2816 files changed, 55745 insertions, 46222 deletions

diff --git a/app-accessibility/at-spi2-atk/at-spi2-atk-2.16.0-r1.ebuild b/app-accessibility/at-spi2-atk/at-spi2-atk-2.16.0-r1.ebuild
index b24dea4c8a16..7823d08bfda7 100644
--- a/app-accessibility/at-spi2-atk/at-spi2-atk-2.16.0-r1.ebuild
+++ b/app-accessibility/at-spi2-atk/at-spi2-atk-2.16.0-r1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://live.gnome.org/Accessibility"
 
 LICENSE="LGPL-2+"
 SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE="test"
 
 COMMON_DEPEND="
diff --git a/app-accessibility/at-spi2-core/at-spi2-core-2.16.0.ebuild b/app-accessibility/at-spi2-core/at-spi2-core-2.16.0.ebuild
index f7dd2bcda66b..ced423de11fb 100644
--- a/app-accessibility/at-spi2-core/at-spi2-core-2.16.0.ebuild
+++ b/app-accessibility/at-spi2-core/at-spi2-core-2.16.0.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://live.gnome.org/Accessibility"
 LICENSE="LGPL-2+"
 SLOT="2"
 IUSE="+X +introspection"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos"
 
 # x11-libs/libSM is needed until upstream #719808 is solved either
 # making the dep unneeded or fixing their configure
diff --git a/app-accessibility/orca/orca-3.16.2.ebuild b/app-accessibility/orca/orca-3.16.2.ebuild
index 4a779289d555..cfb30550c1ec 100644
--- a/app-accessibility/orca/orca-3.16.2.ebuild
+++ b/app-accessibility/orca/orca-3.16.2.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Orca"
 
 LICENSE="LGPL-2.1+ CC-BY-SA-3.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 
 IUSE="+braille"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/app-admin/ansible/Manifest b/app-admin/ansible/Manifest
index 282ffd0a6332..416c4cc12d27 100644
--- a/app-admin/ansible/Manifest
+++ b/app-admin/ansible/Manifest
@@ -1 +1,2 @@
 DIST ansible-1.9.2.tar.gz 927525 SHA256 c25ef4738b08fdfb3094247c012f3fd1b29972acbd37f988070b2a85f5fbee00 SHA512 6c0b3eaac11e11bf90f5b63c54da86df0cb33b0ee98c987c48a68fa643b39e9f0817884767f2bd9c0f6e8852d37fd1b197d5299abc574fccc181fbb22985d4ad WHIRLPOOL 19d50845b9920d85c5ce0380303144e7a4237e673dd4beb5ff020042d7bac59dc0706cff88f08155029ce1a3aa9decc3c54261f9f16524b6e5e3b42e599d3a6b
+DIST ansible-1.9.3.tar.gz 936633 SHA256 2594f642fd800056a427c1026410dc6ed8dfa7c0033f5c3d187abdb2b0d4eeed SHA512 280d7506417affc11fe8c8715f82ffb011991e48e96db73aca915e1393d51073564c78a98b018c380b7fb8e697ce0fac6208822da44f2bac545f142707325d43 WHIRLPOOL 5738bcd263ca32279bbca30e3f1b5c53e5bd72a18025fdb82393a8d85e5a826b3be4ce78cbbc648133768d212fa49d1c3320af4b34f948c1b1cee40d73147f8a
diff --git a/app-admin/ansible/ansible-1.9.3.ebuild b/app-admin/ansible/ansible-1.9.3.ebuild
new file mode 100644
index 000000000000..273d25a097d6
--- /dev/null
+++ b/app-admin/ansible/ansible-1.9.3.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1 eutils readme.gentoo
+
+DESCRIPTION="Radically simple deployment, model-driven configuration management, and command execution framework"
+HOMEPAGE="http://ansible.com/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x64-macos"
+IUSE="test"
+
+RDEPEND="
+	dev-python/httplib2[${PYTHON_USEDEP}]
+	dev-python/jinja[${PYTHON_USEDEP}]
+	dev-python/keyczar[${PYTHON_USEDEP}]
+	>=dev-python/pycrypto-2.6[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	net-misc/sshpass
+	virtual/ssh
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/passlib[${PYTHON_USEDEP}]
+		dev-vcs/git
+	)"
+
+# not included in release tarball
+RESTRICT="test"
+
+python_test() {
+	nosetests -d -w test/units -v --with-coverage --cover-package=ansible --cover-branches || die
+}
+
+python_install_all() {
+	EXAMPLES=( examples )
+	distutils-r1_python_install_all
+
+	doman docs/man/man1/*.1
+
+	newenvd "${FILESDIR}"/${PN}.env 95ansible
+}
+
+src_install() {
+	distutils-r1_src_install
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	optfeature "Alternative ssh transport" dev-python/paramiko
+}
diff --git a/app-admin/apache-tools/apache-tools-2.2.31.ebuild b/app-admin/apache-tools/apache-tools-2.2.31.ebuild
index d1efa934fe07..a0a17b5dee90 100644
--- a/app-admin/apache-tools/apache-tools-2.2.31.ebuild
+++ b/app-admin/apache-tools/apache-tools-2.2.31.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
 IUSE="ssl"
 RESTRICT="test"
 
diff --git a/app-admin/cgmanager/Manifest b/app-admin/cgmanager/Manifest
index 6c026dbd5c83..3224db5dcb12 100644
--- a/app-admin/cgmanager/Manifest
+++ b/app-admin/cgmanager/Manifest
@@ -1,2 +1,3 @@
 DIST cgmanager-0.36.tar.gz 428374 SHA256 f4707f0130efb50ccd8a1900e7ae626c0631947528ce921a63b15ef848fb2a0d SHA512 3325c03e25b7bd7b8dcfb68bb3dedccf9367ce80c23ac8df3f1af6cdb9ee706eafc0f95fcea055cc1fe9b31acb5bb66c61b16b21dfa057e661fdace3ff207f43 WHIRLPOOL dcaad06e6281f89e672b843f9903473cb1ee5d1b938c72d1b806f7bc7a1014144dd9e6e304e9ce6e2b941a1b224177747dacc7affa122f9a17a14598969a4779
 DIST cgmanager-0.37.tar.gz 430522 SHA256 8309e7f2ae5f4a6b52cc2fca62c098b18ecfe90bca2c9c034ba80f68aa427b6e SHA512 fbe96af36d556c988351f1136f4382d907b8fb6d4098a90b17f4abfbdf182060d8ba059878455a8842597e7ad33ff12b91bddf68a6c42b02ad9549a2ad900a89 WHIRLPOOL 9a78226ec2a6a84c7fb84f3bb2622df159a4b857d990b2d4f22a1d8c7d02d071c0ed046e5d17ea9d2bd4b970a0a6ad9bf59ba68401248db318b89e16010c720a
+DIST cgmanager-0.39.tar.gz 437683 SHA256 9e65487fb4e4aa0a6acd87ba7f8f00b8007d8c52608aa6d411e72e6fe9445b7b SHA512 2adf2c639191fb681ffed083629d6ba93f6d5a3534d4dc00b2cff1917c3273febcb30ec7d524ee95ce4a1b8811d902a2ff1cdffe911a66850fb9f10750ef1801 WHIRLPOOL b57c0feb75543af7e7eadccd5287962034fa2c54883289822b54ed184873fb1b6e1eb6d9dcc952fcda2f3027d84fa517c2bfed22a855ede8e700c2298d5d210a
diff --git a/app-admin/cgmanager/cgmanager-0.39.ebuild b/app-admin/cgmanager/cgmanager-0.39.ebuild
new file mode 100644
index 000000000000..b574877df53c
--- /dev/null
+++ b/app-admin/cgmanager/cgmanager-0.39.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit autotools pam
+
+DESCRIPTION="Control Group manager daemon"
+HOMEPAGE="https://linuxcontainers.org/cgmanager/introduction/"
+SRC_URI="https://linuxcontainers.org/downloads/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~x86"
+IUSE="pam selinux"
+
+RDEPEND="sys-libs/libnih[dbus]
+	sys-apps/dbus
+	selinux? ( sec-policy/selinux-cgmanager )"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	epatch_user
+
+	# systemd expects files in /sbin but we will have them in /usr/sbin
+	pushd config/init/systemd > /dev/null || die
+	sed -i -e "s@sbin@usr/&@" {${PN},cgproxy}.service || \
+		die "Failed to fix paths in systemd service files"
+	popd > /dev/null || die
+
+	# there is an automagic dep on pam
+	epatch "${FILESDIR}/${PN}-0.39-make-pam-conditional.patch"
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--with-distro=gentoo \
+		$(use_enable pam pam-module) \
+		--with-pamdir="$(getpam_mod_dir)" \
+		--with-init-script=systemd
+}
+
+src_install () {
+	default
+
+	# I see no reason to have the tests in the filesystem. Drop them
+	rm -r "${D}"/usr/share/${PN}/tests || die "Failed to remove ${PN} tests"
+
+	newinitd "${FILESDIR}"/${PN}.initd-r1 ${PN}
+	newinitd "${FILESDIR}"/cgproxy.initd-r1 cgproxy
+}
diff --git a/app-admin/cgmanager/files/cgmanager-0.39-make-pam-conditional.patch b/app-admin/cgmanager/files/cgmanager-0.39-make-pam-conditional.patch
new file mode 100644
index 000000000000..eed626f3e68c
--- /dev/null
+++ b/app-admin/cgmanager/files/cgmanager-0.39-make-pam-conditional.patch
@@ -0,0 +1,31 @@
+--- Makefile.am.old	2015-09-06 00:16:38.997836415 +0800
++++ Makefile.am	2015-09-06 01:05:00.376009752 +0800
+@@ -133,6 +133,7 @@
+ 	$(CCLD) -o tests/cgm-concurrent tests/cgm-concurrent.o \
+ 		$(NIH_LIBS) $(NIH_DBUS_LIBS) $(DBUS_LIBS) -lpthread -lcgmanager
+ 
++if HAVE_PAMMODULE
+ pam_LTLIBRARIES = pam_cgm.la
+ pam_cgm_la_SOURCES = pam/pam_cgm.c pam/cgmanager.c pam/cgmanager.h
+ pam_cgm_la_CFLAGS = $(AM_CFLAGS)
+@@ -145,4 +146,6 @@
+ 	rm -f "$(DESTDIR)$(pamdir)/pam_cgm.a"
+ uninstall-local:
+ 	rm -f "$(DESTDIR)$(pamdir)/pam_cgm.so"
++endif
++
+ tests: TESTS_CGM_CONCURRENT TESTS_SCM TEST_NSTEST
+--- configure.ac.old	2015-09-06 00:55:48.262972928 +0800
++++ configure.ac	2015-09-06 01:04:19.683301852 +0800
+@@ -127,6 +127,11 @@
+ 
+ AS_AC_EXPAND(SBINDIR, "$sbindir")
+ 
++AC_ARG_ENABLE(pam-module,
++	[AS_HELP_STRING([--enable-pam-module],[build PAM module])],
++	, enable_pam_module=no)
++AM_CONDITIONAL([HAVE_PAMMODULE], [test "x$enable_pam_module" != "xno" ])
++
+ AC_ARG_WITH(
+ 	[pamdir],
+ 	[AS_HELP_STRING([--with-pamdir=PATH],[Specify the directory where PAM modules are stored])],
diff --git a/app-admin/cgmanager/files/cgmanager.initd b/app-admin/cgmanager/files/cgmanager.initd
index 26c915f4dac8..46b1e01fd170 100644
--- a/app-admin/cgmanager/files/cgmanager.initd
+++ b/app-admin/cgmanager/files/cgmanager.initd
@@ -1,4 +1,4 @@
-#!/sbin/runscript
+#!/sbin/openrc-run
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
@@ -9,7 +9,7 @@ NESTED=yes
 OPTIONS=
 
 depend() {
-	after cgproxy
+	before cgproxy
 }
 
 start() {
diff --git a/app-admin/cgmanager/files/cgmanager.initd-r1 b/app-admin/cgmanager/files/cgmanager.initd-r1
new file mode 100644
index 000000000000..48faf787c938
--- /dev/null
+++ b/app-admin/cgmanager/files/cgmanager.initd-r1
@@ -0,0 +1,15 @@
+#!/sbin/openrc-run
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+description="Control Group manager daemon"
+pidfile="/run/cgmanager.pid"
+command="/usr/sbin/cgmanager"
+command_args="-m name=systemd"
+command_background="yes"
+retry="TERM/45"
+
+depend() {
+	before cgproxy
+}
diff --git a/app-admin/cgmanager/files/cgproxy.initd b/app-admin/cgmanager/files/cgproxy.initd
index 3624598adb31..458dcb6ec278 100644
--- a/app-admin/cgmanager/files/cgproxy.initd
+++ b/app-admin/cgmanager/files/cgproxy.initd
@@ -1,4 +1,4 @@
-#!/sbin/runscript
+#!/sbin/openrc-run
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
@@ -9,7 +9,7 @@ NESTED=yes
 OPTIONS=
 
 depend() {
-	before cgmanager
+	after cgmanager
 }
 
 start() {
diff --git a/app-admin/cgmanager/files/cgproxy.initd-r1 b/app-admin/cgmanager/files/cgproxy.initd-r1
new file mode 100644
index 000000000000..ff7b78e8bbbc
--- /dev/null
+++ b/app-admin/cgmanager/files/cgproxy.initd-r1
@@ -0,0 +1,28 @@
+#!/sbin/openrc-run
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+description="Control Group manager proxy"
+pidfile="/run/cgproxy.pid"
+command="/usr/sbin/cgproxy"
+command_args="--daemon"
+command_background="yes"
+retry="TERM/45"
+NESTED="${NESTED:-no}"
+
+depend() {
+	after cgmanager
+}
+
+start_pre() {
+	if ! /usr/sbin/cgproxy --check-master; then
+		ewarn "cgmanager is not running"
+		return 1
+	fi
+	# cgproxy should only run on container unless on older kernel
+	if [ -e /proc/self/ns/pid ] && [ "$NESTED" != "yes" ]; then
+		eerror "Too old kernel to support cgroup, please update to >3.8"
+		return 1
+	fi
+}
diff --git a/app-admin/cgmanager/metadata.xml b/app-admin/cgmanager/metadata.xml
index 230776629fec..5d74e34036b5 100644
--- a/app-admin/cgmanager/metadata.xml
+++ b/app-admin/cgmanager/metadata.xml
@@ -1,8 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-<email>hwoarang@gentoo.org</email>
-<name>Markos Chandras</name>
-</maintainer>
+		<maintainer>
+				<email>perfinion@gentoo.org</email>
+				<name>Jason Zaman</name>
+		</maintainer>
+		<maintainer>
+				<email>hwoarang@gentoo.org</email>
+				<name>Markos Chandras</name>
+		</maintainer>
 </pkgmetadata>
diff --git a/app-admin/denyhosts/denyhosts-2.9.ebuild b/app-admin/denyhosts/denyhosts-2.9.ebuild
index 338697013eb0..634aac4e07d2 100644
--- a/app-admin/denyhosts/denyhosts-2.9.ebuild
+++ b/app-admin/denyhosts/denyhosts-2.9.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ~ppc ~sparc x86"
+KEYWORDS="alpha amd64 arm hppa ppc ~sparc x86"
 IUSE=""
 
 DEPEND=""
diff --git a/app-admin/gkrellm/Manifest b/app-admin/gkrellm/Manifest
index 8faa1e10fd11..e9e4ff7d4d32 100644
--- a/app-admin/gkrellm/Manifest
+++ b/app-admin/gkrellm/Manifest
@@ -1 +1,2 @@
 DIST gkrellm-2.3.5.tar.bz2 765011 SHA256 702b5b0e9c040eb3af8e157453f38dd6f53e1dcd8b1272d20266cda3d4372c8b SHA512 9681ec5978b6be9f56a71726df36671829a4427f45caf90c8c3460e8c59004ff4083de1692cad16e3724ed37418bb3e4589d1961c140f3becfa3efd210b7a5dc WHIRLPOOL 3dceb20b9da49fb9b287e1faca88b3fdb7ae7af6dde5e675ee1e5c718467b131e34f740cb38719e5026ce0478146264fa4eaa060120e71f2c442ec5504e6dfb4
+DIST gkrellm-2.3.6-rc1.tar.bz2 784934 SHA256 abeeb0c04a8f911db5f07a95a98e4044326a657f65986013d36a736ba4e47ae8 SHA512 2004c6e57dc5dba9dbbd4c713caa29f5b59e4926b1ce4a3cfb47840096d6d93d66633d15d5588bc22e31df88241248d7910645da75de39278f1fd68255b88517 WHIRLPOOL f3506e88dc19e3eebe313b5f57a5d605d6b011808391036ff5332140c53061f8ee99b942b2b287cb7f645e9f2491e654623759b4a01fa454c785883355141319
diff --git a/app-admin/gkrellm/files/gkrellm-2.3.6_rc1-avoid_possible_busy_loop.patch b/app-admin/gkrellm/files/gkrellm-2.3.6_rc1-avoid_possible_busy_loop.patch
new file mode 100644
index 000000000000..b6843b64e923
--- /dev/null
+++ b/app-admin/gkrellm/files/gkrellm-2.3.6_rc1-avoid_possible_busy_loop.patch
@@ -0,0 +1,65 @@
+From 285adc8acd22892f86435edd84bf9b22c915b349 Mon Sep 17 00:00:00 2001
+From: Bill Wilson
+Date: Wed, 5 Nov 2014 17:46:37 -0600
+Subject: Avoid possible busy loop in read_server_setup()
+
+A patch from Joe Garcia.  A ssh tunnel can be up but possibly not
+connected to anything in which case gkrellm_getline() can return 0.
+This patch prevents a busy loop by limiting the 0 return retries.
+
+diff --git a/src/client.c b/src/client.c
+index e7c5116..0eb2924 100644
+--- a/src/client.c
++++ b/src/client.c
+@@ -1712,8 +1712,10 @@ process_server_line(KeyTable *table, gint table_size, gchar *line)
+ static gboolean
+ read_server_setup(gint fd)
+ 	{
+-	gchar			buf[4097]; /* TODO: Use dynamic receive buffer */
+-	gint			table_size;
++	gchar	buf[4097]; /* TODO: Use dynamic receive buffer */
++	gint	table_size;
++	gint	rs;
++	gint	retries = 10;
+ 
+ 	gkrellm_debug(DEBUG_CLIENT, "read_server_setup()\n");
+ 
+@@ -1726,13 +1728,18 @@ read_server_setup(gint fd)
+ 
+ 	gkrellm_free_glist_and_data(&client_plugin_setup_line_list);
+ 
+-    gint rs;
+-
+ 	while (1)
+ 		{
+ 		rs = gkrellm_getline(fd, buf, sizeof(buf));
+-        if (rs < 0)
+-            return FALSE;
++		if (rs < 0)
++			return FALSE;
++		if (rs == 0)
++			{
++			if (--retries)
++				usleep(10000);
++			else
++				return FALSE;
++			}
+ 		if (!strcmp(buf, "</gkrellmd_setup>"))
+ 			break;
+ 		process_server_line(&setup_table[0], table_size, buf);
+@@ -1751,6 +1758,12 @@ read_server_setup(gint fd)
+ 		rs = gkrellm_getline(fd, buf, sizeof(buf));
+         if (rs < 0)
+             return FALSE;
++        if (rs==0){
++        	if(--retries)
++        		usleep(10000);
++        	else
++        		return FALSE;
++        }
+ 		if (!strcmp(buf, "</initial_update>"))
+ 			break;
+ 		process_server_line(&update_table[0], table_size, buf);
+-- 
+cgit v0.10.2-6-g49f6
+
diff --git a/app-admin/gkrellm/files/gkrellm-2.3.6_rc1-fix_copypaste_error.patch b/app-admin/gkrellm/files/gkrellm-2.3.6_rc1-fix_copypaste_error.patch
new file mode 100644
index 000000000000..d5348e24f7b0
--- /dev/null
+++ b/app-admin/gkrellm/files/gkrellm-2.3.6_rc1-fix_copypaste_error.patch
@@ -0,0 +1,24 @@
+From f3f67b79195cb9dbb6f7c2401ffe17d3e3b8321b Mon Sep 17 00:00:00 2001
+From: Jindřich Makovička
+Date: Sun, 26 Oct 2014 17:15:49 +0100
+Subject: fix copy/paste error
+
+This regression was introduced by commit
+6365d18ad0ab6f3646e220bfc493bb2422c6f9aa
+
+diff --git a/src/plugins.c b/src/plugins.c
+index 18278fa..55cd157 100644
+--- a/src/plugins.c
++++ b/src/plugins.c
+@@ -1349,7 +1349,7 @@ replace_plugins()
+ 			{
+ 			gtk_box_pack_start(GTK_BOX(gkrellm_monitor_vbox()),
+ 					mon->privat->main_vbox, FALSE, FALSE, 0);
+-			g_object_ref(G_OBJECT(mon->privat->main_vbox));
++			g_object_unref(G_OBJECT(mon->privat->main_vbox));
+ 			}
+ 		}
+ 	}
+-- 
+cgit v0.10.2-6-g49f6
+
diff --git a/app-admin/gkrellm/files/gkrellm-2.3.6_rc1-fix_gtk_deprecation_warning.patch b/app-admin/gkrellm/files/gkrellm-2.3.6_rc1-fix_gtk_deprecation_warning.patch
new file mode 100644
index 000000000000..1f40e2c92214
--- /dev/null
+++ b/app-admin/gkrellm/files/gkrellm-2.3.6_rc1-fix_gtk_deprecation_warning.patch
@@ -0,0 +1,29 @@
+From e15c0d4a029e14e8fbd03f2773b8504d7e090ced Mon Sep 17 00:00:00 2001
+From: Bill Wilson
+Date: Tue, 21 Oct 2014 18:49:41 -0500
+Subject: Fix deprecated allow-shring & allow-grow warnings
+
+Reported by Troy Engel, avoid recent GTK version deprecated warnings
+by using gtk_window_set_resizable().
+
+diff --git a/src/main.c b/src/main.c
+index 205f462..d130d81 100644
+--- a/src/main.c
++++ b/src/main.c
+@@ -1553,9 +1553,10 @@ create_widget_tree()
+ 
+ 	gtk_widget_realize(gtree.window);
+ 
+-	/* gtk_window_set_resizable() */
+-	g_object_set(G_OBJECT(gtree.window), "allow_shrink", FALSE, NULL);
+-	g_object_set(G_OBJECT(gtree.window), "allow_grow", FALSE, NULL);
++	/* Set the toplevel window size handling to be under program control.
++	*/
++	gtk_window_set_resizable((GtkWindow *) gtree.window, FALSE);
++
+ 	if (!decorated)
+ 		gtk_window_set_decorated((GtkWindow *) gtree.window, FALSE);
+ 
+-- 
+cgit v0.10.2-6-g49f6
+
diff --git a/app-admin/gkrellm/files/gkrellm-2.3.6_rc1-update_german_translation.patch.xz b/app-admin/gkrellm/files/gkrellm-2.3.6_rc1-update_german_translation.patch.xz
new file mode 100644
index 000000000000..993f27edc1d1
--- /dev/null
+++ b/app-admin/gkrellm/files/gkrellm-2.3.6_rc1-update_german_translation.patch.xz
diff --git a/app-admin/gkrellm/files/gkrellmd.initd b/app-admin/gkrellm/files/gkrellmd.initd
new file mode 100644
index 000000000000..2a3bd6947ed8
--- /dev/null
+++ b/app-admin/gkrellm/files/gkrellmd.initd
@@ -0,0 +1,16 @@
+#!/sbin/openrc-run
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+description="gkrell system monitor daemon"
+pidfile="/var/run/gkrellmd.pid"
+command="/usr/bin/gkrellmd"
+command_args="${GKRELLMD_OPTS}"
+command_background="true"
+
+depend() {
+	need net
+	after lm_sensors
+	after hddtemp
+}
diff --git a/app-admin/gkrellm/gkrellm-2.3.6_rc1.ebuild b/app-admin/gkrellm/gkrellm-2.3.6_rc1.ebuild
new file mode 100644
index 000000000000..e2149f4a61af
--- /dev/null
+++ b/app-admin/gkrellm/gkrellm-2.3.6_rc1.ebuild
@@ -0,0 +1,136 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils multilib user systemd toolchain-funcs
+
+MY_P="${P/_/-}"
+
+DESCRIPTION="Single process stack of various system monitors"
+HOMEPAGE="http://www.gkrellm.net/"
+SRC_URI="http://gkrellm.srcbox.net/${MY_P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="gnutls hddtemp lm_sensors nls ntlm ssl kernel_FreeBSD X"
+
+RDEPEND="
+	dev-libs/glib:2
+	hddtemp? ( app-admin/hddtemp )
+	gnutls? ( net-libs/gnutls )
+	!gnutls? ( ssl? ( dev-libs/openssl:0= ) )
+	lm_sensors? ( sys-apps/lm_sensors )
+	nls? ( virtual/libintl )
+	ntlm? ( net-libs/libntlm )
+	X? (
+		x11-libs/gtk+:2
+		x11-libs/pango
+		)"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.3.5-cifs.patch
+	"${FILESDIR}"/${PN}-2.3.5-config.patch
+	"${FILESDIR}"/${PN}-2.3.5-width.patch
+	"${FILESDIR}"/${PN}-2.3.5-sansfont.patch
+	"${FILESDIR}"/${P}-fix_gtk_deprecation_warning.patch
+	"${FILESDIR}"/${P}-fix_copypaste_error.patch
+	"${FILESDIR}"/${P}-avoid_possible_busy_loop.patch
+	"${FILESDIR}"/${P}-update_german_translation.patch.xz
+)
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	enewgroup gkrellmd
+	enewuser gkrellmd -1 -1 -1 gkrellmd
+	TARGET=
+	use kernel_FreeBSD && TARGET="freebsd"
+}
+
+src_prepare() {
+	sed -e 's:-O2 ::' \
+		-e 's:override CC:CFLAGS:' \
+		-e 's:-L/usr/X11R6/lib::' \
+		-i */Makefile || die "sed Makefile(s) failed"
+
+	sed -e "s:/usr/lib:${EPREFIX}/usr/$(get_libdir):" \
+		-e "s:/usr/local/lib:${EPREFIX}/usr/local/$(get_libdir):" \
+		-i src/${PN}.h || die "sed ${PN}.h failed"
+
+	epatch ${PATCHES[@]}
+}
+
+src_compile() {
+	if use X ; then
+		local sslopt=""
+		if use gnutls; then
+			sslopt="without-ssl=yes"
+		elif use ssl; then
+			sslopt="without-gnutls=yes"
+		else
+			sslopt="without-ssl=yes without-gnutls=yes"
+		fi
+
+		emake \
+			${TARGET} \
+			CC="$(tc-getCC)" \
+			STRIP="" \
+			INSTALLROOT="${EPREFIX}/usr" \
+			INCLUDEDIR="${EPREFIX}/usr/include/gkrellm2" \
+			LOCALEDIR="${EPREFIX}/usr/share/locale" \
+			$(usex nls "" "enable_nls=0") \
+			$(usex lm_sensors "" "without-libsensors=yes") \
+			$(usex ntlm "" "without-ntlm=yes") \
+			${sslopt}
+	else
+		cd server || die
+		emake \
+			${TARGET} \
+			CC="$(tc-getCC)" \
+			LINK_FLAGS="$LDFLAGS -Wl,-E" \
+			STRIP="" \
+			$(usex nls "" "enable_nls=0") \
+			$(usex lm_sensors "" "without-libsensors=yes")
+	fi
+}
+
+src_install() {
+	if use X ; then
+		emake \
+			install${TARGET:+_}${TARGET} \
+			$(usex nls "" "enable_nls=0") \
+			STRIP="" \
+			INSTALLDIR="${ED}/usr/bin" \
+			INCLUDEDIR="${ED}/usr/include" \
+			LOCALEDIR="${ED}/usr/share/locale" \
+			PKGCONFIGDIR="${ED}/usr/$(get_libdir)/pkgconfig" \
+			MANDIR="${ED}/usr/share/man/man1"
+
+		dohtml *.html
+
+		newicon src/icon.xpm ${PN}.xpm
+		make_desktop_entry ${PN} GKrellM ${PN}
+	else
+		dobin server/gkrellmd
+
+		insinto /usr/include/gkrellm2
+		doins server/gkrellmd.h
+		doins shared/log.h
+	fi
+
+	newinitd "${FILESDIR}"/gkrellmd.initd gkrellmd
+	newconfd "${FILESDIR}"/gkrellmd.conf gkrellmd
+
+	systemd_dounit "${FILESDIR}"/gkrellmd.service
+
+	insinto /etc
+	doins server/gkrellmd.conf
+
+	dodoc Changelog CREDITS README
+}
diff --git a/app-admin/keepassx/Manifest b/app-admin/keepassx/Manifest
index 46aee195f3ff..af1ab374b504 100644
--- a/app-admin/keepassx/Manifest
+++ b/app-admin/keepassx/Manifest
@@ -1,3 +1,3 @@
 DIST keepassx-0.4.3.tar.gz 1368766 SHA256 cd901a0611ce57e62cf6df7eeeb1b690b5232302bdad8626994eb54adcfa1e85 SHA512 8ce1bc252694e11a8b0da94bb00a4e5ca2837fe099f2f992aa9a93bacc4d94f33970cec687bd73a7a7762e86220a0541fe85a6708a2d4ad1bb3aef5f19935ccc WHIRLPOOL e2f54832eeb8eb3c7b7874e2deb97843a9ef1a92f027ec540fd197cf850d313be5d8959595e122b24a286973747d3b71bd33537de601b31ba3d45a16a095747b
-DIST keepassx-2.0_alpha5.tar.gz 1052454 SHA256 d5554d98666c7e0ea14d868ea837a3bc83661e95770faf77452367f80d18b2ef SHA512 864b56b35c768cf084d1934909c8f1aca474c0586ed644c3d5fef6d4eaffb550eeb14b1ac93d01e26a1319ad38144130ccdcf9f0c5634c395afed9f560173e79 WHIRLPOOL 92a0d9b653ea63c5abb5dde0ff2e92f92221e8b7f877da042b70f3a517ba9ac3c3e220c7014bc2da6cdb8a309f9c9575efce62de5026b281df2899ac756c21ec
 DIST keepassx-2.0_alpha6.tar.gz 1366929 SHA256 592f9995b13c4f84724fb24a0078162246397eedccd467daaf0fd3608151f2b0 SHA512 76cf2e9617217b4f38ecd0027a88768c5a06c51e796f32e4939ba3a4506583ce6793c107293ee87c0ff1d18eaf6030096cab4da644cf0bef35ff09d5a46cd5ca WHIRLPOOL 37283e66bb285656ff2992552ce6e745603f27685a8a2e87fec42e391b484b2bf1697da011ec0ef86ff1ba5053abd803f38ad8ba77f0d295d901bd5ecf38d1e3
+DIST keepassx-2.0_beta2.tar.gz 1479599 SHA256 5828261226c441856bd12e2f4f73af1a5fc3b1981b2cff40fbc2403e344f4e52 SHA512 e63431a55536fccc8dd4e441863081f533cac6608ce393ad4d641fc57fce815232aff1fdf777374464b3ad6bedb16392d578ff39bf9230d4cb0cd62b11869a5f WHIRLPOOL 69e1de023b5090640747b332642559ea0d0fdbe04bffdf4805475f29eb100c2e8d2744c3b9222c3c63a938e33e470ad9b5a6812d09c249eb09af7006728c7866
diff --git a/app-admin/keepassx/files/keepassx-2.0_alpha5-libgcrypt-1.6.0.patch b/app-admin/keepassx/files/keepassx-2.0_alpha5-libgcrypt-1.6.0.patch
deleted file mode 100644
index c2734c83e45d..000000000000
--- a/app-admin/keepassx/files/keepassx-2.0_alpha5-libgcrypt-1.6.0.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-commit 8c7e6552742d11b13bc381fb39c00f9d57ce70ba
-Author: Felix Geyer <debfx@fobos.de>
-Date:   Sun Jan 12 12:39:39 2014 +0100
-
-    Add compatibility with libgcrypt 1.6.
-    
-    Closes #129
-
-diff --git a/src/crypto/Crypto.cpp b/src/crypto/Crypto.cpp
-index 6ad7fb0..1e28002 100644
---- a/src/crypto/Crypto.cpp
-+++ b/src/crypto/Crypto.cpp
-@@ -23,6 +23,7 @@
- 
- bool Crypto::m_initalized(false);
- 
-+#if !defined(GCRYPT_VERSION_NUMBER) || (GCRYPT_VERSION_NUMBER < 0x010600)
- static int gcry_qt_mutex_init(void** p_sys)
- {
-     *p_sys = new QMutex();
-@@ -57,6 +58,7 @@ static const struct gcry_thread_cbs gcry_threads_qt =
-     gcry_qt_mutex_unlock,
-     0, 0, 0, 0, 0, 0, 0, 0
- };
-+#endif
- 
- Crypto::Crypto()
- {
-@@ -69,7 +71,10 @@ void Crypto::init()
-         return;
-     }
- 
-+    // libgcrypt >= 1.6 doesn't allow custom thread callbacks anymore.
-+#if !defined(GCRYPT_VERSION_NUMBER) || (GCRYPT_VERSION_NUMBER < 0x010600)
-     gcry_control(GCRYCTL_SET_THREAD_CBS, &gcry_threads_qt);
-+#endif
-     gcry_check_version(0);
-     gcry_control(GCRYCTL_INITIALIZATION_FINISHED, 0);
- 
diff --git a/app-admin/keepassx/keepassx-2.0_alpha5.ebuild b/app-admin/keepassx/keepassx-2.0_alpha5.ebuild
deleted file mode 100644
index 0eec23fe1ad5..000000000000
--- a/app-admin/keepassx/keepassx-2.0_alpha5.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit cmake-utils vcs-snapshot
-
-DESCRIPTION="Qt password manager compatible with its Win32 and Pocket PC versions"
-HOMEPAGE="http://www.keepassx.org/"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV/_/-}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="|| ( GPL-2 GPL-3 ) BSD GPL-2 LGPL-2.1 LGPL-3+ CC0-1.0 public-domain || ( LGPL-2.1 GPL-3 )"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-DEPEND="
-	dev-libs/libgcrypt:0=
-	dev-qt/qtcore:4
-	dev-qt/qtdbus:4
-	dev-qt/qtgui:4
-	dev-qt/qttest:4
-	sys-libs/zlib
-	x11-libs/libX11
-	x11-libs/libXtst
-"
-RDEPEND="${DEPEND}"
-
-DOCS=(CHANGELOG)
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-libgcrypt-1.6.0.patch
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_with test TESTS)
-	)
-	cmake-utils_src_configure
-}
diff --git a/app-admin/keepassx/keepassx-2.0_beta2.ebuild b/app-admin/keepassx/keepassx-2.0_beta2.ebuild
new file mode 100644
index 000000000000..dba04533f09b
--- /dev/null
+++ b/app-admin/keepassx/keepassx-2.0_beta2.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit cmake-utils vcs-snapshot
+
+DESCRIPTION="Qt password manager compatible with its Win32 and Pocket PC versions"
+HOMEPAGE="http://www.keepassx.org/"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV/_/-}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="|| ( GPL-2 GPL-3 ) BSD GPL-2 LGPL-2.1 LGPL-3+ CC0-1.0 public-domain || ( LGPL-2.1 GPL-3 )"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+DEPEND="
+	dev-libs/libgcrypt:0=
+	dev-qt/qtcore:4
+	dev-qt/qtgui:4
+	dev-qt/qttest:4
+	sys-libs/zlib
+	x11-libs/libX11
+	x11-libs/libXtst
+"
+RDEPEND="${DEPEND}"
+
+DOCS=(CHANGELOG)
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_with test TESTS)
+	)
+	cmake-utils_src_configure
+}
diff --git a/app-admin/logrotate/logrotate-3.9.1.ebuild b/app-admin/logrotate/logrotate-3.9.1.ebuild
index 50608763cb49..b45ce6258f7f 100644
--- a/app-admin/logrotate/logrotate-3.9.1.ebuild
+++ b/app-admin/logrotate/logrotate-3.9.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://fedorahosted.org/releases/l/o/logrotate/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="acl +cron selinux"
 
 CDEPEND="
diff --git a/app-admin/logstash-bin/Manifest b/app-admin/logstash-bin/Manifest
index 04b039cc543e..5b69ca8d1677 100644
--- a/app-admin/logstash-bin/Manifest
+++ b/app-admin/logstash-bin/Manifest
@@ -1,2 +1,2 @@
-DIST logstash-1.4.4.tar.gz 71931272 SHA256 b148a76670a11f879e26622e229c882f3c98950e695f2d7ec066522c3c658658 SHA512 e8252167fb6c75462dc910f86d2a5ce4f718d108705f16ea7fc80e0e6446d8649e1d0310a8024bf785bb51834a55ab79cf435541a88b7c7eb8cd640683df8635 WHIRLPOOL c5d3c5e50dc1d306be739c72df746163e43c7772087c52253050a92c69ec02c7c924279eca77782f3089b92db359278732f2adbfb02549748d2559fedf612329
-DIST logstash-1.5.3.tar.gz 91690052 SHA256 a54abaade1c31e65187f77fca1738bc9e6c8e95b4ee3176a2bc44735b6dd0cf8 SHA512 7cd9a522a8f99448954e973b38f17477f8f4d645ab3971492e94a25097ad52aa65446ec8caebcf1c3f7b756b76e1b70d139f27c6140a09d2c97d41dd3fb9b78e WHIRLPOOL ce1f020e2af0082a3e65caf5d09b52089c04f584a1fe024a933c1077d115d7fcd5fd119aedfbdf3d2d01fe42ed120f331f517472e9eb5797095970b8aeb68a11
+DIST logstash-1.4.5.tar.gz 73896488 SHA256 ddb6fd2d26e87b13d87fa1495492a7346d45267df46eed29503df08d3e5d8a13 SHA512 b71b818dfb681459cc7cdd39d241b46c8bc905b4f26af377058feb78c9b9f3528059d136605685f24e7af1f2c190fa93557b0876765d78fc1f7cce32640a2593 WHIRLPOOL 7fa1189120fbfac487471261ae1a10e55986bee924df8356169d88ee37ef578607323316156ecbaa64e7e4f9fe9c1a70f475529f61f9977ac9287a484d2321cb
+DIST logstash-1.5.4.tar.gz 91956015 SHA256 f03075ee534ce6e7667679447f56543ce05cebbdb7b65a9396a5e538bf3e9fa8 SHA512 b20a8de5e22f82e6ddc03bae16d6ca01ab1fbff695a7fd0148feee9f8903c3805c45f296bceada6688fbcc86b8e318daaebcb6d67c2a6cd8d0cc3bdd8a3bf757 WHIRLPOOL 470e0a29b928690187ef17297393e702fc015c6a476e75b28d1abddc4082e0da0bd27f0fca5c2f81a207aeb0303e78ff6761126e08a800b3eb989710486f717c
diff --git a/app-admin/logstash-bin/logstash-bin-1.4.4.ebuild b/app-admin/logstash-bin/logstash-bin-1.4.5.ebuild
index 027faae0d39d..027faae0d39d 100644
--- a/app-admin/logstash-bin/logstash-bin-1.4.4.ebuild
+++ b/app-admin/logstash-bin/logstash-bin-1.4.5.ebuild
diff --git a/app-admin/logstash-bin/logstash-bin-1.5.3.ebuild b/app-admin/logstash-bin/logstash-bin-1.5.4.ebuild
index 18df7a31ce3f..18df7a31ce3f 100644
--- a/app-admin/logstash-bin/logstash-bin-1.5.3.ebuild
+++ b/app-admin/logstash-bin/logstash-bin-1.5.4.ebuild
diff --git a/app-admin/lsyncd/metadata.xml b/app-admin/lsyncd/metadata.xml
index 926da28a904a..8716f562d13a 100644
--- a/app-admin/lsyncd/metadata.xml
+++ b/app-admin/lsyncd/metadata.xml
@@ -6,5 +6,6 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="google-code">lsyncd</remote-id>
+		<remote-id type="github">axkibe/lsyncd</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/app-admin/restart_services/restart_services-0.13.0-r1.ebuild b/app-admin/restart_services/restart_services-0.13.0-r1.ebuild
new file mode 100644
index 000000000000..87fa490cff64
--- /dev/null
+++ b/app-admin/restart_services/restart_services-0.13.0-r1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+DESCRIPTION="Tool to manage OpenRC services that need to be restarted"
+HOMEPAGE="https://dev.gentoo.org/~mschiff/restart_services/"
+SRC_URI="https://dev.gentoo.org/~mschiff/src/${PN}/${P}.tgz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="
+	app-admin/lib_users
+	sys-apps/openrc
+"
+
+src_install() {
+	dosbin restart_services
+	doman restart_services.1
+	keepdir /etc/restart_services.d
+	insinto /etc
+	doins restart_services.conf
+	dodoc README CHANGES
+
+	sed -i 's/^#include/include/' "${D}"/etc/restart_services.conf
+	cat>"${D}"/etc/restart_services.d/00-local.conf<<-EOF
+	# You may put your local changes here or in any other *.conf file
+	# in this directory so you can leave /etc/restart_services.conf as is.
+	# Example:
+	# *extend* SV_ALWAYS to match 'myservice'
+	# SV_ALWAYS+=( myservice )
+	EOF
+}
diff --git a/app-admin/salt/Manifest b/app-admin/salt/Manifest
index 6104f6d95144..ac0432a7cb8f 100644
--- a/app-admin/salt/Manifest
+++ b/app-admin/salt/Manifest
@@ -1,3 +1,4 @@
 DIST salt-2015.5.3.tar.gz 5389038 SHA256 f8b04dc8bd4b00ce803d31ce5fba033c2f20fa38cdc5a3bf54b4c47362fbe853 SHA512 61203cb9b82fe8ab84fa36d06f442aebcf5c5decfacb99f8df6b52320979699d168f9df7e9e675a13a8078feabbe9210a40e526627a213239760ea43d85f1298 WHIRLPOOL 160455263ee1a95faec1f03dfcd16f9b811e5ecb961a2db5c9545070ed74786c83592e008c1ed70a6ea358ba2491128d6081d57bf7c0a679bb99abb1555bbd21
 DIST salt-2015.5.5.tar.gz 5526444 SHA256 5cd8d317616abab691a83f7fd3f8bcf9ad8aecaa95fcfdc0f6d788de87f0beeb SHA512 263f772d403c0e841957342f552389914c563add3f774f26b5d9da81efa04330ec95349223f81e192a2a4789b2d565f7a67e9e3be564296d6235a47cb6657ac3 WHIRLPOOL 7b4f71d6a12b50f4f0a92bfd68c1df2cf8992481d17db984079d4a9cadd51de56d7390ea69c9b02055e747993818756af85f82538a4640e5fb831e4a1ee1cb57
+DIST salt-2015.8.0.tar.gz 6584668 SHA256 71e1cb2eb1d4b30f3247f5590c00a2089190b8f9a90c9330dc9a65fae517ec9b SHA512 e5066773cdd69635272e8bda4e030ae270ea0d6a4895ca18c2d8e94ae7a2987700fda05a760d799e369f1ec977428da0a1c8797790f0f9ac30c03a4d80ce1599 WHIRLPOOL ca1c1d8f18d29b047ebbdf590ed1d1bbe932359017505af2b5043aa6e5035756e29f9d7d3f9293ca5a76c6d643b38d62cedbc3abffafef7cf8ab2443f7143fe9
 DIST salt-vim-20141109.tar.gz 3783 SHA256 4989d111ad618ea3f5f7a7046a0ff6ce3ca6bc7f71fca90849f7c38947ab6d9a SHA512 d8d62ee827012e29586cf492f2881ee5870ed058828102f985e8b27300c115e01bb126f89decb15a19a8e206dc54c89856d4c31b3ff5320a36385cb5ed517a63 WHIRLPOOL 98026b2cdcb64665790475e3b20a7de294e5cefb390b414294756cad440bc040d9044ffd37a13f3c93af9be1a1bfd444710ff0df24895db624f49fddd16b5545
diff --git a/app-admin/salt/files/salt-2015.8.0-remove-buggy-tests.patch b/app-admin/salt/files/salt-2015.8.0-remove-buggy-tests.patch
new file mode 100644
index 000000000000..92ab0624e595
--- /dev/null
+++ b/app-admin/salt/files/salt-2015.8.0-remove-buggy-tests.patch
@@ -0,0 +1,56 @@
+diff --git a/tests/unit/modules/mount_test.py b/tests/unit/modules/mount_test.py
+index 282539d..c88a7a8 100644
+--- a/tests/unit/modules/mount_test.py
++++ b/tests/unit/modules/mount_test.py
+@@ -103,12 +103,6 @@ class MountTestCase(TestCase):
+             self.assertTrue(mount.rm_fstab('name', 'device'))
+ 
+         mock = MagicMock(return_value={'name': 'name'})
+-        with patch.object(mount, 'fstab', mock):
+-            with patch('salt.utils.fopen', mock_open()) as m_open:
+-                helper_open = m_open()
+-                helper_open.write.assertRaises(CommandExecutionError,
+-                                               mount.rm_fstab,
+-                                               config=None)
+ 
+     def test_set_fstab(self):
+         '''
+@@ -143,12 +137,6 @@ class MountTestCase(TestCase):
+             self.assertTrue(mount.rm_automaster('name', 'device'))
+ 
+         mock = MagicMock(return_value={'name': 'name'})
+-        with patch.object(mount, 'fstab', mock):
+-            with patch('salt.utils.fopen', mock_open()) as m_open:
+-                helper_open = m_open()
+-                helper_open.write.assertRaises(CommandExecutionError,
+-                                               mount.rm_automaster,
+-                                               'name', 'device')
+ 
+     def test_set_automaster(self):
+         '''
+diff --git a/tests/unit/modules/puppet_test.py b/tests/unit/modules/puppet_test.py
+index 6a43fd4..3be039c 100644
+--- a/tests/unit/modules/puppet_test.py
++++ b/tests/unit/modules/puppet_test.py
+@@ -91,10 +91,6 @@ class PuppetTestCase(TestCase):
+                     with patch('salt.utils.fopen', mock_open()):
+                         self.assertTrue(puppet.disable())
+ 
+-                    with patch('salt.utils.fopen', mock_open()) as m_open:
+-                        helper_open = m_open()
+-                        helper_open.write.assertRaises(CommandExecutionError,
+-                                                       puppet.disable)
+ 
+     def test_status(self):
+         '''
+@@ -154,10 +150,6 @@ class PuppetTestCase(TestCase):
+                            mock_open(read_data="resources: 1")):
+                     self.assertDictEqual(puppet.summary(), {'resources': 1})
+ 
+-                with patch('salt.utils.fopen', mock_open()) as m_open:
+-                    helper_open = m_open()
+-                    helper_open.write.assertRaises(CommandExecutionError,
+-                                                   puppet.summary)
+ 
+     def test_plugin_sync(self):
+         '''
diff --git a/app-admin/salt/files/salt-2015.8.0-remove-pydsl-includes-test.patch b/app-admin/salt/files/salt-2015.8.0-remove-pydsl-includes-test.patch
new file mode 100644
index 000000000000..469e0d27e101
--- /dev/null
+++ b/app-admin/salt/files/salt-2015.8.0-remove-pydsl-includes-test.patch
@@ -0,0 +1,107 @@
+diff --git a/tests/unit/pydsl_test.py b/tests/unit/pydsl_test.py
+index 2f39a41..2052f55 100644
+--- a/tests/unit/pydsl_test.py
++++ b/tests/unit/pydsl_test.py
+@@ -445,102 +445,6 @@ class PyDSLRendererTestCase(CommonTestCaseBoilerplate):
+             shutil.rmtree(dirpath, ignore_errors=True)
+ 
+ 
+-class PyDSLRendererIncludeTestCase(CommonTestCaseBoilerplate):
+-
+-    def test_rendering_includes(self):
+-        dirpath = tempfile.mkdtemp(dir=integration.SYS_TMP_DIR)
+-        if not os.path.isdir(dirpath):
+-            self.skipTest(
+-                'The temporary directory {0!r} was not created'.format(
+-                    dirpath
+-                )
+-            )
+-        output = os.path.join(dirpath, 'output')
+-        try:
+-            write_to(os.path.join(dirpath, 'aaa.sls'), textwrap.dedent('''\
+-                #!pydsl|stateconf -ps
+-
+-                include('xxx')
+-                yyy = include('yyy')
+-
+-                # ensure states in xxx are run first, then those in yyy and then those in aaa last.
+-                extend(state('yyy::start').stateconf.require(stateconf='xxx::goal'))
+-                extend(state('.start').stateconf.require(stateconf='yyy::goal'))
+-
+-                extend(state('yyy::Y2').cmd.run('echo Y2 extended >> {0}'))
+-
+-                __pydsl__.set(ordered=True)
+-
+-                yyy.hello('red', 1)
+-                yyy.hello('green', 2)
+-                yyy.hello('blue', 3)
+-                '''.format(output)))
+-
+-            write_to(os.path.join(dirpath, 'xxx.sls'), textwrap.dedent('''\
+-                #!stateconf -os yaml . jinja
+-
+-                include:
+-                  - yyy
+-
+-                extend:
+-                  yyy::start:
+-                    stateconf.set:
+-                      - require:
+-                        - stateconf: .goal
+-
+-                  yyy::Y1:
+-                    cmd.run:
+-                      - name: 'echo Y1 extended >> {0}'
+-
+-                .X1:
+-                  cmd.run:
+-                    - name: echo X1 >> {1}
+-                    - cwd: /
+-                .X2:
+-                  cmd.run:
+-                    - name: echo X2 >> {2}
+-                    - cwd: /
+-                .X3:
+-                  cmd.run:
+-                    - name: echo X3 >> {3}
+-                    - cwd: /
+-
+-                '''.format(output, output, output, output)))
+-
+-            write_to(os.path.join(dirpath, 'yyy.sls'), textwrap.dedent('''\
+-                #!pydsl|stateconf -ps
+-
+-                include('xxx')
+-                __pydsl__.set(ordered=True)
+-
+-                state('.Y1').cmd.run('echo Y1 >> {0}', cwd='/')
+-                state('.Y2').cmd.run('echo Y2 >> {1}', cwd='/')
+-                state('.Y3').cmd.run('echo Y3 >> {2}', cwd='/')
+-
+-                def hello(color, number):
+-                    state(color).cmd.run('echo hello '+color+' '+str(number)+' >> {3}', cwd='/')
+-                '''.format(output, output, output, output)))
+-
+-            self.state_highstate({'base': ['aaa']}, dirpath)
+-            expected = textwrap.dedent('''\
+-                X1
+-                X2
+-                X3
+-                Y1 extended
+-                Y2 extended
+-                Y3
+-                hello red 1
+-                hello green 2
+-                hello blue 3
+-                ''')
+-
+-            with salt.utils.fopen(output, 'r') as f:
+-                self.assertEqual(sorted(f.read()), sorted(expected))
+-
+-        finally:
+-            shutil.rmtree(dirpath, ignore_errors=True)
+-
+-
+ def write_to(fpath, content):
+     with salt.utils.fopen(fpath, 'w') as f:
+         f.write(content)
diff --git a/app-admin/salt/salt-2015.8.0.ebuild b/app-admin/salt/salt-2015.8.0.ebuild
new file mode 100644
index 000000000000..e8568efce203
--- /dev/null
+++ b/app-admin/salt/salt-2015.8.0.ebuild
@@ -0,0 +1,120 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=(python2_7)
+
+inherit eutils systemd vim-plugin distutils-r1
+
+DESCRIPTION="Salt is a remote execution and configuration manager"
+HOMEPAGE="http://saltstack.org/"
+SALT_VIM_HASH="20695f68e5895e5ae2b5884b78f5a2cd29897b05"
+
+if [[ ${PV} == 9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="git://github.com/${PN}stack/${PN}.git"
+	EGIT_BRANCH="develop"
+	SRC_URI=""
+	KEYWORDS=""
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~x86 ~amd64"
+fi
+
+SRC_URI+=" vim-syntax? ( https://github.com/${PN}stack/${PN}-vim/archive/${SALT_VIM_HASH}.tar.gz -> salt-vim-20141109.tar.gz )"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="cherrypy ldap libcloud libvirt gnupg keyring mako mongodb mysql neutron nova"
+IUSE+=" openssl profile redis selinux test timelib raet +zeromq vim-syntax"
+
+RDEPEND="sys-apps/pciutils
+	dev-python/jinja[${PYTHON_USEDEP}]
+	>=dev-python/msgpack-0.3[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/markupsafe[${PYTHON_USEDEP}]
+	>=dev-python/requests-1.0.0[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=www-servers/tornado-4.2.1[${PYTHON_USEDEP}]
+	virtual/python-futures[${PYTHON_USEDEP}]
+	libcloud? ( >=dev-python/libcloud-0.14.0[${PYTHON_USEDEP}] )
+	mako? ( dev-python/mako[${PYTHON_USEDEP}] )
+	ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}] )
+	openssl? ( dev-python/pyopenssl[${PYTHON_USEDEP}] )
+	libvirt? ( dev-python/libvirt-python[${PYTHON_USEDEP}] )
+	raet? (
+		>=dev-python/libnacl-1.0.0[${PYTHON_USEDEP}]
+		>=dev-python/ioflo-1.1.7[${PYTHON_USEDEP}]
+		>=dev-python/raet-0.6.0[${PYTHON_USEDEP}]
+	)
+	zeromq? (
+		>=dev-python/pyzmq-2.2.0[${PYTHON_USEDEP}]
+		>=dev-python/pycrypto-2.6.1[${PYTHON_USEDEP}]
+	)
+	cherrypy? ( >=dev-python/cherrypy-3.2.2[${PYTHON_USEDEP}] )
+	mongodb? ( dev-python/pymongo[${PYTHON_USEDEP}] )
+	keyring? ( dev-python/keyring[${PYTHON_USEDEP}] )
+	mysql? ( dev-python/mysql-python[${PYTHON_USEDEP}] )
+	redis? ( dev-python/redis-py[${PYTHON_USEDEP}] )
+	selinux? ( sec-policy/selinux-salt )
+	timelib? ( dev-python/timelib[${PYTHON_USEDEP}] )
+	nova? ( >=dev-python/python-novaclient-2.17.0[${PYTHON_USEDEP}] )
+	neutron? ( >=dev-python/python-neutronclient-2.3.6[${PYTHON_USEDEP}] )
+	gnupg? ( dev-python/python-gnupg[${PYTHON_USEDEP}] )
+	profile? ( dev-python/yappi[${PYTHON_USEDEP}] )"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pip[${PYTHON_USEDEP}]
+		dev-python/virtualenv[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/timelib[${PYTHON_USEDEP}]
+		>=dev-python/boto-2.32.1[${PYTHON_USEDEP}]
+		>=dev-python/moto-0.3.6[${PYTHON_USEDEP}]
+		>=dev-python/SaltTesting-2015.2.16[${PYTHON_USEDEP}]
+		${RDEPEND}
+	)"
+
+DOCS=(README.rst AUTHORS)
+
+REQUIRED_USE="|| ( raet zeromq )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2015.8.0-remove-pydsl-includes-test.patch"
+	"${FILESDIR}/${PN}-2015.8.0-remove-buggy-tests.patch"
+	"${FILESDIR}/${PN}-2015.5.5-auth-tests.patch"
+	"${FILESDIR}/${PN}-2015.5.5-cron-tests.patch"
+	"${FILESDIR}/${PN}-2015.5.5-remove-buggy-tests.patch"
+)
+
+python_prepare() {
+	# this test fails because it trys to "pip install distribute"
+	rm tests/unit/{modules,states}/zcbuildout_test.py tests/unit/modules/{rh_ip,win_network}_test.py
+}
+
+python_install_all() {
+	local svc
+	USE_SETUPTOOLS=1 distutils-r1_python_install_all
+
+	for svc in minion master syndic api; do
+		newinitd "${FILESDIR}"/${svc}-initd-4 salt-${svc}
+		newconfd "${FILESDIR}"/${svc}-confd-1 salt-${svc}
+		systemd_dounit "${FILESDIR}"/salt-${svc}.service
+	done
+
+	insinto /etc/${PN}
+	doins -r conf/*
+
+	use vim-syntax && S="${WORKDIR}/salt-vim-${SALT_VIM_HASH}" \
+		vim-plugin_src_install
+}
+
+python_test() {
+	# testsuite likes lots of files
+	ulimit -n 3072
+
+	# using ${T} for the TMPDIR makes some tests needs paths that exceed PATH_MAX
+	USE_SETUPTOOLS=1 SHELL="/bin/bash" TMPDIR="/tmp" \
+		${EPYTHON} tests/runtests.py \
+		--unit-tests --no-report --verbose || die "testing failed"
+}
diff --git a/app-admin/syslog-ng/syslog-ng-3.6.4.ebuild b/app-admin/syslog-ng/syslog-ng-3.6.4.ebuild
index 486044e53ee3..1bf148c5a7ff 100644
--- a/app-admin/syslog-ng/syslog-ng-3.6.4.ebuild
+++ b/app-admin/syslog-ng/syslog-ng-3.6.4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://www.balabit.com/downloads/files/syslog-ng/sources/${MY_PV}/sourc
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd"
 IUSE="amqp caps dbi geoip ipv6 json mongodb pacct redis smtp spoof-source ssl systemd tcpd"
 RESTRICT="test"
 
diff --git a/app-admin/system-tools-backends/metadata.xml b/app-admin/system-tools-backends/metadata.xml
index 013e6579a275..a5be798c5082 100644
--- a/app-admin/system-tools-backends/metadata.xml
+++ b/app-admin/system-tools-backends/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
+<herd>lxqt</herd>
 <longdescription lang="en">
 The System Tools Backends are a set of cross-platform modules for Linux,
 FreeBSD, Solaris and other Unix systems. The backends provide an common DBus
diff --git a/app-admin/systemrescuecd-x86/Manifest b/app-admin/systemrescuecd-x86/Manifest
index 1c0a7a5c2745..af9e335e88f6 100644
--- a/app-admin/systemrescuecd-x86/Manifest
+++ b/app-admin/systemrescuecd-x86/Manifest
@@ -4,3 +4,4 @@ DIST systemrescuecd-x86-4.5.1.iso 443541504 SHA256 4fda2fce55a46c7b258fba10c88a4
 DIST systemrescuecd-x86-4.5.2.iso 456060928 SHA256 e8805433699acd7b6df38ff893eddad8c6f287a09cc34be3f6fef46d3e5056c4 SHA512 b27223b08032f0132f81204a244638262cf70348a1a299e5bf63971db556d604e52d8c3408e3943c305eac887c2e38ed6d2b1488633595c9f8c1cc087162f911 WHIRLPOOL 0c304b5622e0079746128832133b7f554b8dd6536b447d399da150539c6425ed6ec6aaaef4d3d034ff9a6e814812f9f0ac3383b07f83f13ede9e00d917f2ad5b
 DIST systemrescuecd-x86-4.5.3.iso 458467328 SHA256 16aadc8bef95a0f409a7865054e8597b1001d815b22d976556c103379ea6aba3 SHA512 14774e9a882d5a505532ab8bee85e81867f5d30674df471eb76cae84678eae00fa3992c894b6c90b85c7eaa20bdc04ffe910a7a432092faf3329c08bf54eff49 WHIRLPOOL 7fa6a4e708453bc149d50b56fc05e77ed0d14a6ebab0c939f4e33d92ccbf2409de0da1154425f633e7e4415a3de7f9dc705131259e290b5a40b51f4f43b0f7dd
 DIST systemrescuecd-x86-4.5.4.iso 459102208 SHA256 333827d5375cbb9bb201aa2c36871d941e78eeb66652c18c76664154a30eb9a4 SHA512 c32904413516af917de3d58b8eaf3b5701b9c49b1249daf1f8eca060497d5278fedbb0c0d86907bf94ddeab716dc8bf014e0baed0aee66141e8967207805d446 WHIRLPOOL 75c46f12dd92b093e4194e3b67ca020aefc43a3d9e27d94088a2c2f7f0ccad5cd44f7d7fbec4185956756fc3a3bf8845a82ab7a3d171c6ce3d8672f76e9c46e0
+DIST systemrescuecd-x86-4.6.0.iso 467294208 SHA256 cdf1db091a7d963e3395f4d9b90f40b2b0b939c99ae9138178d5abc6dfa31e0f SHA512 f90d46adb8ab19b19eae589744808bcbd50aa0b0eac22eca92a09e8407c77e7a2bf573c2c72b37f497a9d287c90b20164b213bf007b538063f758b12b1da11eb WHIRLPOOL f6f8a674d3971309361997b2c5a06ddcec15bbdf069a5177dab3a0701c95f55723bcd835f8e3bac0e5b756d9a5115f4828ceac0af7edef903af16ece0c24e81a
diff --git a/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.6.0.ebuild b/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.6.0.ebuild
new file mode 100644
index 000000000000..d7cc39e4ee14
--- /dev/null
+++ b/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.6.0.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+DESCRIPTION="The .iso image of SystemRescueCD rescue disk, x86 (+ amd64) variant"
+HOMEPAGE="http://www.sysresccd.org/"
+SRC_URI="mirror://sourceforge/systemrescuecd/sysresccd-${PN#*-}/${PV}/${P}.iso"
+
+LICENSE="GPL-2"
+SLOT="${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+S=${WORKDIR}
+
+RESTRICT="mirror"
+
+src_install() {
+	insinto "/usr/share/${PN%-*}"
+	doins "${DISTDIR}/${P}.iso"
+}
+
+pkg_postinst() {
+	local f=${EROOT%/}/usr/share/${PN%-*}/${PN}-newest.iso
+
+	# no version newer than ours? we're the newest!
+	if ! has_version ">${CATEGORY}/${PF}"; then
+		ln -f -s -v "${P}.iso" "${f}" || die
+	fi
+}
+
+pkg_postrm() {
+	local f=${EROOT%/}/usr/share/${PN%-*}/${PN}-newest.iso
+
+	# if there is no version newer than ours installed
+	if ! has_version ">${CATEGORY}/${PF}"; then
+		# and we are truly and completely uninstalled...
+		if [[ ! ${REPLACED_BY_VERSION} ]]; then
+			# then find an older version to set the symlink to
+			local newest_version=$(best_version "<${CATEGORY}/${PF}")
+
+			if [[ ${newest_version} ]]; then
+				# update the symlink
+				ln -f -s -v "${newest_version%-r*}.iso" "${f}" || die
+			else
+				# last version removed? clean up the symlink
+				rm -v "${f}" || die
+				# and the parent directory
+				rmdir "${f%/*}" || die
+			fi
+		fi
+	fi
+}
diff --git a/app-admin/ulogd/ulogd-2.0.5-r1.ebuild b/app-admin/ulogd/ulogd-2.0.5-r1.ebuild
new file mode 100644
index 000000000000..0115be00985c
--- /dev/null
+++ b/app-admin/ulogd/ulogd-2.0.5-r1.ebuild
@@ -0,0 +1,142 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+AUTOTOOLS_AUTORECONF=1
+AUTOTOOLS_IN_SOURCE_BUILD=1
+
+inherit autotools-utils eutils flag-o-matic linux-info readme.gentoo systemd user
+
+DESCRIPTION="A userspace logging daemon for netfilter/iptables related logging"
+HOMEPAGE="http://netfilter.org/projects/ulogd/index.html"
+SRC_URI="ftp://ftp.netfilter.org/pub/${PN}/${P}.tar.bz2
+		http://www.netfilter.org/projects/${PN}/files/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ia64 ~ppc ~x86"
+IUSE="dbi doc json mysql nfacct +nfct +nflog pcap postgres sqlite -ulog"
+
+RDEPEND="
+	net-firewall/iptables
+	>=net-libs/libnfnetlink-1.0.1
+	dbi? ( dev-db/libdbi )
+	json? ( dev-libs/jansson )
+	nfacct? (
+		>=net-libs/libmnl-1.0.3
+		>=net-libs/libnetfilter_acct-1.0.1
+	)
+	nfct? ( >=net-libs/libnetfilter_conntrack-1.0.2 )
+	nflog? ( >=net-libs/libnetfilter_log-1.0.0 )
+	mysql? ( virtual/mysql )
+	pcap? ( net-libs/libpcap )
+	postgres? ( dev-db/postgresql:= )
+	sqlite? ( dev-db/sqlite:3 )"
+
+DEPEND="${RDEPEND}
+	doc? (
+		app-text/linuxdoc-tools
+		app-text/texlive-core
+		virtual/latex-base
+	)"
+
+PATCHES=( "${FILESDIR}/${P}-remove-db-automagic.patch" )
+
+DOCS=( AUTHORS README TODO )
+DOC_CONTENTS="You must have at least one logging stack enabled to make ulogd work.
+Please edit example configuration located at /etc/ulogd.conf"
+
+pkg_setup() {
+	enewgroup ulogd
+	enewuser ulogd -1 -1 /var/log/ulogd ulogd
+
+	linux-info_pkg_setup
+
+	if kernel_is lt 2 6 14; then
+		die "ulogd2 requires kernel newer than 2.6.14"
+	fi
+
+	if kernel_is lt 2 6 18; then
+		ewarn "You are using kernel older than 2.6.18"
+		ewarn "Some ulogd2 features may be unavailable"
+	fi
+
+	if use nfacct && kernel_is lt 3 3 0; then
+		ewarn "NFACCT input plugin requires kernel newer than 3.3.0"
+	fi
+
+	if use ulog && kernel_is gt 3 17 0; then
+		ewarn "ULOG target was removed since 3.17.0 kernel release"
+		ewarn "Consider enabling NFACCT, NFCT or NFLOG support"
+	fi
+}
+
+src_prepare() {
+	# - make all logs to be kept in a single dir /var/log/ulogd
+	# - place sockets in /run instead of /tmp
+	sed -i \
+		-e 's:var/log:var/log/ulogd:g' \
+		-e 's:tmp:run:g' \
+		ulogd.conf.in || die 'sed on ulogd.conf.in failed'
+
+	append-lfs-flags
+	autotools-utils_src_prepare
+}
+
+src_configure() {
+	local myeconfargs=(
+		$(use_with dbi)
+		$(use_with json jansson)
+		$(use_enable nfacct)
+		$(use_enable nfct)
+		$(use_enable nflog)
+		$(use_with mysql)
+		$(use_with pcap)
+		$(use_with postgres pgsql)
+		$(use_with sqlite)
+		$(use_enable ulog)
+	)
+	autotools-utils_src_configure
+}
+
+src_compile() {
+	autotools-utils_src_compile
+
+	if use doc; then
+		# prevent access violations from generation of bitmap font files
+		export VARTEXFONTS="${T}"/fonts
+		emake -C doc
+	fi
+}
+
+src_install() {
+	autotools-utils_src_install
+	readme.gentoo_create_doc
+	prune_libtool_files --modules
+
+	if use doc; then
+		dohtml doc/${PN}.html
+		dodoc doc/${PN}.dvi doc/${PN}.txt doc/${PN}.ps
+	fi
+
+	use sqlite && dodoc doc/sqlite3.table
+	use mysql && dodoc doc/mysql-*.sql
+	use postgres && dodoc doc/pgsql-*.sql
+	doman ${PN}.8
+
+	insinto /etc
+	doins ${PN}.conf
+	fowners root:ulogd /etc/ulogd.conf
+	fperms 640 /etc/ulogd.conf
+
+	newinitd "${FILESDIR}/${PN}.init" ${PN}
+	systemd_dounit "${FILESDIR}/${PN}.service"
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/${PN}.logrotate" ${PN}
+
+	diropts -o ulogd -g ulogd
+	keepdir /var/log/ulogd
+}
diff --git a/app-arch/cpio/cpio-2.11-r1.ebuild b/app-arch/cpio/cpio-2.11-r1.ebuild
deleted file mode 100644
index a98650bad0da..000000000000
--- a/app-arch/cpio/cpio-2.11-r1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-
-inherit eutils
-
-DESCRIPTION="A file archival tool which can also read and write tar files"
-HOMEPAGE="https://www.gnu.org/software/cpio/cpio.html"
-SRC_URI="mirror://gnu/cpio/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="nls"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-stat.patch #328531
-	epatch "${FILESDIR}"/${P}-no-gets.patch #424974
-	epatch "${FILESDIR}"/${P}-non-gnu-compilers.patch #275295
-}
-
-src_configure() {
-	econf \
-		$(use_enable nls) \
-		--bindir="${EPREFIX}"/bin \
-		--with-rmt="${EPREFIX}"/usr/sbin/rmt
-}
-
-src_install() {
-	default
-	rm "${ED}"/usr/share/man/man1/mt.1 || die
-	rmdir "${ED}"/usr/libexec || die
-}
diff --git a/app-arch/cpio/cpio-2.11-r3.ebuild b/app-arch/cpio/cpio-2.11-r3.ebuild
index d234da80e401..c59414eacd2e 100644
--- a/app-arch/cpio/cpio-2.11-r3.ebuild
+++ b/app-arch/cpio/cpio-2.11-r3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/cpio/${P}.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="nls"
 
 src_prepare() {
@@ -20,6 +20,7 @@ src_prepare() {
 	epatch "${FILESDIR}"/${P}-no-gets.patch #424974
 	epatch "${FILESDIR}"/${P}-non-gnu-compilers.patch #275295
 	epatch "${FILESDIR}"/${P}-security.patch #530512 #536010
+	epatch "${FILESDIR}"/${P}-symlink-bad-length-test.patch #554760
 	eautoreconf
 }
 
diff --git a/app-arch/cpio/cpio-2.11.ebuild b/app-arch/cpio/cpio-2.11.ebuild
deleted file mode 100644
index 3ef42fde5729..000000000000
--- a/app-arch/cpio/cpio-2.11.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="2"
-
-inherit eutils
-
-DESCRIPTION="A file archival tool which can also read and write tar files"
-HOMEPAGE="https://www.gnu.org/software/cpio/cpio.html"
-SRC_URI="mirror://gnu/cpio/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-IUSE="nls"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-stat.patch #328531
-	epatch "${FILESDIR}"/${P}-no-gets.patch #424974
-}
-
-src_configure() {
-	econf \
-		$(use_enable nls) \
-		--bindir=/bin \
-		--with-rmt=/usr/sbin/rmt
-}
-
-src_install() {
-	emake install DESTDIR="${D}" || die
-	dodoc ChangeLog NEWS README
-	rm "${D}"/usr/share/man/man1/mt.1 || die
-	rmdir "${D}"/usr/libexec || die
-}
diff --git a/app-arch/cpio/files/cpio-2.11-symlink-bad-length-test.patch b/app-arch/cpio/files/cpio-2.11-symlink-bad-length-test.patch
new file mode 100644
index 000000000000..7af5fe0f0bc5
--- /dev/null
+++ b/app-arch/cpio/files/cpio-2.11-symlink-bad-length-test.patch
@@ -0,0 +1,39 @@
+https://lists.gnu.org/archive/html/bug-cpio/2015-06/msg00001.html
+https://bugs.gentoo.org/554760
+
+this fix is squashed into 0396591026410f91f7a81b4b150bc7285d9f2278
+(as upstream doesn't seem to understand git)
+
+>From bebf9662c406d1d137a66c567d8748b489d352e7 Mon Sep 17 00:00:00 2001
+From: Pavel Raiskup <address@hidden>
+Date: Thu, 4 Jun 2015 13:27:42 +0200
+Subject: [PATCH] tests: fix expected output for old file
+
+Thanks Victor Rodriguez.  Upstream thread:
+http://lists.gnu.org/archive/html/bug-cpio/2015-06/msg00000.html
+
+* tests/symlink-bad-length.at (STDOUT): Expect the year string
+'2014' is printed and not time because the file in archive is
+older than 6 months.
+* Thanks: Mention Victor.
+---
+ THANKS                      | 1 +
+ tests/symlink-bad-length.at | 2 +-
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/tests/symlink-bad-length.at b/tests/symlink-bad-length.at
+index e1a7093..2cdc692 100644
+--- a/tests/symlink-bad-length.at
++++ b/tests/symlink-bad-length.at
+@@ -57,7 +57,7 @@ cat stderr | grep -v \
+ echo >&2 STDERR
+ ],
+ [0],
+-[-rw-rw-r--   1 10029    10031          13 Nov 25 11:52 FILE
++[-rw-rw-r--   1 10029    10031          13 Nov 25  2014 FILE
+ ],[STDERR
+ ])
+ 
+-- 
+2.1.0
+
diff --git a/app-arch/file-roller/Manifest b/app-arch/file-roller/Manifest
index 39cb4a0f7dae..845d036ddda0 100644
--- a/app-arch/file-roller/Manifest
+++ b/app-arch/file-roller/Manifest
@@ -1,3 +1,3 @@
 DIST file-roller-3.14.2.tar.xz 1387784 SHA256 1815e736715afe8c0f3fbda41c76c07289220d4855345f779c632adf5e074e50 SHA512 92ff42e4fe06e3ea54e71806157fbb95f9e5f247142e9e857f61f61748fd0e1b99a73cfb35fd3ea890c3e19da0d2176af9a017a8eb918eff9ddc0371b09ed11d WHIRLPOOL db4e5519fe298759dbb0f048a597d4cd8ef6610b04eab9f77ee21905726f19e15312cdfc47aa80c2f55490ad4f400e7cac0664e24376b40a340d780e5f0809bf
-DIST file-roller-3.16.2.tar.xz 1409944 SHA256 60897ff24d4822395a227b62811c3b8768b701844961e93303d6d6d9463d7e3f SHA512 ac8c36c3b186bd4eb2ae41fe2e777a15074f09863402a56614a8ad0a89d6e480046fb2566db1be907ea1155ebe4aff6733e32e0f59547435db451757fb3cb15f WHIRLPOOL 3e20ba55d57d69a838f1602322478752eb2f172e8f713c23099edd3446c4b811306d101e23393a8d088382145d4bbf72c66c7ec62796e6eba47e4a4f46fd3ff7
 DIST file-roller-3.16.3.tar.xz 1411360 SHA256 2b3a1111caba26e67b96559a3118a700dbfb6a4c6ad7ebd3e509df227995411c SHA512 999d08d6ea5ae975a026c351c5f216fd503b78eb65e8f417f8afdce152c816f631bd5c6b1a430a5baefa19541e3d718c59beef4773242a6ba087479061ed42ea WHIRLPOOL 2534ae5ad2bb3886d4963bb30a5ef67a82c698f74d64fc0ddc1cac0a37ab258b4fa7e569d031ec1a715a0d3f99b70aae54d16f88d18b95ce7f77654cede4f176
+DIST file-roller-3.16.4.tar.xz 1412224 SHA256 5455980b2c9c7eb063d2d65560ae7ab2e7f01b208ea3947e151680231c7a4185 SHA512 76378e16cd7f37a336b3eb3c6106cf36c2ea6e9209c23175810e2b80dc13a7b62b04cfcdea0b2bf69251baf7b164e85c34d99813cdbfd07433f73aba9c7361ae WHIRLPOOL 0d8736e13b97a4a005ae53bd9885b10c8a7797e10e0d8f4548e4112490ebc3ce91b0e5349b251bdca5d0f392318be7ea4fb324e3399300e362f47b024217849d
diff --git a/app-arch/file-roller/file-roller-3.16.2.ebuild b/app-arch/file-roller/file-roller-3.16.2.ebuild
deleted file mode 100644
index 018e1b2db5b3..000000000000
--- a/app-arch/file-roller/file-roller-3.16.2.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-
-inherit eutils gnome2 readme.gentoo
-
-DESCRIPTION="Archive manager for GNOME"
-HOMEPAGE="http://fileroller.sourceforge.net/ https://wiki.gnome.org/Apps/FileRoller"
-
-LICENSE="GPL-2+ CC-BY-SA-3.0"
-SLOT="0"
-IUSE="nautilus packagekit"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux"
-
-# gdk-pixbuf used extensively in the source
-# cairo used in eggtreemultidnd.c
-# pango used in fr-window
-RDEPEND="
-	>=app-arch/libarchive-3:=
-	>=dev-libs/glib-2.36:2
-	>=dev-libs/json-glib-0.14
-	>=x11-libs/gtk+-3.13.2:3
-	>=x11-libs/libnotify-0.4.3:=
-	sys-apps/file
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf:2
-	x11-libs/pango
-	nautilus? ( >=gnome-base/nautilus-3 )
-	packagekit? ( app-admin/packagekit-base )
-"
-DEPEND="${RDEPEND}
-	dev-util/desktop-file-utils
-	>=dev-util/intltool-0.40.0
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-# eautoreconf needs:
-#	gnome-base/gnome-common
-
-DISABLE_AUTOFORMATTING="yes"
-DOC_CONTENTS="
-${PN} is a frontend for several archiving utilities. If you want a
-particular archive format support, see ${HOMEPAGE}
-and install the relevant package. For example:
-7-zip   - app-arch/p7zip
-ace     - app-arch/unace
-arj     - app-arch/arj
-cpio    - app-arch/cpio
-deb     - app-arch/dpkg
-iso     - app-cdr/cdrtools
-jar,zip - app-arch/zip and app-arch/unzip
-lha     - app-arch/lha
-lzop    - app-arch/lzop
-rar     - app-arch/unrar or app-arch/unar
-rpm     - app-arch/rpm
-unstuff - app-arch/stuffit
-zoo     - app-arch/zoo"
-
-src_prepare() {
-	# Use absolute path to GNU tar since star doesn't have the same
-	# options. On Gentoo, star is /usr/bin/tar, GNU tar is /bin/tar
-	epatch "${FILESDIR}"/${PN}-2.10.3-use_bin_tar.patch
-
-	# File providing Gentoo package names for various archivers
-	cp -f "${FILESDIR}"/3.6.0-packages.match data/packages.match || die
-
-	gnome2_src_prepare
-}
-
-src_configure() {
-	DOCS="AUTHORS ChangeLog HACKING MAINTAINERS NEWS README* TODO"
-	# --disable-debug because enabling it adds -O0 to CFLAGS
-	gnome2_src_configure \
-		--disable-run-in-place \
-		--disable-static \
-		--disable-debug \
-		--enable-magic \
-		--enable-libarchive \
-		$(use_enable nautilus nautilus-actions) \
-		$(use_enable packagekit) \
-		ITSTOOL=$(type -P true)
-}
-
-src_install() {
-	gnome2_src_install
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	readme.gentoo_print_elog
-}
diff --git a/app-arch/file-roller/file-roller-3.16.4.ebuild b/app-arch/file-roller/file-roller-3.16.4.ebuild
new file mode 100644
index 000000000000..8d057e545227
--- /dev/null
+++ b/app-arch/file-roller/file-roller-3.16.4.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+
+inherit eutils gnome2 readme.gentoo
+
+DESCRIPTION="Archive manager for GNOME"
+HOMEPAGE="https://wiki.gnome.org/Apps/FileRoller"
+
+LICENSE="GPL-2+ CC-BY-SA-3.0"
+SLOT="0"
+IUSE="nautilus packagekit"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux"
+
+# gdk-pixbuf used extensively in the source
+# cairo used in eggtreemultidnd.c
+# pango used in fr-window
+RDEPEND="
+	>=app-arch/libarchive-3:=
+	>=dev-libs/glib-2.36:2
+	>=dev-libs/json-glib-0.14
+	>=x11-libs/gtk+-3.13.2:3
+	>=x11-libs/libnotify-0.4.3:=
+	sys-apps/file
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf:2
+	x11-libs/pango
+	nautilus? ( >=gnome-base/nautilus-3 )
+	packagekit? ( app-admin/packagekit-base )
+"
+DEPEND="${RDEPEND}
+	dev-util/desktop-file-utils
+	>=dev-util/intltool-0.40.0
+	dev-util/itstool
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+# eautoreconf needs:
+#	gnome-base/gnome-common
+
+DISABLE_AUTOFORMATTING="yes"
+DOC_CONTENTS="
+${PN} is a frontend for several archiving utilities. If you want a
+particular archive format support, see ${HOMEPAGE}
+and install the relevant package. For example:
+7-zip   - app-arch/p7zip
+ace     - app-arch/unace
+arj     - app-arch/arj
+cpio    - app-arch/cpio
+deb     - app-arch/dpkg
+iso     - app-cdr/cdrtools
+jar,zip - app-arch/zip and app-arch/unzip
+lha     - app-arch/lha
+lzop    - app-arch/lzop
+rar     - app-arch/unrar or app-arch/unar
+rpm     - app-arch/rpm
+unstuff - app-arch/stuffit
+zoo     - app-arch/zoo"
+
+src_prepare() {
+	# File providing Gentoo package names for various archivers
+	cp -f "${FILESDIR}"/3.6.0-packages.match data/packages.match || die
+	gnome2_src_prepare
+}
+
+src_configure() {
+	DOCS="AUTHORS ChangeLog HACKING MAINTAINERS NEWS README* TODO"
+	# --disable-debug because enabling it adds -O0 to CFLAGS
+	gnome2_src_configure \
+		--disable-run-in-place \
+		--disable-static \
+		--disable-debug \
+		--enable-magic \
+		--enable-libarchive \
+		$(use_enable nautilus nautilus-actions) \
+		$(use_enable packagekit)
+}
+
+src_install() {
+	gnome2_src_install
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+	readme.gentoo_print_elog
+}
diff --git a/app-arch/gcab/gcab-0.6.ebuild b/app-arch/gcab/gcab-0.6.ebuild
index 972f89b1b02b..abde83082e64 100644
--- a/app-arch/gcab/gcab-0.6.ebuild
+++ b/app-arch/gcab/gcab-0.6.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://wiki.gnome.org/msitools"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
 IUSE="+introspection vala"
 REQUIRED_USE="vala? ( introspection )"
 
diff --git a/app-arch/lz4/metadata.xml b/app-arch/lz4/metadata.xml
index 1decb7dd7609..a69854a96fb1 100644
--- a/app-arch/lz4/metadata.xml
+++ b/app-arch/lz4/metadata.xml
@@ -5,7 +5,10 @@
 		<email>ryao@gentoo.org</email>
 		<name>Richard Yao</name>
 	</maintainer>
-<use>
-<flag name='valgrind'>Enable usage of dev-util/valgrind in tests</flag>
-</use>
+	<use>
+		<flag name="valgrind">Enable usage of dev-util/valgrind in tests</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">Cyan4973/lz4</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/app-arch/pixz/Manifest b/app-arch/pixz/Manifest
index f5ce1c9665c7..671dcf325be0 100644
--- a/app-arch/pixz/Manifest
+++ b/app-arch/pixz/Manifest
@@ -1 +1 @@
-DIST pixz-1.0.2.tgz 21425 SHA256 af9dac41edd6bf57953471f7fcbd4793810003bf911593ba4c84f7cccb5f74af SHA512 ea3f37b725a0f08e87a6bc0af19522e92bb5b34fad49cfbfcc04e7054f4537cb09c8f3b56abda7f6d27ce64535b158a676a9e69f92141190840bd9ba255961f3 WHIRLPOOL 76b8af8833b9d87718b0a1fa5f596f6aa820b176b17cbde25f7cd0cf1f6b0cdce6c4d7b7c3d82b3f7b018a60bd6ce1ae6f43263875f0eeef5c93ae889856c60e
+DIST pixz-1.0.3.tar.gz 27105 SHA256 49f44520b411315ec4b02891eb77ba6060bdfd77ab5112e9c3e21de581c3384d SHA512 e33e038fc760a51b5bbc52c4faca2b165a5e4546438cd1bf9b41b91d6c8aabad43be367750ac1e7a7007c6d2544ce6dd4662fa60c99c763d96d918eeed002fa7 WHIRLPOOL 29ba24955280051d2d7562aca0b908c1228d0345beb7a6b1e330714ac8c39f6e86a87d60581c91a578950a9dfabbc96c59f64e8afecd2100499c64d4007f5477
diff --git a/app-arch/pixz/files/pixz-1.0.2-lm.patch b/app-arch/pixz/files/pixz-1.0.2-lm.patch
deleted file mode 100644
index 7db039a54a95..000000000000
--- a/app-arch/pixz/files/pixz-1.0.2-lm.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 6c9d6b9020c599f850c0b719cc9c041f1667671b Mon Sep 17 00:00:00 2001
-From: Dave Vasilevsky <dave@vasilevsky.ca>
-Date: Thu, 10 Jan 2013 08:28:06 -0500
-Subject: [PATCH] Fix linking bug (issue 11)
-
----
- Makefile | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Makefile b/Makefile
-index fe605f2..3b27690 100644
---- a/Makefile
-+++ b/Makefile
-@@ -12,7 +12,7 @@ MYCFLAGS = $(patsubst %,-I%/include,$(LIBPREFIX)) $(OPT) -std=gnu99 \
- MYLDFLAGS = $(patsubst %,-L%/lib,$(LIBPREFIX)) $(OPT) -Wall
- 
- THREADS = -lpthread
--LIBADD = $(THREADS) -llzma -larchive
-+LIBADD = $(THREADS) -lm -llzma -larchive
- 
- CC = gcc
- COMPILE = $(CC) $(MYCFLAGS) $(CFLAGS) -c -o
--- 
-1.8.1.2
-
diff --git a/app-arch/pixz/pixz-1.0.2.ebuild b/app-arch/pixz/pixz-1.0.2.ebuild
deleted file mode 100644
index 4d3d7d56816b..000000000000
--- a/app-arch/pixz/pixz-1.0.2.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit toolchain-funcs flag-o-matic eutils
-
-DESCRIPTION="Parallel Indexed XZ compressor"
-HOMEPAGE="https://github.com/vasi/pixz"
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/vasi/pixz.git"
-	inherit git-2
-	KEYWORDS=""
-else
-	SRC_URI="mirror://sourceforge/${PN}/${P}.tgz"
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-LICENSE="BSD-2"
-SLOT="0"
-IUSE="static"
-
-LIB_DEPEND=">=app-arch/libarchive-2.8:=[static-libs(+)]
-	>=app-arch/xz-utils-5[static-libs(+)]"
-RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
-DEPEND="${RDEPEND}
-	static? ( ${LIB_DEPEND} )"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-lm.patch
-}
-
-src_configure() {
-	use static && append-ldflags -static
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" OPT=""
-}
-
-src_install() {
-	dobin pixz
-	doman pixz.1
-	dodoc README TODO
-}
diff --git a/app-arch/pixz/pixz-1.0.3.ebuild b/app-arch/pixz/pixz-1.0.3.ebuild
new file mode 100644
index 000000000000..03ad203c76d6
--- /dev/null
+++ b/app-arch/pixz/pixz-1.0.3.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit toolchain-funcs flag-o-matic autotools
+
+DESCRIPTION="Parallel Indexed XZ compressor"
+HOMEPAGE="https://github.com/vasi/pixz"
+LICENSE="BSD-2"
+SLOT="0"
+IUSE="static"
+
+LIB_DEPEND=">=app-arch/libarchive-2.8:=[static-libs(+)]
+	>=app-arch/xz-utils-5[static-libs(+)]"
+RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
+DEPEND="${RDEPEND}
+	static? ( ${LIB_DEPEND} )
+	app-text/asciidoc"
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/vasi/${PN}.git"
+	inherit git-r3
+	KEYWORDS=""
+else
+	SRC_URI="https://github.com/vasi/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~x86"
+fi
+
+src_prepare() {
+	eautoreconf
+}
+
+src_configure() {
+	use static && append-ldflags -static
+	append-flags -std=gnu99
+	econf
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" OPT=""
+}
+
+src_install() {
+	dobin src/pixz
+	doman src/pixz.1
+	dodoc README.md TODO
+}
diff --git a/app-arch/pixz/pixz-9999.ebuild b/app-arch/pixz/pixz-9999.ebuild
index 57941097e605..03ad203c76d6 100644
--- a/app-arch/pixz/pixz-9999.ebuild
+++ b/app-arch/pixz/pixz-9999.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=5
 
-inherit toolchain-funcs flag-o-matic
+inherit toolchain-funcs flag-o-matic autotools
 
 DESCRIPTION="Parallel Indexed XZ compressor"
 HOMEPAGE="https://github.com/vasi/pixz"
@@ -16,32 +16,34 @@ LIB_DEPEND=">=app-arch/libarchive-2.8:=[static-libs(+)]
 	>=app-arch/xz-utils-5[static-libs(+)]"
 RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
 DEPEND="${RDEPEND}
-	static? ( ${LIB_DEPEND} )"
+	static? ( ${LIB_DEPEND} )
+	app-text/asciidoc"
 
 if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/vasi/pixz.git"
-	inherit git-2
+	EGIT_REPO_URI="https://github.com/vasi/${PN}.git"
+	inherit git-r3
 	KEYWORDS=""
 else
-	SRC_URI="https://github.com/vasi/${PN}/archive/v${PV}.zip -> ${P}.zip"
+	SRC_URI="https://github.com/vasi/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~arm ~x86"
-	DEPEND="${DEPEND} app-text/asciidoc"
 fi
 
+src_prepare() {
+	eautoreconf
+}
+
 src_configure() {
 	use static && append-ldflags -static
+	append-flags -std=gnu99
+	econf
 }
 
 src_compile() {
-	if [[ ${PV} == "9999" ]] ; then
-		emake CC="$(tc-getCC)" OPT="" all pixz.1
-	else
-		emake CC="$(tc-getCC)" OPT="" all
-	fi
+	emake CC="$(tc-getCC)" OPT=""
 }
 
 src_install() {
-	dobin pixz
-	doman pixz.1
-	dodoc README TODO
+	dobin src/pixz
+	doman src/pixz.1
+	dodoc README.md TODO
 }
diff --git a/app-arch/star/star-1.5.3.ebuild b/app-arch/star/star-1.5.3.ebuild
index 9beb4cf3ff4e..79a8d11becd3 100644
--- a/app-arch/star/star-1.5.3.ebuild
+++ b/app-arch/star/star-1.5.3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/s-tar/${P}.tar.bz2"
 
 LICENSE="GPL-2 LGPL-2.1 CDDL-Schily"
 SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ~mips ~ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="acl xattr"
 
 DEPEND="
diff --git a/app-arch/unrar-gpl/files/unrar-gpl-0.0.1-solaris.patch b/app-arch/unrar-gpl/files/unrar-gpl-0.0.1-solaris.patch
new file mode 100644
index 000000000000..f1cf8ef2338a
--- /dev/null
+++ b/app-arch/unrar-gpl/files/unrar-gpl-0.0.1-solaris.patch
@@ -0,0 +1,63 @@
+* grobian@gentoo.org: allow compilation on non glibc hosts by use of an
+                      external library for argp, and check for certain
+                      headers before including them
+
+--- configure.ac
++++ configure.ac
+@@ -14,7 +14,7 @@
+ 
+ # Checks for header files.
+ AC_HEADER_STDC
+-AC_CHECK_HEADERS([limits.h stdlib.h string.h unistd.h])
++AC_CHECK_HEADERS([limits.h stdlib.h string.h unistd.h error.h])
+ 
+ # Checks for typedefs, structures, and compiler characteristics.
+ AC_C_CONST
+@@ -24,6 +24,7 @@
+ AC_FUNC_MALLOC
+ AC_FUNC_REALLOC
+ AC_CHECK_FUNCS([atexit realpath setenv strchr])
++AC_SEARCH_LIBS([argp_usage], [argp])
+ 
+ AC_CONFIG_FILES([Makefile
+                  src/Makefile])
+--- src/unrar.c
++++ src/unrar.c
+@@ -24,7 +24,9 @@
+ #include <stdlib.h>
+ #include <string.h>
+ #include <time.h>
++#ifdef HAVE_ERROR_H
+ #include <error.h>
++#endif
+ #include <errno.h>
+ #include <sys/stat.h>
+ #include <sys/types.h>
+--- src/opts.c
++++ src/opts.c
+@@ -22,7 +22,9 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#ifdef HAVE_ERROR_H
+ #include <error.h>
++#endif
+ #include <argp.h>
+ #include <unistd.h>
+ #include <sys/types.h>
+--- src/opts.h
++++ src/opts.h
+@@ -56,4 +56,13 @@
+ int parse_opts (int argc, char **argv, struct arguments_t *arguments);
+ int compat_parse_opts (int argc, char **argv, struct arguments_t *arguments);
+ 
++#ifndef HAVE_ERROR_H
++#define error(S, E, ...) \
++	fflush(stdout); \
++	fprintf(stderr, "unrar: " __VA_ARGS__); \
++	if (E != 0) fprintf(stderr, ": %s", strerror(E)); \
++	fprintf(stderr, "\n"); \
++	if (S != 0) exit(S);
++#endif
++
+ #endif
diff --git a/app-arch/unrar-gpl/unrar-gpl-0.0.1_p20080417-r2.ebuild b/app-arch/unrar-gpl/unrar-gpl-0.0.1_p20080417-r2.ebuild
new file mode 100644
index 000000000000..be1690d8386a
--- /dev/null
+++ b/app-arch/unrar-gpl/unrar-gpl-0.0.1_p20080417-r2.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+inherit autotools flag-o-matic
+
+DESCRIPTION="Free rar unpacker for old (pre v3) rar files"
+HOMEPAGE="http://home.gna.org/unrar/"
+SRC_URI="mirror://gentoo/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE=""
+DEPEND="!elibc_glibc? ( dev-libs/argp dev-libs/gnulib )"
+
+DOCS="AUTHORS README"
+
+S=${WORKDIR}/${PN/-gpl}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-0.0.1-solaris.patch
+	sed -i configure.ac -e 's|AM_CONFIG_HEADER|AC_CONFIG_HEADERS|g' || die
+	eautoreconf
+
+	if [[ ${CHOST} == *-aix* || ${CHOST} == *-solaris* ]]; then
+		append-cppflags -I"${EPREFIX}"/usr/$(get_libdir)/gnulib/include
+		append-ldflags -L"${EPREFIX}"/usr/$(get_libdir)/gnulib/lib
+		append-libs -lgnu
+	fi
+}
+src_configure() { econf --program-suffix="-gpl"; }
diff --git a/app-arch/unrar/Manifest b/app-arch/unrar/Manifest
index b6401356189a..17e5795fb045 100644
--- a/app-arch/unrar/Manifest
+++ b/app-arch/unrar/Manifest
@@ -1,7 +1,4 @@
-DIST unrarsrc-5.0.14.tar.gz 209707 SHA256 e276ea30a2dc9b8961a4268772e5b6caccaa984664e2d5255a43fcb0f5d59806 SHA512 91b05bd2974e0a1cb8bd8f01ee90637c9c48da71a4ffa74e161de969f17bedbcda0cfbac128d366ffa5065e8195004fe82763a2a1e8628f0016621b1c2d364f2 WHIRLPOOL 665833a5cac5cfddaa6bf852b6820e8447604019286f7f81dce910ad49b8eccf5a4ceab2c1177837e71492ba0c37d2d288b78eb0a531fd47d34cdd8256fd7f19
 DIST unrarsrc-5.1.6.tar.gz 215185 SHA256 3c38eaabc655527244fd0c3ba3beff567ea24aad37d448488643242fd4cf41a5 SHA512 a7a7800ac94850320ce3e2dd24c5005694dd59360b7f3fc7886ef241153e471459b0b9397d1dacbc3adcd19044cdcb8a8a847e16d7b224af149a1455f46fcaa0 WHIRLPOOL bcb9d1b60f42357cb236cbb5e86eb19dd4ed623244036fc1e8fc3759eef3d4002e6ffc90d3cf5b5200e81fe018a2215c0238ee2aac7148e51f130e43ad3e5ea0
-DIST unrarsrc-5.2.1.tar.gz 217272 SHA256 a075a8943412abb2ff5600038330a3d5a8f5a39cbe8e92543cc2c45b6247d05d SHA512 bd89acbed0377f48c88e5b9f6c3701dff1d0a5a65e74e9668690daf0ce0188c74914ed7edb093c0139b0507cf0785790fd8505be7d54204d16bcfced64b4dc29 WHIRLPOOL 6e21e981663eaa14e5d94553cb8fb93db601fe1058f73fc32d3f9a30f399210e71c657d342495d1be18b0e011a5677084242e01b5dff8aa476379bcbae1f7857
-DIST unrarsrc-5.2.2.tar.gz 217481 SHA256 4c134a739467dd0a18bd8aaa48f32750335c842d8a27e11b955ccc33a73ac834 SHA512 ae1d9c3009b9e632bffff54553c0ccc347e59a77236b0a76d9fe603285e17229ce295e718ca6e7658fb050a3145a03dcb2daa6e704cd459d2b7a6eb1a101daa3 WHIRLPOOL 6e3e98be8df13729b89a0c64e775c148ac560c31bb2ff8d61c7ba3ba75421da698e702336604944787eee5e3edc774ee09df62395610c4af0f6262f5870134be
-DIST unrarsrc-5.2.3.tar.gz 217841 SHA256 d249d34541dba39234cdf661ccec80e44334efe50c3ca1d7c51186cd5d26e072 SHA512 94ff765c2aa4ede7d5f2f35c3c35c634b7691559ac9bc978a4f760e22e005422a3a0d36ab09e4c492cea456161cc13dbf256eb2ead23a7976e79bf3cc89903ed WHIRLPOOL dbb7408444078a0ad507fba2d2a483c91a9519193635b25a04c076b92c27c7af9e53481cd89927ca040e03422b5a36e1192f906043706bf9ad2a80f867c27b0f
 DIST unrarsrc-5.2.7.tar.gz 218880 SHA256 ef14757e943787b439fedf2c564c1f38d0db315528a928e0de170860717e2fac SHA512 95e06451e2bec46a12e5b9b1423c3ea31ce86859f8086812d9c442aaa69627f72635a6a8c197b30dbc7e99bbf7c7caaa25d703caecbe03c697cc0e5b7644d638 WHIRLPOOL 49f5492a7441192d96616f892012ca2dac8a94063e806ece3c62bf13d29beb9d2d0368a186c0f0bff8814c9e6af542ba6b447a61683295f560f120ff75507379
 DIST unrarsrc-5.3.2.tar.gz 221786 SHA256 2d8712eed32367b1a404633f230f94f545c1f2ce0552f851266b00c261a786ea SHA512 ea3ee5dd3c15a52f577896bca0d5136c9a6e76a5552d6f56be519eb59c2cc137aba0dafe53dfb50c768e8e7f2e1c1c067a3e4d0c67383da3ae1da58ed68fe99b WHIRLPOOL 07454ef4e00ad8982cd4658aa35a120d8318b3bc7979360abdb7973855e1d6e78cd28473cf4127aa7673b26c27c7e379e483017f0f29b49b6c65d08271326d05
+DIST unrarsrc-5.3.3.tar.gz 221930 SHA256 099c67a2fdb76e55386e4496d28cf6fd1ffd9ac394b95c46b73926c5f69bd107 SHA512 5dffa77043992b72dab10752c547c30d2ff884a18c8b19ddbbcd711e4a9f7f82020edfeb560bd10122c18296aaf08d27c7c1db4f6b62e3ec2a4cd0c449ec7d52 WHIRLPOOL 8be0c41a1ac81d9e9a16ce6b7cbc3479929ec65df8040a58a91c0c89d9b02a8ccde584e829e6ceea6ffa645939d68998f46627ba7df54942f76595cea8f26aaf
diff --git a/app-arch/unrar/unrar-5.0.14.ebuild b/app-arch/unrar/unrar-5.0.14.ebuild
deleted file mode 100644
index a2af02f07d76..000000000000
--- a/app-arch/unrar/unrar-5.0.14.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit eutils flag-o-matic multilib toolchain-funcs
-
-MY_PN=${PN}src
-
-DESCRIPTION="Uncompress rar files"
-HOMEPAGE="http://www.rarlab.com/rar_add.htm"
-SRC_URI="http://www.rarlab.com/rar/${MY_PN}-${PV}.tar.gz"
-
-LICENSE="unRAR"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="!<=app-arch/unrar-gpl-0.0.1_p20080417"
-
-S=${WORKDIR}/unrar
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-5.0.2-build.patch
-	sed -i \
-		-e "/libunrar/s:.so:$(get_libname ${PV%.*.*}):" \
-		-e "s:-shared:& -Wl,-soname -Wl,libunrar$(get_libname ${PV%.*.*}):" \
-		makefile || die
-}
-
-src_compile() {
-	unrar_make() {
-		emake CXX="$(tc-getCXX)" CXXFLAGS="${CXXFLAGS}" STRIP=true "$@"
-	}
-
-	unrar_make CXXFLAGS+=" -fPIC" lib
-	ln -s libunrar$(get_libname ${PV%.*.*}) libunrar$(get_libname)
-	ln -s libunrar$(get_libname ${PV%.*.*}) libunrar$(get_libname ${PV})
-
-	# The stupid code compiles a lot of objects differently if
-	# they're going into a lib (-DRARDLL) or into the main app.
-	# So for now, we can't link the main app against the lib.
-	unrar_make clean
-	unrar_make
-}
-
-src_install() {
-	dobin unrar
-	dodoc readme.txt
-
-	dolib.so libunrar*
-
-	insinto /usr/include/libunrar${PV%.*.*}
-	doins *.hpp
-	dosym libunrar${PV%.*.*} /usr/include/libunrar
-}
diff --git a/app-arch/unrar/unrar-5.2.1.ebuild b/app-arch/unrar/unrar-5.2.1.ebuild
deleted file mode 100644
index 5e3d2006df93..000000000000
--- a/app-arch/unrar/unrar-5.2.1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit eutils flag-o-matic multilib toolchain-funcs
-
-MY_PN=${PN}src
-
-DESCRIPTION="Uncompress rar files"
-HOMEPAGE="http://www.rarlab.com/rar_add.htm"
-SRC_URI="http://www.rarlab.com/rar/${MY_PN}-${PV}.tar.gz"
-
-LICENSE="unRAR"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND="!<=app-arch/unrar-gpl-0.0.1_p20080417"
-
-S=${WORKDIR}/unrar
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-5.0.2-build.patch
-	epatch "${FILESDIR}"/${PN}-5.2.2-no-auto-clean.patch #528218
-	local sed_args=( -e "/libunrar/s:.so:$(get_libname ${PV%.*.*}):" )
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		sed_args+=( -e "s:-shared:-dynamiclib -install_name ${EPREFIX}/usr/$(get_libdir)/libunrar$(get_libname ${PV%.*.*}):" )
-	else
-		sed_args+=( -e "s:-shared:& -Wl,-soname -Wl,libunrar$(get_libname ${PV%.*.*}):" )
-	fi
-	sed -i "${sed_args[@]}" makefile
-}
-
-src_compile() {
-	unrar_make() {
-		emake CXX="$(tc-getCXX)" CXXFLAGS="${CXXFLAGS}" STRIP=true "$@"
-	}
-
-	unrar_make CXXFLAGS+=" -fPIC" lib
-	ln -s libunrar$(get_libname ${PV%.*.*}) libunrar$(get_libname)
-	ln -s libunrar$(get_libname ${PV%.*.*}) libunrar$(get_libname ${PV})
-
-	# The stupid code compiles a lot of objects differently if
-	# they're going into a lib (-DRARDLL) or into the main app.
-	# So for now, we can't link the main app against the lib.
-	unrar_make clean
-	unrar_make
-}
-
-src_install() {
-	dobin unrar
-	dodoc readme.txt
-
-	dolib.so libunrar*
-
-	insinto /usr/include/libunrar${PV%.*.*}
-	doins *.hpp
-	dosym libunrar${PV%.*.*} /usr/include/libunrar
-}
diff --git a/app-arch/unrar/unrar-5.2.2.ebuild b/app-arch/unrar/unrar-5.2.2.ebuild
deleted file mode 100644
index 1abc1e6075f3..000000000000
--- a/app-arch/unrar/unrar-5.2.2.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit eutils flag-o-matic multilib toolchain-funcs
-
-MY_PN=${PN}src
-
-DESCRIPTION="Uncompress rar files"
-HOMEPAGE="http://www.rarlab.com/rar_add.htm"
-SRC_URI="http://www.rarlab.com/rar/${MY_PN}-${PV}.tar.gz"
-
-LICENSE="unRAR"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND="!<=app-arch/unrar-gpl-0.0.1_p20080417"
-
-S=${WORKDIR}/unrar
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-5.0.2-build.patch
-	epatch "${FILESDIR}"/${PN}-5.2.2-no-auto-clean.patch #528218
-	local sed_args=( -e "/libunrar/s:.so:$(get_libname ${PV%.*.*}):" )
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		sed_args+=( -e "s:-shared:-dynamiclib -install_name ${EPREFIX}/usr/$(get_libdir)/libunrar$(get_libname ${PV%.*.*}):" )
-	else
-		sed_args+=( -e "s:-shared:& -Wl,-soname -Wl,libunrar$(get_libname ${PV%.*.*}):" )
-	fi
-	sed -i "${sed_args[@]}" makefile
-}
-
-src_configure() {
-	mkdir -p build-{lib,bin}
-	printf 'VPATH = ..\ninclude ../makefile' > build-lib/Makefile || die
-	cp build-{lib,bin}/Makefile || die
-}
-
-src_compile() {
-	unrar_make() {
-		emake CXX="$(tc-getCXX)" CXXFLAGS="${CXXFLAGS}" STRIP=true "$@"
-	}
-
-	unrar_make CXXFLAGS+=" -fPIC" -C build-lib lib
-	ln -s libunrar$(get_libname ${PV%.*.*}) build-lib/libunrar$(get_libname)
-	ln -s libunrar$(get_libname ${PV%.*.*}) build-lib/libunrar$(get_libname ${PV})
-
-	unrar_make -C build-bin
-}
-
-src_install() {
-	dobin build-bin/unrar
-	dodoc readme.txt
-
-	dolib.so build-lib/libunrar*
-
-	insinto /usr/include/libunrar${PV%.*.*}
-	doins *.hpp
-	dosym libunrar${PV%.*.*} /usr/include/libunrar
-}
diff --git a/app-arch/unrar/unrar-5.2.3.ebuild b/app-arch/unrar/unrar-5.2.3.ebuild
deleted file mode 100644
index 1abc1e6075f3..000000000000
--- a/app-arch/unrar/unrar-5.2.3.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit eutils flag-o-matic multilib toolchain-funcs
-
-MY_PN=${PN}src
-
-DESCRIPTION="Uncompress rar files"
-HOMEPAGE="http://www.rarlab.com/rar_add.htm"
-SRC_URI="http://www.rarlab.com/rar/${MY_PN}-${PV}.tar.gz"
-
-LICENSE="unRAR"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND="!<=app-arch/unrar-gpl-0.0.1_p20080417"
-
-S=${WORKDIR}/unrar
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-5.0.2-build.patch
-	epatch "${FILESDIR}"/${PN}-5.2.2-no-auto-clean.patch #528218
-	local sed_args=( -e "/libunrar/s:.so:$(get_libname ${PV%.*.*}):" )
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		sed_args+=( -e "s:-shared:-dynamiclib -install_name ${EPREFIX}/usr/$(get_libdir)/libunrar$(get_libname ${PV%.*.*}):" )
-	else
-		sed_args+=( -e "s:-shared:& -Wl,-soname -Wl,libunrar$(get_libname ${PV%.*.*}):" )
-	fi
-	sed -i "${sed_args[@]}" makefile
-}
-
-src_configure() {
-	mkdir -p build-{lib,bin}
-	printf 'VPATH = ..\ninclude ../makefile' > build-lib/Makefile || die
-	cp build-{lib,bin}/Makefile || die
-}
-
-src_compile() {
-	unrar_make() {
-		emake CXX="$(tc-getCXX)" CXXFLAGS="${CXXFLAGS}" STRIP=true "$@"
-	}
-
-	unrar_make CXXFLAGS+=" -fPIC" -C build-lib lib
-	ln -s libunrar$(get_libname ${PV%.*.*}) build-lib/libunrar$(get_libname)
-	ln -s libunrar$(get_libname ${PV%.*.*}) build-lib/libunrar$(get_libname ${PV})
-
-	unrar_make -C build-bin
-}
-
-src_install() {
-	dobin build-bin/unrar
-	dodoc readme.txt
-
-	dolib.so build-lib/libunrar*
-
-	insinto /usr/include/libunrar${PV%.*.*}
-	doins *.hpp
-	dosym libunrar${PV%.*.*} /usr/include/libunrar
-}
diff --git a/app-arch/unrar/unrar-5.3.3.ebuild b/app-arch/unrar/unrar-5.3.3.ebuild
new file mode 100644
index 000000000000..71373bb52655
--- /dev/null
+++ b/app-arch/unrar/unrar-5.3.3.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit eutils flag-o-matic multilib toolchain-funcs
+
+MY_PN=${PN}src
+
+DESCRIPTION="Uncompress rar files"
+HOMEPAGE="http://www.rarlab.com/rar_add.htm"
+SRC_URI="http://www.rarlab.com/rar/${MY_PN}-${PV}.tar.gz"
+
+LICENSE="unRAR"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND="!<=app-arch/unrar-gpl-0.0.1_p20080417"
+
+S=${WORKDIR}/unrar
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-5.0.2-build.patch
+	epatch "${FILESDIR}"/${PN}-5.2.2-no-auto-clean.patch #528218
+	local sed_args=( -e "/libunrar/s:.so:$(get_libname ${PV%.*.*}):" )
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		sed_args+=( -e "s:-shared:-dynamiclib -install_name ${EPREFIX}/usr/$(get_libdir)/libunrar$(get_libname ${PV%.*.*}):" )
+	else
+		sed_args+=( -e "s:-shared:& -Wl,-soname -Wl,libunrar$(get_libname ${PV%.*.*}):" )
+	fi
+	sed -i "${sed_args[@]}" makefile || die
+}
+
+src_configure() {
+	mkdir -p build-{lib,bin}
+	printf 'VPATH = ..\ninclude ../makefile' > build-lib/Makefile || die
+	cp build-{lib,bin}/Makefile || die
+}
+
+src_compile() {
+	unrar_make() {
+		emake CXX="$(tc-getCXX)" CXXFLAGS="${CXXFLAGS}" STRIP=true "$@"
+	}
+
+	unrar_make CXXFLAGS+=" -fPIC" -C build-lib lib
+	ln -s libunrar$(get_libname ${PV%.*.*}) build-lib/libunrar$(get_libname) || die
+	ln -s libunrar$(get_libname ${PV%.*.*}) build-lib/libunrar$(get_libname ${PV}) || die
+
+	unrar_make -C build-bin
+}
+
+src_install() {
+	dobin build-bin/unrar
+	dodoc readme.txt
+
+	dolib.so build-lib/libunrar*
+
+	insinto /usr/include/libunrar${PV%.*.*}
+	doins *.hpp
+	dosym libunrar${PV%.*.*} /usr/include/libunrar
+}
diff --git a/app-backup/bacula/bacula-7.2.0.ebuild b/app-backup/bacula/bacula-7.2.0.ebuild
index a5eb41fe7d57..77a260bd5a69 100644
--- a/app-backup/bacula/bacula-7.2.0.ebuild
+++ b/app-backup/bacula/bacula-7.2.0.ebuild
@@ -143,13 +143,6 @@ src_prepare() {
 	# bug 504370
 	sed -i -e '/Alias=bacula-dir/d' platforms/systemd/bacula-dir.service.in || die
 
-	# Fix tmpfiles config for client-only (no bacula user) install
-	# NOTE: Change only first occurance (user) not second (group)
-	# bug 528398
-	if use bacula-clientonly; then
-		sed -i -e 's/bacula/root/' platforms/systemd/bacula.conf.in || die
-	fi
-
 	# fix bundled libtool (bug 466696)
 	# But first move directory with M4 macros out of the way.
 	# It is only needed by autoconf and gives errors during elibtoolize.
diff --git a/app-backup/deja-dup/deja-dup-34.0.ebuild b/app-backup/deja-dup/deja-dup-34.0.ebuild
index 27102a87e8af..552d59375b11 100644
--- a/app-backup/deja-dup/deja-dup-34.0.ebuild
+++ b/app-backup/deja-dup/deja-dup-34.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://launchpad.net/${PN}/34/${PV}/+download/${P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="nautilus test"
 
 RESTRICT="test"
diff --git a/app-backup/obnam/Manifest b/app-backup/obnam/Manifest
index f3e3ea9f71c1..e6da371294bd 100644
--- a/app-backup/obnam/Manifest
+++ b/app-backup/obnam/Manifest
@@ -1,3 +1,4 @@
 DIST obnam-1.13.tar.gz 361079 SHA256 51684a44352e57b2bc9b019566d210c772a99489da6929899a41937731fc8f24 SHA512 1df7ebac4c7cae9b2809c7fce61edc187c70098d6bb8cfbed4d789b02de7d2ddc7077907bff056beac09cc33ecc7eb5db3b282915707086ae998bba089939819 WHIRLPOOL 12d86d53c3b6a1d1ec35af31192129d31ef569bf188ec029bdebbd88ddd239ca11f4007135fdcd94f645bef7517808641b32ec3565b2ec796364e4f320021372
 DIST obnam-1.14.tar.gz 361431 SHA256 67aca6e3a49f5ef14fe81010136ee90b81048d8bd9a1681ea20e699da227bee9 SHA512 652db41865d724e53abb8e31644c9cd8e583162e7b94c8e569a8efaf40962b7066564f7439066c329ee23f4f453ead46d14348f7dfa5a70e749d169e34aed69a WHIRLPOOL f5f5657be9ff1d80154f9ce63c15a69811474d1a0bd386be837c5432178938eb8939f3de8fae26c47db97d8f07482e86a8b6795d5321a2dc3cf767728513343b
+DIST obnam-1.16.tar.gz 362372 SHA256 4c3e525aeef87f4beba55bd8ab7459e33bc2c14c4fa7fc35b74beafc8beb25d0 SHA512 e495991c7277f6cb121900441a191bab9c58da7cd796afe47b24c62e081b281337a414ec43bac0c117c837e4195d4d8d911aa037280679aaba2b43ae109db085 WHIRLPOOL 942b8ad8e7f1852283eefee5bb371e71a160e65b0430428800dc8253650b7128fe0715786743fe30beaa2a1db84197326c377d30914700f022b177805d254f12
 DIST obnam-1.9.tar.gz 340103 SHA256 7e0182efb16597d63916d052ac36546e7c597ee75ba40ae23b2dc9afbb959f82 SHA512 f170a4223b84d2b26617c412524e9ec6efcf3b7bb7bb1a4bfc7333c138e9b9066658c54da9aa8c41b4ea3c3335da3bcd1c26b911b2cce7eb98eabf52d72af67f WHIRLPOOL 73b72c8fe7bbf2958714ef05dba518839471aea91aa02d60f8015481c30440de985f2db0a610bcf08d29eaa86e074cf7b39e975c3847cb1e78c0adf27d793b31
diff --git a/app-backup/obnam/obnam-1.13.ebuild b/app-backup/obnam/obnam-1.16.ebuild
index cd42b25e8071..cd42b25e8071 100644
--- a/app-backup/obnam/obnam-1.13.ebuild
+++ b/app-backup/obnam/obnam-1.16.ebuild
diff --git a/app-benchmarks/httperf/metadata.xml b/app-benchmarks/httperf/metadata.xml
index 870f412e6dea..82d59e7109d1 100644
--- a/app-benchmarks/httperf/metadata.xml
+++ b/app-benchmarks/httperf/metadata.xml
@@ -14,5 +14,6 @@
 		measurements.</longdescription>
 	<upstream>
 		<remote-id type="google-code">httperf</remote-id>
+		<remote-id type="github">httperf/httperf</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/app-crypt/gcr/gcr-3.16.0.ebuild b/app-crypt/gcr/gcr-3.16.0.ebuild
index 7c01df8b349c..fffe48845fac 100644
--- a/app-crypt/gcr/gcr-3.16.0.ebuild
+++ b/app-crypt/gcr/gcr-3.16.0.ebuild
@@ -16,7 +16,7 @@ LICENSE="GPL-2+ LGPL-2+"
 SLOT="0/1" # subslot = suffix of libgcr-3
 IUSE="debug gtk +introspection vala"
 REQUIRED_USE="vala? ( introspection )"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x86-solaris"
 
 COMMON_DEPEND="
 	>=app-crypt/gnupg-2
diff --git a/app-crypt/gnupg/Manifest b/app-crypt/gnupg/Manifest
index 17fdd2b54952..d467f21c9d93 100644
--- a/app-crypt/gnupg/Manifest
+++ b/app-crypt/gnupg/Manifest
@@ -4,3 +4,4 @@ DIST gnupg-2.0.27.tar.bz2 4424679 SHA256 57646d3e4b919fa1e5c8f1c0cf5fe1215333041
 DIST gnupg-2.0.28.tar.bz2 4435779 SHA256 ce092ee4ab58fd19b9fb34a460c07b06c348f4360dd5dd4886d041eb521a534c SHA512 7e786fe0648d5ea453f9c7524fec4bd7d5eec26d28f723acf3cb2f7ec9c400c339f0926a179411876c3f8e08b06942dcec643dc930caf58239bbd4932f4bd3c1 WHIRLPOOL ccf7427e54a545914e89677618055a114b4c9dc4db48669a2fc726fced98475df4ed27c93bd180f1250d147111ee663c736cdf4e1d8afdc40ed967cdffd0eb66
 DIST gnupg-2.1.6.tar.bz2 4917722 SHA256 5e599ad542199f3bd733eed2b88a539d1b4c3beda2dbab0ff69f1896f52e92fd SHA512 ae8aafe770336c83badf5610fe37f4ddc488786e3604780627893b636161d8407f3fd782538799e2b2a02e31c97468464372017fa52b5d9ed1bd31c85d9b3763 WHIRLPOOL 2136c526242a4e741c0cbc9aec102ba634234efd679d62db9aae3b2ab8fe9f8ad9b8fdb7d1f2d43982e6a072d5f5072d0744d8bb434d61f49ff24e868c902f80
 DIST gnupg-2.1.7.tar.bz2 4918583 SHA256 c18a3776d47fec98892d51d28b6574ef16bf0a25eabb0956231058aaf2e7846e SHA512 7c3efb9bd5d1509a9b2a6264293542b3d5db979bf443754f96d77322a96e18cba2ac6142665459d161eb7222fae44ce5b89eff88dca1c7abf47449fcafd3eb00 WHIRLPOOL da7ef3a02b186736c8d105ca627d2c889781465ecfdb4c4861f8af748a7d68a7c05a106c73bdfe44e7037807deb822c231d615cc1e1fcdd9b01e7632945ac094
+DIST gnupg-2.1.8.tar.bz2 4900705 SHA256 a3b8d01e4690715d42e8f289493c85413766f3fa935e4fe7e5ff5b0f6e2781a3 SHA512 80176fda032c921d3716fba3d3a264f9951464fd578a9d8d60673585efef17e20eec4d026921ab7ab2d7bd4dbf0a2b94a33a58c07acb747eebcb758e42bafd57 WHIRLPOOL 32e2e959363529cfd9ca857f823970b6cdd6497a72515aa9e75c2a680c83acea55a38d8de19b16c7327f92c0ab326e76a37952014b317afe2689c211c0d1965b
diff --git a/app-crypt/gnupg/gnupg-2.0.28.ebuild b/app-crypt/gnupg/gnupg-2.0.28.ebuild
index c3aa1bd635df..3294b5c767d4 100644
--- a/app-crypt/gnupg/gnupg-2.0.28.ebuild
+++ b/app-crypt/gnupg/gnupg-2.0.28.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://gnupg/gnupg/${P}.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="bzip2 doc ldap nls mta readline static selinux smartcard tools usb"
 
 COMMON_DEPEND_LIBS="
diff --git a/app-crypt/gnupg/gnupg-2.1.8.ebuild b/app-crypt/gnupg/gnupg-2.1.8.ebuild
new file mode 100644
index 000000000000..a29666177992
--- /dev/null
+++ b/app-crypt/gnupg/gnupg-2.1.8.ebuild
@@ -0,0 +1,169 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit eutils flag-o-matic toolchain-funcs
+
+DESCRIPTION="The GNU Privacy Guard, a GPL OpenPGP implementation"
+HOMEPAGE="http://www.gnupg.org/"
+MY_P="${P/_/-}"
+SRC_URI="mirror://gnupg/gnupg/${MY_P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~x86"
+IUSE="bzip2 doc +gnutls ldap nls readline static selinux smartcard tools usb"
+
+COMMON_DEPEND_LIBS="
+	dev-libs/npth
+	>=dev-libs/libassuan-2
+	>=dev-libs/libgcrypt-1.6.2[threads]
+	>=dev-libs/libgpg-error-1.17
+	>=dev-libs/libksba-1.0.7
+	>=net-misc/curl-7.10
+	gnutls? ( >=net-libs/gnutls-3.0 )
+	sys-libs/zlib
+	ldap? ( net-nds/openldap )
+	bzip2? ( app-arch/bzip2 )
+	readline? ( sys-libs/readline:= )
+	smartcard? ( usb? ( virtual/libusb:0 ) )
+	"
+COMMON_DEPEND_BINS="app-crypt/pinentry
+		   !app-crypt/dirmngr"
+
+# Existence of executables is checked during configuration.
+DEPEND="${COMMON_DEPEND_LIBS}
+	${COMMON_DEPEND_BINS}
+	static? (
+		>=dev-libs/libassuan-2[static-libs]
+		>=dev-libs/libgcrypt-1.6.2[static-libs]
+		>=dev-libs/libgpg-error-1.17[static-libs]
+		>=dev-libs/libksba-1.0.7[static-libs]
+		dev-libs/npth[static-libs]
+		>=net-misc/curl-7.10[static-libs]
+		sys-libs/zlib[static-libs]
+		bzip2? ( app-arch/bzip2[static-libs] )
+	)
+	nls? ( sys-devel/gettext )
+	doc? ( sys-apps/texinfo )"
+
+RDEPEND="!static? ( ${COMMON_DEPEND_LIBS} )
+	${COMMON_DEPEND_BINS}
+	selinux? ( sec-policy/selinux-gpg )
+	nls? ( virtual/libintl )"
+
+REQUIRED_USE="smartcard? ( !static )"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	epatch_user
+}
+
+src_configure() {
+	local myconf=()
+
+	# 'USE=static' support was requested:
+	# gnupg1: bug #29299
+	# gnupg2: bug #159623
+	use static && append-ldflags -static
+
+	if use smartcard; then
+		myconf+=(
+			--enable-scdaemon
+			$(use_enable usb ccid-driver)
+		)
+	else
+		myconf+=( --disable-scdaemon )
+	fi
+
+	if use elibc_SunOS || use elibc_AIX; then
+		myconf+=( --disable-symcryptrun )
+	else
+		myconf+=( --enable-symcryptrun )
+	fi
+
+	# glib fails and picks up clang's internal stdint.h causing weird errors
+	[[ ${CC} == clang ]] && export gl_cv_absolute_stdint_h=/usr/include/stdint.h
+
+	econf \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
+		--enable-gpg \
+		--enable-gpgsm \
+		--enable-large-secmem \
+		--without-adns \
+		"${myconf[@]}" \
+		$(use_enable bzip2) \
+		$(use_enable gnutls) \
+		$(use_with ldap) \
+		$(use_enable nls) \
+		$(use_with readline) \
+		CC_FOR_BUILD="$(tc-getBUILD_CC)"
+}
+
+src_compile() {
+	default
+
+	if use doc; then
+		cd doc
+		emake html
+	fi
+}
+
+src_install() {
+	default
+
+	use tools && dobin tools/{convert-from-106,gpg-check-pattern} \
+		tools/{gpg-zip,gpgconf,gpgsplit,lspgpot,mail-signed-keys,make-dns-cert}
+
+	emake DESTDIR="${D}" -f doc/Makefile uninstall-nobase_dist_docDATA
+	rm "${ED}"/usr/share/gnupg/help* || die
+
+	dodoc ChangeLog NEWS README THANKS TODO VERSION doc/FAQ doc/DETAILS \
+		doc/HACKING doc/TRANSLATE doc/OpenPGP doc/KEYSERVER doc/help*
+
+	dosym gpg2 /usr/bin/gpg
+	dosym gpgv2 /usr/bin/gpgv
+	echo ".so man1/gpg2.1" > "${ED}"/usr/share/man/man1/gpg.1
+	echo ".so man1/gpgv2.1" > "${ED}"/usr/share/man/man1/gpgv.1
+
+	dodir /etc/env.d
+	echo "CONFIG_PROTECT=/usr/share/gnupg/qualified.txt" >> "${ED}"/etc/env.d/30gnupg
+
+	if use doc; then
+		dohtml doc/gnupg.html/* doc/*.png
+	fi
+}
+
+pkg_postinst() {
+	elog "If you wish to view images emerge:"
+	elog "media-gfx/xloadimage, media-gfx/xli or any other viewer"
+	elog "Remember to use photo-viewer option in configuration file to activate"
+	elog "the right viewer."
+	elog
+
+	if use smartcard; then
+		elog "To use your OpenPGP smartcard (or token) with GnuPG you need one of"
+		use usb && elog " - a CCID-compatible reader, used directly through libusb;"
+		elog " - sys-apps/pcsc-lite and a compatible reader device;"
+		elog " - dev-libs/openct and a compatible reader device;"
+		elog " - a reader device and drivers exporting either PC/SC or CT-API interfaces."
+		elog ""
+		elog "General hint: you probably want to try installing sys-apps/pcsc-lite and"
+		elog "app-crypt/ccid first."
+	fi
+
+	ewarn "Please remember to restart gpg-agent if a different version"
+	ewarn "of the agent is currently used. If you are unsure of the gpg"
+	ewarn "agent you are using please run 'killall gpg-agent',"
+	ewarn "and to start a fresh daemon just run 'gpg-agent --daemon'."
+
+	if [[ -n ${REPLACING_VERSIONS} ]]; then
+		elog "If upgrading from a version prior than 2.1 you might have to re-import"
+		elog "secret keys after restarting the gpg-agent as the new version is using"
+		elog "a new storage mechanism."
+		elog "You can migrate the keys using gpg --import \$HOME/.gnupg/secring.gpg"
+	fi
+}
diff --git a/app-crypt/gpa/Manifest b/app-crypt/gpa/Manifest
index 6a03751b776a..c7c10055ab7e 100644
--- a/app-crypt/gpa/Manifest
+++ b/app-crypt/gpa/Manifest
@@ -1,4 +1,3 @@
 DIST gpa-0.9.4.tar.bz2 730440 SHA256 444de33735cec227f65549ea7bdca4526ead9f464e99903636902ca85f80cfba SHA512 60fd4d49a23d00dd87f3ab025fc2721c4d61fa73710525e7f99921aae52fe192bd909b9041d4664f476862922a4ffaafb691475b2f0d83f8cde7450b6c0aab82 WHIRLPOOL aa366d512bc131b6f0f6e5859805fbad6413a112f4c2dd1752567a075a37f502c4ed0b00dc02235d9f8ffaf93538560d6226db16b253496e873bb08708d3140b
-DIST gpa-0.9.5.tar.bz2 732748 SHA256 55e77c0d34a7e0cef8af9a245af8697779b1cb071fea604dd80f24d78e7f30f3 SHA512 16dbc8ff9c37e435540f5770f8343b2a40ad851b64024459ca356fc33e2bc3a3fe10e626b9bab2a79553ca5eab6097a6619b8551bf04478b6ca63aecf5fa1543 WHIRLPOOL 255f0227507000b62571de6d26e43c86006096da00e8c55390b1b7ae52d0c9af810ff159c108290145f1155b3b2ca5842dd3ae114c63e03a3bf8502fbdcbd096
-DIST gpa-0.9.6.tar.bz2 734881 SHA256 81fa52a6c24f8ec1538145823866b3b9e1f058ae7cb2ae915e3d7037218e3fa7 SHA512 7cf949534483ab8c307fdb0744aa83c8e7e4a36a6e84e3c15e0051c641ba0cfb6d7def1af3511e13d9d3ec137821db4a42c8a6f9bd316b2905d18c0a82b3948c WHIRLPOOL 1f6681481820db48dc2acba572ebd8c00386cd90faf9862a28581bd78f5f2b57e21520552e51a192b39e8ce56439bfbcc808c7002d00f3fc99250b8028f373f7
 DIST gpa-0.9.7.tar.bz2 734750 SHA256 7e8ccb615e8fab15808cedc6fc5f60e284d4fbca8a4a0569aa6219c3ddb617e5 SHA512 59a4e1bc77e1f4f6b8cd160803676dda5d0deb6e49b5c8bf8e4c05fc810e8138a1933b496f214e4e85407dac21d1c034cf43f3fc30633ed74f29221a0f4ea2f3 WHIRLPOOL be47cc166164fb689da2b1f04fb768af607a99917ce11cba7d279d14a899616f3761abe758a61a0218dc956d2c96a10ff002430eb6b571ac822fdc4476e0f337
+DIST gpa-0.9.9.tar.bz2 737975 SHA256 6828d738b9e1d3cce96d2ec9831c09873c4cb2c87ba67a161ef54485192c4334 SHA512 2f239a655d56c95b63f5d9bd96bce19a1b5a41c4d849d7fc4f02b6e74bdc8b2738a9483c50cf28a8ff1c78cde994db45a2eee75585c62c7d0fd16e29e045c3d6 WHIRLPOOL 6aa009b915229c25df830e54551fb9474a413500de7a0a20d0c14567130859054a070b89db5573aa158fd8eda387f0f0a0918e786afb87356e2dc407b3e91f7c
diff --git a/app-crypt/gpa/gpa-0.9.5.ebuild b/app-crypt/gpa/gpa-0.9.5.ebuild
deleted file mode 100644
index 83611ba06265..000000000000
--- a/app-crypt/gpa/gpa-0.9.5.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-DESCRIPTION="The GNU Privacy Assistant (GPA) is a graphical user interface for GnuPG"
-HOMEPAGE="http://gpa.wald.intevation.org"
-SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE_LINGUAS=" ar cs de es fr ja nl pl pt_BR ru sv tr zh_TW"
-IUSE="nls ${IUSE_LINGUAS// / linguas_}"
-
-RDEPEND=">=x11-libs/gtk+-2.10.0:2
-	>=dev-libs/libgpg-error-1.4
-	>=dev-libs/libassuan-1.1.0
-	>=app-crypt/gnupg-2
-	>=app-crypt/gpgme-1.5.0"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )"
-
-src_prepare() {
-	sed -i 's/Application;//' gpa.desktop
-}
-
-src_configure() {
-	econf \
-		--with-gpgme-prefix=/usr \
-		--with-libassuan-prefix=/usr \
-		$(use_enable nls) \
-		GPGKEYS_LDAP="/usr/libexec/gpgkeys_ldap"
-}
diff --git a/app-crypt/gpa/gpa-0.9.6.ebuild b/app-crypt/gpa/gpa-0.9.6.ebuild
deleted file mode 100644
index 83611ba06265..000000000000
--- a/app-crypt/gpa/gpa-0.9.6.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-DESCRIPTION="The GNU Privacy Assistant (GPA) is a graphical user interface for GnuPG"
-HOMEPAGE="http://gpa.wald.intevation.org"
-SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE_LINGUAS=" ar cs de es fr ja nl pl pt_BR ru sv tr zh_TW"
-IUSE="nls ${IUSE_LINGUAS// / linguas_}"
-
-RDEPEND=">=x11-libs/gtk+-2.10.0:2
-	>=dev-libs/libgpg-error-1.4
-	>=dev-libs/libassuan-1.1.0
-	>=app-crypt/gnupg-2
-	>=app-crypt/gpgme-1.5.0"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )"
-
-src_prepare() {
-	sed -i 's/Application;//' gpa.desktop
-}
-
-src_configure() {
-	econf \
-		--with-gpgme-prefix=/usr \
-		--with-libassuan-prefix=/usr \
-		$(use_enable nls) \
-		GPGKEYS_LDAP="/usr/libexec/gpgkeys_ldap"
-}
diff --git a/app-crypt/gpa/gpa-0.9.9.ebuild b/app-crypt/gpa/gpa-0.9.9.ebuild
new file mode 100644
index 000000000000..e15bcb5a7e18
--- /dev/null
+++ b/app-crypt/gpa/gpa-0.9.9.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+DESCRIPTION="The GNU Privacy Assistant (GPA) is a graphical user interface for GnuPG"
+HOMEPAGE="http://gpa.wald.intevation.org"
+SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE_LINGUAS=" ar cs de es fr ja nl pl pt_BR ru sv tr zh_TW"
+IUSE="nls ${IUSE_LINGUAS// / linguas_}"
+
+RDEPEND=">=x11-libs/gtk+-2.10.0:2
+	>=dev-libs/libgpg-error-1.4
+	>=dev-libs/libassuan-1.1.0
+	>=app-crypt/gnupg-2
+	>=app-crypt/gpgme-1.5.0"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )"
+
+src_prepare() {
+	sed -i 's/Application;//' gpa.desktop
+}
+
+src_configure() {
+	econf \
+		--with-gpgme-prefix=/usr \
+		--with-libassuan-prefix=/usr \
+		$(use_enable nls) \
+		GPGKEYS_LDAP="/usr/libexec/gpgkeys_ldap"
+}
diff --git a/app-crypt/gpgme/Manifest b/app-crypt/gpgme/Manifest
index 0dd3131e6b8c..7ea626ff4d44 100644
--- a/app-crypt/gpgme/Manifest
+++ b/app-crypt/gpgme/Manifest
@@ -1 +1,2 @@
 DIST gpgme-1.5.5.tar.bz2 976383 SHA256 0b3d3d5107680c594777aae65882a1ff6dd1ba629a83432e719c8b82a743c207 SHA512 a01b84c1ae2a7c647b2de793fc05d39c4bf4a2d1b7378934e437857823f11ca9e9c1f3b32302d69a3a84d0be1fee1e1c86874355031b8fa6b40f4ad56ecc72ad WHIRLPOOL f3ad4282a254cf1ab8d01184df787a773fa7963a42157da93bee11430263fa86166f12f051e2b11d13be99ce1f0939d565cb02a8fba93ab6afed73ca7b2c0041
+DIST gpgme-1.6.0.tar.bz2 983573 SHA256 b09de4197ac280b102080e09eaec6211d081efff1963bf7821cf8f4f9916099d SHA512 b7ccccc2bac246b0759c8752cadd3e77f03da39711badfc66d0f21cefab3f3b07fe1038611ad9ca1c16a8a48d7e831dcca68d83d052456a4cf794a73e287d41b WHIRLPOOL 4e753156474097dba9db2905954d1754ca408066996a01cbc7266a24654eb7c2323043f40495cc3c227d8eef540eeca47de4c23bb329a2d34604d5a4d3828970
diff --git a/app-crypt/gpgme/gpgme-1.6.0.ebuild b/app-crypt/gpgme/gpgme-1.6.0.ebuild
new file mode 100644
index 000000000000..6c3378917863
--- /dev/null
+++ b/app-crypt/gpgme/gpgme-1.6.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit eutils libtool
+
+DESCRIPTION="GnuPG Made Easy is a library for making GnuPG easier to use"
+HOMEPAGE="http://www.gnupg.org/related_software/gpgme"
+SRC_URI="mirror://gnupg/gpgme/${P}.tar.bz2"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="1/11" # subslot = soname major version
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x64-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="common-lisp static-libs"
+
+DEPEND="app-crypt/gnupg
+	>=dev-libs/libassuan-2.0.2
+	>=dev-libs/libgpg-error-1.11"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-1.1.8-et_EE.patch
+	elibtoolize
+}
+
+src_configure() {
+	econf \
+		--includedir="${EPREFIX}/usr/include/gpgme" \
+		$(use_enable static-libs static)
+}
+
+src_install() {
+	default
+	prune_libtool_files
+
+	if ! use common-lisp; then
+		rm -fr "${ED}usr/share/common-lisp"
+	fi
+}
diff --git a/app-crypt/libsecret/libsecret-0.18.3.ebuild b/app-crypt/libsecret/libsecret-0.18.3.ebuild
index b8e216efa4f3..eee94934ce74 100644
--- a/app-crypt/libsecret/libsecret-0.18.3.ebuild
+++ b/app-crypt/libsecret/libsecret-0.18.3.ebuild
@@ -16,7 +16,7 @@ LICENSE="LGPL-2.1+ Apache-2.0" # Apache-2.0 license is used for tests only
 SLOT="0"
 IUSE="+crypt debug +introspection test vala"
 REQUIRED_USE="vala? ( introspection )"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
 
 RDEPEND="
 	>=dev-libs/glib-2.38:2
diff --git a/app-crypt/pinentry/pinentry-0.9.5.ebuild b/app-crypt/pinentry/pinentry-0.9.5.ebuild
index 5b80f264acc0..ab15d4e688d1 100644
--- a/app-crypt/pinentry/pinentry-0.9.5.ebuild
+++ b/app-crypt/pinentry/pinentry-0.9.5.ebuild
@@ -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="clipboard emacs gtk ncurses qt4 caps gnome-keyring static"
 
 RDEPEND="
diff --git a/app-crypt/seahorse/seahorse-3.16.0-r1.ebuild b/app-crypt/seahorse/seahorse-3.16.0-r1.ebuild
index c6e74f059132..4017ad92f02f 100644
--- a/app-crypt/seahorse/seahorse-3.16.0-r1.ebuild
+++ b/app-crypt/seahorse/seahorse-3.16.0-r1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Seahorse"
 LICENSE="GPL-2+ FDL-1.1+"
 SLOT="0"
 IUSE="debug ldap zeroconf"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 
 COMMON_DEPEND="
 	>=app-crypt/gcr-3.11.91:=
diff --git a/app-crypt/zuluCrypt/Manifest b/app-crypt/zuluCrypt/Manifest
index 40f1b8ea2866..41b8ffb88dc2 100644
--- a/app-crypt/zuluCrypt/Manifest
+++ b/app-crypt/zuluCrypt/Manifest
@@ -1 +1,2 @@
 DIST zuluCrypt-4.7.6.tar.bz2 582120 SHA256 b39533de700608a0d1981eb6818f8e103c948c342ba3de36f2f4a0520664294b SHA512 bcf3dd31997ba7db47df4beae2c1e54d031b9c468517475fb7ea6a73e3cf787aaf87a4fdc3cfbb3e54cc0ed8ea218b92014315e940ecb722e0b748248367a2b7 WHIRLPOOL e4d1ca05ebce4c33a8b849e96917b842a1a0330a57700e94fc3f1d1af6a13bcfca9d2039e58f6b4b9353c14296d9feaf898b3de47c3ccd6cc11517be5f07088f
+DIST zuluCrypt-4.7.7.tar.bz2 550309 SHA256 d832668c646bb93a63e908bd1896def830db304138a17f34eae09dd41b3197d4 SHA512 bca390caacc7ff39b03dce370c2f85da2f52d9de3604713ec2dec6f53b75573163a5db60ca30746f4056def8617a9a93f80026c1833396356c849b10948468f1 WHIRLPOOL 6d54015b8458cd6b4460afc33f14dabe3672bc3aea849230090b0c2a64f37da9777f1e0745e7000be1e05874962f4cc97e284fa8877fa0a1d09b93b71bb5e215
diff --git a/app-crypt/zuluCrypt/zuluCrypt-4.7.7.ebuild b/app-crypt/zuluCrypt/zuluCrypt-4.7.7.ebuild
new file mode 100644
index 000000000000..c0bf1f096d4c
--- /dev/null
+++ b/app-crypt/zuluCrypt/zuluCrypt-4.7.7.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit multilib cmake-utils
+
+DESCRIPTION="Front end to cryptsetup"
+HOMEPAGE="http://mhogomchungu.github.io/zuluCrypt/"
+SRC_URI="https://github.com/mhogomchungu/zuluCrypt/releases/download/${PV}/zuluCrypt-${PV}.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gnome +gui kde udev"
+
+CDEPEND="
+	dev-libs/libgcrypt:0
+	sys-apps/util-linux
+	sys-fs/cryptsetup
+	gnome? ( app-crypt/libsecret )
+	gui? (
+		dev-libs/libpwquality
+		dev-qt/qtcore:4
+		dev-qt/qtgui:4
+		kde? (
+			kde-base/kdelibs:4
+			kde-apps/kwalletd:4
+		)
+	)
+"
+RDEPEND="${CDEPEND}
+	udev? ( virtual/udev )"
+DEPEND="${CDEPEND}
+	virtual/pkgconfig
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use udev UDEVSUPPORT)
+		-DLIB_SUFFIX="$(get_libdir)"
+		$(cmake-utils_use !gnome NOGNOME)
+		$(cmake-utils_use !gui NOGUI)
+		# WITH_PWQUALITY has no effect without gui
+		$(cmake-utils_use gui WITH_PWQUALITY)
+		# KDE has no effect without gui
+		$(usex gui "$(cmake-utils_use !kde NOKDE)" "-DNOKDE=TRUE")
+	)
+
+	cmake-utils_src_configure
+}
diff --git a/app-dicts/gnome-dictionary/gnome-dictionary-3.16.2.ebuild b/app-dicts/gnome-dictionary/gnome-dictionary-3.16.2.ebuild
index 16e270482ab1..20f44b82acec 100644
--- a/app-dicts/gnome-dictionary/gnome-dictionary-3.16.2.ebuild
+++ b/app-dicts/gnome-dictionary/gnome-dictionary-3.16.2.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://live.gnome.org/GnomeUtils"
 LICENSE="GPL-2+ LGPL-2.1+ FDL-1.1+"
 SLOT="0/8" # subslot = suffix of libgdict-1.0.so
 IUSE="+introspection ipv6"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux"
 
 COMMON_DEPEND="
 	>=dev-libs/glib-2.39:2
diff --git a/app-dicts/prime-dict/prime-dict-1.0.0-r2.ebuild b/app-dicts/prime-dict/prime-dict-1.0.0-r2.ebuild
index 187497b66851..970960b8798b 100644
--- a/app-dicts/prime-dict/prime-dict-1.0.0-r2.ebuild
+++ b/app-dicts/prime-dict/prime-dict-1.0.0-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://prime.sourceforge.jp/src/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 hppa ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="alpha amd64 hppa ppc ~ppc64 ~sparc x86"
 IUSE=""
 
 each_ruby_configure() {
diff --git a/app-doc/gnucash-docs/Manifest b/app-doc/gnucash-docs/Manifest
index 8ccee33616b0..9a213e499840 100644
--- a/app-doc/gnucash-docs/Manifest
+++ b/app-doc/gnucash-docs/Manifest
@@ -1 +1,2 @@
 DIST gnucash-docs-2.6.6.tar.gz 58940604 SHA256 64c5e5a9a5b0756f4fc7f631ace6d5bea910acf5b4d5249b9e010575f67004f7 SHA512 11ba613d0df2c8d1a4d107313001371b301db9595adeba6e0157ad258d3d2498e2b7a17f1bd6dc44ae3f6026ea0ed7d5597fde732a78bcf1cd03a835181f8f22 WHIRLPOOL 0a771aed2699b9b846c1b627e6b5018cf73bfb78b43ab6c7ff8d97dcf6fed457d69b56fe059971d0ce4eeeddb752ed2e23e895e9f28b92c0170294cb53215fe5
+DIST gnucash-docs-2.6.7.tar.gz 58975368 SHA256 80b8188675f3202aa0385f005a99d720a96aa380d2689c9c15f9aa7ecb08de7e SHA512 a73692e72f7613bf5f30869db8f8b42cc209af337ffb95327198a153a764ee0427fda12ee89a14ab932b15dfb8a3f8be318f50910e63b0419a13fb1b9773b262 WHIRLPOOL f6365eda03da9f005f4c6b19887dece44ce3893b57e37902ca2c55605755a9bd56ab00b405089631756fd65fba41a07361fd359e3edd8e76c08a7b7fa439e5c0
diff --git a/app-doc/gnucash-docs/gnucash-docs-2.6.7.ebuild b/app-doc/gnucash-docs/gnucash-docs-2.6.7.ebuild
new file mode 100644
index 000000000000..f14b10a2060d
--- /dev/null
+++ b/app-doc/gnucash-docs/gnucash-docs-2.6.7.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+GCONF_DEBUG=no
+
+inherit gnome2
+
+DESCRIPTION="Documentation package for GnuCash"
+HOMEPAGE="http://www.gnucash.org/"
+SRC_URI="mirror://sourceforge/gnucash/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2 FDL-1.1"
+KEYWORDS="amd64 ~ppc ~ppc64 ~x86"
+IUSE="test"
+
+RDEPEND="!<=app-office/gnucash-2.2.1"
+DEPEND="${RDEPEND}
+	>=dev-libs/libxml2-2.5.10
+	dev-libs/libxslt
+	app-text/docbook-xsl-stylesheets
+	app-text/docbook-xml-dtd:4.1.2
+	app-text/rarian
+	test? ( app-text/docbook-xml-dtd:4.4 )
+"
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+	has_version dev-java/fop || elog "You need dev-java/fop to generate pdf files."
+	has_version gnome-extra/yelp || elog "You need gnome-extra/yelp to view the docs."
+}
diff --git a/app-editors/emacs/emacs-24.5.ebuild b/app-editors/emacs/emacs-24.5.ebuild
index 2caef1669094..3996ca29064f 100644
--- a/app-editors/emacs/emacs-24.5.ebuild
+++ b/app-editors/emacs/emacs-24.5.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://gnu/emacs/${P}.tar.xz
 
 LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
 SLOT="24"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="acl alsa aqua athena dbus games gconf gfile gif gnutls gpm gsettings gtk +gtk3 gzip-el hesiod imagemagick +inotify jpeg kerberos libxml2 livecd m17n-lib motif pax_kernel png selinux sound source svg tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm zlib"
 REQUIRED_USE="?? ( aqua X )"
 
diff --git a/app-editors/gedit-plugins/gedit-plugins-3.16.0.ebuild b/app-editors/gedit-plugins/gedit-plugins-3.16.0.ebuild
index 9d530763657a..4d8a1c940ba7 100644
--- a/app-editors/gedit-plugins/gedit-plugins-3.16.0.ebuild
+++ b/app-editors/gedit-plugins/gedit-plugins-3.16.0.ebuild
@@ -14,7 +14,7 @@ DESCRIPTION="Official plugins for gedit"
 HOMEPAGE="https://wiki.gnome.org/Apps/Gedit/ShippedPlugins"
 
 LICENSE="GPL-2+"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 SLOT="0"
 
 IUSE_plugins="charmap git terminal zeitgeist"
diff --git a/app-editors/gedit/Manifest b/app-editors/gedit/Manifest
index e1dd10a66ca5..db688455e48e 100644
--- a/app-editors/gedit/Manifest
+++ b/app-editors/gedit/Manifest
@@ -1,2 +1,3 @@
 DIST gedit-3.14.3.tar.xz 2875192 SHA256 cd6c9f556ec12001e4b250091a1d7405cd807cce7fe767bc89ed2c25aa96a319 SHA512 2237ad697161cff5755336775cf128136d7cefdece0d335246735b3ae1b9d2cadb29ae36be2000cd7fb02d6a4187aac1d2ff7935bec5c64b5b880fe84f330b01 WHIRLPOOL 39ffa7ece00f712f052c78107b3f95cd0e3a744932d22f5e946141b3bc8954643ae091f75508d9761761fb041a18b43e50b23ed1c0ff3d7ac0bdce9464cc71cd
 DIST gedit-3.16.2.tar.xz 2905916 SHA256 db60a9408711b00f3780f5f5b657e9f44722c88c683ba6e9f2b4885631f429aa SHA512 511d70099eeb857a3e25d789c44302756d108ff84634c4c7386e1e1de8dd08834cf57991311c69aa81da23510027523bc7cde313b689feb1a8e08eb01b017648 WHIRLPOOL ce51f82265664839d686ea91388f8dc906c5dcf666032f4073792832aabfa9a04dbd99e4aeef5cfd733a753eaf63daaa5b55dce3c67bb0cdb01d96595d36b4f9
+DIST gedit-3.16.3.tar.xz 2924392 SHA256 c28df44a29ee5707441f89e94b513079d709111afec4bd4b079a1dff0242cdb2 SHA512 479370c25be4b8c6f2fc77628e835b763194fdc9ce1858bb8fe4641964e6911db573b28300d8cc5519a5e4ddef980d28c224a315c3879770265be9328b70e925 WHIRLPOOL 604690b148f2af10358c1d567521e49a406594c390d8b67a22a4879ce1d70398d0de43865cc3874d29b51d9c86103fa765b5cde181008172e5617333b1ab3b9e
diff --git a/app-editors/gedit/gedit-3.16.3.ebuild b/app-editors/gedit/gedit-3.16.3.ebuild
new file mode 100644
index 000000000000..fd64d570391c
--- /dev/null
+++ b/app-editors/gedit/gedit-3.16.3.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes" # plugins are dlopened
+PYTHON_COMPAT=( python3_{3,4} )
+VALA_MIN_API_VERSION="0.26"
+VALA_USE_DEPEND="vapigen"
+
+inherit eutils gnome2 multilib python-r1 vala virtualx
+
+DESCRIPTION="A text editor for the GNOME desktop"
+HOMEPAGE="https://wiki.gnome.org/Apps/Gedit"
+
+LICENSE="GPL-2+ CC-BY-SA-3.0"
+SLOT="0"
+
+IUSE="+introspection +python spell vala"
+# python-single-r1 would request disabling PYTHON_TARGETS on libpeas
+# we need to fix that
+REQUIRED_USE="
+	python? ( introspection )
+	python? ( ^^ ( $(python_gen_useflags '*') ) )
+"
+
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux"
+
+# X libs are not needed for OSX (aqua)
+COMMON_DEPEND="
+	>=dev-libs/libxml2-2.5.0:2
+	>=dev-libs/glib-2.40:2[dbus]
+	>=x11-libs/gtk+-3.16:3[introspection?]
+	>=x11-libs/gtksourceview-3.16:3.0[introspection?]
+	>=dev-libs/libpeas-1.7.0[gtk]
+
+	gnome-base/gsettings-desktop-schemas
+	gnome-base/gvfs
+
+	x11-libs/libX11
+
+	net-libs/libsoup:2.4
+
+	introspection? ( >=dev-libs/gobject-introspection-0.9.3:= )
+	python? (
+		${PYTHON_DEPS}
+		dev-python/pycairo[${PYTHON_USEDEP}]
+		>=dev-python/pygobject-3:3[cairo,${PYTHON_USEDEP}]
+		dev-libs/libpeas[${PYTHON_USEDEP}] )
+	spell? (
+		>=app-text/enchant-1.2:=
+		>=app-text/iso-codes-0.35 )
+"
+RDEPEND="${COMMON_DEPEND}
+	x11-themes/gnome-icon-theme-symbolic
+"
+DEPEND="${COMMON_DEPEND}
+	${vala_depend}
+	app-text/docbook-xml-dtd:4.1.2
+	>=app-text/scrollkeeper-0.3.11
+	dev-libs/libxml2:2
+	>=dev-util/gtk-doc-am-1
+	>=dev-util/intltool-0.50.1
+	dev-util/itstool
+	>=sys-devel/gettext-0.18
+	virtual/pkgconfig
+"
+# yelp-tools, gnome-common needed to eautoreconf
+
+pkg_setup() {
+	use python && [[ ${MERGE_TYPE} != binary ]] && python_setup
+}
+
+src_prepare() {
+	vala_src_prepare
+	gnome2_src_prepare
+}
+
+src_configure() {
+	DOCS="AUTHORS BUGS ChangeLog MAINTAINERS NEWS README"
+
+	gnome2_src_configure \
+		--disable-deprecations \
+		--enable-updater \
+		--enable-gvfs-metadata \
+		$(use_enable introspection) \
+		$(use_enable spell) \
+		$(use_enable python) \
+		$(use_enable vala)
+}
+
+src_test() {
+	# FIXME: this should be handled at eclass level
+	"${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/data" || die
+
+	unset DBUS_SESSION_BUS_ADDRESS
+	GSETTINGS_SCHEMA_DIR="${S}/data" Xemake check
+}
+
+src_install() {
+	local args=()
+	# manually set pyoverridesdir due to bug #524018 and AM_PATH_PYTHON limitations
+	use python && args+=( pyoverridesdir="$(python_get_sitedir)/gi/overrides" )
+
+	gnome2_src_install "${args[@]}"
+}
diff --git a/app-editors/gvim/gvim-7.4.769.ebuild b/app-editors/gvim/gvim-7.4.769.ebuild
index b0b8f90058e3..d2f5edadd112 100644
--- a/app-editors/gvim/gvim-7.4.769.ebuild
+++ b/app-editors/gvim/gvim-7.4.769.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} == 9999* ]] ; then
 else
 	SRC_URI="https://github.com/vim/vim/archive/v${MY_PV}.tar.gz -> vim-${PV}.tar.gz
 		https://dev.gentoo.org/~radhermit/vim/vim-7.4.542-gentoo-patches.tar.bz2"
-	KEYWORDS="alpha amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+	KEYWORDS="alpha amd64 arm hppa ~ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 fi
 
 DESCRIPTION="GUI version of the Vim text editor"
diff --git a/app-editors/joe/Manifest b/app-editors/joe/Manifest
index 80e17f3c8ca7..cf03925a59b5 100644
--- a/app-editors/joe/Manifest
+++ b/app-editors/joe/Manifest
@@ -1,2 +1,3 @@
 DIST joe-3.7.tar.gz 696036 SHA256 cae456e1ad5a8c1d3c94920a3416c2347277739b260e3494d3bc0f2b9b73106f SHA512 1b6ac65309156c422c73194b82c1f855006bb7a73dec957c3a25f68a51e91e6a2a84df9d5d538f08c8900fe0eb0e2b41ef0936437859d5dae5ffc45005e8a90f WHIRLPOOL 4ee918936eb1a902fd4c6e60061180dfef215a57fb0700a5e078cb9db9717eea30094388a472a14f031d80267a5e0ba290360ed89fe44d89269dfddb4e9a31d1
 DIST joe-4.0.tar.gz 838783 SHA256 c556adff77fd97bf1b86198de6cb82e0b92cda18579c4fef6c83b608d2ed2915 SHA512 6d88ec9d4fd51f768dd35f74cc296f6e6469a3b36ff7aa0306796577d3a27c2719e8580483ab6184ffa3d00c6ec81d53548b501ae231845e4c0640988b0e7a31 WHIRLPOOL 029af0a45bb66008b2a40bd8bd8220741839c31e8d7d51bf428f244e55e6c8ee50138c06b8ebad181c36289c6d7c0c897580e7f192492a3376b3c68efbc6c214
+DIST joe-4.1.tar.gz 1292957 SHA256 816211b2bd951f792de3602afd74ea4b51612fffdd9bc24a7808660053fef6db SHA512 f6fd9d87c94a4f47586d7a81cccbfd6bfdace2357e3c579f5abfb54117dd95cadcd1783e281874868da6f0a8853327fff5bb3876f86a031f45afb13db45f7377 WHIRLPOOL e5d536fbed434800a22fd38034d86928a08e4efacc0fa708bad7631a84d18d005c58a7de4347aa7ec21e5f2736a13e63399c3ef5c7949ab9602dd144718e5fcc
diff --git a/app-editors/joe/joe-4.1.ebuild b/app-editors/joe/joe-4.1.ebuild
new file mode 100644
index 000000000000..8328d68f3309
--- /dev/null
+++ b/app-editors/joe/joe-4.1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils
+
+DESCRIPTION="A free ASCII-Text Screen Editor for UNIX"
+HOMEPAGE="http://sourceforge.net/projects/joe-editor/"
+SRC_URI="mirror://sourceforge/joe-editor/${P}.tar.gz"
+
+LICENSE="GPL-1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
+IUSE="xterm"
+
+DEPEND=">=sys-libs/ncurses-5.2-r2"
+RDEPEND="xterm? ( >=x11-terms/xterm-239 )"
+
+DOCS=( README.md NEWS.md docs/hacking.md docs/man.md )
+
+src_prepare() {
+	# Enable xterm mouse support in the rc files
+	if use xterm; then
+		cd "${S}"/rc
+		for i in *rc*.in; do
+			sed -e 's/^ -\(mouse\|joexterm\)/-\1/' -i "${i}" || die "sed failed"
+		done
+	fi
+}
+
+src_configure() {
+	econf \
+		--docdir="/usr/share/doc/${PF}"
+}
+
+pkg_postinst() {
+	if use xterm; then
+		elog "To enable full xterm clipboard you need to set the allowWindowOps"
+		elog "resources to true. This is usually found in /etc/X11/app-defaults/XTerm"
+		elog "This is false by default due to potential security problems on some"
+		elog "architectures (see bug #91453)."
+	fi
+}
diff --git a/app-editors/latexila/Manifest b/app-editors/latexila/Manifest
index 637ae354f647..6a684001a46d 100644
--- a/app-editors/latexila/Manifest
+++ b/app-editors/latexila/Manifest
@@ -1,2 +1,3 @@
 DIST latexila-3.14.4.tar.xz 1139644 SHA256 8e087040260a6eb777382c55fd3d1260f1686453052ccdf1a5b9e0e4178c4d62 SHA512 88b3f2c8d931e49370614021f69e0711b3e78b1e49ad99601ea70f570c551b4f89558fdc3f5abaf68adba4e819a542ba3159c830b134c7e9679fbeffe8f3934d WHIRLPOOL 2d2925470e2fd27fa79b553ec8e1e9442c7817df36a907c47ace3b6b33d58977ae571aec6cc3f787e6de98c679f355592add59e3bf2e04d7090d75d8aae17068
 DIST latexila-3.16.1.tar.xz 1059308 SHA256 ab2d769546e10c86670e86271024c023c0a87f1b72856955c1883416a9f333f0 SHA512 b6854a301006c04c6f87cc3e9d5fc167ac7b3e0c7ac11fdce3dd6a0dca74d69b3ec51130feb8a8af505b50f6f85cb0684f7102bf5cc976fe1f845dd604863314 WHIRLPOOL 30ce694b1ddb5d71932679d31fb890aca0afc71634d6cdf744faddd792f47589c7593c43b6476b932002d70f74f4c738cef38f38fc6caa0452b1e13b205c57cc
+DIST latexila-3.16.2.tar.xz 1058776 SHA256 5ad20a2acdb8c93dea5aa175a219e62efe5f4a7ffb67bc52ff6faf0c6f42bad3 SHA512 d9d5c90374d5aa9b2599f90565dde9da1c4dc7713b7be8ffbfac71b5797124142ef46811660f14edfd278ec9d3f3b6b0c56ef325201fb85caf3b7322577e40fc WHIRLPOOL 3fde6abc4979dd9a40cc019e30c8b0e0c55c97fa3a4670d073d1ca6f662342b54923ea263246a169e8944fa3aaba358d6881629e20c6e949b1287e9328c1cdc6
diff --git a/app-editors/latexila/latexila-3.16.2.ebuild b/app-editors/latexila/latexila-3.16.2.ebuild
new file mode 100644
index 000000000000..9693d54c540c
--- /dev/null
+++ b/app-editors/latexila/latexila-3.16.2.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+VALA_MIN_API_VERSION="0.26"
+VALA_USE_DEPEND="vapigen"
+
+inherit gnome2 vala
+
+DESCRIPTION="Integrated LaTeX environment for GNOME"
+HOMEPAGE="https://wiki.gnome.org/Apps/LaTeXila"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 ~x86"
+IUSE="+introspection +latexmk rubber"
+
+COMMON_DEPEND="$(vala_depend)
+	app-text/enchant
+	>=app-text/gtkspell-3.0.4:3
+	>=dev-libs/glib-2.40:2[dbus]
+	>=dev-libs/libgee-0.10:0.8=
+	gnome-base/gsettings-desktop-schemas
+	>=x11-libs/gtk+-3.14:3
+	>=x11-libs/gtksourceview-3.16:3.0
+	x11-libs/gdk-pixbuf:2
+	x11-libs/libX11
+	x11-libs/pango
+	introspection? ( >=dev-libs/gobject-introspection-1.30.0:= )
+"
+RDEPEND="${COMMON_DEPEND}
+	virtual/latex-base
+	x11-themes/hicolor-icon-theme
+	latexmk? ( dev-tex/latexmk )
+	rubber? ( dev-tex/rubber )
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-util/gtk-doc-am-1.14
+	>=dev-util/intltool-0.50.1
+	dev-util/itstool
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	DOCS="AUTHORS HACKING NEWS README"
+	gnome2_src_prepare
+	vala_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure \
+		$(use_enable introspection)
+}
diff --git a/app-editors/vim-core/vim-core-7.4.769.ebuild b/app-editors/vim-core/vim-core-7.4.769.ebuild
index a0de48a0b269..4a217f96fe04 100644
--- a/app-editors/vim-core/vim-core-7.4.769.ebuild
+++ b/app-editors/vim-core/vim-core-7.4.769.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == 9999* ]] ; then
 else
 	SRC_URI="https://github.com/vim/vim/archive/v${MY_PV}.tar.gz -> vim-${PV}.tar.gz
 		https://dev.gentoo.org/~radhermit/vim/vim-7.4.542-gentoo-patches.tar.bz2"
-	KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="vim and gvim shared files"
diff --git a/app-editors/vim/vim-7.4.769.ebuild b/app-editors/vim/vim-7.4.769.ebuild
index 832f4bbd4b80..42748be5f837 100644
--- a/app-editors/vim/vim-7.4.769.ebuild
+++ b/app-editors/vim/vim-7.4.769.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} == 9999* ]] ; then
 else
 	SRC_URI="https://github.com/vim/vim/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz
 		https://dev.gentoo.org/~radhermit/vim/vim-7.4.542-gentoo-patches.tar.bz2"
-	KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="Vim, an improved vi-style text editor"
diff --git a/app-emacs/google-c-style/metadata.xml b/app-emacs/google-c-style/metadata.xml
index 1d4cd56fb85b..f662d74d64b6 100644
--- a/app-emacs/google-c-style/metadata.xml
+++ b/app-emacs/google-c-style/metadata.xml
@@ -3,4 +3,7 @@
 <pkgmetadata>
 	<herd>chromium</herd>
 	<herd>emacs</herd>
+	<upstream>
+		<remote-id type="github">google/styleguide</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/app-emacs/yasnippet/metadata.xml b/app-emacs/yasnippet/metadata.xml
index 6d71c2e5287f..be75e8ba45aa 100644
--- a/app-emacs/yasnippet/metadata.xml
+++ b/app-emacs/yasnippet/metadata.xml
@@ -6,5 +6,6 @@
   and more powerful than smart-snippet.</longdescription>
 	<upstream>
 		<remote-id type="google-code">yasnippet</remote-id>
+		<remote-id type="github">capitaomorte/yasnippet</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/app-emulation/libvirt-glib/libvirt-glib-0.2.2.ebuild b/app-emulation/libvirt-glib/libvirt-glib-0.2.2.ebuild
index a5ccb744bdff..0ce6e0862ab3 100644
--- a/app-emulation/libvirt-glib/libvirt-glib-0.2.2.ebuild
+++ b/app-emulation/libvirt-glib/libvirt-glib-0.2.2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="ftp://libvirt.org/libvirt/glib/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="+introspection python +vala"
 REQUIRED_USE="
 	python? ( ${PYTHON_REQUIRED_USE} )
diff --git a/app-emulation/libvirt/files/libvirtd.confd-r5 b/app-emulation/libvirt/files/libvirtd.confd-r5
index 3463cb95f275..c326531d469f 100644
--- a/app-emulation/libvirt/files/libvirtd.confd-r5
+++ b/app-emulation/libvirt/files/libvirtd.confd-r5
@@ -6,6 +6,11 @@
 # for libvirtd, you may override this. Or if you only use libvirtd locally.
 rc_need="net"
 
+# The termination timeout (start-stop-daemon parameter "retry") ensures
+# that the service will be terminated within a given time (25 + 5 seconds
+# per default) when you are stopping the service.
+#LIBVIRTD_TERMTIMEOUT="TERM/25/KILL/5"
+
 # LIBVIRTD_OPTS
 # You may want to add '--listen' to have libvirtd listen for tcp/ip connections
 # if you want to use libvirt for remote control
diff --git a/app-emulation/libvirt/files/libvirtd.init-r15 b/app-emulation/libvirt/files/libvirtd.init-r15
index 7b95bd866015..0c529bd7e78b 100644
--- a/app-emulation/libvirt/files/libvirtd.init-r15
+++ b/app-emulation/libvirt/files/libvirtd.init-r15
@@ -1,35 +1,38 @@
 #!/sbin/runscript
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
 
 description="Virtual Machine Management daemon (libvirt)"
 
+LIBVIRTD_OPTS=${LIBVIRTD_OPTS:-"${LIBVIRTD_OPTS}"}
+LIBVIRTD_TIMEOUT=${LIBVIRTD_TERMTIMEOUT:-"TERM/25/KILL/5"}
+
+command="/usr/sbin/libvirtd"
+command_args="-d ${LIBVIRTD_OPTS}"
+start_stop_daemon_args="--env KRB5_KTNAME=/etc/libvirt/krb5.tab"
+pidfile="/var/run/libvirtd.pid"
+retry="${LIBVIRTD_TERMTIMEOUT}"
+
 depend() {
 	USE_FLAG_FIREWALLD
 	use USE_FLAG_AVAHI USE_FLAG_ISCSI USE_FLAG_RBD dbus virtlockd
 	after ntp-client ntpd nfs nfsmount portmap rpc.statd iptables ip6tables ebtables corosync sanlock cgconfig xenconsoled
 }
 
-start() {
+start_pre() {
 	# Test configuration directories in /etc/libvirt/ to be either not
 	# present or a directory, i.e. not a regular file, bug #532892
+	local has_errors=0
+	ebegin "Checking for suitable directories in \"/etc/libvirt\""
+
 	for dir in lxc nwfilter qemu storage; do
 		if [ -f /etc/libvirt/$dir ]; then
+			has_errors=1
 			eerror "/etc/libvirt/$dir was created as a regular file. It must be either"
 			eerror "a directory or not present for libvirtd to start up successfully."
-			return 1
 		fi
 	done
 
-	ebegin "Starting libvirtd"
-	start-stop-daemon --start \
-		--env KRB5_KTNAME=/etc/libvirt/krb5.tab \
-		--exec /usr/sbin/libvirtd --pidfile=/var/run/libvirtd.pid \
-		-- -d ${LIBVIRTD_OPTS}
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping libvirtd without shutting down your VMs"
-	start-stop-daemon --stop --quiet --exec \
-		/usr/sbin/libvirtd --pidfile=/var/run/libvirtd.pid
-	eend $?
+	eend ${has_errors} "Please correct the error(s) above"
 }
diff --git a/app-emulation/libvirt/libvirt-1.2.18-r1.ebuild b/app-emulation/libvirt/libvirt-1.2.18-r1.ebuild
index ca50ed1199bc..565007a10455 100644
--- a/app-emulation/libvirt/libvirt-1.2.18-r1.ebuild
+++ b/app-emulation/libvirt/libvirt-1.2.18-r1.ebuild
@@ -28,7 +28,7 @@ else
 	SRC_URI+=" ${BACKPORTS:+
 		https://dev.gentoo.org/~cardoe/distfiles/${P}-${BACKPORTS}.tar.xz
 		https://dev.gentoo.org/~tamiko/distfiles/${P}-${BACKPORTS}.tar.xz}"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 	SLOT="0/${PV}"
 fi
 S="${WORKDIR}/${P%_rc*}"
diff --git a/app-emulation/libvirt/libvirt-1.2.19.ebuild b/app-emulation/libvirt/libvirt-1.2.19.ebuild
index a94cddf04b3b..55fb80d79933 100644
--- a/app-emulation/libvirt/libvirt-1.2.19.ebuild
+++ b/app-emulation/libvirt/libvirt-1.2.19.ebuild
@@ -28,7 +28,7 @@ else
 	SRC_URI+=" ${BACKPORTS:+
 		https://dev.gentoo.org/~cardoe/distfiles/${P}-${BACKPORTS}.tar.xz
 		https://dev.gentoo.org/~tamiko/distfiles/${P}-${BACKPORTS}.tar.xz}"
-	KEYWORDS="" # "~amd64 ~x86"
+	KEYWORDS="~amd64 ~x86"
 	SLOT="0/${PV}"
 fi
 S="${WORKDIR}/${P%_rc*}"
@@ -126,8 +126,9 @@ DOC_CONTENTS="Important: The openrc libvirtd init script is now broken up into t
 separate services: libvirtd, that solely handles the daemon, and
 libvirt-guests, that takes care of clients during shutdown/restart of the
 host. In order to reenable client handling, edit /etc/conf.d/libvirt-guests
-and enable the service:
+and enable the service and start it:
 	$ rc-update add libvirt-guests
+	$ service libvirt-guests start
 
 For the basic networking support (bridged and routed networks) you don't
 need any extra software. For more complex network modes including but not
diff --git a/app-emulation/lxc/Manifest b/app-emulation/lxc/Manifest
index cc4a5655230a..fe67c91f82dd 100644
--- a/app-emulation/lxc/Manifest
+++ b/app-emulation/lxc/Manifest
@@ -3,3 +3,4 @@ DIST lxc-1.0.7.tar.gz 564985 SHA256 a0b1b09592e076e270dcb3ba004616d9ac3147f9de0b
 DIST lxc-1.1.0.tar.gz 592543 SHA256 216e806f7e18e5bfbc782493a9e44fc255f24a587d6faee94cda848a0b949155 SHA512 160da88d6dc96cd9f0679f948bfed057c024adcd459fa4b79e872d12284fa3774ac33a13923c6e150072886a371ccfcdf7ab2c4587efa7f6175fc91a67525c4a WHIRLPOOL 2caf81418850ea8b1ecf25b25e799895563ecf1819f32310fcbb4efe88f711eafe2bcb16a0d3b8ee59072c770a5520b4df90a5962215b932e68a4705c4a56d61
 DIST lxc-1.1.1.tar.gz 594112 SHA256 64951fdd39df2bea083bb5a8ac35a7390daf2dc7753d8fce33138129892ef672 SHA512 8af3fb43127b57de4e252baf5cb387270955062ff3838e4807a93d04520ca23f0457913bc8274da51b20961fb08650f9b976a84d395785aca2b2d300b285d549 WHIRLPOOL 4f28b976dd6710705d6361b9a45fef9a1265dffef0cedd0fb304f2820585ece3e2bb64d4c5289d444b3ab55bac265850943c63cdf258c40c45c99176a788ca2a
 DIST lxc-1.1.2.tar.gz 597158 SHA256 f22fcf2659ca98dfe864e632374de98c42cdf465d0c694834b6f6098a3cb8519 SHA512 7c4c9b5418321eedcd37a3f5c2c99ff227de48f672cabd1722a74722077d33badb038675ec95fc3e338eaf2b06972c4ffb2e11f36347587ef71a95fad5b66daa WHIRLPOOL 2b657a9195b6357a367f6aa7609952d9162aae7d7be3f2c5e4cda4b2e81f2c7411835e75af5740cca053d445a3cf7dc7457f9e76ca866de7265e99ed42c744e9
+DIST lxc-1.1.3.tar.gz 599889 SHA256 b75fb8e376d3313e152f31fb7372b68f33a953a12191a39de4cded04fff94300 SHA512 cafa4fbe4fe23b8c0b98007a79f20899c4a3b98c51d797b9c16e38dfec1eee5a513b58621308fe6551707d38028d9e5bd78ade8822691ffe4a7a369b10a48dda WHIRLPOOL 04ad57d8b189ab089b27adad8e511dcc2e5c563505f8134323ac9d738283bd5d0d929ebadeb69cd49ea68ea3e182f22c72590505cbf6f9d8438112e46909e1b5
diff --git a/app-emulation/lxc/files/lxc-1.1.3-bash-completion.patch b/app-emulation/lxc/files/lxc-1.1.3-bash-completion.patch
new file mode 100644
index 000000000000..3bcb40c65a65
--- /dev/null
+++ b/app-emulation/lxc/files/lxc-1.1.3-bash-completion.patch
@@ -0,0 +1,35 @@
+Index: lxc-lxc-1.1.3/config/bash/Makefile.am
+===================================================================
+--- lxc-lxc-1.1.3.orig/config/bash/Makefile.am
++++ lxc-lxc-1.1.3/config/bash/Makefile.am
+@@ -2,12 +2,12 @@ EXTRA_DIST = lxc
+ 
+ if ENABLE_BASH
+ install-bash:
+-	$(MKDIR_P) $(DESTDIR)$(sysconfdir)/bash_completion.d/
+-	$(INSTALL_DATA) lxc $(DESTDIR)$(sysconfdir)/bash_completion.d/
++	$(MKDIR_P) $(DESTDIR)$(datarootdir)/bash-completion/completions//
++	$(INSTALL_DATA) lxc $(DESTDIR)$(datarootdir)/bash-completion/completions/
+ 
+ uninstall-bash:
+-	rm -f $(DESTDIR)$(sysconfdir)/bash_completion.d/lxc
+-	rmdir $(DESTDIR)$(sysconfdir)/bash_completion.d/ || :
++	rm -f $(DESTDIR)$(datarootdir)/bash-completion/completions/lxc
++	rmdir $(DESTDIR)$(datarootdir)/bash-completion/ || :
+ 
+ install-data-local: install-bash
+ uninstall-local: uninstall-bash
+Index: lxc-lxc-1.1.3/config/bash/lxc.in
+===================================================================
+--- lxc-lxc-1.1.3.orig/config/bash/lxc.in
++++ lxc-lxc-1.1.3/config/bash/lxc.in
+@@ -1,4 +1,3 @@
+-have lxc-start && {
+     _lxc_names() {
+         COMPREPLY=( $( compgen -W "$( lxc-ls )" "$cur" ) )
+     }
+@@ -100,4 +99,3 @@ have lxc-start && {
+ 
+     complete -o default -F _lxc_generic_o lxc-clone
+     complete -o default -F _lxc_generic_o lxc-start-ephemeral
+-}
diff --git a/app-emulation/lxc/files/lxc.initd.3 b/app-emulation/lxc/files/lxc.initd.3
index c9ef99919922..092085400649 100644
--- a/app-emulation/lxc/files/lxc.initd.3
+++ b/app-emulation/lxc/files/lxc.initd.3
@@ -111,29 +111,8 @@ stop() {
 	    return 0
 	fi
 
-	init_pid=$(lxc-info -n ${CONTAINER} --pid | awk '{ print $2 }')
-
-	if [ -z "${init_pid}" ]; then
-	    ewarn "${CONTAINER} doesn't seem to be running."
-	    return 0
-	fi
-
-	ebegin "Shutting down system in ${CONTAINER}"
-	kill -PWR ${init_pid}
-	eend $?
-
-	TIMEOUT=${TIMEOUT:-30}
-	i=0
-	while [ -n "$(pgrep -P ${init_pid})" -a $i -lt ${TIMEOUT} ]; do
-		sleep 1
-		i=$(expr $i + 1)
-	done
-
-	if [ -n "${missingprocs}" ]; then
-		ewarn "Something failed to properly shut down in ${CONTAINER}"
-	fi
-
+	# 10s should be enough to shut everything down
 	ebegin "Stopping ${CONTAINER}"
-	lxc-stop -n ${CONTAINER}
+	lxc-stop -t 10 -n ${CONTAINER}
 	eend $?
 }
diff --git a/app-emulation/lxc/lxc-1.1.3.ebuild b/app-emulation/lxc/lxc-1.1.3.ebuild
new file mode 100644
index 000000000000..4a336ef0ddc8
--- /dev/null
+++ b/app-emulation/lxc/lxc-1.1.3.ebuild
@@ -0,0 +1,194 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+MY_P="${P/_/-}"
+PYTHON_COMPAT=( python{3_3,3_4} )
+DISTUTILS_OPTIONAL=1
+
+inherit autotools bash-completion-r1 distutils-r1 eutils linux-info versionator flag-o-matic systemd
+
+DESCRIPTION="LinuX Containers userspace utilities"
+HOMEPAGE="https://linuxcontainers.org/"
+SRC_URI="https://github.com/lxc/lxc/archive/${MY_P}.tar.gz"
+
+KEYWORDS="~amd64 ~arm ~arm64"
+
+LICENSE="LGPL-3"
+SLOT="0"
+IUSE="cgmanager doc examples lua python seccomp"
+
+RDEPEND="net-libs/gnutls
+	sys-libs/libcap
+	cgmanager? ( app-admin/cgmanager )
+	lua? ( >=dev-lang/lua-5.1:= )
+	python? ( ${PYTHON_DEPS} )
+	seccomp? ( sys-libs/libseccomp )"
+
+DEPEND="${RDEPEND}
+	doc? ( app-text/docbook-sgml-utils )
+	>=sys-kernel/linux-headers-3.2"
+
+RDEPEND="${RDEPEND}
+	sys-process/criu
+	sys-apps/util-linux
+	app-misc/pax-utils
+	virtual/awk"
+
+CONFIG_CHECK="~CGROUPS ~CGROUP_DEVICE
+	~CPUSETS ~CGROUP_CPUACCT
+	~CGROUP_SCHED
+
+	~NAMESPACES
+	~IPC_NS ~USER_NS ~PID_NS
+
+	~NETLINK_DIAG ~PACKET_DIAG
+	~INET_UDP_DIAG ~INET_TCP_DIAG
+	~UNIX_DIAG ~CHECKPOINT_RESTORE
+
+	~DEVPTS_MULTIPLE_INSTANCES
+	~CGROUP_FREEZER
+	~UTS_NS ~NET_NS
+	~VETH ~MACVLAN
+
+	~POSIX_MQUEUE
+	~!NETPRIO_CGROUP
+
+	~!GRKERNSEC_CHROOT_MOUNT
+	~!GRKERNSEC_CHROOT_DOUBLE
+	~!GRKERNSEC_CHROOT_PIVOT
+	~!GRKERNSEC_CHROOT_CHMOD
+	~!GRKERNSEC_CHROOT_CAPS
+"
+
+ERROR_DEVPTS_MULTIPLE_INSTANCES="CONFIG_DEVPTS_MULTIPLE_INSTANCES:  needed for pts inside container"
+
+ERROR_CGROUP_FREEZER="CONFIG_CGROUP_FREEZER:  needed to freeze containers"
+
+ERROR_UTS_NS="CONFIG_UTS_NS:  needed to unshare hostnames and uname info"
+ERROR_NET_NS="CONFIG_NET_NS:  needed for unshared network"
+
+ERROR_VETH="CONFIG_VETH:  needed for internal (host-to-container) networking"
+ERROR_MACVLAN="CONFIG_MACVLAN:  needed for internal (inter-container) networking"
+
+ERROR_NETLINK_DIAG="CONFIG_NETLINK_DIAG:  needed for lxc-checkpoint"
+ERROR_PACKET_DIAG="CONFIG_PACKET_DIAG:  needed for lxc-checkpoint"
+ERROR_INET_UDP_DIAG="CONFIG_INET_UDP_DIAG:  needed for lxc-checkpoint"
+ERROR_INET_TCP_DIAG="CONFIG_INET_TCP_DIAG:  needed for lxc-checkpoint"
+ERROR_UNIX_DIAG="CONFIG_UNIX_DIAG:  needed for lxc-checkpoint"
+ERROR_CHECKPOINT_RESTORE="CONFIG_CHECKPOINT_RESTORE:  needed for lxc-checkpoint"
+
+ERROR_POSIX_MQUEUE="CONFIG_POSIX_MQUEUE:  needed for lxc-execute command"
+
+ERROR_NETPRIO_CGROUP="CONFIG_NETPRIO_CGROUP:  as of kernel 3.3 and lxc 0.8.0_rc1 this causes LXCs to fail booting."
+
+ERROR_GRKERNSEC_CHROOT_MOUNT="CONFIG_GRKERNSEC_CHROOT_MOUNT:  some GRSEC features make LXC unusable see postinst notes"
+ERROR_GRKERNSEC_CHROOT_DOUBLE="CONFIG_GRKERNSEC_CHROOT_DOUBLE:  some GRSEC features make LXC unusable see postinst notes"
+ERROR_GRKERNSEC_CHROOT_PIVOT="CONFIG_GRKERNSEC_CHROOT_PIVOT:  some GRSEC features make LXC unusable see postinst notes"
+ERROR_GRKERNSEC_CHROOT_CHMOD="CONFIG_GRKERNSEC_CHROOT_CHMOD:  some GRSEC features make LXC unusable see postinst notes"
+ERROR_GRKERNSEC_CHROOT_CAPS="CONFIG_GRKERNSEC_CHROOT_CAPS:  some GRSEC features make LXC unusable see postinst notes"
+
+DOCS=(AUTHORS CONTRIBUTING MAINTAINERS NEWS README doc/FAQ.txt)
+
+S="${WORKDIR}/${PN}-${MY_P}"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+src_prepare() {
+
+	epatch "${FILESDIR}"/${PN}-1.1.3-bash-completion.patch
+	eautoreconf
+}
+
+src_configure() {
+	append-flags -fno-strict-aliasing
+
+	if use python; then
+		#541932
+		python_setup "python3*"
+		export PKG_CONFIG_PATH="${T}/${EPYTHON}/pkgconfig:${PKG_CONFIG_PATH}"
+	fi
+
+	# I am not sure about the --with-rootfs-path
+	# /var/lib/lxc is probably more appropriate than
+	# /usr/lib/lxc.
+	econf \
+		--localstatedir=/var \
+		--bindir=/usr/bin \
+		--sbindir=/usr/bin \
+		--docdir=/usr/share/doc/${PF} \
+		--with-config-path=/var/lib/lxc	\
+		--with-rootfs-path=/var/lib/lxc/rootfs \
+		--with-distro=gentoo \
+		--with-runtime-path=/run \
+		--disable-apparmor \
+		$(use_enable cgmanager) \
+		$(use_enable doc) \
+		$(use_enable examples) \
+		$(use_enable lua) \
+		$(use_enable python) \
+		$(use_enable seccomp)
+}
+
+python_compile() {
+	distutils-r1_python_compile build_ext -I ../ -L ../${PN}
+}
+
+src_compile() {
+	default
+
+	if use python; then
+		pushd "${S}/src/python-${PN}" > /dev/null
+		distutils-r1_src_compile
+		popd > /dev/null
+	fi
+}
+
+src_install() {
+	default
+
+	mv "${ED}"/usr/share/bash-completion/completions/${PN} "${ED}"/$(get_bashcompdir)/${PN}-start || die
+	bashcomp_alias ${PN}-start \
+		${PN}-{attach,cgroup,clone,console,create,destroy,device,execute,freeze,info,monitor,snapshot,start-ephemeral,stop,unfreeze,wait}
+
+	if use python; then
+		pushd "${S}/src/python-lxc" > /dev/null
+		# Unset DOCS. This has been handled by the default target
+		unset DOCS
+		distutils-r1_src_install
+		popd > /dev/null
+	fi
+
+	keepdir /etc/lxc /var/lib/lxc/rootfs /var/log/lxc
+
+	find "${D}" -name '*.la' -delete
+
+	# Gentoo-specific additions!
+	# Use initd.3 per #517144
+	newinitd "${FILESDIR}/${PN}.initd.3" ${PN}
+
+	# lxc-devsetup script
+	exeinto /usr/libexec/${PN}
+	doexe config/init/systemd/${PN}-devsetup
+	# Remember to compare our systemd unit file with the upstream one
+	# config/init/systemd/lxc.service.in
+	systemd_newunit "${FILESDIR}"/${PN}_at.service.2 "lxc@.service"
+}
+
+pkg_postinst() {
+	elog ""
+	elog "Starting from version ${PN}-1.1.0-r3, the default lxc path has been"
+	elog "moved from /etc/lxc to /var/lib/lxc. If you still want to use /etc/lxc"
+	elog "please add the following to your /etc/lxc/default.conf"
+	elog "lxc.lxcpath = /etc/lxc"
+	elog ""
+	elog "There is an init script provided with the package now; no documentation"
+	elog "is currently available though, so please check out /etc/init.d/lxc ."
+	elog "You _should_ only need to symlink it to /etc/init.d/lxc.configname"
+	elog "to start the container defined into /etc/lxc/configname.conf ."
+	elog "For further information about LXC development see"
+	elog "http://blog.flameeyes.eu/tag/lxc" # remove once proper doc is available
+	elog ""
+}
diff --git a/app-emulation/lxd/Manifest b/app-emulation/lxd/Manifest
index 79b174919d7c..625471421b09 100644
--- a/app-emulation/lxd/Manifest
+++ b/app-emulation/lxd/Manifest
@@ -1,2 +1,3 @@
 DIST lxd-0.13.tar.bz2 3336161 SHA256 4228979ea9a856647f75f0230f58cc577c111a287f148787af766ab36c55f756 SHA512 12cd865ef63702674342df23ebb298b6ba39f0d44e9bfe91c643820be06ff30910145388a4daa2d63fbcb53c236e3cd4eb84e3e0bc617c85247322b0024c4920 WHIRLPOOL 82e788e9b35429df308d498955bd0cab06eb7d1a09c0a20bddad78490900b2cb78a44da9970db149ebfda546250a1d5aa2204e5f6f98b81a228310bfee3003a7
 DIST lxd-0.14.tar.bz2 2526939 SHA256 c0c51ac5b3d30c7906323eba965011073b412a3c354ce095e46f14df4298c46c SHA512 d3f9eb38cdf71add270c895c1583dab85b0e0dba0d956900628b519881b41582113d6c25d37b9522493de069ad6a43b197ae895aefeb83391337273a4b60953e WHIRLPOOL 2b9c6931b81df7e60b13e35bfcd5272a46fb29377e11f6326616f55bf6c583db7be82d41273369518e9b9e434bee3b30f989b6816cd8dbdd40cc2cc1effac7b4
+DIST lxd-0.16.tar.bz2 2660683 SHA256 bbe2b7542af34c93c7509e9638016a420bfc1daf1f1f45a33fa3d379ae10f14f SHA512 856e5ea1920ec3025cbd308a8e2ef656393a149111a38188f749e7d42a41032d762009d85316815c3f18ac0907fa9380758ca48666b13e900c9bbdf809d57f1c WHIRLPOOL f4bbea69073f2cc0dce65e39d88cdf1a0fadd4629b5b42bdee7ab385df459f78a2e36619c40ace687be124fb8d59c0da043cb1a8195630b2d0a051ab53297b89
diff --git a/app-emulation/lxd/files/lxd-0.16-dont-go-get.patch b/app-emulation/lxd/files/lxd-0.16-dont-go-get.patch
new file mode 100644
index 000000000000..fbfcf1365016
--- /dev/null
+++ b/app-emulation/lxd/files/lxd-0.16-dont-go-get.patch
@@ -0,0 +1,15 @@
+--- Makefile.orig	2015-09-03 10:08:26.921410426 -0500
++++ Makefile	2015-09-03 10:08:52.193408698 -0500
+@@ -12,12 +12,10 @@
+ 
+ .PHONY: default
+ default:
+-	go get -t -v -d ./... || true
+ 	go install -v ./...
+ 
+ .PHONY: client
+ client:
+-	go get -t -v -d ./...
+ 	go install -v ./lxc
+ 
+ # This only needs to be done when migrate.proto is actually changed; since we
diff --git a/app-emulation/lxd/files/lxd-0.16-nc-binary-name.patch b/app-emulation/lxd/files/lxd-0.16-nc-binary-name.patch
new file mode 100644
index 000000000000..c81a3edb7298
--- /dev/null
+++ b/app-emulation/lxd/files/lxd-0.16-nc-binary-name.patch
@@ -0,0 +1,11 @@
+--- lxd/migration/rsync.go.orig	2015-08-21 12:05:15.098768663 -0500
++++ lxd/migration/rsync.go	2015-08-21 12:06:15.899764506 -0500
+@@ -73,7 +73,7 @@
+ 	 * command (i.e. the command to run on --server). However, we're
+ 	 * hardcoding that at the other end, so we can just ignore it.
+ 	 */
+-	rsyncCmd := fmt.Sprintf("sh -c \"nc -U %s\"", f.Name())
++	rsyncCmd := fmt.Sprintf("sh -c \"nc.openbsd -U %s\"", f.Name())
+ 	cmd := exec.Command("rsync", "-arvP", "--devices", "--partial", path, "localhost:/tmp/foo", "-e", rsyncCmd)
+ 	if err := cmd.Start(); err != nil {
+ 		return nil, nil, err
diff --git a/app-emulation/lxd/files/lxd-0.16.confd b/app-emulation/lxd/files/lxd-0.16.confd
new file mode 100644
index 000000000000..c3e6e681b885
--- /dev/null
+++ b/app-emulation/lxd/files/lxd-0.16.confd
@@ -0,0 +1,23 @@
+LXD_OPTIONS=""
+
+# Group which owns the shared socket
+LXD_OPTIONS="${LXD_OPTIONS} --group lxd"
+
+
+
+# Enable cpu profiling into the specified file
+#LXD_OPTIONS="${LXD_OPTIONS} --cpuprofile ''"
+
+# Enable memory profiling into the specified file
+#LXD_OPTIONS="${LXD_OPTIONS} --memprofile ''"
+
+
+
+# Enables debug mode
+#LXD_OPTIONS="${LXD_OPTIONS} --debug"
+
+# For debugging, print a complete stack trace every n seconds
+#LXD_OPTIONS="${LXD_OPTIONS} --print-goroutines-every 5"
+
+# Enables verbose mode
+#LXD_OPTIONS="${LXD_OPTIONS} -v"
diff --git a/app-emulation/lxd/files/lxd-0.16.initd b/app-emulation/lxd/files/lxd-0.16.initd
new file mode 100644
index 000000000000..2b75e51c8a64
--- /dev/null
+++ b/app-emulation/lxd/files/lxd-0.16.initd
@@ -0,0 +1,32 @@
+#!/sbin/runscript
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+DAEMON=/usr/sbin/lxd
+PIDFILE=/run/lxd.pid
+
+depend() {
+    need cgmanager
+    need net
+}
+
+start() {
+    ebegin "Starting lxd server"
+
+    start-stop-daemon --start \
+		      --pidfile ${PIDFILE} \
+		      --exec ${DAEMON} \
+		      --background \
+		      --make-pidfile \
+		      -- \
+		      ${LXD_OPTIONS}
+
+    eend $?
+}
+
+stop() {
+    ebegin "Stopping lxd server"
+    start-stop-daemon --stop --quiet -R TERM/45 -p ${PIDFILE}
+    eend $?
+}
diff --git a/app-emulation/lxd/lxd-0.16.ebuild b/app-emulation/lxd/lxd-0.16.ebuild
new file mode 100644
index 000000000000..cb20eba5a8ef
--- /dev/null
+++ b/app-emulation/lxd/lxd-0.16.ebuild
@@ -0,0 +1,164 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+DESCRIPTION="Fast, dense and secure container management"
+HOMEPAGE="https://linuxcontainers.org/lxd/introduction/"
+EGO_PN_PARENT="github.com/lxc"
+EGO_PN="${EGO_PN_PARENT}/lxd"
+SRC_URI="http://961db08fe45d5f5dd062-b8a7a040508aea6d369676e49b80719d.r29.cf2.rackcdn.com/${P}.tar.bz2"
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+PLOCALES="de fr ja"
+IUSE="+criu +daemon +image +lvm nls test"
+
+# IUSE and PLOCALES must be defined before l10n inherited
+inherit bash-completion-r1 eutils golang-build l10n systemd user vcs-snapshot
+
+DEPEND="
+	dev-go/go-crypto
+	>=dev-lang/go-1.4.2:=
+	dev-libs/protobuf
+	dev-vcs/git
+	nls? ( sys-devel/gettext )
+	test? (
+		app-misc/jq
+		dev-db/sqlite
+		net-misc/curl
+		sys-devel/gettext
+	)
+"
+
+RDEPEND="
+	daemon? (
+		app-admin/cgmanager
+		app-arch/xz-utils
+		app-emulation/lxc[cgmanager]
+		net-analyzer/openbsd-netcat
+		net-misc/bridge-utils
+		virtual/acl
+		criu? (
+			sys-process/criu
+		)
+		image? (
+			app-crypt/gnupg
+			>=dev-lang/python-3.2
+		)
+		lvm? (
+			sys-fs/lvm2
+		)
+	)
+"
+
+# KNOWN ISSUES:
+# - Translations may not work.  I've been unsuccessful in forcing
+#   localized output.  Anyway, upstream (Canonical) doesn't install the
+#   message files.
+
+# TODO:
+# - since 0.15 gccgo is a supported compiler ('make gccgo').  It would
+#   be preferable for that support to go into the golang-build eclass not
+#   this package directly.
+
+src_prepare() {
+	cd "${S}/src/${EGO_PN}"
+
+	epatch "${FILESDIR}/${P}-dont-go-get.patch"
+
+	if use daemon; then
+		# Upstream requires the openbsd flavor of netcat (with -U), but
+		# Gentoo installs that with a renamed binary
+		epatch "${FILESDIR}/${P}-nc-binary-name.patch"
+	fi
+
+	# Warn on unhandled locale changes
+	l10n_find_plocales_changes po "" .po
+}
+
+src_compile() {
+	golang-build_src_compile
+
+	cd "${S}/src/${EGO_PN}"
+
+	if use daemon; then
+		# Build binaries
+		GOPATH="${S}:$(get_golibdir_gopath)" emake
+	else
+		# build client tool
+		GOPATH="${S}:$(get_golibdir_gopath)" emake client
+	fi
+
+	use nls && emake build-mo
+}
+
+src_test() {
+	if use daemon; then
+		# Go native tests should succeed
+		golang-build_src_test
+	fi
+}
+
+src_install() {
+	# Installs all src,pkg to /usr/lib/go-gentoo
+	golang-build_src_install
+
+	cd "${S}"
+	dobin bin/lxc
+	if use daemon; then
+		dobin bin/fuidshift
+
+		dosbin bin/lxd
+	fi
+
+	cd "src/${EGO_PN}"
+
+	use image && dobin scripts/lxd-images
+
+	if use nls; then
+		for lingua in ${PLOCALES}; do
+			if use linguas_${lingua}; then
+				domo po/${lingua}.mo
+			fi
+		done
+	fi
+
+	if use daemon; then
+		newinitd "${FILESDIR}"/${P}.initd lxd
+		newconfd "${FILESDIR}"/${P}.confd lxd
+
+		systemd_dounit "${FILESDIR}"/lxd.service
+	fi
+
+	newbashcomp config/bash/lxc.in lxc
+
+	dodoc AUTHORS CONTRIBUTING.md README.md
+
+	docinto specs
+	dodoc specs/*
+}
+
+pkg_postinst() {
+	einfo
+	einfo "Consult https://wiki.gentoo.org/wiki/LXD for more information,"
+	einfo "including a Quick Start."
+
+	# The messaging below only applies to daemon installs
+	use daemon || return 0
+
+	# The control socket will be owned by (and writeable by) this group.
+	enewgroup lxd
+
+	# Ubuntu also defines an lxd user but it appears unused (the daemon
+	# must run as root)
+
+	if test -n "${REPLACING_VERSIONS}"; then
+		einfo
+		einfo "If you are upgrading from version 0.14 or older, note that the --tcp"
+		einfo "is no longer available in /etc/conf.d/lxd.  Instead, configure the"
+		einfo "listen address/port by setting the core.https_address profile option."
+	fi
+}
diff --git a/app-emulation/lxd/metadata.xml b/app-emulation/lxd/metadata.xml
index 3ee6854f2f3a..c49dbec3e071 100644
--- a/app-emulation/lxd/metadata.xml
+++ b/app-emulation/lxd/metadata.xml
@@ -19,8 +19,18 @@
 		<remote-id type="github">lxc/lxd</remote-id>
 	</upstream>
 	<use>
+		<flag name="criu">
+			Add support for live-migrateable containers
+		</flag>
+		<flag name="daemon">
+			Build the system daemon, not just the client tool
+		</flag>
 		<flag name="image">
 			Installs the lxd-images image-fetching script
 		</flag>
+		<flag name="lvm">
+			Allow using the Logical Volume Manager as pool
+			for disk image storage
+		</flag>
 	</use>
 </pkgmetadata>
diff --git a/app-emulation/phpvirtualbox/Manifest b/app-emulation/phpvirtualbox/Manifest
index 4085d43205b8..b8425709c3ab 100644
--- a/app-emulation/phpvirtualbox/Manifest
+++ b/app-emulation/phpvirtualbox/Manifest
@@ -4,3 +4,4 @@ DIST phpvirtualbox-4.2-3b.zip 3184088 SHA256 23134a05d22ac9429524abb9d7165eb4c0e
 DIST phpvirtualbox-4.2-4.zip 3663173 SHA256 dd2681dc9703ec68a995cac98719863dca9e0720e45f5e0322dbb6fa3858138b SHA512 51e3b90bb5fcedbd45a6e54cf3ea6cc74cd764bdc107f97f9cb24c27f2c5d53a862781b808ab7d53cdbbd9d4cff93734d7578676b409d10326895dd1c5dcdc15 WHIRLPOOL 1678790492df50f7ae63bd4b44dbcd0ddd892c1bef9d455bf47bb20f1dcdac4955645fe71d549095ccc4a19f5960abf0f34fa1d95c4f4c8d82a34848a405fe06
 DIST phpvirtualbox-4.2-7.zip 3425805 SHA256 3dc078d7058d75aa5745f531a6d485a11fff18972df1a638a749f019e0196e4e SHA512 a066f127115a83c6061e8c0ff6447464818511f3ab7805c119f75ddc88459efd144d45fb358ce52959301f2f1a4f2609f7f42c2bb24213a5be98f2036085a81b WHIRLPOOL d6cf095b9768b7a9c0113c8df354dad124a0b2dc0a52e8518dfde230823c95dcad6b6e3df56cc41a4474b8b73cb281f3bfc91f417078e0b6f1136acd70dca4cf
 DIST phpvirtualbox-4.3-0.zip 4231805 SHA256 e33eea5553fb134ba6a1203e33e212bc5764c05b28164dcc02c6d66af565c293 SHA512 fd49a6a4c79d75f37fd40d74743f295a148548373ab046cf1f31ef7b982008ea6b9d2838cdad2dc37a1d266ed630cd2ddb7f7423ea62af1e0f8f9f76a12c0e9d WHIRLPOOL 1c96ec2fe19092dabac9e04be596974cc4dbaa9993c34e76b938036e8e04c67dc4f4f344be8afd636d603a478ce0c85435a75f8d6cf59bbdc3a11c6fd575b6c1
+DIST phpvirtualbox-5.0-3.zip 4092132 SHA256 8e23eee4ee36ff8cf765afb6842338e8ea8190956882ec0baa30f09ff4fe134b SHA512 b632ff3be2028bd011ce27b580996638dfc89e09350c459f16bd1c8c5c3eefbab93f42d7facfb99279eb2ee1c6a38854ea999654ca2090a39c7bfa0afa7fe2d5 WHIRLPOOL 38070a6935e3a4e5155f84db395c9e82603583957b26fcf166a654446052b15aa3d3b7653a9f7d56a33382dc82058e55413575e75c26b4c97f782bb868cc66e8
diff --git a/app-emulation/phpvirtualbox/phpvirtualbox-5.0.3.ebuild b/app-emulation/phpvirtualbox/phpvirtualbox-5.0.3.ebuild
new file mode 100644
index 000000000000..e14574da6d31
--- /dev/null
+++ b/app-emulation/phpvirtualbox/phpvirtualbox-5.0.3.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit versionator eutils webapp depend.php readme.gentoo
+
+MY_PV="$(replace_version_separator 2 '-')"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="Web-based administration for VirtualBox in PHP"
+HOMEPAGE="https://sourceforge.net/projects/phpvirtualbox/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.zip"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	dev-lang/php[session,unicode,soap,gd]
+"
+DEPEND="app-arch/unzip"
+
+S="${WORKDIR}/${MY_P}"
+
+need_php_httpd
+
+DISABLE_AUTOFORMATTING="yes"
+DOC_CONTENTS="
+Local or remote virtualbox hosts must be compiled with
+'vboxwebsrv' useflag and the respective init script
+must be running to use this interface:
+/etc/init.d/vboxwebsrv start
+
+To enable the automatic startup mode feature uncomment the
+following line in the config.php file:
+var \$startStopConfig = true;
+
+You should also add the /etc/init.d/vboxinit script to the
+default runlevel on the virtualbox host:
+\`rc-update add vboxinit default\`
+If the server is on a remote host, than the script must be
+copied manually from
+'${FILESDIR}'/vboxinit-initd to
+/etc/init.d/vboxinit on the remote host."
+
+src_install() {
+	webapp_src_preinst
+
+	dodoc CHANGELOG.txt LICENSE.txt README.txt
+	rm -f CHANGELOG.txt LICENSE.txt README.txt
+
+	insinto "${MY_HTDOCSDIR}"
+	doins -r .
+
+	webapp_configfile "${MY_HTDOCSDIR}"/config.php-example
+	webapp_serverowned "${MY_HTDOCSDIR}"/config.php-example
+
+	webapp_src_install
+	if has_version app-emulation/virtualbox[vboxwebsrv] || \
+		has_version app-emulation/virtualbox-bin[vboxwebsrv]
+	then
+		newinitd "${FILESDIR}"/vboxinit-initd vboxinit
+	fi
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	webapp_pkg_postinst
+	readme.gentoo_print_elog
+}
diff --git a/app-emulation/qemu-guest-agent/qemu-guest-agent-2.4.0.ebuild b/app-emulation/qemu-guest-agent/qemu-guest-agent-2.4.0.ebuild
index d17bb83b7bde..e244a7970f61 100644
--- a/app-emulation/qemu-guest-agent/qemu-guest-agent-2.4.0.ebuild
+++ b/app-emulation/qemu-guest-agent/qemu-guest-agent-2.4.0.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == *9999* ]]; then
 	inherit git-2
 else
 	SRC_URI="http://wiki.qemu.org/download/${MY_P}.tar.bz2"
-	KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+	KEYWORDS="amd64 ~ppc ~ppc64 x86 ~x86-fbsd"
 fi
 
 DESCRIPTION="QEMU Guest Agent (qemu-ga) for use when running inside a VM"
diff --git a/app-emulation/qemu/files/qemu-2.4.0-CVE-2015-5225.patch b/app-emulation/qemu/files/qemu-2.4.0-CVE-2015-5225.patch
new file mode 100644
index 000000000000..de7090d01a4d
--- /dev/null
+++ b/app-emulation/qemu/files/qemu-2.4.0-CVE-2015-5225.patch
@@ -0,0 +1,86 @@
+https://bugs.gentoo.org/558416
+
+fix from upstream git
+
+From eb8934b0418b3b1d125edddc4fc334a54334a49b Mon Sep 17 00:00:00 2001
+From: Gerd Hoffmann <kraxel@redhat.com>
+Date: Mon, 17 Aug 2015 19:56:53 +0200
+Subject: [PATCH] vnc: fix memory corruption (CVE-2015-5225)
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+The _cmp_bytes variable added by commit "bea60dd ui/vnc: fix potential
+memory corruption issues" can become negative.  Result is (possibly
+exploitable) memory corruption.  Reason for that is it uses the stride
+instead of bytes per scanline to apply limits.
+
+For the server surface is is actually fine.  vnc creates that itself,
+there is never any padding and thus scanline length always equals stride.
+
+For the guest surface scanline length and stride are typically identical
+too, but it doesn't has to be that way.  So add and use a new variable
+(guest_ll) for the guest scanline length.  Also rename min_stride to
+line_bytes to make more clear what it actually is.  Finally sprinkle
+in an assert() to make sure we never use a negative _cmp_bytes again.
+
+Reported-by: 范祚至(库特) <zuozhi.fzz@alibaba-inc.com>
+Reviewed-by: P J P <ppandit@redhat.com>
+Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
+---
+ ui/vnc.c | 15 ++++++++++-----
+ 1 file changed, 10 insertions(+), 5 deletions(-)
+
+diff --git a/ui/vnc.c b/ui/vnc.c
+index e26973a..caf82f5 100644
+--- a/ui/vnc.c
++++ b/ui/vnc.c
+@@ -2872,7 +2872,7 @@ static int vnc_refresh_server_surface(VncDisplay *vd)
+                     pixman_image_get_width(vd->server));
+     int height = MIN(pixman_image_get_height(vd->guest.fb),
+                      pixman_image_get_height(vd->server));
+-    int cmp_bytes, server_stride, min_stride, guest_stride, y = 0;
++    int cmp_bytes, server_stride, line_bytes, guest_ll, guest_stride, y = 0;
+     uint8_t *guest_row0 = NULL, *server_row0;
+     VncState *vs;
+     int has_dirty = 0;
+@@ -2891,17 +2891,21 @@ static int vnc_refresh_server_surface(VncDisplay *vd)
+      * Update server dirty map.
+      */
+     server_row0 = (uint8_t *)pixman_image_get_data(vd->server);
+-    server_stride = guest_stride = pixman_image_get_stride(vd->server);
++    server_stride = guest_stride = guest_ll =
++        pixman_image_get_stride(vd->server);
+     cmp_bytes = MIN(VNC_DIRTY_PIXELS_PER_BIT * VNC_SERVER_FB_BYTES,
+                     server_stride);
+     if (vd->guest.format != VNC_SERVER_FB_FORMAT) {
+         int width = pixman_image_get_width(vd->server);
+         tmpbuf = qemu_pixman_linebuf_create(VNC_SERVER_FB_FORMAT, width);
+     } else {
++        int guest_bpp =
++            PIXMAN_FORMAT_BPP(pixman_image_get_format(vd->guest.fb));
+         guest_row0 = (uint8_t *)pixman_image_get_data(vd->guest.fb);
+         guest_stride = pixman_image_get_stride(vd->guest.fb);
++        guest_ll = pixman_image_get_width(vd->guest.fb) * ((guest_bpp + 7) / 8);
+     }
+-    min_stride = MIN(server_stride, guest_stride);
++    line_bytes = MIN(server_stride, guest_ll);
+ 
+     for (;;) {
+         int x;
+@@ -2932,9 +2936,10 @@ static int vnc_refresh_server_surface(VncDisplay *vd)
+             if (!test_and_clear_bit(x, vd->guest.dirty[y])) {
+                 continue;
+             }
+-            if ((x + 1) * cmp_bytes > min_stride) {
+-                _cmp_bytes = min_stride - x * cmp_bytes;
++            if ((x + 1) * cmp_bytes > line_bytes) {
++                _cmp_bytes = line_bytes - x * cmp_bytes;
+             }
++            assert(_cmp_bytes >= 0);
+             if (memcmp(server_ptr, guest_ptr, _cmp_bytes) == 0) {
+                 continue;
+             }
+-- 
+2.5.0
+
diff --git a/app-emulation/qemu/files/qemu-2.4.0-block-mirror-crash.patch b/app-emulation/qemu/files/qemu-2.4.0-block-mirror-crash.patch
new file mode 100644
index 000000000000..ad4051e22c94
--- /dev/null
+++ b/app-emulation/qemu/files/qemu-2.4.0-block-mirror-crash.patch
@@ -0,0 +1,124 @@
+https://bugs.gentoo.org/558396
+
+fix from upstream git
+
+From e424aff5f307227b1c2512bbb8ece891bb895cef Mon Sep 17 00:00:00 2001
+From: Kevin Wolf <kwolf@redhat.com>
+Date: Thu, 13 Aug 2015 10:41:50 +0200
+Subject: [PATCH] mirror: Fix coroutine reentrance
+
+This fixes a regression introduced by commit dcfb3beb ("mirror: Do zero
+write on target if sectors not allocated"), which was reported to cause
+aborts with the message "Co-routine re-entered recursively".
+
+The cause for this bug is the following code in mirror_iteration_done():
+
+    if (s->common.busy) {
+        qemu_coroutine_enter(s->common.co, NULL);
+    }
+
+This has always been ugly because - unlike most places that reenter - it
+doesn't have a specific yield that it pairs with, but is more
+uncontrolled.  What we really mean here is "reenter the coroutine if
+it's in one of the four explicit yields in mirror.c".
+
+This used to be equivalent with s->common.busy because neither
+mirror_run() nor mirror_iteration() call any function that could yield.
+However since commit dcfb3beb this doesn't hold true any more:
+bdrv_get_block_status_above() can yield.
+
+So what happens is that bdrv_get_block_status_above() wants to take a
+lock that is already held, so it adds itself to the queue of waiting
+coroutines and yields. Instead of being woken up by the unlock function,
+however, it gets woken up by mirror_iteration_done(), which is obviously
+wrong.
+
+In most cases the code actually happens to cope fairly well with such
+cases, but in this specific case, the unlock must already have scheduled
+the coroutine for wakeup when mirror_iteration_done() reentered it. And
+then the coroutine happened to process the scheduled restarts and tried
+to reenter itself recursively.
+
+This patch fixes the problem by pairing the reenter in
+mirror_iteration_done() with specific yields instead of abusing
+s->common.busy.
+
+Cc: qemu-stable@nongnu.org
+Signed-off-by: Kevin Wolf <kwolf@redhat.com>
+Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
+Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
+Reviewed-by: Jeff Cody <jcody@redhat.com>
+Message-id: 1439455310-11263-1-git-send-email-kwolf@redhat.com
+Signed-off-by: Jeff Cody <jcody@redhat.com>
+---
+ block/mirror.c | 15 ++++++++++-----
+ 1 file changed, 10 insertions(+), 5 deletions(-)
+
+diff --git a/block/mirror.c b/block/mirror.c
+index 0841964..9474443 100644
+--- a/block/mirror.c
++++ b/block/mirror.c
+@@ -60,6 +60,7 @@ typedef struct MirrorBlockJob {
+     int sectors_in_flight;
+     int ret;
+     bool unmap;
++    bool waiting_for_io;
+ } MirrorBlockJob;
+ 
+ typedef struct MirrorOp {
+@@ -114,11 +115,7 @@ static void mirror_iteration_done(MirrorOp *op, int ret)
+     qemu_iovec_destroy(&op->qiov);
+     g_slice_free(MirrorOp, op);
+ 
+-    /* Enter coroutine when it is not sleeping.  The coroutine sleeps to
+-     * rate-limit itself.  The coroutine will eventually resume since there is
+-     * a sleep timeout so don't wake it early.
+-     */
+-    if (s->common.busy) {
++    if (s->waiting_for_io) {
+         qemu_coroutine_enter(s->common.co, NULL);
+     }
+ }
+@@ -203,7 +200,9 @@ static uint64_t coroutine_fn mirror_iteration(MirrorBlockJob *s)
+     /* Wait for I/O to this cluster (from a previous iteration) to be done.  */
+     while (test_bit(next_chunk, s->in_flight_bitmap)) {
+         trace_mirror_yield_in_flight(s, sector_num, s->in_flight);
++        s->waiting_for_io = true;
+         qemu_coroutine_yield();
++        s->waiting_for_io = false;
+     }
+ 
+     do {
+@@ -239,7 +238,9 @@ static uint64_t coroutine_fn mirror_iteration(MirrorBlockJob *s)
+          */
+         while (nb_chunks == 0 && s->buf_free_count < added_chunks) {
+             trace_mirror_yield_buf_busy(s, nb_chunks, s->in_flight);
++            s->waiting_for_io = true;
+             qemu_coroutine_yield();
++            s->waiting_for_io = false;
+         }
+         if (s->buf_free_count < nb_chunks + added_chunks) {
+             trace_mirror_break_buf_busy(s, nb_chunks, s->in_flight);
+@@ -337,7 +338,9 @@ static void mirror_free_init(MirrorBlockJob *s)
+ static void mirror_drain(MirrorBlockJob *s)
+ {
+     while (s->in_flight > 0) {
++        s->waiting_for_io = true;
+         qemu_coroutine_yield();
++        s->waiting_for_io = false;
+     }
+ }
+ 
+@@ -510,7 +513,9 @@ static void coroutine_fn mirror_run(void *opaque)
+             if (s->in_flight == MAX_IN_FLIGHT || s->buf_free_count == 0 ||
+                 (cnt == 0 && s->in_flight > 0)) {
+                 trace_mirror_yield(s, s->in_flight, s->buf_free_count, cnt);
++                s->waiting_for_io = true;
+                 qemu_coroutine_yield();
++                s->waiting_for_io = false;
+                 continue;
+             } else if (cnt != 0) {
+                 delay_ns = mirror_iteration(s);
+-- 
+2.5.0
+
diff --git a/app-emulation/qemu/files/qemu-2.4.0-e1000-loop.patch b/app-emulation/qemu/files/qemu-2.4.0-e1000-loop.patch
new file mode 100644
index 000000000000..f2538a723d15
--- /dev/null
+++ b/app-emulation/qemu/files/qemu-2.4.0-e1000-loop.patch
@@ -0,0 +1,39 @@
+https://bugs.gentoo.org/559656
+
+https://lists.gnu.org/archive/html/qemu-devel/2015-09/msg01199.html
+
+From: Stefan Hajnoczi <stefanha@redhat.com>
+Subject: [PATCH] e1000: Avoid infinite loop in processing	transmit descriptor
+Newsgroups: gmane.comp.emulators.qemu
+Date: 2015-09-04 16:21:06 GMT (2 days, 12 hours and 51 minutes ago)
+From: P J P <pjp@fedoraproject.org>
+
+While processing transmit descriptors, it could lead to an infinite
+loop if 'bytes' was to become zero; Add a check to avoid it.
+
+[The guest can force 'bytes' to 0 by setting the hdr_len and mss
+descriptor fields to 0.
+--Stefan]
+
+Signed-off-by: P J P <pjp@fedoraproject.org>
+Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
+---
+ hw/net/e1000.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/hw/net/e1000.c b/hw/net/e1000.c
+index 5c6bcd0..09c9e9d 100644
+--- a/hw/net/e1000.c
++++ b/hw/net/e1000.c
+@@ -740,7 +740,8 @@ process_tx_desc(E1000State *s, struct e1000_tx_desc *dp)
+                 memmove(tp->data, tp->header, tp->hdr_len);
+                 tp->size = tp->hdr_len;
+             }
+-        } while (split_size -= bytes);
++            split_size -= bytes;
++        } while (bytes && split_size);
+     } else if (!tp->tse && tp->cptse) {
+         // context descriptor TSE is not set, while data descriptor TSE is set
+         DBGOUT(TXERR, "TCP segmentation error\n");
+-- 
+2.4.3
diff --git a/app-emulation/qemu/qemu-2.4.0-r1.ebuild b/app-emulation/qemu/qemu-2.4.0-r1.ebuild
new file mode 100644
index 000000000000..c49fe2171251
--- /dev/null
+++ b/app-emulation/qemu/qemu-2.4.0-r1.ebuild
@@ -0,0 +1,643 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="ncurses,readline"
+
+inherit eutils flag-o-matic linux-info toolchain-funcs multilib python-r1 \
+	user udev fcaps readme.gentoo pax-utils
+
+BACKPORTS=
+
+if [[ ${PV} = *9999* ]]; then
+	EGIT_REPO_URI="git://git.qemu.org/qemu.git"
+	inherit git-2
+	SRC_URI=""
+else
+	SRC_URI="http://wiki.qemu-project.org/download/${P}.tar.bz2
+	${BACKPORTS:+
+		https://dev.gentoo.org/~cardoe/distfiles/${P}-${BACKPORTS}.tar.xz}"
+	KEYWORDS="amd64 ~ppc ~ppc64 x86 ~x86-fbsd"
+fi
+
+DESCRIPTION="QEMU + Kernel-based Virtual Machine userland tools"
+HOMEPAGE="http://www.qemu.org http://www.linux-kvm.org"
+
+LICENSE="GPL-2 LGPL-2 BSD-2"
+SLOT="0"
+IUSE="accessibility +aio alsa bluetooth +caps +curl debug +fdt glusterfs \
+gtk gtk2 infiniband iscsi +jpeg \
+kernel_linux kernel_FreeBSD lzo ncurses nfs nls numa opengl +pin-upstream-blobs
++png pulseaudio python \
+rbd sasl +seccomp sdl sdl2 selinux smartcard snappy spice ssh static static-softmmu
+static-user systemtap tci test +threads tls usb usbredir +uuid vde +vhost-net \
+virtfs +vnc vte xattr xen xfs"
+
+COMMON_TARGETS="aarch64 alpha arm cris i386 m68k microblaze microblazeel mips
+mips64 mips64el mipsel or32 ppc ppc64 s390x sh4 sh4eb sparc sparc64 unicore32
+x86_64"
+IUSE_SOFTMMU_TARGETS="${COMMON_TARGETS} lm32 moxie ppcemb tricore xtensa xtensaeb"
+IUSE_USER_TARGETS="${COMMON_TARGETS} armeb mipsn32 mipsn32el ppc64abi32 ppc64le sparc32plus"
+
+use_softmmu_targets=$(printf ' qemu_softmmu_targets_%s' ${IUSE_SOFTMMU_TARGETS})
+use_user_targets=$(printf ' qemu_user_targets_%s' ${IUSE_USER_TARGETS})
+IUSE+=" ${use_softmmu_targets} ${use_user_targets}"
+
+# Allow no targets to be built so that people can get a tools-only build.
+# Block USE flag configurations known to not work.
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	gtk2? ( gtk )
+	qemu_softmmu_targets_arm? ( fdt )
+	qemu_softmmu_targets_microblaze? ( fdt )
+	qemu_softmmu_targets_ppc? ( fdt )
+	qemu_softmmu_targets_ppc64? ( fdt )
+	sdl2? ( sdl )
+	static? ( static-softmmu static-user )
+	static-softmmu? ( !alsa !pulseaudio !bluetooth !opengl !gtk !gtk2 )
+	virtfs? ( xattr )
+	vte? ( gtk )"
+
+# Yep, you need both libcap and libcap-ng since virtfs only uses libcap.
+#
+# The attr lib isn't always linked in (although the USE flag is always
+# respected).  This is because qemu supports using the C library's API
+# when available rather than always using the extranl library.
+COMMON_LIB_DEPEND=">=dev-libs/glib-2.0[static-libs(+)]
+	sys-libs/zlib[static-libs(+)]
+	xattr? ( sys-apps/attr[static-libs(+)] )"
+SOFTMMU_LIB_DEPEND="${COMMON_LIB_DEPEND}
+	>=x11-libs/pixman-0.28.0[static-libs(+)]
+	accessibility? ( app-accessibility/brltty[static-libs(+)] )
+	aio? ( dev-libs/libaio[static-libs(+)] )
+	alsa? ( >=media-libs/alsa-lib-1.0.13 )
+	bluetooth? ( net-wireless/bluez )
+	caps? ( sys-libs/libcap-ng[static-libs(+)] )
+	curl? ( >=net-misc/curl-7.15.4[static-libs(+)] )
+	fdt? ( >=sys-apps/dtc-1.4.0[static-libs(+)] )
+	glusterfs? ( >=sys-cluster/glusterfs-3.4.0[static-libs(+)] )
+	gtk? (
+		gtk2? (
+			x11-libs/gtk+:2
+			vte? ( x11-libs/vte:0 )
+		)
+		!gtk2? (
+			x11-libs/gtk+:3
+			vte? ( x11-libs/vte:2.90 )
+		)
+	)
+	infiniband? ( sys-infiniband/librdmacm:=[static-libs(+)] )
+	iscsi? ( net-libs/libiscsi )
+	jpeg? ( virtual/jpeg:=[static-libs(+)] )
+	lzo? ( dev-libs/lzo:2[static-libs(+)] )
+	ncurses? ( sys-libs/ncurses:0=[static-libs(+)] )
+	nfs? ( >=net-fs/libnfs-1.9.3[static-libs(+)] )
+	numa? ( sys-process/numactl[static-libs(+)] )
+	opengl? (
+		virtual/opengl
+		media-libs/libepoxy[static-libs(+)]
+		media-libs/mesa[static-libs(+)]
+		media-libs/mesa[gles2]
+	)
+	png? ( media-libs/libpng:0=[static-libs(+)] )
+	pulseaudio? ( media-sound/pulseaudio )
+	rbd? ( sys-cluster/ceph[static-libs(+)] )
+	sasl? ( dev-libs/cyrus-sasl[static-libs(+)] )
+	sdl? (
+		!sdl2? (
+			media-libs/libsdl[X]
+			>=media-libs/libsdl-1.2.11[static-libs(+)]
+		)
+		sdl2? (
+			media-libs/libsdl2[X]
+			media-libs/libsdl2[static-libs(+)]
+		)
+	)
+	seccomp? ( >=sys-libs/libseccomp-2.1.0[static-libs(+)] )
+	smartcard? ( dev-libs/nss !app-emulation/libcacard )
+	snappy? ( app-arch/snappy[static-libs(+)] )
+	spice? (
+		>=app-emulation/spice-protocol-0.12.3
+		>=app-emulation/spice-0.12.0[static-libs(+)]
+	)
+	ssh? ( >=net-libs/libssh2-1.2.8[static-libs(+)] )
+	tls? ( net-libs/gnutls[static-libs(+)] )
+	usb? ( >=virtual/libusb-1-r2[static-libs(+)] )
+	usbredir? ( >=sys-apps/usbredir-0.6[static-libs(+)] )
+	uuid? ( >=sys-apps/util-linux-2.16.0[static-libs(+)] )
+	vde? ( net-misc/vde[static-libs(+)] )
+	virtfs? ( sys-libs/libcap )
+	xfs? ( sys-fs/xfsprogs[static-libs(+)] )"
+USER_LIB_DEPEND="${COMMON_LIB_DEPEND}"
+X86_FIRMWARE_DEPEND="
+	>=sys-firmware/ipxe-1.0.0_p20130624
+	pin-upstream-blobs? (
+		~sys-firmware/seabios-1.8.2
+		~sys-firmware/sgabios-0.1_pre8
+		~sys-firmware/vgabios-0.7a
+	)
+	!pin-upstream-blobs? (
+		sys-firmware/seabios
+		sys-firmware/sgabios
+		sys-firmware/vgabios
+	)"
+CDEPEND="
+	!static-softmmu? ( $(printf "%s? ( ${SOFTMMU_LIB_DEPEND//\[static-libs(+)]} ) " ${use_softmmu_targets}) )
+	!static-user? ( $(printf "%s? ( ${USER_LIB_DEPEND//\[static-libs(+)]} ) " ${use_user_targets}) )
+	qemu_softmmu_targets_i386? ( ${X86_FIRMWARE_DEPEND} )
+	qemu_softmmu_targets_x86_64? ( ${X86_FIRMWARE_DEPEND} )
+	python? ( ${PYTHON_DEPS} )
+	systemtap? ( dev-util/systemtap )
+	xen? ( app-emulation/xen-tools )"
+DEPEND="${CDEPEND}
+	dev-lang/perl
+	=dev-lang/python-2*
+	sys-apps/texinfo
+	virtual/pkgconfig
+	kernel_linux? ( >=sys-kernel/linux-headers-2.6.35 )
+	gtk? ( nls? ( sys-devel/gettext ) )
+	static-softmmu? ( $(printf "%s? ( ${SOFTMMU_LIB_DEPEND} ) " ${use_softmmu_targets}) )
+	static-user? ( $(printf "%s? ( ${USER_LIB_DEPEND} ) " ${use_user_targets}) )
+	test? (
+		dev-libs/glib[utils]
+		sys-devel/bc
+	)"
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-qemu )
+"
+
+STRIP_MASK="/usr/share/qemu/palcode-clipper"
+
+QA_PREBUILT="
+	usr/share/qemu/openbios-ppc
+	usr/share/qemu/openbios-sparc64
+	usr/share/qemu/openbios-sparc32
+	usr/share/qemu/palcode-clipper
+	usr/share/qemu/s390-ccw.img
+	usr/share/qemu/u-boot.e500
+"
+
+QA_WX_LOAD="usr/bin/qemu-i386
+	usr/bin/qemu-x86_64
+	usr/bin/qemu-alpha
+	usr/bin/qemu-arm
+	usr/bin/qemu-cris
+	usr/bin/qemu-m68k
+	usr/bin/qemu-microblaze
+	usr/bin/qemu-microblazeel
+	usr/bin/qemu-mips
+	usr/bin/qemu-mipsel
+	usr/bin/qemu-or32
+	usr/bin/qemu-ppc
+	usr/bin/qemu-ppc64
+	usr/bin/qemu-ppc64abi32
+	usr/bin/qemu-sh4
+	usr/bin/qemu-sh4eb
+	usr/bin/qemu-sparc
+	usr/bin/qemu-sparc64
+	usr/bin/qemu-armeb
+	usr/bin/qemu-sparc32plus
+	usr/bin/qemu-s390x
+	usr/bin/qemu-unicore32"
+
+DOC_CONTENTS="If you don't have kvm compiled into the kernel, make sure
+you have the kernel module loaded before running kvm. The easiest way to
+ensure that the kernel module is loaded is to load it on boot.\n
+For AMD CPUs the module is called 'kvm-amd'\n
+For Intel CPUs the module is called 'kvm-intel'\n
+Please review /etc/conf.d/modules for how to load these\n\n
+Make sure your user is in the 'kvm' group\n
+Just run 'gpasswd -a <USER> kvm', then have <USER> re-login."
+
+qemu_support_kvm() {
+	if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386 \
+		use qemu_softmmu_targets_ppc || use qemu_softmmu_targets_ppc64 \
+		use qemu_softmmu_targets_s390x; then
+		return 0
+	fi
+
+	return 1
+}
+
+pkg_pretend() {
+	if use kernel_linux && kernel_is lt 2 6 25; then
+		eerror "This version of KVM requres a host kernel of 2.6.25 or higher."
+	elif use kernel_linux; then
+		if ! linux_config_exists; then
+			eerror "Unable to check your kernel for KVM support"
+		else
+			CONFIG_CHECK="~KVM ~TUN ~BRIDGE"
+			ERROR_KVM="You must enable KVM in your kernel to continue"
+			ERROR_KVM_AMD="If you have an AMD CPU, you must enable KVM_AMD in"
+			ERROR_KVM_AMD+=" your kernel configuration."
+			ERROR_KVM_INTEL="If you have an Intel CPU, you must enable"
+			ERROR_KVM_INTEL+=" KVM_INTEL in your kernel configuration."
+			ERROR_TUN="You will need the Universal TUN/TAP driver compiled"
+			ERROR_TUN+=" into your kernel or loaded as a module to use the"
+			ERROR_TUN+=" virtual network device if using -net tap."
+			ERROR_BRIDGE="You will also need support for 802.1d"
+			ERROR_BRIDGE+=" Ethernet Bridging for some network configurations."
+			use vhost-net && CONFIG_CHECK+=" ~VHOST_NET"
+			ERROR_VHOST_NET="You must enable VHOST_NET to have vhost-net"
+			ERROR_VHOST_NET+=" support"
+
+			if use amd64 || use x86 || use amd64-linux || use x86-linux; then
+				CONFIG_CHECK+=" ~KVM_AMD ~KVM_INTEL"
+			fi
+
+			use python && CONFIG_CHECK+=" ~DEBUG_FS"
+			ERROR_DEBUG_FS="debugFS support required for kvm_stat"
+
+			# Now do the actual checks setup above
+			check_extra_config
+		fi
+	fi
+
+	if grep -qs '/usr/bin/qemu-kvm' "${EROOT}"/etc/libvirt/qemu/*.xml; then
+		eerror "The kvm/qemu-kvm wrappers no longer exist, but your libvirt"
+		eerror "instances are still pointing to it.  Please update your"
+		eerror "configs in /etc/libvirt/qemu/ to use the -enable-kvm flag"
+		eerror "and the right system binary (e.g. qemu-system-x86_64)."
+		die "update your virt configs to not use qemu-kvm"
+	fi
+}
+
+pkg_setup() {
+	enewgroup kvm 78
+}
+
+# Sanity check to make sure target lists are kept up-to-date.
+check_targets() {
+	local var=$1 mak=$2
+	local detected sorted
+
+	pushd "${S}"/default-configs >/dev/null || die
+
+	detected=$(echo $(printf '%s\n' *-${mak}.mak | sed "s:-${mak}.mak::" | sort -u))
+	sorted=$(echo $(printf '%s\n' ${!var} | sort -u))
+	if [[ ${sorted} != "${detected}" ]] ; then
+		eerror "The ebuild needs to be kept in sync."
+		eerror "${var}: ${sorted}"
+		eerror "$(printf '%-*s' ${#var} configure): ${detected}"
+		die "sync ${var} to the list of targets"
+	fi
+
+	popd >/dev/null
+}
+
+src_prepare() {
+	check_targets IUSE_SOFTMMU_TARGETS softmmu
+	check_targets IUSE_USER_TARGETS linux-user
+
+	# Alter target makefiles to accept CFLAGS set via flag-o
+	sed -i -r \
+		-e 's/^(C|OP_C|HELPER_C)FLAGS=/\1FLAGS+=/' \
+		Makefile Makefile.target || die
+
+	# Cheap hack to disable gettext .mo generation.
+	use nls || rm -f po/*.po
+
+	epatch "${FILESDIR}"/qemu-1.7.0-cflags.patch
+	epatch "${FILESDIR}"/${P}-block-mirror-crash.patch #558396
+	epatch "${FILESDIR}"/${P}-CVE-2015-5225.patch #558416
+	epatch "${FILESDIR}"/${PN}-2.4.0-e1000-loop.patch #559656
+	[[ -n ${BACKPORTS} ]] && \
+		EPATCH_FORCE=yes EPATCH_SUFFIX="patch" EPATCH_SOURCE="${S}/patches" \
+			epatch
+
+	# Fix ld and objcopy being called directly
+	tc-export AR LD OBJCOPY
+
+	# Verbose builds
+	MAKEOPTS+=" V=1"
+
+	epatch_user
+}
+
+##
+# configures qemu based on the build directory and the build type
+# we are using.
+#
+qemu_src_configure() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	local buildtype=$1
+	local builddir="${S}/${buildtype}-build"
+	local static_flag="static-${buildtype}"
+
+	mkdir "${builddir}"
+
+	local conf_opts=(
+		--prefix=/usr
+		--sysconfdir=/etc
+		--libdir=/usr/$(get_libdir)
+		--docdir=/usr/share/doc/${PF}/html
+		--disable-bsd-user
+		--disable-guest-agent
+		--disable-strip
+		--disable-werror
+		--python="${PYTHON}"
+		--cc="$(tc-getCC)"
+		--cxx="$(tc-getCXX)"
+		--host-cc="$(tc-getBUILD_CC)"
+		$(use_enable debug debug-info)
+		$(use_enable debug debug-tcg)
+		--enable-docs
+		$(use_enable tci tcg-interpreter)
+		$(use_enable xattr attr)
+	)
+
+	# Disable options not used by user targets as the default configure
+	# options will autoprobe and try to link in a bunch of unused junk.
+	conf_softmmu() {
+		if [[ ${buildtype} == "user" ]] ; then
+			echo "--disable-${2:-$1}"
+		else
+			use_enable "$@"
+		fi
+	}
+	conf_opts+=(
+		$(conf_softmmu accessibility brlapi)
+		$(conf_softmmu aio linux-aio)
+		$(conf_softmmu bluetooth bluez)
+		$(conf_softmmu caps cap-ng)
+		$(conf_softmmu curl)
+		$(conf_softmmu fdt)
+		$(conf_softmmu glusterfs)
+		$(conf_softmmu gtk)
+		$(conf_softmmu infiniband rdma)
+		$(conf_softmmu iscsi libiscsi)
+		$(conf_softmmu jpeg vnc-jpeg)
+		$(conf_softmmu kernel_linux kvm)
+		$(conf_softmmu lzo)
+		$(conf_softmmu ncurses curses)
+		$(conf_softmmu nfs libnfs)
+		$(conf_softmmu numa)
+		$(conf_softmmu opengl)
+		$(conf_softmmu png vnc-png)
+		$(conf_softmmu rbd)
+		$(conf_softmmu sasl vnc-sasl)
+		$(conf_softmmu sdl)
+		$(conf_softmmu seccomp)
+		$(conf_softmmu smartcard smartcard-nss)
+		$(conf_softmmu snappy)
+		$(conf_softmmu spice)
+		$(conf_softmmu ssh libssh2)
+		$(conf_softmmu tls vnc-tls)
+		$(conf_softmmu usb libusb)
+		$(conf_softmmu usbredir usb-redir)
+		$(conf_softmmu uuid)
+		$(conf_softmmu vde)
+		$(conf_softmmu vhost-net)
+		$(conf_softmmu virtfs)
+		$(conf_softmmu vnc)
+		$(conf_softmmu vte)
+		$(conf_softmmu xen)
+		$(conf_softmmu xen xen-pci-passthrough)
+		$(conf_softmmu xfs xfsctl)
+	)
+
+	case ${buildtype} in
+	user)
+		conf_opts+=(
+			--enable-linux-user
+			--disable-system
+			--disable-blobs
+			--disable-tools
+		)
+		;;
+	softmmu)
+		# audio options
+		local audio_opts="oss"
+		use alsa && audio_opts="alsa,${audio_opts}"
+		use sdl && audio_opts="sdl,${audio_opts}"
+		use pulseaudio && audio_opts="pa,${audio_opts}"
+
+		conf_opts+=(
+			--disable-linux-user
+			--enable-system
+			--with-system-pixman
+			--audio-drv-list="${audio_opts}"
+		)
+		use gtk && conf_opts+=( --with-gtkabi=$(usex gtk2 2.0 3.0) )
+		use sdl && conf_opts+=( --with-sdlabi=$(usex sdl2 2.0 1.2) )
+		;;
+	tools)
+		conf_opts+=(
+			--disable-linux-user
+			--disable-system
+			--disable-blobs
+		)
+		static_flag="static"
+		;;
+	esac
+
+	local targets="${buildtype}_targets"
+	[[ -n ${targets} ]] && conf_opts+=( --target-list="${!targets}" )
+
+	# Add support for SystemTAP
+	use systemtap && conf_opts+=( --enable-trace-backend=dtrace )
+
+	# We always want to attempt to build with PIE support as it results
+	# in a more secure binary. But it doesn't work with static or if
+	# the current GCC doesn't have PIE support.
+	if use ${static_flag}; then
+		conf_opts+=( --static --disable-pie )
+	else
+		gcc-specs-pie && conf_opts+=( --enable-pie )
+	fi
+
+	echo "../configure ${conf_opts[*]}"
+	cd "${builddir}"
+	../configure "${conf_opts[@]}" || die "configure failed"
+
+	# FreeBSD's kernel does not support QEMU assigning/grabbing
+	# host USB devices yet
+	use kernel_FreeBSD && \
+		sed -i -E -e "s|^(HOST_USB=)bsd|\1stub|" "${S}"/config-host.mak
+}
+
+src_configure() {
+	local target
+
+	python_setup
+
+	softmmu_targets= softmmu_bins=()
+	user_targets= user_bins=()
+
+	for target in ${IUSE_SOFTMMU_TARGETS} ; do
+		if use "qemu_softmmu_targets_${target}"; then
+			softmmu_targets+=",${target}-softmmu"
+			softmmu_bins+=( "qemu-system-${target}" )
+		fi
+	done
+
+	for target in ${IUSE_USER_TARGETS} ; do
+		if use "qemu_user_targets_${target}"; then
+			user_targets+=",${target}-linux-user"
+			user_bins+=( "qemu-${target}" )
+		fi
+	done
+
+	softmmu_targets=${softmmu_targets#,}
+	user_targets=${user_targets#,}
+
+	[[ -n ${softmmu_targets} ]] && qemu_src_configure "softmmu"
+	[[ -n ${user_targets}    ]] && qemu_src_configure "user"
+	[[ -z ${softmmu_targets}${user_targets} ]] && qemu_src_configure "tools"
+}
+
+src_compile() {
+	if [[ -n ${user_targets} ]]; then
+		cd "${S}/user-build"
+		default
+	fi
+
+	if [[ -n ${softmmu_targets} ]]; then
+		cd "${S}/softmmu-build"
+		default
+	fi
+
+	if [[ -z ${softmmu_targets}${user_targets} ]]; then
+		cd "${S}/tools-build"
+		default
+	fi
+}
+
+src_test() {
+	if [[ -n ${softmmu_targets} ]]; then
+		cd "${S}/softmmu-build"
+		pax-mark m */qemu-system-* #515550
+		emake -j1 check
+		emake -j1 check-report.html
+	fi
+}
+
+qemu_python_install() {
+	python_domodule "${S}/scripts/qmp/qmp.py"
+
+	python_doscript "${S}/scripts/kvm/kvm_stat"
+	python_doscript "${S}/scripts/kvm/vmxcap"
+	python_doscript "${S}/scripts/qmp/qmp-shell"
+	python_doscript "${S}/scripts/qmp/qemu-ga-client"
+}
+
+src_install() {
+	if [[ -n ${user_targets} ]]; then
+		cd "${S}/user-build"
+		emake DESTDIR="${ED}" install
+
+		# Install binfmt handler init script for user targets
+		newinitd "${FILESDIR}/qemu-binfmt.initd-r1" qemu-binfmt
+	fi
+
+	if [[ -n ${softmmu_targets} ]]; then
+		cd "${S}/softmmu-build"
+		emake DESTDIR="${ED}" install
+
+		# This might not exist if the test failed. #512010
+		[[ -e check-report.html ]] && dohtml check-report.html
+
+		if use kernel_linux; then
+			udev_dorules "${FILESDIR}"/65-kvm.rules
+		fi
+
+		if use python; then
+			python_foreach_impl qemu_python_install
+		fi
+	fi
+
+	if [[ -z ${softmmu_targets}${user_targets} ]]; then
+		cd "${S}/tools-build"
+		emake DESTDIR="${ED}" install
+	fi
+
+	# Disable mprotect on the qemu binaries as they use JITs to be fast #459348
+	pushd "${ED}"/usr/bin >/dev/null
+	pax-mark m "${softmmu_bins[@]}" "${user_bins[@]}"
+	popd >/dev/null
+
+	# Install config file example for qemu-bridge-helper
+	insinto "/etc/qemu"
+	doins "${FILESDIR}/bridge.conf"
+
+	# Remove the docdir placed qmp-commands.txt
+	mv "${ED}/usr/share/doc/${PF}/html/qmp-commands.txt" "${S}/docs/qmp/"
+
+	cd "${S}"
+	dodoc Changelog MAINTAINERS docs/specs/pci-ids.txt
+	newdoc pc-bios/README README.pc-bios
+	dodoc docs/qmp/*.txt
+
+	if [[ -n ${softmmu_targets} ]]; then
+		# Remove SeaBIOS since we're using the SeaBIOS packaged one
+		rm "${ED}/usr/share/qemu/bios.bin"
+		if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
+			dosym ../seabios/bios.bin /usr/share/qemu/bios.bin
+		fi
+
+		# Remove vgabios since we're using the vgabios packaged one
+		rm "${ED}/usr/share/qemu/vgabios.bin"
+		rm "${ED}/usr/share/qemu/vgabios-cirrus.bin"
+		rm "${ED}/usr/share/qemu/vgabios-qxl.bin"
+		rm "${ED}/usr/share/qemu/vgabios-stdvga.bin"
+		rm "${ED}/usr/share/qemu/vgabios-vmware.bin"
+		if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
+			dosym ../vgabios/vgabios.bin /usr/share/qemu/vgabios.bin
+			dosym ../vgabios/vgabios-cirrus.bin /usr/share/qemu/vgabios-cirrus.bin
+			dosym ../vgabios/vgabios-qxl.bin /usr/share/qemu/vgabios-qxl.bin
+			dosym ../vgabios/vgabios-stdvga.bin /usr/share/qemu/vgabios-stdvga.bin
+			dosym ../vgabios/vgabios-vmware.bin /usr/share/qemu/vgabios-vmware.bin
+		fi
+
+		# Remove sgabios since we're using the sgabios packaged one
+		rm "${ED}/usr/share/qemu/sgabios.bin"
+		if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
+			dosym ../sgabios/sgabios.bin /usr/share/qemu/sgabios.bin
+		fi
+
+		# Remove iPXE since we're using the iPXE packaged one
+		rm "${ED}"/usr/share/qemu/pxe-*.rom
+		if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
+			dosym ../ipxe/8086100e.rom /usr/share/qemu/pxe-e1000.rom
+			dosym ../ipxe/80861209.rom /usr/share/qemu/pxe-eepro100.rom
+			dosym ../ipxe/10500940.rom /usr/share/qemu/pxe-ne2k_pci.rom
+			dosym ../ipxe/10222000.rom /usr/share/qemu/pxe-pcnet.rom
+			dosym ../ipxe/10ec8139.rom /usr/share/qemu/pxe-rtl8139.rom
+			dosym ../ipxe/1af41000.rom /usr/share/qemu/pxe-virtio.rom
+		fi
+	fi
+
+	qemu_support_kvm && readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	if qemu_support_kvm; then
+		readme.gentoo_print_elog
+	fi
+
+	if [[ -n ${softmmu_targets} ]] && use kernel_linux; then
+		udev_reload
+	fi
+
+	fcaps cap_net_admin /usr/libexec/qemu-bridge-helper
+	if use virtfs && [ -n "${softmmu_targets}" ]; then
+		local virtfs_caps="cap_chown,cap_dac_override,cap_fowner,cap_fsetid,cap_setgid,cap_mknod,cap_setuid"
+		fcaps ${virtfs_caps} /usr/bin/virtfs-proxy-helper
+	fi
+}
+
+pkg_info() {
+	echo "Using:"
+	echo "  $(best_version app-emulation/spice-protocol)"
+	echo "  $(best_version sys-firmware/ipxe)"
+	echo "  $(best_version sys-firmware/seabios)"
+	if has_version 'sys-firmware/seabios[binary]'; then
+		echo "    USE=binary"
+	else
+		echo "    USE=''"
+	fi
+	echo "  $(best_version sys-firmware/vgabios)"
+}
diff --git a/app-emulation/qemu/qemu-2.4.0.ebuild b/app-emulation/qemu/qemu-2.4.0.ebuild
deleted file mode 100644
index 0dfa27f069fb..000000000000
--- a/app-emulation/qemu/qemu-2.4.0.ebuild
+++ /dev/null
@@ -1,618 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="ncurses,readline"
-
-inherit eutils flag-o-matic linux-info toolchain-funcs multilib python-r1 \
-	user udev fcaps readme.gentoo pax-utils
-
-BACKPORTS=
-
-if [[ ${PV} = *9999* ]]; then
-	EGIT_REPO_URI="git://git.qemu.org/qemu.git"
-	inherit git-2
-	SRC_URI=""
-else
-	SRC_URI="http://wiki.qemu-project.org/download/${P}.tar.bz2
-	${BACKPORTS:+
-		https://dev.gentoo.org/~cardoe/distfiles/${P}-${BACKPORTS}.tar.xz}"
-	KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
-fi
-
-DESCRIPTION="QEMU + Kernel-based Virtual Machine userland tools"
-HOMEPAGE="http://www.qemu.org http://www.linux-kvm.org"
-
-LICENSE="GPL-2 LGPL-2 BSD-2"
-SLOT="0"
-IUSE="accessibility +aio alsa bluetooth +caps +curl debug +fdt glusterfs \
-gtk gtk2 infiniband iscsi +jpeg \
-kernel_linux kernel_FreeBSD lzo ncurses nfs nls numa opengl +pin-upstream-blobs
-+png pulseaudio python \
-rbd sasl +seccomp sdl sdl2 selinux smartcard snappy spice ssh static static-softmmu
-static-user systemtap tci test +threads tls usb usbredir +uuid vde +vhost-net \
-virtfs +vnc vte xattr xen xfs"
-
-COMMON_TARGETS="aarch64 alpha arm cris i386 m68k microblaze microblazeel mips
-mips64 mips64el mipsel or32 ppc ppc64 s390x sh4 sh4eb sparc sparc64 unicore32
-x86_64"
-IUSE_SOFTMMU_TARGETS="${COMMON_TARGETS} lm32 moxie ppcemb xtensa xtensaeb"
-IUSE_USER_TARGETS="${COMMON_TARGETS} armeb mipsn32 mipsn32el ppc64abi32 sparc32plus"
-
-use_softmmu_targets=$(printf ' qemu_softmmu_targets_%s' ${IUSE_SOFTMMU_TARGETS})
-use_user_targets=$(printf ' qemu_user_targets_%s' ${IUSE_USER_TARGETS})
-IUSE+=" ${use_softmmu_targets} ${use_user_targets}"
-
-# Allow no targets to be built so that people can get a tools-only build.
-# Block USE flag configurations known to not work.
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	gtk2? ( gtk )
-	qemu_softmmu_targets_arm? ( fdt )
-	qemu_softmmu_targets_microblaze? ( fdt )
-	qemu_softmmu_targets_ppc? ( fdt )
-	qemu_softmmu_targets_ppc64? ( fdt )
-	sdl2? ( sdl )
-	static? ( static-softmmu static-user )
-	static-softmmu? ( !alsa !pulseaudio !bluetooth !opengl !gtk !gtk2 )
-	virtfs? ( xattr )
-	vte? ( gtk )"
-
-# Yep, you need both libcap and libcap-ng since virtfs only uses libcap.
-#
-# The attr lib isn't always linked in (although the USE flag is always
-# respected).  This is because qemu supports using the C library's API
-# when available rather than always using the extranl library.
-COMMON_LIB_DEPEND=">=dev-libs/glib-2.0[static-libs(+)]
-	sys-libs/zlib[static-libs(+)]
-	xattr? ( sys-apps/attr[static-libs(+)] )"
-SOFTMMU_LIB_DEPEND="${COMMON_LIB_DEPEND}
-	>=x11-libs/pixman-0.28.0[static-libs(+)]
-	accessibility? ( app-accessibility/brltty[static-libs(+)] )
-	aio? ( dev-libs/libaio[static-libs(+)] )
-	alsa? ( >=media-libs/alsa-lib-1.0.13 )
-	bluetooth? ( net-wireless/bluez )
-	caps? ( sys-libs/libcap-ng[static-libs(+)] )
-	curl? ( >=net-misc/curl-7.15.4[static-libs(+)] )
-	fdt? ( >=sys-apps/dtc-1.4.0[static-libs(+)] )
-	glusterfs? ( >=sys-cluster/glusterfs-3.4.0[static-libs(+)] )
-	gtk? (
-		gtk2? (
-			x11-libs/gtk+:2
-			vte? ( x11-libs/vte:0 )
-		)
-		!gtk2? (
-			x11-libs/gtk+:3
-			vte? ( x11-libs/vte:2.90 )
-		)
-	)
-	infiniband? ( sys-infiniband/librdmacm:=[static-libs(+)] )
-	iscsi? ( net-libs/libiscsi )
-	jpeg? ( virtual/jpeg:=[static-libs(+)] )
-	lzo? ( dev-libs/lzo:2[static-libs(+)] )
-	ncurses? ( sys-libs/ncurses:0=[static-libs(+)] )
-	nfs? ( >=net-fs/libnfs-1.9.3[static-libs(+)] )
-	numa? ( sys-process/numactl[static-libs(+)] )
-	opengl? (
-		virtual/opengl
-		media-libs/libepoxy[static-libs(+)]
-		media-libs/mesa[static-libs(+)]
-		media-libs/mesa[gles2]
-	)
-	png? ( media-libs/libpng:0=[static-libs(+)] )
-	pulseaudio? ( media-sound/pulseaudio )
-	rbd? ( sys-cluster/ceph[static-libs(+)] )
-	sasl? ( dev-libs/cyrus-sasl[static-libs(+)] )
-	sdl? (
-		!sdl2? (
-			media-libs/libsdl[X]
-			>=media-libs/libsdl-1.2.11[static-libs(+)]
-		)
-		sdl2? (
-			media-libs/libsdl2[X]
-			media-libs/libsdl2[static-libs(+)]
-		)
-	)
-	seccomp? ( >=sys-libs/libseccomp-2.1.0[static-libs(+)] )
-	smartcard? ( dev-libs/nss !app-emulation/libcacard )
-	snappy? ( app-arch/snappy[static-libs(+)] )
-	spice? (
-		>=app-emulation/spice-protocol-0.12.3
-		>=app-emulation/spice-0.12.0[static-libs(+)]
-	)
-	ssh? ( >=net-libs/libssh2-1.2.8[static-libs(+)] )
-	tls? ( net-libs/gnutls[static-libs(+)] )
-	usb? ( >=virtual/libusb-1-r2[static-libs(+)] )
-	usbredir? ( >=sys-apps/usbredir-0.6[static-libs(+)] )
-	uuid? ( >=sys-apps/util-linux-2.16.0[static-libs(+)] )
-	vde? ( net-misc/vde[static-libs(+)] )
-	virtfs? ( sys-libs/libcap )
-	xfs? ( sys-fs/xfsprogs[static-libs(+)] )"
-USER_LIB_DEPEND="${COMMON_LIB_DEPEND}"
-X86_FIRMWARE_DEPEND="
-	>=sys-firmware/ipxe-1.0.0_p20130624
-	pin-upstream-blobs? (
-		~sys-firmware/seabios-1.7.5
-		~sys-firmware/sgabios-0.1_pre8
-		~sys-firmware/vgabios-0.7a
-	)
-	!pin-upstream-blobs? (
-		sys-firmware/seabios
-		sys-firmware/sgabios
-		sys-firmware/vgabios
-	)"
-CDEPEND="
-	!static-softmmu? ( $(printf "%s? ( ${SOFTMMU_LIB_DEPEND//\[static-libs(+)]} ) " ${use_softmmu_targets}) )
-	!static-user? ( $(printf "%s? ( ${USER_LIB_DEPEND//\[static-libs(+)]} ) " ${use_user_targets}) )
-	qemu_softmmu_targets_i386? ( ${X86_FIRMWARE_DEPEND} )
-	qemu_softmmu_targets_x86_64? ( ${X86_FIRMWARE_DEPEND} )
-	python? ( ${PYTHON_DEPS} )
-	systemtap? ( dev-util/systemtap )
-	xen? ( app-emulation/xen-tools )"
-DEPEND="${CDEPEND}
-	dev-lang/perl
-	=dev-lang/python-2*
-	sys-apps/texinfo
-	virtual/pkgconfig
-	kernel_linux? ( >=sys-kernel/linux-headers-2.6.35 )
-	gtk? ( nls? ( sys-devel/gettext ) )
-	static-softmmu? ( $(printf "%s? ( ${SOFTMMU_LIB_DEPEND} ) " ${use_softmmu_targets}) )
-	static-user? ( $(printf "%s? ( ${USER_LIB_DEPEND} ) " ${use_user_targets}) )
-	test? (
-		dev-libs/glib[utils]
-		sys-devel/bc
-	)"
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-qemu )
-"
-
-STRIP_MASK="/usr/share/qemu/palcode-clipper"
-
-QA_PREBUILT="
-	usr/share/qemu/openbios-ppc
-	usr/share/qemu/openbios-sparc64
-	usr/share/qemu/openbios-sparc32
-	usr/share/qemu/palcode-clipper
-	usr/share/qemu/s390-ccw.img
-	usr/share/qemu/u-boot.e500
-"
-
-QA_WX_LOAD="usr/bin/qemu-i386
-	usr/bin/qemu-x86_64
-	usr/bin/qemu-alpha
-	usr/bin/qemu-arm
-	usr/bin/qemu-cris
-	usr/bin/qemu-m68k
-	usr/bin/qemu-microblaze
-	usr/bin/qemu-microblazeel
-	usr/bin/qemu-mips
-	usr/bin/qemu-mipsel
-	usr/bin/qemu-or32
-	usr/bin/qemu-ppc
-	usr/bin/qemu-ppc64
-	usr/bin/qemu-ppc64abi32
-	usr/bin/qemu-sh4
-	usr/bin/qemu-sh4eb
-	usr/bin/qemu-sparc
-	usr/bin/qemu-sparc64
-	usr/bin/qemu-armeb
-	usr/bin/qemu-sparc32plus
-	usr/bin/qemu-s390x
-	usr/bin/qemu-unicore32"
-
-DOC_CONTENTS="If you don't have kvm compiled into the kernel, make sure
-you have the kernel module loaded before running kvm. The easiest way to
-ensure that the kernel module is loaded is to load it on boot.\n
-For AMD CPUs the module is called 'kvm-amd'\n
-For Intel CPUs the module is called 'kvm-intel'\n
-Please review /etc/conf.d/modules for how to load these\n\n
-Make sure your user is in the 'kvm' group\n
-Just run 'gpasswd -a <USER> kvm', then have <USER> re-login."
-
-qemu_support_kvm() {
-	if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386 \
-		use qemu_softmmu_targets_ppc || use qemu_softmmu_targets_ppc64 \
-		use qemu_softmmu_targets_s390x; then
-		return 0
-	fi
-
-	return 1
-}
-
-pkg_pretend() {
-	if use kernel_linux && kernel_is lt 2 6 25; then
-		eerror "This version of KVM requres a host kernel of 2.6.25 or higher."
-	elif use kernel_linux; then
-		if ! linux_config_exists; then
-			eerror "Unable to check your kernel for KVM support"
-		else
-			CONFIG_CHECK="~KVM ~TUN ~BRIDGE"
-			ERROR_KVM="You must enable KVM in your kernel to continue"
-			ERROR_KVM_AMD="If you have an AMD CPU, you must enable KVM_AMD in"
-			ERROR_KVM_AMD+=" your kernel configuration."
-			ERROR_KVM_INTEL="If you have an Intel CPU, you must enable"
-			ERROR_KVM_INTEL+=" KVM_INTEL in your kernel configuration."
-			ERROR_TUN="You will need the Universal TUN/TAP driver compiled"
-			ERROR_TUN+=" into your kernel or loaded as a module to use the"
-			ERROR_TUN+=" virtual network device if using -net tap."
-			ERROR_BRIDGE="You will also need support for 802.1d"
-			ERROR_BRIDGE+=" Ethernet Bridging for some network configurations."
-			use vhost-net && CONFIG_CHECK+=" ~VHOST_NET"
-			ERROR_VHOST_NET="You must enable VHOST_NET to have vhost-net"
-			ERROR_VHOST_NET+=" support"
-
-			if use amd64 || use x86 || use amd64-linux || use x86-linux; then
-				CONFIG_CHECK+=" ~KVM_AMD ~KVM_INTEL"
-			fi
-
-			use python && CONFIG_CHECK+=" ~DEBUG_FS"
-			ERROR_DEBUG_FS="debugFS support required for kvm_stat"
-
-			# Now do the actual checks setup above
-			check_extra_config
-		fi
-	fi
-
-	if grep -qs '/usr/bin/qemu-kvm' "${EROOT}"/etc/libvirt/qemu/*.xml; then
-		eerror "The kvm/qemu-kvm wrappers no longer exist, but your libvirt"
-		eerror "instances are still pointing to it.  Please update your"
-		eerror "configs in /etc/libvirt/qemu/ to use the -enable-kvm flag"
-		eerror "and the right system binary (e.g. qemu-system-x86_64)."
-		die "update your virt configs to not use qemu-kvm"
-	fi
-}
-
-pkg_setup() {
-	enewgroup kvm 78
-}
-
-src_prepare() {
-	# Alter target makefiles to accept CFLAGS set via flag-o
-	sed -i -r \
-		-e 's/^(C|OP_C|HELPER_C)FLAGS=/\1FLAGS+=/' \
-		Makefile Makefile.target || die
-
-	# Cheap hack to disable gettext .mo generation.
-	use nls || rm -f po/*.po
-
-	epatch "${FILESDIR}"/qemu-1.7.0-cflags.patch
-	[[ -n ${BACKPORTS} ]] && \
-		EPATCH_FORCE=yes EPATCH_SUFFIX="patch" EPATCH_SOURCE="${S}/patches" \
-			epatch
-
-	# Fix ld and objcopy being called directly
-	tc-export AR LD OBJCOPY
-
-	# Verbose builds
-	MAKEOPTS+=" V=1"
-
-	epatch_user
-}
-
-##
-# configures qemu based on the build directory and the build type
-# we are using.
-#
-qemu_src_configure() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	local buildtype=$1
-	local builddir="${S}/${buildtype}-build"
-	local static_flag="static-${buildtype}"
-
-	mkdir "${builddir}"
-
-	local conf_opts=(
-		--prefix=/usr
-		--sysconfdir=/etc
-		--libdir=/usr/$(get_libdir)
-		--docdir=/usr/share/doc/${PF}/html
-		--disable-bsd-user
-		--disable-guest-agent
-		--disable-strip
-		--disable-werror
-		--python="${PYTHON}"
-		--cc="$(tc-getCC)"
-		--cxx="$(tc-getCXX)"
-		--host-cc="$(tc-getBUILD_CC)"
-		$(use_enable debug debug-info)
-		$(use_enable debug debug-tcg)
-		--enable-docs
-		$(use_enable tci tcg-interpreter)
-		$(use_enable xattr attr)
-	)
-
-	# Disable options not used by user targets as the default configure
-	# options will autoprobe and try to link in a bunch of unused junk.
-	conf_softmmu() {
-		if [[ ${buildtype} == "user" ]] ; then
-			echo "--disable-${2:-$1}"
-		else
-			use_enable "$@"
-		fi
-	}
-	conf_opts+=(
-		$(conf_softmmu accessibility brlapi)
-		$(conf_softmmu aio linux-aio)
-		$(conf_softmmu bluetooth bluez)
-		$(conf_softmmu caps cap-ng)
-		$(conf_softmmu curl)
-		$(conf_softmmu fdt)
-		$(conf_softmmu glusterfs)
-		$(conf_softmmu gtk)
-		$(conf_softmmu infiniband rdma)
-		$(conf_softmmu iscsi libiscsi)
-		$(conf_softmmu jpeg vnc-jpeg)
-		$(conf_softmmu kernel_linux kvm)
-		$(conf_softmmu lzo)
-		$(conf_softmmu ncurses curses)
-		$(conf_softmmu nfs libnfs)
-		$(conf_softmmu numa)
-		$(conf_softmmu opengl)
-		$(conf_softmmu png vnc-png)
-		$(conf_softmmu rbd)
-		$(conf_softmmu sasl vnc-sasl)
-		$(conf_softmmu sdl)
-		$(conf_softmmu seccomp)
-		$(conf_softmmu smartcard smartcard-nss)
-		$(conf_softmmu snappy)
-		$(conf_softmmu spice)
-		$(conf_softmmu ssh libssh2)
-		$(conf_softmmu tls vnc-tls)
-		$(conf_softmmu usb libusb)
-		$(conf_softmmu usbredir usb-redir)
-		$(conf_softmmu uuid)
-		$(conf_softmmu vde)
-		$(conf_softmmu vhost-net)
-		$(conf_softmmu virtfs)
-		$(conf_softmmu vnc)
-		$(conf_softmmu vte)
-		$(conf_softmmu xen)
-		$(conf_softmmu xen xen-pci-passthrough)
-		$(conf_softmmu xfs xfsctl)
-	)
-
-	case ${buildtype} in
-	user)
-		conf_opts+=(
-			--enable-linux-user
-			--disable-system
-			--disable-blobs
-			--disable-tools
-		)
-		;;
-	softmmu)
-		# audio options
-		local audio_opts="oss"
-		use alsa && audio_opts="alsa,${audio_opts}"
-		use sdl && audio_opts="sdl,${audio_opts}"
-		use pulseaudio && audio_opts="pa,${audio_opts}"
-
-		conf_opts+=(
-			--disable-linux-user
-			--enable-system
-			--with-system-pixman
-			--audio-drv-list="${audio_opts}"
-		)
-		use gtk && conf_opts+=( --with-gtkabi=$(usex gtk2 2.0 3.0) )
-		use sdl && conf_opts+=( --with-sdlabi=$(usex sdl2 2.0 1.2) )
-		;;
-	tools)
-		conf_opts+=(
-			--disable-linux-user
-			--disable-system
-			--disable-blobs
-		)
-		static_flag="static"
-		;;
-	esac
-
-	local targets="${buildtype}_targets"
-	[[ -n ${targets} ]] && conf_opts+=( --target-list="${!targets}" )
-
-	# Add support for SystemTAP
-	use systemtap && conf_opts+=( --enable-trace-backend=dtrace )
-
-	# We always want to attempt to build with PIE support as it results
-	# in a more secure binary. But it doesn't work with static or if
-	# the current GCC doesn't have PIE support.
-	if use ${static_flag}; then
-		conf_opts+=( --static --disable-pie )
-	else
-		gcc-specs-pie && conf_opts+=( --enable-pie )
-	fi
-
-	echo "../configure ${conf_opts[*]}"
-	cd "${builddir}"
-	../configure "${conf_opts[@]}" || die "configure failed"
-
-	# FreeBSD's kernel does not support QEMU assigning/grabbing
-	# host USB devices yet
-	use kernel_FreeBSD && \
-		sed -i -E -e "s|^(HOST_USB=)bsd|\1stub|" "${S}"/config-host.mak
-}
-
-src_configure() {
-	local target
-
-	python_setup
-
-	softmmu_targets= softmmu_bins=()
-	user_targets= user_bins=()
-
-	for target in ${IUSE_SOFTMMU_TARGETS} ; do
-		if use "qemu_softmmu_targets_${target}"; then
-			softmmu_targets+=",${target}-softmmu"
-			softmmu_bins+=( "qemu-system-${target}" )
-		fi
-	done
-
-	for target in ${IUSE_USER_TARGETS} ; do
-		if use "qemu_user_targets_${target}"; then
-			user_targets+=",${target}-linux-user"
-			user_bins+=( "qemu-${target}" )
-		fi
-	done
-
-	softmmu_targets=${softmmu_targets#,}
-	user_targets=${user_targets#,}
-
-	[[ -n ${softmmu_targets} ]] && qemu_src_configure "softmmu"
-	[[ -n ${user_targets}    ]] && qemu_src_configure "user"
-	[[ -z ${softmmu_targets}${user_targets} ]] && qemu_src_configure "tools"
-}
-
-src_compile() {
-	if [[ -n ${user_targets} ]]; then
-		cd "${S}/user-build"
-		default
-	fi
-
-	if [[ -n ${softmmu_targets} ]]; then
-		cd "${S}/softmmu-build"
-		default
-	fi
-
-	if [[ -z ${softmmu_targets}${user_targets} ]]; then
-		cd "${S}/tools-build"
-		default
-	fi
-}
-
-src_test() {
-	if [[ -n ${softmmu_targets} ]]; then
-		cd "${S}/softmmu-build"
-		pax-mark m */qemu-system-* #515550
-		emake -j1 check
-		emake -j1 check-report.html
-	fi
-}
-
-qemu_python_install() {
-	python_domodule "${S}/scripts/qmp/qmp.py"
-
-	python_doscript "${S}/scripts/kvm/kvm_stat"
-	python_doscript "${S}/scripts/kvm/vmxcap"
-	python_doscript "${S}/scripts/qmp/qmp-shell"
-	python_doscript "${S}/scripts/qmp/qemu-ga-client"
-}
-
-src_install() {
-	if [[ -n ${user_targets} ]]; then
-		cd "${S}/user-build"
-		emake DESTDIR="${ED}" install
-
-		# Install binfmt handler init script for user targets
-		newinitd "${FILESDIR}/qemu-binfmt.initd-r1" qemu-binfmt
-	fi
-
-	if [[ -n ${softmmu_targets} ]]; then
-		cd "${S}/softmmu-build"
-		emake DESTDIR="${ED}" install
-
-		# This might not exist if the test failed. #512010
-		[[ -e check-report.html ]] && dohtml check-report.html
-
-		if use kernel_linux; then
-			udev_dorules "${FILESDIR}"/65-kvm.rules
-		fi
-
-		if use python; then
-			python_foreach_impl qemu_python_install
-		fi
-	fi
-
-	if [[ -z ${softmmu_targets}${user_targets} ]]; then
-		cd "${S}/tools-build"
-		emake DESTDIR="${ED}" install
-	fi
-
-	# Disable mprotect on the qemu binaries as they use JITs to be fast #459348
-	pushd "${ED}"/usr/bin >/dev/null
-	pax-mark m "${softmmu_bins[@]}" "${user_bins[@]}"
-	popd >/dev/null
-
-	# Install config file example for qemu-bridge-helper
-	insinto "/etc/qemu"
-	doins "${FILESDIR}/bridge.conf"
-
-	# Remove the docdir placed qmp-commands.txt
-	mv "${ED}/usr/share/doc/${PF}/html/qmp-commands.txt" "${S}/docs/qmp/"
-
-	cd "${S}"
-	dodoc Changelog MAINTAINERS docs/specs/pci-ids.txt
-	newdoc pc-bios/README README.pc-bios
-	dodoc docs/qmp/*.txt
-
-	if [[ -n ${softmmu_targets} ]]; then
-		# Remove SeaBIOS since we're using the SeaBIOS packaged one
-		rm "${ED}/usr/share/qemu/bios.bin"
-		if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
-			dosym ../seabios/bios.bin /usr/share/qemu/bios.bin
-		fi
-
-		# Remove vgabios since we're using the vgabios packaged one
-		rm "${ED}/usr/share/qemu/vgabios.bin"
-		rm "${ED}/usr/share/qemu/vgabios-cirrus.bin"
-		rm "${ED}/usr/share/qemu/vgabios-qxl.bin"
-		rm "${ED}/usr/share/qemu/vgabios-stdvga.bin"
-		rm "${ED}/usr/share/qemu/vgabios-vmware.bin"
-		if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
-			dosym ../vgabios/vgabios.bin /usr/share/qemu/vgabios.bin
-			dosym ../vgabios/vgabios-cirrus.bin /usr/share/qemu/vgabios-cirrus.bin
-			dosym ../vgabios/vgabios-qxl.bin /usr/share/qemu/vgabios-qxl.bin
-			dosym ../vgabios/vgabios-stdvga.bin /usr/share/qemu/vgabios-stdvga.bin
-			dosym ../vgabios/vgabios-vmware.bin /usr/share/qemu/vgabios-vmware.bin
-		fi
-
-		# Remove sgabios since we're using the sgabios packaged one
-		rm "${ED}/usr/share/qemu/sgabios.bin"
-		if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
-			dosym ../sgabios/sgabios.bin /usr/share/qemu/sgabios.bin
-		fi
-
-		# Remove iPXE since we're using the iPXE packaged one
-		rm "${ED}"/usr/share/qemu/pxe-*.rom
-		if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
-			dosym ../ipxe/8086100e.rom /usr/share/qemu/pxe-e1000.rom
-			dosym ../ipxe/80861209.rom /usr/share/qemu/pxe-eepro100.rom
-			dosym ../ipxe/10500940.rom /usr/share/qemu/pxe-ne2k_pci.rom
-			dosym ../ipxe/10222000.rom /usr/share/qemu/pxe-pcnet.rom
-			dosym ../ipxe/10ec8139.rom /usr/share/qemu/pxe-rtl8139.rom
-			dosym ../ipxe/1af41000.rom /usr/share/qemu/pxe-virtio.rom
-		fi
-	fi
-
-	qemu_support_kvm && readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	if qemu_support_kvm; then
-		readme.gentoo_print_elog
-	fi
-
-	if [[ -n ${softmmu_targets} ]] && use kernel_linux; then
-		udev_reload
-	fi
-
-	fcaps cap_net_admin /usr/libexec/qemu-bridge-helper
-	if use virtfs && [ -n "${softmmu_targets}" ]; then
-		local virtfs_caps="cap_chown,cap_dac_override,cap_fowner,cap_fsetid,cap_setgid,cap_mknod,cap_setuid"
-		fcaps ${virtfs_caps} /usr/bin/virtfs-proxy-helper
-	fi
-}
-
-pkg_info() {
-	echo "Using:"
-	echo "  $(best_version app-emulation/spice-protocol)"
-	echo "  $(best_version sys-firmware/ipxe)"
-	echo "  $(best_version sys-firmware/seabios)"
-	if has_version 'sys-firmware/seabios[binary]'; then
-		echo "    USE=binary"
-	else
-		echo "    USE=''"
-	fi
-	echo "  $(best_version sys-firmware/vgabios)"
-}
diff --git a/app-emulation/qemu/qemu-9999.ebuild b/app-emulation/qemu/qemu-9999.ebuild
index 0dfa27f069fb..9a8f7bd119c4 100644
--- a/app-emulation/qemu/qemu-9999.ebuild
+++ b/app-emulation/qemu/qemu-9999.ebuild
@@ -39,8 +39,8 @@ virtfs +vnc vte xattr xen xfs"
 COMMON_TARGETS="aarch64 alpha arm cris i386 m68k microblaze microblazeel mips
 mips64 mips64el mipsel or32 ppc ppc64 s390x sh4 sh4eb sparc sparc64 unicore32
 x86_64"
-IUSE_SOFTMMU_TARGETS="${COMMON_TARGETS} lm32 moxie ppcemb xtensa xtensaeb"
-IUSE_USER_TARGETS="${COMMON_TARGETS} armeb mipsn32 mipsn32el ppc64abi32 sparc32plus"
+IUSE_SOFTMMU_TARGETS="${COMMON_TARGETS} lm32 moxie ppcemb tricore xtensa xtensaeb"
+IUSE_USER_TARGETS="${COMMON_TARGETS} armeb mipsn32 mipsn32el ppc64abi32 ppc64le sparc32plus"
 
 use_softmmu_targets=$(printf ' qemu_softmmu_targets_%s' ${IUSE_SOFTMMU_TARGETS})
 use_user_targets=$(printf ' qemu_user_targets_%s' ${IUSE_USER_TARGETS})
@@ -134,7 +134,7 @@ USER_LIB_DEPEND="${COMMON_LIB_DEPEND}"
 X86_FIRMWARE_DEPEND="
 	>=sys-firmware/ipxe-1.0.0_p20130624
 	pin-upstream-blobs? (
-		~sys-firmware/seabios-1.7.5
+		~sys-firmware/seabios-1.8.2
 		~sys-firmware/sgabios-0.1_pre8
 		~sys-firmware/vgabios-0.7a
 	)
@@ -268,7 +268,29 @@ pkg_setup() {
 	enewgroup kvm 78
 }
 
+# Sanity check to make sure target lists are kept up-to-date.
+check_targets() {
+	local var=$1 mak=$2
+	local detected sorted
+
+	pushd "${S}"/default-configs >/dev/null || die
+
+	detected=$(echo $(printf '%s\n' *-${mak}.mak | sed "s:-${mak}.mak::" | sort -u))
+	sorted=$(echo $(printf '%s\n' ${!var} | sort -u))
+	if [[ ${sorted} != "${detected}" ]] ; then
+		eerror "The ebuild needs to be kept in sync."
+		eerror "${var}: ${sorted}"
+		eerror "$(printf '%-*s' ${#var} configure): ${detected}"
+		die "sync ${var} to the list of targets"
+	fi
+
+	popd >/dev/null
+}
+
 src_prepare() {
+	check_targets IUSE_SOFTMMU_TARGETS softmmu
+	check_targets IUSE_USER_TARGETS linux-user
+
 	# Alter target makefiles to accept CFLAGS set via flag-o
 	sed -i -r \
 		-e 's/^(C|OP_C|HELPER_C)FLAGS=/\1FLAGS+=/' \
diff --git a/app-emulation/rkt/Manifest b/app-emulation/rkt/Manifest
new file mode 100644
index 000000000000..d74b026c6ca6
--- /dev/null
+++ b/app-emulation/rkt/Manifest
@@ -0,0 +1,2 @@
+DIST rkt-0.8.0.tar.gz 1749853 SHA256 c9eb0126b8ff2f059d7cedaab17ca73dce256f342092c9bf4a7ae20661f2a5aa SHA512 4e2c27fb40cd3d27de062631105db3ea04ed902f48abb647a8e4de249478dd8a145ac0b77fd5b261cc680df1bcaa4067accb8a597def9b3963108e2c1f3d9d5a WHIRLPOOL f65ddd8908ec30cfefa06e60cd4d8cdb2099ab279b6350790eb3e436b88c792efe28cea53569f48d42f6eec682635a4212f16fea9d184e6baa97877a643e1106
+DIST rkt-pxe-738.1.0.img 151780780 SHA256 805a4c491281553c8927f3dd1a7bec50cca29209d0a7264870e7155d794ecbe6 SHA512 7774cc64dfa874f08f48cba0c15103e9eca86ffd87dcb24f765a9b56074e72f6862a663a4007a0a7dd296740ae91bf4edf7290fa35659b0b1572fe2f5dad3256 WHIRLPOOL 5973a6036d650c576bb0bd365c8c9ea35776501c1fd2baf1d7c00d06496fab35e9c796096ef89b095e7a922e2062dce6c0d1c85cd3101022e0aca84277d18cb9
diff --git a/app-emulation/rkt/metadata.xml b/app-emulation/rkt/metadata.xml
new file mode 100644
index 000000000000..1100d241c8ff
--- /dev/null
+++ b/app-emulation/rkt/metadata.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>mail@stefanjunker.de</email>
+		<name>Stefan Junker</name>
+	</maintainer>
+	<maintainer>
+		<email>alunduil@gentoo.org</email>
+		<name>Alex Brandt</name>
+	</maintainer>
+	<longdescription lang="en">
+		rkt is a new container runtime, designed for composability, security,
+		and speed. Today we are releasing a prototype version on GitHub to begin
+		gathering feedback from our community and explain why we are building
+		rkt. 
+	</longdescription>
+	<use>
+		<flag name="actool">Install the actool for ACI manipulation</flag>
+		<flag name="rkt_stage1_coreos">Download and use a prebuilt stage1.aci from CoreOS</flag>
+		<flag name="rkt_stage1_src">Build the stage1.aci from source</flag>
+		<flag name="rkt_stage1_host">Assemble stage1.aci from host binaries</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">coreos/rkt</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-emulation/rkt/rkt-0.8.0.ebuild b/app-emulation/rkt/rkt-0.8.0.ebuild
new file mode 100644
index 000000000000..e1354ed5a2a8
--- /dev/null
+++ b/app-emulation/rkt/rkt-0.8.0.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+AUTOTOOLS_AUTORECONF=yes
+AUTOTOOLS_IN_SOURCE_BUILD=yes
+
+inherit autotools-utils flag-o-matic systemd toolchain-funcs
+
+KEYWORDS="~amd64"
+
+PXE_VERSION="738.1.0"
+PXE_URI="http://alpha.release.core-os.net/amd64-usr/${PXE_VERSION}/coreos_production_pxe_image.cpio.gz"
+PXE_FILE="${PN}-pxe-${PXE_VERSION}.img"
+
+SRC_URI="https://github.com/coreos/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+rkt_stage1_coreos? ( $PXE_URI -> $PXE_FILE )"
+
+DESCRIPTION="A CLI for running app containers, and an implementation of the App
+Container Spec."
+HOMEPAGE="https://github.com/coreos/rkt"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="doc examples +rkt_stage1_coreos rkt_stage1_src +actool systemd"
+REQUIRED_USE="^^ ( rkt_stage1_coreos rkt_stage1_src )"
+
+DEPEND=">=dev-lang/go-1.4.1
+	app-arch/cpio
+	sys-fs/squashfs-tools
+	dev-perl/Capture-Tiny
+	rkt_stage1_src? (
+		>=sys-apps/systemd-222
+		app-shells/bash:0
+	)"
+RDEPEND="!app-emulation/rocket"
+
+BUILDDIR="build-${P}"
+
+src_configure() {
+	local myeconfargs=(
+		--with-stage1-image-path="/usr/share/rkt/stage1.aci"
+	)
+
+	if use rkt_stage1_src; then
+		myeconfargs+=( --with-stage1="src" )
+	elif use rkt_stage1_coreos; then
+		myeconfargs+=( --with-stage1="coreos" )
+		mkdir -p "${BUILDDIR}/tmp/usr_from_coreos/" || die
+		cp "${DISTDIR}/${PXE_FILE}" "${BUILDDIR}/tmp/usr_from_coreos/pxe.img" || die
+	fi
+
+	# Go's 6l linker does not support PIE, disable so cgo binaries
+	# which use 6l+gcc for linking can be built correctly.
+	if gcc-specs-pie; then
+		append-ldflags -nopie
+	fi
+
+	export CC=$(tc-getCC)
+	export CGO_ENABLED=1
+	export CGO_CFLAGS="${CFLAGS}"
+	export CGO_CPPFLAGS="${CPPFLAGS}"
+	export CGO_CXXFLAGS="${CXXFLAGS}"
+	export CGO_LDFLAGS="${LDFLAGS}"
+	export BUILDDIR
+
+	autotools-utils_src_configure
+}
+
+src_install() {
+	dodoc README.md
+	use doc && dodoc -r Documentation
+	use examples && dodoc -r examples
+	use actool && dobin "${S}/${BUILDDIR}/bin/actool"
+
+	dobin "${S}/${BUILDDIR}/bin/rkt"
+
+	insinto /usr/share/rkt/
+	doins "${S}/${BUILDDIR}/bin/stage1.aci"
+
+	systemd_dounit "${S}"/dist/init/systemd/${PN}-gc.service
+	systemd_dounit "${S}"/dist/init/systemd/${PN}-gc.timer
+	systemd_dounit "${S}"/dist/init/systemd/${PN}-metadata.service
+	systemd_dounit "${S}"/dist/init/systemd/${PN}-metadata.socket
+}
diff --git a/app-emulation/rkt/rkt-9999.ebuild b/app-emulation/rkt/rkt-9999.ebuild
new file mode 100644
index 000000000000..fcb665c9746c
--- /dev/null
+++ b/app-emulation/rkt/rkt-9999.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+AUTOTOOLS_AUTORECONF=yes
+AUTOTOOLS_IN_SOURCE_BUILD=yes
+
+inherit autotools-utils flag-o-matic systemd toolchain-funcs
+inherit git-r3
+
+EGIT_REPO_URI="https://github.com/coreos/rkt.git"
+
+KEYWORDS=""
+PXE_VERSION="738.1.0"
+EGIT_BRANCH="master"
+
+PXE_URI="http://alpha.release.core-os.net/amd64-usr/${PXE_VERSION}/coreos_production_pxe_image.cpio.gz"
+PXE_FILE="${PN}-pxe-${PXE_VERSION}.img"
+
+SRC_URI="rkt_stage1_coreos? ( $PXE_URI -> $PXE_FILE )"
+
+DESCRIPTION="A CLI for running app containers, and an implementation of the App
+Container Spec."
+HOMEPAGE="https://github.com/coreos/rkt"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="doc examples +rkt_stage1_coreos rkt_stage1_host rkt_stage1_src +actool systemd"
+REQUIRED_USE="^^ ( rkt_stage1_coreos rkt_stage1_host rkt_stage1_src )"
+
+DEPEND=">=dev-lang/go-1.4.1
+	app-arch/cpio
+	sys-fs/squashfs-tools
+	dev-perl/Capture-Tiny
+	rkt_stage1_src? (
+		>=sys-apps/systemd-222
+		app-shells/bash:0
+	)"
+RDEPEND="!app-emulation/rocket
+	rkt_stage1_host? (
+		>=sys-apps/systemd-222
+		app-shells/bash:0
+	)"
+
+BUILDDIR="build-${P}"
+
+src_configure() {
+	local myeconfargs=(
+		--with-stage1-image-path="/usr/share/rkt/stage1.aci"
+	)
+
+	if use rkt_stage1_host; then
+		myeconfargs+=( --with-stage1="host" )
+	elif use rkt_stage1_src; then
+		myeconfargs+=( --with-stage1="src" )
+	elif use rkt_stage1_coreos; then
+		myeconfargs+=( --with-stage1="coreos" )
+		mkdir -p "${BUILDDIR}/tmp/usr_from_coreos/" || die
+		cp "${DISTDIR}/${PXE_FILE}" "${BUILDDIR}/tmp/usr_from_coreos/pxe.img" || die
+	fi
+
+	# Go's 6l linker does not support PIE, disable so cgo binaries
+	# which use 6l+gcc for linking can be built correctly.
+	if gcc-specs-pie; then
+		append-ldflags -nopie
+	fi
+
+	export CC=$(tc-getCC)
+	export CGO_ENABLED=1
+	export CGO_CFLAGS="${CFLAGS}"
+	export CGO_CPPFLAGS="${CPPFLAGS}"
+	export CGO_CXXFLAGS="${CXXFLAGS}"
+	export CGO_LDFLAGS="${LDFLAGS}"
+	export BUILDDIR
+
+	autotools-utils_src_configure
+}
+
+src_install() {
+	dodoc README.md
+	use doc && dodoc -r Documentation
+	use examples && dodoc -r examples
+	use actool && dobin "${S}/${BUILDDIR}/bin/actool"
+
+	dobin "${S}/${BUILDDIR}/bin/rkt"
+
+	insinto /usr/share/rkt/
+	doins "${S}/${BUILDDIR}/bin/stage1.aci"
+
+	systemd_dounit "${S}"/dist/init/systemd/${PN}-gc.service
+	systemd_dounit "${S}"/dist/init/systemd/${PN}-gc.timer
+	systemd_dounit "${S}"/dist/init/systemd/${PN}-metadata.service
+	systemd_dounit "${S}"/dist/init/systemd/${PN}-metadata.socket
+}
diff --git a/app-emulation/virt-manager/virt-manager-9999.ebuild b/app-emulation/virt-manager/virt-manager-9999.ebuild
index 8f0ce94204db..1d629011a7e2 100644
--- a/app-emulation/virt-manager/virt-manager-9999.ebuild
+++ b/app-emulation/virt-manager/virt-manager-9999.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} = *9999* ]]; then
 	inherit git-2
 	SRC_URI=""
 	KEYWORDS=""
-	EGIT_REPO_URI="git://git.fedorahosted.org/virt-manager.git"
+	EGIT_REPO_URI="https://github.com/virt-manager/virt-manager.git"
 else
 	SRC_URI="http://virt-manager.org/download/sources/${PN}/${P}.tar.gz"
 	KEYWORDS="~amd64 ~x86"
diff --git a/app-emulation/virtualbox-additions/Manifest b/app-emulation/virtualbox-additions/Manifest
index 882d6321855e..e7fac29d663a 100644
--- a/app-emulation/virtualbox-additions/Manifest
+++ b/app-emulation/virtualbox-additions/Manifest
@@ -1,4 +1,4 @@
 DIST VBoxGuestAdditions_4.3.28.iso 58241024 SHA256 9f52e186d6c9407b2676d4b2ed1cdf96940ec129cc2bd92e54b24526271a9733 SHA512 78055f389dc1a7bd62577f1fa670b8f8899ab3a58a87953d30fcaea1cd0c77f8662e15fea932c434309747971a2a61b61854b6f087654d9d2fb2de07fb6f1b5c WHIRLPOOL 64275e44c01f4f260899a7c16aaeb494ebe81277e7cbdec87e487736833cc239338f3c32c00759244b3be55c5754788593b81d06dab7d9ab26991369fa9d65fd
 DIST VBoxGuestAdditions_4.3.30.iso 58257408 SHA256 432c2da1d9a939de7ba1d2cfb10595031374af9ce66417a43979d1794beedbb1 SHA512 a782e47381b708aee8a8f2c1d6608d51d09a2fb0d55ea3b543530a31cbf489043f05d4c334a9e269b922318339cb78a897603b8bce2749fe02088a6e9a4fd177 WHIRLPOOL c70b9e630820f7be38e38fd7ce20073c3766758950f60367a3a6e666644f10baadbfb5a9dc67c7c8364770e7ae28d27d632c53699fd6d1102bf672672419f1f2
-DIST VBoxGuestAdditions_5.0.0.iso 58601472 SHA256 7b61f523db7ba75aebc4c7bb0cae2da92674fa72299e4a006c5c67517f7d786b SHA512 8db386b2bf4ccfadcffbef2d38fc8374e4c51aabdbddc4ccf632be029b84d560416bcd255ae1e228f862ea294ff2c7e4f1e0b1076f387d84ed72fbf03407d6e8 WHIRLPOOL 2fcd8544bb668b38e25b9f70ab9b1e646daea7657c5c15c9eaecb9a028ee6961cc8b729ec4d0f1db2de620e074e033bbb6cd0a8529ce133136634498f44e33d2
 DIST VBoxGuestAdditions_5.0.2.iso 58716160 SHA256 974063ca9c7bde796dd77ba55d35583dc5d8bc27d53a6bfd81ae206978b133e2 SHA512 598709d64d78687e6905f3a17bd1442aae588a3024fbb6732a3fcbc43e9299e23a5d377bb4f810f4747b62db5c7cf6bd9f21270d5e76fd365743f845256ae736 WHIRLPOOL 86d3f40b67e6bbd6e1ff503e44558fc213f8c42d8496fcbd148ff82f418012ea58854470090ddaa9754a35e53b2dd335d4a116bd8502c1e00f4b4b1b729b3998
+DIST VBoxGuestAdditions_5.0.4.iso 58793984 SHA256 de4abc28832d4e96b826efef3e7e69e69d6b941babfdc6317185f1fd6e22ffcf SHA512 c35561b5e332a7cf815c672111fe937ebe9ed5297853b3577fb347437e3b11a9ef3f19eb00318f277560644f49c858e1e12657b5d4c3a02cd91c8d2339e08545 WHIRLPOOL f3520bbcb939d1503c00954a59e0c31b502303450cc0c6f8c067e67501bf4015938d0fccd453e29650dc9b587ab9c4b3a190321d42803fac73d3435da91d38f2
diff --git a/app-emulation/virtualbox-additions/virtualbox-additions-5.0.0.ebuild b/app-emulation/virtualbox-additions/virtualbox-additions-5.0.4.ebuild
index e46434cb5133..e46434cb5133 100644
--- a/app-emulation/virtualbox-additions/virtualbox-additions-5.0.0.ebuild
+++ b/app-emulation/virtualbox-additions/virtualbox-additions-5.0.4.ebuild
diff --git a/app-emulation/virtualbox-bin/Manifest b/app-emulation/virtualbox-bin/Manifest
index 7dad4f7ce3dc..733523c131fd 100644
--- a/app-emulation/virtualbox-bin/Manifest
+++ b/app-emulation/virtualbox-bin/Manifest
@@ -1,16 +1,16 @@
 DIST Oracle_VM_VirtualBox_Extension_Pack-4.3.28-100309.tar.gz 15961939 SHA256 72e101d9dc5eabeb76d1ab5bd6d2f817a11c89adfe8bb72cc5d614a2eef532d1 SHA512 57ad44a99a7abcad195e6ceccc1fe7b494979da65601a52e0be8336bb819812d5cef48a8bc0fe9f74f3a05238e6fd29562ac678d4ef7e0c78587fe81c287a65e WHIRLPOOL fb08189c53841664119bffb4de6a76d6f72fb035f887ed5e948f38faa5be2891e35de0806da02d299e818370285bcddba06eb84bea7db4d3cfa09d92f8042db7
 DIST Oracle_VM_VirtualBox_Extension_Pack-4.3.30-101610.tar.gz 15983777 SHA256 770d49247976f2a0d14a66196dddf864c6b9d185671e2a29cab459fc28f105db SHA512 f5d8275fe3e1ea60e8d15af3b0c7382faab172df39369c8904ff734a5105daed87a48215880b2e286c6735ead341c237d2260e6ee923f513818f85cf0b452def WHIRLPOOL 3b1e29a44413ebc65dc250b2366b1fe75d6ea48fd94b722c8ec9eb7e97e6981470e9201c9840d566953c9c9bdd4a7893f9d525b3fac7150ca24391f696bba9c4
-DIST Oracle_VM_VirtualBox_Extension_Pack-5.0.0-101573.tar.gz 18028050 SHA256 c357e36368883df821ed092d261890a95c75e50422b75848c40ad20984086a7a SHA512 8eb21610ab4d4b5ada5901e25adcc99ad2b4ab20e86309c90f9bad993d71007f13eccf81e3670102e5400fa02d3df9c03d0901389f8980e9cdfa092b2d326271 WHIRLPOOL bd0cff1c58d90663b5c4f7983b05be9f3469f201143f30ef729723aaa55508685a34355b00ad952dc5132045589a1b26d71bbc5a5ee0d0fc32b99cf0a5f8e4f8
 DIST Oracle_VM_VirtualBox_Extension_Pack-5.0.2-102096.tar.gz 16868753 SHA256 0c49864ea7ab2be8b95c4495e5825b0e48b8611e1761c1b22b86a3f4bf9201bf SHA512 d072e3460366cf6ae40e4b4e9944463db43b6a0a3ed3c872495c6454fb177181ab376917b59550edb000737dc49347025977754b2e20bbe43cdb5b389dff7165 WHIRLPOOL ead3d7f55245a18f418f58d31005912bef3b4b9a4bed6ef9f4ef42e04d98514be50f2bf18e5f161236dbbdbd2833873cca2ed552214520749595adec57f74c0c
+DIST Oracle_VM_VirtualBox_Extension_Pack-5.0.4-102546.tar.gz 16874455 SHA256 e4618e7847eff7c31426f4639bcd83c37bd817147081d3218f21c8e7b6bc7cfa SHA512 1b645422966a2e90b2d2af9187e756d90cb5307db70718cb6e6679426da2d43ec5e398e6ab082195b7a4ad302bb626ad2101c3237759481177db2104bf8b6a23 WHIRLPOOL 6cdb3a63ea0a8d2ce3952d3613fcea3af1e104b1e09d8167bf2c78cb52e3a1c49db669cbeebdc54c9140c36b77c20970b666aa0f6f3d9af43b2b543251288f46
 DIST VirtualBox-4.3.28-100309-Linux_amd64.run 85677523 SHA256 8c862533f876dc32fbfae993597b1123e2feac81a302c60e73b7ee891e17a77f SHA512 75dc2cd257b187b0a497b87c2f1e576a57ceece290327a98804c903810522444b0a64a704bc51a25945dbaa5c0caf30898ba258829577e2f17f7c736fcf59bb0 WHIRLPOOL c8d5d885807ad633bf1c4c6f98cac8dddf4002dc2e21ed2d2fb2f0a859f447b7ce06d1c49c4daff4147b25ca4992da14b6b75b39f47075c861732e6ef00091d1
 DIST VirtualBox-4.3.28-100309-Linux_x86.run 85083598 SHA256 aeb224d7136314865db8175db665408a3dc08f50ed68fbd4bf1568b32b7ea2f6 SHA512 110e20a45657c7677fcab0158d31052c909893b8f618adad2a2c95ad119d47d7c35d4aedf3692dd650fda62ba0747acf202364c14034e5c10d17cd45a9918707 WHIRLPOOL 35c97248985d11c77194ac03448357331e08b7ef64a77ba416564b6051eaf74ffb5a0acdf835bfcf71657c5fdd58066947b0ba1c42e91d34dbf026434f662f67
 DIST VirtualBox-4.3.30-101610-Linux_amd64.run 81069522 SHA256 5745bc9b1edd1d7d28f81ba7fed7fff3ed0bbe7084c39a77bd305018ad0a420d SHA512 928dc5b6b9031892f9391ded3aa10b090a9312c16e5b8bd4d0457d3af3d5f5495323e48a5cc781411c14318aab5d3856de5369bbf1ac3b75068797ef4c5445a7 WHIRLPOOL bf5175a228ddef4319f6972dadefa035dc0902b290691ba14478f10fe89947fbc3f9545b65d4c09f397c06309fb01a7fab6187b5f9f9d2cb39b9f808b0bb5bb5
 DIST VirtualBox-4.3.30-101610-Linux_x86.run 80537038 SHA256 c8e42d247ecfa1ff3e3da6c7988a58e2d64fbb54598e9b08211308226d61c42a SHA512 629907432887606b1e31328a751c5ec3c764e90b3eae4a984c5d9e6b5f77b626e8eafa235bb55a0e1725fe95324dcb3cc1c8e2f441d716a8408d1e1ddf0e5dde WHIRLPOOL c10976693284b7b1c178aa036eb5d28ce76366362ac00eb0f686e8f99ddb93df508654d8acab0912714d3f9215d8f217a91999c25877fb2b973171b9be8b7d09
-DIST VirtualBox-5.0.0-101573-Linux_amd64.run 84284870 SHA256 19d6ffec4fd84924a70cbe07bb9021b77dea26b85082b5a008828e5ecf57e4bc SHA512 5e5aba2325118c60f4fcdf15c306ff0aa3fd036cd4dd7097455a5390b85c8d40a5a435143004085ef263367f987f6e9d7d03175ba7e64c2978be09d698c2900a WHIRLPOOL 20b123932afd3c3b407d1768eec84ab9469dfec7e92e07a73fdf0bd800736b21da113590b5edef85dcc1092040073ecbb3b17e35333600229ae25368c8438d5d
-DIST VirtualBox-5.0.0-101573-Linux_x86.run 83353025 SHA256 fddb7946ae68f235ef07a88dfc57130efd2c4e02ae76c9d809c30ecec8896905 SHA512 84363cac2b453469adaeeb58dd93a9b8a69dbc58c0355a0b7f55d5fc65ccebb808da144beb3e1f7550286ce7622cc583f2e0c5de6f99539a335bb5e5e490ce65 WHIRLPOOL fc8f1c948852fb10ab140a3ea9ea3946da35b275adb3382f37e14310cc2d815b7b63ce2b12a8c3bdb8d8e0dc0da1ddadd03e3c0091fa870a337cfebbae43420b
 DIST VirtualBox-5.0.2-102096-Linux_amd64.run 84540870 SHA256 2d976eb4929ee8fe4b3ec9a1d5f7a070ffb3053d8a3e15d223a4689a7dd93adb SHA512 ab03a2f456376fbcb6dc501a1be4a2f949f5cc56f883749104be3bf004ce8c8f3920c8bdd573c4093a5cc84a8dfaf0793cc55276e8d88ec135751ac3f4051651 WHIRLPOOL cc98cd331d60de2ff57867630c01330fe85c474b96b1898e1f5c5d1485d88444a46ab9df17a6c5a61a3f174d59b4061ae80654de7c3ed0061c731ef5558a4b1a
 DIST VirtualBox-5.0.2-102096-Linux_x86.run 83639745 SHA256 cc71706026fd9d3d57527e7bf7861da0fb5317ed28952d65c81d16baca24f2e9 SHA512 01cbcf6aa8a1caa3e4a2f2fe65680827f28adb6a229bbf924673850901ec9c7331996c4f158e66fe427dc318f2bbfe12041a436ec861c56561378781d985212f WHIRLPOOL 57b77de0a100e3b75ae0f5a37edffe7f1e73a63bef1fb27f85f284ef54fa35f7ee5a77bef114f75ef3dfa07fbbaed111eaa1fc56f7dceeb90f5494aad36b0f89
+DIST VirtualBox-5.0.4-102546-Linux_amd64.run 84254161 SHA256 d9c4a166aa350ca26a9063163b18b8e37eee9b7a4cb592f55c5e4aaf406daa3b SHA512 3ad21812a96f94e613985ae2fbe75ac9bb982d46d7b01bf0da7d2e7512f120666720d1145d4725d36d7bb7d611abb1d4cbe045d025742a4de928f21d308eaa98 WHIRLPOOL 71279d6133d1ea2c63349d01dea12a225d1eb89205d657708e8f9e34fb6affeadd223203d6e551c03766e619b3b83b022009f16dc5eb4bd5016ad7eec56252c5
+DIST VirtualBox-5.0.4-102546-Linux_x86.run 83373516 SHA256 cbb5f4e464645fd98c21b15013a97ab2f333496f374ddba03e9df469f7382fe4 SHA512 65ac5ea3fe2a1dbb957bcd02cd5e23130659e1eae599218d85cf8b5d2eea3afa08dd6b69d4a58e399f92f149503a3dcadb9b7e2b10fa1c70c3921baed5370fe8 WHIRLPOOL 14f8d8fd8f8c113ce930254bd2c677a8cdbf8eab3afad8a12902083d01c554336a804e8ba8c47905d4a0be3c9acd2cfe4307343f8d3a8c814611028c12b6cb2f
 DIST VirtualBoxSDK-4.3.28-100309.zip 11698378 SHA256 fe0cc316cecb3dfe9bbb925e6c023620d4cfd8e137b2a9b9f40f22f527af16fa SHA512 6af7d2107cff080281a356cbf522961b2e9d1917e861e410b169ce5ca3cefe05cc87e4e01f78ae171f8716f7006c031f14fc01d8d282a872a4f619638049b11a WHIRLPOOL 23a77dbc410a28b2799264da88d79b2c4335c07da67dd8bf4be26cac271e3ed38a9bf4fb2966ec0a3c06fb869bb252f5fa6a34a9a9c62cbb9a2fb0ad76442f66
 DIST VirtualBoxSDK-4.3.30-101610.zip 11436700 SHA256 6d8f1a006d56dfa1bbec10a35369c80c75845fdc6127c4d806b5c69cec03ab7e SHA512 2b2b3220d9ce908813699f8fc4cee80de5b29cb134ec968c2ccbb78c40b8d0d8aeb666996627f0f13cd036ef0376582c48f6c12b45acb7593d8b0eefd6eba960 WHIRLPOOL fe82cacecfedc05b6d92feac5285bc41100a9538f6cb37027c85ee08e051580243e2635af9d873c67970ecab5e8ee8eee0cee89e50be59895b44862264aa3fdf
-DIST VirtualBoxSDK-5.0.0-101573.zip 9635666 SHA256 769267df1940ed6be0742ace40af98d141b9b79a832c8cc772af5e87628c0b7c SHA512 f115653cf2595bbed59add41c297cb1c96332fc87770cf7d2784a0f6148970492038b533a17a569dd5037f9bf136b14205bd8afa71cde0f54f37a2d722c2b13e WHIRLPOOL 022be41a5ec6d316c588447ced475219102103c4292a4d9bc05eee78d621680cff87c18ff809d0245f01f201b05d1163a014453179f790d58103846ae1c2091e
 DIST VirtualBoxSDK-5.0.2-102096.zip 9636596 SHA256 6df7b53e877d8899ec98fa5e60eeca293a8e03f343e03b82936fdee35b3c0ae1 SHA512 fb3037ea0c767bb87bf9f945916f164a2b8901b4b9e24ff72eaf0f10f7fcb29d32f719d581ec0fbcd897cf2decaaf31789d64ff63a209182b5cbd71c4752b685 WHIRLPOOL 2726216d786ed3b0fe874b1d403fd691ebb60916b83579817a4dd9a1c2e47b6f0379ac1a9bd8d9ba2492b0ffe9ec4113210be8856d27ee4b7e0d027ceb8f81f3
+DIST VirtualBoxSDK-5.0.4-102546.zip 9634312 SHA256 f09c428a56a10b204bba8f1cb27c3c8bd6539efd9f88e375a5894fae747d9c81 SHA512 bb06c6cb10786029b542e855bcf87f91083b3de080a367ac2a16c5c1416b10352f7bc76b416349038545499db7c17c7904747420b221d0a21ae6615c79b2cbb9 WHIRLPOOL 9afe856f0d954ea7f1faeca4748de264084897e1e85f18eedfbd585a43d115a04b22c8e8d5e998322f1936c169c83a9761f908adb839ebd070da56a390ca0327
diff --git a/app-emulation/virtualbox-bin/virtualbox-bin-5.0.0.101573.ebuild b/app-emulation/virtualbox-bin/virtualbox-bin-5.0.4.102546.ebuild
index be7050520b60..be7050520b60 100644
--- a/app-emulation/virtualbox-bin/virtualbox-bin-5.0.0.101573.ebuild
+++ b/app-emulation/virtualbox-bin/virtualbox-bin-5.0.4.102546.ebuild
diff --git a/app-emulation/virtualbox-extpack-oracle/Manifest b/app-emulation/virtualbox-extpack-oracle/Manifest
index 68efc60f0a34..5f0bb4a3ad69 100644
--- a/app-emulation/virtualbox-extpack-oracle/Manifest
+++ b/app-emulation/virtualbox-extpack-oracle/Manifest
@@ -1,4 +1,4 @@
 DIST Oracle_VM_VirtualBox_Extension_Pack-4.3.28-100309.tar.gz 15961939 SHA256 72e101d9dc5eabeb76d1ab5bd6d2f817a11c89adfe8bb72cc5d614a2eef532d1 SHA512 57ad44a99a7abcad195e6ceccc1fe7b494979da65601a52e0be8336bb819812d5cef48a8bc0fe9f74f3a05238e6fd29562ac678d4ef7e0c78587fe81c287a65e WHIRLPOOL fb08189c53841664119bffb4de6a76d6f72fb035f887ed5e948f38faa5be2891e35de0806da02d299e818370285bcddba06eb84bea7db4d3cfa09d92f8042db7
 DIST Oracle_VM_VirtualBox_Extension_Pack-4.3.30-101610.tar.gz 15983777 SHA256 770d49247976f2a0d14a66196dddf864c6b9d185671e2a29cab459fc28f105db SHA512 f5d8275fe3e1ea60e8d15af3b0c7382faab172df39369c8904ff734a5105daed87a48215880b2e286c6735ead341c237d2260e6ee923f513818f85cf0b452def WHIRLPOOL 3b1e29a44413ebc65dc250b2366b1fe75d6ea48fd94b722c8ec9eb7e97e6981470e9201c9840d566953c9c9bdd4a7893f9d525b3fac7150ca24391f696bba9c4
-DIST Oracle_VM_VirtualBox_Extension_Pack-5.0.0-101573.tar.gz 18028050 SHA256 c357e36368883df821ed092d261890a95c75e50422b75848c40ad20984086a7a SHA512 8eb21610ab4d4b5ada5901e25adcc99ad2b4ab20e86309c90f9bad993d71007f13eccf81e3670102e5400fa02d3df9c03d0901389f8980e9cdfa092b2d326271 WHIRLPOOL bd0cff1c58d90663b5c4f7983b05be9f3469f201143f30ef729723aaa55508685a34355b00ad952dc5132045589a1b26d71bbc5a5ee0d0fc32b99cf0a5f8e4f8
 DIST Oracle_VM_VirtualBox_Extension_Pack-5.0.2-102096.tar.gz 16868753 SHA256 0c49864ea7ab2be8b95c4495e5825b0e48b8611e1761c1b22b86a3f4bf9201bf SHA512 d072e3460366cf6ae40e4b4e9944463db43b6a0a3ed3c872495c6454fb177181ab376917b59550edb000737dc49347025977754b2e20bbe43cdb5b389dff7165 WHIRLPOOL ead3d7f55245a18f418f58d31005912bef3b4b9a4bed6ef9f4ef42e04d98514be50f2bf18e5f161236dbbdbd2833873cca2ed552214520749595adec57f74c0c
+DIST Oracle_VM_VirtualBox_Extension_Pack-5.0.4-102546.tar.gz 16874455 SHA256 e4618e7847eff7c31426f4639bcd83c37bd817147081d3218f21c8e7b6bc7cfa SHA512 1b645422966a2e90b2d2af9187e756d90cb5307db70718cb6e6679426da2d43ec5e398e6ab082195b7a4ad302bb626ad2101c3237759481177db2104bf8b6a23 WHIRLPOOL 6cdb3a63ea0a8d2ce3952d3613fcea3af1e104b1e09d8167bf2c78cb52e3a1c49db669cbeebdc54c9140c36b77c20970b666aa0f6f3d9af43b2b543251288f46
diff --git a/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-5.0.0.101573.ebuild b/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-5.0.4.102546.ebuild
index 19d40ce0c134..19d40ce0c134 100644
--- a/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-5.0.0.101573.ebuild
+++ b/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-5.0.4.102546.ebuild
diff --git a/app-emulation/virtualbox-guest-additions/Manifest b/app-emulation/virtualbox-guest-additions/Manifest
index 1d763fe14654..a5b92fd2dd7f 100644
--- a/app-emulation/virtualbox-guest-additions/Manifest
+++ b/app-emulation/virtualbox-guest-additions/Manifest
@@ -1,4 +1,4 @@
 DIST VirtualBox-4.3.28.tar.bz2 100092002 SHA256 e157ab76d1958ae2c56b2a3875194fbff3de82486ad0e30032fd5bd772297c31 SHA512 b6e849a1420515b6dbda8cee0ab64940dd93296ec58cde76676ac257ff3dad0459aa1fd0bda7e1d0abc751d2d59f055465b198a546fdbb4e70e934a78654a8fc WHIRLPOOL 1b739f1f989032e07829a23ffadadd49e31109d70b0effbc44126a48a165218ff3ebafa576fa0e4f2af76a404033b60e5c9804ac43db5dd3024f1eca25ca70da
 DIST VirtualBox-4.3.30.tar.bz2 97428942 SHA256 ea9569ec16cd6202ee61bcadb2506d31ac12fd343adb91565773a05eaaea9a36 SHA512 d0817335cf4bd196da93b91ede6bc9e48ca0d471166ab2790dbf508a4574e4ace54a86053932abf3b4e804c583e80a713d2ab2e556dc15bee6ef3a62f88b95fc WHIRLPOOL 47cbd702e83cc737e04b5862cc6c52e32be244dc1dc0145f582f57b2f19bb898f0f4b200576a28f10a3290691f1ffd43c256e8c8eb5545a9723be8eefca88a38
-DIST VirtualBox-5.0.0.tar.bz2 109816664 SHA256 bb71356c8f82012c9b5ae16e12302eb111c71ae7b063ada7688fbfa8aa10c2f7 SHA512 c9557820fa04215b1b7905babfab340a01ad2cf733a18462fc608f8db5d0aa908e9ec0d92b3c77075e8a1322c10c92f58f8f14608aa3480052ca730ebd507636 WHIRLPOOL 7cda1523e0cd2851cbea5bb7a202963bac67cc6af29d0ec9a706dcec53746e50e6c85ccea014604eca9558ccaa45e9d2ce05b2eb64dbb54a7edac5f538634134
 DIST VirtualBox-5.0.2.tar.bz2 109872963 SHA256 f290c220d62af2a7fdabb1934c1a0b924b68968a236bb2509bcb507d2c19485e SHA512 fc89cfe475aa02182b04e19a62d52d02b4ff5d2afb082ed3cf11b36288b19f7be15b0e76ae2fd8b9b2c3d5456b316453f112c3b711d242915688adf24623e0c1 WHIRLPOOL 23de881fa6233ce97a1ceeca900657019466df08dc0890355b9d415cd8f4fe8d6877f06218b2455a75be69cfa13d3b2a35855fb641832b300788273af1d26b32
+DIST VirtualBox-5.0.4.tar.bz2 109865904 SHA256 b19e23fc8e71f38aef7c059f44e59fcbff3bb2ce85baa8de81f1629b85f68fcf SHA512 4349792390f0a236faef0bdb06806dde604373dcccf83351f805508a2fdcae9f729a5e793ac53c4d134c50e48c0624b340328a7bb21ddcf15ed69a08365eb2b5 WHIRLPOOL cacf3193231a8500a3b475ede2d0f0458a656d87d3d97b78ccb743c1606f7f6ec58f6d56cb1bc0a40e9eb279d4cbeeab3318d1e71be3dead07fe4ccff6bdfbcf
diff --git a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.0.0.ebuild b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.0.0.ebuild
deleted file mode 100644
index 45157583e899..000000000000
--- a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.0.0.ebuild
+++ /dev/null
@@ -1,221 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils linux-mod systemd user toolchain-funcs
-
-MY_PV="${PV/beta/BETA}"
-MY_PV="${MY_PV/rc/RC}"
-MY_P=VirtualBox-${MY_PV}
-DESCRIPTION="VirtualBox kernel modules and user-space tools for Gentoo guests"
-HOMEPAGE="http://www.virtualbox.org/"
-SRC_URI="http://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="X"
-
-RDEPEND="X? ( ~x11-drivers/xf86-video-virtualbox-${PV}
-		x11-apps/xrandr
-		x11-apps/xrefresh
-		x11-libs/libXmu
-		x11-libs/libX11
-		x11-libs/libXt
-		x11-libs/libXext
-		x11-libs/libXau
-		x11-libs/libXdmcp
-		x11-libs/libSM
-		x11-libs/libICE
-		x11-proto/glproto )
-	sys-apps/dbus
-	!!x11-drivers/xf86-input-virtualbox"
-DEPEND="${RDEPEND}
-	>=dev-util/kbuild-0.1.9998_pre20131130
-	>=dev-lang/yasm-0.6.2
-	sys-devel/bin86
-	sys-libs/pam
-	sys-power/iasl
-	X? ( x11-proto/renderproto )
-	!X? ( x11-proto/xproto )"
-
-BUILD_TARGETS="all"
-BUILD_TARGET_ARCH="${ARCH}"
-MODULE_NAMES="vboxguest(misc:${WORKDIR}/vboxguest:${WORKDIR}/vboxguest)
-		vboxsf(misc:${WORKDIR}/vboxsf:${WORKDIR}/vboxsf)"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	linux-mod_pkg_setup
-	BUILD_PARAMS="KERN_DIR=${KV_OUT_DIR} KERNOUT=${KV_OUT_DIR}"
-	enewgroup vboxguest
-	enewuser vboxguest -1 /bin/sh /dev/null vboxguest
-	# automount Error: VBoxServiceAutoMountWorker: Group "vboxsf" does not exist
-	enewgroup vboxsf
-}
-
-src_unpack() {
-	unpack ${A}
-
-	# Create and unpack a tarball with the sources of the Linux guest
-	# kernel modules, to include all the needed files
-	"${S}"/src/VBox/Additions/linux/export_modules "${WORKDIR}/vbox-kmod.tar.gz"
-	unpack ./vbox-kmod.tar.gz
-
-	# Remove shipped binaries (kBuild,yasm), see bug #232775
-	cd "${S}"
-	rm -rf kBuild/bin tools
-}
-
-src_prepare() {
-	# PaX fixes (see bug #298988)
-	pushd "${WORKDIR}" &>/dev/null || die
-	epatch "${FILESDIR}"/vboxguest-4.1.0-log-use-c99.patch
-	popd &>/dev/null || die
-
-	# Disable things unused or splitted into separate ebuilds
-	cp "${FILESDIR}/${PN}-5-localconfig" LocalConfig.kmk || die
-
-	# stupid new header references...
-	for vboxheader in {product,revision}-generated.h ; do
-		for mdir in vbox{guest,sf} ; do
-			ln -sf "${S}"/out/linux.${ARCH}/release/${vboxheader} \
-				"${WORKDIR}/${mdir}/${vboxheader}"
-		done
-	done
-}
-
-src_configure() {
-	# build the user-space tools, warnings are harmless
-	local cmd=(
-		./configure
-		--nofatal
-		--disable-xpcom
-		--disable-sdl-ttf
-		--disable-pulse
-		--disable-alsa
-		--with-gcc="$(tc-getCC)"
-		--with-g++="$(tc-getCXX)"
-		--target-arch=${ARCH}
-		--with-linux="${KV_OUT_DIR}"
-		--build-headless
-	)
-	echo "${cmd[@]}"
-	"${cmd[@]}" || die "configure failed"
-	source ./env.sh
-	export VBOX_GCC_OPT="${CFLAGS} ${CPPFLAGS}"
-}
-
-src_compile() {
-	for each in /src/VBox/{Runtime,Additions/common} \
-		/src/VBox/Additions/linux/sharedfolders ; do
-			cd "${S}"${each} || die
-			MAKE="kmk" \
-			emake TOOL_YASM_AS=yasm \
-			KBUILD_VERBOSE=2
-	done
-
-	if use X; then
-		cd "${S}"/src/VBox/Additions/x11/VBoxClient || die
-		MAKE="kmk" \
-		emake TOOL_YASM_AS=yasm \
-		KBUILD_PATH="${S}/kBuild"
-	fi
-
-	# Now creating the kernel modules. We must do this _after_
-	# we compiled the user-space tools as we need two of the
-	# automatically generated header files. (>=3.2.0)
-	linux-mod_src_compile
-}
-
-src_install() {
-	linux-mod_src_install
-
-	cd "${S}"/out/linux.${ARCH}/release/bin/additions || die
-
-	insinto /sbin
-	newins mount.vboxsf mount.vboxsf
-	fperms 4755 /sbin/mount.vboxsf
-
-	newinitd "${FILESDIR}"/${PN}-8.initd ${PN}
-
-	insinto /usr/sbin/
-	newins VBoxService vboxguest-service
-	fperms 0755 /usr/sbin/vboxguest-service
-
-	insinto /usr/bin
-	doins VBoxControl
-	fperms 0755 /usr/bin/VBoxControl
-
-	# VBoxClient user service and xrandr wrapper
-	if use X ; then
-		doins VBoxClient
-		fperms 0755 /usr/bin/VBoxClient
-
-		pushd "${S}"/src/VBox/Additions/x11/Installer &>/dev/null \
-			|| die
-		newins 98vboxadd-xclient VBoxClient-all
-		fperms 0755 /usr/bin/VBoxClient-all
-		popd &>/dev/null || die
-	fi
-
-	# udev rule for vboxdrv
-	local udev_rules_dir="/lib/udev/rules.d"
-	dodir ${udev_rules_dir}
-	echo 'KERNEL=="vboxguest", OWNER="vboxguest", GROUP="vboxguest", MODE="0660"' \
-		>> "${D}/${udev_rules_dir}/60-virtualbox-guest-additions.rules" \
-		|| die
-	echo 'KERNEL=="vboxuser", OWNER="vboxguest", GROUP="vboxguest", MODE="0660"' \
-		>> "${D}/${udev_rules_dir}/60-virtualbox-guest-additions.rules" \
-		|| die
-
-	# VBoxClient autostart file
-	insinto /etc/xdg/autostart
-	doins "${FILESDIR}"/vboxclient.desktop
-
-	# sample xorg.conf
-	insinto /usr/share/doc/${PF}
-	doins "${FILESDIR}"/xorg.conf.vbox
-
-	systemd_dounit "${FILESDIR}/${PN}.service"
-}
-
-pkg_postinst() {
-	linux-mod_pkg_postinst
-	if ! use X ; then
-		elog "use flag X is off, enable it to install the"
-		elog "X Window System video driver."
-	fi
-	elog ""
-	elog "Please add users to the \"vboxguest\" group so they can"
-	elog "benefit from seamless mode, auto-resize and clipboard."
-	elog ""
-	elog "The vboxsf group has been added to make automount services work."
-	elog "These services are part of the shared folders support."
-	elog ""
-	elog "Please add:"
-	elog "/etc/init.d/${PN}"
-	elog "to the default runlevel in order to start"
-	elog "needed services."
-	elog "To use the VirtualBox X driver, use the following"
-	elog "file as your /etc/X11/xorg.conf:"
-	elog "    /usr/share/doc/${PF}/xorg.conf.vbox"
-	elog ""
-	elog "Also make sure you use the Mesa library for OpenGL:"
-	elog "    eselect opengl set xorg-x11"
-	elog ""
-	elog "An autostart .desktop file has been installed to start"
-	elog "VBoxClient in desktop sessions."
-	elog ""
-	elog "You can mount shared folders with:"
-	elog "    mount -t vboxsf <shared_folder_name> <mount_point>"
-	elog ""
-	elog "Warning:"
-	elog "this ebuild is only needed if you are running gentoo"
-	elog "inside a VirtualBox Virtual Machine, you don't need"
-	elog "it to run VirtualBox itself."
-	elog ""
-}
diff --git a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.0.4.ebuild b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.0.4.ebuild
new file mode 100644
index 000000000000..a1d8560671d8
--- /dev/null
+++ b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.0.4.ebuild
@@ -0,0 +1,212 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils linux-mod systemd user toolchain-funcs
+
+MY_PV="${PV/beta/BETA}"
+MY_PV="${MY_PV/rc/RC}"
+MY_P=VirtualBox-${MY_PV}
+DESCRIPTION="VirtualBox kernel modules and user-space tools for Gentoo guests"
+HOMEPAGE="http://www.virtualbox.org/"
+SRC_URI="http://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="X"
+
+RDEPEND="X? ( ~x11-drivers/xf86-video-virtualbox-${PV}
+		x11-apps/xrandr
+		x11-apps/xrefresh
+		x11-libs/libXmu
+		x11-libs/libX11
+		x11-libs/libXt
+		x11-libs/libXext
+		x11-libs/libXau
+		x11-libs/libXdmcp
+		x11-libs/libSM
+		x11-libs/libICE
+		x11-proto/glproto )
+	sys-apps/dbus
+	!!x11-drivers/xf86-input-virtualbox"
+DEPEND="${RDEPEND}
+	>=dev-util/kbuild-0.1.9998_pre20131130
+	>=dev-lang/yasm-0.6.2
+	sys-devel/bin86
+	sys-libs/pam
+	sys-power/iasl
+	X? ( x11-proto/renderproto )
+	!X? ( x11-proto/xproto )"
+
+BUILD_TARGETS="all"
+BUILD_TARGET_ARCH="${ARCH}"
+MODULE_NAMES="vboxguest(misc:${WORKDIR}/vboxguest:${WORKDIR}/vboxguest)
+		vboxsf(misc:${WORKDIR}/vboxsf:${WORKDIR}/vboxsf)"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	linux-mod_pkg_setup
+	BUILD_PARAMS="KERN_DIR=${KV_OUT_DIR} KERNOUT=${KV_OUT_DIR}"
+	enewgroup vboxguest
+	enewuser vboxguest -1 /bin/sh /dev/null vboxguest
+	# automount Error: VBoxServiceAutoMountWorker: Group "vboxsf" does not exist
+	enewgroup vboxsf
+}
+
+src_unpack() {
+	unpack ${A}
+
+	# Create and unpack a tarball with the sources of the Linux guest
+	# kernel modules, to include all the needed files
+	"${S}"/src/VBox/Additions/linux/export_modules "${WORKDIR}/vbox-kmod.tar.gz"
+	unpack ./vbox-kmod.tar.gz
+
+	# Remove shipped binaries (kBuild,yasm), see bug #232775
+	cd "${S}"
+	rm -rf kBuild/bin tools
+}
+
+src_prepare() {
+	# PaX fixes (see bug #298988)
+	pushd "${WORKDIR}" &>/dev/null || die
+	epatch "${FILESDIR}"/vboxguest-4.1.0-log-use-c99.patch
+	popd &>/dev/null || die
+
+	# Disable things unused or splitted into separate ebuilds
+	cp "${FILESDIR}/${PN}-5-localconfig" LocalConfig.kmk || die
+	use X || echo "VBOX_WITH_X11_ADDITIONS :=" >> LocalConfig.kmk
+
+	# stupid new header references...
+	for vboxheader in {product,revision,version}-generated.h ; do
+		for mdir in vbox{guest,sf} ; do
+			ln -sf "${S}"/out/linux.${ARCH}/release/${vboxheader} \
+				"${WORKDIR}/${mdir}/${vboxheader}"
+		done
+	done
+}
+
+src_configure() {
+	# build the user-space tools, warnings are harmless
+	local cmd=(
+		./configure
+		--nofatal
+		--disable-xpcom
+		--disable-sdl-ttf
+		--disable-pulse
+		--disable-alsa
+		--with-gcc="$(tc-getCC)"
+		--with-g++="$(tc-getCXX)"
+		--target-arch=${ARCH}
+		--with-linux="${KV_OUT_DIR}"
+		--build-headless
+	)
+	echo "${cmd[@]}"
+	"${cmd[@]}" || die "configure failed"
+	source ./env.sh
+	export VBOX_GCC_OPT="${CFLAGS} ${CPPFLAGS}"
+}
+
+src_compile() {
+	MAKE="kmk" \
+	emake TOOL_YASM_AS=yasm \
+	VBOX_ONLY_ADDITIONS=1 \
+	KBUILD_VERBOSE=2
+
+	# Now creating the kernel modules. We must do this _after_
+	# we compiled the user-space tools as we need two of the
+	# automatically generated header files. (>=3.2.0)
+	linux-mod_src_compile
+}
+
+src_install() {
+	linux-mod_src_install
+
+	cd "${S}"/out/linux.${ARCH}/release/bin/additions || die
+
+	insinto /sbin
+	newins mount.vboxsf mount.vboxsf
+	fperms 4755 /sbin/mount.vboxsf
+
+	newinitd "${FILESDIR}"/${PN}-8.initd ${PN}
+
+	insinto /usr/sbin/
+	newins VBoxService vboxguest-service
+	fperms 0755 /usr/sbin/vboxguest-service
+
+	insinto /usr/bin
+	doins VBoxControl
+	fperms 0755 /usr/bin/VBoxControl
+
+	# VBoxClient user service and xrandr wrapper
+	if use X ; then
+		doins VBoxClient
+		fperms 0755 /usr/bin/VBoxClient
+
+		pushd "${S}"/src/VBox/Additions/x11/Installer &>/dev/null \
+			|| die
+		newins 98vboxadd-xclient VBoxClient-all
+		fperms 0755 /usr/bin/VBoxClient-all
+		popd &>/dev/null || die
+	fi
+
+	# udev rule for vboxdrv
+	local udev_rules_dir="/lib/udev/rules.d"
+	dodir ${udev_rules_dir}
+	echo 'KERNEL=="vboxguest", OWNER="vboxguest", GROUP="vboxguest", MODE="0660"' \
+		>> "${D}/${udev_rules_dir}/60-virtualbox-guest-additions.rules" \
+		|| die
+	echo 'KERNEL=="vboxuser", OWNER="vboxguest", GROUP="vboxguest", MODE="0660"' \
+		>> "${D}/${udev_rules_dir}/60-virtualbox-guest-additions.rules" \
+		|| die
+
+	# VBoxClient autostart file
+	insinto /etc/xdg/autostart
+	doins "${FILESDIR}"/vboxclient.desktop
+
+	# sample xorg.conf
+	insinto /usr/share/doc/${PF}
+	doins "${FILESDIR}"/xorg.conf.vbox
+
+	systemd_dounit "${FILESDIR}/${PN}.service"
+}
+
+pkg_postinst() {
+	linux-mod_pkg_postinst
+	if ! use X ; then
+		elog "use flag X is off, enable it to install the"
+		elog "X Window System video driver."
+	fi
+	elog ""
+	elog "Please add users to the \"vboxguest\" group so they can"
+	elog "benefit from seamless mode, auto-resize and clipboard."
+	elog ""
+	elog "The vboxsf group has been added to make automount services work."
+	elog "These services are part of the shared folders support."
+	elog ""
+	elog "Please add:"
+	elog "/etc/init.d/${PN}"
+	elog "to the default runlevel in order to start"
+	elog "needed services."
+	elog "To use the VirtualBox X driver, use the following"
+	elog "file as your /etc/X11/xorg.conf:"
+	elog "    /usr/share/doc/${PF}/xorg.conf.vbox"
+	elog ""
+	elog "Also make sure you use the Mesa library for OpenGL:"
+	elog "    eselect opengl set xorg-x11"
+	elog ""
+	elog "An autostart .desktop file has been installed to start"
+	elog "VBoxClient in desktop sessions."
+	elog ""
+	elog "You can mount shared folders with:"
+	elog "    mount -t vboxsf <shared_folder_name> <mount_point>"
+	elog ""
+	elog "Warning:"
+	elog "this ebuild is only needed if you are running gentoo"
+	elog "inside a VirtualBox Virtual Machine, you don't need"
+	elog "it to run VirtualBox itself."
+	elog ""
+}
diff --git a/app-emulation/virtualbox-modules/Manifest b/app-emulation/virtualbox-modules/Manifest
index 32b064d9f868..2906cd458192 100644
--- a/app-emulation/virtualbox-modules/Manifest
+++ b/app-emulation/virtualbox-modules/Manifest
@@ -1,4 +1,4 @@
 DIST vbox-kernel-module-src-4.3.28.tar.xz 539876 SHA256 fb052997ec4992b0ee102475051b5d7bd8485e17405c6b3dcc94e1fa4a53b761 SHA512 637149f8595cb023e75116f83237bb4cef1b05627f58d475fa952ac86a85aa3cbab5f0cec723d730979f831999c920f35248e5f8db8f6987fb4c15c4a29bd517 WHIRLPOOL ab1ed07ee148a1ef352c0fda3f09865405be4146b987a5dffcb753d7512a00aa88c2ba1f7184b56d694c88320b350c6ececd3bec5636dd1586fc14a6be8a874d
 DIST vbox-kernel-module-src-4.3.30.tar.xz 540712 SHA256 28d89c06a4db190ec690980d68552745fb87ee2e23a3fe53edb29edda889f9d8 SHA512 8536d4bd105edf0fc112488232f7c85d8606b28b6cbeb28ee56bc135f693d1059328e75023299a67033bc1d486aea6a81c0fb23d51af500968119aa2f05156dc WHIRLPOOL 17452456aa127ca4ba53b2883f43970980f26094b80feaaa49b4773c386834d59f67afe21649539edc6dabde8725fd49c968002df9f2eb0e1ea8e888a2f8089b
-DIST vbox-kernel-module-src-5.0.0.tar.xz 585784 SHA256 53a2caf079ebb91cabd1542c8cd977a95cbe73ffe2e1da51457bbecfcb9ad734 SHA512 612bfe3cffa46b949c59a5126f2a80e54a2d4a11b565a2b5d8aa562623e21af02234b6c8ff6ee32980bf4d7608020d05d4d2f695efec88f759b4fc85142abf7c WHIRLPOOL 94b86d5d78d247e4130701c4a3b9c30f5d0fb7ad3df385a919c39a917cd115ab80eb806d55ae4397e542f43ac4bb64a6de62073db473e08efc0980692f278ce1
 DIST vbox-kernel-module-src-5.0.2.tar.xz 592648 SHA256 0060ed14de81f86f1acae11e124a81573b19a1abeebf92f1a15ea7aa8a987bdd SHA512 965059d533536f77eacb69bf19e3b348c02a9125dc18fc06cf0e05226f75ab0c34cf634f0754ee309905b31e53adbaf23830c9ecfc689ca2735e7de0a33c29e7 WHIRLPOOL 79c4e6a1dc7073f09a5e711fa05277acf6c407e4f2813ca9523110cdc01c9f229fda3f96c6e07bdbbc45d375079c145b1aee6a53ada7b9d9469561cfac21ca55
+DIST vbox-kernel-module-src-5.0.4.tar.xz 592716 SHA256 dad5657c9b1280050d2469a94e3e3d5b5cc8279f9a175abf068f3940ea700889 SHA512 0a71a3e857b8bd8b90a06db6950c6c40950f0f87b14d5e79c14dd82a674de1f171556d849006e49932f06bc794dfe2066e37d31fef352e9128dfaeab11caaadd WHIRLPOOL 78a0f704cce92ed3546710d8cbca263f1bb9784f99291fa29d58e177e1c65800e4a80cba4e59fd2577f00895829a04c8605ff0b849a23f35f797a1565a0ec6d0
diff --git a/app-emulation/virtualbox-modules/virtualbox-modules-5.0.0.ebuild b/app-emulation/virtualbox-modules/virtualbox-modules-5.0.4.ebuild
index fe93a351b196..fe93a351b196 100644
--- a/app-emulation/virtualbox-modules/virtualbox-modules-5.0.0.ebuild
+++ b/app-emulation/virtualbox-modules/virtualbox-modules-5.0.4.ebuild
diff --git a/app-emulation/virtualbox/Manifest b/app-emulation/virtualbox/Manifest
index cc3a8cb4e392..dbecf0783c21 100644
--- a/app-emulation/virtualbox/Manifest
+++ b/app-emulation/virtualbox/Manifest
@@ -1,7 +1,6 @@
 DIST VirtualBox-4.3.28.tar.bz2 100092002 SHA256 e157ab76d1958ae2c56b2a3875194fbff3de82486ad0e30032fd5bd772297c31 SHA512 b6e849a1420515b6dbda8cee0ab64940dd93296ec58cde76676ac257ff3dad0459aa1fd0bda7e1d0abc751d2d59f055465b198a546fdbb4e70e934a78654a8fc WHIRLPOOL 1b739f1f989032e07829a23ffadadd49e31109d70b0effbc44126a48a165218ff3ebafa576fa0e4f2af76a404033b60e5c9804ac43db5dd3024f1eca25ca70da
 DIST VirtualBox-4.3.30.tar.bz2 97428942 SHA256 ea9569ec16cd6202ee61bcadb2506d31ac12fd343adb91565773a05eaaea9a36 SHA512 d0817335cf4bd196da93b91ede6bc9e48ca0d471166ab2790dbf508a4574e4ace54a86053932abf3b4e804c583e80a713d2ab2e556dc15bee6ef3a62f88b95fc WHIRLPOOL 47cbd702e83cc737e04b5862cc6c52e32be244dc1dc0145f582f57b2f19bb898f0f4b200576a28f10a3290691f1ffd43c256e8c8eb5545a9723be8eefca88a38
-DIST VirtualBox-5.0.0.tar.bz2 109816664 SHA256 bb71356c8f82012c9b5ae16e12302eb111c71ae7b063ada7688fbfa8aa10c2f7 SHA512 c9557820fa04215b1b7905babfab340a01ad2cf733a18462fc608f8db5d0aa908e9ec0d92b3c77075e8a1322c10c92f58f8f14608aa3480052ca730ebd507636 WHIRLPOOL 7cda1523e0cd2851cbea5bb7a202963bac67cc6af29d0ec9a706dcec53746e50e6c85ccea014604eca9558ccaa45e9d2ce05b2eb64dbb54a7edac5f538634134
 DIST VirtualBox-5.0.2.tar.bz2 109872963 SHA256 f290c220d62af2a7fdabb1934c1a0b924b68968a236bb2509bcb507d2c19485e SHA512 fc89cfe475aa02182b04e19a62d52d02b4ff5d2afb082ed3cf11b36288b19f7be15b0e76ae2fd8b9b2c3d5456b316453f112c3b711d242915688adf24623e0c1 WHIRLPOOL 23de881fa6233ce97a1ceeca900657019466df08dc0890355b9d415cd8f4fe8d6877f06218b2455a75be69cfa13d3b2a35855fb641832b300788273af1d26b32
+DIST VirtualBox-5.0.4.tar.bz2 109865904 SHA256 b19e23fc8e71f38aef7c059f44e59fcbff3bb2ce85baa8de81f1629b85f68fcf SHA512 4349792390f0a236faef0bdb06806dde604373dcccf83351f805508a2fdcae9f729a5e793ac53c4d134c50e48c0624b340328a7bb21ddcf15ed69a08365eb2b5 WHIRLPOOL cacf3193231a8500a3b475ede2d0f0458a656d87d3d97b78ccb743c1606f7f6ec58f6d56cb1bc0a40e9eb279d4cbeeab3318d1e71be3dead07fe4ccff6bdfbcf
 DIST virtualbox-4.3.16-patches-01.tar.xz 4288 SHA256 270c4f01b2c13c4133987b3acc073dfbf78840212cf09f083dbf8fc80407ce6f SHA512 595f88c4b388b4807347c15c1750ec73aceba1c82ad993e9a05c7b78dfece7b679aff0338b3a48e2ccee7911fb5ed0dba803052332a270230078551f747052bc WHIRLPOOL 2157ee3fb9beed906cff28647c869e37d62551ad8c93801c0f0ec6893675f11786aa6d92acf11c348d30aa58b6e03a3faa879c664dddac6e5b8525035986c9ca
-DIST virtualbox-5.0.0_beta3-patches-01.tar.xz 4300 SHA256 6559d2f4c2004cd922d6cb21f668d962b824346cf6d9fa9f25519f2937920447 SHA512 62796002f7cdba59904235bcb79868040c39fbb6682a8ab456848029fc6b287dabfea4090c5f612c8396a0f759a0146dc43c71122cb6b4811becf4c8e4596e6d WHIRLPOOL 577107bd708a725604e872f3247521cd73501db94bb3ac637068b9c6d5978cacad689e6b6e8c277d591ee601854731a28a9b1054a21d4e0149ed2eb11d9d4e83
 DIST virtualbox-5.0.2-patches-01.tar.xz 4556 SHA256 8fcfa7972b0942f3e65bda73a35a6feb234aad770016fb4caafba105757d7ada SHA512 14ce8f0b17e593b2de676e0beaab688f29606aaea330151038fbb9259d3f5e4c22f254d1fa6cc45f968d81cf9f7d71deb9a7a32f565d07c1d9fa615431472ca9 WHIRLPOOL be73fd5576732f70f6ebb33a9d604d46a8fabdbdb0e187af3435f75412e21f62c0774130a9a6315e6b87ecf96d02398ffce828b3ab8f584716ed9a12e06d7cde
diff --git a/app-emulation/virtualbox/virtualbox-5.0.0-r1.ebuild b/app-emulation/virtualbox/virtualbox-5.0.0-r1.ebuild
deleted file mode 100644
index 3f0901d97c76..000000000000
--- a/app-emulation/virtualbox/virtualbox-5.0.0-r1.ebuild
+++ /dev/null
@@ -1,425 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-inherit eutils fdo-mime flag-o-matic java-pkg-opt-2 linux-info multilib pax-utils python-single-r1 qt4-r2 toolchain-funcs udev
-
-MY_PV="${PV/beta/BETA}"
-MY_PV="${MY_PV/rc/RC}"
-MY_P=VirtualBox-${MY_PV}
-SRC_URI="http://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.tar.bz2
-	https://dev.gentoo.org/~polynomial-c/${PN}/patchsets/${PN}-5.0.0_beta3-patches-01.tar.xz"
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="Family of powerful x86 virtualization products for enterprise as well as home use"
-HOMEPAGE="http://www.virtualbox.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="alsa doc headless java pam pulseaudio +opengl python +qt4 +sdk +udev vboxwebsrv vnc"
-
-RDEPEND="!app-emulation/virtualbox-bin
-	~app-emulation/virtualbox-modules-${PV}
-	dev-libs/libIDL
-	>=dev-libs/libxslt-1.1.19
-	net-misc/curl
-	dev-libs/openssl:0=
-	dev-libs/libxml2
-	media-libs/libpng:0=
-	media-libs/libvpx
-	sys-libs/zlib
-	!headless? (
-		qt4? (
-			dev-qt/qtgui:4
-			dev-qt/qtcore:4
-			opengl? ( dev-qt/qtopengl:4 )
-			x11-libs/libXinerama
-		)
-		opengl? ( virtual/opengl media-libs/freeglut )
-		x11-libs/libX11
-		x11-libs/libXcursor
-		x11-libs/libXext
-		x11-libs/libXmu
-		x11-libs/libXt
-		media-libs/libsdl:0[X,video]
-	)
-
-	java? ( >=virtual/jre-1.6 )
-	udev? ( >=virtual/udev-171 )
-	vnc? ( >=net-libs/libvncserver-0.9.9 )"
-DEPEND="${RDEPEND}
-	>=dev-util/kbuild-0.1.9998_pre20131130
-	>=dev-lang/yasm-0.6.2
-	sys-devel/bin86
-	sys-power/iasl
-	pam? ( sys-libs/pam )
-	sys-libs/libcap
-	doc? (
-		dev-texlive/texlive-basic
-		dev-texlive/texlive-latex
-		dev-texlive/texlive-latexrecommended
-		dev-texlive/texlive-latexextra
-		dev-texlive/texlive-fontsrecommended
-		dev-texlive/texlive-fontsextra
-	)
-	java? ( >=virtual/jre-1.6 )
-	virtual/pkgconfig
-	alsa? ( >=media-libs/alsa-lib-1.0.13 )
-	!headless? ( x11-libs/libXinerama )
-	pulseaudio? ( media-sound/pulseaudio )
-	vboxwebsrv? ( net-libs/gsoap[-gnutls(-)] )
-	${PYTHON_DEPS}"
-
-QA_TEXTRELS_x86="usr/lib/virtualbox-ose/VBoxGuestPropSvc.so
-	usr/lib/virtualbox/VBoxSDL.so
-	usr/lib/virtualbox/VBoxSharedFolders.so
-	usr/lib/virtualbox/VBoxDD2.so
-	usr/lib/virtualbox/VBoxOGLrenderspu.so
-	usr/lib/virtualbox/VBoxPython.so
-	usr/lib/virtualbox/VBoxDD.so
-	usr/lib/virtualbox/VBoxDDU.so
-	usr/lib/virtualbox/VBoxREM64.so
-	usr/lib/virtualbox/VBoxSharedClipboard.so
-	usr/lib/virtualbox/VBoxHeadless.so
-	usr/lib/virtualbox/VBoxRT.so
-	usr/lib/virtualbox/VBoxREM.so
-	usr/lib/virtualbox/VBoxSettings.so
-	usr/lib/virtualbox/VBoxKeyboard.so
-	usr/lib/virtualbox/VBoxSharedCrOpenGL.so
-	usr/lib/virtualbox/VBoxVMM.so
-	usr/lib/virtualbox/VirtualBox.so
-	usr/lib/virtualbox/VBoxOGLhosterrorspu.so
-	usr/lib/virtualbox/components/VBoxC.so
-	usr/lib/virtualbox/components/VBoxSVCM.so
-	usr/lib/virtualbox/components/VBoxDDU.so
-	usr/lib/virtualbox/components/VBoxRT.so
-	usr/lib/virtualbox/components/VBoxREM.so
-	usr/lib/virtualbox/components/VBoxVMM.so
-	usr/lib/virtualbox/VBoxREM32.so
-	usr/lib/virtualbox/VBoxPython2_4.so
-	usr/lib/virtualbox/VBoxPython2_5.so
-	usr/lib/virtualbox/VBoxPython2_6.so
-	usr/lib/virtualbox/VBoxPython2_7.so
-	usr/lib/virtualbox/VBoxXPCOMC.so
-	usr/lib/virtualbox/VBoxOGLhostcrutil.so
-	usr/lib/virtualbox/VBoxNetDHCP.so
-	usr/lib/virtualbox/VBoxNetNAT.so"
-
-REQUIRED_USE="
-	java? ( sdk )
-	python? (
-		( sdk )
-	)
-	vboxwebsrv? ( java )
-	${PYTHON_REQUIRED_USE}
-"
-
-pkg_setup() {
-	if ! use headless && ! use qt4 ; then
-		einfo "No USE=\"qt4\" selected, this build will not include"
-		einfo "any Qt frontend."
-	elif use headless && use qt4 ; then
-		einfo "You selected USE=\"headless qt4\", defaulting to"
-		einfo "USE=\"headless\", this build will not include any X11/Qt frontend."
-	fi
-
-	if ! use opengl ; then
-		einfo "No USE=\"opengl\" selected, this build will lack"
-		einfo "the OpenGL feature."
-	fi
-	if ! use python ; then
-		einfo "You have disabled the \"python\" USE flag. This will only"
-		einfo "disable the python bindings being installed."
-	fi
-	java-pkg-opt-2_pkg_setup
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	# Remove shipped binaries (kBuild,yasm), see bug #232775
-	rm -rf kBuild/bin tools
-
-	# Disable things unused or split into separate ebuilds
-	sed -e "s@MY_LIBDIR@$(get_libdir)@" \
-		"${FILESDIR}"/${PN}-5-localconfig > LocalConfig.kmk || die
-
-	# Respect LDFLAGS
-	sed -e "s@_LDFLAGS\.${ARCH}*.*=@& ${LDFLAGS}@g" \
-		-i Config.kmk src/libs/xpcom18a4/Config.kmk || die
-
-	# Use PAM only when pam USE flag is enbaled (bug #376531)
-	if ! use pam ; then
-		elog "Disabling PAM removes the possibility to use the VRDP features."
-		sed -i 's@^.*VBOX_WITH_PAM@#VBOX_WITH_PAM@' Config.kmk || die
-		sed -i 's@\(.*/auth/Makefile.kmk.*\)@#\1@' \
-			src/VBox/HostServices/Makefile.kmk || die
-	fi
-
-	# add correct java path
-	if use java ; then
-		sed "s@/usr/lib/jvm/java-6-sun@$(java-config -O)@" \
-			-i "${S}"/Config.kmk || die
-		java-pkg-opt-2_src_prepare
-	fi
-
-	if ! gcc-specs-pie ; then
-		EPATCH_EXCLUDE="050_${PN}-4.3.14-nopie.patch"
-	fi
-
-	EPATCH_SUFFIX="patch" \
-	EPATCH_FORCE="yes" \
-	epatch "${WORKDIR}/patches"
-
-	#epatch "${FILESDIR}/${PN}-5.0.0_beta1-dont_build_validationkit.patch"
-
-	epatch_user
-}
-
-src_configure() {
-	local myconf
-	use alsa       || myconf+=" --disable-alsa"
-	use doc        || myconf+=" --disable-docs"
-	use java       || myconf+=" --disable-java"
-	use opengl     || myconf+=" --disable-opengl"
-	use pulseaudio || myconf+=" --disable-pulse"
-	use python     || myconf+=" --disable-python"
-	use vboxwebsrv && myconf+=" --enable-webservice"
-	use vnc        && myconf+=" --enable-vnc"
-	if ! use headless ; then
-		use qt4 || myconf+=" --disable-qt4"
-	else
-		myconf+=" --build-headless --disable-opengl"
-	fi
-	if use amd64 && ! has_multilib_profile ; then
-		myconf+=" --disable-vmmraw"
-	fi
-	# not an autoconf script
-	./configure \
-		--with-gcc="$(tc-getCC)" \
-		--with-g++="$(tc-getCXX)" \
-		--disable-kmods \
-		--disable-dbus \
-		--disable-devmapper \
-		${myconf} \
-		|| die "configure failed"
-}
-
-src_compile() {
-	source ./env.sh
-
-	# Force kBuild to respect C[XX]FLAGS and MAKEOPTS (bug #178529)
-	# and strip all flags
-	# strip-flags
-
-	MAKEJOBS=$(echo ${MAKEOPTS} | egrep -o '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+')
-	MAKELOAD=$(echo ${MAKEOPTS} | egrep -o '(\-l|\-\-load-average)(=?|[[:space:]]*)[[:digit:]]+')
-	MAKEOPTS="${MAKEJOBS} ${MAKELOAD}"
-	MAKE="kmk" emake \
-		VBOX_BUILD_PUBLISHER=_Gentoo \
-		TOOL_GCC3_CC="$(tc-getCC)" TOOL_GCC3_CXX="$(tc-getCXX)" \
-		TOOL_GCC3_AS="$(tc-getCC)" TOOL_GCC3_AR="$(tc-getAR)" \
-		TOOL_GCC3_LD="$(tc-getCXX)" TOOL_GCC3_LD_SYSMOD="$(tc-getLD)" \
-		TOOL_GCC3_CFLAGS="${CFLAGS}" TOOL_GCC3_CXXFLAGS="${CXXFLAGS}" \
-		VBOX_GCC_OPT="${CXXFLAGS}" \
-		TOOL_YASM_AS=yasm KBUILD_VERBOSE=2 \
-		all
-}
-
-src_install() {
-	cd "${S}"/out/linux.${ARCH}/release/bin || die
-
-	# Create configuration files
-	insinto /etc/vbox
-	newins "${FILESDIR}/${PN}-4-config" vbox.cfg
-
-	# Set the right libdir
-	sed -i \
-		-e "s@MY_LIBDIR@$(get_libdir)@" \
-		"${D}"/etc/vbox/vbox.cfg || die "vbox.cfg sed failed"
-
-	# Symlink binaries to the shipped wrapper
-	exeinto /usr/$(get_libdir)/${PN}
-	newexe "${FILESDIR}/${PN}-ose-3-wrapper" "VBox"
-	fowners root:vboxusers /usr/$(get_libdir)/${PN}/VBox
-	fperms 0750 /usr/$(get_libdir)/${PN}/VBox
-
-	dosym /usr/$(get_libdir)/${PN}/VBox /usr/bin/VBoxManage
-	dosym /usr/$(get_libdir)/${PN}/VBox /usr/bin/VBoxVRDP
-	dosym /usr/$(get_libdir)/${PN}/VBox /usr/bin/VBoxHeadless
-	dosym /usr/$(get_libdir)/${PN}/VBoxTunctl /usr/bin/VBoxTunctl
-
-	# Install binaries and libraries
-	insinto /usr/$(get_libdir)/${PN}
-	doins -r components
-
-	if use sdk ; then
-		doins -r sdk
-	fi
-
-	if use vboxwebsrv ; then
-		doins vboxwebsrv
-		fowners root:vboxusers /usr/$(get_libdir)/${PN}/vboxwebsrv
-		fperms 0750 /usr/$(get_libdir)/${PN}/vboxwebsrv
-		dosym /usr/$(get_libdir)/${PN}/VBox /usr/bin/vboxwebsrv
-		newinitd "${FILESDIR}"/vboxwebsrv-initd vboxwebsrv
-		newconfd "${FILESDIR}"/vboxwebsrv-confd vboxwebsrv
-	fi
-
-	#local gcfiles="*gc"
-	#if use amd64 && ! has_multilib_profile ; then
-	#	gcfiles=""
-	#fi
-
-	for each in VBox{Manage,SVC,XPCOMIPCD,Tunctl,ExtPackHelperApp} *so *r0 *.rc ; do
-		doins ${each}
-		fowners root:vboxusers /usr/$(get_libdir)/${PN}/${each}
-		fperms 0750 /usr/$(get_libdir)/${PN}/${each}
-	done
-
-	# VBoxNetAdpCtl and VBoxNetDHCP binaries need to be suid root in any case..
-	for each in VBoxNet{AdpCtl,DHCP,NAT} ; do
-		doins ${each}
-		fowners root:vboxusers /usr/$(get_libdir)/${PN}/${each}
-		fperms 4750 /usr/$(get_libdir)/${PN}/${each}
-	done
-
-	# VBoxSVC and VBoxManage need to be pax-marked (bug #403453)
-	# VBoxXPCOMIPCD (bug #524202)
-	for each in VBox{Manage,SVC,XPCOMIPCD} ; do
-		pax-mark -m "${D}"/usr/$(get_libdir)/${PN}/${each} || die
-	done
-
-	if ! use headless ; then
-		for each in VBox{SDL,Headless} ; do
-			doins ${each}
-			fowners root:vboxusers /usr/$(get_libdir)/${PN}/${each}
-			fperms 4750 /usr/$(get_libdir)/${PN}/${each}
-			pax-mark -m "${D}"/usr/$(get_libdir)/${PN}/${each}
-		done
-
-		if use opengl && use qt4 ; then
-			doins VBoxTestOGL
-			fowners root:vboxusers /usr/$(get_libdir)/${PN}/VBoxTestOGL
-			fperms 0750 /usr/$(get_libdir)/${PN}/VBoxTestOGL
-			pax-mark -m "${D}"/usr/$(get_libdir)/${PN}/VBoxTestOGL
-		fi
-
-		dosym /usr/$(get_libdir)/${PN}/VBox /usr/bin/VBoxSDL
-
-		if use qt4 ; then
-			doins VirtualBox
-			fowners root:vboxusers /usr/$(get_libdir)/${PN}/VirtualBox
-			fperms 4750 /usr/$(get_libdir)/${PN}/VirtualBox
-			pax-mark -m "${D}"/usr/$(get_libdir)/${PN}/VirtualBox \
-				|| die
-
-			dosym /usr/$(get_libdir)/${PN}/VBox /usr/bin/VirtualBox
-
-			newmenu "${FILESDIR}"/${PN}-ose.desktop-2 ${PN}.desktop
-		fi
-
-		pushd "${S}"/src/VBox/Resources/OSE &>/dev/null || die
-		for size in 16 32 48 64 128 ; do
-			newicon -s ${size} ${PN}-${size}px.png ${PN}.png
-		done
-		newicon ${PN}-48px.png ${PN}.png
-		popd &>/dev/null || die
-	else
-		doins VBoxHeadless
-		fowners root:vboxusers /usr/$(get_libdir)/${PN}/VBoxHeadless
-		fperms 4750 /usr/$(get_libdir)/${PN}/VBoxHeadless
-		pax-mark -m "${D}"/usr/$(get_libdir)/${PN}/VBoxHeadless || die
-	fi
-
-	insinto /usr/$(get_libdir)/${PN}
-	# Install EFI Firmware files (bug #320757)
-	pushd "${S}"/src/VBox/Devices/EFI/FirmwareBin &>/dev/null || die
-	for fwfile in VBoxEFI{32,64}.fd ; do
-		doins ${fwfile}
-		fowners root:vboxusers /usr/$(get_libdir)/${PN}/${fwfile}
-	done
-	popd &>/dev/null || die
-
-	if use udev ; then
-		# New way of handling USB device nodes for VBox (bug #356215)
-		local udevdir="$(get_udevdir)"
-		insinto ${udevdir}
-		doins VBoxCreateUSBNode.sh
-		fowners root:vboxusers ${udevdir}/VBoxCreateUSBNode.sh
-		fperms 0750 ${udevdir}/VBoxCreateUSBNode.sh
-		insinto ${udevdir}/rules.d
-		doins "${FILESDIR}"/10-virtualbox.rules
-		sed "s@%UDEVDIR%@${udevdir}@" \
-			-i "${D}"${udevdir}/rules.d/10-virtualbox.rules || die
-	fi
-
-	insinto /usr/share/${PN}
-	if ! use headless && use qt4 ; then
-		doins -r nls
-	fi
-
-	# VRDPAuth only works with this (bug #351949)
-	dosym VBoxAuth.so  /usr/$(get_libdir)/${PN}/VRDPAuth.so
-
-	# set an env-variable for 3rd party tools
-	echo -n "VBOX_APP_HOME=/usr/$(get_libdir)/${PN}" > "${T}/90virtualbox"
-	doenvd "${T}/90virtualbox"
-
-	if use java ; then
-		java-pkg_regjar "${D}/usr/$(get_libdir)/${PN}/sdk/bindings/xpcom/java/vboxjxpcom.jar"
-		java-pkg_regso "${D}/usr/$(get_libdir)/${PN}/libvboxjxpcom.so"
-	fi
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-
-	if use udev ; then
-		udevadm control --reload-rules \
-			&& udevadm trigger --subsystem-match=usb
-	fi
-
-	if ! use headless && use qt4 ; then
-		elog "To launch VirtualBox just type: \"VirtualBox\"."
-	fi
-	elog "You must be in the vboxusers group to use VirtualBox."
-	elog ""
-	elog "The latest user manual is available for download at:"
-	elog "http://download.virtualbox.org/virtualbox/${PV}/UserManual.pdf"
-	elog ""
-	elog "For advanced networking setups you should emerge:"
-	elog "net-misc/bridge-utils and sys-apps/usermode-utilities"
-	elog ""
-	elog "IMPORTANT!"
-	elog "If you upgrade from app-emulation/virtualbox-ose make sure to run"
-	elog "\"env-update\" as root and logout and relogin as the user you wish"
-	elog "to run ${PN} as."
-	elog ""
-	elog "Starting with version 4.0.0, ${PN} has USB-1 support."
-	elog "For USB-2 support, PXE-boot ability and VRDP support please emerge"
-	elog "  app-emulation/virtualbox-extpack-oracle"
-	elog "package."
-	elog "Starting with version 5.0.0, ${PN} no longer has the \"additions\" and"
-	elog "the \"extension\" USE flag. For installation of the guest additions ISO"
-	elog "image, please emerge"
-	elog "  app-emulation/virtualbox-additions"
-	elog "and for the USB2, USB3, VRDP and PXE boot ROM modules, please emerge"
-	elog "  app-emulation/virtualbox-extpack-oracle"
-	if ! use udev ; then
-		elog ""
-		elog "WARNING!"
-		elog "Without USE=udev, USB devices will likely not work in ${PN}."
-	elif [ -e "${ROOT}/etc/udev/rules.d/10-virtualbox.rules" ] ; then
-		elog ""
-		elog "Please remove \"${ROOT}/etc/udev/rules.d/10-virtualbox.rules\""
-		elog "or else USB in ${PN} won't work."
-	fi
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-}
diff --git a/app-emulation/virtualbox/virtualbox-5.0.0.ebuild b/app-emulation/virtualbox/virtualbox-5.0.0.ebuild
deleted file mode 100644
index aed5e5353e4e..000000000000
--- a/app-emulation/virtualbox/virtualbox-5.0.0.ebuild
+++ /dev/null
@@ -1,425 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-inherit eutils fdo-mime flag-o-matic java-pkg-opt-2 linux-info multilib pax-utils python-single-r1 qt4-r2 toolchain-funcs udev
-
-MY_PV="${PV/beta/BETA}"
-MY_PV="${MY_PV/rc/RC}"
-MY_P=VirtualBox-${MY_PV}
-SRC_URI="http://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.tar.bz2
-	https://dev.gentoo.org/~polynomial-c/${PN}/patchsets/${PN}-5.0.0_beta3-patches-01.tar.xz"
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="Family of powerful x86 virtualization products for enterprise as well as home use"
-HOMEPAGE="http://www.virtualbox.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="alsa doc headless java pam pulseaudio +opengl python +qt4 +sdk +udev vboxwebsrv vnc"
-
-RDEPEND="!app-emulation/virtualbox-bin
-	~app-emulation/virtualbox-modules-${PV}
-	dev-libs/libIDL
-	>=dev-libs/libxslt-1.1.19
-	net-misc/curl
-	dev-libs/openssl:0=
-	dev-libs/libxml2
-	media-libs/libpng:0=
-	media-libs/libvpx
-	sys-libs/zlib
-	!headless? (
-		qt4? (
-			dev-qt/qtgui:4
-			dev-qt/qtcore:4
-			opengl? ( dev-qt/qtopengl:4 )
-			x11-libs/libXinerama
-		)
-		opengl? ( virtual/opengl media-libs/freeglut )
-		x11-libs/libX11
-		x11-libs/libXcursor
-		x11-libs/libXext
-		x11-libs/libXmu
-		x11-libs/libXt
-		media-libs/libsdl:0[X,video]
-	)
-
-	java? ( || ( virtual/jre:1.7 virtual/jre:1.6 ) )
-	udev? ( >=virtual/udev-171 )
-	vnc? ( >=net-libs/libvncserver-0.9.9 )"
-DEPEND="${RDEPEND}
-	>=dev-util/kbuild-0.1.9998_pre20131130
-	>=dev-lang/yasm-0.6.2
-	sys-devel/bin86
-	sys-power/iasl
-	pam? ( sys-libs/pam )
-	sys-libs/libcap
-	doc? (
-		dev-texlive/texlive-basic
-		dev-texlive/texlive-latex
-		dev-texlive/texlive-latexrecommended
-		dev-texlive/texlive-latexextra
-		dev-texlive/texlive-fontsrecommended
-		dev-texlive/texlive-fontsextra
-	)
-	java? ( || ( virtual/jdk:1.7 virtual/jdk:1.6 ) )
-	virtual/pkgconfig
-	alsa? ( >=media-libs/alsa-lib-1.0.13 )
-	!headless? ( x11-libs/libXinerama )
-	pulseaudio? ( media-sound/pulseaudio )
-	vboxwebsrv? ( net-libs/gsoap[-gnutls(-)] )
-	${PYTHON_DEPS}"
-
-QA_TEXTRELS_x86="usr/lib/virtualbox-ose/VBoxGuestPropSvc.so
-	usr/lib/virtualbox/VBoxSDL.so
-	usr/lib/virtualbox/VBoxSharedFolders.so
-	usr/lib/virtualbox/VBoxDD2.so
-	usr/lib/virtualbox/VBoxOGLrenderspu.so
-	usr/lib/virtualbox/VBoxPython.so
-	usr/lib/virtualbox/VBoxDD.so
-	usr/lib/virtualbox/VBoxDDU.so
-	usr/lib/virtualbox/VBoxREM64.so
-	usr/lib/virtualbox/VBoxSharedClipboard.so
-	usr/lib/virtualbox/VBoxHeadless.so
-	usr/lib/virtualbox/VBoxRT.so
-	usr/lib/virtualbox/VBoxREM.so
-	usr/lib/virtualbox/VBoxSettings.so
-	usr/lib/virtualbox/VBoxKeyboard.so
-	usr/lib/virtualbox/VBoxSharedCrOpenGL.so
-	usr/lib/virtualbox/VBoxVMM.so
-	usr/lib/virtualbox/VirtualBox.so
-	usr/lib/virtualbox/VBoxOGLhosterrorspu.so
-	usr/lib/virtualbox/components/VBoxC.so
-	usr/lib/virtualbox/components/VBoxSVCM.so
-	usr/lib/virtualbox/components/VBoxDDU.so
-	usr/lib/virtualbox/components/VBoxRT.so
-	usr/lib/virtualbox/components/VBoxREM.so
-	usr/lib/virtualbox/components/VBoxVMM.so
-	usr/lib/virtualbox/VBoxREM32.so
-	usr/lib/virtualbox/VBoxPython2_4.so
-	usr/lib/virtualbox/VBoxPython2_5.so
-	usr/lib/virtualbox/VBoxPython2_6.so
-	usr/lib/virtualbox/VBoxPython2_7.so
-	usr/lib/virtualbox/VBoxXPCOMC.so
-	usr/lib/virtualbox/VBoxOGLhostcrutil.so
-	usr/lib/virtualbox/VBoxNetDHCP.so
-	usr/lib/virtualbox/VBoxNetNAT.so"
-
-REQUIRED_USE="
-	java? ( sdk )
-	python? (
-		( sdk )
-	)
-	vboxwebsrv? ( java )
-	${PYTHON_REQUIRED_USE}
-"
-
-pkg_setup() {
-	if ! use headless && ! use qt4 ; then
-		einfo "No USE=\"qt4\" selected, this build will not include"
-		einfo "any Qt frontend."
-	elif use headless && use qt4 ; then
-		einfo "You selected USE=\"headless qt4\", defaulting to"
-		einfo "USE=\"headless\", this build will not include any X11/Qt frontend."
-	fi
-
-	if ! use opengl ; then
-		einfo "No USE=\"opengl\" selected, this build will lack"
-		einfo "the OpenGL feature."
-	fi
-	if ! use python ; then
-		einfo "You have disabled the \"python\" USE flag. This will only"
-		einfo "disable the python bindings being installed."
-	fi
-	java-pkg-opt-2_pkg_setup
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	# Remove shipped binaries (kBuild,yasm), see bug #232775
-	rm -rf kBuild/bin tools
-
-	# Disable things unused or split into separate ebuilds
-	sed -e "s@MY_LIBDIR@$(get_libdir)@" \
-		"${FILESDIR}"/${PN}-5-localconfig > LocalConfig.kmk || die
-
-	# Respect LDFLAGS
-	sed -e "s@_LDFLAGS\.${ARCH}*.*=@& ${LDFLAGS}@g" \
-		-i Config.kmk src/libs/xpcom18a4/Config.kmk || die
-
-	# Use PAM only when pam USE flag is enbaled (bug #376531)
-	if ! use pam ; then
-		elog "Disabling PAM removes the possibility to use the VRDP features."
-		sed -i 's@^.*VBOX_WITH_PAM@#VBOX_WITH_PAM@' Config.kmk || die
-		sed -i 's@\(.*/auth/Makefile.kmk.*\)@#\1@' \
-			src/VBox/HostServices/Makefile.kmk || die
-	fi
-
-	# add correct java path
-	if use java ; then
-		sed "s@/usr/lib/jvm/java-6-sun@$(java-config -O)@" \
-			-i "${S}"/Config.kmk || die
-		java-pkg-opt-2_src_prepare
-	fi
-
-	if ! gcc-specs-pie ; then
-		EPATCH_EXCLUDE="050_${PN}-4.3.14-nopie.patch"
-	fi
-
-	EPATCH_SUFFIX="patch" \
-	EPATCH_FORCE="yes" \
-	epatch "${WORKDIR}/patches"
-
-	#epatch "${FILESDIR}/${PN}-5.0.0_beta1-dont_build_validationkit.patch"
-
-	epatch_user
-}
-
-src_configure() {
-	local myconf
-	use alsa       || myconf+=" --disable-alsa"
-	use doc        || myconf+=" --disable-docs"
-	use java       || myconf+=" --disable-java"
-	use opengl     || myconf+=" --disable-opengl"
-	use pulseaudio || myconf+=" --disable-pulse"
-	use python     || myconf+=" --disable-python"
-	use vboxwebsrv && myconf+=" --enable-webservice"
-	use vnc        && myconf+=" --enable-vnc"
-	if ! use headless ; then
-		use qt4 || myconf+=" --disable-qt4"
-	else
-		myconf+=" --build-headless --disable-opengl"
-	fi
-	if use amd64 && ! has_multilib_profile ; then
-		myconf+=" --disable-vmmraw"
-	fi
-	# not an autoconf script
-	./configure \
-		--with-gcc="$(tc-getCC)" \
-		--with-g++="$(tc-getCXX)" \
-		--disable-kmods \
-		--disable-dbus \
-		--disable-devmapper \
-		${myconf} \
-		|| die "configure failed"
-}
-
-src_compile() {
-	source ./env.sh
-
-	# Force kBuild to respect C[XX]FLAGS and MAKEOPTS (bug #178529)
-	# and strip all flags
-	# strip-flags
-
-	MAKEJOBS=$(echo ${MAKEOPTS} | egrep -o '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+')
-	MAKELOAD=$(echo ${MAKEOPTS} | egrep -o '(\-l|\-\-load-average)(=?|[[:space:]]*)[[:digit:]]+')
-	MAKEOPTS="${MAKEJOBS} ${MAKELOAD}"
-	MAKE="kmk" emake \
-		VBOX_BUILD_PUBLISHER=_Gentoo \
-		TOOL_GCC3_CC="$(tc-getCC)" TOOL_GCC3_CXX="$(tc-getCXX)" \
-		TOOL_GCC3_AS="$(tc-getCC)" TOOL_GCC3_AR="$(tc-getAR)" \
-		TOOL_GCC3_LD="$(tc-getCXX)" TOOL_GCC3_LD_SYSMOD="$(tc-getLD)" \
-		TOOL_GCC3_CFLAGS="${CFLAGS}" TOOL_GCC3_CXXFLAGS="${CXXFLAGS}" \
-		VBOX_GCC_OPT="${CXXFLAGS}" \
-		TOOL_YASM_AS=yasm KBUILD_VERBOSE=2 \
-		all
-}
-
-src_install() {
-	cd "${S}"/out/linux.${ARCH}/release/bin || die
-
-	# Create configuration files
-	insinto /etc/vbox
-	newins "${FILESDIR}/${PN}-4-config" vbox.cfg
-
-	# Set the right libdir
-	sed -i \
-		-e "s@MY_LIBDIR@$(get_libdir)@" \
-		"${D}"/etc/vbox/vbox.cfg || die "vbox.cfg sed failed"
-
-	# Symlink binaries to the shipped wrapper
-	exeinto /usr/$(get_libdir)/${PN}
-	newexe "${FILESDIR}/${PN}-ose-3-wrapper" "VBox"
-	fowners root:vboxusers /usr/$(get_libdir)/${PN}/VBox
-	fperms 0750 /usr/$(get_libdir)/${PN}/VBox
-
-	dosym /usr/$(get_libdir)/${PN}/VBox /usr/bin/VBoxManage
-	dosym /usr/$(get_libdir)/${PN}/VBox /usr/bin/VBoxVRDP
-	dosym /usr/$(get_libdir)/${PN}/VBox /usr/bin/VBoxHeadless
-	dosym /usr/$(get_libdir)/${PN}/VBoxTunctl /usr/bin/VBoxTunctl
-
-	# Install binaries and libraries
-	insinto /usr/$(get_libdir)/${PN}
-	doins -r components
-
-	if use sdk ; then
-		doins -r sdk
-	fi
-
-	if use vboxwebsrv ; then
-		doins vboxwebsrv
-		fowners root:vboxusers /usr/$(get_libdir)/${PN}/vboxwebsrv
-		fperms 0750 /usr/$(get_libdir)/${PN}/vboxwebsrv
-		dosym /usr/$(get_libdir)/${PN}/VBox /usr/bin/vboxwebsrv
-		newinitd "${FILESDIR}"/vboxwebsrv-initd vboxwebsrv
-		newconfd "${FILESDIR}"/vboxwebsrv-confd vboxwebsrv
-	fi
-
-	#local gcfiles="*gc"
-	#if use amd64 && ! has_multilib_profile ; then
-	#	gcfiles=""
-	#fi
-
-	for each in VBox{Manage,SVC,XPCOMIPCD,Tunctl,ExtPackHelperApp} *so *r0 *.rc ; do
-		doins ${each}
-		fowners root:vboxusers /usr/$(get_libdir)/${PN}/${each}
-		fperms 0750 /usr/$(get_libdir)/${PN}/${each}
-	done
-
-	# VBoxNetAdpCtl and VBoxNetDHCP binaries need to be suid root in any case..
-	for each in VBoxNet{AdpCtl,DHCP,NAT} ; do
-		doins ${each}
-		fowners root:vboxusers /usr/$(get_libdir)/${PN}/${each}
-		fperms 4750 /usr/$(get_libdir)/${PN}/${each}
-	done
-
-	# VBoxSVC and VBoxManage need to be pax-marked (bug #403453)
-	# VBoxXPCOMIPCD (bug #524202)
-	for each in VBox{Manage,SVC,XPCOMIPCD} ; do
-		pax-mark -m "${D}"/usr/$(get_libdir)/${PN}/${each} || die
-	done
-
-	if ! use headless ; then
-		for each in VBox{SDL,Headless} ; do
-			doins ${each}
-			fowners root:vboxusers /usr/$(get_libdir)/${PN}/${each}
-			fperms 4750 /usr/$(get_libdir)/${PN}/${each}
-			pax-mark -m "${D}"/usr/$(get_libdir)/${PN}/${each}
-		done
-
-		if use opengl && use qt4 ; then
-			doins VBoxTestOGL
-			fowners root:vboxusers /usr/$(get_libdir)/${PN}/VBoxTestOGL
-			fperms 0750 /usr/$(get_libdir)/${PN}/VBoxTestOGL
-			pax-mark -m "${D}"/usr/$(get_libdir)/${PN}/VBoxTestOGL
-		fi
-
-		dosym /usr/$(get_libdir)/${PN}/VBox /usr/bin/VBoxSDL
-
-		if use qt4 ; then
-			doins VirtualBox
-			fowners root:vboxusers /usr/$(get_libdir)/${PN}/VirtualBox
-			fperms 4750 /usr/$(get_libdir)/${PN}/VirtualBox
-			pax-mark -m "${D}"/usr/$(get_libdir)/${PN}/VirtualBox \
-				|| die
-
-			dosym /usr/$(get_libdir)/${PN}/VBox /usr/bin/VirtualBox
-
-			newmenu "${FILESDIR}"/${PN}-ose.desktop-2 ${PN}.desktop
-		fi
-
-		pushd "${S}"/src/VBox/Resources/OSE &>/dev/null || die
-		for size in 16 32 48 64 128 ; do
-			newicon -s ${size} ${PN}-${size}px.png ${PN}.png
-		done
-		newicon ${PN}-48px.png ${PN}.png
-		popd &>/dev/null || die
-	else
-		doins VBoxHeadless
-		fowners root:vboxusers /usr/$(get_libdir)/${PN}/VBoxHeadless
-		fperms 4750 /usr/$(get_libdir)/${PN}/VBoxHeadless
-		pax-mark -m "${D}"/usr/$(get_libdir)/${PN}/VBoxHeadless || die
-	fi
-
-	insinto /usr/$(get_libdir)/${PN}
-	# Install EFI Firmware files (bug #320757)
-	pushd "${S}"/src/VBox/Devices/EFI/FirmwareBin &>/dev/null || die
-	for fwfile in VBoxEFI{32,64}.fd ; do
-		doins ${fwfile}
-		fowners root:vboxusers /usr/$(get_libdir)/${PN}/${fwfile}
-	done
-	popd &>/dev/null || die
-
-	if use udev ; then
-		# New way of handling USB device nodes for VBox (bug #356215)
-		local udevdir="$(get_udevdir)"
-		insinto ${udevdir}
-		doins VBoxCreateUSBNode.sh
-		fowners root:vboxusers ${udevdir}/VBoxCreateUSBNode.sh
-		fperms 0750 ${udevdir}/VBoxCreateUSBNode.sh
-		insinto ${udevdir}/rules.d
-		doins "${FILESDIR}"/10-virtualbox.rules
-		sed "s@%UDEVDIR%@${udevdir}@" \
-			-i "${D}"${udevdir}/rules.d/10-virtualbox.rules || die
-	fi
-
-	insinto /usr/share/${PN}
-	if ! use headless && use qt4 ; then
-		doins -r nls
-	fi
-
-	# VRDPAuth only works with this (bug #351949)
-	dosym VBoxAuth.so  /usr/$(get_libdir)/${PN}/VRDPAuth.so
-
-	# set an env-variable for 3rd party tools
-	echo -n "VBOX_APP_HOME=/usr/$(get_libdir)/${PN}" > "${T}/90virtualbox"
-	doenvd "${T}/90virtualbox"
-
-	if use java ; then
-		java-pkg_regjar "${D}/usr/$(get_libdir)/${PN}/sdk/bindings/xpcom/java/vboxjxpcom.jar"
-		java-pkg_regso "${D}/usr/$(get_libdir)/${PN}/libvboxjxpcom.so"
-	fi
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-
-	if use udev ; then
-		udevadm control --reload-rules \
-			&& udevadm trigger --subsystem-match=usb
-	fi
-
-	if ! use headless && use qt4 ; then
-		elog "To launch VirtualBox just type: \"VirtualBox\"."
-	fi
-	elog "You must be in the vboxusers group to use VirtualBox."
-	elog ""
-	elog "The latest user manual is available for download at:"
-	elog "http://download.virtualbox.org/virtualbox/${PV}/UserManual.pdf"
-	elog ""
-	elog "For advanced networking setups you should emerge:"
-	elog "net-misc/bridge-utils and sys-apps/usermode-utilities"
-	elog ""
-	elog "IMPORTANT!"
-	elog "If you upgrade from app-emulation/virtualbox-ose make sure to run"
-	elog "\"env-update\" as root and logout and relogin as the user you wish"
-	elog "to run ${PN} as."
-	elog ""
-	elog "Starting with version 4.0.0, ${PN} has USB-1 support."
-	elog "For USB-2 support, PXE-boot ability and VRDP support please emerge"
-	elog "  app-emulation/virtualbox-extpack-oracle"
-	elog "package."
-	elog "Starting with version 5.0.0, ${PN} no longer has the \"additions\" and"
-	elog "the \"extension\" USE flag. For installation of the guest additions ISO"
-	elog "image, please emerge"
-	elog "  app-emulation/virtualbox-additions"
-	elog "and for the USB2, USB3, VRDP and PXE boot ROM modules, please emerge"
-	elog "  app-emulation/virtualbox-extpack-oracle"
-	if ! use udev ; then
-		elog ""
-		elog "WARNING!"
-		elog "Without USE=udev, USB devices will likely not work in ${PN}."
-	elif [ -e "${ROOT}/etc/udev/rules.d/10-virtualbox.rules" ] ; then
-		elog ""
-		elog "Please remove \"${ROOT}/etc/udev/rules.d/10-virtualbox.rules\""
-		elog "or else USB in ${PN} won't work."
-	fi
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-}
diff --git a/app-emulation/virtualbox/virtualbox-5.0.4.ebuild b/app-emulation/virtualbox/virtualbox-5.0.4.ebuild
new file mode 100644
index 000000000000..b10c46121722
--- /dev/null
+++ b/app-emulation/virtualbox/virtualbox-5.0.4.ebuild
@@ -0,0 +1,431 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+inherit eutils fdo-mime flag-o-matic java-pkg-opt-2 linux-info multilib pax-utils python-single-r1 qt4-r2 toolchain-funcs udev
+
+MY_PV="${PV/beta/BETA}"
+MY_PV="${MY_PV/rc/RC}"
+MY_P=VirtualBox-${MY_PV}
+SRC_URI="http://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.tar.bz2
+	https://dev.gentoo.org/~polynomial-c/${PN}/patchsets/${PN}-5.0.2-patches-01.tar.xz"
+S="${WORKDIR}/${MY_P}"
+
+DESCRIPTION="Family of powerful x86 virtualization products for enterprise as well as home use"
+HOMEPAGE="http://www.virtualbox.org/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="alsa doc headless java pam pulseaudio +opengl python +qt4 +sdk +udev vboxwebsrv vnc"
+
+RDEPEND="!app-emulation/virtualbox-bin
+	~app-emulation/virtualbox-modules-${PV}
+	dev-libs/libIDL
+	>=dev-libs/libxslt-1.1.19
+	net-misc/curl
+	dev-libs/openssl:0=
+	dev-libs/libxml2
+	media-libs/libpng:0=
+	media-libs/libvpx
+	sys-libs/zlib
+	!headless? (
+		qt4? (
+			dev-qt/qtgui:4
+			dev-qt/qtcore:4
+			opengl? ( dev-qt/qtopengl:4 )
+			x11-libs/libXinerama
+		)
+		opengl? ( virtual/opengl media-libs/freeglut )
+		x11-libs/libX11
+		x11-libs/libXcursor
+		x11-libs/libXext
+		x11-libs/libXmu
+		x11-libs/libXt
+		media-libs/libsdl:0[X,video]
+	)
+
+	java? ( >=virtual/jre-1.6:= )
+	udev? ( >=virtual/udev-171 )
+	vnc? ( >=net-libs/libvncserver-0.9.9 )"
+DEPEND="${RDEPEND}
+	>=dev-util/kbuild-0.1.9998_pre20131130
+	>=dev-lang/yasm-0.6.2
+	sys-devel/bin86
+	sys-power/iasl
+	pam? ( sys-libs/pam )
+	sys-libs/libcap
+	doc? (
+		dev-texlive/texlive-basic
+		dev-texlive/texlive-latex
+		dev-texlive/texlive-latexrecommended
+		dev-texlive/texlive-latexextra
+		dev-texlive/texlive-fontsrecommended
+		dev-texlive/texlive-fontsextra
+	)
+	java? ( >=virtual/jre-1.6:= )
+	virtual/pkgconfig
+	alsa? ( >=media-libs/alsa-lib-1.0.13 )
+	!headless? ( x11-libs/libXinerama )
+	pulseaudio? ( media-sound/pulseaudio )
+	vboxwebsrv? ( net-libs/gsoap[-gnutls(-)] )
+	${PYTHON_DEPS}"
+
+QA_TEXTRELS_x86="usr/lib/virtualbox-ose/VBoxGuestPropSvc.so
+	usr/lib/virtualbox/VBoxSDL.so
+	usr/lib/virtualbox/VBoxSharedFolders.so
+	usr/lib/virtualbox/VBoxDD2.so
+	usr/lib/virtualbox/VBoxOGLrenderspu.so
+	usr/lib/virtualbox/VBoxPython.so
+	usr/lib/virtualbox/VBoxDD.so
+	usr/lib/virtualbox/VBoxDDU.so
+	usr/lib/virtualbox/VBoxREM64.so
+	usr/lib/virtualbox/VBoxSharedClipboard.so
+	usr/lib/virtualbox/VBoxHeadless.so
+	usr/lib/virtualbox/VBoxRT.so
+	usr/lib/virtualbox/VBoxREM.so
+	usr/lib/virtualbox/VBoxSettings.so
+	usr/lib/virtualbox/VBoxKeyboard.so
+	usr/lib/virtualbox/VBoxSharedCrOpenGL.so
+	usr/lib/virtualbox/VBoxVMM.so
+	usr/lib/virtualbox/VirtualBox.so
+	usr/lib/virtualbox/VBoxOGLhosterrorspu.so
+	usr/lib/virtualbox/components/VBoxC.so
+	usr/lib/virtualbox/components/VBoxSVCM.so
+	usr/lib/virtualbox/components/VBoxDDU.so
+	usr/lib/virtualbox/components/VBoxRT.so
+	usr/lib/virtualbox/components/VBoxREM.so
+	usr/lib/virtualbox/components/VBoxVMM.so
+	usr/lib/virtualbox/VBoxREM32.so
+	usr/lib/virtualbox/VBoxPython2_4.so
+	usr/lib/virtualbox/VBoxPython2_5.so
+	usr/lib/virtualbox/VBoxPython2_6.so
+	usr/lib/virtualbox/VBoxPython2_7.so
+	usr/lib/virtualbox/VBoxXPCOMC.so
+	usr/lib/virtualbox/VBoxOGLhostcrutil.so
+	usr/lib/virtualbox/VBoxNetDHCP.so
+	usr/lib/virtualbox/VBoxNetNAT.so"
+
+REQUIRED_USE="
+	java? ( sdk )
+	python? (
+		( sdk )
+	)
+	vboxwebsrv? ( java )
+	${PYTHON_REQUIRED_USE}
+"
+
+pkg_setup() {
+	if ! use headless && ! use qt4 ; then
+		einfo "No USE=\"qt4\" selected, this build will not include"
+		einfo "any Qt frontend."
+	elif use headless && use qt4 ; then
+		einfo "You selected USE=\"headless qt4\", defaulting to"
+		einfo "USE=\"headless\", this build will not include any X11/Qt frontend."
+	fi
+
+	if ! use opengl ; then
+		einfo "No USE=\"opengl\" selected, this build will lack"
+		einfo "the OpenGL feature."
+	fi
+	if ! use python ; then
+		einfo "You have disabled the \"python\" USE flag. This will only"
+		einfo "disable the python bindings being installed."
+	fi
+	java-pkg-opt-2_pkg_setup
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	# Remove shipped binaries (kBuild,yasm), see bug #232775
+	rm -rf kBuild/bin tools
+
+	# Disable things unused or split into separate ebuilds
+	sed -e "s@MY_LIBDIR@$(get_libdir)@" \
+		"${FILESDIR}"/${PN}-5-localconfig > LocalConfig.kmk || die
+
+	# Respect LDFLAGS
+	sed -e "s@_LDFLAGS\.${ARCH}*.*=@& ${LDFLAGS}@g" \
+		-i Config.kmk src/libs/xpcom18a4/Config.kmk || die
+
+	# Use PAM only when pam USE flag is enbaled (bug #376531)
+	if ! use pam ; then
+		elog "Disabling PAM removes the possibility to use the VRDP features."
+		sed -i 's@^.*VBOX_WITH_PAM@#VBOX_WITH_PAM@' Config.kmk || die
+		sed -i 's@\(.*/auth/Makefile.kmk.*\)@#\1@' \
+			src/VBox/HostServices/Makefile.kmk || die
+	fi
+
+	# add correct java path
+	if use java ; then
+		sed "s@/usr/lib/jvm/java-6-sun@$(java-config -O)@" \
+			-i "${S}"/Config.kmk || die
+		java-pkg-opt-2_src_prepare
+	fi
+
+	if ! gcc-specs-pie ; then
+		EPATCH_EXCLUDE="050_${PN}-5.0.2-nopie.patch"
+	fi
+
+	EPATCH_SUFFIX="patch" \
+	EPATCH_FORCE="yes" \
+	epatch "${WORKDIR}/patches"
+
+	epatch_user
+}
+
+src_configure() {
+	local myconf
+	use alsa       || myconf+=" --disable-alsa"
+	use doc        || myconf+=" --disable-docs"
+	use java       || myconf+=" --disable-java"
+	use opengl     || myconf+=" --disable-opengl"
+	use pulseaudio || myconf+=" --disable-pulse"
+	use python     || myconf+=" --disable-python"
+	use vboxwebsrv && myconf+=" --enable-webservice"
+	use vnc        && myconf+=" --enable-vnc"
+	if ! use headless ; then
+		use qt4 || myconf+=" --disable-qt4"
+	else
+		myconf+=" --build-headless --disable-opengl"
+	fi
+	if use amd64 && ! has_multilib_profile ; then
+		myconf+=" --disable-vmmraw"
+	fi
+	# not an autoconf script
+	./configure \
+		--with-gcc="$(tc-getCC)" \
+		--with-g++="$(tc-getCXX)" \
+		--disable-kmods \
+		--disable-dbus \
+		--disable-devmapper \
+		${myconf} \
+		|| die "configure failed"
+}
+
+src_compile() {
+	source ./env.sh
+
+	# Force kBuild to respect C[XX]FLAGS and MAKEOPTS (bug #178529)
+	# and strip all flags
+	# strip-flags
+
+	MAKEJOBS=$(echo ${MAKEOPTS} | egrep -o '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+')
+	MAKELOAD=$(echo ${MAKEOPTS} | egrep -o '(\-l|\-\-load-average)(=?|[[:space:]]*)[[:digit:]]+')
+	MAKEOPTS="${MAKEJOBS} ${MAKELOAD}"
+	MAKE="kmk" emake \
+		VBOX_BUILD_PUBLISHER=_Gentoo \
+		TOOL_GCC3_CC="$(tc-getCC)" TOOL_GCC3_CXX="$(tc-getCXX)" \
+		TOOL_GCC3_AS="$(tc-getCC)" TOOL_GCC3_AR="$(tc-getAR)" \
+		TOOL_GCC3_LD="$(tc-getCXX)" TOOL_GCC3_LD_SYSMOD="$(tc-getLD)" \
+		TOOL_GCC3_CFLAGS="${CFLAGS}" TOOL_GCC3_CXXFLAGS="${CXXFLAGS}" \
+		VBOX_GCC_OPT="${CXXFLAGS}" \
+		TOOL_YASM_AS=yasm KBUILD_VERBOSE=2 \
+		all
+}
+
+src_install() {
+	cd "${S}"/out/linux.${ARCH}/release/bin || die
+
+	# Create configuration files
+	insinto /etc/vbox
+	newins "${FILESDIR}/${PN}-4-config" vbox.cfg
+
+	# Set the right libdir
+	sed -i \
+		-e "s@MY_LIBDIR@$(get_libdir)@" \
+		"${D}"/etc/vbox/vbox.cfg || die "vbox.cfg sed failed"
+
+	# Symlink binaries to the shipped wrapper
+	exeinto /usr/$(get_libdir)/${PN}
+	newexe "${FILESDIR}/${PN}-ose-3-wrapper" "VBox"
+	fowners root:vboxusers /usr/$(get_libdir)/${PN}/VBox
+	fperms 0750 /usr/$(get_libdir)/${PN}/VBox
+
+	dosym /usr/$(get_libdir)/${PN}/VBox /usr/bin/VBoxManage
+	dosym /usr/$(get_libdir)/${PN}/VBox /usr/bin/VBoxVRDP
+	dosym /usr/$(get_libdir)/${PN}/VBox /usr/bin/VBoxHeadless
+	dosym /usr/$(get_libdir)/${PN}/VBoxTunctl /usr/bin/VBoxTunctl
+
+	# Install binaries and libraries
+	insinto /usr/$(get_libdir)/${PN}
+	doins -r components
+
+	if use sdk ; then
+		doins -r sdk
+	fi
+
+	if use vboxwebsrv ; then
+		doins vboxwebsrv
+		fowners root:vboxusers /usr/$(get_libdir)/${PN}/vboxwebsrv
+		fperms 0750 /usr/$(get_libdir)/${PN}/vboxwebsrv
+		dosym /usr/$(get_libdir)/${PN}/VBox /usr/bin/vboxwebsrv
+		newinitd "${FILESDIR}"/vboxwebsrv-initd vboxwebsrv
+		newconfd "${FILESDIR}"/vboxwebsrv-confd vboxwebsrv
+	fi
+
+	local rcfiles="*.rc"
+	if use amd64 && ! has_multilib_profile ; then
+		rcfiles=""
+	fi
+
+	for each in VBox{Manage,SVC,XPCOMIPCD,Tunctl,ExtPackHelperApp} *so *r0 ${rcfiles} ; do
+		doins ${each}
+		fowners root:vboxusers /usr/$(get_libdir)/${PN}/${each}
+		fperms 0750 /usr/$(get_libdir)/${PN}/${each}
+	done
+
+	# VBoxNetAdpCtl and VBoxNetDHCP binaries need to be suid root in any case..
+	for each in VBoxNet{AdpCtl,DHCP,NAT} ; do
+		doins ${each}
+		fowners root:vboxusers /usr/$(get_libdir)/${PN}/${each}
+		fperms 4750 /usr/$(get_libdir)/${PN}/${each}
+	done
+
+	# VBoxSVC and VBoxManage need to be pax-marked (bug #403453)
+	# VBoxXPCOMIPCD (bug #524202)
+	for each in VBox{Manage,SVC,XPCOMIPCD} ; do
+		if ! pax-mark -m "${D}"/usr/$(get_libdir)/${PN}/${each} ; then
+			ewarn "Couldn't pax-mark /usr/$(get_libdir)/${PN}/${each}"
+		fi
+	done
+
+	if ! use headless ; then
+		doins VBoxSDL
+		fowners root:vboxusers /usr/$(get_libdir)/${PN}/VBoxSDL
+		fperms 4750 /usr/$(get_libdir)/${PN}/VBoxSDL
+		if ! pax-mark -m "${D}"/usr/$(get_libdir)/${PN}/VBoxSDL ; then
+			ewarn "Couldn't pax-mark /usr/$(get_libdir)/${PN}/VBoxSDL"
+		fi
+
+		if use opengl && use qt4 ; then
+			doins VBoxTestOGL
+			fowners root:vboxusers /usr/$(get_libdir)/${PN}/VBoxTestOGL
+			fperms 0750 /usr/$(get_libdir)/${PN}/VBoxTestOGL
+			if ! pax-mark -m "${D}"/usr/$(get_libdir)/${PN}/VBoxTestOGL ; then
+				ewarn "Couldn't pax-mark /usr/$(get_libdir)/${PN}/VBoxTestOGL"
+			fi
+		fi
+
+		dosym /usr/$(get_libdir)/${PN}/VBox /usr/bin/VBoxSDL
+
+		if use qt4 ; then
+			doins VirtualBox
+			fowners root:vboxusers /usr/$(get_libdir)/${PN}/VirtualBox
+			fperms 4750 /usr/$(get_libdir)/${PN}/VirtualBox
+			if ! pax-mark -m "${D}"/usr/$(get_libdir)/${PN}/VirtualBox ; then
+				ewarn "Couldn't pax-mark /usr/$(get_libdir)/${PN}/VirtualBox"
+			fi
+
+			dosym /usr/$(get_libdir)/${PN}/VBox /usr/bin/VirtualBox
+
+			newmenu "${FILESDIR}"/${PN}-ose.desktop-2 ${PN}.desktop
+		fi
+
+		pushd "${S}"/src/VBox/Artwork/OSE &>/dev/null || die
+		for size in 16 32 48 64 128 ; do
+			newicon -s ${size} ${PN}-${size}px.png ${PN}.png
+		done
+		newicon ${PN}-48px.png ${PN}.png
+		doicon -s scalable ${PN}.svg
+		popd &>/dev/null || die
+	fi
+
+	doins VBoxHeadless
+	fowners root:vboxusers /usr/$(get_libdir)/${PN}/VBoxHeadless
+	fperms 4750 /usr/$(get_libdir)/${PN}/VBoxHeadless
+	if ! pax-mark -m "${D}"/usr/$(get_libdir)/${PN}/VBoxHeadless ; then
+		ewarn "Couldn't pax-mark /usr/$(get_libdir)/${PN}/VBoxHeadless"
+	fi
+
+	insinto /usr/$(get_libdir)/${PN}
+	# Install EFI Firmware files (bug #320757)
+	pushd "${S}"/src/VBox/Devices/EFI/FirmwareBin &>/dev/null || die
+	for fwfile in VBoxEFI{32,64}.fd ; do
+		doins ${fwfile}
+		fowners root:vboxusers /usr/$(get_libdir)/${PN}/${fwfile}
+	done
+	popd &>/dev/null || die
+
+	if use udev ; then
+		# New way of handling USB device nodes for VBox (bug #356215)
+		local udevdir="$(get_udevdir)"
+		insinto ${udevdir}
+		doins VBoxCreateUSBNode.sh
+		fowners root:vboxusers ${udevdir}/VBoxCreateUSBNode.sh
+		fperms 0750 ${udevdir}/VBoxCreateUSBNode.sh
+		insinto ${udevdir}/rules.d
+		doins "${FILESDIR}"/10-virtualbox.rules
+		sed "s@%UDEVDIR%@${udevdir}@" \
+			-i "${D}"${udevdir}/rules.d/10-virtualbox.rules || die
+	fi
+
+	insinto /usr/share/${PN}
+	if ! use headless && use qt4 ; then
+		doins -r nls
+	fi
+
+	# VRDPAuth only works with this (bug #351949)
+	dosym VBoxAuth.so  /usr/$(get_libdir)/${PN}/VRDPAuth.so
+
+	# set an env-variable for 3rd party tools
+	echo -n "VBOX_APP_HOME=/usr/$(get_libdir)/${PN}" > "${T}/90virtualbox"
+	doenvd "${T}/90virtualbox"
+
+	if use java ; then
+		java-pkg_regjar "${D}/usr/$(get_libdir)/${PN}/sdk/bindings/xpcom/java/vboxjxpcom.jar"
+		java-pkg_regso "${D}/usr/$(get_libdir)/${PN}/libvboxjxpcom.so"
+	fi
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+
+	if use udev ; then
+		udevadm control --reload-rules \
+			&& udevadm trigger --subsystem-match=usb
+	fi
+
+	if ! use headless && use qt4 ; then
+		elog "To launch VirtualBox just type: \"VirtualBox\"."
+	fi
+	elog "You must be in the vboxusers group to use VirtualBox."
+	elog ""
+	elog "The latest user manual is available for download at:"
+	elog "http://download.virtualbox.org/virtualbox/${PV}/UserManual.pdf"
+	elog ""
+	elog "For advanced networking setups you should emerge:"
+	elog "net-misc/bridge-utils and sys-apps/usermode-utilities"
+	elog ""
+	elog "IMPORTANT!"
+	elog "If you upgrade from app-emulation/virtualbox-ose make sure to run"
+	elog "\"env-update\" as root and logout and relogin as the user you wish"
+	elog "to run ${PN} as."
+	elog ""
+	elog "Starting with version 4.0.0, ${PN} has USB-1 support."
+	elog "For USB-2 support, PXE-boot ability and VRDP support please emerge"
+	elog "  app-emulation/virtualbox-extpack-oracle"
+	elog "package."
+	elog "Starting with version 5.0.0, ${PN} no longer has the \"additions\" and"
+	elog "the \"extension\" USE flag. For installation of the guest additions ISO"
+	elog "image, please emerge"
+	elog "  app-emulation/virtualbox-additions"
+	elog "and for the USB2, USB3, VRDP and PXE boot ROM modules, please emerge"
+	elog "  app-emulation/virtualbox-extpack-oracle"
+	if ! use udev ; then
+		elog ""
+		elog "WARNING!"
+		elog "Without USE=udev, USB devices will likely not work in ${PN}."
+	elif [ -e "${ROOT}/etc/udev/rules.d/10-virtualbox.rules" ] ; then
+		elog ""
+		elog "Please remove \"${ROOT}/etc/udev/rules.d/10-virtualbox.rules\""
+		elog "or else USB in ${PN} won't work."
+	fi
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+}
diff --git a/app-emulation/vmware-modules/files/271-3.10-00-userns.patch b/app-emulation/vmware-modules/files/271-3.10-00-userns.patch
new file mode 100644
index 000000000000..b1b78b76300e
--- /dev/null
+++ b/app-emulation/vmware-modules/files/271-3.10-00-userns.patch
@@ -0,0 +1,41 @@
+correctly initializes UID/GID values
+gets UID correctly in light of user namespace API
+origionally from https://462666.bugs.gentoo.org/attachment.cgi?id=342888
+
+--- a/vmblock-only/linux/inode.c   2013-03-20 17:37:48.000000000 +0100
++++ b/vmblock-only/linux/inode.c   2013-03-20 17:41:22.000000000 +0100
+@@ -135,7 +135,8 @@
+    inode->i_size = INODE_TO_IINFO(inode)->nameLen;
+    inode->i_version = 1;
+    inode->i_atime = inode->i_mtime = inode->i_ctime = CURRENT_TIME;
+-   inode->i_uid = inode->i_gid = 0;
++   inode->i_uid = GLOBAL_ROOT_UID;
++   inode->i_gid = GLOBAL_ROOT_GID;
+    inode->i_op = &LinkInodeOps;
+ 
+    d_add(dentry, inode);
+
+--- a/vmci-only/linux/driver.c    2013-03-20 17:57:35.000000000 +0100
++++ b/vmci-only/linux/driver.c    2013-03-20 17:57:43.000000000 +0100
+@@ -740,7 +740,7 @@
+          goto init_release;
+       }
+ 
+-      user = current_uid();
++      user = from_kuid(current_user_ns(), current_uid());
+       retval = VMCIContext_InitContext(initBlock.cid, initBlock.flags,
+                                        0 /* Unused */, vmciLinux->userVersion,
+                                        &user, &vmciLinux->context);
+
+--- a/vsock-only/linux/af_vsock.c 2013-03-20 18:01:48.000000000 +0100
++++ b/vsock-only/linux/af_vsock.c 2013-03-20 18:01:58.000000000 +0100
+@@ -2866,7 +2866,7 @@
+       vsk->connectTimeout = psk->connectTimeout;
+    } else {
+       vsk->trusted = capable(CAP_NET_ADMIN);
+-      vsk->owner = current_uid();
++      vsk->owner = from_kuid(current_user_ns(), current_uid());
+       vsk->queuePairSize = VSOCK_DEFAULT_QP_SIZE;
+       vsk->queuePairMinSize = VSOCK_DEFAULT_QP_SIZE_MIN;
+       vsk->queuePairMaxSize = VSOCK_DEFAULT_QP_SIZE_MAX;
+
diff --git a/app-emulation/vmware-modules/files/271-3.10-01-create_proc_entry.patch b/app-emulation/vmware-modules/files/271-3.10-01-create_proc_entry.patch
new file mode 100644
index 000000000000..889ae71be47b
--- /dev/null
+++ b/app-emulation/vmware-modules/files/271-3.10-01-create_proc_entry.patch
@@ -0,0 +1,28 @@
+uses the new proc_create function to create /proc entries
+instead of create_proc_entry which was deprecated: 
+https://lkml.org/lkml/2013/4/11/215
+
+--- a/vmblock-only/linux/control.c	2013-05-21 19:21:19.165750556 +0200
++++ b/vmblock-only/linux/control.c	2013-05-21 19:22:18.363747723 +0200
+@@ -208,9 +208,10 @@
+    VMBlockSetProcEntryOwner(controlProcMountpoint);
+ 
+    /* Create /proc/fs/vmblock/dev */
+-   controlProcEntry = create_proc_entry(VMBLOCK_CONTROL_DEVNAME,
+-                                        VMBLOCK_CONTROL_MODE,
+-                                        controlProcDirEntry);
++   controlProcEntry = proc_create(VMBLOCK_CONTROL_DEVNAME,
++                                  VMBLOCK_CONTROL_MODE,
++                                  controlProcDirEntry,
++                                  &ControlFileOps);
+    if (!controlProcEntry) {
+       Warning("SetupProcDevice: could not create " VMBLOCK_DEVICE "\n");
+       remove_proc_entry(VMBLOCK_CONTROL_MOUNTPOINT, controlProcDirEntry);
+@@ -218,7 +219,6 @@
+       return -EINVAL;
+    }
+ 
+-   controlProcEntry->proc_fops = &ControlFileOps;
+    return 0;
+ }
+ 
diff --git a/app-emulation/vmware-modules/files/271-3.10-02-getname.patch b/app-emulation/vmware-modules/files/271-3.10-02-getname.patch
new file mode 100644
index 000000000000..05ed8dbcc374
--- /dev/null
+++ b/app-emulation/vmware-modules/files/271-3.10-02-getname.patch
@@ -0,0 +1,24 @@
+uses __getname/__putname instead of getname. getname was deprecated
+the new code calls __getname (which really is a specific type of 
+memory allocator, then copies the string safely from user space
+into the allocated buffer
+
+--- vmblock-only/linux/control.c	2014-03-15 15:28:40.871076076 +0100
++++ vmblock-only/linux/control.c.new	2014-03-15 15:29:15.079074439 +0100
+@@ -279,11 +279,17 @@
+    int i;
+    int retval;
+ 
+-   name = getname(buf);
++   name = __getname();
+    if (IS_ERR(name)) {
+       return PTR_ERR(name);
+    }
+ 
++   i = strncpy_from_user(name, buf, PATH_MAX);
++   if (i < 0 || i == PATH_MAX) {
++      __putname(name);
++      return -EINVAL;
++   }
++
+    for (i = strlen(name) - 1; i >= 0 && name[i] == '/'; i--) {
diff --git a/app-emulation/vmware-modules/files/271-3.10-03-deprecated.patch b/app-emulation/vmware-modules/files/271-3.10-03-deprecated.patch
new file mode 100644
index 000000000000..981aabdd1260
--- /dev/null
+++ b/app-emulation/vmware-modules/files/271-3.10-03-deprecated.patch
@@ -0,0 +1,89 @@
+undefines DEPRECATED which is unfortunately also defined (as a string)
+in <linux/printk.h>. Realistically, this macro isn't even used, so this
+doesn't matter much. But it hushes some very loud warnings.
+
+diff -rupN vmblock-only/shared/vm_assert.h vmblock-only.new/shared/vm_assert.h
+--- vmblock-only/shared/vm_assert.h	2014-10-09 21:50:54.221159088 -0400
++++ vmblock-only.new/shared/vm_assert.h	2014-10-09 21:53:04.612166156 -0400
+@@ -237,11 +237,13 @@ EXTERN void WarningThrottled(uint32 *cou
+ #define LOG_ONCE(_s) DO_ONCE(Log _s)
+ 
+ #ifdef VMX86_DEVEL
++   #undef DEPRECATED
+    #define DEPRECATED(_fix) DO_ONCE(                                        \
+                                Warning("%s:%d: %s is DEPRECATED; %s\n",     \
+                                           __FILE__, __LINE__, __FUNCTION__, \
+                                           _fix))
+ #else
++   #undef DEPRECATED
+    #define DEPRECATED(_fix) do {} while (0)
+ #endif
+ 
+diff -rupN vmci-only/shared/vm_assert.h vmci-only.new/shared/vm_assert.h
+--- vmci-only/shared/vm_assert.h	2014-10-09 21:50:54.222159088 -0400
++++ vmci-only.new/shared/vm_assert.h	2014-10-09 21:52:52.348165492 -0400
+@@ -237,11 +237,13 @@ EXTERN void WarningThrottled(uint32 *cou
+ #define LOG_ONCE(_s) DO_ONCE(Log _s)
+ 
+ #ifdef VMX86_DEVEL
++   #undef DEPRECATED
+    #define DEPRECATED(_fix) DO_ONCE(                                        \
+                                Warning("%s:%d: %s is DEPRECATED; %s\n",     \
+                                           __FILE__, __LINE__, __FUNCTION__, \
+                                           _fix))
+ #else
++   #undef DEPRECATED
+    #define DEPRECATED(_fix) do {} while (0)
+ #endif
+ 
+diff -rupN vmmon-only/include/vm_assert.h vmmon-only.new/include/vm_assert.h
+--- vmmon-only/include/vm_assert.h	2014-10-09 21:50:54.222159088 -0400
++++ vmmon-only.new/include/vm_assert.h	2014-10-09 21:52:36.877164653 -0400
+@@ -237,11 +237,13 @@ EXTERN void WarningThrottled(uint32 *cou
+ #define LOG_ONCE(_s) DO_ONCE(Log _s)
+ 
+ #ifdef VMX86_DEVEL
++   #undef DEPRECATED
+    #define DEPRECATED(_fix) DO_ONCE(                                        \
+                                Warning("%s:%d: %s is DEPRECATED; %s\n",     \
+                                           __FILE__, __LINE__, __FUNCTION__, \
+                                           _fix))
+ #else
++   #undef DEPRECATED
+    #define DEPRECATED(_fix) do {} while (0)
+ #endif
+ 
+diff -rupN vmnet-only/vm_assert.h vmnet-only.new/vm_assert.h
+--- vmnet-only/vm_assert.h	2014-10-09 21:50:54.222159088 -0400
++++ vmnet-only.new/vm_assert.h	2014-10-09 21:52:57.736165784 -0400
+@@ -237,11 +237,13 @@ EXTERN void WarningThrottled(uint32 *cou
+ #define LOG_ONCE(_s) DO_ONCE(Log _s)
+ 
+ #ifdef VMX86_DEVEL
++   #undef DEPRECATED
+    #define DEPRECATED(_fix) DO_ONCE(                                        \
+                                Warning("%s:%d: %s is DEPRECATED; %s\n",     \
+                                           __FILE__, __LINE__, __FUNCTION__, \
+                                           _fix))
+ #else
++   #undef DEPRECATED
+    #define DEPRECATED(_fix) do {} while (0)
+ #endif
+ 
+diff -rupN vsock-only/shared/vm_assert.h vsock-only.new/shared/vm_assert.h
+--- vsock-only/shared/vm_assert.h	2014-10-09 21:50:54.222159088 -0400
++++ vsock-only.new/shared/vm_assert.h	2014-10-09 21:52:45.352165112 -0400
+@@ -237,11 +237,13 @@ EXTERN void WarningThrottled(uint32 *cou
+ #define LOG_ONCE(_s) DO_ONCE(Log _s)
+ 
+ #ifdef VMX86_DEVEL
++   #undef DEPRECATED
+    #define DEPRECATED(_fix) DO_ONCE(                                        \
+                                Warning("%s:%d: %s is DEPRECATED; %s\n",     \
+                                           __FILE__, __LINE__, __FUNCTION__, \
+                                           _fix))
+ #else
++   #undef DEPRECATED
+    #define DEPRECATED(_fix) do {} while (0)
+ #endif
+ 
diff --git a/app-emulation/vmware-modules/files/271-3.10-04-unused-typedef.patch b/app-emulation/vmware-modules/files/271-3.10-04-unused-typedef.patch
new file mode 100644
index 000000000000..d5129ec689a4
--- /dev/null
+++ b/app-emulation/vmware-modules/files/271-3.10-04-unused-typedef.patch
@@ -0,0 +1,115 @@
+hushes warnings about unused typedefs which are part of the "static assert"
+technique that the code uses. We simply add an "__attribute__((unused)) to each of them
+
+--- vmblock-only/shared/vm_assert.h	2014-10-07 22:43:39.519402467 -0400
++++ vmblock-only/shared/vm_assert.h	2014-10-07 22:48:01.346409957 -0400
+@@ -317,7 +317,7 @@ EXTERN void WarningThrottled(uint32 *cou
+ #define ASSERT_ON_COMPILE(e) \
+    do { \
+       enum { AssertOnCompileMisused = ((e) ? 1 : -1) }; \
+-      typedef char AssertOnCompileFailed[AssertOnCompileMisused]; \
++      __attribute__((unused)) typedef char AssertOnCompileFailed[AssertOnCompileMisused]; \
+    } while (0)
+ 
+ 
+--- vmci-only/shared/vm_assert.h	2014-10-07 22:43:39.519402467 -0400
++++ vmci-only/shared/vm_assert.h	2014-10-07 22:47:51.829409685 -0400
+@@ -317,7 +317,7 @@ EXTERN void WarningThrottled(uint32 *cou
+ #define ASSERT_ON_COMPILE(e) \
+    do { \
+       enum { AssertOnCompileMisused = ((e) ? 1 : -1) }; \
+-      typedef char AssertOnCompileFailed[AssertOnCompileMisused]; \
++      __attribute__((unused)) typedef char AssertOnCompileFailed[AssertOnCompileMisused]; \
+    } while (0)
+ 
+ 
+--- vmmon-only/include/vm_assert.h	2014-10-07 22:43:39.520402467 -0400
++++ vmmon-only/include/vm_assert.h	2014-10-07 22:47:39.246409325 -0400
+@@ -317,7 +317,7 @@ EXTERN void WarningThrottled(uint32 *cou
+ #define ASSERT_ON_COMPILE(e) \
+    do { \
+       enum { AssertOnCompileMisused = ((e) ? 1 : -1) }; \
+-      typedef char AssertOnCompileFailed[AssertOnCompileMisused]; \
++      __attribute__((unused)) typedef char AssertOnCompileFailed[AssertOnCompileMisused]; \
+    } while (0)
+ 
+ 
+--- vmnet-only/vm_assert.h	2014-10-07 22:43:39.520402467 -0400
++++ vmnet-only/vm_assert.h	2014-10-07 22:47:55.804409799 -0400
+@@ -317,7 +317,7 @@ EXTERN void WarningThrottled(uint32 *cou
+ #define ASSERT_ON_COMPILE(e) \
+    do { \
+       enum { AssertOnCompileMisused = ((e) ? 1 : -1) }; \
+-      typedef char AssertOnCompileFailed[AssertOnCompileMisused]; \
++      __attribute__((unused)) typedef char AssertOnCompileFailed[AssertOnCompileMisused]; \
+    } while (0)
+ 
+ 
+--- vsock-only/shared/vm_assert.h	2014-10-07 22:47:11.595408534 -0400
++++ vsock-only/shared/vm_assert.h	2014-10-07 22:45:55.715406363 -0400
+@@ -317,7 +317,7 @@ EXTERN void WarningThrottled(uint32 *cou
+ #define ASSERT_ON_COMPILE(e) \
+    do { \
+       enum { AssertOnCompileMisused = ((e) ? 1 : -1) }; \
+-      typedef char AssertOnCompileFailed[AssertOnCompileMisused]; \
++      __attribute__((unused)) typedef char AssertOnCompileFailed[AssertOnCompileMisused]; \
+    } while (0)
+ 
+ 
+--- vsock-only/shared/vm_atomic.h	2013-11-05 23:33:27.000000000 -0500
++++ vsock-only/shared/vm_atomic.h	2014-10-07 22:53:06.024418673 -0400
+@@ -2394,7 +2394,7 @@ Atomic_TestBit64(Atomic_uint64 *var, //
+                                       && 8 * sizeof (out) == size             \
+                                       && 8 * sizeof (cast) == size            \
+                                          ? 1 : -1 };                          \
+-      typedef char AssertOnCompileFailed[AssertOnCompileMisused];             \
++      __attribute__((unused)) typedef char AssertOnCompileFailed[AssertOnCompileMisused];             \
+    }                                                                          \
+                                                                               \
+                                                                               \
+--- vmci-only/shared/vm_atomic.h	2013-11-05 23:33:27.000000000 -0500
++++ vmci-only/shared/vm_atomic.h	2014-10-07 22:53:24.873419213 -0400
+@@ -2394,7 +2394,7 @@ Atomic_TestBit64(Atomic_uint64 *var, //
+                                       && 8 * sizeof (out) == size             \
+                                       && 8 * sizeof (cast) == size            \
+                                          ? 1 : -1 };                          \
+-      typedef char AssertOnCompileFailed[AssertOnCompileMisused];             \
++      __attribute__((unused)) typedef char AssertOnCompileFailed[AssertOnCompileMisused];             \
+    }                                                                          \
+                                                                               \
+                                                                               \
+
+--- vmblock-only/shared/vm_atomic.h	2013-11-05 23:33:27.000000000 -0500
++++ vmblock-only/shared/vm_atomic.h	2014-10-07 22:53:31.073419390 -0400
+@@ -2394,7 +2394,7 @@ Atomic_TestBit64(Atomic_uint64 *var, //
+                                       && 8 * sizeof (out) == size             \
+                                       && 8 * sizeof (cast) == size            \
+                                          ? 1 : -1 };                          \
+-      typedef char AssertOnCompileFailed[AssertOnCompileMisused];             \
++      __attribute__((unused)) typedef char AssertOnCompileFailed[AssertOnCompileMisused];             \
+    }                                                                          \
+                                                                               \
+
+--- vmnet-only/vm_atomic.h	2013-11-06 00:40:52.000000000 -0500
++++ vmnet-only/vm_atomic.h	2014-10-07 23:04:50.637438831 -0400
+@@ -2394,7 +2394,7 @@ Atomic_TestBit64(Atomic_uint64 *var, //
+                                       && 8 * sizeof (out) == size             \
+                                       && 8 * sizeof (cast) == size            \
+                                          ? 1 : -1 };                          \
+-      typedef char AssertOnCompileFailed[AssertOnCompileMisused];             \
++      __attribute__((unused)) typedef char AssertOnCompileFailed[AssertOnCompileMisused];             \
+    }                                                                          \
+                                                                               \
+                                                                               \
+																			   
+--- vmmon-only/include/vm_atomic.h   2013-11-06 00:40:52.000000000 -0500
++++ vmmon-only/include/vm_atomic.h   2014-10-07 23:04:50.637438831 -0400
+@@ -2394,7 +2394,7 @@ Atomic_TestBit64(Atomic_uint64 *var, //
+                                       && 8 * sizeof (out) == size             \
+                                       && 8 * sizeof (cast) == size            \
+                                          ? 1 : -1 };                          \
+-      typedef char AssertOnCompileFailed[AssertOnCompileMisused];             \
++      __attribute__((unused)) typedef char AssertOnCompileFailed[AssertOnCompileMisused];             \
+    }                                                                          \
+                                                                               \
+                                                                               \
diff --git a/app-emulation/vmware-modules/files/271-3.10-05-dentry.patch b/app-emulation/vmware-modules/files/271-3.10-05-dentry.patch
new file mode 100644
index 000000000000..f4f59d977408
--- /dev/null
+++ b/app-emulation/vmware-modules/files/271-3.10-05-dentry.patch
@@ -0,0 +1,34 @@
+starting with kernel 3.6, d_revalidate takes an unsigned int "flags"
+as the second argument, not a nameidata pointer! see fs/namei.c 
+for implementation
+
+diff -Naur vmblock-only/linux/dentry.c vmblock-only/linux/dentry.c
+--- vmblock-only/linux/dentry.c	2013-11-05 23:33:26.000000000 -0500
++++ vmblock-only/linux/dentry.c	2014-04-26 10:58:03.062635343 -0400
+@@ -32,7 +32,7 @@
+ #include "block.h"
+ 
+ 
+-static int DentryOpRevalidate(struct dentry *dentry, struct nameidata *nd);
++static int DentryOpRevalidate(struct dentry *dentry, unsigned int flags);
+ 
+ struct dentry_operations LinkDentryOps = {
+    .d_revalidate = DentryOpRevalidate,
+@@ -60,7 +60,7 @@
+ 
+ static int
+ DentryOpRevalidate(struct dentry *dentry,  // IN: dentry revalidating
+-                   struct nameidata *nd)   // IN: lookup flags & intent
++                   unsigned int flags)   // IN: lookup flags & intent
+ {
+    VMBlockInodeInfo *iinfo;
+    struct nameidata actualNd;
+@@ -101,7 +101,7 @@
+    if (actualDentry &&
+        actualDentry->d_op &&
+        actualDentry->d_op->d_revalidate) {
+-      return actualDentry->d_op->d_revalidate(actualDentry, nd);
++      return actualDentry->d_op->d_revalidate(actualDentry, flags);
+    }
+ 
+    if (compat_path_lookup(iinfo->name, 0, &actualNd)) {
diff --git a/app-emulation/vmware-modules/files/271-3.10-06-inode.patch b/app-emulation/vmware-modules/files/271-3.10-06-inode.patch
new file mode 100644
index 000000000000..01c88930899c
--- /dev/null
+++ b/app-emulation/vmware-modules/files/271-3.10-06-inode.patch
@@ -0,0 +1,36 @@
+starting with kernel 3.6, d_revalidate takes an unsigned int "flags"
+as the second argument, not a nameidata pointer! see fs/namei.c 
+for implementation. Also changing vfs_follow_link to nd_set_link.
+See: https://lkml.org/lkml/2013/9/9/236
+
+diff -Naur vmblock-only/linux/inode.c vmblock-only/linux/inode.c
+--- vmblock-only/linux/inode.c	2013-11-05 23:33:26.000000000 -0500
++++ vmblock-only/linux/inode.c	2014-04-26 10:58:03.063635343 -0400
+@@ -36,7 +36,7 @@
+ 
+ /* Inode operations */
+ static struct dentry *InodeOpLookup(struct inode *dir,
+-                                    struct dentry *dentry, struct nameidata *nd);
++                                    struct dentry *dentry, unsigned int flags);
+ static int InodeOpReadlink(struct dentry *dentry, char __user *buffer, int buflen);
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 13)
+ static void *InodeOpFollowlink(struct dentry *dentry, struct nameidata *nd);
+@@ -75,7 +75,7 @@
+ static struct dentry *
+ InodeOpLookup(struct inode *dir,      // IN: parent directory's inode
+               struct dentry *dentry,  // IN: dentry to lookup
+-              struct nameidata *nd)   // IN: lookup intent and information
++              unsigned int flags)   // IN: lookup intent and information
+ {
+    char *filename;
+    struct inode *inode;
+@@ -221,7 +221,8 @@
+       goto out;
+    }
+ 
+-   ret = vfs_follow_link(nd, iinfo->name);
++   nd_set_link(nd, iinfo->name);
++   ret = 0;
+ 
+ out:
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 13)
diff --git a/app-emulation/vmware-modules/files/271-3.10-07-hub.patch b/app-emulation/vmware-modules/files/271-3.10-07-hub.patch
new file mode 100644
index 000000000000..eebe4a23b304
--- /dev/null
+++ b/app-emulation/vmware-modules/files/271-3.10-07-hub.patch
@@ -0,0 +1,26 @@
+fixes a bug where sizeof was being used on a pointer when they clearly
+meant to use the size of the array referred to. Fortunately, the amount is
+always smaller than the actual size of the buffer, so likely not a security issue
+(and was fixed in vmware-workstaiton 10
+
+diff -rupN vmnet-only/hub.c vmnet-only.new/hub.c
+--- vmnet-only/hub.c	2013-11-06 00:40:52.000000000 -0500
++++ vmnet-only.new/hub.c	2014-10-07 18:45:34.403918680 -0400
+@@ -129,7 +129,7 @@ VNetHubFindHubByID(uint8 idNum[VNET_PVN_
+ {
+    VNetHub *currHub = vnetHub;
+    while (currHub && (currHub->hubType != HUB_TYPE_PVN ||
+-		      memcmp(idNum, currHub->id.pvnID, sizeof idNum))) {
++		      memcmp(idNum, currHub->id.pvnID, VNET_PVN_ID_LEN))) {
+       currHub = currHub->next;
+    }
+    return currHub;
+@@ -312,7 +312,7 @@ VNetHubAlloc(Bool allocPvn, // IN: TRUE
+ 
+       if (allocPvn) {
+ 	 hub->hubType = HUB_TYPE_PVN;
+-	 memcpy(hub->id.pvnID, id, sizeof id);
++	 memcpy(hub->id.pvnID, id, VNET_PVN_ID_LEN);
+ 	 ++pvnInstance;
+       } else {
+ 	 hub->hubType = HUB_TYPE_VNET;
diff --git a/app-emulation/vmware-modules/files/271-3.11-00-readdir.patch b/app-emulation/vmware-modules/files/271-3.11-00-readdir.patch
new file mode 100644
index 000000000000..b2f76d3e2b30
--- /dev/null
+++ b/app-emulation/vmware-modules/files/271-3.11-00-readdir.patch
@@ -0,0 +1,41 @@
+replaces usage of vfs_readdir with iterate_dir. origionally found here:
+https://bugs.gentoo.org/show_bug.cgi?id=508204
+
+diff -Naur vmblock-only/linux/file.c vmblock-only/linux/file.c
+--- vmblock-only/linux/file.c	2013-11-05 23:33:26.000000000 -0500
++++ vmblock-only/linux/file.c	2014-04-26 10:58:03.062635343 -0400
+@@ -166,11 +166,9 @@
+ 
+ static int
+ FileOpReaddir(struct file *file,  // IN
+-              void *dirent,       // IN
+-              filldir_t filldir)  // IN
++		struct dir_context *ctx)
+ {
+    int ret;
+-   FilldirInfo info;
+    struct file *actualFile;
+ 
+    if (!file) {
+@@ -184,11 +182,8 @@
+       return -EINVAL;
+    }
+ 
+-   info.filldir = filldir;
+-   info.dirent = dirent;
+-
+    actualFile->f_pos = file->f_pos;
+-   ret = vfs_readdir(actualFile, Filldir, &info);
++   ret = iterate_dir(actualFile, ctx);
+    file->f_pos = actualFile->f_pos;
+ 
+    return ret;
+@@ -237,7 +232,7 @@
+ 
+ 
+ struct file_operations RootFileOps = {
+-   .readdir = FileOpReaddir,
++   .iterate = FileOpReaddir,
+    .open    = FileOpOpen,
+    .release = FileOpRelease,
+ };
diff --git a/app-emulation/vmware-modules/files/271-3.11-01-filldir.patch b/app-emulation/vmware-modules/files/271-3.11-01-filldir.patch
new file mode 100644
index 000000000000..2eec99b7c1f8
--- /dev/null
+++ b/app-emulation/vmware-modules/files/271-3.11-01-filldir.patch
@@ -0,0 +1,53 @@
+simply remove the code for Filldir since it is no longer used with the new 
+iterate_dir API
+
+diff -rupN vmblock-only/linux/file.c vmblock-only.new/linux/file.c
+--- vmblock-only/linux/file.c	2014-10-07 23:22:46.832469618 -0400
++++ vmblock-only.new/linux/file.c	2014-10-07 23:24:35.276472720 -0400
+@@ -38,46 +38,6 @@ typedef u64 inode_num_t;
+ typedef ino_t inode_num_t;
+ #endif
+ 
+-/* Specifically for our filldir_t callback */
+-typedef struct FilldirInfo {
+-   filldir_t filldir;
+-   void *dirent;
+-} FilldirInfo;
+-
+-
+-/*
+- *----------------------------------------------------------------------------
+- *
+- * Filldir --
+- *
+- *    Callback function for readdir that we use in place of the one provided.
+- *    This allows us to specify that each dentry is a symlink, but pass through
+- *    everything else to the original filldir function.
+- *
+- * Results:
+- *    Original filldir's return value.
+- *
+- * Side effects:
+- *    Directory information gets copied to user's buffer.
+- *
+- *----------------------------------------------------------------------------
+- */
+-
+-static int
+-Filldir(void *buf,              // IN: Dirent buffer passed from FileOpReaddir
+-        const char *name,       // IN: Dirent name
+-        int namelen,            // IN: len of dirent's name
+-        loff_t offset,          // IN: Offset
+-        inode_num_t ino,        // IN: Inode number of dirent
+-        unsigned int d_type)    // IN: Type of file
+-{
+-   FilldirInfo *info = buf;
+-
+-   /* Specify DT_LNK regardless */
+-   return info->filldir(info->dirent, name, namelen, offset, ino, DT_LNK);
+-}
+-
+-
+ /* File operations */
+ 
+ /*
diff --git a/app-emulation/vmware-modules/files/271-3.13-00-vmnet.patch b/app-emulation/vmware-modules/files/271-3.13-00-vmnet.patch
new file mode 100644
index 000000000000..1bf22077b727
--- /dev/null
+++ b/app-emulation/vmware-modules/files/271-3.13-00-vmnet.patch
@@ -0,0 +1,39 @@
+the new API to get the hooknum
+origionally from http://forums.gentoo.org/viewtopic-t-979802-start-25.html
+
+--- work/vmnet-only/filter.c   2013-08-27 20:29:04.000000000 +0100
++++ patched/vmnet-only/filter.c   2014-01-26 01:09:05.184893854 +0000
+@@ -27,6 +27,7 @@
+ #include "compat_module.h"
+ #include <linux/mutex.h>
+ #include <linux/netdevice.h>
++#include <linux/version.h>
+ #if COMPAT_LINUX_VERSION_CHECK_LT(3, 2, 0)
+ #   include <linux/module.h>
+ #else
+@@ -203,7 +204,11 @@
+ #endif
+
+ static unsigned int
++#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 13, 0)
+ VNetFilterHookFn(unsigned int hooknum,                 // IN:
++#else
++VNetFilterHookFn(const struct nf_hook_ops *ops,        // IN:
++#endif
+ #ifdef VMW_NFHOOK_USES_SKB
+                  struct sk_buff *skb,                  // IN:
+ #else
+@@ -252,7 +257,12 @@
+
+    /* When the host transmits, hooknum is VMW_NF_INET_POST_ROUTING. */
+    /* When the host receives, hooknum is VMW_NF_INET_LOCAL_IN. */
+-   transmit = (hooknum == VMW_NF_INET_POST_ROUTING);
++
++   #if LINUX_VERSION_CODE < KERNEL_VERSION(3, 13, 0)
++      transmit = (hooknum == VMW_NF_INET_POST_ROUTING);
++   #else
++      transmit = (ops->hooknum == VMW_NF_INET_POST_ROUTING);
++   #endif
+
+    packetHeader = compat_skb_network_header(skb);
+    ip = (struct iphdr*)packetHeader;
diff --git a/app-emulation/vmware-modules/files/271-3.15-00-readlink.patch b/app-emulation/vmware-modules/files/271-3.15-00-readlink.patch
new file mode 100644
index 000000000000..b8ee07822021
--- /dev/null
+++ b/app-emulation/vmware-modules/files/271-3.15-00-readlink.patch
@@ -0,0 +1,15 @@
+replacing usage of vfs_readlink with new readlink_copy API
+see: http://permalink.gmane.org/gmane.linux.kernel.commits.head/445090
+
+diff -rupN vmblock-only/linux/inode.c vmblock-only/linux/inode.c
+--- vmblock-only/linux/inode.c	2014-10-05 23:20:14.545218357 -0400
++++ vmblock-only/linux/inode.c	2014-10-05 23:33:01.549259933 -0400
+@@ -178,7 +178,7 @@ InodeOpReadlink(struct dentry *dentry,
+       return -EINVAL;
+    }
+ 
+-   return vfs_readlink(dentry, buffer, buflen, iinfo->name);
++   return readlink_copy(buffer, buflen, iinfo->name);
+ }
+ 
+ 
diff --git a/app-emulation/vmware-modules/files/271-3.15-01-vsock.patch b/app-emulation/vmware-modules/files/271-3.15-01-vsock.patch
new file mode 100644
index 000000000000..9e8d9d1a32f7
--- /dev/null
+++ b/app-emulation/vmware-modules/files/271-3.15-01-vsock.patch
@@ -0,0 +1,46 @@
+removing the no longer existing second parameter to sk_data_ready
+doesn't seem it ever served a purpose.
+
+diff -rupN vsock-only/linux/notify.c vsock-only.new/linux/notify.c
+--- vsock-only/linux/notify.c	2013-11-05 23:33:27.000000000 -0500
++++ vsock-only.new/linux/notify.c	2014-10-05 23:46:47.943304728 -0400
+@@ -515,8 +515,11 @@ VSockVmciHandleWrote(struct sock *sk,
+    vsk = vsock_sk(sk);
+    PKT_FIELD(vsk, sentWaitingRead) = FALSE;
+ #endif
+-
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 15, 0)
++   sk->sk_data_ready(sk);
++#else
+    sk->sk_data_ready(sk, 0);
++#endif
+ }
+ 
+ 
+diff -rupN vsock-only/linux/notifyQState.c vsock-only.new/linux/notifyQState.c
+--- vsock-only/linux/notifyQState.c	2013-11-05 23:33:27.000000000 -0500
++++ vsock-only.new/linux/notifyQState.c	2014-10-05 23:46:33.231303931 -0400
+@@ -164,7 +164,11 @@ VSockVmciHandleWrote(struct sock *sk,
+                      struct sockaddr_vm *dst,    // IN: unused
+                      struct sockaddr_vm *src)    // IN: unused
+ {
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 15, 0)
++   sk->sk_data_ready(sk);
++#else
+    sk->sk_data_ready(sk, 0);
++#endif
+ }
+ 
+ 
+@@ -566,7 +570,11 @@ VSockVmciNotifyPktRecvPostDequeue(struct
+       }
+ 
+       /* See the comment in VSockVmciNotifyPktSendPostEnqueue */
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 15, 0)
++      sk->sk_data_ready(sk);
++#else
+       sk->sk_data_ready(sk, 0);
++#endif
+    }
+ 
+    return err;
diff --git a/app-emulation/vmware-modules/files/271-3.17-00-netdev.patch b/app-emulation/vmware-modules/files/271-3.17-00-netdev.patch
new file mode 100644
index 000000000000..e3ee3aa09939
--- /dev/null
+++ b/app-emulation/vmware-modules/files/271-3.17-00-netdev.patch
@@ -0,0 +1,16 @@
+new alloc_netdev requires a new parameter. All examples in the kernel i've seen just
+use the constant NET_NAME_UNKNOWN.
+origionally from: https://communities.vmware.com/message/2425189
+
+diff -rupN vmnet-only/netif.c vmnet-only.new/netif.c
+--- vmnet-only/netif.c	2013-11-06 00:40:52.000000000 -0500
++++ vmnet-only.new/netif.c	2014-10-09 17:29:12.361307961 -0400
+@@ -149,7 +149,7 @@ VNetNetIf_Create(char *devName,  // IN:
+    memcpy(deviceName, devName, sizeof deviceName);
+    NULL_TERMINATE_STRING(deviceName);
+ 
+-   dev = alloc_netdev(sizeof *netIf, deviceName, VNetNetIfSetup);
++   dev = alloc_netdev(sizeof *netIf, deviceName, NET_NAME_USER, VNetNetIfSetup);
+    if (!dev) {
+       retval = -ENOMEM;
+       goto out;
diff --git a/app-emulation/vmware-modules/files/271-3.19-00-vmnet-warning.patch b/app-emulation/vmware-modules/files/271-3.19-00-vmnet-warning.patch
new file mode 100644
index 000000000000..b4d30c97a59c
--- /dev/null
+++ b/app-emulation/vmware-modules/files/271-3.19-00-vmnet-warning.patch
@@ -0,0 +1,13 @@
+diff -rupN vmnet-only/vm_device_version.h vmnet-only.new/vm_device_version.h
+--- vmnet-only/vm_device_version.h	2013-11-06 00:40:52.000000000 -0500
++++ vmnet-only.new/vm_device_version.h	2015-05-05 12:03:06.879202223 -0400
+@@ -53,7 +53,9 @@
+  *    VMware HD Audio codec
+  *    VMware HD Audio controller
+  */
++#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 19, 0)
+ #define PCI_VENDOR_ID_VMWARE                    0x15AD
++#endif
+ #define PCI_DEVICE_ID_VMWARE_SVGA2              0x0405
+ #define PCI_DEVICE_ID_VMWARE_SVGA               0x0710
+ #define PCI_DEVICE_ID_VMWARE_NET                0x0720
diff --git a/app-emulation/vmware-modules/files/271-3.19-01-vmblock-path.patch b/app-emulation/vmware-modules/files/271-3.19-01-vmblock-path.patch
new file mode 100644
index 000000000000..178d1478ae59
--- /dev/null
+++ b/app-emulation/vmware-modules/files/271-3.19-01-vmblock-path.patch
@@ -0,0 +1,67 @@
+Sources:
+https://531682.bugs.gentoo.org/attachment.cgi?id=396484
+https://531682.bugs.gentoo.org/attachment.cgi?id=396482
+diff -rupN vmblock-only.orig/linux/dentry.c vmblock-only/linux/dentry.c
+--- vmblock-only.orig/linux/dentry.c	2015-02-14 18:05:46.000000000 -0500
++++ vmblock-only/linux/dentry.c	2015-02-14 18:09:59.000000000 -0500
+@@ -63,7 +63,7 @@ DentryOpRevalidate(struct dentry *dentry
+                    unsigned int flags)   // IN: lookup flags & intent
+ {
+    VMBlockInodeInfo *iinfo;
+-   struct nameidata actualNd;
++   struct path actualNd;
+    struct dentry *actualDentry;
+    int ret;
+ 
+diff -rupN vmblock-only.orig/linux/filesystem.c vmblock-only/linux/filesystem.c
+--- vmblock-only.orig/linux/filesystem.c	2014-11-20 19:29:15.000000000 -0500
++++ vmblock-only/linux/filesystem.c	2015-02-14 18:10:49.000000000 -0500
+@@ -322,7 +322,7 @@ Iget(struct super_block *sb,    // IN: f
+ {
+    VMBlockInodeInfo *iinfo;
+    struct inode *inode;
+-   struct nameidata actualNd;
++   struct path actualNd;
+ 
+    ASSERT(sb);
+ 
+diff -rupN vmblock-only.orig/shared/compat_namei.h vmblock-only/shared/compat_namei.h
+--- vmblock-only.orig/shared/compat_namei.h	2014-11-20 19:29:15.000000000 -0500
++++ vmblock-only/shared/compat_namei.h	2015-02-14 18:08:38.000000000 -0500
+@@ -26,21 +26,21 @@
+  * struct. They were both replaced with a struct path.
+  */
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 25)
+-#define compat_vmw_nd_to_dentry(nd) (nd).path.dentry
++#define compat_vmw_nd_to_dentry(nd) (nd).dentry
+ #else
+ #define compat_vmw_nd_to_dentry(nd) (nd).dentry
+ #endif
+ 
+ /* In 2.6.25-rc2, path_release(&nd) was replaced with path_put(&nd.path). */
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 25)
+-#define compat_path_release(nd) path_put(&(nd)->path)
++#define compat_path_release(nd) path_put(nd)
+ #else
+ #define compat_path_release(nd) path_release(nd)
+ #endif
+ 
+ /* path_lookup was removed in 2.6.39 merge window VFS merge */
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 38)
+-#define compat_path_lookup(name, flags, nd)     kern_path(name, flags, &((nd)->path))
++#define compat_path_lookup(name, flags, nd)     kern_path(name, flags, nd)
+ #else
+ #define compat_path_lookup(name, flags, nd)     path_lookup(name, flags, nd)
+ #endif
+diff -u vmblock-only.orig/linux/file.c vmblock-only/linux/file.c
+--- vmblock-only.orig/linux/file.c	2015-02-11 12:18:29.000000000 -0500
++++ vmblock-only/linux/file.c	2015-02-11 12:41:41.000000000 -0500
+@@ -92,7 +92,7 @@
+     * and that would try to acquire the inode's semaphore; if the two inodes
+     * are the same we'll deadlock.
+     */
+-   if (actualFile->f_dentry && inode == actualFile->f_dentry->d_inode) {
++   if (actualFile->f_path.dentry && inode == actualFile->f_path.dentry->d_inode) {
+       Warning("FileOpOpen: identical inode encountered, open cannot succeed.\n");
+       if (filp_close(actualFile, current->files) < 0) {
+          Warning("FileOpOpen: unable to close opened file.\n");
diff --git a/app-emulation/vmware-modules/files/271-3.19-02-vmci.patch b/app-emulation/vmware-modules/files/271-3.19-02-vmci.patch
new file mode 100644
index 000000000000..a8ec2b11daf9
--- /dev/null
+++ b/app-emulation/vmware-modules/files/271-3.19-02-vmci.patch
@@ -0,0 +1,29 @@
+diff -rupN vmci-only/linux/vmciKernelIf.c vmci-only.new/linux/vmciKernelIf.c
+--- vmci-only/linux/vmciKernelIf.c	2015-05-05 11:22:55.276071501 -0400
++++ vmci-only.new/linux/vmciKernelIf.c	2015-05-05 11:23:58.912074950 -0400
+@@ -40,6 +40,7 @@
+ #include <linux/socket.h>       /* For memcpy_{to,from}iovec(). */
+ #include <linux/vmalloc.h>
+ #include <linux/wait.h>
++#include <linux/skbuff.h>
+ 
+ #include "compat_highmem.h"
+ #include "compat_interrupt.h"
+diff -rupN vmci-only/linux/vmciKernelIf.c vmci-only.new/linux/vmciKernelIf.c
+--- vmci-only/linux/vmciKernelIf.c	2013-11-05 23:33:26.000000000 -0500
++++ vmci-only.new/linux/vmciKernelIf.c	2015-05-05 11:21:59.929068500 -0400
+@@ -1246,11 +1246,11 @@ __VMCIMemcpyFromQueue(void *dest,
+       }
+ 
+       if (isIovec) {
+-         struct iovec *iov = (struct iovec *)dest;
++         struct msghdr *msg = dest;
+          int err;
+ 
+          /* The iovec will track bytesCopied internally. */
+-         err = memcpy_toiovec(iov, (uint8 *)va + pageOffset, toCopy);
++         err = memcpy_to_msg(msg, (uint8 *)va + pageOffset, toCopy);
+          if (err != 0) {
+             kunmap(kernelIf->page[pageIndex]);
+             return VMCI_ERROR_INVALID_ARGS;
+
diff --git a/app-emulation/vmware-modules/files/271-3.19-03-vmnet.patch b/app-emulation/vmware-modules/files/271-3.19-03-vmnet.patch
new file mode 100644
index 000000000000..041bfb6a6210
--- /dev/null
+++ b/app-emulation/vmware-modules/files/271-3.19-03-vmnet.patch
@@ -0,0 +1,29 @@
+diff -ur vmnet-only.orig/driver.c vmnet-only/driver.c
+--- vmnet-only.orig/driver.c	2014-06-13 02:38:25.000000000 +0200
++++ vmnet-only/driver.c	2015-02-21 17:31:22.630656305 +0100
+@@ -1236,8 +1236,8 @@
+    struct inode *inode = NULL;
+    long err;
+ 
+-   if (filp && filp->f_dentry) {
+-      inode = filp->f_dentry->d_inode;
++   if (filp && filp->f_path.dentry) {
++      inode = filp->f_path.dentry->d_inode;
+    }
+    err = VNetFileOpIoctl(inode, filp, iocmd, ioarg);
+    return err;
+diff -ur vmnet-only.orig/userif.c vmnet-only/userif.c
+--- vmnet-only.orig/userif.c	2014-06-13 02:38:25.000000000 +0200
++++ vmnet-only/userif.c	2015-02-21 17:37:46.154589854 +0100
+@@ -523,7 +523,10 @@
+       .iov_base = buf,
+       .iov_len  = len,
+    };
+-   return skb_copy_datagram_iovec(skb, 0, &iov, len);
++   struct iov_iter to;
++
++   iov_iter_init(&to, READ, &iov, 1, len);
++   return skb_copy_datagram_iter(skb, 0, &to, len);
+ }
+ 
+ 
diff --git a/app-emulation/vmware-modules/files/271-3.19-04-vsock.patch b/app-emulation/vmware-modules/files/271-3.19-04-vsock.patch
new file mode 100644
index 000000000000..8c9d3cb6dfe3
--- /dev/null
+++ b/app-emulation/vmware-modules/files/271-3.19-04-vsock.patch
@@ -0,0 +1,12 @@
+diff -rupN vsock-only/linux/af_vsock.c vsock-only.new/linux/af_vsock.c
+--- vsock-only/linux/af_vsock.c	2015-05-05 11:26:05.145081792 -0400
++++ vsock-only.new/linux/af_vsock.c	2015-05-05 11:30:54.304097466 -0400
+@@ -4266,7 +4266,7 @@ VSockVmciDgramSendmsg(struct kiocb *kioc
+       goto out;
+    }
+ 
+-   memcpy_fromiovec(VMCI_DG_PAYLOAD(dg), msg->msg_iov, len);
++   memcpy_from_msg(VMCI_DG_PAYLOAD(dg), msg, len);
+ 
+    dg->dst = VMCI_MAKE_HANDLE(remoteAddr->svm_cid, remoteAddr->svm_port);
+    dg->src = VMCI_MAKE_HANDLE(vsk->localAddr.svm_cid, vsk->localAddr.svm_port);
diff --git a/app-emulation/vmware-modules/files/271-3.19-05-vsock.patch b/app-emulation/vmware-modules/files/271-3.19-05-vsock.patch
new file mode 100644
index 000000000000..2e412301d096
--- /dev/null
+++ b/app-emulation/vmware-modules/files/271-3.19-05-vsock.patch
@@ -0,0 +1,15 @@
+diff -rupN vsock-only/linux/af_vsock.c vsock-only.new/linux/af_vsock.c
+--- vsock-only/linux/af_vsock.c	2015-05-05 11:31:35.710099711 -0400
++++ vsock-only.new/linux/af_vsock.c	2015-05-05 11:36:33.260115840 -0400
+@@ -4727,7 +4727,11 @@ VSockVmciDgramRecvmsg(struct kiocb *kioc
+    }
+ 
+    /* Place the datagram payload in the user's iovec. */
++#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 19, 0)
+    err = skb_copy_datagram_iovec(skb, sizeof *dg, msg->msg_iov, payloadLen);
++#else
++   err = skb_copy_datagram_iter(skb, sizeof *dg, &msg->msg_iter, payloadLen);
++#endif
+    if (err) {
+       goto out;
+    }
diff --git a/app-emulation/vmware-modules/files/271-3.19-06-vmci_qpair.patch b/app-emulation/vmware-modules/files/271-3.19-06-vmci_qpair.patch
new file mode 100644
index 000000000000..1849a378456e
--- /dev/null
+++ b/app-emulation/vmware-modules/files/271-3.19-06-vmci_qpair.patch
@@ -0,0 +1,24 @@
+diff -rupN vsock-only.old/linux/af_vsock.c vsock-only/linux/af_vsock.c
+--- vsock-only.old/linux/af_vsock.c     2015-05-06 20:41:47.684046762 -0400
++++ vsock-only/linux/af_vsock.c 2015-05-06 20:52:15.245080779 -0400
+@@ -4629,7 +4629,7 @@ VSockVmciStreamSendmsg(struct kiocb *kio
+        * able to send.
+        */
+ 
+-      written = vmci_qpair_enquev(vsk->qpair, msg->msg_iov,
++      written = vmci_qpair_enquev(vsk->qpair, &msg->msg_iter.iov,
+                                   len - totalWritten, 0);
+       if (written < 0) {
+          err = -ENOMEM;
+@@ -4874,9 +4874,9 @@ VSockVmciStreamRecvmsg(struct kiocb *kio
+          }
+ 
+          if (flags & MSG_PEEK) {
+-            read = vmci_qpair_peekv(vsk->qpair, msg->msg_iov, len - copied, 0);
++            read = vmci_qpair_peekv(vsk->qpair, &msg->msg_iter.iov, len - copied, 0);
+          } else {
+-            read = vmci_qpair_dequev(vsk->qpair, msg->msg_iov, len - copied, 0);
++            read = vmci_qpair_dequev(vsk->qpair, &msg->msg_iter.iov, len - copied, 0);
+          }
+ 
+          if (read < 0) {
diff --git a/app-emulation/vmware-modules/files/271-hardened.patch b/app-emulation/vmware-modules/files/271-hardened.patch
new file mode 100644
index 000000000000..ea1b0f300751
--- /dev/null
+++ b/app-emulation/vmware-modules/files/271-hardened.patch
@@ -0,0 +1,170 @@
+diff --git a/vmci-only/linux/driver.c b/vmci-only/linux/driver.c
+index 921f25c..41a39e3 100644
+--- a/vmci-only/linux/driver.c
++++ b/vmci-only/linux/driver.c
+@@ -241,7 +241,24 @@ static unsigned int LinuxDriverPoll(struct file *file, poll_table *wait);
+ #define LinuxDriverUnlockIoctlPerFD(mutex) do {} while (0)
+ #endif
+ 
+-static struct file_operations vmuser_fops;
++/*
++ * Moved file operations initialize here because of incompatibilites
++ * with Gentoo hardened profile/hardend Linux 3.
++ */
++static struct file_operations vmuser_fops = {
++    .owner = THIS_MODULE,
++    .poll = LinuxDriverPoll,
++#ifdef HAVE_UNLOCKED_IOCTL
++    .unlocked_ioctl = LinuxDriver_UnlockedIoctl,
++#else
++    .ioctl = LinuxDriver_Ioctl,
++#endif
++#ifdef HAVE_COMPAT_IOCTL
++    .compat_ioctl = LinuxDriver_UnlockedIoctl,
++#endif
++    .open = LinuxDriver_Open,
++    .release = LinuxDriver_Close
++};
+ 
+ 
+ /*
+@@ -378,26 +395,6 @@ vmci_host_init(void)
+       return -ENOMEM;
+    }
+ 
+-   /*
+-    * Initialize the file_operations structure. Because this code is always
+-    * compiled as a module, this is fine to do it here and not in a static
+-    * initializer.
+-    */
+-
+-   memset(&vmuser_fops, 0, sizeof vmuser_fops);
+-   vmuser_fops.owner = THIS_MODULE;
+-   vmuser_fops.poll = LinuxDriverPoll;
+-#ifdef HAVE_UNLOCKED_IOCTL
+-   vmuser_fops.unlocked_ioctl = LinuxDriver_UnlockedIoctl;
+-#else
+-   vmuser_fops.ioctl = LinuxDriver_Ioctl;
+-#endif
+-#ifdef HAVE_COMPAT_IOCTL
+-   vmuser_fops.compat_ioctl = LinuxDriver_UnlockedIoctl;
+-#endif
+-   vmuser_fops.open = LinuxDriver_Open;
+-   vmuser_fops.release = LinuxDriver_Close;
+-
+    sprintf(linuxState.deviceName, "vmci");
+    linuxState.major = 10;
+    linuxState.misc.minor = MISC_DYNAMIC_MINOR;
+diff --git a/vmmon-only/linux/driver.c b/vmmon-only/linux/driver.c
+index b21dd44..960c2aa 100644
+--- a/vmmon-only/linux/driver.c
++++ b/vmmon-only/linux/driver.c
+@@ -178,7 +178,22 @@ static struct vm_operations_struct vmuser_mops = {
+ #endif
+ };
+ 
+-static struct file_operations vmuser_fops;
++static struct file_operations vmuser_fops = {
++   .owner = THIS_MODULE,
++   .poll = LinuxDriverPoll,
++#ifdef HAVE_UNLOCKED_IOCTL
++   .unlocked_ioctl = LinuxDriver_UnlockedIoctl,
++#else
++   .ioctl = LinuxDriver_Ioctl,
++#endif
++#ifdef HAVE_COMPAT_IOCTL
++   .compat_ioctl = LinuxDriver_UnlockedIoctl,
++#endif
++   .open = LinuxDriver_Open,
++   .release = LinuxDriver_Close,
++   .mmap = LinuxDriverMmap
++};
++
+ static struct timer_list tscTimer;
+ 
+ /*
+@@ -357,27 +372,6 @@ init_module(void)
+    spin_lock_init(&linuxState.pollListLock);
+ #endif
+ 
+-   /*
+-    * Initialize the file_operations structure. Because this code is always
+-    * compiled as a module, this is fine to do it here and not in a static
+-    * initializer.
+-    */
+-
+-   memset(&vmuser_fops, 0, sizeof vmuser_fops);
+-   vmuser_fops.owner = THIS_MODULE;
+-   vmuser_fops.poll = LinuxDriverPoll;
+-#ifdef HAVE_UNLOCKED_IOCTL
+-   vmuser_fops.unlocked_ioctl = LinuxDriver_UnlockedIoctl;
+-#else
+-   vmuser_fops.ioctl = LinuxDriver_Ioctl;
+-#endif
+-#ifdef HAVE_COMPAT_IOCTL
+-   vmuser_fops.compat_ioctl = LinuxDriver_UnlockedIoctl;
+-#endif
+-   vmuser_fops.open = LinuxDriver_Open;
+-   vmuser_fops.release = LinuxDriver_Close;
+-   vmuser_fops.mmap = LinuxDriverMmap;
+-
+ #ifdef VMX86_DEVEL
+    devel_init_module();
+    linuxState.minor = 0;
+diff --git a/vmnet-only/driver.c b/vmnet-only/driver.c
+index b12b982..40bd4cf 100644
+--- a/vmnet-only/driver.c
++++ b/vmnet-only/driver.c
+@@ -165,7 +165,22 @@ static long  VNetFileOpUnlockedIoctl(struct file * filp,
+                                      unsigned int iocmd, unsigned long ioarg);
+ #endif
+ 
+-static struct file_operations vnetFileOps;
++static struct file_operations vnetFileOps = {
++   .owner = THIS_MODULE,
++   .read = VNetFileOpRead,
++   .write = VNetFileOpWrite,
++   .poll = VNetFileOpPoll,
++#ifdef HAVE_UNLOCKED_IOCTL
++   .unlocked_ioctl = VNetFileOpUnlockedIoctl,
++#else
++   .ioctl = VNetFileOpIoctl,
++#endif
++#ifdef HAVE_COMPAT_IOCTL
++   .compat_ioctl = VNetFileOpUnlockedIoctl,
++#endif
++   .open = VNetFileOpOpen,
++   .release = VNetFileOpClose
++};
+ 
+ /*
+  * Utility functions
+@@ -476,28 +491,6 @@ init_module(void)
+       goto err_proto;
+    }
+ 
+-   /*
+-    * Initialize the file_operations structure. Because this code is always
+-    * compiled as a module, this is fine to do it here and not in a static
+-    * initializer.
+-    */
+-
+-   memset(&vnetFileOps, 0, sizeof vnetFileOps);
+-   vnetFileOps.owner = THIS_MODULE;
+-   vnetFileOps.read = VNetFileOpRead;
+-   vnetFileOps.write = VNetFileOpWrite;
+-   vnetFileOps.poll = VNetFileOpPoll;
+-#ifdef HAVE_UNLOCKED_IOCTL
+-   vnetFileOps.unlocked_ioctl = VNetFileOpUnlockedIoctl;
+-#else
+-   vnetFileOps.ioctl = VNetFileOpIoctl;
+-#endif
+-#ifdef HAVE_COMPAT_IOCTL
+-   vnetFileOps.compat_ioctl = VNetFileOpUnlockedIoctl;
+-#endif
+-   vnetFileOps.open = VNetFileOpOpen;
+-   vnetFileOps.release = VNetFileOpClose;
+-
+    retval = register_chrdev(VNET_MAJOR_NUMBER, "vmnet", &vnetFileOps);
+    if (retval) {
+       LOG(0, (KERN_NOTICE "/dev/vmnet: could not register major device %d\n",
diff --git a/app-emulation/vmware-modules/files/279-3.10-00-userns.patch b/app-emulation/vmware-modules/files/279-3.10-00-userns.patch
new file mode 100644
index 000000000000..b1b78b76300e
--- /dev/null
+++ b/app-emulation/vmware-modules/files/279-3.10-00-userns.patch
@@ -0,0 +1,41 @@
+correctly initializes UID/GID values
+gets UID correctly in light of user namespace API
+origionally from https://462666.bugs.gentoo.org/attachment.cgi?id=342888
+
+--- a/vmblock-only/linux/inode.c   2013-03-20 17:37:48.000000000 +0100
++++ b/vmblock-only/linux/inode.c   2013-03-20 17:41:22.000000000 +0100
+@@ -135,7 +135,8 @@
+    inode->i_size = INODE_TO_IINFO(inode)->nameLen;
+    inode->i_version = 1;
+    inode->i_atime = inode->i_mtime = inode->i_ctime = CURRENT_TIME;
+-   inode->i_uid = inode->i_gid = 0;
++   inode->i_uid = GLOBAL_ROOT_UID;
++   inode->i_gid = GLOBAL_ROOT_GID;
+    inode->i_op = &LinkInodeOps;
+ 
+    d_add(dentry, inode);
+
+--- a/vmci-only/linux/driver.c    2013-03-20 17:57:35.000000000 +0100
++++ b/vmci-only/linux/driver.c    2013-03-20 17:57:43.000000000 +0100
+@@ -740,7 +740,7 @@
+          goto init_release;
+       }
+ 
+-      user = current_uid();
++      user = from_kuid(current_user_ns(), current_uid());
+       retval = VMCIContext_InitContext(initBlock.cid, initBlock.flags,
+                                        0 /* Unused */, vmciLinux->userVersion,
+                                        &user, &vmciLinux->context);
+
+--- a/vsock-only/linux/af_vsock.c 2013-03-20 18:01:48.000000000 +0100
++++ b/vsock-only/linux/af_vsock.c 2013-03-20 18:01:58.000000000 +0100
+@@ -2866,7 +2866,7 @@
+       vsk->connectTimeout = psk->connectTimeout;
+    } else {
+       vsk->trusted = capable(CAP_NET_ADMIN);
+-      vsk->owner = current_uid();
++      vsk->owner = from_kuid(current_user_ns(), current_uid());
+       vsk->queuePairSize = VSOCK_DEFAULT_QP_SIZE;
+       vsk->queuePairMinSize = VSOCK_DEFAULT_QP_SIZE_MIN;
+       vsk->queuePairMaxSize = VSOCK_DEFAULT_QP_SIZE_MAX;
+
diff --git a/app-emulation/vmware-modules/files/279-3.10-01-getname.patch b/app-emulation/vmware-modules/files/279-3.10-01-getname.patch
new file mode 100644
index 000000000000..05ed8dbcc374
--- /dev/null
+++ b/app-emulation/vmware-modules/files/279-3.10-01-getname.patch
@@ -0,0 +1,24 @@
+uses __getname/__putname instead of getname. getname was deprecated
+the new code calls __getname (which really is a specific type of 
+memory allocator, then copies the string safely from user space
+into the allocated buffer
+
+--- vmblock-only/linux/control.c	2014-03-15 15:28:40.871076076 +0100
++++ vmblock-only/linux/control.c.new	2014-03-15 15:29:15.079074439 +0100
+@@ -279,11 +279,17 @@
+    int i;
+    int retval;
+ 
+-   name = getname(buf);
++   name = __getname();
+    if (IS_ERR(name)) {
+       return PTR_ERR(name);
+    }
+ 
++   i = strncpy_from_user(name, buf, PATH_MAX);
++   if (i < 0 || i == PATH_MAX) {
++      __putname(name);
++      return -EINVAL;
++   }
++
+    for (i = strlen(name) - 1; i >= 0 && name[i] == '/'; i--) {
diff --git a/app-emulation/vmware-modules/files/279-3.10-03-deprecated.patch b/app-emulation/vmware-modules/files/279-3.10-03-deprecated.patch
new file mode 100644
index 000000000000..98b28aabcdeb
--- /dev/null
+++ b/app-emulation/vmware-modules/files/279-3.10-03-deprecated.patch
@@ -0,0 +1,89 @@
+undefines DEPRECATED which is unfortunately also defined (as a string)
+in <linux/printk.h>. Realistically, this macro isn't even used, so this
+doesn't matter much. But it hushes some very loud warnings.
+
+diff -rupN vmblock-only/shared/vm_assert.h vmblock-only.new/shared/vm_assert.h
+--- vmblock-only/shared/vm_assert.h	2014-04-14 17:41:41.000000000 -0400
++++ vmblock-only.new/shared/vm_assert.h	2014-10-11 17:37:23.010352172 -0400
+@@ -251,11 +251,13 @@ void WarningThrottled(uint32 *count, con
+ #define LOG_ONCE(_s) DO_ONCE(Log _s)
+ 
+ #ifdef VMX86_DEVEL
++   #undef DEPRECATED
+    #define DEPRECATED(_fix) DO_ONCE(                                     \
+                                Warning("%s:%d: %s is DEPRECATED. %s\n",  \
+                                        __FILE__, __LINE__, __FUNCTION__, \
+                                        _fix))
+ #else
++   #undef DEPRECATED
+    #define DEPRECATED(_fix) do {} while (0)
+ #endif
+ 
+diff -rupN vmci-only/shared/vm_assert.h vmci-only.new/shared/vm_assert.h
+--- vmci-only/shared/vm_assert.h	2014-04-14 17:41:41.000000000 -0400
++++ vmci-only.new/shared/vm_assert.h	2014-10-11 17:37:08.936352130 -0400
+@@ -251,11 +251,13 @@ void WarningThrottled(uint32 *count, con
+ #define LOG_ONCE(_s) DO_ONCE(Log _s)
+ 
+ #ifdef VMX86_DEVEL
++   #undef DEPRECATED
+    #define DEPRECATED(_fix) DO_ONCE(                                     \
+                                Warning("%s:%d: %s is DEPRECATED. %s\n",  \
+                                        __FILE__, __LINE__, __FUNCTION__, \
+                                        _fix))
+ #else
++   #undef DEPRECATED
+    #define DEPRECATED(_fix) do {} while (0)
+ #endif
+ 
+diff -rupN vmmon-only/include/vm_assert.h vmmon-only.new/include/vm_assert.h
+--- vmmon-only/include/vm_assert.h	2014-04-14 20:06:20.000000000 -0400
++++ vmmon-only.new/include/vm_assert.h	2014-10-11 17:36:45.289352058 -0400
+@@ -251,11 +251,13 @@ void WarningThrottled(uint32 *count, con
+ #define LOG_ONCE(_s) DO_ONCE(Log _s)
+ 
+ #ifdef VMX86_DEVEL
++   #undef DEPRECATED
+    #define DEPRECATED(_fix) DO_ONCE(                                     \
+                                Warning("%s:%d: %s is DEPRECATED. %s\n",  \
+                                        __FILE__, __LINE__, __FUNCTION__, \
+                                        _fix))
+ #else
++   #undef DEPRECATED
+    #define DEPRECATED(_fix) do {} while (0)
+ #endif
+ 
+diff -rupN vmnet-only/vm_assert.h vmnet-only.new/vm_assert.h
+--- vmnet-only/vm_assert.h	2014-04-14 20:06:21.000000000 -0400
++++ vmnet-only.new/vm_assert.h	2014-10-11 17:37:14.364352146 -0400
+@@ -251,11 +251,13 @@ void WarningThrottled(uint32 *count, con
+ #define LOG_ONCE(_s) DO_ONCE(Log _s)
+ 
+ #ifdef VMX86_DEVEL
++   #undef DEPRECATED
+    #define DEPRECATED(_fix) DO_ONCE(                                     \
+                                Warning("%s:%d: %s is DEPRECATED. %s\n",  \
+                                        __FILE__, __LINE__, __FUNCTION__, \
+                                        _fix))
+ #else
++   #undef DEPRECATED
+    #define DEPRECATED(_fix) do {} while (0)
+ #endif
+ 
+diff -rupN vsock-only/shared/vm_assert.h vsock-only.new/shared/vm_assert.h
+--- vsock-only/shared/vm_assert.h	2014-04-14 17:41:41.000000000 -0400
++++ vsock-only.new/shared/vm_assert.h	2014-10-11 17:37:02.778352111 -0400
+@@ -251,11 +251,13 @@ void WarningThrottled(uint32 *count, con
+ #define LOG_ONCE(_s) DO_ONCE(Log _s)
+ 
+ #ifdef VMX86_DEVEL
++   #undef DEPRECATED
+    #define DEPRECATED(_fix) DO_ONCE(                                     \
+                                Warning("%s:%d: %s is DEPRECATED. %s\n",  \
+                                        __FILE__, __LINE__, __FUNCTION__, \
+                                        _fix))
+ #else
++   #undef DEPRECATED
+    #define DEPRECATED(_fix) do {} while (0)
+ #endif
+ 
diff --git a/app-emulation/vmware-modules/files/279-3.10-04-dentry.patch b/app-emulation/vmware-modules/files/279-3.10-04-dentry.patch
new file mode 100644
index 000000000000..f4f59d977408
--- /dev/null
+++ b/app-emulation/vmware-modules/files/279-3.10-04-dentry.patch
@@ -0,0 +1,34 @@
+starting with kernel 3.6, d_revalidate takes an unsigned int "flags"
+as the second argument, not a nameidata pointer! see fs/namei.c 
+for implementation
+
+diff -Naur vmblock-only/linux/dentry.c vmblock-only/linux/dentry.c
+--- vmblock-only/linux/dentry.c	2013-11-05 23:33:26.000000000 -0500
++++ vmblock-only/linux/dentry.c	2014-04-26 10:58:03.062635343 -0400
+@@ -32,7 +32,7 @@
+ #include "block.h"
+ 
+ 
+-static int DentryOpRevalidate(struct dentry *dentry, struct nameidata *nd);
++static int DentryOpRevalidate(struct dentry *dentry, unsigned int flags);
+ 
+ struct dentry_operations LinkDentryOps = {
+    .d_revalidate = DentryOpRevalidate,
+@@ -60,7 +60,7 @@
+ 
+ static int
+ DentryOpRevalidate(struct dentry *dentry,  // IN: dentry revalidating
+-                   struct nameidata *nd)   // IN: lookup flags & intent
++                   unsigned int flags)   // IN: lookup flags & intent
+ {
+    VMBlockInodeInfo *iinfo;
+    struct nameidata actualNd;
+@@ -101,7 +101,7 @@
+    if (actualDentry &&
+        actualDentry->d_op &&
+        actualDentry->d_op->d_revalidate) {
+-      return actualDentry->d_op->d_revalidate(actualDentry, nd);
++      return actualDentry->d_op->d_revalidate(actualDentry, flags);
+    }
+ 
+    if (compat_path_lookup(iinfo->name, 0, &actualNd)) {
diff --git a/app-emulation/vmware-modules/files/279-3.10-05-inode.patch b/app-emulation/vmware-modules/files/279-3.10-05-inode.patch
new file mode 100644
index 000000000000..01c88930899c
--- /dev/null
+++ b/app-emulation/vmware-modules/files/279-3.10-05-inode.patch
@@ -0,0 +1,36 @@
+starting with kernel 3.6, d_revalidate takes an unsigned int "flags"
+as the second argument, not a nameidata pointer! see fs/namei.c 
+for implementation. Also changing vfs_follow_link to nd_set_link.
+See: https://lkml.org/lkml/2013/9/9/236
+
+diff -Naur vmblock-only/linux/inode.c vmblock-only/linux/inode.c
+--- vmblock-only/linux/inode.c	2013-11-05 23:33:26.000000000 -0500
++++ vmblock-only/linux/inode.c	2014-04-26 10:58:03.063635343 -0400
+@@ -36,7 +36,7 @@
+ 
+ /* Inode operations */
+ static struct dentry *InodeOpLookup(struct inode *dir,
+-                                    struct dentry *dentry, struct nameidata *nd);
++                                    struct dentry *dentry, unsigned int flags);
+ static int InodeOpReadlink(struct dentry *dentry, char __user *buffer, int buflen);
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 13)
+ static void *InodeOpFollowlink(struct dentry *dentry, struct nameidata *nd);
+@@ -75,7 +75,7 @@
+ static struct dentry *
+ InodeOpLookup(struct inode *dir,      // IN: parent directory's inode
+               struct dentry *dentry,  // IN: dentry to lookup
+-              struct nameidata *nd)   // IN: lookup intent and information
++              unsigned int flags)   // IN: lookup intent and information
+ {
+    char *filename;
+    struct inode *inode;
+@@ -221,7 +221,8 @@
+       goto out;
+    }
+ 
+-   ret = vfs_follow_link(nd, iinfo->name);
++   nd_set_link(nd, iinfo->name);
++   ret = 0;
+ 
+ out:
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 13)
diff --git a/app-emulation/vmware-modules/files/279-3.15-00-readlink.patch b/app-emulation/vmware-modules/files/279-3.15-00-readlink.patch
new file mode 100644
index 000000000000..b8ee07822021
--- /dev/null
+++ b/app-emulation/vmware-modules/files/279-3.15-00-readlink.patch
@@ -0,0 +1,15 @@
+replacing usage of vfs_readlink with new readlink_copy API
+see: http://permalink.gmane.org/gmane.linux.kernel.commits.head/445090
+
+diff -rupN vmblock-only/linux/inode.c vmblock-only/linux/inode.c
+--- vmblock-only/linux/inode.c	2014-10-05 23:20:14.545218357 -0400
++++ vmblock-only/linux/inode.c	2014-10-05 23:33:01.549259933 -0400
+@@ -178,7 +178,7 @@ InodeOpReadlink(struct dentry *dentry,
+       return -EINVAL;
+    }
+ 
+-   return vfs_readlink(dentry, buffer, buflen, iinfo->name);
++   return readlink_copy(buffer, buflen, iinfo->name);
+ }
+ 
+ 
diff --git a/app-emulation/vmware-modules/files/279-3.15-01-vsock.patch b/app-emulation/vmware-modules/files/279-3.15-01-vsock.patch
new file mode 100644
index 000000000000..9e8d9d1a32f7
--- /dev/null
+++ b/app-emulation/vmware-modules/files/279-3.15-01-vsock.patch
@@ -0,0 +1,46 @@
+removing the no longer existing second parameter to sk_data_ready
+doesn't seem it ever served a purpose.
+
+diff -rupN vsock-only/linux/notify.c vsock-only.new/linux/notify.c
+--- vsock-only/linux/notify.c	2013-11-05 23:33:27.000000000 -0500
++++ vsock-only.new/linux/notify.c	2014-10-05 23:46:47.943304728 -0400
+@@ -515,8 +515,11 @@ VSockVmciHandleWrote(struct sock *sk,
+    vsk = vsock_sk(sk);
+    PKT_FIELD(vsk, sentWaitingRead) = FALSE;
+ #endif
+-
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 15, 0)
++   sk->sk_data_ready(sk);
++#else
+    sk->sk_data_ready(sk, 0);
++#endif
+ }
+ 
+ 
+diff -rupN vsock-only/linux/notifyQState.c vsock-only.new/linux/notifyQState.c
+--- vsock-only/linux/notifyQState.c	2013-11-05 23:33:27.000000000 -0500
++++ vsock-only.new/linux/notifyQState.c	2014-10-05 23:46:33.231303931 -0400
+@@ -164,7 +164,11 @@ VSockVmciHandleWrote(struct sock *sk,
+                      struct sockaddr_vm *dst,    // IN: unused
+                      struct sockaddr_vm *src)    // IN: unused
+ {
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 15, 0)
++   sk->sk_data_ready(sk);
++#else
+    sk->sk_data_ready(sk, 0);
++#endif
+ }
+ 
+ 
+@@ -566,7 +570,11 @@ VSockVmciNotifyPktRecvPostDequeue(struct
+       }
+ 
+       /* See the comment in VSockVmciNotifyPktSendPostEnqueue */
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 15, 0)
++      sk->sk_data_ready(sk);
++#else
+       sk->sk_data_ready(sk, 0);
++#endif
+    }
+ 
+    return err;
diff --git a/app-emulation/vmware-modules/files/279-3.17-00-netdev.patch b/app-emulation/vmware-modules/files/279-3.17-00-netdev.patch
new file mode 100644
index 000000000000..e3ee3aa09939
--- /dev/null
+++ b/app-emulation/vmware-modules/files/279-3.17-00-netdev.patch
@@ -0,0 +1,16 @@
+new alloc_netdev requires a new parameter. All examples in the kernel i've seen just
+use the constant NET_NAME_UNKNOWN.
+origionally from: https://communities.vmware.com/message/2425189
+
+diff -rupN vmnet-only/netif.c vmnet-only.new/netif.c
+--- vmnet-only/netif.c	2013-11-06 00:40:52.000000000 -0500
++++ vmnet-only.new/netif.c	2014-10-09 17:29:12.361307961 -0400
+@@ -149,7 +149,7 @@ VNetNetIf_Create(char *devName,  // IN:
+    memcpy(deviceName, devName, sizeof deviceName);
+    NULL_TERMINATE_STRING(deviceName);
+ 
+-   dev = alloc_netdev(sizeof *netIf, deviceName, VNetNetIfSetup);
++   dev = alloc_netdev(sizeof *netIf, deviceName, NET_NAME_USER, VNetNetIfSetup);
+    if (!dev) {
+       retval = -ENOMEM;
+       goto out;
diff --git a/app-emulation/vmware-modules/files/279-3.18-00-version-redefined.patch b/app-emulation/vmware-modules/files/279-3.18-00-version-redefined.patch
new file mode 100644
index 000000000000..2d3882430580
--- /dev/null
+++ b/app-emulation/vmware-modules/files/279-3.18-00-version-redefined.patch
@@ -0,0 +1,24 @@
+--- a/vmci-only/shared/vm_device_version.h	2015-02-07 03:11:55.000000000 +0300
++++ c/vmci-only/shared/vm_device_version.h	2015-02-24 03:58:06.041605450 +0300
+@@ -53,7 +53,9 @@
+  *    VMware HD Audio codec
+  *    VMware HD Audio controller
+  */
++#ifndef PCI_VENDOR_ID_VMWARE
+ #define PCI_VENDOR_ID_VMWARE                    0x15AD
++#endif
+ #define PCI_DEVICE_ID_VMWARE_SVGA2              0x0405
+ #define PCI_DEVICE_ID_VMWARE_SVGA               0x0710
+ #define PCI_DEVICE_ID_VMWARE_VGA                0x0711
+--- a/vmnet-only/vm_device_version.h	2015-02-07 03:54:16.000000000 +0300
++++ c/vmnet-only/vm_device_version.h	2015-02-24 03:58:06.044604981 +0300
+@@ -53,7 +53,9 @@
+  *    VMware HD Audio codec
+  *    VMware HD Audio controller
+  */
++#ifndef PCI_VENDOR_ID_VMWARE                    
+ #define PCI_VENDOR_ID_VMWARE                    0x15AD
++#endif
+ #define PCI_DEVICE_ID_VMWARE_SVGA2              0x0405
+ #define PCI_DEVICE_ID_VMWARE_SVGA               0x0710
+ #define PCI_DEVICE_ID_VMWARE_VGA                0x0711
diff --git a/app-emulation/vmware-modules/files/279-3.19-00-compat-namei.patch b/app-emulation/vmware-modules/files/279-3.19-00-compat-namei.patch
new file mode 100644
index 000000000000..ec73500e979c
--- /dev/null
+++ b/app-emulation/vmware-modules/files/279-3.19-00-compat-namei.patch
@@ -0,0 +1,23 @@
+--- a/vmblock-only/shared/compat_namei.h	2015-02-07 03:11:55.000000000 +0300
++++ c/vmblock-only/shared/compat_namei.h	2015-02-24 03:51:25.235286047 +0300
+@@ -21,6 +21,20 @@
+ 
+ #include <linux/namei.h>
+ 
++/* Copy-n-paste from kernel's source/fs/namei.c */
++struct nameidata {
++         struct path     path;
++         struct qstr     last;
++         struct path     root;
++         struct inode    *inode; /* path.dentry.d_inode */
++         unsigned int    flags;
++         unsigned        seq, m_seq;
++         int             last_type;
++         unsigned        depth;
++         struct file     *base;
++         char *saved_names[MAX_NESTED_LINKS + 1];
++};
++
+ /*
+  * In 2.6.25-rc2, dentry and mount objects were removed from the nameidata
+  * struct. They were both replaced with a struct path.
diff --git a/app-emulation/vmware-modules/files/279-3.19-01-dentry.patch b/app-emulation/vmware-modules/files/279-3.19-01-dentry.patch
new file mode 100644
index 000000000000..6f11a520a447
--- /dev/null
+++ b/app-emulation/vmware-modules/files/279-3.19-01-dentry.patch
@@ -0,0 +1,13 @@
+--- a/vmnet-only/driver.c	2015-02-07 03:54:17.000000000 +0300
++++ c/vmnet-only/driver.c	2015-02-24 03:58:06.043605137 +0300
+@@ -1191,8 +1191,8 @@
+    struct inode *inode = NULL;
+    long err;
+
+-   if (filp && filp->f_dentry) {
+-      inode = filp->f_dentry->d_inode;
++   if (filp && filp->f_path.dentry) {
++      inode = filp->f_path.dentry->d_inode;
+    }
+    err = VNetFileOpIoctl(inode, filp, iocmd, ioarg);
+    return err;
diff --git a/app-emulation/vmware-modules/files/279-3.19-02-vmblock-path.patch b/app-emulation/vmware-modules/files/279-3.19-02-vmblock-path.patch
new file mode 100644
index 000000000000..178d1478ae59
--- /dev/null
+++ b/app-emulation/vmware-modules/files/279-3.19-02-vmblock-path.patch
@@ -0,0 +1,67 @@
+Sources:
+https://531682.bugs.gentoo.org/attachment.cgi?id=396484
+https://531682.bugs.gentoo.org/attachment.cgi?id=396482
+diff -rupN vmblock-only.orig/linux/dentry.c vmblock-only/linux/dentry.c
+--- vmblock-only.orig/linux/dentry.c	2015-02-14 18:05:46.000000000 -0500
++++ vmblock-only/linux/dentry.c	2015-02-14 18:09:59.000000000 -0500
+@@ -63,7 +63,7 @@ DentryOpRevalidate(struct dentry *dentry
+                    unsigned int flags)   // IN: lookup flags & intent
+ {
+    VMBlockInodeInfo *iinfo;
+-   struct nameidata actualNd;
++   struct path actualNd;
+    struct dentry *actualDentry;
+    int ret;
+ 
+diff -rupN vmblock-only.orig/linux/filesystem.c vmblock-only/linux/filesystem.c
+--- vmblock-only.orig/linux/filesystem.c	2014-11-20 19:29:15.000000000 -0500
++++ vmblock-only/linux/filesystem.c	2015-02-14 18:10:49.000000000 -0500
+@@ -322,7 +322,7 @@ Iget(struct super_block *sb,    // IN: f
+ {
+    VMBlockInodeInfo *iinfo;
+    struct inode *inode;
+-   struct nameidata actualNd;
++   struct path actualNd;
+ 
+    ASSERT(sb);
+ 
+diff -rupN vmblock-only.orig/shared/compat_namei.h vmblock-only/shared/compat_namei.h
+--- vmblock-only.orig/shared/compat_namei.h	2014-11-20 19:29:15.000000000 -0500
++++ vmblock-only/shared/compat_namei.h	2015-02-14 18:08:38.000000000 -0500
+@@ -26,21 +26,21 @@
+  * struct. They were both replaced with a struct path.
+  */
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 25)
+-#define compat_vmw_nd_to_dentry(nd) (nd).path.dentry
++#define compat_vmw_nd_to_dentry(nd) (nd).dentry
+ #else
+ #define compat_vmw_nd_to_dentry(nd) (nd).dentry
+ #endif
+ 
+ /* In 2.6.25-rc2, path_release(&nd) was replaced with path_put(&nd.path). */
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 25)
+-#define compat_path_release(nd) path_put(&(nd)->path)
++#define compat_path_release(nd) path_put(nd)
+ #else
+ #define compat_path_release(nd) path_release(nd)
+ #endif
+ 
+ /* path_lookup was removed in 2.6.39 merge window VFS merge */
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 38)
+-#define compat_path_lookup(name, flags, nd)     kern_path(name, flags, &((nd)->path))
++#define compat_path_lookup(name, flags, nd)     kern_path(name, flags, nd)
+ #else
+ #define compat_path_lookup(name, flags, nd)     path_lookup(name, flags, nd)
+ #endif
+diff -u vmblock-only.orig/linux/file.c vmblock-only/linux/file.c
+--- vmblock-only.orig/linux/file.c	2015-02-11 12:18:29.000000000 -0500
++++ vmblock-only/linux/file.c	2015-02-11 12:41:41.000000000 -0500
+@@ -92,7 +92,7 @@
+     * and that would try to acquire the inode's semaphore; if the two inodes
+     * are the same we'll deadlock.
+     */
+-   if (actualFile->f_dentry && inode == actualFile->f_dentry->d_inode) {
++   if (actualFile->f_path.dentry && inode == actualFile->f_path.dentry->d_inode) {
+       Warning("FileOpOpen: identical inode encountered, open cannot succeed.\n");
+       if (filp_close(actualFile, current->files) < 0) {
+          Warning("FileOpOpen: unable to close opened file.\n");
diff --git a/app-emulation/vmware-modules/files/279-3.19-03-iovec.patch b/app-emulation/vmware-modules/files/279-3.19-03-iovec.patch
new file mode 100644
index 000000000000..b016fec1e652
--- /dev/null
+++ b/app-emulation/vmware-modules/files/279-3.19-03-iovec.patch
@@ -0,0 +1,19 @@
+--- a/vmnet-only/userif.c	2015-02-07 03:54:17.000000000 +0300
++++ c/vmnet-only/userif.c	2015-02-24 03:58:06.043605137 +0300
+@@ -523,7 +523,15 @@
+       .iov_base = buf,
+       .iov_len  = len,
+    };
+-   return skb_copy_datagram_iovec(skb, 0, &iov, len);
++
++
++#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 19, 0)
++	return skb_copy_datagram_iovec(skb, 0, &iov, len);
++#else
++	struct iov_iter to;
++	iov_iter_init(&to, READ, &iov, 1, len);
++	return skb_copy_datagram_iter(skb, 0, &to, len);
++#endif
+ }
+ 
+ 
diff --git a/app-emulation/vmware-modules/files/279-3.19-04-iovec.patch b/app-emulation/vmware-modules/files/279-3.19-04-iovec.patch
new file mode 100644
index 000000000000..9103c555663d
--- /dev/null
+++ b/app-emulation/vmware-modules/files/279-3.19-04-iovec.patch
@@ -0,0 +1,39 @@
+diff -rupN vmci-only.old/linux/vmciKernelIf.c vmci-only/linux/vmciKernelIf.c
+--- vmci-only.old/linux/vmciKernelIf.c	2015-04-28 18:05:56.000000000 +0000
++++ vmci-only/linux/vmciKernelIf.c	2015-07-06 08:02:08.314262258 +0000
+@@ -40,6 +40,7 @@
+ #include <linux/socket.h>       /* For memcpy_{to,from}iovec(). */
+ #include <linux/vmalloc.h>
+ #include <linux/wait.h>
++#include <linux/skbuff.h>
+ 
+ #include "compat_highmem.h"
+ #include "compat_interrupt.h"
+@@ -1227,11 +1228,11 @@ __VMCIMemcpyToQueue(VMCIQueue *queue,
+       }
+ 
+       if (isIovec) {
+-         struct iovec *iov = (struct iovec *)src;
++         struct msghdr *msg = (struct msghdr *)src;
+          int err;
+ 
+          /* The iovec will track bytesCopied internally. */
+-         err = memcpy_fromiovec((uint8 *)va + pageOffset, iov, toCopy);
++         err = memcpy_from_msg((u8 *)va + pageOffset, msg, toCopy);
+          if (err != 0) {
+             if (!kernelIf->isDataMapped) {
+                kunmap(kernelIf->page[pageIndex]);
+@@ -1302,11 +1303,11 @@ __VMCIMemcpyFromQueue(void *dest,
+       }
+ 
+       if (isIovec) {
+-         struct iovec *iov = (struct iovec *)dest;
++         struct msghdr *msg = (struct msghdr *)dest;
+          int err;
+ 
+          /* The iovec will track bytesCopied internally. */
+-         err = memcpy_toiovec(iov, (uint8 *)va + pageOffset, toCopy);
++         err = memcpy_to_msg(msg, (uint8 *)va + pageOffset, toCopy);
+          if (err != 0) {
+             if (!kernelIf->isDataMapped) {
+                kunmap(kernelIf->page[pageIndex]);
diff --git a/app-emulation/vmware-modules/files/279-3.19-05-vmci_qpair.patch b/app-emulation/vmware-modules/files/279-3.19-05-vmci_qpair.patch
new file mode 100644
index 000000000000..1849a378456e
--- /dev/null
+++ b/app-emulation/vmware-modules/files/279-3.19-05-vmci_qpair.patch
@@ -0,0 +1,24 @@
+diff -rupN vsock-only.old/linux/af_vsock.c vsock-only/linux/af_vsock.c
+--- vsock-only.old/linux/af_vsock.c     2015-05-06 20:41:47.684046762 -0400
++++ vsock-only/linux/af_vsock.c 2015-05-06 20:52:15.245080779 -0400
+@@ -4629,7 +4629,7 @@ VSockVmciStreamSendmsg(struct kiocb *kio
+        * able to send.
+        */
+ 
+-      written = vmci_qpair_enquev(vsk->qpair, msg->msg_iov,
++      written = vmci_qpair_enquev(vsk->qpair, &msg->msg_iter.iov,
+                                   len - totalWritten, 0);
+       if (written < 0) {
+          err = -ENOMEM;
+@@ -4874,9 +4874,9 @@ VSockVmciStreamRecvmsg(struct kiocb *kio
+          }
+ 
+          if (flags & MSG_PEEK) {
+-            read = vmci_qpair_peekv(vsk->qpair, msg->msg_iov, len - copied, 0);
++            read = vmci_qpair_peekv(vsk->qpair, &msg->msg_iter.iov, len - copied, 0);
+          } else {
+-            read = vmci_qpair_dequev(vsk->qpair, msg->msg_iov, len - copied, 0);
++            read = vmci_qpair_dequev(vsk->qpair, &msg->msg_iter.iov, len - copied, 0);
+          }
+ 
+          if (read < 0) {
diff --git a/app-emulation/vmware-modules/files/279-3.19-06-vsock.patch b/app-emulation/vmware-modules/files/279-3.19-06-vsock.patch
new file mode 100644
index 000000000000..2e412301d096
--- /dev/null
+++ b/app-emulation/vmware-modules/files/279-3.19-06-vsock.patch
@@ -0,0 +1,15 @@
+diff -rupN vsock-only/linux/af_vsock.c vsock-only.new/linux/af_vsock.c
+--- vsock-only/linux/af_vsock.c	2015-05-05 11:31:35.710099711 -0400
++++ vsock-only.new/linux/af_vsock.c	2015-05-05 11:36:33.260115840 -0400
+@@ -4727,7 +4727,11 @@ VSockVmciDgramRecvmsg(struct kiocb *kioc
+    }
+ 
+    /* Place the datagram payload in the user's iovec. */
++#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 19, 0)
+    err = skb_copy_datagram_iovec(skb, sizeof *dg, msg->msg_iov, payloadLen);
++#else
++   err = skb_copy_datagram_iter(skb, sizeof *dg, &msg->msg_iter, payloadLen);
++#endif
+    if (err) {
+       goto out;
+    }
diff --git a/app-emulation/vmware-modules/files/279-3.19-07-vsock.patch b/app-emulation/vmware-modules/files/279-3.19-07-vsock.patch
new file mode 100644
index 000000000000..8c9d3cb6dfe3
--- /dev/null
+++ b/app-emulation/vmware-modules/files/279-3.19-07-vsock.patch
@@ -0,0 +1,12 @@
+diff -rupN vsock-only/linux/af_vsock.c vsock-only.new/linux/af_vsock.c
+--- vsock-only/linux/af_vsock.c	2015-05-05 11:26:05.145081792 -0400
++++ vsock-only.new/linux/af_vsock.c	2015-05-05 11:30:54.304097466 -0400
+@@ -4266,7 +4266,7 @@ VSockVmciDgramSendmsg(struct kiocb *kioc
+       goto out;
+    }
+ 
+-   memcpy_fromiovec(VMCI_DG_PAYLOAD(dg), msg->msg_iov, len);
++   memcpy_from_msg(VMCI_DG_PAYLOAD(dg), msg, len);
+ 
+    dg->dst = VMCI_MAKE_HANDLE(remoteAddr->svm_cid, remoteAddr->svm_port);
+    dg->src = VMCI_MAKE_HANDLE(vsk->localAddr.svm_cid, vsk->localAddr.svm_port);
diff --git a/app-emulation/vmware-modules/files/279-5.10-00-userns.patch b/app-emulation/vmware-modules/files/279-5.10-00-userns.patch
new file mode 100644
index 000000000000..7a1bb987fecd
--- /dev/null
+++ b/app-emulation/vmware-modules/files/279-5.10-00-userns.patch
@@ -0,0 +1,16 @@
+correctly initializes UID/GID values
+gets UID correctly in light of user namespace API
+origionally from https://462666.bugs.gentoo.org/attachment.cgi?id=342888
+
+--- a/vmblock-only/linux/inode.c   2013-03-20 17:37:48.000000000 +0100
++++ b/vmblock-only/linux/inode.c   2013-03-20 17:41:22.000000000 +0100
+@@ -135,7 +135,8 @@
+    inode->i_size = INODE_TO_IINFO(inode)->nameLen;
+    inode->i_version = 1;
+    inode->i_atime = inode->i_mtime = inode->i_ctime = CURRENT_TIME;
+-   inode->i_uid = inode->i_gid = 0;
++   inode->i_uid = GLOBAL_ROOT_UID;
++   inode->i_gid = GLOBAL_ROOT_GID;
+    inode->i_op = &LinkInodeOps;
+ 
+    d_add(dentry, inode);
diff --git a/app-emulation/vmware-modules/files/304-3.10-00-dentry.patch b/app-emulation/vmware-modules/files/304-3.10-00-dentry.patch
new file mode 100644
index 000000000000..5cc445fcadf9
--- /dev/null
+++ b/app-emulation/vmware-modules/files/304-3.10-00-dentry.patch
@@ -0,0 +1,43 @@
+Minor change the API, now it just gets passed flags instead of a pointer to the nameidata
+--- a/vmblock-only/linux/dentry.c	2015-02-07 03:11:55.000000000 +0300
++++ c/vmblock-only/linux/dentry.c	2015-02-24 03:58:06.038605919 +0300
+@@ -32,7 +32,11 @@
+ #include "block.h"
+ 
+ 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 10, 0)
+ static int DentryOpRevalidate(struct dentry *dentry, struct nameidata *nd);
++#else
++static int DentryOpRevalidate(struct dentry *dentry, unsigned int);
++#endif
+ 
+ struct dentry_operations LinkDentryOps = {
+    .d_revalidate = DentryOpRevalidate,
+@@ -58,9 +62,12 @@
+  *----------------------------------------------------------------------------
+  */
+ 
+-static int
+-DentryOpRevalidate(struct dentry *dentry,  // IN: dentry revalidating
+-                   struct nameidata *nd)   // IN: lookup flags & intent
++#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 10, 0)
++static int DentryOpRevalidate(struct dentry *dentry, struct nameidata *nd)
++#else
++static int DentryOpRevalidate(struct dentry *dentry, unsigned int flags)
++#endif
++
+ {
+    VMBlockInodeInfo *iinfo;
+    struct nameidata actualNd;
+@@ -101,7 +108,11 @@
+    if (actualDentry &&
+        actualDentry->d_op &&
+        actualDentry->d_op->d_revalidate) {
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 10, 0)
++      return actualDentry->d_op->d_revalidate(actualDentry, flags);
++#else
+       return actualDentry->d_op->d_revalidate(actualDentry, nd);
++#endif
+    }
+ 
+    if (compat_path_lookup(iinfo->name, 0, &actualNd)) {
diff --git a/app-emulation/vmware-modules/files/304-3.10-01-inode.patch b/app-emulation/vmware-modules/files/304-3.10-01-inode.patch
new file mode 100644
index 000000000000..e12d84d10e7b
--- /dev/null
+++ b/app-emulation/vmware-modules/files/304-3.10-01-inode.patch
@@ -0,0 +1,94 @@
+Minor change the API, now it just gets passed flags instead of a pointer to the nameidata
+Properly initializes UID/GID with repsect to namespaces
+Some changes the readlink/setlink APIs
+--- a/vmblock-only/linux/inode.c	2015-02-07 03:11:55.000000000 +0300
++++ c/vmblock-only/linux/inode.c	2015-02-24 03:58:06.039605762 +0300
+@@ -35,9 +35,15 @@
+ 
+ 
+ /* Inode operations */
+-static struct dentry *InodeOpLookup(struct inode *dir,
+-                                    struct dentry *dentry, struct nameidata *nd);
++
++#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 10, 0)
++static struct dentry *InodeOpLookup(struct inode *dir, struct dentry *dentry, struct nameidata *nd);
+ static int InodeOpReadlink(struct dentry *dentry, char __user *buffer, int buflen);
++#else
++static struct dentry *InodeOpLookup(struct inode *, struct dentry *, unsigned int);
++static int InodeOpReadlink(struct dentry *, char __user *, int);
++#endif
++
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 13)
+ static void *InodeOpFollowlink(struct dentry *dentry, struct nameidata *nd);
+ #else
+@@ -49,12 +55,15 @@
+    .lookup = InodeOpLookup,
+ };
+ 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 13, 0)
+ static struct inode_operations LinkInodeOps = {
++#else
++struct inode_operations LinkInodeOps = {
++#endif
+    .readlink    = InodeOpReadlink,
+    .follow_link = InodeOpFollowlink,
+ };
+ 
+-
+ /*
+  *----------------------------------------------------------------------------
+  *
+@@ -75,7 +84,11 @@
+ static struct dentry *
+ InodeOpLookup(struct inode *dir,      // IN: parent directory's inode
+               struct dentry *dentry,  // IN: dentry to lookup
+-              struct nameidata *nd)   // IN: lookup intent and information
++#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 10, 0)
++	      struct nameidata *nd)   // IN: lookup intent and information
++#else
++              unsigned int flags)
++#endif
+ {
+    char *filename;
+    struct inode *inode;
+@@ -135,7 +148,12 @@
+    inode->i_size = INODE_TO_IINFO(inode)->nameLen;
+    inode->i_version = 1;
+    inode->i_atime = inode->i_mtime = inode->i_ctime = CURRENT_TIME;
++#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 10, 0)
+    inode->i_uid = inode->i_gid = 0;
++#else
++   inode->i_gid = make_kgid(current_user_ns(), 0);
++   inode->i_uid = make_kuid(current_user_ns(), 0);
++#endif
+    inode->i_op = &LinkInodeOps;
+ 
+    d_add(dentry, inode);
+@@ -177,7 +195,12 @@
+       return -EINVAL;
+    }
+ 
+-   return vfs_readlink(dentry, buffer, buflen, iinfo->name);
++#if LINUX_VERSION_CODE <= KERNEL_VERSION(3, 14, 99)
++	return vfs_readlink(dentry, buffer, buflen, iinfo->name);
++#else
++       return readlink_copy(buffer, buflen, iinfo->name);
++#endif
++
+ }
+ 
+ 
+@@ -221,7 +244,7 @@
+       goto out;
+    }
+ 
+-   ret = vfs_follow_link(nd, iinfo->name);
++   nd_set_link(nd, iinfo->name);
+ 
+ out:
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 13)
+@@ -230,3 +253,4 @@
+    return ret;
+ #endif
+ }
++
diff --git a/app-emulation/vmware-modules/files/304-3.10-02-control.patch b/app-emulation/vmware-modules/files/304-3.10-02-control.patch
new file mode 100644
index 000000000000..928835337511
--- /dev/null
+++ b/app-emulation/vmware-modules/files/304-3.10-02-control.patch
@@ -0,0 +1,57 @@
+The API to create proc entries now takes the file ops structure directly, instead of being set after the fact
+Using new __getname/__putname API
+--- a/vmblock-only/linux/control.c	2015-02-07 03:11:55.000000000 +0300
++++ c/vmblock-only/linux/control.c	2015-02-24 03:58:06.038605919 +0300
+@@ -208,9 +208,11 @@
+    VMBlockSetProcEntryOwner(controlProcMountpoint);
+ 
+    /* Create /proc/fs/vmblock/dev */
+-   controlProcEntry = create_proc_entry(VMBLOCK_CONTROL_DEVNAME,
+-                                        VMBLOCK_CONTROL_MODE,
+-                                        controlProcDirEntry);
++   controlProcEntry = proc_create(VMBLOCK_CONTROL_DEVNAME, 
++				  VMBLOCK_CONTROL_MODE,
++                                  controlProcDirEntry, 
++				  &ControlFileOps);
++
+    if (!controlProcEntry) {
+       Warning("SetupProcDevice: could not create " VMBLOCK_DEVICE "\n");
+       remove_proc_entry(VMBLOCK_CONTROL_MOUNTPOINT, controlProcDirEntry);
+@@ -218,7 +220,10 @@
+       return -EINVAL;
+    }
+ 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 10, 0)
+    controlProcEntry->proc_fops = &ControlFileOps;
++#endif
++
+    return 0;
+ }
+
+@@ -287,18 +287,24 @@ ExecuteBlockOp(const char __user *buf,
+    int i;
+    int retval;
+ 
+-   name = getname(buf);
++   name = __getname();
+    if (IS_ERR(name)) {
+       return PTR_ERR(name);
+    }
+ 
++   i = strncpy_from_user(name, buf, PATH_MAX);
++   if (i < 0 || i == PATH_MAX) {
++      __putname(name);
++      return -EINVAL;
++   }
++
+    for (i = strlen(name) - 1; i >= 0 && name[i] == '/'; i--) {
+       name[i] = '\0';
+    }
+ 
+    retval = i < 0 ? -EINVAL : blockOp(name, blocker);
+ 
+-   putname(name);
++   __putname(name);
+ 
+    return retval;
+ }
diff --git a/app-emulation/vmware-modules/files/304-3.10-03-inline.patch b/app-emulation/vmware-modules/files/304-3.10-03-inline.patch
new file mode 100644
index 000000000000..fa8f36a35c29
--- /dev/null
+++ b/app-emulation/vmware-modules/files/304-3.10-03-inline.patch
@@ -0,0 +1,14 @@
+Hushes a warning
+--- a/vmmon-only/linux/driver.c	2015-02-07 03:54:16.000000000 +0300
++++ c/vmmon-only/linux/driver.c	2015-02-24 03:58:06.042605293 +0300
+@@ -1328,7 +1328,9 @@
+  *-----------------------------------------------------------------------------
+  */
+ 
+-__attribute__((always_inline)) static Bool
++#include <linux/compiler-gcc.h>
++
++__always_inline static Bool
+ LinuxDriverSyncReadTSCs(uint64 *delta) // OUT: TSC max - TSC min
+ {
+    TSCDelta tscDelta;
diff --git a/app-emulation/vmware-modules/files/304-3.11-00-readdir.patch b/app-emulation/vmware-modules/files/304-3.11-00-readdir.patch
new file mode 100644
index 000000000000..b2f76d3e2b30
--- /dev/null
+++ b/app-emulation/vmware-modules/files/304-3.11-00-readdir.patch
@@ -0,0 +1,41 @@
+replaces usage of vfs_readdir with iterate_dir. origionally found here:
+https://bugs.gentoo.org/show_bug.cgi?id=508204
+
+diff -Naur vmblock-only/linux/file.c vmblock-only/linux/file.c
+--- vmblock-only/linux/file.c	2013-11-05 23:33:26.000000000 -0500
++++ vmblock-only/linux/file.c	2014-04-26 10:58:03.062635343 -0400
+@@ -166,11 +166,9 @@
+ 
+ static int
+ FileOpReaddir(struct file *file,  // IN
+-              void *dirent,       // IN
+-              filldir_t filldir)  // IN
++		struct dir_context *ctx)
+ {
+    int ret;
+-   FilldirInfo info;
+    struct file *actualFile;
+ 
+    if (!file) {
+@@ -184,11 +182,8 @@
+       return -EINVAL;
+    }
+ 
+-   info.filldir = filldir;
+-   info.dirent = dirent;
+-
+    actualFile->f_pos = file->f_pos;
+-   ret = vfs_readdir(actualFile, Filldir, &info);
++   ret = iterate_dir(actualFile, ctx);
+    file->f_pos = actualFile->f_pos;
+ 
+    return ret;
+@@ -237,7 +232,7 @@
+ 
+ 
+ struct file_operations RootFileOps = {
+-   .readdir = FileOpReaddir,
++   .iterate = FileOpReaddir,
+    .open    = FileOpOpen,
+    .release = FileOpRelease,
+ };
diff --git a/app-emulation/vmware-modules/files/304-3.11-01-filldir.patch b/app-emulation/vmware-modules/files/304-3.11-01-filldir.patch
new file mode 100644
index 000000000000..2eec99b7c1f8
--- /dev/null
+++ b/app-emulation/vmware-modules/files/304-3.11-01-filldir.patch
@@ -0,0 +1,53 @@
+simply remove the code for Filldir since it is no longer used with the new 
+iterate_dir API
+
+diff -rupN vmblock-only/linux/file.c vmblock-only.new/linux/file.c
+--- vmblock-only/linux/file.c	2014-10-07 23:22:46.832469618 -0400
++++ vmblock-only.new/linux/file.c	2014-10-07 23:24:35.276472720 -0400
+@@ -38,46 +38,6 @@ typedef u64 inode_num_t;
+ typedef ino_t inode_num_t;
+ #endif
+ 
+-/* Specifically for our filldir_t callback */
+-typedef struct FilldirInfo {
+-   filldir_t filldir;
+-   void *dirent;
+-} FilldirInfo;
+-
+-
+-/*
+- *----------------------------------------------------------------------------
+- *
+- * Filldir --
+- *
+- *    Callback function for readdir that we use in place of the one provided.
+- *    This allows us to specify that each dentry is a symlink, but pass through
+- *    everything else to the original filldir function.
+- *
+- * Results:
+- *    Original filldir's return value.
+- *
+- * Side effects:
+- *    Directory information gets copied to user's buffer.
+- *
+- *----------------------------------------------------------------------------
+- */
+-
+-static int
+-Filldir(void *buf,              // IN: Dirent buffer passed from FileOpReaddir
+-        const char *name,       // IN: Dirent name
+-        int namelen,            // IN: len of dirent's name
+-        loff_t offset,          // IN: Offset
+-        inode_num_t ino,        // IN: Inode number of dirent
+-        unsigned int d_type)    // IN: Type of file
+-{
+-   FilldirInfo *info = buf;
+-
+-   /* Specify DT_LNK regardless */
+-   return info->filldir(info->dirent, name, namelen, offset, ino, DT_LNK);
+-}
+-
+-
+ /* File operations */
+ 
+ /*
diff --git a/app-emulation/vmware-modules/files/304-3.15-00-vsock.patch b/app-emulation/vmware-modules/files/304-3.15-00-vsock.patch
new file mode 100644
index 000000000000..9e8d9d1a32f7
--- /dev/null
+++ b/app-emulation/vmware-modules/files/304-3.15-00-vsock.patch
@@ -0,0 +1,46 @@
+removing the no longer existing second parameter to sk_data_ready
+doesn't seem it ever served a purpose.
+
+diff -rupN vsock-only/linux/notify.c vsock-only.new/linux/notify.c
+--- vsock-only/linux/notify.c	2013-11-05 23:33:27.000000000 -0500
++++ vsock-only.new/linux/notify.c	2014-10-05 23:46:47.943304728 -0400
+@@ -515,8 +515,11 @@ VSockVmciHandleWrote(struct sock *sk,
+    vsk = vsock_sk(sk);
+    PKT_FIELD(vsk, sentWaitingRead) = FALSE;
+ #endif
+-
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 15, 0)
++   sk->sk_data_ready(sk);
++#else
+    sk->sk_data_ready(sk, 0);
++#endif
+ }
+ 
+ 
+diff -rupN vsock-only/linux/notifyQState.c vsock-only.new/linux/notifyQState.c
+--- vsock-only/linux/notifyQState.c	2013-11-05 23:33:27.000000000 -0500
++++ vsock-only.new/linux/notifyQState.c	2014-10-05 23:46:33.231303931 -0400
+@@ -164,7 +164,11 @@ VSockVmciHandleWrote(struct sock *sk,
+                      struct sockaddr_vm *dst,    // IN: unused
+                      struct sockaddr_vm *src)    // IN: unused
+ {
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 15, 0)
++   sk->sk_data_ready(sk);
++#else
+    sk->sk_data_ready(sk, 0);
++#endif
+ }
+ 
+ 
+@@ -566,7 +570,11 @@ VSockVmciNotifyPktRecvPostDequeue(struct
+       }
+ 
+       /* See the comment in VSockVmciNotifyPktSendPostEnqueue */
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 15, 0)
++      sk->sk_data_ready(sk);
++#else
+       sk->sk_data_ready(sk, 0);
++#endif
+    }
+ 
+    return err;
diff --git a/app-emulation/vmware-modules/files/304-3.18-00-version-redefined.patch b/app-emulation/vmware-modules/files/304-3.18-00-version-redefined.patch
new file mode 100644
index 000000000000..22d6325c9a90
--- /dev/null
+++ b/app-emulation/vmware-modules/files/304-3.18-00-version-redefined.patch
@@ -0,0 +1,25 @@
+Hushes some (but not all warnings) relating to redefinitions of this define
+--- a/vmci-only/shared/vm_device_version.h	2015-02-07 03:11:55.000000000 +0300
++++ c/vmci-only/shared/vm_device_version.h	2015-02-24 03:58:06.041605450 +0300
+@@ -53,7 +53,9 @@
+  *    VMware HD Audio codec
+  *    VMware HD Audio controller
+  */
++#ifndef PCI_VENDOR_ID_VMWARE
+ #define PCI_VENDOR_ID_VMWARE                    0x15AD
++#endif
+ #define PCI_DEVICE_ID_VMWARE_SVGA2              0x0405
+ #define PCI_DEVICE_ID_VMWARE_SVGA               0x0710
+ #define PCI_DEVICE_ID_VMWARE_VGA                0x0711
+--- a/vmnet-only/vm_device_version.h	2015-02-07 03:54:16.000000000 +0300
++++ c/vmnet-only/vm_device_version.h	2015-02-24 03:58:06.044604981 +0300
+@@ -53,7 +53,9 @@
+  *    VMware HD Audio codec
+  *    VMware HD Audio controller
+  */
++#ifndef PCI_VENDOR_ID_VMWARE                    
+ #define PCI_VENDOR_ID_VMWARE                    0x15AD
++#endif
+ #define PCI_DEVICE_ID_VMWARE_SVGA2              0x0405
+ #define PCI_DEVICE_ID_VMWARE_SVGA               0x0710
+ #define PCI_DEVICE_ID_VMWARE_VGA                0x0711
diff --git a/app-emulation/vmware-modules/files/304-3.19-00-compat-namei.patch b/app-emulation/vmware-modules/files/304-3.19-00-compat-namei.patch
new file mode 100644
index 000000000000..0182077254a1
--- /dev/null
+++ b/app-emulation/vmware-modules/files/304-3.19-00-compat-namei.patch
@@ -0,0 +1,24 @@
+A copy of this since it is no longer exported by the kernel headers
+--- a/vmblock-only/shared/compat_namei.h	2015-02-07 03:11:55.000000000 +0300
++++ c/vmblock-only/shared/compat_namei.h	2015-02-24 03:51:25.235286047 +0300
+@@ -21,6 +21,20 @@
+ 
+ #include <linux/namei.h>
+ 
++/* Copy-n-paste from kernel's source/fs/namei.c */
++struct nameidata {
++         struct path     path;
++         struct qstr     last;
++         struct path     root;
++         struct inode    *inode; /* path.dentry.d_inode */
++         unsigned int    flags;
++         unsigned        seq, m_seq;
++         int             last_type;
++         unsigned        depth;
++         struct file     *base;
++         char *saved_names[MAX_NESTED_LINKS + 1];
++};
++
+ /*
+  * In 2.6.25-rc2, dentry and mount objects were removed from the nameidata
+  * struct. They were both replaced with a struct path.
diff --git a/app-emulation/vmware-modules/files/304-3.19-01-dentry.patch b/app-emulation/vmware-modules/files/304-3.19-01-dentry.patch
new file mode 100644
index 000000000000..3e3be6542dda
--- /dev/null
+++ b/app-emulation/vmware-modules/files/304-3.19-01-dentry.patch
@@ -0,0 +1,14 @@
+There is an level of abstrxtion in the newre API as of 3.19 here
+--- a/vmnet-only/driver.c	2015-02-07 03:54:17.000000000 +0300
++++ c/vmnet-only/driver.c	2015-02-24 03:58:06.043605137 +0300
+@@ -1191,8 +1191,8 @@
+    struct inode *inode = NULL;
+    long err;
+
+-   if (filp && filp->f_dentry) {
+-      inode = filp->f_dentry->d_inode;
++   if (filp && filp->f_path.dentry) {
++      inode = filp->f_path.dentry->d_inode;
+    }
+    err = VNetFileOpIoctl(inode, filp, iocmd, ioarg);
+    return err;
diff --git a/app-emulation/vmware-modules/files/304-3.19-02-vmblock-path.patch b/app-emulation/vmware-modules/files/304-3.19-02-vmblock-path.patch
new file mode 100644
index 000000000000..178d1478ae59
--- /dev/null
+++ b/app-emulation/vmware-modules/files/304-3.19-02-vmblock-path.patch
@@ -0,0 +1,67 @@
+Sources:
+https://531682.bugs.gentoo.org/attachment.cgi?id=396484
+https://531682.bugs.gentoo.org/attachment.cgi?id=396482
+diff -rupN vmblock-only.orig/linux/dentry.c vmblock-only/linux/dentry.c
+--- vmblock-only.orig/linux/dentry.c	2015-02-14 18:05:46.000000000 -0500
++++ vmblock-only/linux/dentry.c	2015-02-14 18:09:59.000000000 -0500
+@@ -63,7 +63,7 @@ DentryOpRevalidate(struct dentry *dentry
+                    unsigned int flags)   // IN: lookup flags & intent
+ {
+    VMBlockInodeInfo *iinfo;
+-   struct nameidata actualNd;
++   struct path actualNd;
+    struct dentry *actualDentry;
+    int ret;
+ 
+diff -rupN vmblock-only.orig/linux/filesystem.c vmblock-only/linux/filesystem.c
+--- vmblock-only.orig/linux/filesystem.c	2014-11-20 19:29:15.000000000 -0500
++++ vmblock-only/linux/filesystem.c	2015-02-14 18:10:49.000000000 -0500
+@@ -322,7 +322,7 @@ Iget(struct super_block *sb,    // IN: f
+ {
+    VMBlockInodeInfo *iinfo;
+    struct inode *inode;
+-   struct nameidata actualNd;
++   struct path actualNd;
+ 
+    ASSERT(sb);
+ 
+diff -rupN vmblock-only.orig/shared/compat_namei.h vmblock-only/shared/compat_namei.h
+--- vmblock-only.orig/shared/compat_namei.h	2014-11-20 19:29:15.000000000 -0500
++++ vmblock-only/shared/compat_namei.h	2015-02-14 18:08:38.000000000 -0500
+@@ -26,21 +26,21 @@
+  * struct. They were both replaced with a struct path.
+  */
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 25)
+-#define compat_vmw_nd_to_dentry(nd) (nd).path.dentry
++#define compat_vmw_nd_to_dentry(nd) (nd).dentry
+ #else
+ #define compat_vmw_nd_to_dentry(nd) (nd).dentry
+ #endif
+ 
+ /* In 2.6.25-rc2, path_release(&nd) was replaced with path_put(&nd.path). */
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 25)
+-#define compat_path_release(nd) path_put(&(nd)->path)
++#define compat_path_release(nd) path_put(nd)
+ #else
+ #define compat_path_release(nd) path_release(nd)
+ #endif
+ 
+ /* path_lookup was removed in 2.6.39 merge window VFS merge */
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 38)
+-#define compat_path_lookup(name, flags, nd)     kern_path(name, flags, &((nd)->path))
++#define compat_path_lookup(name, flags, nd)     kern_path(name, flags, nd)
+ #else
+ #define compat_path_lookup(name, flags, nd)     path_lookup(name, flags, nd)
+ #endif
+diff -u vmblock-only.orig/linux/file.c vmblock-only/linux/file.c
+--- vmblock-only.orig/linux/file.c	2015-02-11 12:18:29.000000000 -0500
++++ vmblock-only/linux/file.c	2015-02-11 12:41:41.000000000 -0500
+@@ -92,7 +92,7 @@
+     * and that would try to acquire the inode's semaphore; if the two inodes
+     * are the same we'll deadlock.
+     */
+-   if (actualFile->f_dentry && inode == actualFile->f_dentry->d_inode) {
++   if (actualFile->f_path.dentry && inode == actualFile->f_path.dentry->d_inode) {
+       Warning("FileOpOpen: identical inode encountered, open cannot succeed.\n");
+       if (filp_close(actualFile, current->files) < 0) {
+          Warning("FileOpOpen: unable to close opened file.\n");
diff --git a/app-emulation/vmware-modules/files/304-3.19-03-iovec.patch b/app-emulation/vmware-modules/files/304-3.19-03-iovec.patch
new file mode 100644
index 000000000000..726d1173b3b3
--- /dev/null
+++ b/app-emulation/vmware-modules/files/304-3.19-03-iovec.patch
@@ -0,0 +1,20 @@
+using new iterator based API, this matches exactly the changes made upstream as of vmware-modules-304.2
+--- a/vmnet-only/userif.c	2015-02-07 03:54:17.000000000 +0300
++++ c/vmnet-only/userif.c	2015-02-24 03:58:06.043605137 +0300
+@@ -523,7 +523,15 @@
+       .iov_base = buf,
+       .iov_len  = len,
+    };
+-   return skb_copy_datagram_iovec(skb, 0, &iov, len);
++
++
++#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 19, 0)
++	return skb_copy_datagram_iovec(skb, 0, &iov, len);
++#else
++	struct iov_iter to;
++	iov_iter_init(&to, READ, &iov, 1, len);
++	return skb_copy_datagram_iter(skb, 0, &to, len);
++#endif
+ }
+ 
+ 
diff --git a/app-emulation/vmware-modules/files/304-3.19-04-iovec.patch b/app-emulation/vmware-modules/files/304-3.19-04-iovec.patch
new file mode 100644
index 000000000000..83f0cc8fcbbf
--- /dev/null
+++ b/app-emulation/vmware-modules/files/304-3.19-04-iovec.patch
@@ -0,0 +1,59 @@
+Some parts of the iovec API were replaced by the similar message API. Refactoring the code to use that.
+--- a/vmci-only/linux/vmciKernelIf.c	2015-02-07 03:11:55.000000000 +0300
++++ c/vmci-only/linux/vmciKernelIf.c	2015-02-24 03:58:06.041605450 +0300
+@@ -40,6 +40,7 @@
+ #include <linux/socket.h>       /* For memcpy_{to,from}iovec(). */
+ #include <linux/vmalloc.h>
+ #include <linux/wait.h>
++#include <linux/skbuff.h>
+ 
+ #include "compat_highmem.h"
+ #include "compat_interrupt.h"
+@@ -1196,21 +1197,21 @@
+       } else {
+          toCopy = size - bytesCopied;
+       }
+-
++      /* Code cloned from kernels drivers/misc/vmw_vmci/vmci_queue_pair.c */
+       if (isIovec) {
+-         struct iovec *iov = (struct iovec *)src;
+-         int err;
++         struct msghdr *msg = (struct msghdr *)src;
++         int err;
+ 
+-         /* The iovec will track bytesCopied internally. */
+-         err = memcpy_fromiovec((uint8 *)va + pageOffset, iov, toCopy);
+-         if (err != 0) {
+-            if (kernelIf->host) {
+-               kunmap(kernelIf->u.h.page[pageIndex]);
++         /* The iovec will track bytes_copied internally. */
++         err = memcpy_from_msg((u8 *)va + pageOffset, msg, toCopy);
++         if (err != 0) {
++            if (kernelIf->host)
++               kunmap(kernelIf->u.h.page[pageIndex]);
++               return VMCI_ERROR_INVALID_ARGS;
+             }
+-            return VMCI_ERROR_INVALID_ARGS;
+-         }
+-      } else {
+-         memcpy((uint8 *)va + pageOffset, (uint8 *)src + bytesCopied, toCopy);
++        } else {
++            memcpy((u8 *)va + pageOffset,
++                   (u8 *)src + bytesCopied, toCopy);
+       }
+ 
+       bytesCopied += toCopy;
+@@ -1273,11 +1274,11 @@
+       }
+ 
+       if (isIovec) {
+-         struct iovec *iov = (struct iovec *)dest;
++	  struct msghdr *msg = (struct msghdr *)dest;
+          int err;
+ 
+          /* The iovec will track bytesCopied internally. */
+-         err = memcpy_toiovec(iov, (uint8 *)va + pageOffset, toCopy);
++	  err = memcpy_to_msg(msg, (uint8 *)va + pageOffset, toCopy);
+          if (err != 0) {
+             if (kernelIf->host) {
+                kunmap(kernelIf->u.h.page[pageIndex]);
diff --git a/app-emulation/vmware-modules/files/304-3.19-05-vmci_qpair.patch b/app-emulation/vmware-modules/files/304-3.19-05-vmci_qpair.patch
new file mode 100644
index 000000000000..4dec3c468206
--- /dev/null
+++ b/app-emulation/vmware-modules/files/304-3.19-05-vmci_qpair.patch
@@ -0,0 +1,25 @@
+Some parts of the iovec API were replaced by the similar message API. Refactoring the code to use that.
+diff -rupN vsock-only.old/linux/af_vsock.c vsock-only/linux/af_vsock.c
+--- vsock-only.old/linux/af_vsock.c     2015-05-06 20:41:47.684046762 -0400
++++ vsock-only/linux/af_vsock.c 2015-05-06 20:52:15.245080779 -0400
+@@ -4629,7 +4629,7 @@ VSockVmciStreamSendmsg(struct kiocb *kio
+        * able to send.
+        */
+ 
+-      written = vmci_qpair_enquev(vsk->qpair, msg->msg_iov,
++      written = vmci_qpair_enquev(vsk->qpair, &msg->msg_iter.iov,
+                                   len - totalWritten, 0);
+       if (written < 0) {
+          err = -ENOMEM;
+@@ -4874,9 +4874,9 @@ VSockVmciStreamRecvmsg(struct kiocb *kio
+          }
+ 
+          if (flags & MSG_PEEK) {
+-            read = vmci_qpair_peekv(vsk->qpair, msg->msg_iov, len - copied, 0);
++            read = vmci_qpair_peekv(vsk->qpair, &msg->msg_iter.iov, len - copied, 0);
+          } else {
+-            read = vmci_qpair_dequev(vsk->qpair, msg->msg_iov, len - copied, 0);
++            read = vmci_qpair_dequev(vsk->qpair, &msg->msg_iter.iov, len - copied, 0);
+          }
+ 
+          if (read < 0) {
diff --git a/app-emulation/vmware-modules/files/304-3.19-06-vsock.patch b/app-emulation/vmware-modules/files/304-3.19-06-vsock.patch
new file mode 100644
index 000000000000..9a2096e679a4
--- /dev/null
+++ b/app-emulation/vmware-modules/files/304-3.19-06-vsock.patch
@@ -0,0 +1,16 @@
+Some parts of the iovec API were replaced by the similar message API. Refactoring the code to use that.
+diff -rupN vsock-only/linux/af_vsock.c vsock-only.new/linux/af_vsock.c
+--- vsock-only/linux/af_vsock.c	2015-05-05 11:31:35.710099711 -0400
++++ vsock-only.new/linux/af_vsock.c	2015-05-05 11:36:33.260115840 -0400
+@@ -4727,7 +4727,11 @@ VSockVmciDgramRecvmsg(struct kiocb *kioc
+    }
+ 
+    /* Place the datagram payload in the user's iovec. */
++#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 19, 0)
+    err = skb_copy_datagram_iovec(skb, sizeof *dg, msg->msg_iov, payloadLen);
++#else
++   err = skb_copy_datagram_iter(skb, sizeof *dg, &msg->msg_iter, payloadLen);
++#endif
+    if (err) {
+       goto out;
+    }
diff --git a/app-emulation/vmware-modules/files/304-3.19-07-vsock.patch b/app-emulation/vmware-modules/files/304-3.19-07-vsock.patch
new file mode 100644
index 000000000000..6aec2cd3d7b5
--- /dev/null
+++ b/app-emulation/vmware-modules/files/304-3.19-07-vsock.patch
@@ -0,0 +1,13 @@
+Some parts of the iovec API were replaced by the similar message API. Refactoring the code to use that.
+diff -rupN vsock-only/linux/af_vsock.c vsock-only.new/linux/af_vsock.c
+--- vsock-only/linux/af_vsock.c	2015-05-05 11:26:05.145081792 -0400
++++ vsock-only.new/linux/af_vsock.c	2015-05-05 11:30:54.304097466 -0400
+@@ -4266,7 +4266,7 @@ VSockVmciDgramSendmsg(struct kiocb *kioc
+       goto out;
+    }
+ 
+-   memcpy_fromiovec(VMCI_DG_PAYLOAD(dg), msg->msg_iov, len);
++   memcpy_from_msg(VMCI_DG_PAYLOAD(dg), msg, len);
+ 
+    dg->dst = VMCI_MAKE_HANDLE(remoteAddr->svm_cid, remoteAddr->svm_port);
+    dg->src = VMCI_MAKE_HANDLE(vsk->localAddr.svm_cid, vsk->localAddr.svm_port);
diff --git a/app-emulation/vmware-modules/files/304-apic.patch b/app-emulation/vmware-modules/files/304-apic.patch
new file mode 100644
index 000000000000..66cd45933246
--- /dev/null
+++ b/app-emulation/vmware-modules/files/304-apic.patch
@@ -0,0 +1,12 @@
+diff --git a/vmmon-only/linux/hostif.c b/vmmon-only/linux/hostif.c
+index f1f4b10..c43242f 100644
+--- a/vmmon-only/linux/hostif.c
++++ b/vmmon-only/linux/hostif.c
+@@ -55,6 +55,7 @@
+ #include <linux/kthread.h>
+ #include <linux/wait.h>
+ 
++#include <asm/apic.h>
+ 
+ #include "vmware.h"
+ #include "x86apic.h"
diff --git a/app-emulation/vmware-modules/files/304-hardened.patch b/app-emulation/vmware-modules/files/304-hardened.patch
new file mode 100644
index 000000000000..cc3e04152877
--- /dev/null
+++ b/app-emulation/vmware-modules/files/304-hardened.patch
@@ -0,0 +1,113 @@
+diff --git a/vmmon-only/linux/driver.c b/vmmon-only/linux/driver.c
+index b21dd44..960c2aa 100644
+--- a/vmmon-only/linux/driver.c
++++ b/vmmon-only/linux/driver.c
+@@ -178,7 +178,22 @@ static struct vm_operations_struct vmuser_mops = {
+ #endif
+ };
+ 
+-static struct file_operations vmuser_fops;
++static struct file_operations vmuser_fops = {
++   .owner = THIS_MODULE,
++   .poll = LinuxDriverPoll,
++#ifdef HAVE_UNLOCKED_IOCTL
++   .unlocked_ioctl = LinuxDriver_UnlockedIoctl,
++#else
++   .ioctl = LinuxDriver_Ioctl,
++#endif
++#ifdef HAVE_COMPAT_IOCTL
++   .compat_ioctl = LinuxDriver_UnlockedIoctl,
++#endif
++   .open = LinuxDriver_Open,
++   .release = LinuxDriver_Close,
++   .mmap = LinuxDriverMmap
++};
++
+ static struct timer_list tscTimer;
+ 
+ /*
+@@ -357,27 +372,6 @@ init_module(void)
+    spin_lock_init(&linuxState.pollListLock);
+ #endif
+ 
+-   /*
+-    * Initialize the file_operations structure. Because this code is always
+-    * compiled as a module, this is fine to do it here and not in a static
+-    * initializer.
+-    */
+-
+-   memset(&vmuser_fops, 0, sizeof vmuser_fops);
+-   vmuser_fops.owner = THIS_MODULE;
+-   vmuser_fops.poll = LinuxDriverPoll;
+-#ifdef HAVE_UNLOCKED_IOCTL
+-   vmuser_fops.unlocked_ioctl = LinuxDriver_UnlockedIoctl;
+-#else
+-   vmuser_fops.ioctl = LinuxDriver_Ioctl;
+-#endif
+-#ifdef HAVE_COMPAT_IOCTL
+-   vmuser_fops.compat_ioctl = LinuxDriver_UnlockedIoctl;
+-#endif
+-   vmuser_fops.open = LinuxDriver_Open;
+-   vmuser_fops.release = LinuxDriver_Close;
+-   vmuser_fops.mmap = LinuxDriverMmap;
+-
+ #ifdef VMX86_DEVEL
+    devel_init_module();
+    linuxState.minor = 0;
+diff --git a/vmnet-only/driver.c b/vmnet-only/driver.c
+index b12b982..40bd4cf 100644
+--- a/vmnet-only/driver.c
++++ b/vmnet-only/driver.c
+@@ -165,7 +165,22 @@ static long  VNetFileOpUnlockedIoctl(struct file * filp,
+                                      unsigned int iocmd, unsigned long ioarg);
+ #endif
+ 
+-static struct file_operations vnetFileOps;
++static struct file_operations vnetFileOps = {
++   .owner = THIS_MODULE,
++   .read = VNetFileOpRead,
++   .write = VNetFileOpWrite,
++   .poll = VNetFileOpPoll,
++#ifdef HAVE_UNLOCKED_IOCTL
++   .unlocked_ioctl = VNetFileOpUnlockedIoctl,
++#else
++   .ioctl = VNetFileOpIoctl,
++#endif
++#ifdef HAVE_COMPAT_IOCTL
++   .compat_ioctl = VNetFileOpUnlockedIoctl,
++#endif
++   .open = VNetFileOpOpen,
++   .release = VNetFileOpClose
++};
+ 
+ /*
+  * Utility functions
+@@ -476,28 +491,6 @@ init_module(void)
+       goto err_proto;
+    }
+ 
+-   /*
+-    * Initialize the file_operations structure. Because this code is always
+-    * compiled as a module, this is fine to do it here and not in a static
+-    * initializer.
+-    */
+-
+-   memset(&vnetFileOps, 0, sizeof vnetFileOps);
+-   vnetFileOps.owner = THIS_MODULE;
+-   vnetFileOps.read = VNetFileOpRead;
+-   vnetFileOps.write = VNetFileOpWrite;
+-   vnetFileOps.poll = VNetFileOpPoll;
+-#ifdef HAVE_UNLOCKED_IOCTL
+-   vnetFileOps.unlocked_ioctl = VNetFileOpUnlockedIoctl;
+-#else
+-   vnetFileOps.ioctl = VNetFileOpIoctl;
+-#endif
+-#ifdef HAVE_COMPAT_IOCTL
+-   vnetFileOps.compat_ioctl = VNetFileOpUnlockedIoctl;
+-#endif
+-   vnetFileOps.open = VNetFileOpOpen;
+-   vnetFileOps.release = VNetFileOpClose;
+-
+    retval = register_chrdev(VNET_MAJOR_NUMBER, "vmnet", &vnetFileOps);
+    if (retval) {
+       LOG(0, (KERN_NOTICE "/dev/vmnet: could not register major device %d\n",
diff --git a/app-emulation/vmware-modules/files/304-makefile-include.patch b/app-emulation/vmware-modules/files/304-makefile-include.patch
new file mode 100644
index 000000000000..39c300030805
--- /dev/null
+++ b/app-emulation/vmware-modules/files/304-makefile-include.patch
@@ -0,0 +1,65 @@
+diff --git a/vmblock-only/Makefile.kernel b/vmblock-only/Makefile.kernel
+index ab7a727..e3ec9d2 100644
+--- a/vmblock-only/Makefile.kernel
++++ b/vmblock-only/Makefile.kernel
+@@ -19,7 +19,7 @@
+ 
+ INCLUDE += -I$(SRCROOT)/include
+ 
+-EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE)
++EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE) $(LINUXINCLUDE)
+ 
+ EXTRA_CFLAGS += $(call vm_check_build, $(AUTOCONF_DIR)/cachecreate.c, -DVMW_KMEMCR_HAS_DTOR, )
+ EXTRA_CFLAGS += $(call vm_check_build, $(AUTOCONF_DIR)/cachector.c,   -DVMW_KMEMCR_CTOR_HAS_3_ARGS, )
+diff --git a/vmci-only/Makefile.kernel b/vmci-only/Makefile.kernel
+index ba343ee..861ea83 100644
+--- a/vmci-only/Makefile.kernel
++++ b/vmci-only/Makefile.kernel
+@@ -21,7 +21,7 @@ CC_OPTS += -DVMCI
+ 
+ INCLUDE += -I$(SRCROOT)/shared -I$(SRCROOT)/common -I$(SRCROOT)/linux
+ 
+-EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE)
++EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE) $(LINUXINCLUDE)
+ 
+ obj-m += $(DRIVER).o
+ 
+diff --git a/vmmon-only/Makefile.kernel b/vmmon-only/Makefile.kernel
+index 8770d1d..c4746c3 100644
+--- a/vmmon-only/Makefile.kernel
++++ b/vmmon-only/Makefile.kernel
+@@ -22,7 +22,7 @@ CC_OPTS += -DVMMON -DVMCORE
+ INCLUDE := -I$(SRCROOT)/include -I$(SRCROOT)/common -I$(SRCROOT)/linux \
+ 	   -I$(SRCROOT)/vmcore
+ 
+-EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE)
++EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE) $(LINUXINCLUDE)
+ 
+ EXTRA_CFLAGS += $(call vm_check_build, $(SRCROOT)/autoconf/smpcall.c, -DVMW_HAVE_SMP_CALL_3ARG, )
+ 
+diff --git a/vmnet-only/Makefile.kernel b/vmnet-only/Makefile.kernel
+index d1e3133..665d428 100644
+--- a/vmnet-only/Makefile.kernel
++++ b/vmnet-only/Makefile.kernel
+@@ -19,7 +19,7 @@
+ 
+ INCLUDE := -I$(SRCROOT)
+ 
+-EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE)
++EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE) $(LINUXINCLUDE)
+ EXTRA_CFLAGS += $(call vm_check_build, $(SRCROOT)/netdev_has_net.c,-DVMW_NETDEV_HAS_NET, )
+ EXTRA_CFLAGS += $(call vm_check_build, $(SRCROOT)/netdev_has_dev_net.c,-DVMW_NETDEV_HAS_DEV_NET, )
+ EXTRA_CFLAGS += $(call vm_check_build, $(SRCROOT)/nfhook_uses_skb.c,-DVMW_NFHOOK_USES_SKB, )
+diff --git a/vsock-only/Makefile.kernel b/vsock-only/Makefile.kernel
+index b4629ee..264b8cb 100644
+--- a/vsock-only/Makefile.kernel
++++ b/vsock-only/Makefile.kernel
+@@ -25,7 +25,7 @@ INCLUDE += -I$(SRCROOT)/include
+ INCLUDE += -I$(SRCROOT)/linux
+ INCLUDE += -I$(SRCROOT)/common
+ 
+-EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE)
++EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE) $(LINUXINCLUDE)
+ EXTRA_CFLAGS += $(call vm_check_build, $(AUTOCONF_DIR)/netcreate_num_params.c, -DVMW_NETCREATE_KERNARG, )
+ 
+ 
diff --git a/app-emulation/vmware-modules/files/304-makefile-kernel-dir.patch b/app-emulation/vmware-modules/files/304-makefile-kernel-dir.patch
new file mode 100644
index 000000000000..1a647a3302d8
--- /dev/null
+++ b/app-emulation/vmware-modules/files/304-makefile-kernel-dir.patch
@@ -0,0 +1,85 @@
+diff --git a/vmblock-only/Makefile b/vmblock-only/Makefile
+index 2b81323..746c8b8 100644
+--- a/vmblock-only/Makefile
++++ b/vmblock-only/Makefile
+@@ -49,10 +49,10 @@ VM_UNAME = $(shell uname -r)
+ ifdef LINUXINCLUDE
+ HEADER_DIR = $(LINUXINCLUDE)
+ else
+-HEADER_DIR = /lib/modules/$(VM_UNAME)/build/include
++HEADER_DIR = $(KERNEL_DIR)
+ endif
+ 
+-BUILD_DIR = $(HEADER_DIR)/..
++BUILD_DIR = $(KBUILD_OUTPUT)
+ 
+ DRIVER := vmblock
+ PRODUCT := ws
+diff --git a/vmci-only/Makefile b/vmci-only/Makefile
+index 8e9c5be..6ec828b 100644
+--- a/vmci-only/Makefile
++++ b/vmci-only/Makefile
+@@ -49,10 +49,10 @@ VM_UNAME = $(shell uname -r)
+ ifdef LINUXINCLUDE
+ HEADER_DIR = $(LINUXINCLUDE)
+ else
+-HEADER_DIR = /lib/modules/$(VM_UNAME)/build/include
++HEADER_DIR = $(KERNEL_DIR)
+ endif
+ 
+-BUILD_DIR = $(HEADER_DIR)/..
++BUILD_DIR = $(KBUILD_OUTPUT)
+ 
+ DRIVER := vmci
+ PRODUCT := ws
+diff --git a/vmmon-only/Makefile b/vmmon-only/Makefile
+index 5bd867b..91a83d4 100644
+--- a/vmmon-only/Makefile
++++ b/vmmon-only/Makefile
+@@ -49,10 +49,10 @@ VM_UNAME = $(shell uname -r)
+ ifdef LINUXINCLUDE
+ HEADER_DIR = $(LINUXINCLUDE)
+ else
+-HEADER_DIR = /lib/modules/$(VM_UNAME)/build/include
++HEADER_DIR = $(KERNEL_DIR)
+ endif
+ 
+-BUILD_DIR = $(HEADER_DIR)/..
++BUILD_DIR = $(KBUILD_OUTPUT)
+ 
+ DRIVER := vmmon
+ PRODUCT := @@PRODUCT@@
+diff --git a/vmnet-only/Makefile b/vmnet-only/Makefile
+index d4eb73c..c7c6d38 100644
+--- a/vmnet-only/Makefile
++++ b/vmnet-only/Makefile
+@@ -49,10 +49,10 @@ VM_UNAME = $(shell uname -r)
+ ifdef LINUXINCLUDE
+ HEADER_DIR = $(LINUXINCLUDE)
+ else
+-HEADER_DIR = /lib/modules/$(VM_UNAME)/build/include
++HEADER_DIR = $(KERNEL_DIR)
+ endif
+ 
+-BUILD_DIR = $(HEADER_DIR)/..
++BUILD_DIR = $(KBUILD_OUTPUT)
+ 
+ DRIVER := vmnet
+ PRODUCT := @@PRODUCT@@
+diff --git a/vsock-only/Makefile b/vsock-only/Makefile
+index 93dd61d..9765696 100644
+--- a/vsock-only/Makefile
++++ b/vsock-only/Makefile
+@@ -49,10 +49,10 @@ VM_UNAME = $(shell uname -r)
+ ifdef LINUXINCLUDE
+ HEADER_DIR = $(LINUXINCLUDE)
+ else
+-HEADER_DIR = /lib/modules/$(VM_UNAME)/build/include
++HEADER_DIR = $(KERNEL_DIR)
+ endif
+ 
+-BUILD_DIR = $(HEADER_DIR)/..
++BUILD_DIR = $(KBUILD_OUTPUT)
+ 
+ DRIVER := vsock
+ PRODUCT := ws
diff --git a/app-emulation/vmware-modules/files/304-netdevice.patch b/app-emulation/vmware-modules/files/304-netdevice.patch
new file mode 100644
index 000000000000..35231a3205e3
--- /dev/null
+++ b/app-emulation/vmware-modules/files/304-netdevice.patch
@@ -0,0 +1,24 @@
+diff --git a/vmnet-only/compat_netdevice.h b/vmnet-only/compat_netdevice.h
+index 7a56304..9ff4548 100644
+--- a/vmnet-only/compat_netdevice.h
++++ b/vmnet-only/compat_netdevice.h
+@@ -47,6 +47,19 @@
+ #   define net_device device
+ #endif
+ 
++/* it looks like these have been removed from the kernel 3.1
++ * probably because the "transition" is considered complete.
++ * so to keep this source compatible we just redefine them like they were
++ * previously
++ */
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 1, 0)
++#define HAVE_ALLOC_NETDEV		/* feature macro: alloc_xxxdev
++					   functions are available. */
++#define HAVE_FREE_NETDEV		/* free_netdev() */
++#define HAVE_NETDEV_PRIV		/* netdev_priv() */
++#define HAVE_NETIF_QUEUE
++#define HAVE_NET_DEVICE_OPS
++#endif
+ 
+ /*
+  * SET_MODULE_OWNER appeared sometime during 2.3.x. It was setting
diff --git a/app-emulation/vmware-modules/metadata.xml b/app-emulation/vmware-modules/metadata.xml
index e5af2b1722dd..313c1627f097 100644
--- a/app-emulation/vmware-modules/metadata.xml
+++ b/app-emulation/vmware-modules/metadata.xml
@@ -2,6 +2,9 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>vmware</herd>
+	<longdescription>
+		VMware kernel modules.
+	</longdescription>
 	<use>
     	<flag name="pax_kernel">Apply patch needed for pax enabled kernels</flag>
     	<flag name="vmci">Build the Virtual Machine Communication Interface module; disable this if you want to use the module from the mainline kernel</flag>
diff --git a/app-emulation/vmware-modules/vmware-modules-271.3-r1.ebuild b/app-emulation/vmware-modules/vmware-modules-271.3-r1.ebuild
new file mode 100644
index 000000000000..1d24b19d4dba
--- /dev/null
+++ b/app-emulation/vmware-modules/vmware-modules-271.3-r1.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+
+inherit eutils flag-o-matic linux-info linux-mod user versionator udev
+
+PV_MAJOR=$(get_major_version)
+PV_MINOR=$(get_version_component_range 2)
+
+DESCRIPTION="VMware kernel modules"
+HOMEPAGE="http://www.vmware.com/"
+
+SRC_URI=""
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="pax_kernel"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	|| ( =app-emulation/vmware-player-5.0.${PV_MINOR}*
+	=app-emulation/vmware-workstation-9.0.${PV_MINOR}* )"
+
+S=${WORKDIR}
+
+pkg_setup() {
+	CONFIG_CHECK="~HIGH_RES_TIMERS"
+	if kernel_is ge 2 6 37 && kernel_is lt 2 6 39; then
+		CONFIG_CHECK="${CONFIG_CHECK} BKL"
+	fi
+
+	linux-info_pkg_setup
+
+	linux-mod_pkg_setup
+
+	VMWARE_GROUP=${VMWARE_GROUP:-vmware}
+
+	VMWARE_MODULE_LIST="vmblock vmci vmmon vmnet vsock"
+	VMWARE_MOD_DIR="${PN}-${PVR}"
+
+	BUILD_TARGETS="auto-build KERNEL_DIR=${KERNEL_DIR} KBUILD_OUTPUT=${KV_OUT_DIR}"
+
+	enewgroup "${VMWARE_GROUP}"
+	filter-flags -mfpmath=sse
+
+	for mod in ${VMWARE_MODULE_LIST}; do
+		MODULE_NAMES="${MODULE_NAMES} ${mod}(misc:${S}/${mod}-only)"
+	done
+}
+
+src_unpack() {
+	cd "${S}"
+	for mod in ${VMWARE_MODULE_LIST}; do
+		tar -xf /opt/vmware/lib/vmware/modules/source/${mod}.tar
+	done
+}
+
+src_prepare() {
+	epatch "${FILESDIR}/${PV_MAJOR}-makefile-kernel-dir.patch"
+	epatch "${FILESDIR}/${PV_MAJOR}-makefile-include.patch"
+	epatch "${FILESDIR}/${PV_MAJOR}-netdevice.patch"
+	use pax_kernel && epatch "${FILESDIR}/${PV_MAJOR}-hardened.patch"
+	epatch "${FILESDIR}/${PV_MAJOR}-apic.patch"
+	kernel_is ge 3 7 0 && epatch "${FILESDIR}/${PV_MAJOR}-putname.patch"
+
+	kernel_is ge 3 10 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.10-00-userns.patch"
+	kernel_is ge 3 10 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.10-01-create_proc_entry.patch"
+	kernel_is ge 3 10 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.10-02-getname.patch"
+	kernel_is ge 3 10 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.10-03-deprecated.patch"
+	kernel_is ge 3 10 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.10-04-unused-typedef.patch"
+	kernel_is ge 3 10 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.10-05-dentry.patch"
+	kernel_is ge 3 10 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.10-06-inode.patch"
+
+	# fixes a memcpy/memcmp bug in the hub code
+	kernel_is ge 3 10 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.10-07-hub.patch"
+
+	kernel_is ge 3 11 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.11-00-readdir.patch"
+	kernel_is ge 3 11 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.11-01-filldir.patch"
+	kernel_is ge 3 13 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.13-00-vmnet.patch"
+	kernel_is ge 3 15 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.15-00-readlink.patch"
+	kernel_is ge 3 15 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.15-01-vsock.patch"
+	kernel_is ge 3 17 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.17-00-netdev.patch"
+
+	kernel_is ge 3 19 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.19-00-vmnet-warning.patch"
+	kernel_is ge 3 19 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.19-01-vmblock-path.patch"
+	kernel_is ge 3 19 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.19-02-vmci.patch"
+	kernel_is ge 3 19 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.19-03-vmnet.patch"
+	kernel_is ge 3 19 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.19-04-vsock.patch"
+	kernel_is ge 3 19 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.19-05-vsock.patch"
+	kernel_is ge 3 19 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.19-06-vmci_qpair.patch"
+
+	# Allow user patches so they can support RC kernels and whatever else
+	epatch_user
+}
+
+src_install() {
+	linux-mod_src_install
+	local udevrules="${T}/60-vmware.rules"
+	cat > "${udevrules}" <<-EOF
+		KERNEL=="vmci",  GROUP="vmware", MODE="660"
+		KERNEL=="vmmon", GROUP="vmware", MODE="660"
+		KERNEL=="vsock", GROUP="vmware", MODE="660"
+	EOF
+	udev_dorules "${udevrules}"
+}
diff --git a/app-emulation/vmware-modules/vmware-modules-271.3.ebuild b/app-emulation/vmware-modules/vmware-modules-271.3.ebuild
deleted file mode 100644
index e284750c960c..000000000000
--- a/app-emulation/vmware-modules/vmware-modules-271.3.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-
-inherit eutils flag-o-matic linux-info linux-mod user versionator udev
-
-PV_MAJOR=$(get_major_version)
-PV_MINOR=$(get_version_component_range 2)
-
-DESCRIPTION="VMware kernel modules"
-HOMEPAGE="http://www.vmware.com/"
-
-SRC_URI=""
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="pax_kernel"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	|| ( =app-emulation/vmware-player-5.0.${PV_MINOR}*
-	=app-emulation/vmware-workstation-9.0.${PV_MINOR}* )"
-
-S=${WORKDIR}
-
-pkg_setup() {
-	CONFIG_CHECK="~HIGH_RES_TIMERS"
-	if kernel_is ge 2 6 37 && kernel_is lt 2 6 39; then
-		CONFIG_CHECK="${CONFIG_CHECK} BKL"
-	fi
-
-	linux-info_pkg_setup
-
-	linux-mod_pkg_setup
-
-	VMWARE_GROUP=${VMWARE_GROUP:-vmware}
-
-	VMWARE_MODULE_LIST="vmblock vmci vmmon vmnet vsock"
-	VMWARE_MOD_DIR="${PN}-${PVR}"
-
-	BUILD_TARGETS="auto-build KERNEL_DIR=${KERNEL_DIR} KBUILD_OUTPUT=${KV_OUT_DIR}"
-
-	enewgroup "${VMWARE_GROUP}"
-	filter-flags -mfpmath=sse
-
-	for mod in ${VMWARE_MODULE_LIST}; do
-		MODULE_NAMES="${MODULE_NAMES} ${mod}(misc:${S}/${mod}-only)"
-	done
-}
-
-src_unpack() {
-	cd "${S}"
-	for mod in ${VMWARE_MODULE_LIST}; do
-		tar -xf /opt/vmware/lib/vmware/modules/source/${mod}.tar
-	done
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${PV_MAJOR}-makefile-kernel-dir.patch"
-	epatch "${FILESDIR}/${PV_MAJOR}-makefile-include.patch"
-	epatch "${FILESDIR}/${PV_MAJOR}-netdevice.patch"
-	use pax_kernel && epatch "${FILESDIR}/hardened.patch"
-	epatch "${FILESDIR}/${PV_MAJOR}-apic.patch"
-	kernel_is ge 3 7 0 && epatch "${FILESDIR}/${PV_MAJOR}-putname.patch"
-	kernel_is ge 3 10 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.10.0.patch"
-	kernel_is ge 3 11 0 && epatch "${FILESDIR}/${PV_MAJOR}-filldir.patch"
-	kernel_is ge 3 12 0 && epatch "${FILESDIR}/${PV_MAJOR}-vfsfollowlink.patch"
-
-	# Allow user patches so they can support RC kernels and whatever else
-	epatch_user
-}
-
-src_install() {
-	linux-mod_src_install
-	local udevrules="${T}/60-vmware.rules"
-	cat > "${udevrules}" <<-EOF
-		KERNEL=="vmci",  GROUP="vmware", MODE=660
-		KERNEL=="vmmon", GROUP="vmware", MODE=660
-		KERNEL=="vsock", GROUP="vmware", MODE=660
-	EOF
-	udev_dorules "${udevrules}"
-}
diff --git a/app-emulation/vmware-modules/vmware-modules-279.1-r1.ebuild b/app-emulation/vmware-modules/vmware-modules-279.1-r1.ebuild
deleted file mode 100644
index 0c4018d34a2e..000000000000
--- a/app-emulation/vmware-modules/vmware-modules-279.1-r1.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils flag-o-matic linux-info linux-mod user versionator udev
-
-PV_MAJOR=$(get_major_version)
-PV_MINOR=$(get_version_component_range 2)
-
-DESCRIPTION="VMware kernel modules"
-HOMEPAGE="http://www.vmware.com/"
-
-SRC_URI=""
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="pax_kernel +vmci +vsock"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	|| ( =app-emulation/vmware-player-6.0.${PV_MINOR}*
-	=app-emulation/vmware-workstation-10.0.${PV_MINOR}* )"
-
-S=${WORKDIR}
-
-pkg_setup() {
-	CONFIG_CHECK="~HIGH_RES_TIMERS"
-	if kernel_is ge 2 6 37 && kernel_is lt 2 6 39; then
-		CONFIG_CHECK="${CONFIG_CHECK} BKL"
-	fi
-	if use vmci ; then
-		CONFIG_CHECK="${CONFIG_CHECK} !VMWARE_VMCI"
-	else
-		CONFIG_CHECK="${CONFIG_CHECK} VMWARE_VMCI"
-	fi
-	if use vsock ; then
-		CONFIG_CHECK="${CONFIG_CHECK} !VMWARE_VMCI_VSOCKETS"
-	else
-		CONFIG_CHECK="${CONFIG_CHECK} VMWARE_VMCI_VSOCKETS"
-	fi
-
-	linux-info_pkg_setup
-
-	linux-mod_pkg_setup
-
-	VMWARE_GROUP=${VMWARE_GROUP:-vmware}
-
-	VMWARE_MODULE_LIST_ALL="vmblock vmmon vmnet vmci vsock"
-	VMWARE_MODULE_LIST="vmblock vmmon vmnet"
-	use vmci && VMWARE_MODULE_LIST="${VMWARE_MODULE_LIST} vmci"
-	use vsock && VMWARE_MODULE_LIST="${VMWARE_MODULE_LIST} vsock"
-
-	VMWARE_MOD_DIR="${PN}-${PVR}"
-
-	BUILD_TARGETS="auto-build KERNEL_DIR=${KERNEL_DIR} KBUILD_OUTPUT=${KV_OUT_DIR}"
-
-	enewgroup "${VMWARE_GROUP}"
-	filter-flags -mfpmath=sse
-
-	for mod in ${VMWARE_MODULE_LIST}; do
-		MODULE_NAMES="${MODULE_NAMES} ${mod}(misc:${S}/${mod}-only)"
-	done
-}
-
-src_unpack() {
-	cd "${S}"
-	for mod in ${VMWARE_MODULE_LIST_ALL}; do
-		tar -xf /opt/vmware/lib/vmware/modules/source/${mod}.tar
-	done
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${PV_MAJOR}-makefile-kernel-dir.patch"
-	epatch "${FILESDIR}/${PV_MAJOR}-makefile-include.patch"
-	epatch "${FILESDIR}/${PV_MAJOR}-netdevice.patch"
-	use pax_kernel && epatch "${FILESDIR}/279-hardened.patch"
-	epatch "${FILESDIR}/${PV_MAJOR}-apic.patch"
-	kernel_is ge 3 7 0 && epatch "${FILESDIR}/${PV_MAJOR}-putname.patch"
-	kernel_is ge 3 10 0 && epatch "${FILESDIR}/${PV_MAJOR}-vmblock.patch"
-	kernel_is ge 3 11 0 && epatch "${FILESDIR}/${PV_MAJOR}-filldir.patch"
-	kernel_is ge 3 12 0 && epatch "${FILESDIR}/${PV_MAJOR}-vfsfollowlink.patch"
-
-	# Allow user patches so they can support RC kernels and whatever else
-	epatch_user
-}
-
-src_install() {
-	linux-mod_src_install
-	local udevrules="${T}/60-vmware.rules"
-	cat > "${udevrules}" <<-EOF
-		KERNEL=="vmci",  GROUP="vmware", MODE=660
-		KERNEL=="vmw_vmci",  GROUP="vmware", MODE=660
-		KERNEL=="vmmon", GROUP="vmware", MODE=660
-		KERNEL=="vsock", GROUP="vmware", MODE=660
-	EOF
-	udev_dorules "${udevrules}"
-}
diff --git a/app-emulation/vmware-modules/vmware-modules-279.2.ebuild b/app-emulation/vmware-modules/vmware-modules-279.2.ebuild
deleted file mode 100644
index 0c4018d34a2e..000000000000
--- a/app-emulation/vmware-modules/vmware-modules-279.2.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils flag-o-matic linux-info linux-mod user versionator udev
-
-PV_MAJOR=$(get_major_version)
-PV_MINOR=$(get_version_component_range 2)
-
-DESCRIPTION="VMware kernel modules"
-HOMEPAGE="http://www.vmware.com/"
-
-SRC_URI=""
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="pax_kernel +vmci +vsock"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	|| ( =app-emulation/vmware-player-6.0.${PV_MINOR}*
-	=app-emulation/vmware-workstation-10.0.${PV_MINOR}* )"
-
-S=${WORKDIR}
-
-pkg_setup() {
-	CONFIG_CHECK="~HIGH_RES_TIMERS"
-	if kernel_is ge 2 6 37 && kernel_is lt 2 6 39; then
-		CONFIG_CHECK="${CONFIG_CHECK} BKL"
-	fi
-	if use vmci ; then
-		CONFIG_CHECK="${CONFIG_CHECK} !VMWARE_VMCI"
-	else
-		CONFIG_CHECK="${CONFIG_CHECK} VMWARE_VMCI"
-	fi
-	if use vsock ; then
-		CONFIG_CHECK="${CONFIG_CHECK} !VMWARE_VMCI_VSOCKETS"
-	else
-		CONFIG_CHECK="${CONFIG_CHECK} VMWARE_VMCI_VSOCKETS"
-	fi
-
-	linux-info_pkg_setup
-
-	linux-mod_pkg_setup
-
-	VMWARE_GROUP=${VMWARE_GROUP:-vmware}
-
-	VMWARE_MODULE_LIST_ALL="vmblock vmmon vmnet vmci vsock"
-	VMWARE_MODULE_LIST="vmblock vmmon vmnet"
-	use vmci && VMWARE_MODULE_LIST="${VMWARE_MODULE_LIST} vmci"
-	use vsock && VMWARE_MODULE_LIST="${VMWARE_MODULE_LIST} vsock"
-
-	VMWARE_MOD_DIR="${PN}-${PVR}"
-
-	BUILD_TARGETS="auto-build KERNEL_DIR=${KERNEL_DIR} KBUILD_OUTPUT=${KV_OUT_DIR}"
-
-	enewgroup "${VMWARE_GROUP}"
-	filter-flags -mfpmath=sse
-
-	for mod in ${VMWARE_MODULE_LIST}; do
-		MODULE_NAMES="${MODULE_NAMES} ${mod}(misc:${S}/${mod}-only)"
-	done
-}
-
-src_unpack() {
-	cd "${S}"
-	for mod in ${VMWARE_MODULE_LIST_ALL}; do
-		tar -xf /opt/vmware/lib/vmware/modules/source/${mod}.tar
-	done
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${PV_MAJOR}-makefile-kernel-dir.patch"
-	epatch "${FILESDIR}/${PV_MAJOR}-makefile-include.patch"
-	epatch "${FILESDIR}/${PV_MAJOR}-netdevice.patch"
-	use pax_kernel && epatch "${FILESDIR}/279-hardened.patch"
-	epatch "${FILESDIR}/${PV_MAJOR}-apic.patch"
-	kernel_is ge 3 7 0 && epatch "${FILESDIR}/${PV_MAJOR}-putname.patch"
-	kernel_is ge 3 10 0 && epatch "${FILESDIR}/${PV_MAJOR}-vmblock.patch"
-	kernel_is ge 3 11 0 && epatch "${FILESDIR}/${PV_MAJOR}-filldir.patch"
-	kernel_is ge 3 12 0 && epatch "${FILESDIR}/${PV_MAJOR}-vfsfollowlink.patch"
-
-	# Allow user patches so they can support RC kernels and whatever else
-	epatch_user
-}
-
-src_install() {
-	linux-mod_src_install
-	local udevrules="${T}/60-vmware.rules"
-	cat > "${udevrules}" <<-EOF
-		KERNEL=="vmci",  GROUP="vmware", MODE=660
-		KERNEL=="vmw_vmci",  GROUP="vmware", MODE=660
-		KERNEL=="vmmon", GROUP="vmware", MODE=660
-		KERNEL=="vsock", GROUP="vmware", MODE=660
-	EOF
-	udev_dorules "${udevrules}"
-}
diff --git a/app-emulation/vmware-modules/vmware-modules-279.3.ebuild b/app-emulation/vmware-modules/vmware-modules-279.3.ebuild
deleted file mode 100644
index 0c4018d34a2e..000000000000
--- a/app-emulation/vmware-modules/vmware-modules-279.3.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils flag-o-matic linux-info linux-mod user versionator udev
-
-PV_MAJOR=$(get_major_version)
-PV_MINOR=$(get_version_component_range 2)
-
-DESCRIPTION="VMware kernel modules"
-HOMEPAGE="http://www.vmware.com/"
-
-SRC_URI=""
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="pax_kernel +vmci +vsock"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	|| ( =app-emulation/vmware-player-6.0.${PV_MINOR}*
-	=app-emulation/vmware-workstation-10.0.${PV_MINOR}* )"
-
-S=${WORKDIR}
-
-pkg_setup() {
-	CONFIG_CHECK="~HIGH_RES_TIMERS"
-	if kernel_is ge 2 6 37 && kernel_is lt 2 6 39; then
-		CONFIG_CHECK="${CONFIG_CHECK} BKL"
-	fi
-	if use vmci ; then
-		CONFIG_CHECK="${CONFIG_CHECK} !VMWARE_VMCI"
-	else
-		CONFIG_CHECK="${CONFIG_CHECK} VMWARE_VMCI"
-	fi
-	if use vsock ; then
-		CONFIG_CHECK="${CONFIG_CHECK} !VMWARE_VMCI_VSOCKETS"
-	else
-		CONFIG_CHECK="${CONFIG_CHECK} VMWARE_VMCI_VSOCKETS"
-	fi
-
-	linux-info_pkg_setup
-
-	linux-mod_pkg_setup
-
-	VMWARE_GROUP=${VMWARE_GROUP:-vmware}
-
-	VMWARE_MODULE_LIST_ALL="vmblock vmmon vmnet vmci vsock"
-	VMWARE_MODULE_LIST="vmblock vmmon vmnet"
-	use vmci && VMWARE_MODULE_LIST="${VMWARE_MODULE_LIST} vmci"
-	use vsock && VMWARE_MODULE_LIST="${VMWARE_MODULE_LIST} vsock"
-
-	VMWARE_MOD_DIR="${PN}-${PVR}"
-
-	BUILD_TARGETS="auto-build KERNEL_DIR=${KERNEL_DIR} KBUILD_OUTPUT=${KV_OUT_DIR}"
-
-	enewgroup "${VMWARE_GROUP}"
-	filter-flags -mfpmath=sse
-
-	for mod in ${VMWARE_MODULE_LIST}; do
-		MODULE_NAMES="${MODULE_NAMES} ${mod}(misc:${S}/${mod}-only)"
-	done
-}
-
-src_unpack() {
-	cd "${S}"
-	for mod in ${VMWARE_MODULE_LIST_ALL}; do
-		tar -xf /opt/vmware/lib/vmware/modules/source/${mod}.tar
-	done
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${PV_MAJOR}-makefile-kernel-dir.patch"
-	epatch "${FILESDIR}/${PV_MAJOR}-makefile-include.patch"
-	epatch "${FILESDIR}/${PV_MAJOR}-netdevice.patch"
-	use pax_kernel && epatch "${FILESDIR}/279-hardened.patch"
-	epatch "${FILESDIR}/${PV_MAJOR}-apic.patch"
-	kernel_is ge 3 7 0 && epatch "${FILESDIR}/${PV_MAJOR}-putname.patch"
-	kernel_is ge 3 10 0 && epatch "${FILESDIR}/${PV_MAJOR}-vmblock.patch"
-	kernel_is ge 3 11 0 && epatch "${FILESDIR}/${PV_MAJOR}-filldir.patch"
-	kernel_is ge 3 12 0 && epatch "${FILESDIR}/${PV_MAJOR}-vfsfollowlink.patch"
-
-	# Allow user patches so they can support RC kernels and whatever else
-	epatch_user
-}
-
-src_install() {
-	linux-mod_src_install
-	local udevrules="${T}/60-vmware.rules"
-	cat > "${udevrules}" <<-EOF
-		KERNEL=="vmci",  GROUP="vmware", MODE=660
-		KERNEL=="vmw_vmci",  GROUP="vmware", MODE=660
-		KERNEL=="vmmon", GROUP="vmware", MODE=660
-		KERNEL=="vsock", GROUP="vmware", MODE=660
-	EOF
-	udev_dorules "${udevrules}"
-}
diff --git a/app-emulation/vmware-modules/vmware-modules-279.6.ebuild b/app-emulation/vmware-modules/vmware-modules-279.6.ebuild
new file mode 100644
index 000000000000..356ead7dc064
--- /dev/null
+++ b/app-emulation/vmware-modules/vmware-modules-279.6.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils flag-o-matic linux-info linux-mod user versionator udev
+
+PV_MAJOR=$(get_major_version)
+PV_MINOR=$(get_version_component_range 2)
+
+DESCRIPTION="VMware kernel modules"
+HOMEPAGE="http://www.vmware.com/"
+
+SRC_URI=""
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="pax_kernel +vmci +vsock"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	|| ( =app-emulation/vmware-player-6.0.${PV_MINOR}*
+	=app-emulation/vmware-workstation-10.0.${PV_MINOR}* )"
+
+S=${WORKDIR}
+
+pkg_setup() {
+	CONFIG_CHECK="~HIGH_RES_TIMERS"
+	if kernel_is ge 2 6 37 && kernel_is lt 2 6 39; then
+		CONFIG_CHECK="${CONFIG_CHECK} BKL"
+	fi
+	if use vmci ; then
+		CONFIG_CHECK="${CONFIG_CHECK} !VMWARE_VMCI"
+	else
+		CONFIG_CHECK="${CONFIG_CHECK} VMWARE_VMCI"
+	fi
+	if use vsock ; then
+		CONFIG_CHECK="${CONFIG_CHECK} !VMWARE_VMCI_VSOCKETS"
+	else
+		CONFIG_CHECK="${CONFIG_CHECK} VMWARE_VMCI_VSOCKETS"
+	fi
+
+	linux-info_pkg_setup
+
+	linux-mod_pkg_setup
+
+	VMWARE_GROUP=${VMWARE_GROUP:-vmware}
+
+	VMWARE_MODULE_LIST_ALL="vmblock vmmon vmnet vmci vsock"
+	VMWARE_MODULE_LIST="vmblock vmmon vmnet"
+	use vmci && VMWARE_MODULE_LIST="${VMWARE_MODULE_LIST} vmci"
+	use vsock && VMWARE_MODULE_LIST="${VMWARE_MODULE_LIST} vsock"
+
+	VMWARE_MOD_DIR="${PN}-${PVR}"
+
+	BUILD_TARGETS="auto-build KERNEL_DIR=${KERNEL_DIR} KBUILD_OUTPUT=${KV_OUT_DIR}"
+
+	enewgroup "${VMWARE_GROUP}"
+	filter-flags -mfpmath=sse
+
+	for mod in ${VMWARE_MODULE_LIST}; do
+		MODULE_NAMES="${MODULE_NAMES} ${mod}(misc:${S}/${mod}-only)"
+	done
+}
+
+src_unpack() {
+	cd "${S}"
+	for mod in ${VMWARE_MODULE_LIST_ALL}; do
+		tar -xf /opt/vmware/lib/vmware/modules/source/${mod}.tar
+	done
+}
+
+src_prepare() {
+	epatch "${FILESDIR}/${PV_MAJOR}-makefile-kernel-dir.patch"
+	epatch "${FILESDIR}/${PV_MAJOR}-makefile-include.patch"
+	epatch "${FILESDIR}/${PV_MAJOR}-netdevice.patch"
+	use pax_kernel && epatch "${FILESDIR}/279-hardened.patch"
+	epatch "${FILESDIR}/${PV_MAJOR}-apic.patch"
+	kernel_is ge 3 7 0 && epatch "${FILESDIR}/${PV_MAJOR}-putname.patch"
+	kernel_is ge 3 10 0 && epatch "${FILESDIR}/${PV_MAJOR}-vmblock.patch"
+	kernel_is ge 3 10 0 && epatch "${FILESDIR}/${PV_MAJOR}-5.10-00-userns.patch"
+	kernel_is ge 3 10 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.10-01-getname.patch"
+	#kernel_is ge 3 10 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.10-03-deprecated.patch"
+	kernel_is ge 3 10 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.10-04-dentry.patch"
+	kernel_is ge 3 10 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.10-05-inode.patch"
+	kernel_is ge 3 11 0 && epatch "${FILESDIR}/${PV_MAJOR}-filldir.patch"
+	kernel_is ge 3 15 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.15-00-readlink.patch"
+	kernel_is ge 3 15 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.15-01-vsock.patch"
+	kernel_is ge 3 17 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.17-00-netdev.patch"
+	kernel_is ge 3 18 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.18-00-version-redefined.patch"
+	kernel_is ge 3 19 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.19-00-compat-namei.patch"
+	kernel_is ge 3 19 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.19-01-dentry.patch"
+	kernel_is ge 3 19 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.19-02-vmblock-path.patch"
+	kernel_is ge 3 19 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.19-03-iovec.patch"
+	kernel_is ge 3 19 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.19-04-iovec.patch"
+	kernel_is ge 3 19 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.19-05-vmci_qpair.patch"
+	kernel_is ge 3 19 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.19-06-vsock.patch"
+	kernel_is ge 3 19 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.19-07-vsock.patch"
+
+	# Allow user patches so they can support RC kernels and whatever else
+	epatch_user
+}
+
+src_install() {
+	linux-mod_src_install
+	local udevrules="${T}/60-vmware.rules"
+	cat > "${udevrules}" <<-EOF
+		KERNEL=="vmci",  GROUP="vmware", MODE="660"
+		KERNEL=="vmw_vmci",  GROUP="vmware", MODE="660"
+		KERNEL=="vmmon", GROUP="vmware", MODE="660"
+		KERNEL=="vsock", GROUP="vmware", MODE="660"
+	EOF
+	udev_dorules "${udevrules}"
+}
diff --git a/app-emulation/vmware-modules/vmware-modules-304.2.ebuild b/app-emulation/vmware-modules/vmware-modules-304.2.ebuild
new file mode 100644
index 000000000000..5406bf872176
--- /dev/null
+++ b/app-emulation/vmware-modules/vmware-modules-304.2.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils flag-o-matic linux-info linux-mod user versionator udev
+
+PV_MAJOR=$(get_major_version)
+PV_MINOR=$(get_version_component_range 2)
+
+DESCRIPTION="VMware kernel modules"
+HOMEPAGE="http://www.vmware.com/"
+
+SRC_URI=""
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="pax_kernel +vmci +vsock"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	|| ( =app-emulation/vmware-player-7.1.${PV_MINOR}*
+	=app-emulation/vmware-workstation-11.1.${PV_MINOR}* )"
+
+S=${WORKDIR}
+
+pkg_setup() {
+	CONFIG_CHECK="~HIGH_RES_TIMERS"
+	if kernel_is ge 2 6 37 && kernel_is lt 2 6 39; then
+		CONFIG_CHECK="${CONFIG_CHECK} BKL"
+	fi
+	if use vmci ; then
+		CONFIG_CHECK="${CONFIG_CHECK} !VMWARE_VMCI"
+	else
+		CONFIG_CHECK="${CONFIG_CHECK} VMWARE_VMCI"
+	fi
+	if use vsock ; then
+		CONFIG_CHECK="${CONFIG_CHECK} !VMWARE_VMCI_VSOCKETS"
+	else
+		CONFIG_CHECK="${CONFIG_CHECK} VMWARE_VMCI_VSOCKETS"
+	fi
+
+	linux-info_pkg_setup
+
+	linux-mod_pkg_setup
+
+	VMWARE_GROUP=${VMWARE_GROUP:-vmware}
+
+	VMWARE_MODULE_LIST_ALL="vmblock vmmon vmnet vmci vsock"
+	VMWARE_MODULE_LIST="vmblock vmmon vmnet"
+	use vmci && VMWARE_MODULE_LIST="${VMWARE_MODULE_LIST} vmci"
+	use vsock && VMWARE_MODULE_LIST="${VMWARE_MODULE_LIST} vsock"
+
+	VMWARE_MOD_DIR="${PN}-${PVR}"
+
+	BUILD_TARGETS="auto-build KERNEL_DIR=${KERNEL_DIR} KBUILD_OUTPUT=${KV_OUT_DIR}"
+
+	enewgroup "${VMWARE_GROUP}"
+	filter-flags -mfpmath=sse
+
+	for mod in ${VMWARE_MODULE_LIST}; do
+		MODULE_NAMES="${MODULE_NAMES} ${mod}(misc:${S}/${mod}-only)"
+	done
+}
+
+src_unpack() {
+	cd "${S}"
+	for mod in ${VMWARE_MODULE_LIST_ALL}; do
+		tar -xf /opt/vmware/lib/vmware/modules/source/${mod}.tar
+	done
+}
+
+src_prepare() {
+	epatch "${FILESDIR}/${PV_MAJOR}-makefile-kernel-dir.patch"
+	epatch "${FILESDIR}/${PV_MAJOR}-makefile-include.patch"
+	epatch "${FILESDIR}/${PV_MAJOR}-netdevice.patch"
+	use pax_kernel && epatch "${FILESDIR}/${PV_MAJOR}-hardened.patch"
+	epatch "${FILESDIR}/${PV_MAJOR}-apic.patch"
+
+	kernel_is ge 3 10 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.10-00-dentry.patch"
+	kernel_is ge 3 10 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.10-01-inode.patch"
+	kernel_is ge 3 10 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.10-02-control.patch"
+	kernel_is ge 3 11 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.10-03-inline.patch"
+	kernel_is ge 3 11 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.11-00-readdir.patch"
+	kernel_is ge 3 11 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.11-01-filldir.patch"
+	kernel_is ge 3 15 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.15-00-vsock.patch"
+	kernel_is ge 3 18 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.18-00-version-redefined.patch"
+	kernel_is ge 3 19 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.19-00-compat-namei.patch"
+	#kernel_is ge 3 19 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.19-01-dentry.patch"
+	kernel_is ge 3 19 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.19-02-vmblock-path.patch"
+	#kernel_is ge 3 19 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.19-03-iovec.patch"
+	kernel_is ge 3 19 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.19-04-iovec.patch"
+	kernel_is ge 3 19 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.19-05-vmci_qpair.patch"
+	kernel_is ge 3 19 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.19-06-vsock.patch"
+	kernel_is ge 3 19 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.19-07-vsock.patch"
+
+	# Allow user patches so they can support RC kernels and whatever else
+	epatch_user
+}
+
+src_install() {
+	linux-mod_src_install
+	local udevrules="${T}/60-vmware.rules"
+	cat > "${udevrules}" <<-EOF
+		KERNEL=="vmci",  GROUP="vmware", MODE="660"
+		KERNEL=="vmw_vmci",  GROUP="vmware", MODE="660"
+		KERNEL=="vmmon", GROUP="vmware", MODE="660"
+		KERNEL=="vsock", GROUP="vmware", MODE="660"
+	EOF
+	udev_dorules "${udevrules}"
+}
diff --git a/app-emulation/vmware-player/Manifest b/app-emulation/vmware-player/Manifest
index 23833ca2ba75..834788b94a0d 100644
--- a/app-emulation/vmware-player/Manifest
+++ b/app-emulation/vmware-player/Manifest
@@ -1,8 +1,5 @@
 DIST VMware-Player-5.0.3-1410761.i386.bundle.tar 220047360 SHA256 cf821022b093c9aef768596131085d0c5adcef25339dddefbc0a214e00645a97 SHA512 4660efa92671b33cd701dc37b86d8a18a84acd4e85b660f6e4e9f60c71bbe744574eb07fd563d6fda2626768eeaa9ee7c64c2f61f9b3cdd0eab666ec62abde48 WHIRLPOOL 39e4a85b176f27c0019ab3d8fde2f91973932e81896b006845f7059a4306ed324b7422857cfa4896c7ef216cca937ae238fdbcee4e5c72df86e49a0d52411652
 DIST VMware-Player-5.0.3-1410761.x86_64.bundle.tar 185425920 SHA256 e2ef55702e06646a4465baa16ddb742dd7f9e8021e8f53670a33d7e8f996c678 SHA512 8560ecfb1525d991ac0d3f665c8a89aae81d429cf94ff56fbd22fbd9f41f5a03a56d874811876aaae8042e81f4b57a298e4d29327dab94492c5ded8a58b81071 WHIRLPOOL 8f1c8997e0e2ff90e227474d9b7791b702d180af9a669a9de62a4bc6e373468bca1d7fa8ea9e28e5491992f2b9b0d6d1370a856751422190cafcd6c04682ed07
-DIST VMware-Player-6.0.1-1379776.i386.bundle.tar 232140800 SHA256 3f9bd8b5df203c6e5a2022f0a0c8dfe9fcae17f70f269a9bfe3790be171fe95b SHA512 525fbcc9dfa6856ce2ca926ac3d8b87beca96695b131eb87623756d8b751165b9b693e5d4f0fde5ad752f56c548d9879e983e7fd96d64c9b13357471697e8f61 WHIRLPOOL ab9b0ff567eb91726ba5ac17d2eb1dfcf748f3dff2cfa3c62bfd34b33cfc43d6d9871fe0f5940dc8a58ce62c7151c7153e1699ac319658358fc1f4ae8d85cc55
-DIST VMware-Player-6.0.1-1379776.x86_64.bundle.tar 199587840 SHA256 f108a03892ee180ecff98c59dbe1ea014a23e6fa6dafc83169972c9c300fb69f SHA512 b5218881d7e331aee7e6b834b32d262d09e1e9e8cd33ced0b38a815e2085ab935974980ac15475ce1678fc36816ebc408dced71a200c7642015313dcff34356e WHIRLPOOL 40220941297512a58807fe1a8c69b375ff48835615dacf658e97bc39a00b4d9244db5016f1f2b2e2ccb7524b92f7e4943419a7eb8c6d19a947ddb3db52cfcd3d
-DIST VMware-Player-6.0.2-1744117.i386.bundle.tar 233226240 SHA256 b3314b1b4658fff3a3bd821381e141b4039bc6925088d509f073dfdc19f78937 SHA512 da912c898306a50392cdf814f523321962e70d6d2afabe2cbcec35e581c60d1ba3e28fdf11f4e83306c9057038a7ab8d1d1e2e4281068fdb9997f6d1aaf34e74 WHIRLPOOL bdd81a3620a56a689f48443d8cb0fc5dbde8ec5d996fcff5e38a983eb4fa5d6bfb73658f1b15837f6c4272578b4f90875f9393db3318ee9ad84cf1266fbcbed5
-DIST VMware-Player-6.0.2-1744117.x86_64.bundle.tar 200560640 SHA256 6e8ef0982303128fe2d41f59cc6d4031edcc85f4dcc8ba20e17df9837a4c972f SHA512 8e71b59e5152ec6a21e2bc87e11462fbc9f25a27ea48e73ace6daa198bc75fb0cf49d895755abe10b3fb52df0ec0586fd00e8bd51c461b7a638e745c6bbd996e WHIRLPOOL a9af879ce290a9f0ac2fb5f6af425e509455d6fb553156250013a941e782c416435be7326498ed544ee81623fbac4a5924940cc05dd56325c0d8e4c71c44b0b8
-DIST VMware-Player-6.0.3-1895310.i386.bundle.tar 233216000 SHA256 7e7afedc7cef2c10e018924e26143dfea4e7bbe1de8fc3f30ff6d6ffe681a57b SHA512 3d00bfc0f1978ece042d5dca72bebcbb37761a83678ae645c77c8e87ca4b1b7bce63b857c9f455b0dce8fda1ba1b6c2b787794bebf5ed1faa8dced78316cc060 WHIRLPOOL c6284b025f0a772674987cef231b43bb32d3e0605c575a4b8156a2c2720f5c6c35eef496495d80ed83c9a8b49d16a3d26d8c333e1eabcf1d2cf55b4775a56b17
-DIST VMware-Player-6.0.3-1895310.x86_64.bundle.tar 200550400 SHA256 6ab3d3c718d2973f486b69dfe9ad70c4a091640454f8ac8a78d505b2f57d59af SHA512 492f48e73eaf820645e6db99672106b5cc6148b53266729b85011844300b97d9cf2c36305d28ec77cc61ec70fe2883322bd23254ba3495b95bb6d92021b38036 WHIRLPOOL 9e9d8bebd05b8a4c4d2f940d6daf1305d16de31cc096f7b2ec966e9610b37cda991a2fea9f3249bbe679b6dc25c52c119a9992a94cca54fdc786737387f37b04
+DIST VMware-Player-6.0.6-2700073.i386.bundle.tar 230184960 SHA256 f62c97771b9f9b3d62204cb72472bd3b4cf856f5bdc3fd7ea68f786127b4f98e SHA512 91ce0861eab7a122d9bca8f8899f18ed7f59effffb20ae2b6a4d1a021aa57cc179e0f8b7aebeeea857c10a8b31deffcb1649cb79e64a927bb80905746dbaaefd WHIRLPOOL 90c51b72ecdf1b1fa9575e74d196e5d3e25cc4433fc74df283ad57e5953d7671c848d2e816cd19ca7216c2af9065c092c29a66c3d42247cb952a1890d99458bf
+DIST VMware-Player-6.0.6-2700073.x86_64.bundle.tar 198164480 SHA256 090f93c404d01475b4fc55db529f14e88457bde40b20140b5133a43e391dd866 SHA512 abdb5a6e6162ec297bdea4616f40ff734967fb04838ed75103ad7051a6120e4d4510f9fc192bd874382885e48444af4b00fc2dcd5f6d05929c615e5c379ae212 WHIRLPOOL 386b3a2b928ddf4ce149c1738412c46e0292648e54537b1164197d89b5dd5d86448fbe659141c2ca8d6f55ccd709e629d60b20311c69333bd2b33162a59f3a88
+DIST VMware-Player-7.1.2-2780323.x86_64.bundle.tar 211128320 SHA256 baa60996b3bed5ba89db1a0fd9a2cc263ea07ac1cf2d6f3aab68c728cc960efc SHA512 c4465a4cbf97b9fe3aa2d6a1c690047251a37929867e0b3cbddf6643b59ef8e618809973543150e6cd9a3bdba0c9c04fb55171616c2179a0ff80ee7302e07fc2 WHIRLPOOL f0bc539647a5f3838a486d62506881f752e426e2e7299b20f2828c285cb041c777f93f3d29627ff4187edfd92e43e37e70647828ce537adb67db0fe3e99fccb0
diff --git a/app-emulation/vmware-player/files/vmware-10.0.rc b/app-emulation/vmware-player/files/vmware-10.0.rc
new file mode 100644
index 000000000000..82e45f1bd66d
--- /dev/null
+++ b/app-emulation/vmware-player/files/vmware-10.0.rc
@@ -0,0 +1,37 @@
+#!/sbin/runscript
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-workstation/files/vmware-10.0.rc,v 1.2 2014/04/26 20:36:17 dilfridge Exp $
+
+depend() {
+	need localmount
+	use net
+}
+
+start() {
+	ebegin Starting VMware USB Arbitrator
+	#start-stop-daemon --start --exec @@BINDIR@@/vmware-usbarbitrator
+	@@BINDIR@@/vmware-usbarbitrator 
+	eend $?
+	ebegin Starting VMware services
+	modprobe -v vmci || modprobe -v vmw_vmci
+	eend $?
+	modprobe -av vmmon vmci vsock vmblock vmnet 
+	eend $?
+	@@BINDIR@@/vmware-networks --start
+	eend $?
+}
+
+stop() {
+	ebegin Stopping VMware USB Arbitrator
+	#start-stop-daemon --stop --exec @@BINDIR@@/vmware-usbarbitrator
+	killall --wait @@BINDIR@@/vmware-usbarbitrator 
+	eend $?
+	@@BINDIR@@/vmware-networks --stop 
+	eend $?
+	ebegin Stopping VMware services
+	modprobe -rv vsock vmmon vmblock vmnet
+	eend $?
+	modprobe -rv vmci || modprobe -rv vmw_vmci
+	eend $?
+}
diff --git a/app-emulation/vmware-player/files/vmware-11.0.rc b/app-emulation/vmware-player/files/vmware-11.0.rc
new file mode 100644
index 000000000000..2a827bc1ae31
--- /dev/null
+++ b/app-emulation/vmware-player/files/vmware-11.0.rc
@@ -0,0 +1,44 @@
+#!/sbin/runscript
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+depend() {
+	need localmount
+	use net
+}
+
+start() {
+	ebegin Starting VMware USB Arbitrator
+	#start-stop-daemon --start --exec @@BINDIR@@/vmware-usbarbitrator
+	@@BINDIR@@/vmware-usbarbitrator 
+	eend $?
+	ebegin Starting VMware services
+	
+	# quiet for vmci because it may not be there
+	modprobe -vq vmci || modprobe -v vmw_vmci
+	eend $?
+	
+	# vmci or vmw_vmci was loaded by the previous modprobe 
+	# no need to do it here
+	modprobe -av vmmon vsock vmblock vmnet 
+	eend $?
+	@@BINDIR@@/vmware-networks --start
+	eend $?
+}
+
+stop() {
+	ebegin Stopping VMware USB Arbitrator
+	#start-stop-daemon --stop --exec @@BINDIR@@/vmware-usbarbitrator
+	killall --wait @@BINDIR@@/vmware-usbarbitrator 
+	eend $?
+	@@BINDIR@@/vmware-networks --stop 
+	eend $?
+	ebegin Stopping VMware services
+	modprobe -rv vsock vmmon vmblock vmnet
+	eend $?
+	
+	# quiet for vmci because it may not be there
+	modprobe -rvq vmci || modprobe -rv vmw_vmci
+	eend $?
+}
diff --git a/app-emulation/vmware-player/files/vmware-11.1.rc b/app-emulation/vmware-player/files/vmware-11.1.rc
new file mode 100644
index 000000000000..2a827bc1ae31
--- /dev/null
+++ b/app-emulation/vmware-player/files/vmware-11.1.rc
@@ -0,0 +1,44 @@
+#!/sbin/runscript
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+depend() {
+	need localmount
+	use net
+}
+
+start() {
+	ebegin Starting VMware USB Arbitrator
+	#start-stop-daemon --start --exec @@BINDIR@@/vmware-usbarbitrator
+	@@BINDIR@@/vmware-usbarbitrator 
+	eend $?
+	ebegin Starting VMware services
+	
+	# quiet for vmci because it may not be there
+	modprobe -vq vmci || modprobe -v vmw_vmci
+	eend $?
+	
+	# vmci or vmw_vmci was loaded by the previous modprobe 
+	# no need to do it here
+	modprobe -av vmmon vsock vmblock vmnet 
+	eend $?
+	@@BINDIR@@/vmware-networks --start
+	eend $?
+}
+
+stop() {
+	ebegin Stopping VMware USB Arbitrator
+	#start-stop-daemon --stop --exec @@BINDIR@@/vmware-usbarbitrator
+	killall --wait @@BINDIR@@/vmware-usbarbitrator 
+	eend $?
+	@@BINDIR@@/vmware-networks --stop 
+	eend $?
+	ebegin Stopping VMware services
+	modprobe -rv vsock vmmon vmblock vmnet
+	eend $?
+	
+	# quiet for vmci because it may not be there
+	modprobe -rvq vmci || modprobe -rv vmw_vmci
+	eend $?
+}
diff --git a/app-emulation/vmware-player/files/vmware-11.2.rc b/app-emulation/vmware-player/files/vmware-11.2.rc
new file mode 100644
index 000000000000..2a827bc1ae31
--- /dev/null
+++ b/app-emulation/vmware-player/files/vmware-11.2.rc
@@ -0,0 +1,44 @@
+#!/sbin/runscript
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+depend() {
+	need localmount
+	use net
+}
+
+start() {
+	ebegin Starting VMware USB Arbitrator
+	#start-stop-daemon --start --exec @@BINDIR@@/vmware-usbarbitrator
+	@@BINDIR@@/vmware-usbarbitrator 
+	eend $?
+	ebegin Starting VMware services
+	
+	# quiet for vmci because it may not be there
+	modprobe -vq vmci || modprobe -v vmw_vmci
+	eend $?
+	
+	# vmci or vmw_vmci was loaded by the previous modprobe 
+	# no need to do it here
+	modprobe -av vmmon vsock vmblock vmnet 
+	eend $?
+	@@BINDIR@@/vmware-networks --start
+	eend $?
+}
+
+stop() {
+	ebegin Stopping VMware USB Arbitrator
+	#start-stop-daemon --stop --exec @@BINDIR@@/vmware-usbarbitrator
+	killall --wait @@BINDIR@@/vmware-usbarbitrator 
+	eend $?
+	@@BINDIR@@/vmware-networks --stop 
+	eend $?
+	ebegin Stopping VMware services
+	modprobe -rv vsock vmmon vmblock vmnet
+	eend $?
+	
+	# quiet for vmci because it may not be there
+	modprobe -rvq vmci || modprobe -rv vmw_vmci
+	eend $?
+}
diff --git a/app-emulation/vmware-player/files/vmware-network.service b/app-emulation/vmware-player/files/vmware-network.service
new file mode 100644
index 000000000000..abc6648f3156
--- /dev/null
+++ b/app-emulation/vmware-player/files/vmware-network.service
@@ -0,0 +1,17 @@
+[Unit]
+Description=VMware Network
+Requires=local-fs.target
+Wants=network.target vmware-usbarbitrator.service
+After=local-fs.target network.target vmware-usbarbitrator.service
+
+[Service]
+Type=simple
+ExecStartPre=/sbin/modprobe -av vmci vmmon vsock vmblock vmnet
+ExecStart=/opt/vmware/bin/vmware-networks --start 
+ExecStop=/opt/vmware/bin/vmware-networks --stop
+ExecStopPost=/sbin/modprobe -rv vmmon vsock vmblock vmnet vmci
+TimeoutSec=0
+RemainAfterExit=yes
+
+[Install]
+WantedBy=multi-user.target
diff --git a/app-emulation/vmware-player/files/vmware-usbarbitrator.service b/app-emulation/vmware-player/files/vmware-usbarbitrator.service
new file mode 100644
index 000000000000..16a0fb81bfc9
--- /dev/null
+++ b/app-emulation/vmware-player/files/vmware-usbarbitrator.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=VMware USB Arbitrator
+Requires=local-fs.target
+Before=vmware-network.service
+
+[Service]
+Type=forking
+ExecStart=/opt/vmware/bin/vmware-usbarbitrator
+
+[Install]
+WantedBy=multi-user.target
diff --git a/app-emulation/vmware-player/metadata.xml b/app-emulation/vmware-player/metadata.xml
index aef2572555a8..47a08130e10d 100644
--- a/app-emulation/vmware-player/metadata.xml
+++ b/app-emulation/vmware-player/metadata.xml
@@ -2,13 +2,8 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>vmware</herd>
-	<longdescription lang="en">
-		VMware Player - free desktop virtualization software application - makes it 
-		easy to operate any virtual machine created by VMware Workstation, VMware Fusion,
-		VMware Server or VMware ESX, as well as Microsoft Virtual Server virtual
-		machines or Microsoft Virtual PC virtual machines.
-	</longdescription>
-    <use>
+	<use>
+		<flag name='ovftool'>Install OVF tool for importing and exporting appliance files</flag>
 		<flag name="vmware-tools">Install VMware Tools images</flag>
 	</use>
 </pkgmetadata>
diff --git a/app-emulation/vmware-player/vmware-player-6.0.1.1379776.ebuild b/app-emulation/vmware-player/vmware-player-6.0.1.1379776.ebuild
deleted file mode 100644
index ad56c58e4818..000000000000
--- a/app-emulation/vmware-player/vmware-player-6.0.1.1379776.ebuild
+++ /dev/null
@@ -1,245 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils versionator fdo-mime gnome2-utils pax-utils vmware-bundle
-
-MY_PN="VMware-Player"
-MY_PV=$(get_version_component_range 1-3)
-PV_MINOR=$(get_version_component_range 3)
-PV_BUILD=$(get_version_component_range 4)
-MY_P="${MY_PN}-${MY_PV}-${PV_BUILD}"
-
-DESCRIPTION="Emulate a complete PC on your PC without the usual performance overhead of most emulators"
-HOMEPAGE="http://www.vmware.com/products/player/"
-BASE_URI="https://softwareupdate.vmware.com/cds/vmw-desktop/player/${MY_PV}/${PV_BUILD}/linux/core/"
-SRC_URI="
-	x86? ( ${BASE_URI}${MY_P}.i386.bundle.tar )
-	amd64? ( ${BASE_URI}${MY_P}.x86_64.bundle.tar )
-	"
-
-LICENSE="vmware GPL-2"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE="cups doc +vmware-tools"
-RESTRICT="strip"
-
-# vmware-workstation should not use virtual/libc as this is a
-# precompiled binary package thats linked to glibc.
-RDEPEND="dev-cpp/cairomm
-	dev-cpp/glibmm:2
-	dev-cpp/gtkmm:2.4
-	dev-cpp/libgnomecanvasmm:2.6
-	dev-cpp/pangomm:1.4
-	dev-libs/atk
-	dev-libs/glib:2
-	dev-libs/libaio
-	dev-libs/libsigc++
-	dev-libs/libxml2
-	=dev-libs/openssl-0.9.8*
-	dev-libs/xmlrpc-c
-	gnome-base/libgnomecanvas
-	gnome-base/libgtop:2
-	gnome-base/librsvg:2
-	gnome-base/orbit
-	media-libs/fontconfig
-	media-libs/freetype
-	media-libs/libart_lgpl
-	=media-libs/libpng-1.2*
-	net-misc/curl
-	cups? ( net-print/cups )
-	sys-devel/gcc
-	sys-fs/fuse
-	sys-libs/glibc
-	sys-libs/zlib
-	x11-libs/cairo
-	x11-libs/gtk+:2
-	x11-libs/libgksu
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-	x11-libs/libXau
-	x11-libs/libxcb
-	x11-libs/libXcomposite
-	x11-libs/libXcursor
-	x11-libs/libXdamage
-	x11-libs/libXdmcp
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXft
-	x11-libs/libXi
-	x11-libs/libXinerama
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	x11-libs/libXtst
-	x11-libs/pango
-	x11-libs/startup-notification
-	!app-emulation/vmware-workstation"
-PDEPEND="~app-emulation/vmware-modules-279.${PV_MINOR}
-	vmware-tools? ( app-emulation/vmware-tools )"
-
-S=${WORKDIR}
-VM_INSTALL_DIR="/opt/vmware"
-
-src_unpack() {
-	default
-	local bundle=${A%.tar}
-
-	local component ; for component in \
-			vmware-player \
-			vmware-player-app \
-			vmware-vmx \
-			vmware-usbarbitrator \
-			vmware-network-editor \
-			vmware-player-setup
-			#vmware-ovftool
-	do
-		vmware-bundle_extract-bundle-component "${bundle}" "${component}" "${S}"
-	done
-}
-
-src_prepare() {
-	rm -f bin/vmware-modconfig
-	rm -rf lib/modules/binary
-	# Bug 459566
-	mv lib/libvmware-netcfg.so lib/lib/
-}
-
-clean_bundled_libs() {
-	ebegin 'Removing superfluous libraries'
-	# exclude OpenSSL from unbundling until the AES-NI patch gets into the tree
-	# see https://forums.gentoo.org/viewtopic-t-835867.html
-	# must use shipped libgcr.so.0 or else "undefined symbol: gcr_certificate_widget_new"
-	ldconfig -p | sed 's:^\s\+\([^(]*[^( ]\).*=> \(/.*\)$:\1 \2:g;t;d' | fgrep -v 'libcrypto.so.0.9.8
-libssl.so.0.9.8
-libgcr.so.0' | while read -r libname libpath ; do
-		dosym "${libpath}" "${VM_INSTALL_DIR}/lib/vmware/lib/${libname}/${libname}"
-	done
-	eend
-}
-
-src_install() {
-	# install the binaries
-	into "${VM_INSTALL_DIR}"
-	dobin bin/* || die "failed to install bin"
-
-	# install the libraries
-	insinto "${VM_INSTALL_DIR}"/lib/vmware
-	doins -r lib/*
-
-	# Bug 432918
-	dosym "${VM_INSTALL_DIR}"/lib/vmware/lib/libcrypto.so.0.9.8/libcrypto.so.0.9.8 \
-		"${VM_INSTALL_DIR}"/lib/vmware/lib/libvmwarebase.so.0/libcrypto.so.0.9.8
-	dosym "${VM_INSTALL_DIR}"/lib/vmware/lib/libssl.so.0.9.8/libssl.so.0.9.8 \
-		"${VM_INSTALL_DIR}"/lib/vmware/lib/libvmwarebase.so.0/libssl.so.0.9.8
-
-	# install the ancillaries
-	insinto /usr
-	doins -r share
-
-	if use cups; then
-		exeinto $(cups-config --serverbin)/filter
-		doexe extras/thnucups
-
-		insinto /etc/cups
-		doins -r etc/cups/*
-	fi
-
-	# install documentation
-	if use doc; then
-		dodoc doc/*
-	fi
-
-	exeinto "${VM_INSTALL_DIR}"/lib/vmware/setup
-	doexe vmware-config
-
-	# create symlinks for the various tools
-	local tool ; for tool in thnuclnt vmplayer{,-daemon} \
-			vmware-{acetool,unity-helper,modconfig{,-console},gksu,fuseUI} ; do
-		dosym appLoader "${VM_INSTALL_DIR}"/lib/vmware/bin/"${tool}"
-	done
-	dosym "${VM_INSTALL_DIR}"/lib/vmware/bin/vmplayer "${VM_INSTALL_DIR}"/bin/vmplayer
-	dosym "${VM_INSTALL_DIR}"/lib/vmware/icu /etc/vmware/icu
-
-	# fix permissions
-	fperms 0755 "${VM_INSTALL_DIR}"/lib/vmware/bin/{appLoader,fusermount,launcher.sh,mkisofs,vmware-remotemks}
-	fperms 0755 "${VM_INSTALL_DIR}"/lib/vmware/lib/{wrapper-gtk24.sh,libgksu2.so.0/gksu-run-helper}
-	fperms 4711 "${VM_INSTALL_DIR}"/lib/vmware/bin/vmware-vmx{,-debug,-stats}
-
-	pax-mark -m "${D}${VM_INSTALL_DIR}"/lib/vmware/bin/vmware-vmx
-
-	# create the environment
-	local envd="${T}/90vmware"
-	cat > "${envd}" <<-EOF
-		PATH='${VM_INSTALL_DIR}/bin'
-		ROOTPATH='${VM_INSTALL_DIR}/bin'
-	EOF
-	doenvd "${envd}" || die
-
-	# create the configuration
-	dodir /etc/vmware || die
-
-	cat > "${D}"/etc/vmware/bootstrap <<-EOF
-		BINDIR='${VM_INSTALL_DIR}/bin'
-		LIBDIR='${VM_INSTALL_DIR}/lib'
-	EOF
-
-	cat > "${D}"/etc/vmware/config <<-EOF
-		bindir = "${VM_INSTALL_DIR}/bin"
-		libdir = "${VM_INSTALL_DIR}/lib/vmware"
-		initscriptdir = "/etc/init.d"
-		authd.fullpath = "${VM_INSTALL_DIR}/sbin/vmware-authd"
-		gksu.rootMethod = "su"
-		VMCI_CONFED = "yes"
-		VMBLOCK_CONFED = "yes"
-		VSOCK_CONFED = "yes"
-		NETWORKING = "yes"
-		player.product.version = "${MY_PV}"
-		product.buildNumber = "${PV_BUILD}"
-	EOF
-
-	# install the init.d script
-	local initscript="${T}/vmware.rc"
-
-	sed -e "s:@@BINDIR@@:${VM_INSTALL_DIR}/bin:g" \
-		"${FILESDIR}/vmware-3.0.rc" > "${initscript}" || die
-	newinitd "${initscript}" vmware || die
-
-	# fill in variable placeholders
-	sed -e "s:@@LIBCONF_DIR@@:${VM_INSTALL_DIR}/lib/vmware/libconf:g" \
-		-i "${D}${VM_INSTALL_DIR}"/lib/vmware/libconf/etc/{gtk-2.0/{gdk-pixbuf.loaders,gtk.immodules},pango/pango{.modules,rc}} || die
-	sed -e "s:@@BINARY@@:${VM_INSTALL_DIR}/bin/vmplayer:g" \
-		-e "/^Encoding/d" \
-		-i "${D}/usr/share/applications/${PN}.desktop" || die
-}
-
-pkg_config() {
-	"${VM_INSTALL_DIR}"/bin/vmware-networks --postinstall ${PN},old,new
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-	gnome2_icon_cache_update
-
-	ewarn "/etc/env.d was updated. Please run:"
-	ewarn "env-update && source /etc/profile"
-	ewarn ""
-	ewarn "Before you can use vmware-player, you must configure a default network setup."
-	ewarn "You can do this by running 'emerge --config ${PN}'."
-}
-
-pkg_prerm() {
-	einfo "Stopping ${PN} for safe unmerge"
-	/etc/init.d/vmware stop
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-	gnome2_icon_cache_update
-}
diff --git a/app-emulation/vmware-player/vmware-player-6.0.2.1744117.ebuild b/app-emulation/vmware-player/vmware-player-6.0.2.1744117.ebuild
deleted file mode 100644
index ad56c58e4818..000000000000
--- a/app-emulation/vmware-player/vmware-player-6.0.2.1744117.ebuild
+++ /dev/null
@@ -1,245 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils versionator fdo-mime gnome2-utils pax-utils vmware-bundle
-
-MY_PN="VMware-Player"
-MY_PV=$(get_version_component_range 1-3)
-PV_MINOR=$(get_version_component_range 3)
-PV_BUILD=$(get_version_component_range 4)
-MY_P="${MY_PN}-${MY_PV}-${PV_BUILD}"
-
-DESCRIPTION="Emulate a complete PC on your PC without the usual performance overhead of most emulators"
-HOMEPAGE="http://www.vmware.com/products/player/"
-BASE_URI="https://softwareupdate.vmware.com/cds/vmw-desktop/player/${MY_PV}/${PV_BUILD}/linux/core/"
-SRC_URI="
-	x86? ( ${BASE_URI}${MY_P}.i386.bundle.tar )
-	amd64? ( ${BASE_URI}${MY_P}.x86_64.bundle.tar )
-	"
-
-LICENSE="vmware GPL-2"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE="cups doc +vmware-tools"
-RESTRICT="strip"
-
-# vmware-workstation should not use virtual/libc as this is a
-# precompiled binary package thats linked to glibc.
-RDEPEND="dev-cpp/cairomm
-	dev-cpp/glibmm:2
-	dev-cpp/gtkmm:2.4
-	dev-cpp/libgnomecanvasmm:2.6
-	dev-cpp/pangomm:1.4
-	dev-libs/atk
-	dev-libs/glib:2
-	dev-libs/libaio
-	dev-libs/libsigc++
-	dev-libs/libxml2
-	=dev-libs/openssl-0.9.8*
-	dev-libs/xmlrpc-c
-	gnome-base/libgnomecanvas
-	gnome-base/libgtop:2
-	gnome-base/librsvg:2
-	gnome-base/orbit
-	media-libs/fontconfig
-	media-libs/freetype
-	media-libs/libart_lgpl
-	=media-libs/libpng-1.2*
-	net-misc/curl
-	cups? ( net-print/cups )
-	sys-devel/gcc
-	sys-fs/fuse
-	sys-libs/glibc
-	sys-libs/zlib
-	x11-libs/cairo
-	x11-libs/gtk+:2
-	x11-libs/libgksu
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-	x11-libs/libXau
-	x11-libs/libxcb
-	x11-libs/libXcomposite
-	x11-libs/libXcursor
-	x11-libs/libXdamage
-	x11-libs/libXdmcp
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXft
-	x11-libs/libXi
-	x11-libs/libXinerama
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	x11-libs/libXtst
-	x11-libs/pango
-	x11-libs/startup-notification
-	!app-emulation/vmware-workstation"
-PDEPEND="~app-emulation/vmware-modules-279.${PV_MINOR}
-	vmware-tools? ( app-emulation/vmware-tools )"
-
-S=${WORKDIR}
-VM_INSTALL_DIR="/opt/vmware"
-
-src_unpack() {
-	default
-	local bundle=${A%.tar}
-
-	local component ; for component in \
-			vmware-player \
-			vmware-player-app \
-			vmware-vmx \
-			vmware-usbarbitrator \
-			vmware-network-editor \
-			vmware-player-setup
-			#vmware-ovftool
-	do
-		vmware-bundle_extract-bundle-component "${bundle}" "${component}" "${S}"
-	done
-}
-
-src_prepare() {
-	rm -f bin/vmware-modconfig
-	rm -rf lib/modules/binary
-	# Bug 459566
-	mv lib/libvmware-netcfg.so lib/lib/
-}
-
-clean_bundled_libs() {
-	ebegin 'Removing superfluous libraries'
-	# exclude OpenSSL from unbundling until the AES-NI patch gets into the tree
-	# see https://forums.gentoo.org/viewtopic-t-835867.html
-	# must use shipped libgcr.so.0 or else "undefined symbol: gcr_certificate_widget_new"
-	ldconfig -p | sed 's:^\s\+\([^(]*[^( ]\).*=> \(/.*\)$:\1 \2:g;t;d' | fgrep -v 'libcrypto.so.0.9.8
-libssl.so.0.9.8
-libgcr.so.0' | while read -r libname libpath ; do
-		dosym "${libpath}" "${VM_INSTALL_DIR}/lib/vmware/lib/${libname}/${libname}"
-	done
-	eend
-}
-
-src_install() {
-	# install the binaries
-	into "${VM_INSTALL_DIR}"
-	dobin bin/* || die "failed to install bin"
-
-	# install the libraries
-	insinto "${VM_INSTALL_DIR}"/lib/vmware
-	doins -r lib/*
-
-	# Bug 432918
-	dosym "${VM_INSTALL_DIR}"/lib/vmware/lib/libcrypto.so.0.9.8/libcrypto.so.0.9.8 \
-		"${VM_INSTALL_DIR}"/lib/vmware/lib/libvmwarebase.so.0/libcrypto.so.0.9.8
-	dosym "${VM_INSTALL_DIR}"/lib/vmware/lib/libssl.so.0.9.8/libssl.so.0.9.8 \
-		"${VM_INSTALL_DIR}"/lib/vmware/lib/libvmwarebase.so.0/libssl.so.0.9.8
-
-	# install the ancillaries
-	insinto /usr
-	doins -r share
-
-	if use cups; then
-		exeinto $(cups-config --serverbin)/filter
-		doexe extras/thnucups
-
-		insinto /etc/cups
-		doins -r etc/cups/*
-	fi
-
-	# install documentation
-	if use doc; then
-		dodoc doc/*
-	fi
-
-	exeinto "${VM_INSTALL_DIR}"/lib/vmware/setup
-	doexe vmware-config
-
-	# create symlinks for the various tools
-	local tool ; for tool in thnuclnt vmplayer{,-daemon} \
-			vmware-{acetool,unity-helper,modconfig{,-console},gksu,fuseUI} ; do
-		dosym appLoader "${VM_INSTALL_DIR}"/lib/vmware/bin/"${tool}"
-	done
-	dosym "${VM_INSTALL_DIR}"/lib/vmware/bin/vmplayer "${VM_INSTALL_DIR}"/bin/vmplayer
-	dosym "${VM_INSTALL_DIR}"/lib/vmware/icu /etc/vmware/icu
-
-	# fix permissions
-	fperms 0755 "${VM_INSTALL_DIR}"/lib/vmware/bin/{appLoader,fusermount,launcher.sh,mkisofs,vmware-remotemks}
-	fperms 0755 "${VM_INSTALL_DIR}"/lib/vmware/lib/{wrapper-gtk24.sh,libgksu2.so.0/gksu-run-helper}
-	fperms 4711 "${VM_INSTALL_DIR}"/lib/vmware/bin/vmware-vmx{,-debug,-stats}
-
-	pax-mark -m "${D}${VM_INSTALL_DIR}"/lib/vmware/bin/vmware-vmx
-
-	# create the environment
-	local envd="${T}/90vmware"
-	cat > "${envd}" <<-EOF
-		PATH='${VM_INSTALL_DIR}/bin'
-		ROOTPATH='${VM_INSTALL_DIR}/bin'
-	EOF
-	doenvd "${envd}" || die
-
-	# create the configuration
-	dodir /etc/vmware || die
-
-	cat > "${D}"/etc/vmware/bootstrap <<-EOF
-		BINDIR='${VM_INSTALL_DIR}/bin'
-		LIBDIR='${VM_INSTALL_DIR}/lib'
-	EOF
-
-	cat > "${D}"/etc/vmware/config <<-EOF
-		bindir = "${VM_INSTALL_DIR}/bin"
-		libdir = "${VM_INSTALL_DIR}/lib/vmware"
-		initscriptdir = "/etc/init.d"
-		authd.fullpath = "${VM_INSTALL_DIR}/sbin/vmware-authd"
-		gksu.rootMethod = "su"
-		VMCI_CONFED = "yes"
-		VMBLOCK_CONFED = "yes"
-		VSOCK_CONFED = "yes"
-		NETWORKING = "yes"
-		player.product.version = "${MY_PV}"
-		product.buildNumber = "${PV_BUILD}"
-	EOF
-
-	# install the init.d script
-	local initscript="${T}/vmware.rc"
-
-	sed -e "s:@@BINDIR@@:${VM_INSTALL_DIR}/bin:g" \
-		"${FILESDIR}/vmware-3.0.rc" > "${initscript}" || die
-	newinitd "${initscript}" vmware || die
-
-	# fill in variable placeholders
-	sed -e "s:@@LIBCONF_DIR@@:${VM_INSTALL_DIR}/lib/vmware/libconf:g" \
-		-i "${D}${VM_INSTALL_DIR}"/lib/vmware/libconf/etc/{gtk-2.0/{gdk-pixbuf.loaders,gtk.immodules},pango/pango{.modules,rc}} || die
-	sed -e "s:@@BINARY@@:${VM_INSTALL_DIR}/bin/vmplayer:g" \
-		-e "/^Encoding/d" \
-		-i "${D}/usr/share/applications/${PN}.desktop" || die
-}
-
-pkg_config() {
-	"${VM_INSTALL_DIR}"/bin/vmware-networks --postinstall ${PN},old,new
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-	gnome2_icon_cache_update
-
-	ewarn "/etc/env.d was updated. Please run:"
-	ewarn "env-update && source /etc/profile"
-	ewarn ""
-	ewarn "Before you can use vmware-player, you must configure a default network setup."
-	ewarn "You can do this by running 'emerge --config ${PN}'."
-}
-
-pkg_prerm() {
-	einfo "Stopping ${PN} for safe unmerge"
-	/etc/init.d/vmware stop
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-	gnome2_icon_cache_update
-}
diff --git a/app-emulation/vmware-player/vmware-player-6.0.3.1895310.ebuild b/app-emulation/vmware-player/vmware-player-6.0.3.1895310.ebuild
deleted file mode 100644
index ad56c58e4818..000000000000
--- a/app-emulation/vmware-player/vmware-player-6.0.3.1895310.ebuild
+++ /dev/null
@@ -1,245 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils versionator fdo-mime gnome2-utils pax-utils vmware-bundle
-
-MY_PN="VMware-Player"
-MY_PV=$(get_version_component_range 1-3)
-PV_MINOR=$(get_version_component_range 3)
-PV_BUILD=$(get_version_component_range 4)
-MY_P="${MY_PN}-${MY_PV}-${PV_BUILD}"
-
-DESCRIPTION="Emulate a complete PC on your PC without the usual performance overhead of most emulators"
-HOMEPAGE="http://www.vmware.com/products/player/"
-BASE_URI="https://softwareupdate.vmware.com/cds/vmw-desktop/player/${MY_PV}/${PV_BUILD}/linux/core/"
-SRC_URI="
-	x86? ( ${BASE_URI}${MY_P}.i386.bundle.tar )
-	amd64? ( ${BASE_URI}${MY_P}.x86_64.bundle.tar )
-	"
-
-LICENSE="vmware GPL-2"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE="cups doc +vmware-tools"
-RESTRICT="strip"
-
-# vmware-workstation should not use virtual/libc as this is a
-# precompiled binary package thats linked to glibc.
-RDEPEND="dev-cpp/cairomm
-	dev-cpp/glibmm:2
-	dev-cpp/gtkmm:2.4
-	dev-cpp/libgnomecanvasmm:2.6
-	dev-cpp/pangomm:1.4
-	dev-libs/atk
-	dev-libs/glib:2
-	dev-libs/libaio
-	dev-libs/libsigc++
-	dev-libs/libxml2
-	=dev-libs/openssl-0.9.8*
-	dev-libs/xmlrpc-c
-	gnome-base/libgnomecanvas
-	gnome-base/libgtop:2
-	gnome-base/librsvg:2
-	gnome-base/orbit
-	media-libs/fontconfig
-	media-libs/freetype
-	media-libs/libart_lgpl
-	=media-libs/libpng-1.2*
-	net-misc/curl
-	cups? ( net-print/cups )
-	sys-devel/gcc
-	sys-fs/fuse
-	sys-libs/glibc
-	sys-libs/zlib
-	x11-libs/cairo
-	x11-libs/gtk+:2
-	x11-libs/libgksu
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-	x11-libs/libXau
-	x11-libs/libxcb
-	x11-libs/libXcomposite
-	x11-libs/libXcursor
-	x11-libs/libXdamage
-	x11-libs/libXdmcp
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXft
-	x11-libs/libXi
-	x11-libs/libXinerama
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	x11-libs/libXtst
-	x11-libs/pango
-	x11-libs/startup-notification
-	!app-emulation/vmware-workstation"
-PDEPEND="~app-emulation/vmware-modules-279.${PV_MINOR}
-	vmware-tools? ( app-emulation/vmware-tools )"
-
-S=${WORKDIR}
-VM_INSTALL_DIR="/opt/vmware"
-
-src_unpack() {
-	default
-	local bundle=${A%.tar}
-
-	local component ; for component in \
-			vmware-player \
-			vmware-player-app \
-			vmware-vmx \
-			vmware-usbarbitrator \
-			vmware-network-editor \
-			vmware-player-setup
-			#vmware-ovftool
-	do
-		vmware-bundle_extract-bundle-component "${bundle}" "${component}" "${S}"
-	done
-}
-
-src_prepare() {
-	rm -f bin/vmware-modconfig
-	rm -rf lib/modules/binary
-	# Bug 459566
-	mv lib/libvmware-netcfg.so lib/lib/
-}
-
-clean_bundled_libs() {
-	ebegin 'Removing superfluous libraries'
-	# exclude OpenSSL from unbundling until the AES-NI patch gets into the tree
-	# see https://forums.gentoo.org/viewtopic-t-835867.html
-	# must use shipped libgcr.so.0 or else "undefined symbol: gcr_certificate_widget_new"
-	ldconfig -p | sed 's:^\s\+\([^(]*[^( ]\).*=> \(/.*\)$:\1 \2:g;t;d' | fgrep -v 'libcrypto.so.0.9.8
-libssl.so.0.9.8
-libgcr.so.0' | while read -r libname libpath ; do
-		dosym "${libpath}" "${VM_INSTALL_DIR}/lib/vmware/lib/${libname}/${libname}"
-	done
-	eend
-}
-
-src_install() {
-	# install the binaries
-	into "${VM_INSTALL_DIR}"
-	dobin bin/* || die "failed to install bin"
-
-	# install the libraries
-	insinto "${VM_INSTALL_DIR}"/lib/vmware
-	doins -r lib/*
-
-	# Bug 432918
-	dosym "${VM_INSTALL_DIR}"/lib/vmware/lib/libcrypto.so.0.9.8/libcrypto.so.0.9.8 \
-		"${VM_INSTALL_DIR}"/lib/vmware/lib/libvmwarebase.so.0/libcrypto.so.0.9.8
-	dosym "${VM_INSTALL_DIR}"/lib/vmware/lib/libssl.so.0.9.8/libssl.so.0.9.8 \
-		"${VM_INSTALL_DIR}"/lib/vmware/lib/libvmwarebase.so.0/libssl.so.0.9.8
-
-	# install the ancillaries
-	insinto /usr
-	doins -r share
-
-	if use cups; then
-		exeinto $(cups-config --serverbin)/filter
-		doexe extras/thnucups
-
-		insinto /etc/cups
-		doins -r etc/cups/*
-	fi
-
-	# install documentation
-	if use doc; then
-		dodoc doc/*
-	fi
-
-	exeinto "${VM_INSTALL_DIR}"/lib/vmware/setup
-	doexe vmware-config
-
-	# create symlinks for the various tools
-	local tool ; for tool in thnuclnt vmplayer{,-daemon} \
-			vmware-{acetool,unity-helper,modconfig{,-console},gksu,fuseUI} ; do
-		dosym appLoader "${VM_INSTALL_DIR}"/lib/vmware/bin/"${tool}"
-	done
-	dosym "${VM_INSTALL_DIR}"/lib/vmware/bin/vmplayer "${VM_INSTALL_DIR}"/bin/vmplayer
-	dosym "${VM_INSTALL_DIR}"/lib/vmware/icu /etc/vmware/icu
-
-	# fix permissions
-	fperms 0755 "${VM_INSTALL_DIR}"/lib/vmware/bin/{appLoader,fusermount,launcher.sh,mkisofs,vmware-remotemks}
-	fperms 0755 "${VM_INSTALL_DIR}"/lib/vmware/lib/{wrapper-gtk24.sh,libgksu2.so.0/gksu-run-helper}
-	fperms 4711 "${VM_INSTALL_DIR}"/lib/vmware/bin/vmware-vmx{,-debug,-stats}
-
-	pax-mark -m "${D}${VM_INSTALL_DIR}"/lib/vmware/bin/vmware-vmx
-
-	# create the environment
-	local envd="${T}/90vmware"
-	cat > "${envd}" <<-EOF
-		PATH='${VM_INSTALL_DIR}/bin'
-		ROOTPATH='${VM_INSTALL_DIR}/bin'
-	EOF
-	doenvd "${envd}" || die
-
-	# create the configuration
-	dodir /etc/vmware || die
-
-	cat > "${D}"/etc/vmware/bootstrap <<-EOF
-		BINDIR='${VM_INSTALL_DIR}/bin'
-		LIBDIR='${VM_INSTALL_DIR}/lib'
-	EOF
-
-	cat > "${D}"/etc/vmware/config <<-EOF
-		bindir = "${VM_INSTALL_DIR}/bin"
-		libdir = "${VM_INSTALL_DIR}/lib/vmware"
-		initscriptdir = "/etc/init.d"
-		authd.fullpath = "${VM_INSTALL_DIR}/sbin/vmware-authd"
-		gksu.rootMethod = "su"
-		VMCI_CONFED = "yes"
-		VMBLOCK_CONFED = "yes"
-		VSOCK_CONFED = "yes"
-		NETWORKING = "yes"
-		player.product.version = "${MY_PV}"
-		product.buildNumber = "${PV_BUILD}"
-	EOF
-
-	# install the init.d script
-	local initscript="${T}/vmware.rc"
-
-	sed -e "s:@@BINDIR@@:${VM_INSTALL_DIR}/bin:g" \
-		"${FILESDIR}/vmware-3.0.rc" > "${initscript}" || die
-	newinitd "${initscript}" vmware || die
-
-	# fill in variable placeholders
-	sed -e "s:@@LIBCONF_DIR@@:${VM_INSTALL_DIR}/lib/vmware/libconf:g" \
-		-i "${D}${VM_INSTALL_DIR}"/lib/vmware/libconf/etc/{gtk-2.0/{gdk-pixbuf.loaders,gtk.immodules},pango/pango{.modules,rc}} || die
-	sed -e "s:@@BINARY@@:${VM_INSTALL_DIR}/bin/vmplayer:g" \
-		-e "/^Encoding/d" \
-		-i "${D}/usr/share/applications/${PN}.desktop" || die
-}
-
-pkg_config() {
-	"${VM_INSTALL_DIR}"/bin/vmware-networks --postinstall ${PN},old,new
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-	gnome2_icon_cache_update
-
-	ewarn "/etc/env.d was updated. Please run:"
-	ewarn "env-update && source /etc/profile"
-	ewarn ""
-	ewarn "Before you can use vmware-player, you must configure a default network setup."
-	ewarn "You can do this by running 'emerge --config ${PN}'."
-}
-
-pkg_prerm() {
-	einfo "Stopping ${PN} for safe unmerge"
-	/etc/init.d/vmware stop
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-	gnome2_icon_cache_update
-}
diff --git a/app-emulation/vmware-player/vmware-player-6.0.6.2700073.ebuild b/app-emulation/vmware-player/vmware-player-6.0.6.2700073.ebuild
new file mode 100644
index 000000000000..2419f68fb029
--- /dev/null
+++ b/app-emulation/vmware-player/vmware-player-6.0.6.2700073.ebuild
@@ -0,0 +1,245 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils versionator fdo-mime gnome2-utils pax-utils vmware-bundle
+
+MY_PN="VMware-Player"
+MY_PV=$(get_version_component_range 1-3)
+PV_MINOR=$(get_version_component_range 3)
+PV_BUILD=$(get_version_component_range 4)
+MY_P="${MY_PN}-${MY_PV}-${PV_BUILD}"
+
+DESCRIPTION="Emulate a complete PC on your PC without the usual performance overhead of most emulators"
+HOMEPAGE="http://www.vmware.com/products/player/"
+BASE_URI="https://softwareupdate.vmware.com/cds/vmw-desktop/player/${MY_PV}/${PV_BUILD}/linux/core/"
+SRC_URI="
+	x86? ( ${BASE_URI}${MY_P}.i386.bundle.tar )
+	amd64? ( ${BASE_URI}${MY_P}.x86_64.bundle.tar )
+	"
+
+LICENSE="vmware GPL-2"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE="cups doc +vmware-tools"
+RESTRICT="strip"
+
+# vmware-workstation should not use virtual/libc as this is a
+# precompiled binary package thats linked to glibc.
+RDEPEND="dev-cpp/cairomm
+	dev-cpp/glibmm:2
+	dev-cpp/gtkmm:2.4
+	dev-cpp/libgnomecanvasmm:2.6
+	dev-cpp/pangomm:1.4
+	dev-libs/atk
+	dev-libs/glib:2
+	dev-libs/libaio
+	dev-libs/libsigc++
+	dev-libs/libxml2
+	=dev-libs/openssl-0.9.8*
+	dev-libs/xmlrpc-c
+	gnome-base/libgnomecanvas
+	gnome-base/libgtop:2
+	gnome-base/librsvg:2
+	gnome-base/orbit
+	media-libs/fontconfig
+	media-libs/freetype
+	media-libs/libart_lgpl
+	=media-libs/libpng-1.2*
+	net-misc/curl
+	cups? ( net-print/cups )
+	sys-devel/gcc
+	sys-fs/fuse
+	sys-libs/glibc
+	sys-libs/zlib
+	x11-libs/cairo
+	x11-libs/gtk+:2
+	x11-libs/libgksu
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	x11-libs/libXau
+	x11-libs/libxcb
+	x11-libs/libXcomposite
+	x11-libs/libXcursor
+	x11-libs/libXdamage
+	x11-libs/libXdmcp
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXft
+	x11-libs/libXi
+	x11-libs/libXinerama
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	x11-libs/libXtst
+	x11-libs/pango
+	x11-libs/startup-notification
+	!app-emulation/vmware-workstation"
+PDEPEND="~app-emulation/vmware-modules-279.${PV_MINOR}
+	vmware-tools? ( app-emulation/vmware-tools )"
+
+S=${WORKDIR}
+VM_INSTALL_DIR="/opt/vmware"
+
+src_unpack() {
+	default
+	local bundle=${A%.tar}
+
+	local component ; for component in \
+			vmware-player \
+			vmware-player-app \
+			vmware-vmx \
+			vmware-usbarbitrator \
+			vmware-network-editor \
+			vmware-player-setup
+			#vmware-ovftool
+	do
+		vmware-bundle_extract-bundle-component "${bundle}" "${component}" "${S}"
+	done
+}
+
+src_prepare() {
+	rm -f bin/vmware-modconfig
+	rm -rf lib/modules/binary
+	# Bug 459566
+	mv lib/libvmware-netcfg.so lib/lib/
+}
+
+clean_bundled_libs() {
+	ebegin 'Removing superfluous libraries'
+	# exclude OpenSSL from unbundling until the AES-NI patch gets into the tree
+	# see http://forums.gentoo.org/viewtopic-t-835867.html
+	# must use shipped libgcr.so.0 or else "undefined symbol: gcr_certificate_widget_new"
+	ldconfig -p | sed 's:^\s\+\([^(]*[^( ]\).*=> \(/.*\)$:\1 \2:g;t;d' | fgrep -v 'libcrypto.so.0.9.8
+libssl.so.0.9.8
+libgcr.so.0' | while read -r libname libpath ; do
+		dosym "${libpath}" "${VM_INSTALL_DIR}/lib/vmware/lib/${libname}/${libname}"
+	done
+	eend
+}
+
+src_install() {
+	# install the binaries
+	into "${VM_INSTALL_DIR}"
+	dobin bin/* || die "failed to install bin"
+
+	# install the libraries
+	insinto "${VM_INSTALL_DIR}"/lib/vmware
+	doins -r lib/*
+
+	# Bug 432918
+	dosym "${VM_INSTALL_DIR}"/lib/vmware/lib/libcrypto.so.0.9.8/libcrypto.so.0.9.8 \
+		"${VM_INSTALL_DIR}"/lib/vmware/lib/libvmwarebase.so.0/libcrypto.so.0.9.8
+	dosym "${VM_INSTALL_DIR}"/lib/vmware/lib/libssl.so.0.9.8/libssl.so.0.9.8 \
+		"${VM_INSTALL_DIR}"/lib/vmware/lib/libvmwarebase.so.0/libssl.so.0.9.8
+
+	# install the ancillaries
+	insinto /usr
+	doins -r share
+
+	if use cups; then
+		exeinto $(cups-config --serverbin)/filter
+		doexe extras/thnucups
+
+		insinto /etc/cups
+		doins -r etc/cups/*
+	fi
+
+	# install documentation
+	if use doc; then
+		dodoc doc/*
+	fi
+
+	exeinto "${VM_INSTALL_DIR}"/lib/vmware/setup
+	doexe vmware-config
+
+	# create symlinks for the various tools
+	local tool ; for tool in thnuclnt vmplayer{,-daemon} \
+			vmware-{acetool,unity-helper,modconfig{,-console},gksu,fuseUI} ; do
+		dosym appLoader "${VM_INSTALL_DIR}"/lib/vmware/bin/"${tool}"
+	done
+	dosym "${VM_INSTALL_DIR}"/lib/vmware/bin/vmplayer "${VM_INSTALL_DIR}"/bin/vmplayer
+	dosym "${VM_INSTALL_DIR}"/lib/vmware/icu /etc/vmware/icu
+
+	# fix permissions
+	fperms 0755 "${VM_INSTALL_DIR}"/lib/vmware/bin/{appLoader,fusermount,launcher.sh,mkisofs,vmware-remotemks}
+	fperms 0755 "${VM_INSTALL_DIR}"/lib/vmware/lib/{wrapper-gtk24.sh,libgksu2.so.0/gksu-run-helper}
+	fperms 4711 "${VM_INSTALL_DIR}"/lib/vmware/bin/vmware-vmx{,-debug,-stats}
+
+	pax-mark -m "${D}${VM_INSTALL_DIR}"/lib/vmware/bin/vmware-vmx
+
+	# create the environment
+	local envd="${T}/90vmware"
+	cat > "${envd}" <<-EOF
+		PATH='${VM_INSTALL_DIR}/bin'
+		ROOTPATH='${VM_INSTALL_DIR}/bin'
+	EOF
+	doenvd "${envd}" || die
+
+	# create the configuration
+	dodir /etc/vmware || die
+
+	cat > "${D}"/etc/vmware/bootstrap <<-EOF
+		BINDIR='${VM_INSTALL_DIR}/bin'
+		LIBDIR='${VM_INSTALL_DIR}/lib'
+	EOF
+
+	cat > "${D}"/etc/vmware/config <<-EOF
+		bindir = "${VM_INSTALL_DIR}/bin"
+		libdir = "${VM_INSTALL_DIR}/lib/vmware"
+		initscriptdir = "/etc/init.d"
+		authd.fullpath = "${VM_INSTALL_DIR}/sbin/vmware-authd"
+		gksu.rootMethod = "su"
+		VMCI_CONFED = "yes"
+		VMBLOCK_CONFED = "yes"
+		VSOCK_CONFED = "yes"
+		NETWORKING = "yes"
+		player.product.version = "${MY_PV}"
+		product.buildNumber = "${PV_BUILD}"
+	EOF
+
+	# install the init.d script
+	local initscript="${T}/vmware.rc"
+
+	sed -e "s:@@BINDIR@@:${VM_INSTALL_DIR}/bin:g" \
+		"${FILESDIR}/vmware-10.0.rc" > "${initscript}" || die
+	newinitd "${initscript}" vmware || die
+
+	# fill in variable placeholders
+	sed -e "s:@@LIBCONF_DIR@@:${VM_INSTALL_DIR}/lib/vmware/libconf:g" \
+		-i "${D}${VM_INSTALL_DIR}"/lib/vmware/libconf/etc/{gtk-2.0/{gdk-pixbuf.loaders,gtk.immodules},pango/pango{.modules,rc}} || die
+	sed -e "s:@@BINARY@@:${VM_INSTALL_DIR}/bin/vmplayer:g" \
+		-e "/^Encoding/d" \
+		-i "${D}/usr/share/applications/${PN}.desktop" || die
+}
+
+pkg_config() {
+	"${VM_INSTALL_DIR}"/bin/vmware-networks --postinstall ${PN},old,new
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+	gnome2_icon_cache_update
+
+	ewarn "/etc/env.d was updated. Please run:"
+	ewarn "env-update && source /etc/profile"
+	ewarn ""
+	ewarn "Before you can use vmware-player, you must configure a default network setup."
+	ewarn "You can do this by running 'emerge --config ${PN}'."
+}
+
+pkg_prerm() {
+	einfo "Stopping ${PN} for safe unmerge"
+	/etc/init.d/vmware stop
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+	gnome2_icon_cache_update
+}
diff --git a/app-emulation/vmware-player/vmware-player-7.1.2.2780323.ebuild b/app-emulation/vmware-player/vmware-player-7.1.2.2780323.ebuild
new file mode 100644
index 000000000000..112860289931
--- /dev/null
+++ b/app-emulation/vmware-player/vmware-player-7.1.2.2780323.ebuild
@@ -0,0 +1,263 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils versionator fdo-mime gnome2-utils pax-utils systemd vmware-bundle
+
+MY_PN="VMware-Player"
+MY_PV=$(get_version_component_range 1-3)
+PV_MINOR=$(get_version_component_range 3)
+PV_BUILD=$(get_version_component_range 4)
+MY_P="${MY_PN}-${MY_PV}-${PV_BUILD}"
+
+DESCRIPTION="Emulate a complete PC on your PC without the usual performance overhead of most emulators"
+HOMEPAGE="http://www.vmware.com/products/player/"
+BASE_URI="https://softwareupdate.vmware.com/cds/vmw-desktop/player/${MY_PV}/${PV_BUILD}/linux/core/"
+SRC_URI="
+	amd64? ( ${BASE_URI}${MY_P}.x86_64.bundle.tar )
+	"
+
+LICENSE="vmware GPL-2"
+SLOT="0"
+KEYWORDS="-* ~amd64"
+IUSE="cups doc ovftool +vmware-tools"
+RESTRICT="strip"
+
+# vmware-workstation should not use virtual/libc as this is a
+# precompiled binary package thats linked to glibc.
+RDEPEND="dev-cpp/cairomm
+	dev-cpp/glibmm:2
+	dev-cpp/gtkmm:2.4
+	dev-cpp/libgnomecanvasmm:2.6
+	dev-cpp/pangomm:1.4
+	dev-libs/atk
+	dev-libs/glib:2
+	dev-libs/libaio
+	dev-libs/libsigc++
+	dev-libs/libxml2
+	=dev-libs/openssl-0.9.8*
+	dev-libs/xmlrpc-c
+	gnome-base/libgnomecanvas
+	gnome-base/libgtop:2
+	gnome-base/librsvg:2
+	gnome-base/orbit
+	media-libs/fontconfig
+	media-libs/freetype
+	media-libs/libart_lgpl
+	=media-libs/libpng-1.2*
+	net-misc/curl
+	cups? ( net-print/cups )
+	sys-devel/gcc
+	sys-fs/fuse
+	sys-libs/glibc
+	sys-libs/zlib
+	x11-libs/cairo
+	x11-libs/gtk+:2
+	x11-libs/libgksu
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	x11-libs/libXau
+	x11-libs/libxcb
+	x11-libs/libXcomposite
+	x11-libs/libXcursor
+	x11-libs/libXdamage
+	x11-libs/libXdmcp
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXft
+	x11-libs/libXi
+	x11-libs/libXinerama
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	x11-libs/libXtst
+	x11-libs/pango
+	x11-libs/startup-notification
+	!app-emulation/vmware-workstation"
+PDEPEND="~app-emulation/vmware-modules-304.${PV_MINOR}
+	vmware-tools? ( app-emulation/vmware-tools )"
+
+S=${WORKDIR}
+VM_INSTALL_DIR="/opt/vmware"
+
+src_unpack() {
+	default
+	local bundle=${A%.tar}
+
+	local component ; for component in \
+			vmware-player \
+			vmware-player-app \
+			vmware-vmx \
+			vmware-usbarbitrator \
+			vmware-network-editor \
+			vmware-player-setup
+	do
+		vmware-bundle_extract-bundle-component "${bundle}" "${component}" "${S}"
+	done
+
+	use ovftool && \
+		vmware-bundle_extract-bundle-component "${bundle}" vmware-ovftool
+}
+
+src_prepare() {
+	rm -f bin/vmware-modconfig
+	rm -rf lib/modules/binary
+	# Bug 459566
+	mv lib/libvmware-netcfg.so lib/lib/
+}
+
+clean_bundled_libs() {
+	ebegin 'Removing superfluous libraries'
+	# exclude OpenSSL from unbundling until the AES-NI patch gets into the tree
+	# see http://forums.gentoo.org/viewtopic-t-835867.html
+	# must use shipped libgcr.so.0 or else "undefined symbol: gcr_certificate_widget_new"
+	ldconfig -p | sed 's:^\s\+\([^(]*[^( ]\).*=> \(/.*\)$:\1 \2:g;t;d' | fgrep -v 'libcrypto.so.0.9.8
+libssl.so.0.9.8
+libgcr.so.0' | while read -r libname libpath ; do
+		dosym "${libpath}" "${VM_INSTALL_DIR}/lib/vmware/lib/${libname}/${libname}"
+	done
+	eend
+}
+
+src_install() {
+	# install the binaries
+	into "${VM_INSTALL_DIR}"
+	dobin bin/* || die "failed to install bin"
+
+	# install the libraries
+	insinto "${VM_INSTALL_DIR}"/lib/vmware
+	doins -r lib/*
+
+	# Bug 432918
+	dosym "${VM_INSTALL_DIR}"/lib/vmware/lib/libcrypto.so.0.9.8/libcrypto.so.0.9.8 \
+		"${VM_INSTALL_DIR}"/lib/vmware/lib/libvmwarebase.so.0/libcrypto.so.0.9.8
+	dosym "${VM_INSTALL_DIR}"/lib/vmware/lib/libssl.so.0.9.8/libssl.so.0.9.8 \
+		"${VM_INSTALL_DIR}"/lib/vmware/lib/libvmwarebase.so.0/libssl.so.0.9.8
+
+	# https://github.com/gentoo/vmware/issues/7
+	dosym "${VM_INSTALL_DIR}"/lib/vmware/ /usr/$(get_libdir)/vmware
+
+	# install the ancillaries
+	insinto /usr
+	doins -r share
+
+	if use cups; then
+		exeinto $(cups-config --serverbin)/filter
+		doexe extras/thnucups
+
+		insinto /etc/cups
+		doins -r etc/cups/*
+	fi
+
+	# install documentation
+	if use doc; then
+		dodoc doc/*
+	fi
+
+	exeinto "${VM_INSTALL_DIR}"/lib/vmware/setup
+	doexe vmware-config
+
+	# install ovftool
+	if use ovftool; then
+		cd "${S}"
+
+		insinto "${VM_INSTALL_DIR}"/lib/vmware-ovftool
+		doins -r vmware-ovftool/*
+
+		chmod 0755 "${D}${VM_INSTALL_DIR}"/lib/vmware-ovftool/{ovftool,ovftool.bin}
+		dosym "${D}${VM_INSTALL_DIR}"/lib/vmware-ovftool/ovftool "${VM_INSTALL_DIR}"/bin/ovftool
+	fi
+
+	# create symlinks for the various tools
+	local tool ; for tool in thnuclnt vmplayer{,-daemon} \
+			vmware-{acetool,unity-helper,modconfig{,-console},gksu,fuseUI} ; do
+		dosym appLoader "${VM_INSTALL_DIR}"/lib/vmware/bin/"${tool}"
+	done
+	dosym "${VM_INSTALL_DIR}"/lib/vmware/bin/vmplayer "${VM_INSTALL_DIR}"/bin/vmplayer
+	dosym "${VM_INSTALL_DIR}"/lib/vmware/icu /etc/vmware/icu
+
+	# fix permissions
+	fperms 0755 "${VM_INSTALL_DIR}"/lib/vmware/bin/{appLoader,fusermount,launcher.sh,mkisofs,vmware-remotemks}
+	fperms 0755 "${VM_INSTALL_DIR}"/lib/vmware/lib/{wrapper-gtk24.sh,libgksu2.so.0/gksu-run-helper}
+	fperms 4711 "${VM_INSTALL_DIR}"/lib/vmware/bin/vmware-vmx{,-debug,-stats}
+
+	pax-mark -m "${D}${VM_INSTALL_DIR}"/lib/vmware/bin/vmware-vmx
+
+	# create the environment
+	local envd="${T}/90vmware"
+	cat > "${envd}" <<-EOF
+		PATH='${VM_INSTALL_DIR}/bin'
+		ROOTPATH='${VM_INSTALL_DIR}/bin'
+	EOF
+	doenvd "${envd}" || die
+
+	# create the configuration
+	dodir /etc/vmware || die
+
+	cat > "${D}"/etc/vmware/bootstrap <<-EOF
+		BINDIR='${VM_INSTALL_DIR}/bin'
+		LIBDIR='${VM_INSTALL_DIR}/lib'
+	EOF
+
+	cat > "${D}"/etc/vmware/config <<-EOF
+		bindir = "${VM_INSTALL_DIR}/bin"
+		libdir = "${VM_INSTALL_DIR}/lib/vmware"
+		initscriptdir = "/etc/init.d"
+		authd.fullpath = "${VM_INSTALL_DIR}/sbin/vmware-authd"
+		gksu.rootMethod = "su"
+		VMCI_CONFED = "yes"
+		VMBLOCK_CONFED = "yes"
+		VSOCK_CONFED = "yes"
+		NETWORKING = "yes"
+		player.product.version = "${MY_PV}"
+		product.buildNumber = "${PV_BUILD}"
+	EOF
+
+	# install the init.d script
+	local initscript="${T}/vmware.rc"
+
+	sed -e "s:@@BINDIR@@:${VM_INSTALL_DIR}/bin:g" \
+		"${FILESDIR}/vmware-11.${PV_MINOR}.rc" > "${initscript}" || die
+	newinitd "${initscript}" vmware || die
+
+	systemd_dounit "${FILESDIR}/vmware-usbarbitrator.service"
+	systemd_dounit "${FILESDIR}/vmware-network.service"
+
+	# fill in variable placeholders
+	sed -e "s:@@LIBCONF_DIR@@:${VM_INSTALL_DIR}/lib/vmware/libconf:g" \
+		-i "${D}${VM_INSTALL_DIR}"/lib/vmware/libconf/etc/{gtk-2.0/{gdk-pixbuf.loaders,gtk.immodules},pango/pango{.modules,rc}} || die
+	sed -e "s:@@BINARY@@:${VM_INSTALL_DIR}/bin/vmplayer:g" \
+		-e "/^Encoding/d" \
+		-i "${D}/usr/share/applications/${PN}.desktop" || die
+}
+
+pkg_config() {
+	"${VM_INSTALL_DIR}"/bin/vmware-networks --postinstall ${PN},old,new
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+	gnome2_icon_cache_update
+
+	ewarn "/etc/env.d was updated. Please run:"
+	ewarn "env-update && source /etc/profile"
+	ewarn ""
+	ewarn "Before you can use vmware-player, you must configure a default network setup."
+	ewarn "You can do this by running 'emerge --config ${PN}'."
+}
+
+pkg_prerm() {
+	einfo "Stopping ${PN} for safe unmerge"
+	/etc/init.d/vmware stop
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+	gnome2_icon_cache_update
+}
diff --git a/app-emulation/vmware-tools/Manifest b/app-emulation/vmware-tools/Manifest
index 62772645c3eb..b5ff297aea33 100644
--- a/app-emulation/vmware-tools/Manifest
+++ b/app-emulation/vmware-tools/Manifest
@@ -4,33 +4,57 @@ DIST vmware-tools-freebsd-9.6.1-1379776.i386.component.tar 15155200 SHA256 a3be7
 DIST vmware-tools-freebsd-9.6.1-1379776.x86_64.component.tar 15155200 SHA256 941e58d81e00a11b4f611475e5ecb4257c78380ceef42bd9a3f2341b6bbad43e SHA512 3a1d3e49c6ccbb174868925b5d980e9676e61c61b6df67352cad6f96a004902466ba26e18ef4919ae5afdfd0e7b213ce9754fd97e39bd0873a0da695f11f046e WHIRLPOOL b37985ac5017d3bf306a10b5414d04c206b6f657b012609b0278aa79ab238535782913e5f31918e6906e6b48a95e26bd0cabe3433b380f4c472fd57c58308942
 DIST vmware-tools-freebsd-9.6.2-1744117.i386.component.tar 15144960 SHA256 a9c7c25f829db43005c14bd416a08ae8a30b8096dcc5b924e17ebbaacfcb595c SHA512 e9c1049cc639464532927d5d2f0e16141e114ca8fa68eb6acb0297748036c4d810a57001ab782efaa38cd1d8e3976e70ecc9687f36be0963cd3aab9edc5aa7e9 WHIRLPOOL ec49dfaa540f0f7233a6950d01f8c7bfde6e10a292561a6b81bcd2e0c90de529f33316298c6db6dae49c53f67fe06d1ec335a36c005e0602c1ebff90193a14b2
 DIST vmware-tools-freebsd-9.6.2-1744117.x86_64.component.tar 15144960 SHA256 1c6d4d21aa4ae8ba0c56f4b24fc8c73da07a4e8bfaf421b4db7c25012328fde1 SHA512 3306ccba195ed0373cf94e810fbb75f74f1b4238ed5be9bc50141222c2a5b687f79b794729ab40e192bba1c861670867abc792e54b01445b1bae8553eace2437 WHIRLPOOL 4556ea97c83ab3708316bd96e9e525fcf1a67c46bb2dd55c005e89102b2d4b8992d5a4376d79cc1c2faf20e65e08b8c3c79e26d9c9fd4c30d680a6ed184b9974
+DIST vmware-tools-freebsd-9.6.5-2700073.i386.component.tar 15216640 SHA256 d900d0ee4f9f185f1914f80cb9b0a7df8fcf027e1009def7c2b81a7ac15e5d0b SHA512 5e070544e85137b7f032e2c1e4567233adadac274abc727b4dcfdfdddd455bc5f080499b306c6bdf7e5bbe17f6610fdece1c2ef541d5b89081ec5d342145071e WHIRLPOOL 1cc29331cefb25628425553707b8c8572eddc1b208856eac409d0123901918677d95fe82cc6028f0debcd7b28a8d524e1f29357b399629c30653eced80d12a7b
+DIST vmware-tools-freebsd-9.6.5-2700073.x86_64.component.tar 15216640 SHA256 7a2435330281b039727ab8a10736a95393bc143e6b3bfea6e9b7d18a7bf4ba15 SHA512 e78b1d85bcff951d4661374eb687c388d0b299d3d1cd6e4344d3a0439219f82a1e59f335cd5284fb371304223038ef358b59006504b061d702981bec7afa3408 WHIRLPOOL 42ea166a2b5ec8986d4d7b04dc2d13c76fb2509d6f9993d1dcceb7479332de0032589acfc749996a255b5487173f8ec03dc859b897a5f894fd2dde964db45220
+DIST vmware-tools-freebsd-9.9.2-2496824.x86_64.component.tar 15267840 SHA256 92331cc0c1b6340e23c7f06f36fef6d2945385527f9f49f06c1d9099bbec03d9 SHA512 d58ddaa59b8c939484aa60fe27f2ae857564cb3e607ec76163aec9c02b11115c0d592cb77dfe123397b0700ca7617c2a69e624a6279b6e4fb99101e5ced43bbd WHIRLPOOL e02783002ab5b862c69de1f5d68ec7690b2c6cd9013cdffd2df6b7337bc8e2b532438568cfa503d5b9d23af8c1d35512097522ccc2e4a92dca71e04225d4ff8f
+DIST vmware-tools-freebsd-9.9.3-2780323.x86_64.component.tar 15267840 SHA256 9f0c62ff9ec11b6920b7eed08a60f445b2e39f98408d74e290789ff405f7a8cf SHA512 ab0a97ae7ab5b6762fdba067606725f00eaa0917e209a5f84852c6ea154e24639cc488f9c9bd6e215d2b0048fdff8ee1adbd1292015eb3712811f54459d7c316 WHIRLPOOL db81fb392d8800c8e2a0fe5f883fd88810ea88b927f9e66a17758d0c864059dcac1f1a0bcaa1a135e0d9b300798185710ab3fffa4cd82e264a73d6e0bba21d1e
 DIST vmware-tools-linux-9.2.3-1031769.i386.component.tar 66211840 SHA256 0383d632139dbb463bba02c3f6770c877b2fc254710b05167b1d0d4213fbc11c SHA512 076d952a70bec0be1dcdc22534a57631faa1e74136cd1baac479d6f98d924a8d870958aa02aaaa9eef98e23609470ab85bde5ab7afacbc15516a5d7ad7b023c2 WHIRLPOOL 4429145db5528b8160115a7c55bc895e8b52745c9c3b08024a096e3bdefbb0e11ef6fdad976178e96fa32320711f30c2889c8830535dc6f6dfb8f6cbb214be03
 DIST vmware-tools-linux-9.2.3-1031769.x86_64.component.tar 66211840 SHA256 be5fa35af317058bffe98979b3b1f77eed416f17c7f6ee265a4717bbe3c9e718 SHA512 1f26d724e8e50df9d34333e44831d002ecd1a8af43cfed575c092316c4328ef3f34ac52b32c81ad6eb01dd362947ed462b09af080ee5e19cfd8aa89fbf83cd1d WHIRLPOOL 7292d3d69a46ad97b6decd5dff6c9c5dc19f76545965c6b95a904a14755072bc061742c458eecf974e8ca910af5d6464ccc6708c00c647095c3e98856ab628b0
 DIST vmware-tools-linux-9.6.1-1379776.i386.component.tar 60518400 SHA256 88ef45021e7dcc2197bbbb2021703000065c7aee0df35706b6c0927e06b9a8eb SHA512 1047b481d20fc3ab2818bb540ba0af16e8bc0f703af95e7f78449a688324d73f32af8650a6325400c38dace5ce582c71e1079c08605db69c45c0476dbe98997e WHIRLPOOL 70ab1d8730f95c2c628d397951f922e3022fc938676e330446ba3bc357eba9c1b0157c319bbd3857d46694e0296e280f88f5334af4ed6acde98207c260cad4eb
 DIST vmware-tools-linux-9.6.1-1379776.x86_64.component.tar 60518400 SHA256 b9d453f210891c1f76d70a45c6e463465940af27826006ebba090bd71e7d9590 SHA512 99b941fc7ce87d122f9b66d19d0d9406ba6d479f7b4ee782f261939694768c42bc31fb60974e4e854fe86964ff24f4a9ea7dfa1f8ed42ae697640d19834b89c6 WHIRLPOOL ab6892d084be06d753b1e452316ac30c38cfd1fc2607181159fe5d3ef5f2c9b2466145cae5f2f93c95be1010bc5484d1a39b4ececc9e9fdb3439a4fe64229521
 DIST vmware-tools-linux-9.6.2-1744117.i386.component.tar 61143040 SHA256 d84a4db83b1feb991b1a382b0936b864fc231dcc73c39304a16c34bb343e9f50 SHA512 7338a83330a62212559062e1c75f0540b7eb7f1037b7a32a9b8aba1750c9f53f2bb2c82c79147df93d93f9113b6902b3318ccd29d67d21ecb523f638d541c1e5 WHIRLPOOL 93213e870e99b71fc1dad344bd81acd61dd29a9fe853c37fa44408105d2be68e48ff044c56ad9dde8905ce7d42a614d585ab106ad1f9c5fea07f37fc2ba92526
 DIST vmware-tools-linux-9.6.2-1744117.x86_64.component.tar 61143040 SHA256 ce07d8afe9c63dc8018979528d252413ea49f9330006fca7b9d9d1fb394dd2e4 SHA512 e5078b84a10ab0b6962ca175ae95475e89cda3f2cf94c0e077e012b7163f46f54a418f34439224b5cb41428f809359e053e36926e85cf17d2ef7a9dbed868b80 WHIRLPOOL 51186181d1ee9bf371e3d042d11baa16bf6627922ef9c967ab1a6c731763d50782787d0028978c5640ec7792f48072de3b2ece78bdfc30ad23a49352a4ea11d2
+DIST vmware-tools-linux-9.6.5-2700073.i386.component.tar 61337600 SHA256 aad21f54da7bb37169dc85fd84062f3976618ce63034c6785235bd6d5aa580f4 SHA512 133c4958d904755ef9a4fdc13ea686aa69b325301c435a8cf7ea77a246a072099864c3b3654d5ad35bfda2b849d3c0e31afdc8654959f0ca2df07c9d822bf9f7 WHIRLPOOL 66ceb444996985f264892d7bbee5ab8a7122796691fedf321e108e1bc81c54646ca3fe325688f4824ef781e7f9ae7058d4f440e2f0219bd58c985195eb9332b2
+DIST vmware-tools-linux-9.6.5-2700073.x86_64.component.tar 61337600 SHA256 dd1fea6f4e99f676cef89d6ad1f9880e28d324f5051a95a6216cb48045c39ea8 SHA512 a607713f410a405ff8364adc7a300223ffa26d5cfd8f0612ec39c371057d6a65744de5e4a2eb552e488cdcb9dbc9ae6ddff7e89b533a9cbe531969453eefe291 WHIRLPOOL 5d851d3a3b9e7ab3b5ff48fa43f40330e88c6cdf083b9a975032b9d2868e9ad3e6e73d9c64db5fba0838eebcf182d9406434abf20d4fe76f74b136a00948684c
+DIST vmware-tools-linux-9.9.2-2496824.x86_64.component.tar 62044160 SHA256 3b08dc7dedb9312ddb465c96435120f87053cd1e456e42dc60fba9e0367044f1 SHA512 8bf3022715f40440838225b1ab2e0fb265c7920da3445a252898d3a4d845e93cbd1af34829e470da0bf9427342adeefd2e5b3df915ec63417fa33d9fa995b783 WHIRLPOOL ba49c9e645528ffb59187937a1b1dc01026da9386ddbcf489b25a3ff7d0b1d799c60beb7c820e5472b6b001c56f7b1bdbf6af1e22f8d78fc1ec4c6d32b7aa9d4
+DIST vmware-tools-linux-9.9.3-2780323.x86_64.component.tar 62095360 SHA256 6ed266ef888c8fd9a9f0d49083767f525b03bb2725d241c048308e8660b67254 SHA512 af12a60a70727db6ff98bfcc1693eda8c78fc09f3c5769eb42cd2ddfc36b6ae411309414d922d6fbcbfddab7875822a57d1bbe4afe2e00afd6afc09c8d959d89 WHIRLPOOL b46ef6bd824758bd2c4fdf8b3934a99baa23a4c2c6b9728a9ff464363c8c31050ffbe1392470191514f50d2f1ac208092f5d789e8cde1681d317636cce87d1b3
 DIST vmware-tools-netware-9.2.3-1031769.i386.component.tar 81920 SHA256 906680d060a59414fa1726ef71b29f90f3923b823d4a123d72f345f6c35bab97 SHA512 892b0e9e18a80ab33dc6113447d281e31eb1925fea67ad9d90bfe6af808f855c8efaef6800540037062c4062bacc575fd638b7a49b34998006f5a49696558623 WHIRLPOOL b97bb7314868b1600a349d3b6af0b516aa3bd17124f3cf6bc309f1cdc21617b4c0abbbf74bb080aaaa64f31dc6ebb57905851678600cb6fce48e235428a5099c
 DIST vmware-tools-netware-9.2.3-1031769.x86_64.component.tar 81920 SHA256 e1279aeb2d402fa87c643fb5bcdda695fa39c93495b9a2b75b4e80a713176817 SHA512 542c350d1052a9bad0930138042424a0c91f55f861511e10ce4b81327a40dc1c8a339606b9118ae1e37a3d4171b0617d0205f74e03c2e28b398b2663575206cc WHIRLPOOL 5b146c80e1537f30c8051266994e44d366cd5964539ab1f2d51e82e0e9c10802f78de38bfdcfd83a0f0f91299381aada5f77dc3a19a759bf69b932a9718a0900
 DIST vmware-tools-netware-9.6.1-1379776.i386.component.tar 81920 SHA256 c5c2e4870bf8e9b36a997018b2b40b736ee445b23ac0ee6cf21983cddf67747c SHA512 33e94dbe2c7817703219a00a8dc14af97cd827ab1602c2a17c959dbed072185a2f8c3ede2e075318b67d457f35599054d88e78bf0af190c97e8b5e9039a9c9a1 WHIRLPOOL 96ac4f31879489d9615e5dcaeee876b471a30b7caf54cddc8291143dec66ec9a23664ea527e42249ae44dc46d631b376ea32518335d55e615cde6cd0022640c6
 DIST vmware-tools-netware-9.6.1-1379776.x86_64.component.tar 81920 SHA256 4dbc8ebfecceb0d281db4f75a535e7648f6fbb921202dd5d9dace8e6e8e3db8f SHA512 2497bfc1d1c31a2e7cc787bbf11254aa5d953e19e16f9fa99548a1b05424a6713106f63e3e1981d46d8c5045ca095ab6070b7e03fc934a064f91323b5b224a44 WHIRLPOOL c628730b5a8e1750babdd3d8bd97d25869fc01751cb2f9532d0024865455b7d89b334f5b34894ffa2262838a740d6c51e61e6000b673532a1014e5ad9028f7f7
 DIST vmware-tools-netware-9.6.2-1744117.i386.component.tar 81920 SHA256 1bcf7439f957d07fd84a56e6ab1bf88818759cf9f9a11df50ae5d0d65f0fd466 SHA512 9579e36b667af282ac3901ff4b836ba3fb1e74af81d19ac82fac94deb51d3bcf074e97ccb27bcab0cf8b9e319404c4cc305cea03ce08c6695191f89461c9de4a WHIRLPOOL 34bb18ee5facaebc273e8a2e8212dd4aa946af0c873a822d5704b0dd5bbbfa3225fc6c7629ae1a21ca55608f41df6c1f1a3d80140d6f8a4c3f9566caf04dcd85
 DIST vmware-tools-netware-9.6.2-1744117.x86_64.component.tar 81920 SHA256 ba9d0f84db9d1acf2c53574f411cf9c287b5905fddeaca703c5b503ba400e19d SHA512 72d1d8c8a2339e83a1feb206e8597dae8a922d5c99dbadf3f1c29662e34c3ac409783336e06b12f1885cff9a1f90840410478c7240770864564ff73e7ec5bfee WHIRLPOOL 2d9bede35a1b10648307405fce67dfd2e2dbbf5f5c34b017ef620b1f30680d7442abc785f5685edfcaf85c4cba9eb8d560aafd59d0962f87e3c17e6c6c9a3194
+DIST vmware-tools-netware-9.6.5-2700073.i386.component.tar 81920 SHA256 5ec311062c98a8bd86fa86d2b762b89ad2642c0ba7d95f8d42734c43f3dc7139 SHA512 d5ad09faee4fc5e4d3e9f5ab0423dc4a28cd316b70193277dfc4e26b8daef372af4ba3e9994ed488a6a051ab4f0e2980f6e8a1ab0b911f7f93d29556d3826617 WHIRLPOOL a911c63efece39e149f4086cfdd8e5c29adce1f2553481328988bc946ab6c6653033f967b7f8970c3b859bb245c57e4d70a432bda3a618da9c5b740f8303e24b
+DIST vmware-tools-netware-9.6.5-2700073.x86_64.component.tar 81920 SHA256 78d3a8e66efeeb831658e50fe012e1d1d6bc4cfdf426008c6a21456757e5238c SHA512 bb6a37252beb66c6843ee851dbb71d169f1eace25f2874ec6c577d32ba1df5791e046fb5039e09ee11f536cb0078685665070d2399756130c3bdd6bad2a43e20 WHIRLPOOL 05c41c61715f9cddc89cadf1d2891be9bc13933a1649761087022b592e28b08db5a12b69ea3055750bb7f19688be1f18df4422ebb0650133e2711a30a7bafec6
+DIST vmware-tools-netware-9.9.2-2496824.x86_64.component.tar 81920 SHA256 a590932c3b0294b14ea16c93c76547f2ff7a552019ca79646422d0f5025fd20f SHA512 df18e77a2cb6be56d0009f75d4fb040d5275191456c6dbe44d1d69f741edbabd48cefc0ac6c0a29a8b624bd635accc1665c79c3b7c185d0f4cb3047c5839b7f1 WHIRLPOOL 56f11f4e98bc186519338ff31fd742d0ab16790f1cdf9d8a739fedf53fc88acbe15500c04df892a64b19b042ae20a302ec9326a835ab072b4d51da0cd1ffea04
+DIST vmware-tools-netware-9.9.3-2780323.x86_64.component.tar 81920 SHA256 51ae6356bf0e28ef074f3e64363e1a360018f9be44f33ab6928e532f8f90af9a SHA512 9eadd29b6329eceaa4d90084d80bb635a46f0830420e947398391735935b626bef8d20dd8ec473c18d423c06cf4cf7a51ac77e2a2c95f9f417c7c73b08e100c6 WHIRLPOOL ce3d82023b378acf48efe3073e79ee272a8e3e36ff5cdee742870b7230ecfbcb8b3b2db7d8a7081e547176aae16f1e2df914593bdc2be4bb29e5ac1301158eae
 DIST vmware-tools-solaris-9.2.3-1031769.i386.component.tar 13096960 SHA256 bb38d98351c0bb7f1c268a5ec1140bf2023276fd82dc31895fc6039f983ce964 SHA512 5abbb8e7e31753301a02dc411ca41a4857fb41b0c97a1264e954a53a5f15869dec7e01f8b65190aaf20e86c04e929beb88d6f14261761801480f453ce6b3107b WHIRLPOOL 3ebfa56078c49d53bc17215124a901931fcc3fdcd660ad55f72ea0c8cb81a31463bc83ecc480d7e7cccba602c3a37157e560a99231edae3b8e2c1e26242ce252
 DIST vmware-tools-solaris-9.2.3-1031769.x86_64.component.tar 13096960 SHA256 94ed550543096d9e03326a5adea93928f24f69349e5bc6a995e1fefead7112d9 SHA512 04724855a497aefcbd1ccf6ddd1e793eb6fd4bc65960f59f0e0dc95096434d8fa1a5a12b49a20f7e293427a794e4c16df06e4a844042fd21537b2513992bae41 WHIRLPOOL 223977e8ff88601f58752b7a2fda99a15212858d8045504aefe181b18ca29ca4b09dd2b07ddc4091533fd07da5062777000dcbd1e557a789688dbec70fae9069
 DIST vmware-tools-solaris-9.6.1-1379776.i386.component.tar 13096960 SHA256 f6057b82bfc070e506b51503c4c7e3dd66565dcc06a2f7fbddeaaa87d76283d6 SHA512 aee20ebff38ac19f7d4512fde2cac6b152af61b5b669eedb152530a9bbbad32136aba9747e4f8c57e78c27b6a24b08c026503b6e7f86fcb427f03e4d5ef28b00 WHIRLPOOL 97c5aed51529a8a38f75ce602cdf88821241388d1ff1a3abeaa7ebad041c047233645b020f2ba6719bc5a3cdda24bdf06ffbd43672dc17ae22fc794a8dfa3b10
 DIST vmware-tools-solaris-9.6.1-1379776.x86_64.component.tar 13096960 SHA256 96ad456174dd66acf25dee3fd4f8ecae718120b0d21296fe21bf22d0fd24ec17 SHA512 c41a707e8c68c8e1fff32cd962e9f8d0d30044346e823e2171bf3dc8392c536de97a8b8466af5088869625dfb96c8746e74f1d6080c62183b51c5e0f94fd885a WHIRLPOOL ec4900bfc58325bf4719c4783f42e590a83032529dd8694d912ee586584a49cbec68f8945a25666d8dee94ea7fb50d8e28c33fca454ab68e501cde0c6fb8e497
 DIST vmware-tools-solaris-9.6.2-1744117.i386.component.tar 13086720 SHA256 07b51c4fff9c4ee67f1d45215da0c2c1258620cbd5d8d24c0cae118b48af4ad4 SHA512 3e9aae368556e335b8915f90921caebb6e95d629a1bdf56125bead32ef6a7bcaafca03768e9d8779f530e808b70c23e7ef59bb4563bfb3693e6c0fa008b553f0 WHIRLPOOL 82cdf434c9700dd633fda1a259934617bf8175370690ce3549b3edee109997b2b0cd0108b28c127a744db4c271391de040efda11df68f4ce341e35414e6d94b9
 DIST vmware-tools-solaris-9.6.2-1744117.x86_64.component.tar 13086720 SHA256 6845e98fdd41ed190d6f5b7ae5d2713be7028172297607aee778cf955505e038 SHA512 9a3796cf5102423506c0375d4f1702f1074adb8a818309084a1f7b6de99cf424c4833cfb39bdb8062dde729ddfb62325c2763730af04d8cfdabd1ab3f14fc19f WHIRLPOOL bd23daac15397bf148156f109af1c6bea819ddf70d6de2f98f943880aac64de0c9647ca40dd909ce6395354d169239d7b1e95041531d89c0d5893401a6e6ce35
+DIST vmware-tools-solaris-9.6.5-2700073.i386.component.tar 12830720 SHA256 dfff56bd05aea2f732d893be9bd7b52d5b0a3f4f993bb8a275a429fabedd03d5 SHA512 e5c51665119fce5655cc24cc6ff5815250cd291ab7216eaa5eba6056b70e31734c111ae33189c4cb78c9f95336141f012c35c61cbf1ac2887dd264af8e5d7823 WHIRLPOOL 6429b2ed61a1ecba0ab290a9e37c642350782f257364b984abdda3b448e0b11996c0c1c909811620074b1b18a1206cc5f7a6872765766b3d0dcb2d1a978cc784
+DIST vmware-tools-solaris-9.6.5-2700073.x86_64.component.tar 12830720 SHA256 4995ee79f2aa8093fd8caa9bf5e9d2085f3b9a5b6de6b105069c68a97a01ef11 SHA512 f36aa070959bfe94dca921f7c776f878a56a116b5ab7a0da6a55acd34943b7b9631a4184d3aaa773387aed303922aa8d7e9f5b3f24c5d8d9eafbf3d02fb9bf88 WHIRLPOOL 558aa2a21da94b4741d3dc6195ee705e918947511408560ca836937ca094fe66efd2582e967e7fac941dabbaee86b4727f7010782eded8abdcfc05d66fe779a7
+DIST vmware-tools-solaris-9.9.2-2496824.x86_64.component.tar 13015040 SHA256 af2974298a6149a869532fe9c2fa1afff68565340d50a3712d72326c29a40f08 SHA512 2c399b37e539b4cd4419e4c34b8af22baf621bd45fb39640936b0c30724719f45ac49ff470121a1453ff4dac9f4ce06192c653a75dc12fb49e3122f6692ce046 WHIRLPOOL b950ecf772d902dea333270dc65d44fbbb3c4b388ffcf7b7e5f6f00c23b8ae7ea2bef567563d14f8236418b1af5c5800ce4797d0e486d0deba295bdcb71868d2
+DIST vmware-tools-solaris-9.9.3-2780323.x86_64.component.tar 13015040 SHA256 5ab7c353c8d73be85f756d34deaf5da7aa30a15a4d60f8c22565826d97d3f401 SHA512 8d9b1fe9f02a28da0cefc79d96accb0617a08928bed4189d00abe9f9424e83a28e06ca772c50ea7e4d14ac7f4d6a51b9e3e017b8d9cb5400811d8e2a05d470ea WHIRLPOOL addf9abb4cb07e2e015cdb5c2209dbc9b2371b712772dd337c577e3a7c83c2bc2fcbe468395b551c8b44d2366d0c12be74d76a513f4f690643dd0cbc6a74e57c
 DIST vmware-tools-winPre2k-9.2.3-1031769.i386.component.tar 11253760 SHA256 a83173fbed35fd6484740fa1c3899ef18c84f0e2728e8db2cca442c809bafe1f SHA512 466625a1e342afae65203b1f04568c4d6c57eee2022890ca463a750d67c6fbbd1f9e5c557515298db0566d9297ffcb32183ff476a5e9368fa05b63b073ade467 WHIRLPOOL a5192928c6fc5c198e818bcf5f623660ae4741017a25cf4e691005ff8284666afb3d5e1dbc037a4caa5889e1bf102e91e4a9f06b630c041674cb0d53d8c0d0f4
 DIST vmware-tools-winPre2k-9.2.3-1031769.x86_64.component.tar 11253760 SHA256 9b51d31ca911ccf95db641834ae79220db44df53c2fd5a91d6b6e382cffdd39e SHA512 60f99dcb92794d3b798334c91966658f8bbb5cd11a435672094e0a0ccd0b070c0be277d38a9dfac9df77db6d7b91da806fa50a13e67b30d19c33fe153ff63a2e WHIRLPOOL 8426b651f35902f1ac87d556b330100f68ca1c615011301e6ab0dffb160fb4dab4f205f293ffd83ad74c67e9776d54c354f9fe98d70c596cec165929c5a1ba5c
 DIST vmware-tools-winPre2k-9.6.1-1379776.i386.component.tar 11458560 SHA256 9d46fa6842684d099f8eaf3459aac8973644193ebb4c663164c04b3f69536872 SHA512 6ecb3726235d1cb156898f6887508f7540a5e93437bde43e86740bce15cb8db4a9c9bb4e2d89ef1f5670f37ac11a457410551ff70d8e096d881b51630fd0b40a WHIRLPOOL ed4a441ceb6eac141ea009d871e4a2315e63a1f4f086fb93055b6c2de97e2d06fa98a772a4fda4582cd2e2511a0ace85b2ed52127f1c7343e3e46e122808602d
 DIST vmware-tools-winPre2k-9.6.1-1379776.x86_64.component.tar 11458560 SHA256 99d603372e69bea2e57e62c3c78dff5ac8119de3e89b438a8cf83a22b0f9774a SHA512 0f4ef0bb79cac357cbdb62d918d22f63a6f1ced51a3d15c10c32dd25dc97474858c85ce9dd080210e07e0b5f7c40741fb7695f1cacf84f5c29c8f8abae15f2c8 WHIRLPOOL f523815ad06bca65719ab99bc54da850a9c67568aa9e6e3ac567ec9669a81d6b554b91ddefe774387cadb014e418b33bb47cc3651caa897bca330a9ec1f22df8
 DIST vmware-tools-winPre2k-9.6.2-1744117.i386.component.tar 11458560 SHA256 24f197f2d20d44f052f97d206cd904cb8cb6943a165a43188a6ab616e3d9346d SHA512 c1b9272097d83bc645cdce8d5e477053d9c68f3216440c31f7ad3d6e0acbb0cf6daa294584d3c381075fe9ccc8489e21d94040a6f47c06c4d8984ba4d0910551 WHIRLPOOL e9d4c6a77a926cbbe035babb6b6a0c28338cc6bfff6a791da2fab73bcc917b69642e7cd8963f228370cda0d508f7e9b7ef15c9d8378c09397b33fc46ea0032ac
 DIST vmware-tools-winPre2k-9.6.2-1744117.x86_64.component.tar 11458560 SHA256 9b32f4f4fccdc6e40f36544ea5cc21f77fd2a517dace8dd672b5ca5e25604b6e SHA512 51259807b2e4e0267a4c7bd2ea294ab504b1681e91101813e5bb16ac155d7b0f065a3fabb692dc0108d44024fc373398aa891cb64eaa96244c5c644c08123159 WHIRLPOOL 07c963e0e821df31b60677769fb46fa836f552b3b41af4c133b0bc7ce76cd6011808fbd6a678c8e38e1c07dfb9221e46caee0923d22844cb399ac2831015e47b
+DIST vmware-tools-winPre2k-9.6.5-2700073.i386.component.tar 11458560 SHA256 8b381b1c787466a96bf0f9536df05f58aa62c5c10d6fdeaedd136c6a49e09b8c SHA512 17bcbc4aa84e5e212732860cf34d4c4d8b4c806bd137b497e6dab9f023cf26af5a43a83f6f4d30f9d6e7df87f85b7a33e8ab0626c56450ea024b17e45ab1e1db WHIRLPOOL c3b45bbf5cc49f8b9dd64517dbd9e258ae60de59ea6beeed0b88745f7ba8beef1da9cba577d7829fa25dccf2c51ca919f36db5e7c141e7a4e1d62abe5b9fd187
+DIST vmware-tools-winPre2k-9.6.5-2700073.x86_64.component.tar 11458560 SHA256 55e856f7a701174c3f1f0257d2a8054b836b5e14b328cadcd21e792db03afd3f SHA512 bbc80f18ec0e08d26850220124d0e9187fe9d80472dbd55269c63d05b51ecc7374d7e6066aa5e9fc9bcd027b218925084fb30ddd48dc3828df9c09a9c3579699 WHIRLPOOL f01ad51f8944a167e19abc876f31a6e08f85920d1e17272edff44e4c4871090694e87749cdbd83ffab6deba8569cfec4b600b9de5f930e57405e831dc73a0cd9
+DIST vmware-tools-winPre2k-9.9.2-2496824.x86_64.component.tar 11530240 SHA256 af08bcc956943bc0ed09e37e03bf2005f32cabdd5697d0398f32b6c1943677c3 SHA512 bdce5073ee5937f7e6cf0944360fda5c5e136f7f19f00bbc5fffb7c6e8ce328494309697e4dfabeece73380421f9e6fa34dadaf3c6d540e676a491245de79d36 WHIRLPOOL b59a72c2d63368119998e3d26267f032f8923f792e0031cbd4805911cf65e0a3d39be3d5bb1489b5fac84fba50554d212b9fcaabec726810ed35f1c36e94defe
+DIST vmware-tools-winPre2k-9.9.3-2780323.x86_64.component.tar 11530240 SHA256 5615f563e42b090a87e30423d5e930fc39712bd9bcf597a83b8df85341e0f563 SHA512 904c9323903f25fc1ffec2e0e7c21c7af9928b408a26e0d4e800597b134643e838a312f44b6600244cb3a855f025912384e10b4bc8f362ae7732216ea8ce642f WHIRLPOOL effa090a63d488738f0a17bf164b0594a33a7a5905d317d08589e1e3467783ac674b07b294a8678c3dbbb0ec6e8c784da74b3e3dd61b9b55e4a1bc4794cbdd8a
 DIST vmware-tools-windows-9.2.3-1031769.i386.component.tar 61777920 SHA256 0fa4f7aac30b589292b6064c23702e6a257ac27ce1342c96755352f6f39e3b04 SHA512 776c834b49ad8f4bbe84ba800aa866e740e1dd236496065ebd46ddafa35621d4356f99a6f0bb45dfb1fe337bc75452236b5d5c87ec8c5ab6b5a1b6c18bc8d542 WHIRLPOOL 787725514f0ee1a48b64cc2f3b25f706290e386f9762857290ca2a84baea4a21205900b37df197976205baf27606023ea7626337b580299d4f6d63288c8ba39b
 DIST vmware-tools-windows-9.2.3-1031769.x86_64.component.tar 61777920 SHA256 dbb7f6dbbcf9e44263193e40ad89944a45ef860f4f3b4b51d00ae1602f863f8c SHA512 818e2895c57be6792e82362c9616e2e6e8638997bde65ecea1416f71ccfa9681fc5cd44cd3356780ab35345e6b19ac8054a05eb8424dff1bcd779c9b686455a9 WHIRLPOOL ab847bddd07b029ba7a75fb6ae96133211d5a412fbe2059f851ae249854357dd0e25ab28df98fc2a3ee33f5aae08587a8b4bbfd6a60a2313f77fe6f98a1a3a3d
 DIST vmware-tools-windows-9.6.1-1379776.i386.component.tar 69232640 SHA256 cb09c083adec2bd6a10f9cb75e4570fc19019ddd98320e7cf1ddf311737f75bd SHA512 a1caf8095e8ec56cf15c55e6c0081e16dc3b25e035f1a50eb9f6636a5879b5bbadb4dd079d822b6b1c27f2279c4214eefe004e460f1c1ae70f28242d0aafd400 WHIRLPOOL e61f9df173f83e8844dafd9e226d4b8cd0530df18b4104d1229d18a8c4e8757adc35ac1085602baeb35ba4896273070739c4d783679f18085583124bd856a715
 DIST vmware-tools-windows-9.6.1-1379776.x86_64.component.tar 69232640 SHA256 4034d5f0fe06a7fb4d2dcd7159f59223f0886d2be5ea4dd1ae685cf5ff0c535d SHA512 8a1be0aae39bf7abe5c76d74f26f7f936dda2d6d169d3e5256479251cb961753abcb519647fcc6a026da11d57f45fa626d1c4a7d91a985ffd2361b2468ab601c WHIRLPOOL 2faccc4a8c04fb52bc0749dd69e887b3ad6f8e9776623f7e583590c5e1612de50bb3355372a60e850104f13f8c9ecd613e5f43ebccffe86661838b757110b57c
 DIST vmware-tools-windows-9.6.2-1744117.i386.component.tar 69283840 SHA256 f5f43a1a8d39b16d74953a6ffd36f8b56a4e20808918e7358047080f961c7367 SHA512 9fd041f13d250665ea4adb5d9af7c07e1f3eb48708e1744e88ab7378844632e7da2c42c283b87d0b58af3afc456b9b6cd2eebfc28af1ccca3a53b7968eaadb7f WHIRLPOOL 12ccfd6c5d947caaceb7319359ccf70185ed4fe2d0bd60c39e1f4f6200d7ef89bd1a2c7fbeec5eb7b675fc23cd30aa8339fedfed1350f23745640a768fa9df07
 DIST vmware-tools-windows-9.6.2-1744117.x86_64.component.tar 69283840 SHA256 d4fe4f1d5137c577dd2b82eae8eeee55fe4fc021506eeaa8eaf77ef45f309331 SHA512 c3e40d7e2b10e6c318776d7fcef151c140fd20848de6d48d4a380ff8596b0c4889f8c46816bcacd6e3cdd815d0d8b868283714dba9e9095d94a7cd64da79dc80 WHIRLPOOL 0b1670d8ce585333755fccc72fa55bed6919645c5756917dfd96ccfd6a1eca9d9cd17c74f6458b38e8b9db0632668a33ff9b6d6724e4b01d185eaceff9f14e41
+DIST vmware-tools-windows-9.6.5-2700073.i386.component.tar 69294080 SHA256 6aba23b1bd9f7877c7fd54102f634dbf6d0d61fe2640d2e56f280395ad595f45 SHA512 fb63d93dd2ca26aeae42f27ce4b0dcda4991f10e0077a8384b8c7bbc3dbf73fa1f62f986a6c5661b70aed59e3841dc9a63b0de76c637ef62d919f9b667149dae WHIRLPOOL 8969ab16cc660b39626f40af69563bd85f40547d4656e156c4ef79221b6d71f8c9cd1b9ec6e0657f1c61f7104748cf84c356a5ff50339462f998d677a762eee5
+DIST vmware-tools-windows-9.6.5-2700073.x86_64.component.tar 69294080 SHA256 effeb7d57c0c916de4b18f80df4cd8d9fcf00d0dda886b2ba0ce23179b3ad0fa SHA512 bcf036d3fa54b1b0ae98370a54f0e5d95ba68a6476fc79f60615d5754f370b8724d0ccaa6c826f843ebb3e1eb1afceb03701214774ff0b1e40742be5e9adad3f WHIRLPOOL 595918763b0b31ab07725b19c9642730bfb4ed14cec44ed4920bed0aed38b3d71ffab9a931b2923aef63514ff180f4f2221e1b6694418578ca1d2960531e4438
+DIST vmware-tools-windows-9.9.2-2496824.x86_64.component.tar 71485440 SHA256 3ef86f0bfce6f9396b4868d2fc067baa425cf9d1db2c4361dad81adb8fb02b69 SHA512 0c1df24026f96d160c3e3f4afac127d82f5ba1a4aabff4ca8fa64a60cde4b67b648601144d54a97bc760636bea1f9e71229b05bdc1c6d2959b3be93c1dc421eb WHIRLPOOL 090e49c1452987a77010e20f23f24f747e3158d4cc7ab6604d3fada16bb42410b34631c82d1580611bb7364faa1174108cce037ec4cc873821fe68e3d745cb3c
+DIST vmware-tools-windows-9.9.3-2780323.x86_64.component.tar 71495680 SHA256 fa53a1cb525876a5e809dd5429b4572091642ddc2d731ef3b9a242378c972696 SHA512 9e9db19c116f02e0885e07dd6803b6353439125331deb5722a949a10f023dcc694431599e2dd9a4f7a51dfd48510317854ce513684112444443f63e77e0d2c5d WHIRLPOOL dc32f12d603db31e0ec0853ab936c478f1eb0c04cf669e3b7e48ad058bc035e35ad8ba0783616f6370acb1d3c3ef777673d39c663f889998a62593e814aa93eb
diff --git a/app-emulation/vmware-tools/vmware-tools-9.6.5.2700073.ebuild b/app-emulation/vmware-tools/vmware-tools-9.6.5.2700073.ebuild
new file mode 100644
index 000000000000..6a3c9feefb11
--- /dev/null
+++ b/app-emulation/vmware-tools/vmware-tools-9.6.5.2700073.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+inherit versionator vmware-bundle
+
+MY_PV="$(replace_version_separator 3 - $PV)"
+BASE_URI="http://softwareupdate.vmware.com/cds/vmw-desktop/player/6.0.6/$(get_version_component_range 4)/linux/packages/"
+
+DESCRIPTION="VMware Tools for guest operating systems"
+HOMEPAGE="http://www.vmware.com/products/player/"
+
+LICENSE="vmware"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+RESTRICT="mirror"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
+
+IUSE_VMWARE_GUEST="freebsd linux netware solaris windows winPre2k"
+
+VM_INSTALL_DIR="/opt/vmware"
+
+for guest in ${IUSE_VMWARE_GUEST} ; do
+	SRC_URI+=" vmware_guest_${guest}? (
+		amd64? ( ${BASE_URI}vmware-tools-${guest}-${MY_PV}.x86_64.component.tar )
+		x86? ( ${BASE_URI}vmware-tools-${guest}-${MY_PV}.i386.component.tar )
+		)"
+	IUSE+=" vmware_guest_${guest}"
+done ; unset guest
+
+src_unpack() {
+	local arch
+	if use x86 ; then arch='i386'
+	elif use amd64 ; then arch='x86_64'
+	fi
+	local guest ; for guest in ${IUSE_VMWARE_GUEST} ; do
+		if use "vmware_guest_${guest}" ; then
+			local component="vmware-tools-${guest}-${MY_PV}.${arch}.component"
+			unpack "${component}.tar"
+			vmware-bundle_extract-component "${component}"
+		fi
+	done
+}
+
+src_install() {
+	insinto "${VM_INSTALL_DIR}"/lib/vmware/isoimages
+	local guest ; for guest in ${IUSE_VMWARE_GUEST} ; do
+		if use "vmware_guest_${guest}" ; then
+			doins "${guest}".iso{,.sig}
+		fi
+	done
+}
diff --git a/app-emulation/vmware-tools/vmware-tools-9.9.2.2496824.ebuild b/app-emulation/vmware-tools/vmware-tools-9.9.2.2496824.ebuild
new file mode 100644
index 000000000000..c2c4593bdef2
--- /dev/null
+++ b/app-emulation/vmware-tools/vmware-tools-9.9.2.2496824.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: Exp $
+
+inherit versionator vmware-bundle
+
+MY_PV="$(replace_version_separator 3 - $PV)"
+BASE_URI="http://softwareupdate.vmware.com/cds/vmw-desktop/player/7.1.0/$(get_version_component_range 4)/linux/packages/"
+
+DESCRIPTION="VMware Tools for guest operating systems"
+HOMEPAGE="http://www.vmware.com/products/player/"
+
+LICENSE="vmware"
+SLOT="0"
+KEYWORDS="-* ~amd64"
+RESTRICT="mirror"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
+
+IUSE_VMWARE_GUEST="freebsd linux netware solaris windows winPre2k"
+
+VM_INSTALL_DIR="/opt/vmware"
+
+for guest in ${IUSE_VMWARE_GUEST} ; do
+	SRC_URI+=" vmware_guest_${guest}? (
+		amd64? ( ${BASE_URI}vmware-tools-${guest}-${MY_PV}.x86_64.component.tar )
+		)"
+	IUSE+=" vmware_guest_${guest}"
+done ; unset guest
+
+src_unpack() {
+	local arch
+	if use x86 ; then arch='i386'
+	elif use amd64 ; then arch='x86_64'
+	fi
+	local guest ; for guest in ${IUSE_VMWARE_GUEST} ; do
+		if use "vmware_guest_${guest}" ; then
+			local component="vmware-tools-${guest}-${MY_PV}.${arch}.component"
+			unpack "${component}.tar"
+			vmware-bundle_extract-component "${component}"
+		fi
+	done
+}
+
+src_install() {
+	insinto "${VM_INSTALL_DIR}"/lib/vmware/isoimages
+	local guest ; for guest in ${IUSE_VMWARE_GUEST} ; do
+		if use "vmware_guest_${guest}" ; then
+			doins "${guest}".iso{,.sig}
+		fi
+	done
+}
diff --git a/app-emulation/vmware-tools/vmware-tools-9.9.3.2780323.ebuild b/app-emulation/vmware-tools/vmware-tools-9.9.3.2780323.ebuild
new file mode 100644
index 000000000000..790bbe60c101
--- /dev/null
+++ b/app-emulation/vmware-tools/vmware-tools-9.9.3.2780323.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: Exp $
+
+inherit versionator vmware-bundle
+
+MY_PV="$(replace_version_separator 3 - $PV)"
+BASE_URI="http://softwareupdate.vmware.com/cds/vmw-desktop/player/7.1.2/$(get_version_component_range 4)/linux/packages/"
+
+DESCRIPTION="VMware Tools for guest operating systems"
+HOMEPAGE="http://www.vmware.com/products/player/"
+
+LICENSE="vmware"
+SLOT="0"
+KEYWORDS="-* ~amd64"
+RESTRICT="mirror"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
+
+IUSE_VMWARE_GUEST="freebsd linux netware solaris windows winPre2k"
+
+VM_INSTALL_DIR="/opt/vmware"
+
+for guest in ${IUSE_VMWARE_GUEST} ; do
+	SRC_URI+=" vmware_guest_${guest}? (
+		amd64? ( ${BASE_URI}vmware-tools-${guest}-${MY_PV}.x86_64.component.tar )
+		)"
+	IUSE+=" vmware_guest_${guest}"
+done ; unset guest
+
+src_unpack() {
+	local arch
+	if use x86 ; then arch='i386'
+	elif use amd64 ; then arch='x86_64'
+	fi
+	local guest ; for guest in ${IUSE_VMWARE_GUEST} ; do
+		if use "vmware_guest_${guest}" ; then
+			local component="vmware-tools-${guest}-${MY_PV}.${arch}.component"
+			unpack "${component}.tar"
+			vmware-bundle_extract-component "${component}"
+		fi
+	done
+}
+
+src_install() {
+	insinto "${VM_INSTALL_DIR}"/lib/vmware/isoimages
+	local guest ; for guest in ${IUSE_VMWARE_GUEST} ; do
+		if use "vmware_guest_${guest}" ; then
+			doins "${guest}".iso{,.sig}
+		fi
+	done
+}
diff --git a/app-emulation/vmware-workstation/Manifest b/app-emulation/vmware-workstation/Manifest
index 46c1c76d08cf..b2c8179261a5 100644
--- a/app-emulation/vmware-workstation/Manifest
+++ b/app-emulation/vmware-workstation/Manifest
@@ -1,9 +1,6 @@
-DIST VMware-Workstation-10.0.1-1379776.i386.bundle.tar 282562560 SHA256 14482ce63270b16cd0ffaa176fc84b0d2e82d7f49f082c4c277a4552156ac351 SHA512 f53eaf70b905e235fe16fc642303def43155ece6847179b48c95cdb9aa4ea2bc2d16d0126178ab021a25101c955b061f2572a6e55e53a10cf89383bec1a6016f WHIRLPOOL 250490facd8559fe1e920c1bfe61dcbf2c493b99504d65c1b2b961ffee837342d923c9858585893bebf9657dee058db2d6cbee5ced957405b802e13cbd37891a
-DIST VMware-Workstation-10.0.1-1379776.x86_64.bundle.tar 253132800 SHA256 4fef8984cb30ea04f204ef4dcdc9c5740fe31d196bb89c9af4f05187f749ba06 SHA512 e92a17bc6c21a365bf402fcfb07ffbc7c0c6adf61a040f148a81dafb9634c8c01db81479e48ff37f0ee43f72e90cca9aa54d59d0985006b1f9d0b2f1b6313eb5 WHIRLPOOL ba6b3f9ba03d4933010ecd37a41034c327943ae0e6aa2110b603d4d9cfa844ba0b2c1973eb8099fbbc3deefb82525ea0329d28cb871583812440a901713941bc
-DIST VMware-Workstation-10.0.2-1744117.i386.bundle.tar 283658240 SHA256 3b8fcdf6e459c93b3f2a69288eed53dc92931841d30f064701030434e08231ea SHA512 a5b574d8d0bf5c32a8aa177fcc7d51456ba11fe81e142ba1c16fd25393faa0944844ed10c9e6438ac66ebaeeeefeca1561a590f42768d1685347b93c7acacc23 WHIRLPOOL 53686ed03fdadbd829f560e432bd64d3f227a5f243ae921f2c789203c8a28f26f806ea30817937b31514abb740541ddb7c675855e6f93ec40f8f4d222e348888
-DIST VMware-Workstation-10.0.2-1744117.x86_64.bundle.tar 254115840 SHA256 95986090a4f2f59ae551a63a78f9ff5bdc3a87c48b25b10abb754720c3581f02 SHA512 69ede2f67e3283a3b234605ca5aa05555da008917d6b329ab6ca27f578620b6268ec79622b4fc5c331111f527fcac917dd78a844ad2ff4bbd0149aa4dbb7755d WHIRLPOOL 42117a4bb6184629ec2e8c13c39f3298c746a4fa10b0928cee3ccd1c3e4464af95f59c7ff0f71c44184d25cc91e593cbb40fd050275ee1e66b308010fc907a17
-DIST VMware-Workstation-10.0.3-1895310.i386.bundle.tar 283648000 SHA256 8d66dd5b9351e53ce6729f96f8c9eca0631926220e14c34395236e9133b0c717 SHA512 32b953d25a89ac7a681a5e54adb8005ab32f47ca536af56e6b0095984376e28c59609af615b0f9f5a32999bbb65e2c2d20a4dca25ff7f28768435a1ac60b9ba3 WHIRLPOOL 060d82b470a5fb382ba49e4e2859d3e363864c451b91e4ece2bc19a75131b395438039dfb3cb9baa316beae70992f1ddc47522c0d891c17bbc67cbc1510eacfb
-DIST VMware-Workstation-10.0.3-1895310.x86_64.bundle.tar 254105600 SHA256 59cd70ddb31b08bcf0cf369b4d2d566dee70ed0119a93ec34e180adcd82852bc SHA512 bf32a4d31152c614291cdb490a4ce41a51dbb5421232b8abef7461438e60f6dd8c989e6bf17899ef2d4e4dfb3e36707374368e5d09039f4193b402175d1fb421 WHIRLPOOL cae78535dfe59334b3812586ac454086bf54c32f238ee1a5981e404382ec4b5c2b5042de89fe568545908824377b77bfbd6ec549c1b5968502358d96ce49ff9e
+DIST VMware-Workstation-10.0.6-2700073.i386.bundle.tar 281272320 SHA256 02b6c26ba33027344a943734e48cac03ed522a9cf09131837758af3ebd27ea60 SHA512 f65ce16784c9fccb0a6f09abe52bbbe1cc1567d366d03cfe0f79fdfbf4b9d5fef8238a6f62e969b8415112bf063f3d6a5e66239aa89159172520c80efd90c7e9 WHIRLPOOL 11ffae3b8a7e059e63afd2a8a19f9a07d8d63d2ef8f83c623b37e315750b09cb9a31537125614610fc988184017fe45b3ae5408670257c1dc9531dd6b6b17717
+DIST VMware-Workstation-10.0.6-2700073.x86_64.bundle.tar 252610560 SHA256 e29edcb0638f32bff81d372c9eaf54e663e3376cd1d89dbd4cfe4cab533398b2 SHA512 072de1da92cbef890707a6c4e3d5223fdc60e50a5166bb72b1ebc098d28c1a75b83ed65a29fdf1311e119e590560546e376909e1384f1eab05918500ec80ede4 WHIRLPOOL 3f4252abb6c87424b88fa34adc29e1927d1e6458beca65d9b290ff0c8ad4ccaf2945e2209670f8f8d4e84548d806c18fb23dc8380ec65452841e2c0bbcce89aa
+DIST VMware-Workstation-11.1.2-2780323.x86_64.bundle.tar 259133440 SHA256 085b50175b253647d8b2cb188286d3cf9265ed246cc0deb3b142b0438ef5725f SHA512 1c43ebaa4f8b228ec00f24a263eddcbbad5c0c940cd67040e6e2275c3a4aab6c9e2e5ee96996ca4f007ff786ece978c5789214ad92479720182fc3153d7edbde WHIRLPOOL 60e359a1dcfe1178652d8c6be705dda4f2f31b109bf01d5b5b16dc03e26a649e8f1af2ffa03d68e9108646c98e9cad41c10a9452ea14950883f9162e57ac20ca
 DIST VMware-Workstation-9.0.3-1410761.i386.bundle.tar 264908800 SHA256 dfe9aaa75987793eac096c0fbdb364f94e354ab668213774ea3e90d5ddcecdc0 SHA512 5d0943400cb1fefca20f1a81d3989bf5cdda5e123d1a70b09ebc20a56498d36f597ed7a0730d2f6f752c3c4baad2c86d5ef7691e8d245147d944c6f7e4e708b0 WHIRLPOOL 14a950f2deb03c3b7a088d4fb50378c7109330d89903965c28ead0be1e2223dbce05a628b1ea859215d31a8978f497bd8f807652cf266667d67893eaf2d7372b
 DIST VMware-Workstation-9.0.3-1410761.x86_64.bundle.tar 232724480 SHA256 2612f8a523c9f23164d7557c105520bc6e010af82b3e6d4a3ada04d8ff03cbf0 SHA512 07923231e481550cb0348e40ef341c2d0682ac0daf6c8e0ada130c03113f43a37bf322e64fb9dc73511dea0fd2851f3cb4f5e755bbad4beba9e3cc4e69566070 WHIRLPOOL d979f2d9ef8888be89d5747c16e0db7ca45609cd9d77d84baf8485b4956f9e9f99bf46c33a2690b7b1fea851c0495ed0a06b36e3e69b51abfc11604d9a62fe4d
 DIST gentoo-01.tar.gz 1884 SHA256 e92c694865f1b29f4d7a39efa1dd87bc71dc5f922573f00a3d31ee8e27a8c335 SHA512 454ab93997781bd0a9accddb2ac7bb446f07ea7cddef5640369025c30e03592e14869e0f0f7b4457db2f1ada31c98051426016c86201afa8bc8e3aa4ccc2f875 WHIRLPOOL 9202583b617532ab2612b384da307218e7c93c2962f0d233e28bea066b07163c9bc51c0a599309f9d703c5575ebeb292d787716225624dc1c2fdff3c44fa3513
diff --git a/app-emulation/vmware-workstation/files/vmware-11.0.rc b/app-emulation/vmware-workstation/files/vmware-11.0.rc
new file mode 100644
index 000000000000..2a827bc1ae31
--- /dev/null
+++ b/app-emulation/vmware-workstation/files/vmware-11.0.rc
@@ -0,0 +1,44 @@
+#!/sbin/runscript
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+depend() {
+	need localmount
+	use net
+}
+
+start() {
+	ebegin Starting VMware USB Arbitrator
+	#start-stop-daemon --start --exec @@BINDIR@@/vmware-usbarbitrator
+	@@BINDIR@@/vmware-usbarbitrator 
+	eend $?
+	ebegin Starting VMware services
+	
+	# quiet for vmci because it may not be there
+	modprobe -vq vmci || modprobe -v vmw_vmci
+	eend $?
+	
+	# vmci or vmw_vmci was loaded by the previous modprobe 
+	# no need to do it here
+	modprobe -av vmmon vsock vmblock vmnet 
+	eend $?
+	@@BINDIR@@/vmware-networks --start
+	eend $?
+}
+
+stop() {
+	ebegin Stopping VMware USB Arbitrator
+	#start-stop-daemon --stop --exec @@BINDIR@@/vmware-usbarbitrator
+	killall --wait @@BINDIR@@/vmware-usbarbitrator 
+	eend $?
+	@@BINDIR@@/vmware-networks --stop 
+	eend $?
+	ebegin Stopping VMware services
+	modprobe -rv vsock vmmon vmblock vmnet
+	eend $?
+	
+	# quiet for vmci because it may not be there
+	modprobe -rvq vmci || modprobe -rv vmw_vmci
+	eend $?
+}
diff --git a/app-emulation/vmware-workstation/files/vmware-11.1.rc b/app-emulation/vmware-workstation/files/vmware-11.1.rc
new file mode 100644
index 000000000000..2a827bc1ae31
--- /dev/null
+++ b/app-emulation/vmware-workstation/files/vmware-11.1.rc
@@ -0,0 +1,44 @@
+#!/sbin/runscript
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+depend() {
+	need localmount
+	use net
+}
+
+start() {
+	ebegin Starting VMware USB Arbitrator
+	#start-stop-daemon --start --exec @@BINDIR@@/vmware-usbarbitrator
+	@@BINDIR@@/vmware-usbarbitrator 
+	eend $?
+	ebegin Starting VMware services
+	
+	# quiet for vmci because it may not be there
+	modprobe -vq vmci || modprobe -v vmw_vmci
+	eend $?
+	
+	# vmci or vmw_vmci was loaded by the previous modprobe 
+	# no need to do it here
+	modprobe -av vmmon vsock vmblock vmnet 
+	eend $?
+	@@BINDIR@@/vmware-networks --start
+	eend $?
+}
+
+stop() {
+	ebegin Stopping VMware USB Arbitrator
+	#start-stop-daemon --stop --exec @@BINDIR@@/vmware-usbarbitrator
+	killall --wait @@BINDIR@@/vmware-usbarbitrator 
+	eend $?
+	@@BINDIR@@/vmware-networks --stop 
+	eend $?
+	ebegin Stopping VMware services
+	modprobe -rv vsock vmmon vmblock vmnet
+	eend $?
+	
+	# quiet for vmci because it may not be there
+	modprobe -rvq vmci || modprobe -rv vmw_vmci
+	eend $?
+}
diff --git a/app-emulation/vmware-workstation/files/vmware-11.2.rc b/app-emulation/vmware-workstation/files/vmware-11.2.rc
new file mode 100644
index 000000000000..2a827bc1ae31
--- /dev/null
+++ b/app-emulation/vmware-workstation/files/vmware-11.2.rc
@@ -0,0 +1,44 @@
+#!/sbin/runscript
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+depend() {
+	need localmount
+	use net
+}
+
+start() {
+	ebegin Starting VMware USB Arbitrator
+	#start-stop-daemon --start --exec @@BINDIR@@/vmware-usbarbitrator
+	@@BINDIR@@/vmware-usbarbitrator 
+	eend $?
+	ebegin Starting VMware services
+	
+	# quiet for vmci because it may not be there
+	modprobe -vq vmci || modprobe -v vmw_vmci
+	eend $?
+	
+	# vmci or vmw_vmci was loaded by the previous modprobe 
+	# no need to do it here
+	modprobe -av vmmon vsock vmblock vmnet 
+	eend $?
+	@@BINDIR@@/vmware-networks --start
+	eend $?
+}
+
+stop() {
+	ebegin Stopping VMware USB Arbitrator
+	#start-stop-daemon --stop --exec @@BINDIR@@/vmware-usbarbitrator
+	killall --wait @@BINDIR@@/vmware-usbarbitrator 
+	eend $?
+	@@BINDIR@@/vmware-networks --stop 
+	eend $?
+	ebegin Stopping VMware services
+	modprobe -rv vsock vmmon vmblock vmnet
+	eend $?
+	
+	# quiet for vmci because it may not be there
+	modprobe -rvq vmci || modprobe -rv vmw_vmci
+	eend $?
+}
diff --git a/app-emulation/vmware-workstation/files/vmware-server-11.0.rc b/app-emulation/vmware-workstation/files/vmware-server-11.0.rc
new file mode 100644
index 000000000000..353f3693046b
--- /dev/null
+++ b/app-emulation/vmware-workstation/files/vmware-server-11.0.rc
@@ -0,0 +1,55 @@
+#!/sbin/runscript
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-workstation/files/vmware-server-10.0.rc,v 1.1 2013/10/19 11:38:39 dilfridge Exp $
+
+depend() {
+	need localmount vmware
+	use net
+}
+
+checkconfig() {
+	# Check if certificates exist.  If not, we need to generate them, ala sshd.
+	if [ ! -e @@ETCDIR@@/ssl/rui.key -o ! -e @@ETCDIR@@/ssl/rui.crt ]; then
+		mkdir -p @@ETCDIR@@/ssl
+		openssl req -x509 -days 365 -newkey rsa:2048 -keyout @@ETCDIR@@/ssl/rui.key -out @@ETCDIR@@/ssl/rui.crt -config @@ETCDIR@@/ssl/hostd.ssl.config
+		chmod -R 600 @@ETCDIR@@/ssl
+	fi
+}
+
+start() {
+	checkconfig
+
+	ebegin Starting VMware Authentication Daemon
+	start-stop-daemon --start \
+	  --exec @@PREFIX@@/sbin/vmware-authdlauncher
+	eend $?
+	ebegin Starting VMware Workstation Server
+	start-stop-daemon --start \
+	  --pidfile /var/run/vmware/vmware-hostd.PID \
+	  --exec @@BINDIR@@/vmware-hostd \
+	  -- -a -d @@ETCDIR@@/hostd/config.xml
+
+	eend $?
+}
+
+stop() {
+	ebegin "Shutdown VMs in the AutoStart Sequence"
+	local HOHO_ADMIN="$(@@BINDIR@@/vmware-wssc-adminTool "@@ETCDIR@@/hostd/authorization.xml" 2>/dev/null)"
+
+	if [ "x" != "x${HOHO_ADMIN}" ]; then
+		@@BINDIR@@/vmware-vim-cmd -U "${HOHO_ADMIN}" hostsvc/autostartmanager/autostop
+	fi
+	eend $?
+
+	ebegin Stopping VMware Workstation Server
+	start-stop-daemon --stop \
+	  --pidfile /var/run/vmware/vmware-hostd.PID \
+	  --exec @@BINDIR@@/vmware-hostd 
+	eend $?
+	ebegin Stopping VMware Authentication Daemon
+	#start-stop-daemon --stop \
+	#  --exec @@PREFIX@@/sbin/vmware-authdlauncher
+	killall @@PREFIX@@/sbin/vmware-authdlauncher
+	eend $?
+}
diff --git a/app-emulation/vmware-workstation/files/vmware-server-11.1.rc b/app-emulation/vmware-workstation/files/vmware-server-11.1.rc
new file mode 100644
index 000000000000..353f3693046b
--- /dev/null
+++ b/app-emulation/vmware-workstation/files/vmware-server-11.1.rc
@@ -0,0 +1,55 @@
+#!/sbin/runscript
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-workstation/files/vmware-server-10.0.rc,v 1.1 2013/10/19 11:38:39 dilfridge Exp $
+
+depend() {
+	need localmount vmware
+	use net
+}
+
+checkconfig() {
+	# Check if certificates exist.  If not, we need to generate them, ala sshd.
+	if [ ! -e @@ETCDIR@@/ssl/rui.key -o ! -e @@ETCDIR@@/ssl/rui.crt ]; then
+		mkdir -p @@ETCDIR@@/ssl
+		openssl req -x509 -days 365 -newkey rsa:2048 -keyout @@ETCDIR@@/ssl/rui.key -out @@ETCDIR@@/ssl/rui.crt -config @@ETCDIR@@/ssl/hostd.ssl.config
+		chmod -R 600 @@ETCDIR@@/ssl
+	fi
+}
+
+start() {
+	checkconfig
+
+	ebegin Starting VMware Authentication Daemon
+	start-stop-daemon --start \
+	  --exec @@PREFIX@@/sbin/vmware-authdlauncher
+	eend $?
+	ebegin Starting VMware Workstation Server
+	start-stop-daemon --start \
+	  --pidfile /var/run/vmware/vmware-hostd.PID \
+	  --exec @@BINDIR@@/vmware-hostd \
+	  -- -a -d @@ETCDIR@@/hostd/config.xml
+
+	eend $?
+}
+
+stop() {
+	ebegin "Shutdown VMs in the AutoStart Sequence"
+	local HOHO_ADMIN="$(@@BINDIR@@/vmware-wssc-adminTool "@@ETCDIR@@/hostd/authorization.xml" 2>/dev/null)"
+
+	if [ "x" != "x${HOHO_ADMIN}" ]; then
+		@@BINDIR@@/vmware-vim-cmd -U "${HOHO_ADMIN}" hostsvc/autostartmanager/autostop
+	fi
+	eend $?
+
+	ebegin Stopping VMware Workstation Server
+	start-stop-daemon --stop \
+	  --pidfile /var/run/vmware/vmware-hostd.PID \
+	  --exec @@BINDIR@@/vmware-hostd 
+	eend $?
+	ebegin Stopping VMware Authentication Daemon
+	#start-stop-daemon --stop \
+	#  --exec @@PREFIX@@/sbin/vmware-authdlauncher
+	killall @@PREFIX@@/sbin/vmware-authdlauncher
+	eend $?
+}
diff --git a/app-emulation/vmware-workstation/files/vmware-server-11.2.rc b/app-emulation/vmware-workstation/files/vmware-server-11.2.rc
new file mode 100644
index 000000000000..353f3693046b
--- /dev/null
+++ b/app-emulation/vmware-workstation/files/vmware-server-11.2.rc
@@ -0,0 +1,55 @@
+#!/sbin/runscript
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-workstation/files/vmware-server-10.0.rc,v 1.1 2013/10/19 11:38:39 dilfridge Exp $
+
+depend() {
+	need localmount vmware
+	use net
+}
+
+checkconfig() {
+	# Check if certificates exist.  If not, we need to generate them, ala sshd.
+	if [ ! -e @@ETCDIR@@/ssl/rui.key -o ! -e @@ETCDIR@@/ssl/rui.crt ]; then
+		mkdir -p @@ETCDIR@@/ssl
+		openssl req -x509 -days 365 -newkey rsa:2048 -keyout @@ETCDIR@@/ssl/rui.key -out @@ETCDIR@@/ssl/rui.crt -config @@ETCDIR@@/ssl/hostd.ssl.config
+		chmod -R 600 @@ETCDIR@@/ssl
+	fi
+}
+
+start() {
+	checkconfig
+
+	ebegin Starting VMware Authentication Daemon
+	start-stop-daemon --start \
+	  --exec @@PREFIX@@/sbin/vmware-authdlauncher
+	eend $?
+	ebegin Starting VMware Workstation Server
+	start-stop-daemon --start \
+	  --pidfile /var/run/vmware/vmware-hostd.PID \
+	  --exec @@BINDIR@@/vmware-hostd \
+	  -- -a -d @@ETCDIR@@/hostd/config.xml
+
+	eend $?
+}
+
+stop() {
+	ebegin "Shutdown VMs in the AutoStart Sequence"
+	local HOHO_ADMIN="$(@@BINDIR@@/vmware-wssc-adminTool "@@ETCDIR@@/hostd/authorization.xml" 2>/dev/null)"
+
+	if [ "x" != "x${HOHO_ADMIN}" ]; then
+		@@BINDIR@@/vmware-vim-cmd -U "${HOHO_ADMIN}" hostsvc/autostartmanager/autostop
+	fi
+	eend $?
+
+	ebegin Stopping VMware Workstation Server
+	start-stop-daemon --stop \
+	  --pidfile /var/run/vmware/vmware-hostd.PID \
+	  --exec @@BINDIR@@/vmware-hostd 
+	eend $?
+	ebegin Stopping VMware Authentication Daemon
+	#start-stop-daemon --stop \
+	#  --exec @@PREFIX@@/sbin/vmware-authdlauncher
+	killall @@PREFIX@@/sbin/vmware-authdlauncher
+	eend $?
+}
diff --git a/app-emulation/vmware-workstation/vmware-workstation-10.0.1.1379776-r1.ebuild b/app-emulation/vmware-workstation/vmware-workstation-10.0.1.1379776-r1.ebuild
deleted file mode 100644
index fa297474b979..000000000000
--- a/app-emulation/vmware-workstation/vmware-workstation-10.0.1.1379776-r1.ebuild
+++ /dev/null
@@ -1,493 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-
-inherit eutils versionator fdo-mime systemd gnome2-utils pam vmware-bundle
-
-MY_PN="VMware-Workstation"
-MY_PV=$(get_version_component_range 1-3)
-PV_MINOR=$(get_version_component_range 3)
-PV_BUILD=$(get_version_component_range 4)
-MY_P="${MY_PN}-${MY_PV}-${PV_BUILD}"
-
-SYSTEMD_UNITS_TAG="gentoo-01"
-
-DESCRIPTION="Emulate a complete PC on your PC without the usual performance overhead of most emulators"
-HOMEPAGE="http://www.vmware.com/products/workstation/"
-BASE_URI="https://softwareupdate.vmware.com/cds/vmw-desktop/ws/${MY_PV}/${PV_BUILD}/linux/core/"
-SRC_URI="
-	x86? ( ${BASE_URI}${MY_P}.i386.bundle.tar )
-	amd64? ( ${BASE_URI}${MY_P}.x86_64.bundle.tar )
-	https://github.com/akhuettel/systemd-vmware/archive/${SYSTEMD_UNITS_TAG}.tar.gz
-	"
-LICENSE="vmware GPL-2"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE="cups doc ovftool server vix vmware-tools"
-RESTRICT="mirror strip"
-
-# vmware-workstation should not use virtual/libc as this is a
-# precompiled binary package thats linked to glibc.
-RDEPEND="dev-cpp/cairomm
-	dev-cpp/glibmm:2
-	dev-cpp/gtkmm:2.4
-	dev-cpp/libgnomecanvasmm
-	dev-cpp/pangomm
-	dev-libs/atk
-	dev-libs/glib:2
-	dev-libs/icu
-	dev-libs/expat
-	dev-libs/libaio
-	dev-libs/libgcrypt:0
-	dev-libs/libsigc++
-	dev-libs/libxml2
-	=dev-libs/openssl-0.9.8*
-	dev-libs/xmlrpc-c
-	gnome-base/libgnomecanvas
-	gnome-base/libgtop:2
-	gnome-base/librsvg:2
-	gnome-base/orbit
-	media-libs/fontconfig
-	media-libs/freetype
-	media-libs/libart_lgpl
-	=media-libs/libpng-1.2*
-	media-libs/libpng
-	net-misc/curl
-	cups? ( net-print/cups )
-	sys-devel/gcc
-	sys-fs/fuse
-	sys-libs/glibc
-	sys-libs/zlib
-	x11-libs/cairo
-	x11-libs/gtk+:2
-	x11-libs/libgksu
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-	x11-libs/libXau
-	x11-libs/libxcb
-	x11-libs/libXcomposite
-	x11-libs/libXcursor
-	x11-libs/libXdamage
-	x11-libs/libXdmcp
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXft
-	x11-libs/libXi
-	x11-libs/libXinerama
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	x11-libs/libXtst
-	x11-libs/pango
-	x11-libs/pangox-compat
-	x11-libs/startup-notification
-	x11-themes/hicolor-icon-theme
-	!app-emulation/vmware-player"
-PDEPEND="~app-emulation/vmware-modules-279.${PV_MINOR}
-	vmware-tools? ( app-emulation/vmware-tools )"
-
-S=${WORKDIR}
-VM_INSTALL_DIR="/opt/vmware"
-VM_DATA_STORE_DIR="/var/lib/vmware/Shared VMs"
-VM_HOSTD_USER="root"
-
-src_unpack() {
-	default
-	local bundle
-	use amd64 && bundle=${MY_P}.x86_64.bundle
-	use x86 && bundle=${MY_P}.i386.bundle
-	local component; for component in \
-		vmware-vmx \
-		vmware-player-app \
-		vmware-player-setup \
-		vmware-workstation \
-		vmware-network-editor \
-		vmware-network-editor-ui \
-		vmware-usbarbitrator \
-		vmware-vprobe
-	do
-		vmware-bundle_extract-bundle-component "${bundle}" "${component}" "${S}"
-	done
-
-	if use server; then
-		vmware-bundle_extract-bundle-component "${bundle}" vmware-workstation-server #"${S}"
-	fi
-
-	if use vix; then
-		vmware-bundle_extract-bundle-component "${bundle}" vmware-vix-core vmware-vix
-		vmware-bundle_extract-bundle-component "${bundle}" vmware-vix-lib-Workstation1000andvSphere550 vmware-vix
-	fi
-	if use ovftool; then
-		vmware-bundle_extract-bundle-component "${bundle}" vmware-ovftool
-	fi
-}
-
-src_prepare() {
-	rm -f  bin/vmware-modconfig
-	rm -rf lib/modules/binary
-	# Bug 459566
-	mv lib/libvmware-netcfg.so lib/lib/
-
-	if use server; then
-		rm -f vmware-workstation-server/bin/{openssl,configure-hostd.sh}
-	fi
-
-	find "${S}" -name '*.a' -delete
-
-#	clean_bundled_libs
-}
-
-clean_bundled_libs() {
-	ebegin 'Removing superfluous libraries'
-	cd lib/lib || die
-	ldconfig -p | \
-		sed 's:^\s\+\([^(]*[^( ]\).*=> /.*$:\1:g;t;d' | \
-		fgrep -vx 'libcrypto.so.0.9.8
-libssl.so.0.9.8i
-libgcr.so.0
-libglib-2.0.so.0' |
-		xargs -d'\n' -r rm -rf
-	eend
-}
-
-src_install() {
-	local major_minor=$(get_version_component_range 1-2 "${PV}")
-	local major_minor_revision=$(get_version_component_range 1-3 "${PV}")
-	local build=$(get_version_component_range 4 "${PV}")
-
-	# install the binaries
-	into "${VM_INSTALL_DIR}"
-	dobin bin/*
-
-	# install the libraries
-	insinto "${VM_INSTALL_DIR}"/lib/vmware
-	doins -r lib/*
-
-	# Bug 432918
-	dosym "${VM_INSTALL_DIR}"/lib/vmware/lib/libcrypto.so.0.9.8/libcrypto.so.0.9.8 \
-		"${VM_INSTALL_DIR}"/lib/vmware/lib/libvmwarebase.so.0/libcrypto.so.0.9.8
-	dosym "${VM_INSTALL_DIR}"/lib/vmware/lib/libssl.so.0.9.8/libssl.so.0.9.8 \
-		"${VM_INSTALL_DIR}"/lib/vmware/lib/libvmwarebase.so.0/libssl.so.0.9.8
-
-	# install the ancillaries
-	insinto /usr
-	doins -r share
-
-	if use cups; then
-		exeinto $(cups-config --serverbin)/filter
-		doexe extras/thnucups
-
-		insinto /etc/cups
-		doins -r etc/cups/*
-	fi
-
-	insinto /etc/xdg
-	doins -r etc/xdg/*
-
-	# install documentation
-	doman man/man1/vmware.1.gz
-
-	if use doc; then
-		dodoc doc/*
-	fi
-
-	insinto "${VM_INSTALL_DIR}"/lib/vmware/setup
-	doins vmware-config
-
-	# install vmware workstation server
-	if use server; then
-		dosbin sbin/*
-
-		cd "${S}"/vmware-workstation-server
-
-		# install binaries
-		into "${VM_INSTALL_DIR}"/lib/vmware
-		dobin bin/*
-
-		dobin "${FILESDIR}"/configure-hostd.sh
-
-		dobin "${FILESDIR}"/configure-hostd.sh
-
-		# install the libraries
-		insinto "${VM_INSTALL_DIR}"/lib/vmware/lib
-		doins -r lib/*
-
-		into "${VM_INSTALL_DIR}"
-		for tool in  vmware-{hostd,wssc-adminTool} ; do
-			cat > "${T}/${tool}" <<-EOF
-				#!/usr/bin/env bash
-				set -e
-
-				. /etc/vmware/bootstrap
-
-				exec "${VM_INSTALL_DIR}/lib/vmware/lib/wrapper-gtk24.sh" \\
-					"${VM_INSTALL_DIR}/lib/vmware/lib" \\
-					"${VM_INSTALL_DIR}/lib/vmware/bin/${tool}" \\
-					"${VM_INSTALL_DIR}/lib/vmware/libconf" "\$@"
-			EOF
-			dobin "${T}/${tool}"
-		done
-
-		insinto "${VM_INSTALL_DIR}"/lib/vmware
-		doins -r hostd
-
-		# create the configuration
-		insinto /etc/vmware/hostd
-		doins -r config/etc/vmware/hostd/*
-		doins -r etc/vmware/hostd/*
-
-		insinto /etc/vmware/ssl
-		doins etc/vmware/ssl/*
-
-		# pam
-		pamd_mimic_system vmware-authd auth account
-
-		# create directory for shared virtual machines.
-		keepdir "${VM_DATA_STORE_DIR}"
-		keepdir /var/log/vmware
-	fi
-
-	# install vmware-vix
-	if use vix; then
-		cd "${S}"/vmware-vix
-
-		# install the binary
-		into "${VM_INSTALL_DIR}"
-		dobin bin/*
-
-		# install the libraries
-		insinto "${VM_INSTALL_DIR}"/lib/vmware-vix
-		doins -r lib/*
-
-		dosym vmware-vix/libvixAllProducts.so "${VM_INSTALL_DIR}"/lib/libbvixAllProducts.so
-
-		# install headers
-		insinto /usr/include/vmware-vix
-		doins include/*
-
-		if use doc; then
-			dohtml -r doc/*
-		fi
-	fi
-
-	# install ovftool
-	if use ovftool; then
-		cd "${S}"
-
-		insinto "${VM_INSTALL_DIR}"/lib/vmware-ovftool
-		doins -r vmware-ovftool/*
-
-		chmod 0755 "${D}${VM_INSTALL_DIR}"/lib/vmware-ovftool/{ovftool,ovftool.bin}
-		dosym "${D}${VM_INSTALL_DIR}"/lib/vmware-ovftool/ovftool "${VM_INSTALL_DIR}"/bin/ovftool
-	fi
-
-	# create symlinks for the various tools
-	local tool ; for tool in thnuclnt vmware vmplayer{,-daemon} licenseTool vmamqpd \
-			vmware-{acetool,enter-serial,gksu,fuseUI,modconfig{,-console},netcfg,tray,unity-helper,zenity} ; do
-		dosym appLoader "${VM_INSTALL_DIR}"/lib/vmware/bin/"${tool}"
-	done
-	dosym "${VM_INSTALL_DIR}"/lib/vmware/bin/vmplayer "${VM_INSTALL_DIR}"/bin/vmplayer
-	dosym "${VM_INSTALL_DIR}"/lib/vmware/bin/vmware "${VM_INSTALL_DIR}"/bin/vmware
-	dosym "${VM_INSTALL_DIR}"/lib/vmware/icu /etc/vmware/icu
-
-	# fix permissions
-	fperms 0755 "${VM_INSTALL_DIR}"/lib/vmware/bin/{appLoader,fusermount,launcher.sh,mkisofs,vmware-remotemks}
-	fperms 0755 "${VM_INSTALL_DIR}"/lib/vmware/lib/{wrapper-gtk24.sh,libgksu2.so.0/gksu-run-helper}
-	fperms 0755 "${VM_INSTALL_DIR}"/lib/vmware/setup/vmware-config
-	fperms 4711 "${VM_INSTALL_DIR}"/bin/vmware-mount
-	fperms 4711 "${VM_INSTALL_DIR}"/lib/vmware/bin/vmware-vmx{,-debug,-stats}
-	if use server; then
-		fperms 0755 "${VM_INSTALL_DIR}"/lib/vmware/bin/vmware-{hostd,wssc-adminTool}
-		fperms 4711 "${VM_INSTALL_DIR}"/sbin/vmware-authd
-		fperms 1777 "${VM_DATA_STORE_DIR}"
-	fi
-	if use vix; then
-		fperms 0755 "${VM_INSTALL_DIR}"/lib/vmware-vix/setup/vmware-config
-	fi
-
-	# create the environment
-	local envd="${T}/90vmware"
-	cat > "${envd}" <<-EOF
-		PATH='${VM_INSTALL_DIR}/bin'
-		ROOTPATH='${VM_INSTALL_DIR}/bin'
-	EOF
-	doenvd "${envd}"
-
-	# create the configuration
-	dodir /etc/vmware
-
-	cat > "${D}"/etc/vmware/bootstrap <<-EOF
-		BINDIR='${VM_INSTALL_DIR}/bin'
-		LIBDIR='${VM_INSTALL_DIR}/lib'
-	EOF
-
-	cat > "${D}"/etc/vmware/config <<-EOF
-		bindir = "${VM_INSTALL_DIR}/bin"
-		libdir = "${VM_INSTALL_DIR}/lib/vmware"
-		initscriptdir = "/etc/init.d"
-		authd.fullpath = "${VM_INSTALL_DIR}/sbin/vmware-authd"
-		gksu.rootMethod = "su"
-		VMCI_CONFED = "yes"
-		VMBLOCK_CONFED = "yes"
-		VSOCK_CONFED = "yes"
-		NETWORKING = "yes"
-		player.product.version = "${major_minor_revision}"
-		product.version = "${major_minor_revision}"
-		product.buildNumber = "${build}"
-		product.name = "VMware Workstation"
-		workstation.product.version = "${major_minor_revision}"
-	EOF
-
-	if use vix; then
-		cat >> "${D}"/etc/vmware/config <<-EOF
-			vmware.fullpath = "${VM_INSTALL_DIR}/bin/vmware"
-			vix.libdir = "${VM_INSTALL_DIR}/lib/vmware-vix"
-			vix.config.version = "1"
-		EOF
-	fi
-
-	if use server; then
-		cat >> "${D}"/etc/vmware/config <<-EOF
-			authd.client.port = "902"
-			authd.proxy.nfc = "vmware-hostd:ha-nfc"
-			authd.soapserver = "TRUE"
-		EOF
-	fi
-
-	# install the init.d script
-	local initscript="${T}/vmware.rc"
-	sed -e "s:@@BINDIR@@:${VM_INSTALL_DIR}/bin:g" \
-		"${FILESDIR}/vmware-${major_minor}.rc" > ${initscript}
-	newinitd "${initscript}" vmware
-
-	if use server; then
-		# install the init.d script
-		local initscript="${T}/vmware-workstation-server.rc"
-		sed -e "s:@@ETCDIR@@:/etc/vmware:g" \
-			-e "s:@@PREFIX@@:${VM_INSTALL_DIR}:g" \
-			-e "s:@@BINDIR@@:${VM_INSTALL_DIR}/bin:g" \
-			-e "s:@@LIBDIR@@:${VM_INSTALL_DIR}/lib/vmware:g" \
-			"${FILESDIR}/vmware-server-${major_minor}.rc" > ${initscript}
-		newinitd "${initscript}" vmware-workstation-server
-	fi
-
-	# fill in variable placeholders
-	sed -e "s:@@LIBCONF_DIR@@:${VM_INSTALL_DIR}/lib/vmware/libconf:g" \
-		-i "${D}${VM_INSTALL_DIR}"/lib/vmware/libconf/etc/{gtk-2.0/{gdk-pixbuf.loaders,gtk.immodules},pango/pango{.modules,rc}}
-	sed -e "s:@@BINARY@@:${VM_INSTALL_DIR}/bin/vmware:g" \
-		-e "/^Encoding/d" \
-		-i "${D}/usr/share/applications/${PN}.desktop"
-	sed -e "s:@@BINARY@@:${VM_INSTALL_DIR}/bin/vmplayer:g" \
-		-e "/^Encoding/d" \
-		-i "${D}/usr/share/applications/vmware-player.desktop"
-	sed -e "s:@@BINARY@@:${VM_INSTALL_DIR}/bin/vmware-netcfg:g" \
-		-e "/^Encoding/d" \
-		-i "${D}/usr/share/applications/vmware-netcfg.desktop"
-
-	if use server; then
-	# Configuration for vmware-workstation-server
-		local hostdUser="${VM_HOSTD_USER:-root}"
-		sed -e "/ACEDataUser/s:root:${hostdUser}:g" \
-			-i "${D}/etc/vmware/hostd/authorization.xml" || die
-
-		# Shared VMs Path: [standard].
-		sed -e "s:##{DS_NAME}##:standard:g" \
-			-e "s:##{DS_PATH}##:${VM_DATA_STORE_DIR}:g" \
-			-i "${D}/etc/vmware/hostd/datastores.xml" || die
-
-		sed -e "s:##{HTTP_PORT}##:-1:g" \
-			-e "s:##{HTTPS_PORT}##:443:g" \
-			-e "s:##{PIPE_PREFIX}##:/var/run/vmware/:g" \
-			-i "${D}/etc/vmware/hostd/proxy.xml" || die
-
-		# See vmware-workstation-server.py for more details.
-		sed -e "s:##{BUILD_CFGDIR}##:/etc/vmware/hostd/:g" \
-			-e "s:##{CFGALTDIR}##:/etc/vmware/hostd/:g" \
-			-e "s:##{CFGDIR}##:/etc/vmware/:g" \
-			-e "s:##{ENABLE_AUTH}##:true:g" \
-			-e "s:##{HOSTDMODE}##:ws:g" \
-			-e "s:##{HOSTD_CFGDIR}##:/etc/vmware/hostd/:g" \
-			-e "s:##{HOSTD_MOCKUP}##:false:g" \
-			-e "s:##{LIBDIR}##:${VM_INSTALL_DIR}/lib/vmware:g" \
-			-e "s:##{LIBDIR_INSTALLED}##:${VM_INSTALL_DIR}/lib/vmware/:g" \
-			-e "s:##{LOGDIR}##:/var/log/vmware/:g" \
-			-e "s:##{LOGLEVEL}##:verbose:g" \
-			-e "s:##{MOCKUP}##:mockup-host-config.xml:g" \
-			-e "s:##{PLUGINDIR}##:./:g" \
-			-e "s:##{SHLIB_PREFIX}##:lib:g" \
-			-e "s:##{SHLIB_SUFFIX}##:.so:g" \
-			-e "s:##{USE_BLKLISTSVC}##:false:g" \
-			-e "s:##{USE_CBRCSVC}##:false:g" \
-			-e "s:##{USE_CIMSVC}##:false:g" \
-			-e "s:##{USE_DIRECTORYSVC}##:false:g" \
-			-e "s:##{USE_DIRECTORYSVC_MOCKUP}##:false:g" \
-			-e "s:##{USE_DYNAMIC_PLUGIN_LOADING}##:false:g" \
-			-e "s:##{USE_DYNAMO}##:false:g" \
-			-e "s:##{USE_DYNSVC}##:false:g" \
-			-e "s:##{USE_GUESTSVC}##:false:g" \
-			-e "s:##{USE_HBRSVC}##:false:g" \
-			-e "s:##{USE_HBRSVC_MOCKUP}##:false:g" \
-			-e "s:##{USE_HOSTSVC_MOCKUP}##:false:g" \
-			-e "s:##{USE_HTTPNFCSVC}##:false:g" \
-			-e "s:##{USE_HTTPNFCSVC_MOCKUP}##:false:g" \
-			-e "s:##{USE_LICENSESVC_MOCKUP}##:false:g" \
-			-e "s:##{USE_NFCSVC}##:true:g" \
-			-e "s:##{USE_NFCSVC_MOCKUP}##:false:g" \
-			-e "s:##{USE_OVFMGRSVC}##:true:g" \
-			-e "s:##{USE_PARTITIONSVC}##:false:g" \
-			-e "s:##{USE_SECURESOAP}##:false:g" \
-			-e "s:##{USE_SNMPSVC}##:false:g" \
-			-e "s:##{USE_SOLO_MOCKUP}##:false:g" \
-			-e "s:##{USE_STATSSVC_MOCKUP}##:false:g" \
-			-e "s:##{USE_VCSVC_MOCKUP}##:false:g" \
-			-e "s:##{USE_VDISKSVC}##:false:g" \
-			-e "s:##{USE_VDISKSVC_MOCKUP}##:false:g" \
-			-e "s:##{USE_VMSVC_MOCKUP}##:false:g" \
-			-e "s:##{VM_INVENTORY}##:vmInventory.xml:g" \
-			-e "s:##{VM_RESOURCES}##:vmResources.xml:g" \
-			-e "s:##{WEBSERVER_PORT_ENTRY}##::g" \
-			-e "s:##{WORKINGDIR}##:./:g" \
-			-i "${D}/etc/vmware/hostd/config.xml" || die
-
-		sed -e "s:##{ENV_LOCATION}##:/etc/vmware/hostd/env/:g" \
-			-i "${D}/etc/vmware/hostd/environments.xml" || die
-
-		# @@VICLIENT_URL@@=XXX
-		sed -e "s:@@AUTHD_PORT@@:902:g" \
-			-i "${D}${VM_INSTALL_DIR}/lib/vmware/hostd/docroot/client/clients.xml" || die
-	fi
-
-	# install systemd unit files
-	systemd_dounit "${WORKDIR}/systemd-vmware-${SYSTEMD_UNITS_TAG}/"*.{service,target}
-}
-
-pkg_config() {
-	"${VM_INSTALL_DIR}"/bin/vmware-networks --postinstall ${PN},old,new
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-	gnome2_icon_cache_update
-
-	ewarn "/etc/env.d was updated. Please run:"
-	ewarn "env-update && source /etc/profile"
-	ewarn ""
-	ewarn "Before you can use vmware workstation, you must configure a default network setup."
-	ewarn "You can do this by running 'emerge --config ${PN}'."
-}
-
-pkg_prerm() {
-	einfo "Stopping ${PN} for safe unmerge"
-	/etc/init.d/vmware stop
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-	gnome2_icon_cache_update
-}
diff --git a/app-emulation/vmware-workstation/vmware-workstation-10.0.2.1744117.ebuild b/app-emulation/vmware-workstation/vmware-workstation-10.0.2.1744117.ebuild
deleted file mode 100644
index fa297474b979..000000000000
--- a/app-emulation/vmware-workstation/vmware-workstation-10.0.2.1744117.ebuild
+++ /dev/null
@@ -1,493 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-
-inherit eutils versionator fdo-mime systemd gnome2-utils pam vmware-bundle
-
-MY_PN="VMware-Workstation"
-MY_PV=$(get_version_component_range 1-3)
-PV_MINOR=$(get_version_component_range 3)
-PV_BUILD=$(get_version_component_range 4)
-MY_P="${MY_PN}-${MY_PV}-${PV_BUILD}"
-
-SYSTEMD_UNITS_TAG="gentoo-01"
-
-DESCRIPTION="Emulate a complete PC on your PC without the usual performance overhead of most emulators"
-HOMEPAGE="http://www.vmware.com/products/workstation/"
-BASE_URI="https://softwareupdate.vmware.com/cds/vmw-desktop/ws/${MY_PV}/${PV_BUILD}/linux/core/"
-SRC_URI="
-	x86? ( ${BASE_URI}${MY_P}.i386.bundle.tar )
-	amd64? ( ${BASE_URI}${MY_P}.x86_64.bundle.tar )
-	https://github.com/akhuettel/systemd-vmware/archive/${SYSTEMD_UNITS_TAG}.tar.gz
-	"
-LICENSE="vmware GPL-2"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE="cups doc ovftool server vix vmware-tools"
-RESTRICT="mirror strip"
-
-# vmware-workstation should not use virtual/libc as this is a
-# precompiled binary package thats linked to glibc.
-RDEPEND="dev-cpp/cairomm
-	dev-cpp/glibmm:2
-	dev-cpp/gtkmm:2.4
-	dev-cpp/libgnomecanvasmm
-	dev-cpp/pangomm
-	dev-libs/atk
-	dev-libs/glib:2
-	dev-libs/icu
-	dev-libs/expat
-	dev-libs/libaio
-	dev-libs/libgcrypt:0
-	dev-libs/libsigc++
-	dev-libs/libxml2
-	=dev-libs/openssl-0.9.8*
-	dev-libs/xmlrpc-c
-	gnome-base/libgnomecanvas
-	gnome-base/libgtop:2
-	gnome-base/librsvg:2
-	gnome-base/orbit
-	media-libs/fontconfig
-	media-libs/freetype
-	media-libs/libart_lgpl
-	=media-libs/libpng-1.2*
-	media-libs/libpng
-	net-misc/curl
-	cups? ( net-print/cups )
-	sys-devel/gcc
-	sys-fs/fuse
-	sys-libs/glibc
-	sys-libs/zlib
-	x11-libs/cairo
-	x11-libs/gtk+:2
-	x11-libs/libgksu
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-	x11-libs/libXau
-	x11-libs/libxcb
-	x11-libs/libXcomposite
-	x11-libs/libXcursor
-	x11-libs/libXdamage
-	x11-libs/libXdmcp
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXft
-	x11-libs/libXi
-	x11-libs/libXinerama
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	x11-libs/libXtst
-	x11-libs/pango
-	x11-libs/pangox-compat
-	x11-libs/startup-notification
-	x11-themes/hicolor-icon-theme
-	!app-emulation/vmware-player"
-PDEPEND="~app-emulation/vmware-modules-279.${PV_MINOR}
-	vmware-tools? ( app-emulation/vmware-tools )"
-
-S=${WORKDIR}
-VM_INSTALL_DIR="/opt/vmware"
-VM_DATA_STORE_DIR="/var/lib/vmware/Shared VMs"
-VM_HOSTD_USER="root"
-
-src_unpack() {
-	default
-	local bundle
-	use amd64 && bundle=${MY_P}.x86_64.bundle
-	use x86 && bundle=${MY_P}.i386.bundle
-	local component; for component in \
-		vmware-vmx \
-		vmware-player-app \
-		vmware-player-setup \
-		vmware-workstation \
-		vmware-network-editor \
-		vmware-network-editor-ui \
-		vmware-usbarbitrator \
-		vmware-vprobe
-	do
-		vmware-bundle_extract-bundle-component "${bundle}" "${component}" "${S}"
-	done
-
-	if use server; then
-		vmware-bundle_extract-bundle-component "${bundle}" vmware-workstation-server #"${S}"
-	fi
-
-	if use vix; then
-		vmware-bundle_extract-bundle-component "${bundle}" vmware-vix-core vmware-vix
-		vmware-bundle_extract-bundle-component "${bundle}" vmware-vix-lib-Workstation1000andvSphere550 vmware-vix
-	fi
-	if use ovftool; then
-		vmware-bundle_extract-bundle-component "${bundle}" vmware-ovftool
-	fi
-}
-
-src_prepare() {
-	rm -f  bin/vmware-modconfig
-	rm -rf lib/modules/binary
-	# Bug 459566
-	mv lib/libvmware-netcfg.so lib/lib/
-
-	if use server; then
-		rm -f vmware-workstation-server/bin/{openssl,configure-hostd.sh}
-	fi
-
-	find "${S}" -name '*.a' -delete
-
-#	clean_bundled_libs
-}
-
-clean_bundled_libs() {
-	ebegin 'Removing superfluous libraries'
-	cd lib/lib || die
-	ldconfig -p | \
-		sed 's:^\s\+\([^(]*[^( ]\).*=> /.*$:\1:g;t;d' | \
-		fgrep -vx 'libcrypto.so.0.9.8
-libssl.so.0.9.8i
-libgcr.so.0
-libglib-2.0.so.0' |
-		xargs -d'\n' -r rm -rf
-	eend
-}
-
-src_install() {
-	local major_minor=$(get_version_component_range 1-2 "${PV}")
-	local major_minor_revision=$(get_version_component_range 1-3 "${PV}")
-	local build=$(get_version_component_range 4 "${PV}")
-
-	# install the binaries
-	into "${VM_INSTALL_DIR}"
-	dobin bin/*
-
-	# install the libraries
-	insinto "${VM_INSTALL_DIR}"/lib/vmware
-	doins -r lib/*
-
-	# Bug 432918
-	dosym "${VM_INSTALL_DIR}"/lib/vmware/lib/libcrypto.so.0.9.8/libcrypto.so.0.9.8 \
-		"${VM_INSTALL_DIR}"/lib/vmware/lib/libvmwarebase.so.0/libcrypto.so.0.9.8
-	dosym "${VM_INSTALL_DIR}"/lib/vmware/lib/libssl.so.0.9.8/libssl.so.0.9.8 \
-		"${VM_INSTALL_DIR}"/lib/vmware/lib/libvmwarebase.so.0/libssl.so.0.9.8
-
-	# install the ancillaries
-	insinto /usr
-	doins -r share
-
-	if use cups; then
-		exeinto $(cups-config --serverbin)/filter
-		doexe extras/thnucups
-
-		insinto /etc/cups
-		doins -r etc/cups/*
-	fi
-
-	insinto /etc/xdg
-	doins -r etc/xdg/*
-
-	# install documentation
-	doman man/man1/vmware.1.gz
-
-	if use doc; then
-		dodoc doc/*
-	fi
-
-	insinto "${VM_INSTALL_DIR}"/lib/vmware/setup
-	doins vmware-config
-
-	# install vmware workstation server
-	if use server; then
-		dosbin sbin/*
-
-		cd "${S}"/vmware-workstation-server
-
-		# install binaries
-		into "${VM_INSTALL_DIR}"/lib/vmware
-		dobin bin/*
-
-		dobin "${FILESDIR}"/configure-hostd.sh
-
-		dobin "${FILESDIR}"/configure-hostd.sh
-
-		# install the libraries
-		insinto "${VM_INSTALL_DIR}"/lib/vmware/lib
-		doins -r lib/*
-
-		into "${VM_INSTALL_DIR}"
-		for tool in  vmware-{hostd,wssc-adminTool} ; do
-			cat > "${T}/${tool}" <<-EOF
-				#!/usr/bin/env bash
-				set -e
-
-				. /etc/vmware/bootstrap
-
-				exec "${VM_INSTALL_DIR}/lib/vmware/lib/wrapper-gtk24.sh" \\
-					"${VM_INSTALL_DIR}/lib/vmware/lib" \\
-					"${VM_INSTALL_DIR}/lib/vmware/bin/${tool}" \\
-					"${VM_INSTALL_DIR}/lib/vmware/libconf" "\$@"
-			EOF
-			dobin "${T}/${tool}"
-		done
-
-		insinto "${VM_INSTALL_DIR}"/lib/vmware
-		doins -r hostd
-
-		# create the configuration
-		insinto /etc/vmware/hostd
-		doins -r config/etc/vmware/hostd/*
-		doins -r etc/vmware/hostd/*
-
-		insinto /etc/vmware/ssl
-		doins etc/vmware/ssl/*
-
-		# pam
-		pamd_mimic_system vmware-authd auth account
-
-		# create directory for shared virtual machines.
-		keepdir "${VM_DATA_STORE_DIR}"
-		keepdir /var/log/vmware
-	fi
-
-	# install vmware-vix
-	if use vix; then
-		cd "${S}"/vmware-vix
-
-		# install the binary
-		into "${VM_INSTALL_DIR}"
-		dobin bin/*
-
-		# install the libraries
-		insinto "${VM_INSTALL_DIR}"/lib/vmware-vix
-		doins -r lib/*
-
-		dosym vmware-vix/libvixAllProducts.so "${VM_INSTALL_DIR}"/lib/libbvixAllProducts.so
-
-		# install headers
-		insinto /usr/include/vmware-vix
-		doins include/*
-
-		if use doc; then
-			dohtml -r doc/*
-		fi
-	fi
-
-	# install ovftool
-	if use ovftool; then
-		cd "${S}"
-
-		insinto "${VM_INSTALL_DIR}"/lib/vmware-ovftool
-		doins -r vmware-ovftool/*
-
-		chmod 0755 "${D}${VM_INSTALL_DIR}"/lib/vmware-ovftool/{ovftool,ovftool.bin}
-		dosym "${D}${VM_INSTALL_DIR}"/lib/vmware-ovftool/ovftool "${VM_INSTALL_DIR}"/bin/ovftool
-	fi
-
-	# create symlinks for the various tools
-	local tool ; for tool in thnuclnt vmware vmplayer{,-daemon} licenseTool vmamqpd \
-			vmware-{acetool,enter-serial,gksu,fuseUI,modconfig{,-console},netcfg,tray,unity-helper,zenity} ; do
-		dosym appLoader "${VM_INSTALL_DIR}"/lib/vmware/bin/"${tool}"
-	done
-	dosym "${VM_INSTALL_DIR}"/lib/vmware/bin/vmplayer "${VM_INSTALL_DIR}"/bin/vmplayer
-	dosym "${VM_INSTALL_DIR}"/lib/vmware/bin/vmware "${VM_INSTALL_DIR}"/bin/vmware
-	dosym "${VM_INSTALL_DIR}"/lib/vmware/icu /etc/vmware/icu
-
-	# fix permissions
-	fperms 0755 "${VM_INSTALL_DIR}"/lib/vmware/bin/{appLoader,fusermount,launcher.sh,mkisofs,vmware-remotemks}
-	fperms 0755 "${VM_INSTALL_DIR}"/lib/vmware/lib/{wrapper-gtk24.sh,libgksu2.so.0/gksu-run-helper}
-	fperms 0755 "${VM_INSTALL_DIR}"/lib/vmware/setup/vmware-config
-	fperms 4711 "${VM_INSTALL_DIR}"/bin/vmware-mount
-	fperms 4711 "${VM_INSTALL_DIR}"/lib/vmware/bin/vmware-vmx{,-debug,-stats}
-	if use server; then
-		fperms 0755 "${VM_INSTALL_DIR}"/lib/vmware/bin/vmware-{hostd,wssc-adminTool}
-		fperms 4711 "${VM_INSTALL_DIR}"/sbin/vmware-authd
-		fperms 1777 "${VM_DATA_STORE_DIR}"
-	fi
-	if use vix; then
-		fperms 0755 "${VM_INSTALL_DIR}"/lib/vmware-vix/setup/vmware-config
-	fi
-
-	# create the environment
-	local envd="${T}/90vmware"
-	cat > "${envd}" <<-EOF
-		PATH='${VM_INSTALL_DIR}/bin'
-		ROOTPATH='${VM_INSTALL_DIR}/bin'
-	EOF
-	doenvd "${envd}"
-
-	# create the configuration
-	dodir /etc/vmware
-
-	cat > "${D}"/etc/vmware/bootstrap <<-EOF
-		BINDIR='${VM_INSTALL_DIR}/bin'
-		LIBDIR='${VM_INSTALL_DIR}/lib'
-	EOF
-
-	cat > "${D}"/etc/vmware/config <<-EOF
-		bindir = "${VM_INSTALL_DIR}/bin"
-		libdir = "${VM_INSTALL_DIR}/lib/vmware"
-		initscriptdir = "/etc/init.d"
-		authd.fullpath = "${VM_INSTALL_DIR}/sbin/vmware-authd"
-		gksu.rootMethod = "su"
-		VMCI_CONFED = "yes"
-		VMBLOCK_CONFED = "yes"
-		VSOCK_CONFED = "yes"
-		NETWORKING = "yes"
-		player.product.version = "${major_minor_revision}"
-		product.version = "${major_minor_revision}"
-		product.buildNumber = "${build}"
-		product.name = "VMware Workstation"
-		workstation.product.version = "${major_minor_revision}"
-	EOF
-
-	if use vix; then
-		cat >> "${D}"/etc/vmware/config <<-EOF
-			vmware.fullpath = "${VM_INSTALL_DIR}/bin/vmware"
-			vix.libdir = "${VM_INSTALL_DIR}/lib/vmware-vix"
-			vix.config.version = "1"
-		EOF
-	fi
-
-	if use server; then
-		cat >> "${D}"/etc/vmware/config <<-EOF
-			authd.client.port = "902"
-			authd.proxy.nfc = "vmware-hostd:ha-nfc"
-			authd.soapserver = "TRUE"
-		EOF
-	fi
-
-	# install the init.d script
-	local initscript="${T}/vmware.rc"
-	sed -e "s:@@BINDIR@@:${VM_INSTALL_DIR}/bin:g" \
-		"${FILESDIR}/vmware-${major_minor}.rc" > ${initscript}
-	newinitd "${initscript}" vmware
-
-	if use server; then
-		# install the init.d script
-		local initscript="${T}/vmware-workstation-server.rc"
-		sed -e "s:@@ETCDIR@@:/etc/vmware:g" \
-			-e "s:@@PREFIX@@:${VM_INSTALL_DIR}:g" \
-			-e "s:@@BINDIR@@:${VM_INSTALL_DIR}/bin:g" \
-			-e "s:@@LIBDIR@@:${VM_INSTALL_DIR}/lib/vmware:g" \
-			"${FILESDIR}/vmware-server-${major_minor}.rc" > ${initscript}
-		newinitd "${initscript}" vmware-workstation-server
-	fi
-
-	# fill in variable placeholders
-	sed -e "s:@@LIBCONF_DIR@@:${VM_INSTALL_DIR}/lib/vmware/libconf:g" \
-		-i "${D}${VM_INSTALL_DIR}"/lib/vmware/libconf/etc/{gtk-2.0/{gdk-pixbuf.loaders,gtk.immodules},pango/pango{.modules,rc}}
-	sed -e "s:@@BINARY@@:${VM_INSTALL_DIR}/bin/vmware:g" \
-		-e "/^Encoding/d" \
-		-i "${D}/usr/share/applications/${PN}.desktop"
-	sed -e "s:@@BINARY@@:${VM_INSTALL_DIR}/bin/vmplayer:g" \
-		-e "/^Encoding/d" \
-		-i "${D}/usr/share/applications/vmware-player.desktop"
-	sed -e "s:@@BINARY@@:${VM_INSTALL_DIR}/bin/vmware-netcfg:g" \
-		-e "/^Encoding/d" \
-		-i "${D}/usr/share/applications/vmware-netcfg.desktop"
-
-	if use server; then
-	# Configuration for vmware-workstation-server
-		local hostdUser="${VM_HOSTD_USER:-root}"
-		sed -e "/ACEDataUser/s:root:${hostdUser}:g" \
-			-i "${D}/etc/vmware/hostd/authorization.xml" || die
-
-		# Shared VMs Path: [standard].
-		sed -e "s:##{DS_NAME}##:standard:g" \
-			-e "s:##{DS_PATH}##:${VM_DATA_STORE_DIR}:g" \
-			-i "${D}/etc/vmware/hostd/datastores.xml" || die
-
-		sed -e "s:##{HTTP_PORT}##:-1:g" \
-			-e "s:##{HTTPS_PORT}##:443:g" \
-			-e "s:##{PIPE_PREFIX}##:/var/run/vmware/:g" \
-			-i "${D}/etc/vmware/hostd/proxy.xml" || die
-
-		# See vmware-workstation-server.py for more details.
-		sed -e "s:##{BUILD_CFGDIR}##:/etc/vmware/hostd/:g" \
-			-e "s:##{CFGALTDIR}##:/etc/vmware/hostd/:g" \
-			-e "s:##{CFGDIR}##:/etc/vmware/:g" \
-			-e "s:##{ENABLE_AUTH}##:true:g" \
-			-e "s:##{HOSTDMODE}##:ws:g" \
-			-e "s:##{HOSTD_CFGDIR}##:/etc/vmware/hostd/:g" \
-			-e "s:##{HOSTD_MOCKUP}##:false:g" \
-			-e "s:##{LIBDIR}##:${VM_INSTALL_DIR}/lib/vmware:g" \
-			-e "s:##{LIBDIR_INSTALLED}##:${VM_INSTALL_DIR}/lib/vmware/:g" \
-			-e "s:##{LOGDIR}##:/var/log/vmware/:g" \
-			-e "s:##{LOGLEVEL}##:verbose:g" \
-			-e "s:##{MOCKUP}##:mockup-host-config.xml:g" \
-			-e "s:##{PLUGINDIR}##:./:g" \
-			-e "s:##{SHLIB_PREFIX}##:lib:g" \
-			-e "s:##{SHLIB_SUFFIX}##:.so:g" \
-			-e "s:##{USE_BLKLISTSVC}##:false:g" \
-			-e "s:##{USE_CBRCSVC}##:false:g" \
-			-e "s:##{USE_CIMSVC}##:false:g" \
-			-e "s:##{USE_DIRECTORYSVC}##:false:g" \
-			-e "s:##{USE_DIRECTORYSVC_MOCKUP}##:false:g" \
-			-e "s:##{USE_DYNAMIC_PLUGIN_LOADING}##:false:g" \
-			-e "s:##{USE_DYNAMO}##:false:g" \
-			-e "s:##{USE_DYNSVC}##:false:g" \
-			-e "s:##{USE_GUESTSVC}##:false:g" \
-			-e "s:##{USE_HBRSVC}##:false:g" \
-			-e "s:##{USE_HBRSVC_MOCKUP}##:false:g" \
-			-e "s:##{USE_HOSTSVC_MOCKUP}##:false:g" \
-			-e "s:##{USE_HTTPNFCSVC}##:false:g" \
-			-e "s:##{USE_HTTPNFCSVC_MOCKUP}##:false:g" \
-			-e "s:##{USE_LICENSESVC_MOCKUP}##:false:g" \
-			-e "s:##{USE_NFCSVC}##:true:g" \
-			-e "s:##{USE_NFCSVC_MOCKUP}##:false:g" \
-			-e "s:##{USE_OVFMGRSVC}##:true:g" \
-			-e "s:##{USE_PARTITIONSVC}##:false:g" \
-			-e "s:##{USE_SECURESOAP}##:false:g" \
-			-e "s:##{USE_SNMPSVC}##:false:g" \
-			-e "s:##{USE_SOLO_MOCKUP}##:false:g" \
-			-e "s:##{USE_STATSSVC_MOCKUP}##:false:g" \
-			-e "s:##{USE_VCSVC_MOCKUP}##:false:g" \
-			-e "s:##{USE_VDISKSVC}##:false:g" \
-			-e "s:##{USE_VDISKSVC_MOCKUP}##:false:g" \
-			-e "s:##{USE_VMSVC_MOCKUP}##:false:g" \
-			-e "s:##{VM_INVENTORY}##:vmInventory.xml:g" \
-			-e "s:##{VM_RESOURCES}##:vmResources.xml:g" \
-			-e "s:##{WEBSERVER_PORT_ENTRY}##::g" \
-			-e "s:##{WORKINGDIR}##:./:g" \
-			-i "${D}/etc/vmware/hostd/config.xml" || die
-
-		sed -e "s:##{ENV_LOCATION}##:/etc/vmware/hostd/env/:g" \
-			-i "${D}/etc/vmware/hostd/environments.xml" || die
-
-		# @@VICLIENT_URL@@=XXX
-		sed -e "s:@@AUTHD_PORT@@:902:g" \
-			-i "${D}${VM_INSTALL_DIR}/lib/vmware/hostd/docroot/client/clients.xml" || die
-	fi
-
-	# install systemd unit files
-	systemd_dounit "${WORKDIR}/systemd-vmware-${SYSTEMD_UNITS_TAG}/"*.{service,target}
-}
-
-pkg_config() {
-	"${VM_INSTALL_DIR}"/bin/vmware-networks --postinstall ${PN},old,new
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-	gnome2_icon_cache_update
-
-	ewarn "/etc/env.d was updated. Please run:"
-	ewarn "env-update && source /etc/profile"
-	ewarn ""
-	ewarn "Before you can use vmware workstation, you must configure a default network setup."
-	ewarn "You can do this by running 'emerge --config ${PN}'."
-}
-
-pkg_prerm() {
-	einfo "Stopping ${PN} for safe unmerge"
-	/etc/init.d/vmware stop
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-	gnome2_icon_cache_update
-}
diff --git a/app-emulation/vmware-workstation/vmware-workstation-10.0.3.1895310.ebuild b/app-emulation/vmware-workstation/vmware-workstation-10.0.3.1895310.ebuild
deleted file mode 100644
index fa297474b979..000000000000
--- a/app-emulation/vmware-workstation/vmware-workstation-10.0.3.1895310.ebuild
+++ /dev/null
@@ -1,493 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-
-inherit eutils versionator fdo-mime systemd gnome2-utils pam vmware-bundle
-
-MY_PN="VMware-Workstation"
-MY_PV=$(get_version_component_range 1-3)
-PV_MINOR=$(get_version_component_range 3)
-PV_BUILD=$(get_version_component_range 4)
-MY_P="${MY_PN}-${MY_PV}-${PV_BUILD}"
-
-SYSTEMD_UNITS_TAG="gentoo-01"
-
-DESCRIPTION="Emulate a complete PC on your PC without the usual performance overhead of most emulators"
-HOMEPAGE="http://www.vmware.com/products/workstation/"
-BASE_URI="https://softwareupdate.vmware.com/cds/vmw-desktop/ws/${MY_PV}/${PV_BUILD}/linux/core/"
-SRC_URI="
-	x86? ( ${BASE_URI}${MY_P}.i386.bundle.tar )
-	amd64? ( ${BASE_URI}${MY_P}.x86_64.bundle.tar )
-	https://github.com/akhuettel/systemd-vmware/archive/${SYSTEMD_UNITS_TAG}.tar.gz
-	"
-LICENSE="vmware GPL-2"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE="cups doc ovftool server vix vmware-tools"
-RESTRICT="mirror strip"
-
-# vmware-workstation should not use virtual/libc as this is a
-# precompiled binary package thats linked to glibc.
-RDEPEND="dev-cpp/cairomm
-	dev-cpp/glibmm:2
-	dev-cpp/gtkmm:2.4
-	dev-cpp/libgnomecanvasmm
-	dev-cpp/pangomm
-	dev-libs/atk
-	dev-libs/glib:2
-	dev-libs/icu
-	dev-libs/expat
-	dev-libs/libaio
-	dev-libs/libgcrypt:0
-	dev-libs/libsigc++
-	dev-libs/libxml2
-	=dev-libs/openssl-0.9.8*
-	dev-libs/xmlrpc-c
-	gnome-base/libgnomecanvas
-	gnome-base/libgtop:2
-	gnome-base/librsvg:2
-	gnome-base/orbit
-	media-libs/fontconfig
-	media-libs/freetype
-	media-libs/libart_lgpl
-	=media-libs/libpng-1.2*
-	media-libs/libpng
-	net-misc/curl
-	cups? ( net-print/cups )
-	sys-devel/gcc
-	sys-fs/fuse
-	sys-libs/glibc
-	sys-libs/zlib
-	x11-libs/cairo
-	x11-libs/gtk+:2
-	x11-libs/libgksu
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-	x11-libs/libXau
-	x11-libs/libxcb
-	x11-libs/libXcomposite
-	x11-libs/libXcursor
-	x11-libs/libXdamage
-	x11-libs/libXdmcp
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXft
-	x11-libs/libXi
-	x11-libs/libXinerama
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	x11-libs/libXtst
-	x11-libs/pango
-	x11-libs/pangox-compat
-	x11-libs/startup-notification
-	x11-themes/hicolor-icon-theme
-	!app-emulation/vmware-player"
-PDEPEND="~app-emulation/vmware-modules-279.${PV_MINOR}
-	vmware-tools? ( app-emulation/vmware-tools )"
-
-S=${WORKDIR}
-VM_INSTALL_DIR="/opt/vmware"
-VM_DATA_STORE_DIR="/var/lib/vmware/Shared VMs"
-VM_HOSTD_USER="root"
-
-src_unpack() {
-	default
-	local bundle
-	use amd64 && bundle=${MY_P}.x86_64.bundle
-	use x86 && bundle=${MY_P}.i386.bundle
-	local component; for component in \
-		vmware-vmx \
-		vmware-player-app \
-		vmware-player-setup \
-		vmware-workstation \
-		vmware-network-editor \
-		vmware-network-editor-ui \
-		vmware-usbarbitrator \
-		vmware-vprobe
-	do
-		vmware-bundle_extract-bundle-component "${bundle}" "${component}" "${S}"
-	done
-
-	if use server; then
-		vmware-bundle_extract-bundle-component "${bundle}" vmware-workstation-server #"${S}"
-	fi
-
-	if use vix; then
-		vmware-bundle_extract-bundle-component "${bundle}" vmware-vix-core vmware-vix
-		vmware-bundle_extract-bundle-component "${bundle}" vmware-vix-lib-Workstation1000andvSphere550 vmware-vix
-	fi
-	if use ovftool; then
-		vmware-bundle_extract-bundle-component "${bundle}" vmware-ovftool
-	fi
-}
-
-src_prepare() {
-	rm -f  bin/vmware-modconfig
-	rm -rf lib/modules/binary
-	# Bug 459566
-	mv lib/libvmware-netcfg.so lib/lib/
-
-	if use server; then
-		rm -f vmware-workstation-server/bin/{openssl,configure-hostd.sh}
-	fi
-
-	find "${S}" -name '*.a' -delete
-
-#	clean_bundled_libs
-}
-
-clean_bundled_libs() {
-	ebegin 'Removing superfluous libraries'
-	cd lib/lib || die
-	ldconfig -p | \
-		sed 's:^\s\+\([^(]*[^( ]\).*=> /.*$:\1:g;t;d' | \
-		fgrep -vx 'libcrypto.so.0.9.8
-libssl.so.0.9.8i
-libgcr.so.0
-libglib-2.0.so.0' |
-		xargs -d'\n' -r rm -rf
-	eend
-}
-
-src_install() {
-	local major_minor=$(get_version_component_range 1-2 "${PV}")
-	local major_minor_revision=$(get_version_component_range 1-3 "${PV}")
-	local build=$(get_version_component_range 4 "${PV}")
-
-	# install the binaries
-	into "${VM_INSTALL_DIR}"
-	dobin bin/*
-
-	# install the libraries
-	insinto "${VM_INSTALL_DIR}"/lib/vmware
-	doins -r lib/*
-
-	# Bug 432918
-	dosym "${VM_INSTALL_DIR}"/lib/vmware/lib/libcrypto.so.0.9.8/libcrypto.so.0.9.8 \
-		"${VM_INSTALL_DIR}"/lib/vmware/lib/libvmwarebase.so.0/libcrypto.so.0.9.8
-	dosym "${VM_INSTALL_DIR}"/lib/vmware/lib/libssl.so.0.9.8/libssl.so.0.9.8 \
-		"${VM_INSTALL_DIR}"/lib/vmware/lib/libvmwarebase.so.0/libssl.so.0.9.8
-
-	# install the ancillaries
-	insinto /usr
-	doins -r share
-
-	if use cups; then
-		exeinto $(cups-config --serverbin)/filter
-		doexe extras/thnucups
-
-		insinto /etc/cups
-		doins -r etc/cups/*
-	fi
-
-	insinto /etc/xdg
-	doins -r etc/xdg/*
-
-	# install documentation
-	doman man/man1/vmware.1.gz
-
-	if use doc; then
-		dodoc doc/*
-	fi
-
-	insinto "${VM_INSTALL_DIR}"/lib/vmware/setup
-	doins vmware-config
-
-	# install vmware workstation server
-	if use server; then
-		dosbin sbin/*
-
-		cd "${S}"/vmware-workstation-server
-
-		# install binaries
-		into "${VM_INSTALL_DIR}"/lib/vmware
-		dobin bin/*
-
-		dobin "${FILESDIR}"/configure-hostd.sh
-
-		dobin "${FILESDIR}"/configure-hostd.sh
-
-		# install the libraries
-		insinto "${VM_INSTALL_DIR}"/lib/vmware/lib
-		doins -r lib/*
-
-		into "${VM_INSTALL_DIR}"
-		for tool in  vmware-{hostd,wssc-adminTool} ; do
-			cat > "${T}/${tool}" <<-EOF
-				#!/usr/bin/env bash
-				set -e
-
-				. /etc/vmware/bootstrap
-
-				exec "${VM_INSTALL_DIR}/lib/vmware/lib/wrapper-gtk24.sh" \\
-					"${VM_INSTALL_DIR}/lib/vmware/lib" \\
-					"${VM_INSTALL_DIR}/lib/vmware/bin/${tool}" \\
-					"${VM_INSTALL_DIR}/lib/vmware/libconf" "\$@"
-			EOF
-			dobin "${T}/${tool}"
-		done
-
-		insinto "${VM_INSTALL_DIR}"/lib/vmware
-		doins -r hostd
-
-		# create the configuration
-		insinto /etc/vmware/hostd
-		doins -r config/etc/vmware/hostd/*
-		doins -r etc/vmware/hostd/*
-
-		insinto /etc/vmware/ssl
-		doins etc/vmware/ssl/*
-
-		# pam
-		pamd_mimic_system vmware-authd auth account
-
-		# create directory for shared virtual machines.
-		keepdir "${VM_DATA_STORE_DIR}"
-		keepdir /var/log/vmware
-	fi
-
-	# install vmware-vix
-	if use vix; then
-		cd "${S}"/vmware-vix
-
-		# install the binary
-		into "${VM_INSTALL_DIR}"
-		dobin bin/*
-
-		# install the libraries
-		insinto "${VM_INSTALL_DIR}"/lib/vmware-vix
-		doins -r lib/*
-
-		dosym vmware-vix/libvixAllProducts.so "${VM_INSTALL_DIR}"/lib/libbvixAllProducts.so
-
-		# install headers
-		insinto /usr/include/vmware-vix
-		doins include/*
-
-		if use doc; then
-			dohtml -r doc/*
-		fi
-	fi
-
-	# install ovftool
-	if use ovftool; then
-		cd "${S}"
-
-		insinto "${VM_INSTALL_DIR}"/lib/vmware-ovftool
-		doins -r vmware-ovftool/*
-
-		chmod 0755 "${D}${VM_INSTALL_DIR}"/lib/vmware-ovftool/{ovftool,ovftool.bin}
-		dosym "${D}${VM_INSTALL_DIR}"/lib/vmware-ovftool/ovftool "${VM_INSTALL_DIR}"/bin/ovftool
-	fi
-
-	# create symlinks for the various tools
-	local tool ; for tool in thnuclnt vmware vmplayer{,-daemon} licenseTool vmamqpd \
-			vmware-{acetool,enter-serial,gksu,fuseUI,modconfig{,-console},netcfg,tray,unity-helper,zenity} ; do
-		dosym appLoader "${VM_INSTALL_DIR}"/lib/vmware/bin/"${tool}"
-	done
-	dosym "${VM_INSTALL_DIR}"/lib/vmware/bin/vmplayer "${VM_INSTALL_DIR}"/bin/vmplayer
-	dosym "${VM_INSTALL_DIR}"/lib/vmware/bin/vmware "${VM_INSTALL_DIR}"/bin/vmware
-	dosym "${VM_INSTALL_DIR}"/lib/vmware/icu /etc/vmware/icu
-
-	# fix permissions
-	fperms 0755 "${VM_INSTALL_DIR}"/lib/vmware/bin/{appLoader,fusermount,launcher.sh,mkisofs,vmware-remotemks}
-	fperms 0755 "${VM_INSTALL_DIR}"/lib/vmware/lib/{wrapper-gtk24.sh,libgksu2.so.0/gksu-run-helper}
-	fperms 0755 "${VM_INSTALL_DIR}"/lib/vmware/setup/vmware-config
-	fperms 4711 "${VM_INSTALL_DIR}"/bin/vmware-mount
-	fperms 4711 "${VM_INSTALL_DIR}"/lib/vmware/bin/vmware-vmx{,-debug,-stats}
-	if use server; then
-		fperms 0755 "${VM_INSTALL_DIR}"/lib/vmware/bin/vmware-{hostd,wssc-adminTool}
-		fperms 4711 "${VM_INSTALL_DIR}"/sbin/vmware-authd
-		fperms 1777 "${VM_DATA_STORE_DIR}"
-	fi
-	if use vix; then
-		fperms 0755 "${VM_INSTALL_DIR}"/lib/vmware-vix/setup/vmware-config
-	fi
-
-	# create the environment
-	local envd="${T}/90vmware"
-	cat > "${envd}" <<-EOF
-		PATH='${VM_INSTALL_DIR}/bin'
-		ROOTPATH='${VM_INSTALL_DIR}/bin'
-	EOF
-	doenvd "${envd}"
-
-	# create the configuration
-	dodir /etc/vmware
-
-	cat > "${D}"/etc/vmware/bootstrap <<-EOF
-		BINDIR='${VM_INSTALL_DIR}/bin'
-		LIBDIR='${VM_INSTALL_DIR}/lib'
-	EOF
-
-	cat > "${D}"/etc/vmware/config <<-EOF
-		bindir = "${VM_INSTALL_DIR}/bin"
-		libdir = "${VM_INSTALL_DIR}/lib/vmware"
-		initscriptdir = "/etc/init.d"
-		authd.fullpath = "${VM_INSTALL_DIR}/sbin/vmware-authd"
-		gksu.rootMethod = "su"
-		VMCI_CONFED = "yes"
-		VMBLOCK_CONFED = "yes"
-		VSOCK_CONFED = "yes"
-		NETWORKING = "yes"
-		player.product.version = "${major_minor_revision}"
-		product.version = "${major_minor_revision}"
-		product.buildNumber = "${build}"
-		product.name = "VMware Workstation"
-		workstation.product.version = "${major_minor_revision}"
-	EOF
-
-	if use vix; then
-		cat >> "${D}"/etc/vmware/config <<-EOF
-			vmware.fullpath = "${VM_INSTALL_DIR}/bin/vmware"
-			vix.libdir = "${VM_INSTALL_DIR}/lib/vmware-vix"
-			vix.config.version = "1"
-		EOF
-	fi
-
-	if use server; then
-		cat >> "${D}"/etc/vmware/config <<-EOF
-			authd.client.port = "902"
-			authd.proxy.nfc = "vmware-hostd:ha-nfc"
-			authd.soapserver = "TRUE"
-		EOF
-	fi
-
-	# install the init.d script
-	local initscript="${T}/vmware.rc"
-	sed -e "s:@@BINDIR@@:${VM_INSTALL_DIR}/bin:g" \
-		"${FILESDIR}/vmware-${major_minor}.rc" > ${initscript}
-	newinitd "${initscript}" vmware
-
-	if use server; then
-		# install the init.d script
-		local initscript="${T}/vmware-workstation-server.rc"
-		sed -e "s:@@ETCDIR@@:/etc/vmware:g" \
-			-e "s:@@PREFIX@@:${VM_INSTALL_DIR}:g" \
-			-e "s:@@BINDIR@@:${VM_INSTALL_DIR}/bin:g" \
-			-e "s:@@LIBDIR@@:${VM_INSTALL_DIR}/lib/vmware:g" \
-			"${FILESDIR}/vmware-server-${major_minor}.rc" > ${initscript}
-		newinitd "${initscript}" vmware-workstation-server
-	fi
-
-	# fill in variable placeholders
-	sed -e "s:@@LIBCONF_DIR@@:${VM_INSTALL_DIR}/lib/vmware/libconf:g" \
-		-i "${D}${VM_INSTALL_DIR}"/lib/vmware/libconf/etc/{gtk-2.0/{gdk-pixbuf.loaders,gtk.immodules},pango/pango{.modules,rc}}
-	sed -e "s:@@BINARY@@:${VM_INSTALL_DIR}/bin/vmware:g" \
-		-e "/^Encoding/d" \
-		-i "${D}/usr/share/applications/${PN}.desktop"
-	sed -e "s:@@BINARY@@:${VM_INSTALL_DIR}/bin/vmplayer:g" \
-		-e "/^Encoding/d" \
-		-i "${D}/usr/share/applications/vmware-player.desktop"
-	sed -e "s:@@BINARY@@:${VM_INSTALL_DIR}/bin/vmware-netcfg:g" \
-		-e "/^Encoding/d" \
-		-i "${D}/usr/share/applications/vmware-netcfg.desktop"
-
-	if use server; then
-	# Configuration for vmware-workstation-server
-		local hostdUser="${VM_HOSTD_USER:-root}"
-		sed -e "/ACEDataUser/s:root:${hostdUser}:g" \
-			-i "${D}/etc/vmware/hostd/authorization.xml" || die
-
-		# Shared VMs Path: [standard].
-		sed -e "s:##{DS_NAME}##:standard:g" \
-			-e "s:##{DS_PATH}##:${VM_DATA_STORE_DIR}:g" \
-			-i "${D}/etc/vmware/hostd/datastores.xml" || die
-
-		sed -e "s:##{HTTP_PORT}##:-1:g" \
-			-e "s:##{HTTPS_PORT}##:443:g" \
-			-e "s:##{PIPE_PREFIX}##:/var/run/vmware/:g" \
-			-i "${D}/etc/vmware/hostd/proxy.xml" || die
-
-		# See vmware-workstation-server.py for more details.
-		sed -e "s:##{BUILD_CFGDIR}##:/etc/vmware/hostd/:g" \
-			-e "s:##{CFGALTDIR}##:/etc/vmware/hostd/:g" \
-			-e "s:##{CFGDIR}##:/etc/vmware/:g" \
-			-e "s:##{ENABLE_AUTH}##:true:g" \
-			-e "s:##{HOSTDMODE}##:ws:g" \
-			-e "s:##{HOSTD_CFGDIR}##:/etc/vmware/hostd/:g" \
-			-e "s:##{HOSTD_MOCKUP}##:false:g" \
-			-e "s:##{LIBDIR}##:${VM_INSTALL_DIR}/lib/vmware:g" \
-			-e "s:##{LIBDIR_INSTALLED}##:${VM_INSTALL_DIR}/lib/vmware/:g" \
-			-e "s:##{LOGDIR}##:/var/log/vmware/:g" \
-			-e "s:##{LOGLEVEL}##:verbose:g" \
-			-e "s:##{MOCKUP}##:mockup-host-config.xml:g" \
-			-e "s:##{PLUGINDIR}##:./:g" \
-			-e "s:##{SHLIB_PREFIX}##:lib:g" \
-			-e "s:##{SHLIB_SUFFIX}##:.so:g" \
-			-e "s:##{USE_BLKLISTSVC}##:false:g" \
-			-e "s:##{USE_CBRCSVC}##:false:g" \
-			-e "s:##{USE_CIMSVC}##:false:g" \
-			-e "s:##{USE_DIRECTORYSVC}##:false:g" \
-			-e "s:##{USE_DIRECTORYSVC_MOCKUP}##:false:g" \
-			-e "s:##{USE_DYNAMIC_PLUGIN_LOADING}##:false:g" \
-			-e "s:##{USE_DYNAMO}##:false:g" \
-			-e "s:##{USE_DYNSVC}##:false:g" \
-			-e "s:##{USE_GUESTSVC}##:false:g" \
-			-e "s:##{USE_HBRSVC}##:false:g" \
-			-e "s:##{USE_HBRSVC_MOCKUP}##:false:g" \
-			-e "s:##{USE_HOSTSVC_MOCKUP}##:false:g" \
-			-e "s:##{USE_HTTPNFCSVC}##:false:g" \
-			-e "s:##{USE_HTTPNFCSVC_MOCKUP}##:false:g" \
-			-e "s:##{USE_LICENSESVC_MOCKUP}##:false:g" \
-			-e "s:##{USE_NFCSVC}##:true:g" \
-			-e "s:##{USE_NFCSVC_MOCKUP}##:false:g" \
-			-e "s:##{USE_OVFMGRSVC}##:true:g" \
-			-e "s:##{USE_PARTITIONSVC}##:false:g" \
-			-e "s:##{USE_SECURESOAP}##:false:g" \
-			-e "s:##{USE_SNMPSVC}##:false:g" \
-			-e "s:##{USE_SOLO_MOCKUP}##:false:g" \
-			-e "s:##{USE_STATSSVC_MOCKUP}##:false:g" \
-			-e "s:##{USE_VCSVC_MOCKUP}##:false:g" \
-			-e "s:##{USE_VDISKSVC}##:false:g" \
-			-e "s:##{USE_VDISKSVC_MOCKUP}##:false:g" \
-			-e "s:##{USE_VMSVC_MOCKUP}##:false:g" \
-			-e "s:##{VM_INVENTORY}##:vmInventory.xml:g" \
-			-e "s:##{VM_RESOURCES}##:vmResources.xml:g" \
-			-e "s:##{WEBSERVER_PORT_ENTRY}##::g" \
-			-e "s:##{WORKINGDIR}##:./:g" \
-			-i "${D}/etc/vmware/hostd/config.xml" || die
-
-		sed -e "s:##{ENV_LOCATION}##:/etc/vmware/hostd/env/:g" \
-			-i "${D}/etc/vmware/hostd/environments.xml" || die
-
-		# @@VICLIENT_URL@@=XXX
-		sed -e "s:@@AUTHD_PORT@@:902:g" \
-			-i "${D}${VM_INSTALL_DIR}/lib/vmware/hostd/docroot/client/clients.xml" || die
-	fi
-
-	# install systemd unit files
-	systemd_dounit "${WORKDIR}/systemd-vmware-${SYSTEMD_UNITS_TAG}/"*.{service,target}
-}
-
-pkg_config() {
-	"${VM_INSTALL_DIR}"/bin/vmware-networks --postinstall ${PN},old,new
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-	gnome2_icon_cache_update
-
-	ewarn "/etc/env.d was updated. Please run:"
-	ewarn "env-update && source /etc/profile"
-	ewarn ""
-	ewarn "Before you can use vmware workstation, you must configure a default network setup."
-	ewarn "You can do this by running 'emerge --config ${PN}'."
-}
-
-pkg_prerm() {
-	einfo "Stopping ${PN} for safe unmerge"
-	/etc/init.d/vmware stop
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-	gnome2_icon_cache_update
-}
diff --git a/app-emulation/vmware-workstation/vmware-workstation-10.0.6.2700073.ebuild b/app-emulation/vmware-workstation/vmware-workstation-10.0.6.2700073.ebuild
new file mode 100644
index 000000000000..730645e8b42d
--- /dev/null
+++ b/app-emulation/vmware-workstation/vmware-workstation-10.0.6.2700073.ebuild
@@ -0,0 +1,499 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils versionator fdo-mime systemd gnome2-utils pam vmware-bundle
+
+MY_PN="VMware-Workstation"
+MY_PV=$(get_version_component_range 1-3)
+PV_MINOR=$(get_version_component_range 3)
+PV_BUILD=$(get_version_component_range 4)
+MY_P="${MY_PN}-${MY_PV}-${PV_BUILD}"
+
+SYSTEMD_UNITS_TAG="gentoo-01"
+
+DESCRIPTION="Emulate a complete PC on your PC without the usual performance overhead of most emulators"
+HOMEPAGE="http://www.vmware.com/products/workstation/"
+BASE_URI="https://softwareupdate.vmware.com/cds/vmw-desktop/ws/${MY_PV}/${PV_BUILD}/linux/core/"
+SRC_URI="
+	x86? ( ${BASE_URI}${MY_P}.i386.bundle.tar )
+	amd64? ( ${BASE_URI}${MY_P}.x86_64.bundle.tar )
+	https://github.com/akhuettel/systemd-vmware/archive/${SYSTEMD_UNITS_TAG}.tar.gz
+	"
+LICENSE="vmware GPL-2"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE="cups doc ovftool server vix vmware-tools"
+RESTRICT="mirror strip"
+
+# vmware-workstation should not use virtual/libc as this is a
+# precompiled binary package thats linked to glibc.
+RDEPEND="dev-cpp/cairomm
+	dev-cpp/glibmm:2
+	dev-cpp/gtkmm:2.4
+	dev-cpp/libgnomecanvasmm
+	dev-cpp/pangomm
+	dev-libs/atk
+	dev-libs/glib:2
+	dev-libs/icu
+	dev-libs/expat
+	dev-libs/libaio
+	=dev-libs/libgcrypt-1.5*
+	dev-libs/libsigc++
+	dev-libs/libxml2
+	dev-libs/openssl:0.9.8
+	dev-libs/xmlrpc-c
+	gnome-base/libgnomecanvas
+	gnome-base/libgtop:2
+	gnome-base/librsvg:2
+	gnome-base/orbit
+	media-libs/fontconfig
+	media-libs/freetype
+	media-libs/libart_lgpl
+	media-libs/libpng:1.2
+	media-libs/libpng
+	media-libs/tiff:3
+	net-misc/curl
+	cups? ( net-print/cups )
+	sys-devel/gcc
+	sys-fs/fuse
+	sys-libs/glibc
+	sys-libs/zlib
+	x11-libs/cairo
+	x11-libs/gtk+:2
+	x11-libs/libgksu
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	x11-libs/libXau
+	x11-libs/libxcb
+	x11-libs/libXcomposite
+	x11-libs/libXcursor
+	x11-libs/libXdamage
+	x11-libs/libXdmcp
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXft
+	x11-libs/libXi
+	x11-libs/libXinerama
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	x11-libs/libXtst
+	x11-libs/pango
+	x11-libs/pangox-compat
+	x11-libs/startup-notification
+	x11-themes/hicolor-icon-theme
+	!app-emulation/vmware-player"
+PDEPEND="~app-emulation/vmware-modules-279.${PV_MINOR}
+	vmware-tools? ( app-emulation/vmware-tools )"
+
+S=${WORKDIR}
+VM_INSTALL_DIR="/opt/vmware"
+VM_DATA_STORE_DIR="/var/lib/vmware/Shared VMs"
+VM_HOSTD_USER="root"
+
+src_unpack() {
+	default
+	local bundle
+	use amd64 && bundle=${MY_P}.x86_64.bundle
+	use x86 && bundle=${MY_P}.i386.bundle
+	local component; for component in \
+		vmware-vmx \
+		vmware-player-app \
+		vmware-player-setup \
+		vmware-workstation \
+		vmware-network-editor \
+		vmware-network-editor-ui \
+		vmware-usbarbitrator \
+		vmware-vprobe
+	do
+		vmware-bundle_extract-bundle-component "${bundle}" "${component}" "${S}"
+	done
+
+	if use server; then
+		vmware-bundle_extract-bundle-component "${bundle}" vmware-workstation-server #"${S}"
+	fi
+
+	if use vix; then
+		vmware-bundle_extract-bundle-component "${bundle}" vmware-vix-core vmware-vix
+		vmware-bundle_extract-bundle-component "${bundle}" vmware-vix-lib-Workstation1000andvSphere550 vmware-vix
+	fi
+	if use ovftool; then
+		vmware-bundle_extract-bundle-component "${bundle}" vmware-ovftool
+	fi
+}
+
+src_prepare() {
+	rm -f  bin/vmware-modconfig
+	rm -rf lib/modules/binary
+	# Bug 459566
+	mv lib/libvmware-netcfg.so lib/lib/
+
+	if use server; then
+		rm -f vmware-workstation-server/bin/{openssl,configure-hostd.sh}
+	fi
+
+	find "${S}" -name '*.a' -delete
+
+#	clean_bundled_libs
+}
+
+clean_bundled_libs() {
+	ebegin 'Removing superfluous libraries'
+	cd lib/lib || die
+	ldconfig -p | \
+		sed 's:^\s\+\([^(]*[^( ]\).*=> /.*$:\1:g;t;d' | \
+		fgrep -vx 'libcrypto.so.0.9.8
+libssl.so.0.9.8i
+libgcr.so.0
+libglib-2.0.so.0' |
+		xargs -d'\n' -r rm -rf
+	eend
+}
+
+src_install() {
+	local major_minor=$(get_version_component_range 1-2 "${PV}")
+	local major_minor_revision=$(get_version_component_range 1-3 "${PV}")
+	local build=$(get_version_component_range 4 "${PV}")
+
+	# revdep-rebuild entry
+	insinto /etc/revdep-rebuild
+	echo "SEARCH_DIRS_MASK=\"${VM_INSTALL_DIR}\"" >> ${T}/10${PN}
+	doins "${T}"/10${PN}
+
+	# install the binaries
+	into "${VM_INSTALL_DIR}"
+	dobin bin/*
+
+	# install the libraries
+	insinto "${VM_INSTALL_DIR}"/lib/vmware
+	doins -r lib/*
+
+	# Bug 432918
+	dosym "${VM_INSTALL_DIR}"/lib/vmware/lib/libcrypto.so.0.9.8/libcrypto.so.0.9.8 \
+		"${VM_INSTALL_DIR}"/lib/vmware/lib/libvmwarebase.so.0/libcrypto.so.0.9.8
+	dosym "${VM_INSTALL_DIR}"/lib/vmware/lib/libssl.so.0.9.8/libssl.so.0.9.8 \
+		"${VM_INSTALL_DIR}"/lib/vmware/lib/libvmwarebase.so.0/libssl.so.0.9.8
+
+	# install the ancillaries
+	insinto /usr
+	doins -r share
+
+	if use cups; then
+		exeinto $(cups-config --serverbin)/filter
+		doexe extras/thnucups
+
+		insinto /etc/cups
+		doins -r etc/cups/*
+	fi
+
+	insinto /etc/xdg
+	doins -r etc/xdg/*
+
+	# install documentation
+	doman man/man1/vmware.1.gz
+
+	if use doc; then
+		dodoc doc/*
+	fi
+
+	insinto "${VM_INSTALL_DIR}"/lib/vmware/setup
+	doins vmware-config
+
+	# install vmware workstation server
+	if use server; then
+		dosbin sbin/*
+
+		cd "${S}"/vmware-workstation-server
+
+		# install binaries
+		into "${VM_INSTALL_DIR}"/lib/vmware
+		dobin bin/*
+
+		dobin "${FILESDIR}"/configure-hostd.sh
+
+		dobin "${FILESDIR}"/configure-hostd.sh
+
+		# install the libraries
+		insinto "${VM_INSTALL_DIR}"/lib/vmware/lib
+		doins -r lib/*
+
+		into "${VM_INSTALL_DIR}"
+		for tool in  vmware-{hostd,wssc-adminTool} ; do
+			cat > "${T}/${tool}" <<-EOF
+				#!/usr/bin/env bash
+				set -e
+
+				. /etc/vmware/bootstrap
+
+				exec "${VM_INSTALL_DIR}/lib/vmware/lib/wrapper-gtk24.sh" \\
+					"${VM_INSTALL_DIR}/lib/vmware/lib" \\
+					"${VM_INSTALL_DIR}/lib/vmware/bin/${tool}" \\
+					"${VM_INSTALL_DIR}/lib/vmware/libconf" "\$@"
+			EOF
+			dobin "${T}/${tool}"
+		done
+
+		insinto "${VM_INSTALL_DIR}"/lib/vmware
+		doins -r hostd
+
+		# create the configuration
+		insinto /etc/vmware/hostd
+		doins -r config/etc/vmware/hostd/*
+		doins -r etc/vmware/hostd/*
+
+		insinto /etc/vmware/ssl
+		doins etc/vmware/ssl/*
+
+		# pam
+		pamd_mimic_system vmware-authd auth account
+
+		# create directory for shared virtual machines.
+		keepdir "${VM_DATA_STORE_DIR}"
+		keepdir /var/log/vmware
+	fi
+
+	# install vmware-vix
+	if use vix; then
+		cd "${S}"/vmware-vix
+
+		# install the binary
+		into "${VM_INSTALL_DIR}"
+		dobin bin/*
+
+		# install the libraries
+		insinto "${VM_INSTALL_DIR}"/lib/vmware-vix
+		doins -r lib/*
+
+		dosym vmware-vix/libvixAllProducts.so "${VM_INSTALL_DIR}"/lib/libbvixAllProducts.so
+
+		# install headers
+		insinto /usr/include/vmware-vix
+		doins include/*
+
+		if use doc; then
+			dohtml -r doc/*
+		fi
+	fi
+
+	# install ovftool
+	if use ovftool; then
+		cd "${S}"
+
+		insinto "${VM_INSTALL_DIR}"/lib/vmware-ovftool
+		doins -r vmware-ovftool/*
+
+		chmod 0755 "${D}${VM_INSTALL_DIR}"/lib/vmware-ovftool/{ovftool,ovftool.bin}
+		dosym "${D}${VM_INSTALL_DIR}"/lib/vmware-ovftool/ovftool "${VM_INSTALL_DIR}"/bin/ovftool
+	fi
+
+	# create symlinks for the various tools
+	local tool ; for tool in thnuclnt vmware vmplayer{,-daemon} licenseTool vmamqpd \
+			vmware-{acetool,enter-serial,gksu,fuseUI,modconfig{,-console},netcfg,tray,unity-helper,zenity} ; do
+		dosym appLoader "${VM_INSTALL_DIR}"/lib/vmware/bin/"${tool}"
+	done
+	dosym "${VM_INSTALL_DIR}"/lib/vmware/bin/vmplayer "${VM_INSTALL_DIR}"/bin/vmplayer
+	dosym "${VM_INSTALL_DIR}"/lib/vmware/bin/vmware "${VM_INSTALL_DIR}"/bin/vmware
+	dosym "${VM_INSTALL_DIR}"/lib/vmware/icu /etc/vmware/icu
+
+	# fix permissions
+	fperms 0755 "${VM_INSTALL_DIR}"/lib/vmware/bin/{appLoader,fusermount,launcher.sh,mkisofs,vmware-remotemks}
+	fperms 0755 "${VM_INSTALL_DIR}"/lib/vmware/lib/{wrapper-gtk24.sh,libgksu2.so.0/gksu-run-helper}
+	fperms 0755 "${VM_INSTALL_DIR}"/lib/vmware/setup/vmware-config
+	fperms 4711 "${VM_INSTALL_DIR}"/bin/vmware-mount
+	fperms 4711 "${VM_INSTALL_DIR}"/lib/vmware/bin/vmware-vmx{,-debug,-stats}
+	if use server; then
+		fperms 0755 "${VM_INSTALL_DIR}"/lib/vmware/bin/vmware-{hostd,wssc-adminTool}
+		fperms 4711 "${VM_INSTALL_DIR}"/sbin/vmware-authd
+		fperms 1777 "${VM_DATA_STORE_DIR}"
+	fi
+	if use vix; then
+		fperms 0755 "${VM_INSTALL_DIR}"/lib/vmware-vix/setup/vmware-config
+	fi
+
+	# create the environment
+	local envd="${T}/90vmware"
+	cat > "${envd}" <<-EOF
+		PATH='${VM_INSTALL_DIR}/bin'
+		ROOTPATH='${VM_INSTALL_DIR}/bin'
+	EOF
+	doenvd "${envd}"
+
+	# create the configuration
+	dodir /etc/vmware
+
+	cat > "${D}"/etc/vmware/bootstrap <<-EOF
+		BINDIR='${VM_INSTALL_DIR}/bin'
+		LIBDIR='${VM_INSTALL_DIR}/lib'
+	EOF
+
+	cat > "${D}"/etc/vmware/config <<-EOF
+		bindir = "${VM_INSTALL_DIR}/bin"
+		libdir = "${VM_INSTALL_DIR}/lib/vmware"
+		initscriptdir = "/etc/init.d"
+		authd.fullpath = "${VM_INSTALL_DIR}/sbin/vmware-authd"
+		gksu.rootMethod = "su"
+		VMCI_CONFED = "yes"
+		VMBLOCK_CONFED = "yes"
+		VSOCK_CONFED = "yes"
+		NETWORKING = "yes"
+		player.product.version = "${major_minor_revision}"
+		product.version = "${major_minor_revision}"
+		product.buildNumber = "${build}"
+		product.name = "VMware Workstation"
+		workstation.product.version = "${major_minor_revision}"
+	EOF
+
+	if use vix; then
+		cat >> "${D}"/etc/vmware/config <<-EOF
+			vmware.fullpath = "${VM_INSTALL_DIR}/bin/vmware"
+			vix.libdir = "${VM_INSTALL_DIR}/lib/vmware-vix"
+			vix.config.version = "1"
+		EOF
+	fi
+
+	if use server; then
+		cat >> "${D}"/etc/vmware/config <<-EOF
+			authd.client.port = "902"
+			authd.proxy.nfc = "vmware-hostd:ha-nfc"
+			authd.soapserver = "TRUE"
+		EOF
+	fi
+
+	# install the init.d script
+	local initscript="${T}/vmware.rc"
+	sed -e "s:@@BINDIR@@:${VM_INSTALL_DIR}/bin:g" \
+		"${FILESDIR}/vmware-${major_minor}.rc" > ${initscript}
+	newinitd "${initscript}" vmware
+
+	if use server; then
+		# install the init.d script
+		local initscript="${T}/vmware-workstation-server.rc"
+		sed -e "s:@@ETCDIR@@:/etc/vmware:g" \
+			-e "s:@@PREFIX@@:${VM_INSTALL_DIR}:g" \
+			-e "s:@@BINDIR@@:${VM_INSTALL_DIR}/bin:g" \
+			-e "s:@@LIBDIR@@:${VM_INSTALL_DIR}/lib/vmware:g" \
+			"${FILESDIR}/vmware-server-${major_minor}.rc" > ${initscript}
+		newinitd "${initscript}" vmware-workstation-server
+	fi
+
+	# fill in variable placeholders
+	sed -e "s:@@LIBCONF_DIR@@:${VM_INSTALL_DIR}/lib/vmware/libconf:g" \
+		-i "${D}${VM_INSTALL_DIR}"/lib/vmware/libconf/etc/{gtk-2.0/{gdk-pixbuf.loaders,gtk.immodules},pango/pango{.modules,rc}}
+	sed -e "s:@@BINARY@@:${VM_INSTALL_DIR}/bin/vmware:g" \
+		-e "/^Encoding/d" \
+		-i "${D}/usr/share/applications/${PN}.desktop"
+	sed -e "s:@@BINARY@@:${VM_INSTALL_DIR}/bin/vmplayer:g" \
+		-e "/^Encoding/d" \
+		-i "${D}/usr/share/applications/vmware-player.desktop"
+	sed -e "s:@@BINARY@@:${VM_INSTALL_DIR}/bin/vmware-netcfg:g" \
+		-e "/^Encoding/d" \
+		-i "${D}/usr/share/applications/vmware-netcfg.desktop"
+
+	if use server; then
+	# Configuration for vmware-workstation-server
+		local hostdUser="${VM_HOSTD_USER:-root}"
+		sed -e "/ACEDataUser/s:root:${hostdUser}:g" \
+			-i "${D}/etc/vmware/hostd/authorization.xml" || die
+
+		# Shared VMs Path: [standard].
+		sed -e "s:##{DS_NAME}##:standard:g" \
+			-e "s:##{DS_PATH}##:${VM_DATA_STORE_DIR}:g" \
+			-i "${D}/etc/vmware/hostd/datastores.xml" || die
+
+		sed -e "s:##{HTTP_PORT}##:-1:g" \
+			-e "s:##{HTTPS_PORT}##:443:g" \
+			-e "s:##{PIPE_PREFIX}##:/var/run/vmware/:g" \
+			-i "${D}/etc/vmware/hostd/proxy.xml" || die
+
+		# See vmware-workstation-server.py for more details.
+		sed -e "s:##{BUILD_CFGDIR}##:/etc/vmware/hostd/:g" \
+			-e "s:##{CFGALTDIR}##:/etc/vmware/hostd/:g" \
+			-e "s:##{CFGDIR}##:/etc/vmware/:g" \
+			-e "s:##{ENABLE_AUTH}##:true:g" \
+			-e "s:##{HOSTDMODE}##:ws:g" \
+			-e "s:##{HOSTD_CFGDIR}##:/etc/vmware/hostd/:g" \
+			-e "s:##{HOSTD_MOCKUP}##:false:g" \
+			-e "s:##{LIBDIR}##:${VM_INSTALL_DIR}/lib/vmware:g" \
+			-e "s:##{LIBDIR_INSTALLED}##:${VM_INSTALL_DIR}/lib/vmware/:g" \
+			-e "s:##{LOGDIR}##:/var/log/vmware/:g" \
+			-e "s:##{LOGLEVEL}##:verbose:g" \
+			-e "s:##{MOCKUP}##:mockup-host-config.xml:g" \
+			-e "s:##{PLUGINDIR}##:./:g" \
+			-e "s:##{SHLIB_PREFIX}##:lib:g" \
+			-e "s:##{SHLIB_SUFFIX}##:.so:g" \
+			-e "s:##{USE_BLKLISTSVC}##:false:g" \
+			-e "s:##{USE_CBRCSVC}##:false:g" \
+			-e "s:##{USE_CIMSVC}##:false:g" \
+			-e "s:##{USE_DIRECTORYSVC}##:false:g" \
+			-e "s:##{USE_DIRECTORYSVC_MOCKUP}##:false:g" \
+			-e "s:##{USE_DYNAMIC_PLUGIN_LOADING}##:false:g" \
+			-e "s:##{USE_DYNAMO}##:false:g" \
+			-e "s:##{USE_DYNSVC}##:false:g" \
+			-e "s:##{USE_GUESTSVC}##:false:g" \
+			-e "s:##{USE_HBRSVC}##:false:g" \
+			-e "s:##{USE_HBRSVC_MOCKUP}##:false:g" \
+			-e "s:##{USE_HOSTSVC_MOCKUP}##:false:g" \
+			-e "s:##{USE_HTTPNFCSVC}##:false:g" \
+			-e "s:##{USE_HTTPNFCSVC_MOCKUP}##:false:g" \
+			-e "s:##{USE_LICENSESVC_MOCKUP}##:false:g" \
+			-e "s:##{USE_NFCSVC}##:true:g" \
+			-e "s:##{USE_NFCSVC_MOCKUP}##:false:g" \
+			-e "s:##{USE_OVFMGRSVC}##:true:g" \
+			-e "s:##{USE_PARTITIONSVC}##:false:g" \
+			-e "s:##{USE_SECURESOAP}##:false:g" \
+			-e "s:##{USE_SNMPSVC}##:false:g" \
+			-e "s:##{USE_SOLO_MOCKUP}##:false:g" \
+			-e "s:##{USE_STATSSVC_MOCKUP}##:false:g" \
+			-e "s:##{USE_VCSVC_MOCKUP}##:false:g" \
+			-e "s:##{USE_VDISKSVC}##:false:g" \
+			-e "s:##{USE_VDISKSVC_MOCKUP}##:false:g" \
+			-e "s:##{USE_VMSVC_MOCKUP}##:false:g" \
+			-e "s:##{VM_INVENTORY}##:vmInventory.xml:g" \
+			-e "s:##{VM_RESOURCES}##:vmResources.xml:g" \
+			-e "s:##{WEBSERVER_PORT_ENTRY}##::g" \
+			-e "s:##{WORKINGDIR}##:./:g" \
+			-i "${D}/etc/vmware/hostd/config.xml" || die
+
+		sed -e "s:##{ENV_LOCATION}##:/etc/vmware/hostd/env/:g" \
+			-i "${D}/etc/vmware/hostd/environments.xml" || die
+
+		# @@VICLIENT_URL@@=XXX
+		sed -e "s:@@AUTHD_PORT@@:902:g" \
+			-i "${D}${VM_INSTALL_DIR}/lib/vmware/hostd/docroot/client/clients.xml" || die
+	fi
+
+	# install systemd unit files
+	systemd_dounit "${WORKDIR}/systemd-vmware-${SYSTEMD_UNITS_TAG}/"*.{service,target}
+}
+
+pkg_config() {
+	"${VM_INSTALL_DIR}"/bin/vmware-networks --postinstall ${PN},old,new
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+	gnome2_icon_cache_update
+
+	ewarn "/etc/env.d was updated. Please run:"
+	ewarn "env-update && source /etc/profile"
+	ewarn ""
+	ewarn "Before you can use vmware workstation, you must configure a default network setup."
+	ewarn "You can do this by running 'emerge --config ${PN}'."
+}
+
+pkg_prerm() {
+	einfo "Stopping ${PN} for safe unmerge"
+	/etc/init.d/vmware stop
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+	gnome2_icon_cache_update
+}
diff --git a/app-emulation/vmware-workstation/vmware-workstation-11.1.2.2780323.ebuild b/app-emulation/vmware-workstation/vmware-workstation-11.1.2.2780323.ebuild
new file mode 100644
index 000000000000..cf0493d20c6e
--- /dev/null
+++ b/app-emulation/vmware-workstation/vmware-workstation-11.1.2.2780323.ebuild
@@ -0,0 +1,497 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils versionator fdo-mime systemd gnome2-utils pam vmware-bundle
+
+MY_PN="VMware-Workstation"
+MY_PV=$(get_version_component_range 1-3)
+PV_MINOR=$(get_version_component_range 3)
+PV_BUILD=$(get_version_component_range 4)
+MY_P="${MY_PN}-${MY_PV}-${PV_BUILD}"
+
+SYSTEMD_UNITS_TAG="gentoo-01"
+
+DESCRIPTION="Emulate a complete PC on your PC without the usual performance overhead of most emulators"
+HOMEPAGE="http://www.vmware.com/products/workstation/"
+BASE_URI="https://softwareupdate.vmware.com/cds/vmw-desktop/ws/${MY_PV}/${PV_BUILD}/linux/core/"
+SRC_URI="
+	amd64? ( ${BASE_URI}${MY_P}.x86_64.bundle.tar )
+	https://github.com/akhuettel/systemd-vmware/archive/${SYSTEMD_UNITS_TAG}.tar.gz
+	"
+LICENSE="vmware GPL-2"
+SLOT="0"
+KEYWORDS="-* ~amd64"
+IUSE="cups doc ovftool server vix vmware-tools"
+RESTRICT="mirror strip"
+
+# vmware-workstation should not use virtual/libc as this is a
+# precompiled binary package thats linked to glibc.
+RDEPEND="dev-cpp/cairomm
+	dev-cpp/glibmm:2
+	dev-cpp/gtkmm:2.4
+	dev-cpp/libgnomecanvasmm
+	dev-cpp/pangomm
+	dev-libs/atk
+	dev-libs/glib:2
+	dev-libs/icu
+	dev-libs/expat
+	dev-libs/libaio
+	=dev-libs/libgcrypt-1.5*
+	dev-libs/libsigc++
+	dev-libs/libxml2
+	dev-libs/openssl:0.9.8
+	dev-libs/xmlrpc-c
+	gnome-base/libgnomecanvas
+	gnome-base/libgtop:2
+	gnome-base/librsvg:2
+	gnome-base/orbit
+	media-libs/fontconfig
+	media-libs/freetype
+	media-libs/libart_lgpl
+	media-libs/libpng:1.2
+	media-libs/libpng
+	media-libs/tiff:3
+	net-misc/curl
+	cups? ( net-print/cups )
+	sys-devel/gcc
+	sys-fs/fuse
+	sys-libs/glibc
+	sys-libs/zlib
+	x11-libs/cairo
+	x11-libs/gtk+:2
+	x11-libs/libgksu
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	x11-libs/libXau
+	x11-libs/libxcb
+	x11-libs/libXcomposite
+	x11-libs/libXcursor
+	x11-libs/libXdamage
+	x11-libs/libXdmcp
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXft
+	x11-libs/libXi
+	x11-libs/libXinerama
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	x11-libs/libXtst
+	x11-libs/pango
+	x11-libs/pangox-compat
+	x11-libs/startup-notification
+	x11-themes/hicolor-icon-theme
+	!app-emulation/vmware-player"
+PDEPEND="~app-emulation/vmware-modules-304.${PV_MINOR}
+	vmware-tools? ( app-emulation/vmware-tools )"
+
+S=${WORKDIR}
+VM_INSTALL_DIR="/opt/vmware"
+VM_DATA_STORE_DIR="/var/lib/vmware/Shared VMs"
+VM_HOSTD_USER="root"
+
+src_unpack() {
+	default
+	local bundle
+	use amd64 && bundle=${MY_P}.x86_64.bundle
+	local component; for component in \
+		vmware-vmx \
+		vmware-player-app \
+		vmware-player-setup \
+		vmware-workstation \
+		vmware-network-editor \
+		vmware-network-editor-ui \
+		vmware-usbarbitrator \
+		vmware-vprobe
+	do
+		vmware-bundle_extract-bundle-component "${bundle}" "${component}" "${S}"
+	done
+
+	if use server; then
+		vmware-bundle_extract-bundle-component "${bundle}" vmware-workstation-server #"${S}"
+	fi
+
+	if use vix; then
+		vmware-bundle_extract-bundle-component "${bundle}" vmware-vix-core vmware-vix
+		vmware-bundle_extract-bundle-component "${bundle}" vmware-vix-lib-Workstation1100andvSphere600 vmware-vix
+	fi
+	if use ovftool; then
+		vmware-bundle_extract-bundle-component "${bundle}" vmware-ovftool
+	fi
+}
+
+src_prepare() {
+	rm -f  bin/vmware-modconfig
+	rm -rf lib/modules/binary
+	# Bug 459566
+	mv lib/libvmware-netcfg.so lib/lib/
+
+	if use server; then
+		rm -f vmware-workstation-server/bin/{openssl,configure-hostd.sh}
+	fi
+
+	find "${S}" -name '*.a' -delete
+
+#	clean_bundled_libs
+}
+
+clean_bundled_libs() {
+	ebegin 'Removing superfluous libraries'
+	cd lib/lib || die
+	ldconfig -p | \
+		sed 's:^\s\+\([^(]*[^( ]\).*=> /.*$:\1:g;t;d' | \
+		fgrep -vx 'libcrypto.so.0.9.8
+libssl.so.0.9.8i
+libgcr.so.0
+libglib-2.0.so.0' |
+		xargs -d'\n' -r rm -rf
+	eend
+}
+
+src_install() {
+	local major_minor=$(get_version_component_range 1-2 "${PV}")
+	local major_minor_revision=$(get_version_component_range 1-3 "${PV}")
+	local build=$(get_version_component_range 4 "${PV}")
+
+	# revdep-rebuild entry
+	insinto /etc/revdep-rebuild
+	echo "SEARCH_DIRS_MASK=\"${VM_INSTALL_DIR}\"" >> ${T}/10${PN}
+	doins "${T}"/10${PN}
+
+	# install the binaries
+	into "${VM_INSTALL_DIR}"
+	dobin bin/*
+
+	# install the libraries
+	insinto "${VM_INSTALL_DIR}"/lib/vmware
+	doins -r lib/*
+
+	# Bug 432918
+	dosym "${VM_INSTALL_DIR}"/lib/vmware/lib/libcrypto.so.0.9.8/libcrypto.so.0.9.8 \
+		"${VM_INSTALL_DIR}"/lib/vmware/lib/libvmwarebase.so.0/libcrypto.so.0.9.8
+	dosym "${VM_INSTALL_DIR}"/lib/vmware/lib/libssl.so.0.9.8/libssl.so.0.9.8 \
+		"${VM_INSTALL_DIR}"/lib/vmware/lib/libvmwarebase.so.0/libssl.so.0.9.8
+
+	# install the ancillaries
+	insinto /usr
+	doins -r share
+
+	if use cups; then
+		exeinto $(cups-config --serverbin)/filter
+		doexe extras/thnucups
+
+		insinto /etc/cups
+		doins -r etc/cups/*
+	fi
+
+	insinto /etc/xdg
+	doins -r etc/xdg/*
+
+	# install documentation
+	doman man/man1/vmware.1.gz
+
+	if use doc; then
+		dodoc doc/*
+	fi
+
+	insinto "${VM_INSTALL_DIR}"/lib/vmware/setup
+	doins vmware-config
+
+	# install vmware workstation server
+	if use server; then
+		dosbin sbin/*
+
+		cd "${S}"/vmware-workstation-server
+
+		# install binaries
+		into "${VM_INSTALL_DIR}"/lib/vmware
+		dobin bin/*
+
+		dobin "${FILESDIR}"/configure-hostd.sh
+
+		dobin "${FILESDIR}"/configure-hostd.sh
+
+		# install the libraries
+		insinto "${VM_INSTALL_DIR}"/lib/vmware/lib
+		doins -r lib/*
+
+		into "${VM_INSTALL_DIR}"
+		for tool in  vmware-{hostd,wssc-adminTool} ; do
+			cat > "${T}/${tool}" <<-EOF
+				#!/usr/bin/env bash
+				set -e
+
+				. /etc/vmware/bootstrap
+
+				exec "${VM_INSTALL_DIR}/lib/vmware/lib/wrapper-gtk24.sh" \\
+					"${VM_INSTALL_DIR}/lib/vmware/lib" \\
+					"${VM_INSTALL_DIR}/lib/vmware/bin/${tool}" \\
+					"${VM_INSTALL_DIR}/lib/vmware/libconf" "\$@"
+			EOF
+			dobin "${T}/${tool}"
+		done
+
+		insinto "${VM_INSTALL_DIR}"/lib/vmware
+		doins -r hostd
+
+		# create the configuration
+		insinto /etc/vmware/hostd
+		doins -r config/etc/vmware/hostd/*
+		doins -r etc/vmware/hostd/*
+
+		insinto /etc/vmware/ssl
+		doins etc/vmware/ssl/*
+
+		# pam
+		pamd_mimic_system vmware-authd auth account
+
+		# create directory for shared virtual machines.
+		keepdir "${VM_DATA_STORE_DIR}"
+		keepdir /var/log/vmware
+	fi
+
+	# install vmware-vix
+	if use vix; then
+		cd "${S}"/vmware-vix
+
+		# install the binary
+		into "${VM_INSTALL_DIR}"
+		dobin bin/*
+
+		# install the libraries
+		insinto "${VM_INSTALL_DIR}"/lib/vmware-vix
+		doins -r lib/*
+
+		dosym vmware-vix/libvixAllProducts.so "${VM_INSTALL_DIR}"/lib/libbvixAllProducts.so
+
+		# install headers
+		insinto /usr/include/vmware-vix
+		doins include/*
+
+		if use doc; then
+			dohtml -r doc/*
+		fi
+	fi
+
+	# install ovftool
+	if use ovftool; then
+		cd "${S}"
+
+		insinto "${VM_INSTALL_DIR}"/lib/vmware-ovftool
+		doins -r vmware-ovftool/*
+
+		chmod 0755 "${D}${VM_INSTALL_DIR}"/lib/vmware-ovftool/{ovftool,ovftool.bin}
+		dosym "${D}${VM_INSTALL_DIR}"/lib/vmware-ovftool/ovftool "${VM_INSTALL_DIR}"/bin/ovftool
+	fi
+
+	# create symlinks for the various tools
+	local tool ; for tool in thnuclnt vmware vmplayer{,-daemon} licenseTool vmamqpd \
+			vmware-{acetool,enter-serial,gksu,fuseUI,modconfig{,-console},netcfg,tray,unity-helper,zenity} ; do
+		dosym appLoader "${VM_INSTALL_DIR}"/lib/vmware/bin/"${tool}"
+	done
+	dosym "${VM_INSTALL_DIR}"/lib/vmware/bin/vmplayer "${VM_INSTALL_DIR}"/bin/vmplayer
+	dosym "${VM_INSTALL_DIR}"/lib/vmware/bin/vmware "${VM_INSTALL_DIR}"/bin/vmware
+	dosym "${VM_INSTALL_DIR}"/lib/vmware/icu /etc/vmware/icu
+
+	# fix permissions
+	fperms 0755 "${VM_INSTALL_DIR}"/lib/vmware/bin/{appLoader,fusermount,launcher.sh,mkisofs,vmware-remotemks}
+	fperms 0755 "${VM_INSTALL_DIR}"/lib/vmware/lib/{wrapper-gtk24.sh,libgksu2.so.0/gksu-run-helper}
+	fperms 0755 "${VM_INSTALL_DIR}"/lib/vmware/setup/vmware-config
+	fperms 4711 "${VM_INSTALL_DIR}"/bin/vmware-mount
+	fperms 4711 "${VM_INSTALL_DIR}"/lib/vmware/bin/vmware-vmx{,-debug,-stats}
+	if use server; then
+		fperms 0755 "${VM_INSTALL_DIR}"/lib/vmware/bin/vmware-{hostd,wssc-adminTool}
+		fperms 4711 "${VM_INSTALL_DIR}"/sbin/vmware-authd
+		fperms 1777 "${VM_DATA_STORE_DIR}"
+	fi
+	if use vix; then
+		fperms 0755 "${VM_INSTALL_DIR}"/lib/vmware-vix/setup/vmware-config
+	fi
+
+	# create the environment
+	local envd="${T}/90vmware"
+	cat > "${envd}" <<-EOF
+		PATH='${VM_INSTALL_DIR}/bin'
+		ROOTPATH='${VM_INSTALL_DIR}/bin'
+	EOF
+	doenvd "${envd}"
+
+	# create the configuration
+	dodir /etc/vmware
+
+	cat > "${D}"/etc/vmware/bootstrap <<-EOF
+		BINDIR='${VM_INSTALL_DIR}/bin'
+		LIBDIR='${VM_INSTALL_DIR}/lib'
+	EOF
+
+	cat > "${D}"/etc/vmware/config <<-EOF
+		bindir = "${VM_INSTALL_DIR}/bin"
+		libdir = "${VM_INSTALL_DIR}/lib/vmware"
+		initscriptdir = "/etc/init.d"
+		authd.fullpath = "${VM_INSTALL_DIR}/sbin/vmware-authd"
+		gksu.rootMethod = "su"
+		VMCI_CONFED = "yes"
+		VMBLOCK_CONFED = "yes"
+		VSOCK_CONFED = "yes"
+		NETWORKING = "yes"
+		player.product.version = "${major_minor_revision}"
+		product.version = "${major_minor_revision}"
+		product.buildNumber = "${build}"
+		product.name = "VMware Workstation"
+		workstation.product.version = "${major_minor_revision}"
+	EOF
+
+	if use vix; then
+		cat >> "${D}"/etc/vmware/config <<-EOF
+			vmware.fullpath = "${VM_INSTALL_DIR}/bin/vmware"
+			vix.libdir = "${VM_INSTALL_DIR}/lib/vmware-vix"
+			vix.config.version = "1"
+		EOF
+	fi
+
+	if use server; then
+		cat >> "${D}"/etc/vmware/config <<-EOF
+			authd.client.port = "902"
+			authd.proxy.nfc = "vmware-hostd:ha-nfc"
+			authd.soapserver = "TRUE"
+		EOF
+	fi
+
+	# install the init.d script
+	local initscript="${T}/vmware.rc"
+	sed -e "s:@@BINDIR@@:${VM_INSTALL_DIR}/bin:g" \
+		"${FILESDIR}/vmware-${major_minor}.rc" > ${initscript}
+	newinitd "${initscript}" vmware
+
+	if use server; then
+		# install the init.d script
+		local initscript="${T}/vmware-workstation-server.rc"
+		sed -e "s:@@ETCDIR@@:/etc/vmware:g" \
+			-e "s:@@PREFIX@@:${VM_INSTALL_DIR}:g" \
+			-e "s:@@BINDIR@@:${VM_INSTALL_DIR}/bin:g" \
+			-e "s:@@LIBDIR@@:${VM_INSTALL_DIR}/lib/vmware:g" \
+			"${FILESDIR}/vmware-server-${major_minor}.rc" > ${initscript}
+		newinitd "${initscript}" vmware-workstation-server
+	fi
+
+	# fill in variable placeholders
+	sed -e "s:@@LIBCONF_DIR@@:${VM_INSTALL_DIR}/lib/vmware/libconf:g" \
+		-i "${D}${VM_INSTALL_DIR}"/lib/vmware/libconf/etc/{gtk-2.0/{gdk-pixbuf.loaders,gtk.immodules},pango/pango{.modules,rc}}
+	sed -e "s:@@BINARY@@:${VM_INSTALL_DIR}/bin/vmware:g" \
+		-e "/^Encoding/d" \
+		-i "${D}/usr/share/applications/${PN}.desktop"
+	sed -e "s:@@BINARY@@:${VM_INSTALL_DIR}/bin/vmplayer:g" \
+		-e "/^Encoding/d" \
+		-i "${D}/usr/share/applications/vmware-player.desktop"
+	sed -e "s:@@BINARY@@:${VM_INSTALL_DIR}/bin/vmware-netcfg:g" \
+		-e "/^Encoding/d" \
+		-i "${D}/usr/share/applications/vmware-netcfg.desktop"
+
+	if use server; then
+	# Configuration for vmware-workstation-server
+		local hostdUser="${VM_HOSTD_USER:-root}"
+		sed -e "/ACEDataUser/s:root:${hostdUser}:g" \
+			-i "${D}/etc/vmware/hostd/authorization.xml" || die
+
+		# Shared VMs Path: [standard].
+		sed -e "s:##{DS_NAME}##:standard:g" \
+			-e "s:##{DS_PATH}##:${VM_DATA_STORE_DIR}:g" \
+			-i "${D}/etc/vmware/hostd/datastores.xml" || die
+
+		sed -e "s:##{HTTP_PORT}##:-1:g" \
+			-e "s:##{HTTPS_PORT}##:443:g" \
+			-e "s:##{PIPE_PREFIX}##:/var/run/vmware/:g" \
+			-i "${D}/etc/vmware/hostd/proxy.xml" || die
+
+		# See vmware-workstation-server.py for more details.
+		sed -e "s:##{BUILD_CFGDIR}##:/etc/vmware/hostd/:g" \
+			-e "s:##{CFGALTDIR}##:/etc/vmware/hostd/:g" \
+			-e "s:##{CFGDIR}##:/etc/vmware/:g" \
+			-e "s:##{ENABLE_AUTH}##:true:g" \
+			-e "s:##{HOSTDMODE}##:ws:g" \
+			-e "s:##{HOSTD_CFGDIR}##:/etc/vmware/hostd/:g" \
+			-e "s:##{HOSTD_MOCKUP}##:false:g" \
+			-e "s:##{LIBDIR}##:${VM_INSTALL_DIR}/lib/vmware:g" \
+			-e "s:##{LIBDIR_INSTALLED}##:${VM_INSTALL_DIR}/lib/vmware/:g" \
+			-e "s:##{LOGDIR}##:/var/log/vmware/:g" \
+			-e "s:##{LOGLEVEL}##:verbose:g" \
+			-e "s:##{MOCKUP}##:mockup-host-config.xml:g" \
+			-e "s:##{PLUGINDIR}##:./:g" \
+			-e "s:##{SHLIB_PREFIX}##:lib:g" \
+			-e "s:##{SHLIB_SUFFIX}##:.so:g" \
+			-e "s:##{USE_BLKLISTSVC}##:false:g" \
+			-e "s:##{USE_CBRCSVC}##:false:g" \
+			-e "s:##{USE_CIMSVC}##:false:g" \
+			-e "s:##{USE_DIRECTORYSVC}##:false:g" \
+			-e "s:##{USE_DIRECTORYSVC_MOCKUP}##:false:g" \
+			-e "s:##{USE_DYNAMIC_PLUGIN_LOADING}##:false:g" \
+			-e "s:##{USE_DYNAMO}##:false:g" \
+			-e "s:##{USE_DYNSVC}##:false:g" \
+			-e "s:##{USE_GUESTSVC}##:false:g" \
+			-e "s:##{USE_HBRSVC}##:false:g" \
+			-e "s:##{USE_HBRSVC_MOCKUP}##:false:g" \
+			-e "s:##{USE_HOSTSVC_MOCKUP}##:false:g" \
+			-e "s:##{USE_HTTPNFCSVC}##:false:g" \
+			-e "s:##{USE_HTTPNFCSVC_MOCKUP}##:false:g" \
+			-e "s:##{USE_LICENSESVC_MOCKUP}##:false:g" \
+			-e "s:##{USE_NFCSVC}##:true:g" \
+			-e "s:##{USE_NFCSVC_MOCKUP}##:false:g" \
+			-e "s:##{USE_OVFMGRSVC}##:true:g" \
+			-e "s:##{USE_PARTITIONSVC}##:false:g" \
+			-e "s:##{USE_SECURESOAP}##:false:g" \
+			-e "s:##{USE_SNMPSVC}##:false:g" \
+			-e "s:##{USE_SOLO_MOCKUP}##:false:g" \
+			-e "s:##{USE_STATSSVC_MOCKUP}##:false:g" \
+			-e "s:##{USE_VCSVC_MOCKUP}##:false:g" \
+			-e "s:##{USE_VDISKSVC}##:false:g" \
+			-e "s:##{USE_VDISKSVC_MOCKUP}##:false:g" \
+			-e "s:##{USE_VMSVC_MOCKUP}##:false:g" \
+			-e "s:##{VM_INVENTORY}##:vmInventory.xml:g" \
+			-e "s:##{VM_RESOURCES}##:vmResources.xml:g" \
+			-e "s:##{WEBSERVER_PORT_ENTRY}##::g" \
+			-e "s:##{WORKINGDIR}##:./:g" \
+			-i "${D}/etc/vmware/hostd/config.xml" || die
+
+		sed -e "s:##{ENV_LOCATION}##:/etc/vmware/hostd/env/:g" \
+			-i "${D}/etc/vmware/hostd/environments.xml" || die
+
+		# @@VICLIENT_URL@@=XXX
+		sed -e "s:@@AUTHD_PORT@@:902:g" \
+			-i "${D}${VM_INSTALL_DIR}/lib/vmware/hostd/docroot/client/clients.xml" || die
+	fi
+
+	# install systemd unit files
+	systemd_dounit "${WORKDIR}/systemd-vmware-${SYSTEMD_UNITS_TAG}/"*.{service,target}
+}
+
+pkg_config() {
+	"${VM_INSTALL_DIR}"/bin/vmware-networks --postinstall ${PN},old,new
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+	gnome2_icon_cache_update
+
+	ewarn "/etc/env.d was updated. Please run:"
+	ewarn "env-update && source /etc/profile"
+	ewarn ""
+	ewarn "Before you can use vmware workstation, you must configure a default network setup."
+	ewarn "You can do this by running 'emerge --config ${PN}'."
+}
+
+pkg_prerm() {
+	einfo "Stopping ${PN} for safe unmerge"
+	/etc/init.d/vmware stop
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+	gnome2_icon_cache_update
+}
diff --git a/app-emulation/wine/Manifest b/app-emulation/wine/Manifest
index d6a9e1fcd896..46acd168feee 100644
--- a/app-emulation/wine/Manifest
+++ b/app-emulation/wine/Manifest
@@ -34,6 +34,7 @@ DIST wine-1.7.45.tar.bz2 22312840 SHA256 a30cef1ee4ceaee4b6c9c2ad96df3b8a8847278
 DIST wine-1.7.46.tar.bz2 22356320 SHA256 9ab4046cc676de3054f9f2560e7d757b25324f72dd9a9cfed0d4aa48cc87350b SHA512 42710c39436fcd66d2a245da9d8242f3c909c58e0f0178a74562ae9d5360e8dc5908a336633edd8f717fb5c5ba07310fc24a2ec57cb447900ff8f57b59e5ec1d WHIRLPOOL 8ca9a25301559001176eb542defbfae279760a4e758b6563431900608ca4efa1ea01a2f3ea56039c4116052be58ee7c4a8ab6df773c3c6fdd65599e1ed376b60
 DIST wine-1.7.47.tar.bz2 22398577 SHA256 ba74f75aec400dc4b1d64ddc29560e4946837e73cb19d9c231604ff0147bbb2e SHA512 588bc143fc371c013b3565044ac14a22176c63fb79e7798a32cd75ec2dbf6b52a73529638254809aa3a4b3105067e96289b555436099c41622b8ffeb2b97a601 WHIRLPOOL 6545baa254f181fbe7a35b19e319faf7b21b838b91fddcab46ae65d8331407d62b36f78f20a19f97895c5c16059f18b3d23d6659658f8939611b171a408478ef
 DIST wine-1.7.50.tar.bz2 22586575 SHA256 7c5410fab820281f337d478c18305027363c9012f30f742339ef1eb0f9dd711e SHA512 b79f0391ef147a9ac8f60079e9068435a25552ad2e133b7d84443978f3b0034c17d8e6edee717fbdbc117021ebe22892957923edbba5e8528d6abb21116b9006 WHIRLPOOL 7a4502b088f259153904a80bc8aa81ebe5cb1e27fc4905b8a0fa84beb2e7904b382473a46d472a9b8a11845ab2eda42965f64bead5379995112c6e5f335c756c
+DIST wine-1.7.51.tar.bz2 22639053 SHA256 397fc95b463d6ae1b65ab0477d9fe5d0871e8e2a3322bc9d984e438f2c4d0f52 SHA512 d23b2a37f82c26b4a2b339711a9eb6d6819c8c4def27c65cb7b8bb917aa660f51b3190b35493246d0bc2eea1ffd47529c4ed18a75ee64654b5f40970eefe277a WHIRLPOOL ec4aec57c1623cf1c5bd91f654cff4a23f5ec4010c33217d2e46f25f6322aa8707797368b428561fee6252849bf09abb25e01524d0ff41ebf440ca7914dd9464
 DIST wine-1.7.8.tar.bz2 21463503 SHA256 30e17f5f863a09416f3d229666566b318dbb40f683d4ca6630012c60bb511804 SHA512 1fdaddb7909f818050854bf351d20f445cf6a5906b1bcc789c96ee8d5058c90815a91bbbc6444f3e4527748764f03ab5297585c174b433093a3354a827402fea WHIRLPOOL 3b5b18384ff04b80b936160c2c6e03676d69663c023f484981305c9272d0601b74cda5c5f7d56008b3900d702b1a4fe1929f16b1fba304a6480b076ffede663a
 DIST wine-1.7.9.tar.bz2 21323337 SHA256 79f99ecc24696915439c474c4953bb77652ab53f16b41daa4da270fe43279c5a SHA512 29f8aa715ebe47c8a06bd5f6a80cac3fb75b2ca7aa81648cc8aed5461cfd825e4da68b6209ca672dce42b968521cfd9bffffaadd2d85b904b55d99687a1c83d0 WHIRLPOOL 333fee72b2a0e9d6ab8a003712c38166bd27aaff384a2b940c089ecc846f7669c59efbeb5cdc2fc87a46d63b0d29d0335873bb7c22f05913bad430b81990241a
 DIST wine-gentoo-2013.06.24.tar.bz2 85442 SHA256 bfbf6b25e98f717320de2ede467e3628fbc749d936b8449f8477c9dc6f41e04b SHA512 b6819889314f6a6ea16c1332f4b177c43623116763969c31b23b61754cd304dd085f5d3eafbe847159331eb97dddd9b4c10699430129ea4a71da418c1fe175f0 WHIRLPOOL 227e0ac6569736d4ad5813cef49f775dae956f4fc9255de95753d5d3cba1bf6cf3db31d23d3702bb54d2e60c5a6f779b602f0efb2096e4c827c924565b273d00
@@ -64,6 +65,7 @@ DIST wine-staging-1.7.45.tar.gz 9216075 SHA256 06180e1189e8669892e8b3d640810306b
 DIST wine-staging-1.7.46.tar.gz 9204220 SHA256 a3b681f38917889bc6dce3ea3e78e91da75789f212b69fd1a10a5bac329761d3 SHA512 24861e1adf882465c3f9f6e0aee47776dd18418342eff500007d36eacfadc166bdea40a53318c7fce3871742559904a1d757ea9a9c0f0624da678a3e9ea2d400 WHIRLPOOL d091925e99dc830ff1a6e49ec9c6f7cd1fc7e40920be2e4a5a10c4b7bc3a5b2109487eb32c5426f31b22baf53216b9b7caeb1b4faf6be8c2b5ecc8233d4ae198
 DIST wine-staging-1.7.47.tar.gz 9166592 SHA256 75aef17c68d1e54b922529832edadca5951e6a37637aad696cfe5abb93d9ca15 SHA512 b3feb61040a727b50fc3efb08441a800b08b4f7d61a00fc68175a6187486a701cc4737f9543119c32ed0c5f141d73ace396114337082cf7978a3437f4217844a WHIRLPOOL 69bead0fa0748dab8d0480d20052b3a75798d42bc32d55b9b254fba7774dddda48642c4e2f116f2c3d813f97e0827232945b3adaad22a827a43be8de12698bbc
 DIST wine-staging-1.7.50.tar.gz 9239831 SHA256 04803fe71edc5d5149624946ffd89de1ddadcd151a47e25cd7e0290b31c1f395 SHA512 7866762cd9ddeeba48167c44df0d186e238f61ffb1412315b3ec466b2a99a01c1cb55816998218aba8a14294302c7d98874144f5f456e341bf506b2b09da0d28 WHIRLPOOL f01192fed42532639afb6b5f4905ec77aeb105a4c33000ec624e87aa792ad4194253d793461a2e5d18051d1b0c2a7438e5745447fa616d34759a12dec3cc80bb
+DIST wine-staging-1.7.51.tar.gz 9628831 SHA256 662cbfcca95405045ba063f312fa4f605d8c48b7b0930c951e2ebac817f3b763 SHA512 f9d2388d63af3aa6ccdc7b66f9d767c19c1577acb84eb3ac03f9b4e07b3ff76906875998fdb42baae3768202129d270b1a1b15fd6bfb20fa33e3bc70559bdf45 WHIRLPOOL f606b6cb2f9a2ece0ce411423df8db1a95217341c2dc6720f748ba8df71758e0a099afc7679fc37fb6621ba1f2fcd5bb505a85cdde797adb45d093836e001441
 DIST wine_gecko-2.21-x86.msi 20871680 SHA256 f01fafa6d7aab995c38add77315c4cbc2f32f52d5d6a9350056f42b62d631fd8 SHA512 f4ca9ca5b876dc39e906991e58c6da8ef4103782f83ba781ff27556c0ebdab7fe10c14f0551e900442a5d57a2c619da6e5ed6ed42323edcdd55ce9789c4c83ac WHIRLPOOL d1db97175b047652499c97c968b71c08c5b44774423f22ae626f89b4dde3d03b46295e5caae228f1f8614209e943e8246854b478eef3abb186e8de4c341b0a0d
 DIST wine_gecko-2.21-x86_64.msi 21646336 SHA256 bc370bdc899f66d98f31c4d410a6952aa82c0c9c0a0ec27f2a11243c9b412c3f SHA512 2a48a7697beba4e45816a9eff09e181de353d8c93e02a70108fa77d27136cd5cd75b21c42caa7702a09f86544669ae2bbfc6975b1fc0d7fcb20150a4bc4ea514 WHIRLPOOL 2fce9b9a190a52c173551d47428dd8b8dc54d5878682733e0006a3f06f216cd9f47a88ada49f92fa5697ece8b2942a88f937bd2722b4cb85d2c35c19bda29b85
 DIST wine_gecko-2.24-x86.msi 22373888 SHA256 6e38acae87ea66e2c1e8f2f0afe88f89eed3e6e0b431cd3da38dea814b71202c SHA512 f158d28ca09bc900a2680892e7ac10770e06050a9251e1ec3a953fee0bf9b1c326e166f92fb88a4648297b6587c91a5ef5af35f267bb2ba5f679da4c8fdb6898 WHIRLPOOL bbe7a2572d89dc5e0347ba11b2014bac79fc4427d7551655313a46b147a79c1607b7f46596877c459ddaa0e202337fb3d217429ddd6a4df49ee33b373a788487
diff --git a/app-emulation/wine/wine-1.7.51.ebuild b/app-emulation/wine/wine-1.7.51.ebuild
new file mode 100644
index 000000000000..d78c249d5b5e
--- /dev/null
+++ b/app-emulation/wine/wine-1.7.51.ebuild
@@ -0,0 +1,439 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+AUTOTOOLS_AUTORECONF=1
+PLOCALES="ar bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru sk sl sr_RS@cyrillic sr_RS@latin sv te th tr uk wa zh_CN zh_TW"
+PLOCALE_BACKUP="en"
+
+inherit autotools-utils eutils fdo-mime flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="git://source.winehq.org/git/wine.git http://source.winehq.org/git/wine.git"
+	EGIT_BRANCH="master"
+	inherit git-r3
+	SRC_URI=""
+	#KEYWORDS=""
+else
+	MY_P="${PN}-${PV/_/-}"
+	SRC_URI="mirror://sourceforge/${PN}/Source/${MY_P}.tar.bz2"
+	KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
+	S=${WORKDIR}/${MY_P}
+fi
+
+GV="2.40"
+MV="4.5.6"
+STAGING_P="wine-staging-${PV}"
+STAGING_DIR="${WORKDIR}/${STAGING_P}"
+WINE_GENTOO="wine-gentoo-2015.03.07"
+GST_P="wine-1.7.34-gstreamer-v5"
+DESCRIPTION="Free implementation of Windows(tm) on Unix"
+HOMEPAGE="http://www.winehq.org/"
+SRC_URI="${SRC_URI}
+	gecko? (
+		abi_x86_32? ( mirror://sourceforge/${PN}/Wine%20Gecko/${GV}/wine_gecko-${GV}-x86.msi )
+		abi_x86_64? ( mirror://sourceforge/${PN}/Wine%20Gecko/${GV}/wine_gecko-${GV}-x86_64.msi )
+	)
+	mono? ( mirror://sourceforge/${PN}/Wine%20Mono/${MV}/wine-mono-${MV}.msi )
+	gstreamer? ( https://dev.gentoo.org/~tetromino/distfiles/${PN}/${GST_P}.patch.bz2 )
+	https://dev.gentoo.org/~tetromino/distfiles/${PN}/${WINE_GENTOO}.tar.bz2"
+
+if [[ ${PV} == "9999" ]] ; then
+	STAGING_EGIT_REPO_URI="git://github.com/wine-compholio/wine-staging.git"
+else
+	SRC_URI="${SRC_URI}
+	staging? ( https://github.com/wine-compholio/wine-staging/archive/v${PV}.tar.gz -> ${STAGING_P}.tar.gz )
+	pulseaudio? ( https://github.com/wine-compholio/wine-staging/archive/v${PV}.tar.gz -> ${STAGING_P}.tar.gz )"
+fi
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +fontconfig +gecko gphoto2 gsm gstreamer +jpeg +lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl pcap pipelight +png +prelink pulseaudio +realtime +run-exes s3tc samba scanner selinux +ssl staging test +threads +truetype +udisks v4l vaapi +X +xcomposite xinerama +xml"
+REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
+	test? ( abi_x86_32 )
+	elibc_glibc? ( threads )
+	mono? ( abi_x86_32 )
+	pipelight? ( staging )
+	s3tc? ( staging )
+	vaapi? ( staging )
+	?? ( gstreamer staging )
+	osmesa? ( opengl )" #286560
+
+# FIXME: the test suite is unsuitable for us; many tests require net access
+# or fail due to Xvfb's opengl limitations.
+RESTRICT="test"
+
+COMMON_DEPEND="
+	truetype? ( >=media-libs/freetype-2.0.0[${MULTILIB_USEDEP}] )
+	capi? ( net-dialup/capi4k-utils )
+	ncurses? ( >=sys-libs/ncurses-5.2:0=[${MULTILIB_USEDEP}] )
+	udisks? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
+	fontconfig? ( media-libs/fontconfig:=[${MULTILIB_USEDEP}] )
+	gphoto2? ( media-libs/libgphoto2:=[${MULTILIB_USEDEP}] )
+	openal? ( media-libs/openal:=[${MULTILIB_USEDEP}] )
+	gstreamer? (
+		media-libs/gstreamer:0.10[${MULTILIB_USEDEP}]
+		media-libs/gst-plugins-base:0.10[${MULTILIB_USEDEP}]
+	)
+	X? (
+		x11-libs/libXcursor[${MULTILIB_USEDEP}]
+		x11-libs/libXext[${MULTILIB_USEDEP}]
+		x11-libs/libXrandr[${MULTILIB_USEDEP}]
+		x11-libs/libXi[${MULTILIB_USEDEP}]
+		x11-libs/libXxf86vm[${MULTILIB_USEDEP}]
+	)
+	xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
+	alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
+	cups? ( net-print/cups:=[${MULTILIB_USEDEP}] )
+	opencl? ( virtual/opencl[${MULTILIB_USEDEP}] )
+	opengl? (
+		virtual/glu[${MULTILIB_USEDEP}]
+		virtual/opengl[${MULTILIB_USEDEP}]
+	)
+	gsm? ( media-sound/gsm:=[${MULTILIB_USEDEP}] )
+	jpeg? ( virtual/jpeg:0=[${MULTILIB_USEDEP}] )
+	ldap? ( net-nds/openldap:=[${MULTILIB_USEDEP}] )
+	lcms? ( media-libs/lcms:2=[${MULTILIB_USEDEP}] )
+	mp3? ( >=media-sound/mpg123-1.5.0[${MULTILIB_USEDEP}] )
+	netapi? ( net-fs/samba[netapi(+),${MULTILIB_USEDEP}] )
+	nls? ( sys-devel/gettext[${MULTILIB_USEDEP}] )
+	odbc? ( dev-db/unixODBC:=[${MULTILIB_USEDEP}] )
+	osmesa? ( media-libs/mesa[osmesa,${MULTILIB_USEDEP}] )
+	pcap? ( net-libs/libpcap[${MULTILIB_USEDEP}] )
+	pulseaudio? ( media-sound/pulseaudio[${MULTILIB_USEDEP}] )
+	staging? ( sys-apps/attr[${MULTILIB_USEDEP}] )
+	xml? (
+		dev-libs/libxml2[${MULTILIB_USEDEP}]
+		dev-libs/libxslt[${MULTILIB_USEDEP}]
+	)
+	scanner? ( media-gfx/sane-backends:=[${MULTILIB_USEDEP}] )
+	ssl? ( net-libs/gnutls:=[${MULTILIB_USEDEP}] )
+	png? ( media-libs/libpng:0=[${MULTILIB_USEDEP}] )
+	v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] )
+	vaapi? ( x11-libs/libva[X,${MULTILIB_USEDEP}] )
+	xcomposite? ( x11-libs/libXcomposite[${MULTILIB_USEDEP}] )
+	abi_x86_32? (
+		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
+		!<app-emulation/emul-linux-x86-baselibs-20140508-r14
+		!app-emulation/emul-linux-x86-db[-abi_x86_32(-)]
+		!<app-emulation/emul-linux-x86-db-20140508-r3
+		!app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)]
+		!<app-emulation/emul-linux-x86-medialibs-20140508-r6
+		!app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)]
+		!<app-emulation/emul-linux-x86-opengl-20140508-r1
+		!app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)]
+		!<app-emulation/emul-linux-x86-sdl-20140508-r1
+		!app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)]
+		!<app-emulation/emul-linux-x86-soundlibs-20140508
+		!app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)]
+		!<app-emulation/emul-linux-x86-xlibs-20140508
+	)"
+
+RDEPEND="${COMMON_DEPEND}
+	dos? ( games-emulation/dosbox )
+	perl? ( dev-lang/perl dev-perl/XML-Simple )
+	s3tc? ( >=media-libs/libtxc_dxtn-1.0.1-r1[${MULTILIB_USEDEP}] )
+	samba? ( >=net-fs/samba-3.0.25 )
+	selinux? ( sec-policy/selinux-wine )
+	udisks? ( sys-fs/udisks:2 )
+	pulseaudio? ( realtime? ( sys-auth/rtkit ) )"
+
+# tools/make_requests requires perl
+DEPEND="${COMMON_DEPEND}
+	staging? ( dev-lang/perl dev-perl/XML-Simple )
+	X? (
+		x11-proto/inputproto
+		x11-proto/xextproto
+		x11-proto/xf86vidmodeproto
+	)
+	xinerama? ( x11-proto/xineramaproto )
+	prelink? ( sys-devel/prelink )
+	>=sys-kernel/linux-headers-2.6
+	virtual/pkgconfig
+	virtual/yacc
+	sys-devel/flex"
+
+# These use a non-standard "Wine" category, which is provided by
+# /etc/xdg/applications-merged/wine.menu
+QA_DESKTOP_FILE="usr/share/applications/wine-browsedrive.desktop
+usr/share/applications/wine-notepad.desktop
+usr/share/applications/wine-uninstaller.desktop
+usr/share/applications/wine-winecfg.desktop"
+
+wine_build_environment_check() {
+	[[ ${MERGE_TYPE} = "binary" ]] && return 0
+
+	# bug #549768
+	if use abi_x86_64 && [[ $(gcc-major-version) = 5 ]]; then
+		eerror "64-bit wine cannot be built with gcc-5.1 or 5.2 due to compiler bugs;"
+		eerror "you may use gcc-config to select an older compiler version."
+		eerror "See https://bugs.gentoo.org/549768"
+		eerror
+		return 1
+	fi
+
+	if use abi_x86_64 && [[ $(( $(gcc-major-version) * 100 + $(gcc-minor-version) )) -lt 404 ]]; then
+		eerror "You need gcc-4.4+ to build 64-bit wine"
+		eerror
+		return 1
+	fi
+
+	if use abi_x86_32 && use opencl && [[ x$(eselect opencl show 2> /dev/null) = "xintel" ]]; then
+		eerror "You cannot build wine with USE=opencl because intel-ocl-sdk is 64-bit only."
+		eerror "See https://bugs.gentoo.org/487864 for more details."
+		eerror
+		return 1
+	fi
+}
+
+pkg_pretend() {
+	wine_build_environment_check || die
+}
+
+pkg_setup() {
+	wine_build_environment_check || die
+}
+
+src_unpack() {
+	if [[ ${PV} == "9999" ]] ; then
+		git-r3_src_unpack
+		if use staging || use pulseaudio; then
+			EGIT_REPO_URI=${STAGING_EGIT_REPO_URI}
+			unset ${PN}_LIVE_REPO;
+			EGIT_CHECKOUT_DIR=${STAGING_DIR} git-r3_src_unpack
+		fi
+	else
+		unpack ${MY_P}.tar.bz2
+		use staging || use pulseaudio && unpack "${STAGING_P}.tar.gz"
+	fi
+
+	unpack "${WINE_GENTOO}.tar.bz2"
+	use gstreamer && unpack "${GST_P}.patch.bz2"
+
+	l10n_find_plocales_changes "${S}/po" "" ".po"
+}
+
+src_prepare() {
+	local md5="$(md5sum server/protocol.def)"
+	local PATCHES=(
+		"${FILESDIR}"/${PN}-1.5.26-winegcc.patch #260726
+		"${FILESDIR}"/${PN}-1.4_rc2-multilib-portage.patch #395615
+		"${FILESDIR}"/${PN}-1.7.12-osmesa-check.patch #429386
+		"${FILESDIR}"/${PN}-1.6-memset-O3.patch #480508
+	)
+	if use gstreamer; then
+		# See http://bugs.winehq.org/show_bug.cgi?id=30557
+		ewarn "Applying experimental patch to fix GStreamer support. Note that"
+		ewarn "this patch has been reported to cause crashes in certain games."
+
+		# Wine-Staging 1.7.38 "ntdll: Fix race-condition when threads are killed
+		# during shutdown" patch and "Added patch to implement shared memory
+		# wineserver communication for various user32 functions" prevents the
+		# gstreamer patch from applying cleanly.
+		# So undo the staging patch, apply gstreamer, then re-apply rebased staging
+		# patch on top.
+		if use staging; then
+			PATCHES+=(
+				"${FILESDIR}/${PN}-1.7.39-gstreamer-v5-staging-pre.patch"
+				"${WORKDIR}/${GST_P}.patch"
+				"${FILESDIR}/${PN}-1.7.39-gstreamer-v5-staging-post.patch" )
+		else
+			PATCHES+=( "${WORKDIR}/${GST_P}.patch" )
+		fi
+	fi
+	if use staging; then
+		ewarn "Applying the unofficial Wine-Staging patchset which is unsupported"
+		ewarn "by Wine developers. Please don't report bugs to Wine bugzilla"
+		ewarn "unless you can reproduce them with USE=-staging"
+
+		local STAGING_EXCLUDE=""
+		use pipelight || STAGING_EXCLUDE="${STAGING_EXCLUDE} -W Pipelight"
+
+		# Launch wine-staging patcher in a subshell, using epatch as a backend, and gitapply.sh as a backend for binary patches
+		ebegin "Running Wine-Staging patch installer"
+		(
+			set -- DESTDIR="${S}" --backend=epatch --no-autoconf --all ${STAGING_EXCLUDE}
+			cd "${STAGING_DIR}/patches"
+			source "${STAGING_DIR}/patches/patchinstall.sh"
+		)
+		eend $?
+	elif use pulseaudio; then
+		PATCHES+=( "${STAGING_DIR}/patches/winepulse-PulseAudio_Support"/*.patch )
+	fi
+	autotools-utils_src_prepare
+
+	# Modification of the server protocol requires regenerating the server requests
+	if [[ "$(md5sum server/protocol.def)" != "${md5}" ]]; then
+		einfo "server/protocol.def was patched; running tools/make_requests"
+		tools/make_requests || die #432348
+	fi
+	sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
+	if ! use run-exes; then
+		sed -i '/^MimeType/d' tools/wine.desktop || die #117785
+	fi
+
+	# hi-res default icon, #472990, http://bugs.winehq.org/show_bug.cgi?id=24652
+	cp "${WORKDIR}"/${WINE_GENTOO}/icons/oic_winlogo.ico dlls/user32/resources/ || die
+
+	l10n_get_locales > po/LINGUAS # otherwise wine doesn't respect LINGUAS
+}
+
+src_configure() {
+	export LDCONFIG=/bin/true
+	use custom-cflags || strip-flags
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	local myconf=(
+		--sysconfdir=/etc/wine
+		$(use_with alsa)
+		$(use_with capi)
+		$(use_with lcms cms)
+		$(use_with cups)
+		$(use_with ncurses curses)
+		$(use_with udisks dbus)
+		$(use_with fontconfig)
+		$(use_with ssl gnutls)
+		$(use_enable gecko mshtml)
+		$(use_with gphoto2 gphoto)
+		$(use_with gsm)
+		$(use_with gstreamer)
+		--without-hal
+		$(use_with jpeg)
+		$(use_with ldap)
+		$(use_enable mono mscoree)
+		$(use_with mp3 mpg123)
+		$(use_with netapi)
+		$(use_with nls gettext)
+		$(use_with openal)
+		$(use_with opencl)
+		$(use_with opengl)
+		$(use_with osmesa)
+		$(use_with oss)
+		$(use_with pcap)
+		$(use_with png)
+		$(use_with threads pthread)
+		$(use_with scanner sane)
+		$(use_enable test tests)
+		$(use_with truetype freetype)
+		$(use_with v4l)
+		$(use_with X x)
+		$(use_with xcomposite)
+		$(use_with xinerama)
+		$(use_with xml)
+		$(use_with xml xslt)
+	)
+
+	if use pulseaudio || use staging; then
+		myconf+=( $(use_with pulseaudio pulse) )
+	fi
+	use staging && myconf+=(
+		--with-xattr
+		$(use_with vaapi va)
+	)
+
+	local PKG_CONFIG AR RANLIB
+	# Avoid crossdev's i686-pc-linux-gnu-pkg-config if building wine32 on amd64; #472038
+	# set AR and RANLIB to make QA scripts happy; #483342
+	tc-export PKG_CONFIG AR RANLIB
+
+	if use amd64; then
+		if [[ ${ABI} == amd64 ]]; then
+			myconf+=( --enable-win64 )
+		else
+			myconf+=( --disable-win64 )
+		fi
+
+		# Note: using --with-wine64 results in problems with multilib.eclass
+		# CC/LD hackery. We're using separate tools instead.
+	fi
+
+	ECONF_SOURCE=${S} \
+	econf "${myconf[@]}"
+	emake depend
+}
+
+multilib_src_test() {
+	# FIXME: win32-only; wine64 tests fail with "could not find the Wine loader"
+	if [[ ${ABI} == x86 ]]; then
+		if [[ $(id -u) == 0 ]]; then
+			ewarn "Skipping tests since they cannot be run under the root user."
+			ewarn "To run the test ${PN} suite, add userpriv to FEATURES in make.conf"
+			return
+		fi
+
+		WINEPREFIX="${T}/.wine-${ABI}" \
+		Xemake test
+	fi
+}
+
+multilib_src_install_all() {
+	local DOCS=( ANNOUNCE AUTHORS README )
+	local l
+	add_locale_docs() {
+		local locale_doc="documentation/README.$1"
+		[[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
+	}
+	l10n_for_each_locale_do add_locale_docs
+
+	einstalldocs
+	prune_libtool_files --all
+
+	emake -C "../${WINE_GENTOO}" install DESTDIR="${D}" EPREFIX="${EPREFIX}"
+	if use gecko ; then
+		insinto /usr/share/wine/gecko
+		use abi_x86_32 && doins "${DISTDIR}"/wine_gecko-${GV}-x86.msi
+		use abi_x86_64 && doins "${DISTDIR}"/wine_gecko-${GV}-x86_64.msi
+	fi
+	if use mono ; then
+		insinto /usr/share/wine/mono
+		doins "${DISTDIR}"/wine-mono-${MV}.msi
+	fi
+	if ! use perl ; then # winedump calls function_grep.pl, and winemaker is a perl script
+		rm "${D}"usr/bin/{wine{dump,maker},function_grep.pl} "${D}"usr/share/man/man1/wine{dump,maker}.1 || die
+	fi
+
+	use abi_x86_32 && pax-mark psmr "${D}"usr/bin/wine{,-preloader} #255055
+	use abi_x86_64 && pax-mark psmr "${D}"usr/bin/wine64{,-preloader}
+
+	if use abi_x86_64 && ! use abi_x86_32; then
+		dosym /usr/bin/wine{64,} # 404331
+		dosym /usr/bin/wine{64,}-preloader
+	fi
+
+	# respect LINGUAS when installing man pages, #469418
+	for l in de fr pl; do
+		use linguas_${l} || rm -r "${D}"usr/share/man/${l}*
+	done
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	fdo-mime_desktop_database_update
+
+	if ! use gecko; then
+		ewarn "Without Wine Gecko, wine prefixes will not have a default"
+		ewarn "implementation of iexplore.  Many older windows applications"
+		ewarn "rely upon the existence of an iexplore implementation, so"
+		ewarn "you will likely need to install an external one, like via winetricks"
+	fi
+	if ! use mono; then
+		ewarn "Without Wine Mono, wine prefixes will not have a default"
+		ewarn "implementation of .NET.  Many windows applications rely upon"
+		ewarn "the existence of a .NET implementation, so you will likely need"
+		ewarn "to install an external one, like via winetricks"
+	fi
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	fdo-mime_desktop_database_update
+}
diff --git a/app-eselect/eselect-mesa/Manifest b/app-eselect/eselect-mesa/Manifest
index 41ee5d513d75..5dcaace078f7 100644
--- a/app-eselect/eselect-mesa/Manifest
+++ b/app-eselect/eselect-mesa/Manifest
@@ -1,2 +1 @@
 DIST eselect-mesa-0.0.10.tar.gz 2214 SHA256 736c4360902ddf78d02c6153e558164f3e09cfe74953ae15b74c6ca1647aca7c SHA512 c039ca769a436ccb5a7f0271532d3bc988f29ba31784fc74d1a4dd230e4f9c6db7ef3b9b40a1341202d9641eca9278a73c74e13091f2370065dca7d3707d91c3 WHIRLPOOL 7687b1abab31ccd6a4cad4b585fad0d31b3b7a22e64e3169309824e3cf410ddfd92e8974085d3d01e5deaa884c14964e7af3468ab11b0f2a705657e46091a19e
-DIST eselect-mesa-0.0.9.tar.gz 2217 SHA256 27adf2beff6f7cbd54004e4c27f9ac869e8c7bc72cb83c32acfbccf4119b2494 SHA512 3e00f7e0cc122c15d0c6878b3a3a006e8a8c032c81570fa31143c7e5e8feddc69afdb4f19207f6bc0755172b7cc5e96bcd4093d65218a387af30cfdf230abbf0 WHIRLPOOL bcbcdfdcf17808548ed31fb60fe4f16f26c2e88ab121a4f8a12a5b6c44b9faeb32736fd760e5acbbd90f5afadfcb63798f0f6c46a51540014c967ccf34ec43b7
diff --git a/app-eselect/eselect-mesa/eselect-mesa-0.0.9.ebuild b/app-eselect/eselect-mesa/eselect-mesa-0.0.9.ebuild
deleted file mode 100644
index fd2b5ee86cad..000000000000
--- a/app-eselect/eselect-mesa/eselect-mesa-0.0.9.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=3
-
-DESCRIPTION="Utility to change the Mesa OpenGL driver being used"
-HOMEPAGE="https://www.gentoo.org/"
-
-SRC_URI="mirror://gentoo/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE=""
-
-DEPEND=""
-RDEPEND=">=app-admin/eselect-1.2.4
-	>=app-shells/bash-4"
-
-src_install() {
-	insinto /usr/share/eselect/modules
-	doins mesa.eselect || die
-}
-
-pkg_postinst() {
-	if has_version ">=media-libs/mesa-7.9" && \
-		! [ -f "${EROOT}"/usr/share/mesa/eselect-mesa.conf ]; then
-		eerror "Rebuild media-libs/mesa for ${PN} to work."
-	fi
-}
diff --git a/app-eselect/eselect-mpost/eselect-mpost-0.1.ebuild b/app-eselect/eselect-mpost/eselect-mpost-0.1.ebuild
deleted file mode 100644
index ae08b7f1f27e..000000000000
--- a/app-eselect/eselect-mpost/eselect-mpost-0.1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-inherit eutils
-
-DESCRIPTION="mpost module for eselect"
-HOMEPAGE="https://www.gentoo.org/proj/en/eselect/"
-SRC_URI=""
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~ppc ~ppc64 s390 sh sparc x86 ~x86-fbsd"
-
-IUSE=""
-DEPEND=""
-# Depend on texlive-core-2008 that allows usage of this module, otherwise it
-# will not work so nicely.
-RDEPEND=">=app-admin/eselect-1.0.5
-	>=app-text/texlive-core-2008"
-
-src_install() {
-	local MODULEDIR="/usr/share/eselect/modules"
-	local MODULE="mpost"
-	dodir ${MODULEDIR}
-	insinto ${MODULEDIR}
-	newins "${FILESDIR}/${MODULE}.eselect-${PVR}" ${MODULE}.eselect || die "failed to install"
-}
diff --git a/app-eselect/eselect-mpost/eselect-mpost-0.2.ebuild b/app-eselect/eselect-mpost/eselect-mpost-0.2.ebuild
deleted file mode 100644
index ac09044af519..000000000000
--- a/app-eselect/eselect-mpost/eselect-mpost-0.2.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-inherit eutils
-
-DESCRIPTION="mpost module for eselect"
-HOMEPAGE="https://www.gentoo.org/proj/en/eselect/"
-SRC_URI=""
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE=""
-
-DEPEND=""
-# Depend on texlive-core-2008 that allows usage of this module, otherwise it
-# will not work so nicely.
-RDEPEND=">=app-admin/eselect-1.2.3
-	>=app-text/texlive-core-2008"
-
-src_install() {
-	local MODULEDIR="/usr/share/eselect/modules"
-	local MODULE="mpost"
-	dodir ${MODULEDIR}
-	insinto ${MODULEDIR}
-	newins "${FILESDIR}/${MODULE}.eselect-${PVR}" ${MODULE}.eselect \
-		|| die "failed to install"
-}
diff --git a/app-eselect/eselect-mpost/files/mpost.eselect-0.1 b/app-eselect/eselect-mpost/files/mpost.eselect-0.1
deleted file mode 100644
index 1fb3cf939071..000000000000
--- a/app-eselect/eselect-mpost/files/mpost.eselect-0.1
+++ /dev/null
@@ -1,153 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-DESCRIPTION="Manage /usr/bin/mpost implementations"
-MAINTAINER="ml@gentoo.org"
-SVN_DATE='$Date: 2015/03/31 16:51:56 $'
-VERSION=$(svn_date_to_version "${SVN_DATE}" )
-
-# find a list of mpost symlink targets, best first
-find_targets() {
-	local f
-	for f in "${ROOT}"/usr/bin/mpost-*; do
-		if [[ -f ${f} ]] ; then
-			echo "${f##*/mpost-}"
-		fi
-	done | sort
-}
-
-# find version number of currently symlinked version
-identify_target() {
-	local f
-	f="$(canonicalise "${ROOT}"/usr/bin/mpost)"
-	echo "${f##*/mpost-}"
-}
-
-# try to remove the mpost symlink
-remove_symlinks() {
-	rm -f "${ROOT}"/usr/bin/mpost &>/dev/null
-}
-
-# set the mpost symlink
-set_symlinks() {
-	local target="${1}" targets
-	if is_number "${target}" && [[ ${target} -ge 1 ]] ; then
-		targets=( $(find_targets ) )
-		target=${targets[$(( ${target} - 1 ))]}
-	fi
-	if [[ -f "${ROOT}/usr/bin/mpost-${target}" ]] ; then
-		remove_symlinks
-		ln -s "mpost-${target}" "${ROOT}/usr/bin/mpost" || \
-			die "Could not set ${target} /usr/bin/mpost symlink"
-                echo "Updating TeX formats"
-	        [ -z "${ROOT}" ] && fmtutil-sys --all &>/dev/null || write_warning_msg "Could not update TeX formats for some reason, mpost may not work properly."
-	else
-		die -q "Target \"${target}\" doesn't appear to be valid!"
-	fi
-}
-
-### show action ###
-
-describe_show() {
-	echo "Show the current mpost version"
-}
-
-do_show() {
-	[[ -z "${@}" ]] || die -q "Too many parameters"
-
-	write_list_start "Current mpost verson:"
-	if [[ -L "${ROOT}/usr/bin/mpost" ]] ; then
-		write_kv_list_entry "$(identify_target)" ""
-	elif [[ -e "${ROOT}/usr/bin/mpost" ]] ; then
-		write_kv_list_entry "(not a symlink)" ""
-	else
-		write_kv_list_entry "(unset)" ""
-	fi
-}
-
-### list action ###
-
-describe_list() {
-	echo "List available mpost versions"
-}
-
-do_list() {
-	[[ -z "${@}" ]] || die -q "Too many parameters"
-
-	local i targets current
-	targets=( $(find_targets ) )
-	current=$(identify_target)
-	if [[ -n ${targets[@]} ]] ; then
-		for (( i = 0 ; i < ${#targets[@]} ; i = i + 1 )) ; do
-			[[ ${targets[${i}]} == ${current} ]] && \
-				targets[${i}]="${targets[${i}]} $(highlight '*' )"
-		done
-		write_list_start "Available mpost versions:"
-		write_numbered_list "${targets[@]}"
-	else
-		write_kv_list_entry "(none found)" ""
-	fi
-}
-
-### set action ###
-
-describe_set() {
-	echo "Set a new mpost version"
-}
-
-describe_set_options() {
-	echo "target : Target version number or index from 'list' action"
-}
-
-describe_set_parameters() {
-	echo "<target>"
-}
-
-do_set() {
-	if [[ -z "${1}" ]] ; then
-		die -q "You didn't give me a version number"
-
-	elif [[ -n "${2}" ]] ; then
-		die -q "Too many parameters"
-
-	elif [[ -L "${ROOT}/usr/bin/mpost" ]] ; then
-		if ! remove_symlinks ; then
-			die -q "Can't remove existing version symlink"
-		elif ! set_symlinks "${1}" ; then
-			die -q "Can't set new version"
-		fi
-
-	elif [[ -e "${ROOT}/usr/bin/mpost" ]] ; then
-		die -q "${ROOT}/usr/bin/mpost seems to be from an old ebuild, please remove manually"
-	else
-		set_symlinks "${1}" || die -q "Can't set new version"
-	fi
-}
-
-### update action ###
-
-describe_update() {
-	echo "Automatically update the mpost version number"
-}
-
-describe_update_options() {
-	echo "--if-unset : Do not override currently selected version"
-}
-
-do_update() {
-	[[ -z "${1}" ]] || ( [[ -z "${2}" ]] && [[ "${1}" == "--if-unset" ]] ) || \
-		die -q "Usage error"
-
-	if [[ -L "${ROOT}/usr/bin/mpost" ]] ; then
-		[[ ${1} == "--if-unset" ]] && return
-		remove_symlinks || die -q "Can't remove existing symlink"
-	fi
-	if [[ -e "${ROOT}/usr/bin/mpost" ]] ; then
-		die -q "${ROOT}/usr/bin/mpost seems to be from an old ebuild, please remove manually"
-	elif ! [[ -z $(find_targets ) ]] ; then
-		set_symlinks 1 || die -q "Can't set a new version"
-	fi
-}
-
-# vim: set ft=eselect :
diff --git a/app-eselect/eselect-mpost/files/mpost.eselect-0.2 b/app-eselect/eselect-mpost/files/mpost.eselect-0.2
deleted file mode 100644
index 0824045c0f88..000000000000
--- a/app-eselect/eselect-mpost/files/mpost.eselect-0.2
+++ /dev/null
@@ -1,148 +0,0 @@
-# -*-eselect-*-  vim: ft=eselect
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-DESCRIPTION="Manage /usr/bin/mpost implementations"
-MAINTAINER="ml@gentoo.org"
-SVN_DATE='$Date: 2015/03/31 16:51:56 $'
-VERSION=$(svn_date_to_version "${SVN_DATE}" )
-
-# find a list of mpost symlink targets, best first
-find_targets() {
-	local f
-	for f in "${ROOT}"/usr/bin/mpost-*; do
-		if [[ -f ${f} ]] ; then
-			echo "${f##*/mpost-}"
-		fi
-	done | sort
-}
-
-# find version number of currently symlinked version
-identify_target() {
-	local f
-	f="$(canonicalise "${ROOT}"/usr/bin/mpost)"
-	echo "${f##*/mpost-}"
-}
-
-# try to remove the mpost symlink
-remove_symlinks() {
-	rm -f "${ROOT}"/usr/bin/mpost &>/dev/null
-}
-
-# set the mpost symlink
-set_symlinks() {
-	local target="${1}" targets
-	if is_number "${target}" && [[ ${target} -ge 1 ]] ; then
-		targets=( $(find_targets ) )
-		target=${targets[$(( ${target} - 1 ))]}
-	fi
-	if [[ -f "${ROOT}/usr/bin/mpost-${target}" ]] ; then
-		remove_symlinks
-		ln -s "mpost-${target}" "${ROOT}/usr/bin/mpost" || \
-			die "Could not set ${target} /usr/bin/mpost symlink"
-		echo "Updating TeX formats"
-		[ -z "${ROOT}" ] && fmtutil-sys --all &>/dev/null || write_warning_msg "Could not update TeX formats for some reason, mpost may not work properly."
-	else
-		die -q "Target \"${target}\" doesn't appear to be valid!"
-	fi
-}
-
-### show action ###
-
-describe_show() {
-	echo "Show the current mpost version"
-}
-
-do_show() {
-	[[ -z "${@}" ]] || die -q "Too many parameters"
-
-	write_list_start "Current mpost verson:"
-	if [[ -L "${ROOT}/usr/bin/mpost" ]] ; then
-		write_kv_list_entry "$(identify_target)" ""
-	elif [[ -e "${ROOT}/usr/bin/mpost" ]] ; then
-		write_kv_list_entry "(not a symlink)" ""
-	else
-		write_kv_list_entry "(unset)" ""
-	fi
-}
-
-### list action ###
-
-describe_list() {
-	echo "List available mpost versions"
-}
-
-do_list() {
-	[[ -z "${@}" ]] || die -q "Too many parameters"
-
-	local i targets current
-	targets=( $(find_targets ) )
-	current=$(identify_target)
-	for (( i = 0; i < ${#targets[@]}; i++ )); do
-		[[ ${targets[i]} = ${current} ]] \
-			&& targets[i]=$(highlight_marker "${targets[i]}")
-	done
-	write_list_start "Available mpost versions:"
-	write_numbered_list -m "(none found)" "${targets[@]}"
-}
-
-### set action ###
-
-describe_set() {
-	echo "Set a new mpost version"
-}
-
-describe_set_options() {
-	echo "target : Target version number or index from 'list' action"
-}
-
-describe_set_parameters() {
-	echo "<target>"
-}
-
-do_set() {
-	if [[ -z "${1}" ]] ; then
-		die -q "You didn't give me a version number"
-
-	elif [[ -n "${2}" ]] ; then
-		die -q "Too many parameters"
-
-	elif [[ -L "${ROOT}/usr/bin/mpost" ]] ; then
-		if ! remove_symlinks ; then
-			die -q "Can't remove existing version symlink"
-		elif ! set_symlinks "${1}" ; then
-			die -q "Can't set new version"
-		fi
-
-	elif [[ -e "${ROOT}/usr/bin/mpost" ]] ; then
-		die -q "${ROOT}/usr/bin/mpost seems to be from an old ebuild, please remove manually"
-	else
-		set_symlinks "${1}" || die -q "Can't set new version"
-	fi
-}
-
-### update action ###
-
-describe_update() {
-	echo "Automatically update the mpost version number"
-}
-
-describe_update_options() {
-	echo "--if-unset : Do not override currently selected version"
-}
-
-do_update() {
-	[[ -z "${1}" ]] || ( [[ -z "${2}" ]] && [[ "${1}" == "--if-unset" ]] ) || \
-		die -q "Usage error"
-
-	if [[ -L "${ROOT}/usr/bin/mpost" ]] ; then
-		[[ ${1} == "--if-unset" ]] && return
-		remove_symlinks || die -q "Can't remove existing symlink"
-	fi
-	if [[ -e "${ROOT}/usr/bin/mpost" ]] ; then
-		die -q "${ROOT}/usr/bin/mpost seems to be from an old ebuild, please remove manually"
-	elif ! [[ -z $(find_targets ) ]] ; then
-		set_symlinks 1 || die -q "Can't set a new version"
-	fi
-}
diff --git a/app-eselect/eselect-php/Manifest b/app-eselect/eselect-php/Manifest
index c6bba4ca91bf..27a9d1f6ede4 100644
--- a/app-eselect/eselect-php/Manifest
+++ b/app-eselect/eselect-php/Manifest
@@ -1,2 +1 @@
-DIST eselect-php-0.6.2.bz2 1454 SHA256 c4eecb73aaf50538a8eaf8afb0d52b3666b45ef19e5f26f7998682bac56566c4 SHA512 cb2639ddf97c77336195db57a9a5021200693ee4f1382d7ed6cda22a27f5b0f76be88abf376e13245a72223c12065d019e0537494f934f9cbe40e0fdcbfe2b22 WHIRLPOOL 523f3a0c30705599ee91c5ce0a691c140226a18c0a1ba73df4a0f9835a92644748a0f0ed73f1ea101de65cf270947f054a8feeb3c36609f644f8682d611aaa11
 DIST eselect-php-0.7.1.bz2 2251 SHA256 10aa400e2d08bc71989366993f12ddb546a0ea29f191c40e37beba1d11d7abd7 SHA512 a6b4c1475dda9f368d799db7658c50cef7d6f71482a53a186fb1394e7ea1fff3c0ef123c82b7ca4d1e45aadb0a034d36f213fc9450766878a60d28639761cb3d WHIRLPOOL a4e45492068616ff30fd888b0cc64441a6eb6e6656e0107d00bd2cf15360dce15052d4d62089ab89d43e6bb36e126529aa101c70e8bd94a9fc916a5369463e3b
diff --git a/app-eselect/eselect-php/eselect-php-0.6.2.ebuild b/app-eselect/eselect-php/eselect-php-0.6.2.ebuild
deleted file mode 100644
index 3502548d19d8..000000000000
--- a/app-eselect/eselect-php/eselect-php-0.6.2.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=3
-
-DESCRIPTION="PHP eselect module"
-HOMEPAGE="https://www.gentoo.org"
-SRC_URI="http://olemarkus.org/~olemarkus/gentoo/eselect-php-${PV}.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
-IUSE=""
-
-DEPEND=">=app-admin/eselect-1.2.4
-		!app-admin/php-toolkit"
-RDEPEND="${DEPEND}"
-
-src_install() {
-	mv eselect-php-${PV} php.eselect
-	insinto /usr/share/eselect/modules/
-	doins php.eselect
-}
diff --git a/app-eselect/eselect-php/eselect-php-0.7.1-r1.ebuild b/app-eselect/eselect-php/eselect-php-0.7.1-r1.ebuild
deleted file mode 100644
index 30a849658989..000000000000
--- a/app-eselect/eselect-php/eselect-php-0.7.1-r1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit depend.apache systemd
-
-DESCRIPTION="PHP eselect module"
-HOMEPAGE="https://www.gentoo.org"
-SRC_URI="https://dev.gentoo.org/~olemarkus/eselect-php/eselect-php-${PV}.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="fpm apache2"
-
-DEPEND=">=app-admin/eselect-1.2.4
-		!<dev-lang/php-5.3.23-r1:5.3
-		!<dev-lang/php-5.4.13-r1:5.4
-		!<dev-lang/php-5.5.0_beta1-r2:5.5
-		"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}"
-
-want_apache
-
-src_install() {
-	mv eselect-php-${PV} php.eselect
-	insinto /usr/share/eselect/modules/
-	doins php.eselect
-
-	if use apache2 ; then
-		insinto "${APACHE_MODULES_CONFDIR#${EPREFIX}}"
-		newins "${FILESDIR}/70_mod_php5.conf-apache2" \
-			"70_mod_php5.conf"
-	fi
-
-	if use fpm ; then
-		dodir "/etc/init.d"
-		insinto "/etc/init.d"
-		newinitd "${FILESDIR}/php-fpm.init" "php-fpm"
-		systemd_newunit "${FILESDIR}/php-fpm_at.service" "php-fpm@.service"
-		systemd_dotmpfilesd "${FILESDIR}/php-fpm.conf"
-		exeinto /usr/libexec
-		doexe "${FILESDIR}/php-fpm-launcher"
-	fi
-}
diff --git a/app-eselect/eselect-php/eselect-php-0.7.1-r2.ebuild b/app-eselect/eselect-php/eselect-php-0.7.1-r2.ebuild
deleted file mode 100644
index bfe8be8ef595..000000000000
--- a/app-eselect/eselect-php/eselect-php-0.7.1-r2.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit depend.apache systemd
-
-DESCRIPTION="PHP eselect module"
-HOMEPAGE="https://www.gentoo.org"
-SRC_URI="https://dev.gentoo.org/~olemarkus/eselect-php/eselect-php-${PV}.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="fpm apache2"
-
-DEPEND=">=app-admin/eselect-1.2.4
-		!<dev-lang/php-5.3.23-r1:5.3
-		!<dev-lang/php-5.4.13-r1:5.4
-		!<dev-lang/php-5.5.0_beta1-r2:5.5
-		"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}"
-
-want_apache
-
-src_install() {
-	mv eselect-php-${PV} php.eselect
-	insinto /usr/share/eselect/modules/
-	doins php.eselect
-
-	if use apache2 ; then
-		insinto "${APACHE_MODULES_CONFDIR#${EPREFIX}}"
-		newins "${FILESDIR}/70_mod_php5.conf-apache2" \
-			"70_mod_php5.conf"
-	fi
-
-	if use fpm ; then
-		dodir "/etc/init.d"
-		insinto "/etc/init.d"
-		newinitd "${FILESDIR}/php-fpm-r1.init" "php-fpm"
-		systemd_newunit "${FILESDIR}/php-fpm_at.service" "php-fpm@.service"
-		systemd_dotmpfilesd "${FILESDIR}/php-fpm.conf"
-		exeinto /usr/libexec
-		doexe "${FILESDIR}/php-fpm-launcher"
-	fi
-}
diff --git a/app-eselect/eselect-php/eselect-php-0.7.1-r3.ebuild b/app-eselect/eselect-php/eselect-php-0.7.1-r3.ebuild
deleted file mode 100644
index a57b3c52296a..000000000000
--- a/app-eselect/eselect-php/eselect-php-0.7.1-r3.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit depend.apache systemd
-
-DESCRIPTION="PHP eselect module"
-HOMEPAGE="https://www.gentoo.org"
-SRC_URI="https://dev.gentoo.org/~olemarkus/eselect-php/eselect-php-${PV}.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="fpm apache2"
-
-DEPEND=">=app-admin/eselect-1.2.4
-		!<dev-lang/php-5.3.23-r1:5.3
-		!<dev-lang/php-5.4.13-r1:5.4
-		!<dev-lang/php-5.5.0_beta1-r2:5.5
-		"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}"
-
-want_apache
-
-src_install() {
-	mv eselect-php-${PV} php.eselect
-	insinto /usr/share/eselect/modules/
-	doins php.eselect
-
-	if use apache2 ; then
-		insinto "${APACHE_MODULES_CONFDIR#${EPREFIX}}"
-		newins "${FILESDIR}/70_mod_php5.conf-apache2" \
-			"70_mod_php5.conf"
-	fi
-
-	if use fpm ; then
-		dodir "/etc/init.d"
-		insinto "/etc/init.d"
-		newinitd "${FILESDIR}/php-fpm-r1.init" "php-fpm"
-		systemd_dotmpfilesd "${FILESDIR}/php-fpm.conf"
-		exeinto /usr/libexec
-		doexe "${FILESDIR}/php-fpm-launcher"
-	fi
-}
diff --git a/app-eselect/eselect-php/eselect-php-0.7.1.ebuild b/app-eselect/eselect-php/eselect-php-0.7.1.ebuild
deleted file mode 100644
index eba6a7c9d131..000000000000
--- a/app-eselect/eselect-php/eselect-php-0.7.1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit depend.apache
-
-DESCRIPTION="PHP eselect module"
-HOMEPAGE="https://www.gentoo.org"
-SRC_URI="https://dev.gentoo.org/~olemarkus/eselect-php/eselect-php-${PV}.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="fpm apache2"
-
-DEPEND=">=app-admin/eselect-1.2.4
-		!<dev-lang/php-5.3.23-r1:5.3
-		!<dev-lang/php-5.4.13-r1:5.4
-		!<dev-lang/php-5.5.0_beta1-r2:5.5
-		"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}"
-
-want_apache
-
-src_install() {
-	mv eselect-php-${PV} php.eselect
-	insinto /usr/share/eselect/modules/
-	doins php.eselect
-
-	if use apache2 ; then
-		insinto "${APACHE_MODULES_CONFDIR#${EPREFIX}}"
-		newins "${FILESDIR}/70_mod_php5.conf-apache2" \
-			"70_mod_php5.conf"
-	fi
-
-	if use fpm ; then
-		dodir "/etc/init.d"
-		insinto "/etc/init.d"
-		newinitd "${FILESDIR}/php-fpm.init" "php-fpm"
-	fi
-}
diff --git a/app-eselect/eselect-php/files/70_mod_php5.conf-apache2 b/app-eselect/eselect-php/files/70_mod_php5.conf-apache2
deleted file mode 100644
index 7ec8739cf837..000000000000
--- a/app-eselect/eselect-php/files/70_mod_php5.conf-apache2
+++ /dev/null
@@ -1,14 +0,0 @@
-<IfDefine PHP5>
-	# Load the module first
-	<IfModule !mod_php5.c>
-		LoadModule php5_module    modules/libphp5.so
-	</IfModule>
-
-	# Set it to handle the files
-	<IfModule mod_mime.c>
-		AddHandler application/x-httpd-php .php .php5 .phtml
-		AddHandler application/x-httpd-php-source .phps
-	</IfModule>
-
-	DirectoryIndex index.php index.phtml
-</IfDefine>
diff --git a/app-eselect/eselect-php/files/php-fpm.init b/app-eselect/eselect-php/files/php-fpm.init
deleted file mode 100644
index a186d83478c5..000000000000
--- a/app-eselect/eselect-php/files/php-fpm.init
+++ /dev/null
@@ -1,47 +0,0 @@
-#!/sbin/runscript
-
-set_phpvars() {
-	PHPSLOT=${SVCNAME#php-fpm-}
-	[ ${PHPSLOT} = 'php-fpm' ] && PHPSLOT="$(eselect php show fpm)"
-
-	PHP_FPM_CONF="/etc/php/fpm-${PHPSLOT}/php-fpm.conf"
-	PHP_FPM_PID="/var/run/php-fpm-${PHPSLOT}.pid"
-}
-
-extra_commands="depend"
-extra_started_commands="reload"
-
-depend() {
-	need net
-	use apache2 lighttpd nginx
-}
-
-start() {
-        ebegin "Starting PHP FastCGI Process Manager"
-	set_phpvars
-        start-stop-daemon --start --pidfile ${PHP_FPM_PID} --exec \
-            /usr/lib/${PHPSLOT}/bin/php-fpm -- -y "${PHP_FPM_CONF}" -g "${PHP_FPM_PID}"
-        local i=0
-        local timeout=5
-        while [ ! -f ${PHP_FPM_PID} ] && [ $i -le $timeout ]; do
-            sleep 1
-            i=$(($i + 1))
-        done
-        
-        [ $timeout -gt $i ]
-        eend $?
-}
-
-stop() {
-        ebegin "Stopping PHP FastCGI Process Manager"
-	set_phpvars
-        start-stop-daemon --signal QUIT --stop --exec /usr/lib/${PHPSLOT}/bin/php-fpm --pidfile ${PHP_FPM_PID}
-        eend $?
-}
-
-reload() {
-    ebegin "Reloading PHP FastCGI Process Manager"
-    set_phpvars
-    [ -f ${PHP_FPM_PID} ] && kill -USR2 $(cat ${PHP_FPM_PID})
-    eend $?
-}
diff --git a/app-eselect/eselect-pinentry/eselect-pinentry-0.6.ebuild b/app-eselect/eselect-pinentry/eselect-pinentry-0.6.ebuild
index 383a95ed75c3..152b9840cbee 100644
--- a/app-eselect/eselect-pinentry/eselect-pinentry-0.6.ebuild
+++ b/app-eselect/eselect-pinentry/eselect-pinentry-0.6.ebuild
@@ -10,7 +10,7 @@ SRC_URI=""
 
 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=""
 
 RDEPEND=">=app-eselect/eselect-lib-bin-symlink-0.1.1"
diff --git a/app-eselect/eselect-timidity/Manifest b/app-eselect/eselect-timidity/Manifest
index 1dc3f91d01cb..28cb33bdcedd 100644
--- a/app-eselect/eselect-timidity/Manifest
+++ b/app-eselect/eselect-timidity/Manifest
@@ -1,3 +1 @@
-DIST timidity.eselect-20061203.bz2 1673 SHA256 ad16938191e4f1e70f9775b6b112fbe25a92f948ca4b6ccce342b34a8acf8197 SHA512 6fce1c117120eae0e4538dc7459161a8bbfabb2dbb79a52b643a462a6ef3c05bc0e03bf05cd14785941638a60d7259bdb3afba3b3855dd0b5032855bf57ad9f7 WHIRLPOOL e85fbf127ebe29e997512cd5d584d19da910d3edeb8ebb52b08bf474cfdb706888a2ad10ad6c8d5c13e1bc5122e607eaf4e236bf73e9c2cb7d1b947734409422
-DIST timidity.eselect-20091106.bz2 1663 SHA256 5b72deaa2fb6ef51ec6196d6d50eea4b9ef38ea1779cd59a7914ad73912b1e93 SHA512 35a2682b86b4b0f4dd169be7fdb28e190782375e3071c086c865d7eb8e1e7b1dbe8b967d1169b8fa8bdd576e0b6ee4c00c2f9ff463c8419d5f5226bd802f2275 WHIRLPOOL efc5fd26f8f0111b916d1bd029c4b48340e59c7f90816b5ad32b967a5f8b9c12c24198f5f4238daa2b0c59e57107305519dc64c64750573542372b293eeb821c
 DIST timidity.eselect-20110513.bz2 1689 SHA256 76b4303e12540361dad180fe9d2eaf9ba0223c7e6cf9331138bc4415ca8eae6e SHA512 9af37f195dde3595cb55e3ca467928fd04b5f755545cf41ce0b3198a21107ad35e28365c1d310a77561f8ffcb1b10909b618fbdc55ca06b77492711b48c17afe WHIRLPOOL 0fef11a89e0e5b395d32dff9f972e2260a696e2c8dcd81f5054807cdabdea78660b3d3a08f7164a8351c32c8abd1b5a8ade7e4fcc2c75313c45e342e1c18223d
diff --git a/app-eselect/eselect-timidity/eselect-timidity-20061203.ebuild b/app-eselect/eselect-timidity/eselect-timidity-20061203.ebuild
deleted file mode 100644
index 86c6d0e5abaa..000000000000
--- a/app-eselect/eselect-timidity/eselect-timidity-20061203.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-DESCRIPTION="Manages configuration of TiMidity++ patchsets"
-HOMEPAGE="https://www.gentoo.org/"
-SRC_URI="mirror://gentoo/timidity.eselect-${PVR}.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm hppa ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND=">=app-admin/eselect-1.0.2"
-
-src_install() {
-	insinto /usr/share/eselect/modules
-	newins "${WORKDIR}/timidity.eselect-${PVR}" timidity.eselect || die
-}
diff --git a/app-eselect/eselect-timidity/eselect-timidity-20091106.ebuild b/app-eselect/eselect-timidity/eselect-timidity-20091106.ebuild
deleted file mode 100644
index b2b4786907c7..000000000000
--- a/app-eselect/eselect-timidity/eselect-timidity-20091106.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-DESCRIPTION="Manages configuration of TiMidity++ patchsets"
-HOMEPAGE="https://www.gentoo.org/"
-SRC_URI="mirror://gentoo/timidity.eselect-${PVR}.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND=">=app-admin/eselect-1.2.3"
-
-src_install() {
-	insinto /usr/share/eselect/modules
-	newins "${WORKDIR}/timidity.eselect-${PVR}" timidity.eselect || die
-}
diff --git a/app-eselect/eselect-unison/eselect-unison-0.1.ebuild b/app-eselect/eselect-unison/eselect-unison-0.1.ebuild
deleted file mode 100644
index 33c8fb8227b6..000000000000
--- a/app-eselect/eselect-unison/eselect-unison-0.1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-inherit eutils
-
-DESCRIPTION="unison module for eselect"
-HOMEPAGE="https://www.gentoo.org/proj/en/eselect/"
-SRC_URI=""
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-
-IUSE=""
-DEPEND=""
-RDEPEND=">=app-admin/eselect-1.0.5"
-
-src_install() {
-	local MODULEDIR="/usr/share/eselect/modules"
-	local MODULE="unison"
-	dodir ${MODULEDIR}
-	insinto ${MODULEDIR}
-	newins "${FILESDIR}/${MODULE}.eselect-${PVR}" ${MODULE}.eselect || die "failed to install"
-}
diff --git a/app-eselect/eselect-unison/eselect-unison-0.2.ebuild b/app-eselect/eselect-unison/eselect-unison-0.2.ebuild
deleted file mode 100644
index f6edce513fd6..000000000000
--- a/app-eselect/eselect-unison/eselect-unison-0.2.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-inherit eutils
-
-DESCRIPTION="unison module for eselect"
-HOMEPAGE="https://www.gentoo.org/proj/en/eselect/"
-SRC_URI=""
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND=">=app-admin/eselect-1.2.3"
-
-src_install() {
-	local MODULEDIR="/usr/share/eselect/modules"
-	local MODULE="unison"
-	dodir ${MODULEDIR}
-	insinto ${MODULEDIR}
-	newins "${FILESDIR}/${MODULE}.eselect-${PVR}" ${MODULE}.eselect \
-		|| die "failed to install"
-}
diff --git a/app-eselect/eselect-unison/files/unison.eselect-0.1 b/app-eselect/eselect-unison/files/unison.eselect-0.1
deleted file mode 100644
index 6baa01264da4..000000000000
--- a/app-eselect/eselect-unison/files/unison.eselect-0.1
+++ /dev/null
@@ -1,152 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-DESCRIPTION="Manage /usr/bin/unison versions"
-MAINTAINER="ml@gentoo.org"
-SVN_DATE='$Date: 2015/03/31 16:57:32 $'
-VERSION=$(svn_date_to_version "${SVN_DATE}" )
-
-# find a list of unison symlink targets, best first
-find_targets() {
-	local f
-	for f in "${ROOT}"/usr/bin/unison-[0-9]*; do
-		if [[ -f ${f} ]] ; then
-			echo "${f##*/unison-}"
-		fi
-	done | tac
-}
-
-# find version number of currently symlinked version
-identify_target() {
-	local f
-	f="$(canonicalise "${ROOT}"/usr/bin/unison)"
-	echo "${f##*/unison-}"
-}
-
-# try to remove the unison symlink
-remove_symlinks() {
-	rm -f "${ROOT}"/usr/bin/unison &>/dev/null
-}
-
-# set the unison symlink
-set_symlinks() {
-	local target="${1}" targets
-	if is_number "${target}" && [[ ${target} -ge 1 ]] ; then
-		targets=( $(find_targets ) )
-		target=${targets[$(( ${target} - 1 ))]}
-	fi
-	if [[ -f "${ROOT}/usr/bin/unison-${target}" ]] ; then
-		remove_symlinks
-		ln -s "unison-${target}" "${ROOT}/usr/bin/unison" || \
-			die "Could not set ${target} /usr/bin/unison symlink"
-	else
-		die -q "Target \"${target}\" doesn't appear to be valid!"
-	fi
-}
-
-### show action ###
-
-describe_show() {
-	echo "Show the current unison version"
-}
-
-do_show() {
-	[[ -z "${@}" ]] || die -q "Too many parameters"
-
-	write_list_start "Current unison verson:"
-	if [[ -L "${ROOT}/usr/bin/unison" ]] ; then
-		write_kv_list_entry "$(identify_target)" ""
-	elif [[ -e "${ROOT}/usr/bin/unison" ]] ; then
-		write_kv_list_entry "(not a symlink)" ""
-	else
-		write_kv_list_entry "(unset)" ""
-	fi
-}
-
-### list action ###
-
-describe_list() {
-	echo "List available unison versions"
-}
-
-do_list() {
-	[[ -z "${@}" ]] || die -q "Too many parameters"
-
-	local i targets current
-	targets=( $(find_targets ) )
-	current=$(identify_target)
-	if [[ -n ${targets[@]} ]] ; then
-		for (( i = 0 ; i < ${#targets[@]} ; i = i + 1 )) ; do
-			[[ ${targets[${i}]} == ${current} ]] && \
-				targets[${i}]="${targets[${i}]} $(highlight '*' )"
-		done
-		write_list_start "Available unison versions:"
-		write_numbered_list "${targets[@]}"
-	else
-		write_kv_list_entry "(none found)" ""
-	fi
-}
-
-### set action ###
-
-describe_set() {
-	echo "Set a new unison version"
-}
-
-describe_set_options() {
-	echo "target : Target version number or index from 'list' action"
-}
-
-describe_set_parameters() {
-	echo "<target>"
-}
-
-do_set() {
-	if [[ -z "${1}" ]] ; then
-		die -q "You didn't give me a version number"
-
-	elif [[ -n "${2}" ]] ; then
-		die -q "Too many parameters"
-
-	elif [[ -L "${ROOT}/usr/bin/unison" ]] ; then
-		if ! remove_symlinks ; then
-			die -q "Can't remove existing version symlink"
-		elif ! set_symlinks "${1}" ; then
-			die -q "Can't set new version"
-		fi
-
-	elif [[ -e "${ROOT}/usr/bin/unison" ]] ; then
-		die -q "${ROOT}/usr/bin/unison seems to be from an old ebuild, please remove manually"
-
-	else
-		set_symlinks "${1}" || die -q "Can't set new version"
-	fi
-}
-
-### update action ###
-
-describe_update() {
-	echo "Automatically update the unison version number"
-}
-
-describe_update_options() {
-	echo "--if-unset : Do not override currently selected version"
-}
-
-do_update() {
-	[[ -z "${1}" ]] || ( [[ -z "${2}" ]] && [[ "${1}" == "--if-unset" ]] ) || \
-		die -q "Usage error"
-
-	if [[ -L "${ROOT}/usr/bin/unison" ]] ; then
-		[[ ${1} == "--if-unset" ]] && return
-		remove_symlinks || die -q "Can't remove existing symlink"
-	fi
-	if [[ -e "${ROOT}/usr/bin/unison" ]] ; then
-		die -q "${ROOT}/usr/bin/unison seems to be from an old ebuild, please remove manually"
-	elif ! [[ -z $(find_targets ) ]] ; then
-		set_symlinks 1 || die -q "Can't set a new version"
-	fi
-}
-
-# vim: set ft=eselect :
diff --git a/app-eselect/eselect-unison/files/unison.eselect-0.2 b/app-eselect/eselect-unison/files/unison.eselect-0.2
deleted file mode 100644
index 62cc128c0ec7..000000000000
--- a/app-eselect/eselect-unison/files/unison.eselect-0.2
+++ /dev/null
@@ -1,147 +0,0 @@
-# -*-eselect-*-  vim: ft=eselect
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-DESCRIPTION="Manage /usr/bin/unison versions"
-MAINTAINER="ml@gentoo.org"
-SVN_DATE='$Date: 2015/03/31 16:57:32 $'
-VERSION=$(svn_date_to_version "${SVN_DATE}" )
-
-# find a list of unison symlink targets, best first
-find_targets() {
-	local f
-	for f in "${ROOT}"/usr/bin/unison-[0-9]*; do
-		if [[ -f ${f} ]] ; then
-			echo "${f##*/unison-}"
-		fi
-	done | tac
-}
-
-# find version number of currently symlinked version
-identify_target() {
-	local f
-	f="$(canonicalise "${ROOT}"/usr/bin/unison)"
-	echo "${f##*/unison-}"
-}
-
-# try to remove the unison symlink
-remove_symlinks() {
-	rm -f "${ROOT}"/usr/bin/unison &>/dev/null
-}
-
-# set the unison symlink
-set_symlinks() {
-	local target="${1}" targets
-	if is_number "${target}" && [[ ${target} -ge 1 ]] ; then
-		targets=( $(find_targets ) )
-		target=${targets[$(( ${target} - 1 ))]}
-	fi
-	if [[ -f "${ROOT}/usr/bin/unison-${target}" ]] ; then
-		remove_symlinks
-		ln -s "unison-${target}" "${ROOT}/usr/bin/unison" || \
-			die "Could not set ${target} /usr/bin/unison symlink"
-	else
-		die -q "Target \"${target}\" doesn't appear to be valid!"
-	fi
-}
-
-### show action ###
-
-describe_show() {
-	echo "Show the current unison version"
-}
-
-do_show() {
-	[[ -z "${@}" ]] || die -q "Too many parameters"
-
-	write_list_start "Current unison verson:"
-	if [[ -L "${ROOT}/usr/bin/unison" ]] ; then
-		write_kv_list_entry "$(identify_target)" ""
-	elif [[ -e "${ROOT}/usr/bin/unison" ]] ; then
-		write_kv_list_entry "(not a symlink)" ""
-	else
-		write_kv_list_entry "(unset)" ""
-	fi
-}
-
-### list action ###
-
-describe_list() {
-	echo "List available unison versions"
-}
-
-do_list() {
-	[[ $# -eq 0 ]] || die -q "Too many parameters"
-
-	local i targets current
-	targets=( $(find_targets ) )
-	current=$(identify_target)
-	for (( i = 0; i < ${#targets[@]}; i++ )); do
-		[[ ${targets[i]} = ${current} ]] \
-			&& targets[i]=$(highlight_marker "${targets[i]}")
-	done
-	write_list_start "Available unison versions:"
-	write_numbered_list -m "(none found)" "${targets[@]}"
-}
-
-### set action ###
-
-describe_set() {
-	echo "Set a new unison version"
-}
-
-describe_set_options() {
-	echo "target : Target version number or index from 'list' action"
-}
-
-describe_set_parameters() {
-	echo "<target>"
-}
-
-do_set() {
-	if [[ -z "${1}" ]] ; then
-		die -q "You didn't give me a version number"
-
-	elif [[ -n "${2}" ]] ; then
-		die -q "Too many parameters"
-
-	elif [[ -L "${ROOT}/usr/bin/unison" ]] ; then
-		if ! remove_symlinks ; then
-			die -q "Can't remove existing version symlink"
-		elif ! set_symlinks "${1}" ; then
-			die -q "Can't set new version"
-		fi
-
-	elif [[ -e "${ROOT}/usr/bin/unison" ]] ; then
-		die -q "${ROOT}/usr/bin/unison seems to be from an old ebuild, please remove manually"
-
-	else
-		set_symlinks "${1}" || die -q "Can't set new version"
-	fi
-}
-
-### update action ###
-
-describe_update() {
-	echo "Automatically update the unison version number"
-}
-
-describe_update_options() {
-	echo "--if-unset : Do not override currently selected version"
-}
-
-do_update() {
-	[[ -z "${1}" ]] || ( [[ -z "${2}" ]] && [[ "${1}" == "--if-unset" ]] ) || \
-		die -q "Usage error"
-
-	if [[ -L "${ROOT}/usr/bin/unison" ]] ; then
-		[[ ${1} == "--if-unset" ]] && return
-		remove_symlinks || die -q "Can't remove existing symlink"
-	fi
-	if [[ -e "${ROOT}/usr/bin/unison" ]] ; then
-		die -q "${ROOT}/usr/bin/unison seems to be from an old ebuild, please remove manually"
-	elif ! [[ -z $(find_targets ) ]] ; then
-		set_symlinks 1 || die -q "Can't set a new version"
-	fi
-}
diff --git a/app-eselect/eselect-wxwidgets/Manifest b/app-eselect/eselect-wxwidgets/Manifest
index d56ccdbe8a35..20f5fba12379 100644
--- a/app-eselect/eselect-wxwidgets/Manifest
+++ b/app-eselect/eselect-wxwidgets/Manifest
@@ -1,3 +1 @@
 DIST eselect-wxwidgets-20140423.tar.xz 6792 SHA256 e97d5734f4b0e314abdaa1a9ee148cdafed74e1cdc036e01e6ac74599736e1bb SHA512 0d83e0b6979803c8a02c20ac33a42c91fd8d350c095e26704a80c1913309f0e7d741cc466ab22e0a6ce4773deab21ca80756299a12a83d441ded968531003d0e WHIRLPOOL 31108a15a0f3774c7a5959de946c741b758d818f1dbf09f96d633e354c086863684f431a6ac59a63f559f0c65482f790a95c7dc431dc91b7b48ec4e4a2c9c730
-DIST wxwidgets.eselect-1.4.bz2 2375 SHA256 630d2a79e3c1a124a124a81db1213e1c036a5c49a5bf06a328b164d997725386 SHA512 02cd876c040d2ea2589527530e7c570c94a1ca7cae867488ec5cf4509d21386d89cb128364aff80d64d0aa29e334209f02abb6e7baf890ff9bb0c22f606fc8fd WHIRLPOOL a3d0c88cba4634d1b390f912b3bc1750f2ef06cf2d5865c3a5c958538f7fc0c664edb59693340d5c7a1e3cb4e49737400a932c14841a77ec19bff07860d99514
-DIST wxwidgets.eselect-20131230.bz2 2228 SHA256 7c3c87931b6887cf1e6c486b17fb71fefcdf6fcf8089fe09d7f70ae17e3e0722 SHA512 0406cfbc5c39d2e65b22d0e8d70ea08ea9e348342d7bc1725dd8655fdedd883fd29e14263ad95737523d6285e081ef4558c4dec00c4a9ea9b9ef01ce537978e5 WHIRLPOOL 60a0ea44ddf1faab42a63f3717aa9d1234713eb40897025b7de8ad7f64f3a77c3399f084eb3a67e236b42963d7d793f0026ea17c10ffd3328fa109218a3deebe
diff --git a/app-eselect/eselect-wxwidgets/eselect-wxwidgets-1.4.ebuild b/app-eselect/eselect-wxwidgets/eselect-wxwidgets-1.4.ebuild
deleted file mode 100644
index 36a2cf3dd3dd..000000000000
--- a/app-eselect/eselect-wxwidgets/eselect-wxwidgets-1.4.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-WXWRAP_VER=1.3
-WXESELECT_VER=1.4
-
-DESCRIPTION="Eselect module and wrappers for wxWidgets"
-HOMEPAGE="https://www.gentoo.org"
-SRC_URI="mirror://gentoo/wxwidgets.eselect-${WXESELECT_VER}.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE=""
-
-DEPEND="!<=x11-libs/wxGTK-2.6.4.0-r2"
-RDEPEND=">=app-admin/eselect-1.2.3"
-
-S=${WORKDIR}
-
-src_install() {
-	insinto /usr/share/eselect/modules
-	newins "${S}"/wxwidgets.eselect-${WXESELECT_VER} wxwidgets.eselect \
-		|| die "Failed installing module"
-
-	insinto /usr/share/aclocal
-	newins "${FILESDIR}"/wxwin.m4-2.9 wxwin.m4 || die "Failed installing m4"
-
-	newbin "${FILESDIR}"/wx-config-${WXWRAP_VER} wx-config \
-		|| die "Failed installing wx-config"
-	newbin "${FILESDIR}"/wxrc-${WXWRAP_VER} wxrc \
-		|| die "Failed installing wxrc"
-
-	keepdir /var/lib/wxwidgets
-	keepdir /usr/share/bakefile/presets
-}
-
-pkg_postinst() {
-	if [[ ! -e ${ROOT}/var/lib/wxwidgets/current ]]; then
-		echo 'WXCONFIG="none"' > "${ROOT}"/var/lib/wxwidgets/current
-	fi
-
-	echo
-	elog "By default the system wxWidgets profile is set to \"none\"."
-	elog
-	elog "It is unnecessary to change this unless you are doing development work"
-	elog "with wxGTK outside of portage.  The package manager ignores the profile"
-	elog "setting altogether."
-	echo
-}
diff --git a/app-eselect/eselect-wxwidgets/eselect-wxwidgets-20131230.ebuild b/app-eselect/eselect-wxwidgets/eselect-wxwidgets-20131230.ebuild
deleted file mode 100644
index ee785f422268..000000000000
--- a/app-eselect/eselect-wxwidgets/eselect-wxwidgets-20131230.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-WXWRAP_VER=1.3
-
-DESCRIPTION="Eselect module and wrappers for wxWidgets"
-HOMEPAGE="https://www.gentoo.org"
-SRC_URI="https://dev.gentoo.org/~dirtyepic/dist/wxwidgets.eselect-${PV}.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE=""
-
-RDEPEND="app-admin/eselect"
-S="${WORKDIR}"
-
-src_install() {
-	insinto /usr/share/eselect/modules
-	newins "${S}"/wxwidgets.eselect-${PV} wxwidgets.eselect
-
-	insinto /usr/share/aclocal
-	newins "${FILESDIR}"/wxwin.m4-3.0 wxwin.m4
-
-	newbin "${FILESDIR}"/wx-config-${WXWRAP_VER} wx-config
-	newbin "${FILESDIR}"/wxrc-${WXWRAP_VER} wxrc
-
-	keepdir /var/lib/wxwidgets
-	keepdir /usr/share/bakefile/presets
-}
-
-pkg_postinst() {
-	if [[ ! -e ${ROOT}/var/lib/wxwidgets/current ]]; then
-		echo 'WXCONFIG="none"' > "${ROOT}"/var/lib/wxwidgets/current
-	fi
-
-	echo
-	elog "This eselect module only controls the version of wxGTK used when"
-	elog "building packages outside of portage.  If you are not doing development"
-	elog "with wxWidgets or bakefile you will never need to use it."
-	echo
-}
diff --git a/app-eselect/eselect-wxwidgets/files/wx-config-1.3 b/app-eselect/eselect-wxwidgets/files/wx-config-1.3
deleted file mode 100644
index 30481921fb0f..000000000000
--- a/app-eselect/eselect-wxwidgets/files/wx-config-1.3
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/bin/sh -
-# $Id$
-#
-# /usr/bin/wx-config
-#
-#  a lame wx-config wrapper (bugs to wxwidgets@gentoo.org)
-
-_wxerror() {
-	cat >&2 <<- EOF
-		An error occurred while calling wx-config:
-		
-		${1}
-
-		Please use \`eselect wxwidgets\` to select an available profile and try again.
-	EOF
-	exit 1
-}
-
-if [ -n "${WX_ECLASS_CONFIG}" ]; then
-	${WX_ECLASS_CONFIG} "$@"
-	exit 0
-else
-	if [ -e /var/lib/wxwidgets/current ]; then
-		. /var/lib/wxwidgets/current
-	else
-		_wxerror "Cannot find the wxWidgets profile configuration ( /var/lib/wxwidgets/current )"
-	fi
-
-	[ -z "${WXCONFIG}" -o "${WXCONFIG}" = none ] && _wxerror "No profile currently selected"
-
-	if [ -x /usr/lib/wx/config/${WXCONFIG} ]; then
-	   /usr/lib/wx/config/${WXCONFIG} "$@"
-	else
-		_wxerror "Cannot find wxWidgets profile ( ${WXCONFIG} )"
-	fi
-	exit 0
-fi
-
diff --git a/app-eselect/eselect-wxwidgets/files/wxrc-1.3 b/app-eselect/eselect-wxwidgets/files/wxrc-1.3
deleted file mode 100644
index 543013bbd82a..000000000000
--- a/app-eselect/eselect-wxwidgets/files/wxrc-1.3
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/bin/sh -
-# $Id$
-#
-# /usr/bin/wxrc
-#
-#  a lame wxrc wrapper (bugs to wxwidgets@gentoo.org)
-
-_wxerror() {
-	cat >&2 <<- EOF
-		An error occurred while calling wxrc:
-
-		${1}
-
-		Please use \`eselect wxwidgets\` to select an available profile and try again.
-	EOF
-	exit 1
-}
-
-if [ -n "${WX_ECLASS_CONFIG}" ]; then
-	$(${WX_ECLASS_CONFIG} --utility=wxrc) "$@"
-	exit 0
-else
-	if [ -e /var/lib/wxwidgets/current ]; then
-		. /var/lib/wxwidgets/current
-	else
-		_wxerror "Cannot find the wxWidgets profile configuration ( /var/lib/wxwidgets/current )"
-	fi
-
-	[ -z "${WXCONFIG}" -o "${WXCONFIG}" = none ] && _wxerror "No profile currently selected"
-
-	if [ -x /usr/lib/wx/config/${WXCONFIG} ]; then
-	   $(/usr/lib/wx/config/${WXCONFIG} --utility=wxrc) "$@"
-	else
-		_wxerror "Cannot find wxWidgets profile ( ${WXCONFIG} )"
-	fi
-	exit 0
-fi
-
diff --git a/app-eselect/eselect-wxwidgets/files/wxwin.m4-2.9 b/app-eselect/eselect-wxwidgets/files/wxwin.m4-2.9
deleted file mode 100644
index 4c01ae41bc4a..000000000000
--- a/app-eselect/eselect-wxwidgets/files/wxwin.m4-2.9
+++ /dev/null
@@ -1,1063 +0,0 @@
-dnl ---------------------------------------------------------------------------
-dnl Author:          wxWidgets development team,
-dnl                  Francesco Montorsi,
-dnl                  Bob McCown (Mac-testing)
-dnl Creation date:   24/11/2001
-dnl RCS-ID:          $Id$
-dnl ---------------------------------------------------------------------------
-
-dnl ===========================================================================
-dnl Table of Contents of this macro file:
-dnl -------------------------------------
-dnl
-dnl SECTION A: wxWidgets main macros
-dnl  - WX_CONFIG_OPTIONS
-dnl  - WX_CONFIG_CHECK
-dnl  - WXRC_CHECK
-dnl  - WX_STANDARD_OPTIONS
-dnl  - WX_CONVERT_STANDARD_OPTIONS_TO_WXCONFIG_FLAGS
-dnl  - WX_DETECT_STANDARD_OPTION_VALUES
-dnl
-dnl SECTION B: wxWidgets-related utilities
-dnl  - WX_LIKE_LIBNAME
-dnl  - WX_ARG_ENABLE_YESNOAUTO
-dnl  - WX_ARG_WITH_YESNOAUTO
-dnl
-dnl SECTION C: messages to the user
-dnl  - WX_STANDARD_OPTIONS_SUMMARY_MSG
-dnl  - WX_STANDARD_OPTIONS_SUMMARY_MSG_BEGIN
-dnl  - WX_STANDARD_OPTIONS_SUMMARY_MSG_END
-dnl  - WX_BOOLOPT_SUMMARY
-dnl
-dnl The special "WX_DEBUG_CONFIGURE" variable can be set to 1 to enable extra
-dnl debug output on stdout from these macros.
-dnl ===========================================================================
-
-
-dnl ---------------------------------------------------------------------------
-dnl Macros for wxWidgets detection. Typically used in configure.in as:
-dnl
-dnl     AC_ARG_ENABLE(...)
-dnl     AC_ARG_WITH(...)
-dnl        ...
-dnl     WX_CONFIG_OPTIONS
-dnl        ...
-dnl        ...
-dnl     WX_CONFIG_CHECK([2.6.0], [wxWin=1])
-dnl     if test "$wxWin" != 1; then
-dnl        AC_MSG_ERROR([
-dnl                wxWidgets must be installed on your system
-dnl                but wx-config script couldn't be found.
-dnl
-dnl                Please check that wx-config is in path, the directory
-dnl                where wxWidgets libraries are installed (returned by
-dnl                'wx-config --libs' command) is in LD_LIBRARY_PATH or
-dnl                equivalent variable and wxWidgets version is 2.3.4 or above.
-dnl        ])
-dnl     fi
-dnl     CPPFLAGS="$CPPFLAGS $WX_CPPFLAGS"
-dnl     CXXFLAGS="$CXXFLAGS $WX_CXXFLAGS_ONLY"
-dnl     CFLAGS="$CFLAGS $WX_CFLAGS_ONLY"
-dnl
-dnl     LIBS="$LIBS $WX_LIBS"
-dnl
-dnl If you want to support standard --enable-debug/unicode/shared options, you
-dnl may do the following:
-dnl
-dnl     ...
-dnl     AC_CANONICAL_SYSTEM
-dnl
-dnl     # define configure options
-dnl     WX_CONFIG_OPTIONS
-dnl     WX_STANDARD_OPTIONS([debug,unicode,shared,toolkit,wxshared])
-dnl
-dnl     # basic configure checks
-dnl     ...
-dnl
-dnl     # we want to always have DEBUG==WX_DEBUG and UNICODE==WX_UNICODE
-dnl     WX_DEBUG=$DEBUG
-dnl     WX_UNICODE=$UNICODE
-dnl
-dnl     WX_CONVERT_STANDARD_OPTIONS_TO_WXCONFIG_FLAGS
-dnl     WX_CONFIG_CHECK([2.8.0], [wxWin=1],,[html,core,net,base],[$WXCONFIG_FLAGS])
-dnl     WX_DETECT_STANDARD_OPTION_VALUES
-dnl
-dnl     # write the output files
-dnl     AC_CONFIG_FILES([Makefile ...])
-dnl     AC_OUTPUT
-dnl
-dnl     # optional: just to show a message to the user
-dnl     WX_STANDARD_OPTIONS_SUMMARY_MSG
-dnl
-dnl ---------------------------------------------------------------------------
-
-
-dnl ---------------------------------------------------------------------------
-dnl WX_CONFIG_OPTIONS
-dnl
-dnl adds support for --wx-prefix, --wx-exec-prefix, --with-wxdir and
-dnl --wx-config command line options
-dnl ---------------------------------------------------------------------------
-
-AC_DEFUN([WX_CONFIG_OPTIONS],
-[
-    AC_ARG_WITH(wxdir,
-                [  --with-wxdir=PATH       Use uninstalled version of wxWidgets in PATH],
-                [ wx_config_name="$withval/wx-config"
-                  wx_config_args="--inplace"])
-    AC_ARG_WITH(wx-config,
-                [  --with-wx-config=CONFIG wx-config script to use (optional)],
-                wx_config_name="$withval" )
-    AC_ARG_WITH(wx-prefix,
-                [  --with-wx-prefix=PREFIX Prefix where wxWidgets is installed (optional)],
-                wx_config_prefix="$withval", wx_config_prefix="")
-    AC_ARG_WITH(wx-exec-prefix,
-                [  --with-wx-exec-prefix=PREFIX
-                          Exec prefix where wxWidgets is installed (optional)],
-                wx_config_exec_prefix="$withval", wx_config_exec_prefix="")
-])
-
-dnl Helper macro for checking if wx version is at least $1.$2.$3, set's
-dnl wx_ver_ok=yes if it is:
-AC_DEFUN([_WX_PRIVATE_CHECK_VERSION],
-[
-    wx_ver_ok=""
-    if test "x$WX_VERSION" != x ; then
-      if test $wx_config_major_version -gt $1; then
-        wx_ver_ok=yes
-      else
-        if test $wx_config_major_version -eq $1; then
-           if test $wx_config_minor_version -gt $2; then
-              wx_ver_ok=yes
-           else
-              if test $wx_config_minor_version -eq $2; then
-                 if test $wx_config_micro_version -ge $3; then
-                    wx_ver_ok=yes
-                 fi
-              fi
-           fi
-        fi
-      fi
-    fi
-])
-
-dnl ---------------------------------------------------------------------------
-dnl WX_CONFIG_CHECK(VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND
-dnl                  [, WX-LIBS [, ADDITIONAL-WX-CONFIG-FLAGS]]]])
-dnl
-dnl Test for wxWidgets, and define WX_C*FLAGS, WX_LIBS and WX_LIBS_STATIC
-dnl (the latter is for static linking against wxWidgets). Set WX_CONFIG_NAME
-dnl environment variable to override the default name of the wx-config script
-dnl to use. Set WX_CONFIG_PATH to specify the full path to wx-config - in this
-dnl case the macro won't even waste time on tests for its existence.
-dnl
-dnl Optional WX-LIBS argument contains comma- or space-separated list of
-dnl wxWidgets libraries to link against. If it is not specified then WX_LIBS
-dnl and WX_LIBS_STATIC will contain flags to link with all of the core
-dnl wxWidgets libraries.
-dnl
-dnl Optional ADDITIONAL-WX-CONFIG-FLAGS argument is appended to wx-config
-dnl invocation command in present. It can be used to fine-tune lookup of
-dnl best wxWidgets build available.
-dnl
-dnl Example use:
-dnl   WX_CONFIG_CHECK([2.6.0], [wxWin=1], [wxWin=0], [html,core,net]
-dnl                    [--unicode --debug])
-dnl ---------------------------------------------------------------------------
-
-dnl
-dnl Get the cflags and libraries from the wx-config script
-dnl
-AC_DEFUN([WX_CONFIG_CHECK],
-[
-  dnl do we have wx-config name: it can be wx-config or wxd-config or ...
-  if test x${WX_CONFIG_NAME+set} != xset ; then
-     WX_CONFIG_NAME=wx-config
-  fi
-
-  if test "x$wx_config_name" != x ; then
-     WX_CONFIG_NAME="$wx_config_name"
-  fi
-
-  dnl deal with optional prefixes
-  if test x$wx_config_exec_prefix != x ; then
-     wx_config_args="$wx_config_args --exec-prefix=$wx_config_exec_prefix"
-     WX_LOOKUP_PATH="$wx_config_exec_prefix/bin"
-  fi
-  if test x$wx_config_prefix != x ; then
-     wx_config_args="$wx_config_args --prefix=$wx_config_prefix"
-     WX_LOOKUP_PATH="$WX_LOOKUP_PATH:$wx_config_prefix/bin"
-  fi
-  if test "$cross_compiling" = "yes"; then
-     wx_config_args="$wx_config_args --host=$host_alias"
-  fi
-
-  dnl don't search the PATH if WX_CONFIG_NAME is absolute filename
-  if test -x "$WX_CONFIG_NAME" ; then
-     AC_MSG_CHECKING(for wx-config)
-     WX_CONFIG_PATH="$WX_CONFIG_NAME"
-     AC_MSG_RESULT($WX_CONFIG_PATH)
-  else
-     AC_PATH_PROG(WX_CONFIG_PATH, $WX_CONFIG_NAME, no, "$WX_LOOKUP_PATH:$PATH")
-  fi
-
-  if test "$WX_CONFIG_PATH" != "no" ; then
-    WX_VERSION=""
-
-    min_wx_version=ifelse([$1], ,2.2.1,$1)
-    if test -z "$5" ; then
-      AC_MSG_CHECKING([for wxWidgets version >= $min_wx_version])
-    else
-      AC_MSG_CHECKING([for wxWidgets version >= $min_wx_version ($5)])
-    fi
-
-    dnl don't add the libraries ($4) to this variable as this would result in
-    dnl an error when it's used with --version below
-    WX_CONFIG_WITH_ARGS="$WX_CONFIG_PATH $wx_config_args $5"
-
-    WX_VERSION=`$WX_CONFIG_WITH_ARGS --version 2>/dev/null`
-    wx_config_major_version=`echo $WX_VERSION | \
-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
-    wx_config_minor_version=`echo $WX_VERSION | \
-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
-    wx_config_micro_version=`echo $WX_VERSION | \
-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
-
-    wx_requested_major_version=`echo $min_wx_version | \
-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
-    wx_requested_minor_version=`echo $min_wx_version | \
-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
-    wx_requested_micro_version=`echo $min_wx_version | \
-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
-
-    _WX_PRIVATE_CHECK_VERSION([$wx_requested_major_version],
-                              [$wx_requested_minor_version],
-                              [$wx_requested_micro_version])
-
-    if test -n "$wx_ver_ok"; then
-      AC_MSG_RESULT(yes (version $WX_VERSION))
-      WX_LIBS=`$WX_CONFIG_WITH_ARGS --libs $4`
-
-      dnl is this even still appropriate?  --static is a real option now
-      dnl and WX_CONFIG_WITH_ARGS is likely to contain it if that is
-      dnl what the user actually wants, making this redundant at best.
-      dnl For now keep it in case anyone actually used it in the past.
-      AC_MSG_CHECKING([for wxWidgets static library])
-      WX_LIBS_STATIC=`$WX_CONFIG_WITH_ARGS --static --libs $4 2>/dev/null`
-      if test "x$WX_LIBS_STATIC" = "x"; then
-        AC_MSG_RESULT(no)
-      else
-        AC_MSG_RESULT(yes)
-      fi
-
-      dnl starting with version 2.2.6 wx-config has --cppflags argument
-      wx_has_cppflags=""
-      if test $wx_config_major_version -gt 2; then
-        wx_has_cppflags=yes
-      else
-        if test $wx_config_major_version -eq 2; then
-           if test $wx_config_minor_version -gt 2; then
-              wx_has_cppflags=yes
-           else
-              if test $wx_config_minor_version -eq 2; then
-                 if test $wx_config_micro_version -ge 6; then
-                    wx_has_cppflags=yes
-                 fi
-              fi
-           fi
-        fi
-      fi
-
-      dnl starting with version 2.7.0 wx-config has --rescomp option
-      wx_has_rescomp=""
-      if test $wx_config_major_version -gt 2; then
-        wx_has_rescomp=yes
-      else
-        if test $wx_config_major_version -eq 2; then
-           if test $wx_config_minor_version -ge 7; then
-              wx_has_rescomp=yes
-           fi
-        fi
-      fi
-      if test "x$wx_has_rescomp" = x ; then
-         dnl cannot give any useful info for resource compiler
-         WX_RESCOMP=
-      else
-         WX_RESCOMP=`$WX_CONFIG_WITH_ARGS --rescomp`
-      fi
-
-      if test "x$wx_has_cppflags" = x ; then
-         dnl no choice but to define all flags like CFLAGS
-         WX_CFLAGS=`$WX_CONFIG_WITH_ARGS --cflags $4`
-         WX_CPPFLAGS=$WX_CFLAGS
-         WX_CXXFLAGS=$WX_CFLAGS
-
-         WX_CFLAGS_ONLY=$WX_CFLAGS
-         WX_CXXFLAGS_ONLY=$WX_CFLAGS
-      else
-         dnl we have CPPFLAGS included in CFLAGS included in CXXFLAGS
-         WX_CPPFLAGS=`$WX_CONFIG_WITH_ARGS --cppflags $4`
-         WX_CXXFLAGS=`$WX_CONFIG_WITH_ARGS --cxxflags $4`
-         WX_CFLAGS=`$WX_CONFIG_WITH_ARGS --cflags $4`
-
-         WX_CFLAGS_ONLY=`echo $WX_CFLAGS | sed "s@^$WX_CPPFLAGS *@@"`
-         WX_CXXFLAGS_ONLY=`echo $WX_CXXFLAGS | sed "s@^$WX_CFLAGS *@@"`
-      fi
-
-      ifelse([$2], , :, [$2])
-
-    else
-
-       if test "x$WX_VERSION" = x; then
-          dnl no wx-config at all
-          AC_MSG_RESULT(no)
-       else
-          AC_MSG_RESULT(no (version $WX_VERSION is not new enough))
-       fi
-
-       WX_CFLAGS=""
-       WX_CPPFLAGS=""
-       WX_CXXFLAGS=""
-       WX_LIBS=""
-       WX_LIBS_STATIC=""
-       WX_RESCOMP=""
-
-       if test ! -z "$5"; then
-
-          wx_error_message="
-    The configuration you asked for $PACKAGE_NAME requires a wxWidgets
-    build with the following settings:
-        $5
-    but such build is not available.
-
-    To see the wxWidgets builds available on this system, please use
-    'wx-config --list' command. To use the default build, returned by
-    'wx-config --selected-config', use the options with their 'auto'
-    default values."
-
-       fi
-
-       wx_error_message="
-    The requested wxWidgets build couldn't be found.
-    $wx_error_message
-
-    If you still get this error, then check that 'wx-config' is
-    in path, the directory where wxWidgets libraries are installed
-    (returned by 'wx-config --libs' command) is in LD_LIBRARY_PATH
-    or equivalent variable and wxWidgets version is $1 or above."
-
-       ifelse([$3], , AC_MSG_ERROR([$wx_error_message]), [$3])
-
-    fi
-  else
-
-    WX_CFLAGS=""
-    WX_CPPFLAGS=""
-    WX_CXXFLAGS=""
-    WX_LIBS=""
-    WX_LIBS_STATIC=""
-    WX_RESCOMP=""
-
-    ifelse([$3], , :, [$3])
-
-  fi
-
-  AC_SUBST(WX_CPPFLAGS)
-  AC_SUBST(WX_CFLAGS)
-  AC_SUBST(WX_CXXFLAGS)
-  AC_SUBST(WX_CFLAGS_ONLY)
-  AC_SUBST(WX_CXXFLAGS_ONLY)
-  AC_SUBST(WX_LIBS)
-  AC_SUBST(WX_LIBS_STATIC)
-  AC_SUBST(WX_VERSION)
-  AC_SUBST(WX_RESCOMP)
-
-  dnl need to export also WX_VERSION_MINOR and WX_VERSION_MAJOR symbols
-  dnl to support wxpresets bakefiles (we export also WX_VERSION_MICRO for completeness):
-  WX_VERSION_MAJOR="$wx_config_major_version"
-  WX_VERSION_MINOR="$wx_config_minor_version"
-  WX_VERSION_MICRO="$wx_config_micro_version"
-  AC_SUBST(WX_VERSION_MAJOR)
-  AC_SUBST(WX_VERSION_MINOR)
-  AC_SUBST(WX_VERSION_MICRO)
-])
-
-dnl ---------------------------------------------------------------------------
-dnl Get information on the wxrc program for making C++, Python and xrs
-dnl resource files.
-dnl
-dnl     AC_ARG_ENABLE(...)
-dnl     AC_ARG_WITH(...)
-dnl        ...
-dnl     WX_CONFIG_OPTIONS
-dnl        ...
-dnl     WX_CONFIG_CHECK(2.6.0, wxWin=1)
-dnl     if test "$wxWin" != 1; then
-dnl        AC_MSG_ERROR([
-dnl                wxWidgets must be installed on your system
-dnl                but wx-config script couldn't be found.
-dnl
-dnl                Please check that wx-config is in path, the directory
-dnl                where wxWidgets libraries are installed (returned by
-dnl                'wx-config --libs' command) is in LD_LIBRARY_PATH or
-dnl                equivalent variable and wxWidgets version is 2.6.0 or above.
-dnl        ])
-dnl     fi
-dnl
-dnl     WXRC_CHECK([HAVE_WXRC=1], [HAVE_WXRC=0])
-dnl     if test "x$HAVE_WXRC" != x1; then
-dnl         AC_MSG_ERROR([
-dnl                The wxrc program was not installed or not found.
-dnl
-dnl                Please check the wxWidgets installation.
-dnl         ])
-dnl     fi
-dnl
-dnl     CPPFLAGS="$CPPFLAGS $WX_CPPFLAGS"
-dnl     CXXFLAGS="$CXXFLAGS $WX_CXXFLAGS_ONLY"
-dnl     CFLAGS="$CFLAGS $WX_CFLAGS_ONLY"
-dnl
-dnl     LDFLAGS="$LDFLAGS $WX_LIBS"
-dnl ---------------------------------------------------------------------------
-
-dnl ---------------------------------------------------------------------------
-dnl WXRC_CHECK([ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]])
-dnl
-dnl Test for wxWidgets' wxrc program for creating either C++, Python or XRS
-dnl resources.  The variable WXRC will be set and substituted in the configure
-dnl script and Makefiles.
-dnl
-dnl Example use:
-dnl   WXRC_CHECK([wxrc=1], [wxrc=0])
-dnl ---------------------------------------------------------------------------
-
-dnl
-dnl wxrc program from the wx-config script
-dnl
-AC_DEFUN([WXRC_CHECK],
-[
-  AC_ARG_VAR([WXRC], [Path to wxWidget's wxrc resource compiler])
-
-  if test "x$WX_CONFIG_NAME" = x; then
-    AC_MSG_ERROR([The wxrc tests must run after wxWidgets test.])
-  else
-
-    AC_MSG_CHECKING([for wxrc])
-
-    if test "x$WXRC" = x ; then
-      dnl wx-config --utility is a new addition to wxWidgets:
-      _WX_PRIVATE_CHECK_VERSION(2,5,3)
-      if test -n "$wx_ver_ok"; then
-        WXRC=`$WX_CONFIG_WITH_ARGS --utility=wxrc`
-      fi
-    fi
-
-    if test "x$WXRC" = x ; then
-      AC_MSG_RESULT([not found])
-      ifelse([$2], , :, [$2])
-    else
-      AC_MSG_RESULT([$WXRC])
-      ifelse([$1], , :, [$1])
-    fi
-
-    AC_SUBST(WXRC)
-  fi
-])
-
-dnl ---------------------------------------------------------------------------
-dnl WX_LIKE_LIBNAME([output-var] [prefix], [name])
-dnl
-dnl Sets the "output-var" variable to the name of a library named with same
-dnl wxWidgets rule.
-dnl E.g. for output-var=='lib', name=='test', prefix='mine', sets
-dnl      the $lib variable to:
-dnl          'mine_gtk2ud_test-2.8'
-dnl      if WX_PORT=gtk2, WX_UNICODE=1, WX_DEBUG=1 and WX_RELEASE=28
-dnl ---------------------------------------------------------------------------
-AC_DEFUN([WX_LIKE_LIBNAME],
-    [
-        wx_temp="$2""_""$WX_PORT"
-
-        dnl add the [u][d] string
-        if test "$WX_UNICODE" = "1"; then
-            wx_temp="$wx_temp""u"
-        fi
-        if test "$WX_DEBUG" = "1"; then
-            wx_temp="$wx_temp""d"
-        fi
-
-        dnl complete the name of the lib
-        wx_temp="$wx_temp""_""$3""-$WX_VERSION_MAJOR.$WX_VERSION_MINOR"
-
-        dnl save it in the user's variable
-        $1=$wx_temp
-    ])
-
-dnl ---------------------------------------------------------------------------
-dnl WX_ARG_ENABLE_YESNOAUTO/WX_ARG_WITH_YESNOAUTO
-dnl
-dnl Two little custom macros which define the ENABLE/WITH configure arguments.
-dnl Macro arguments:
-dnl $1 = the name of the --enable / --with  feature
-dnl $2 = the name of the variable associated
-dnl $3 = the description of that feature
-dnl $4 = the default value for that feature
-dnl $5 = additional action to do in case option is given with "yes" value
-dnl ---------------------------------------------------------------------------
-AC_DEFUN([WX_ARG_ENABLE_YESNOAUTO],
-         [AC_ARG_ENABLE($1,
-            AC_HELP_STRING([--enable-$1], [$3 (default is $4)]),
-            [], [enableval="$4"])
-
-            dnl Show a message to the user about this option
-            AC_MSG_CHECKING([for the --enable-$1 option])
-            if test "$enableval" = "yes" ; then
-                AC_MSG_RESULT([yes])
-                $2=1
-                $5
-            elif test "$enableval" = "no" ; then
-                AC_MSG_RESULT([no])
-                $2=0
-            elif test "$enableval" = "auto" ; then
-                AC_MSG_RESULT([will be automatically detected])
-                $2="auto"
-            else
-                AC_MSG_ERROR([
-    Unrecognized option value (allowed values: yes, no, auto)
-                ])
-            fi
-         ])
-
-AC_DEFUN([WX_ARG_WITH_YESNOAUTO],
-         [AC_ARG_WITH($1,
-            AC_HELP_STRING([--with-$1], [$3 (default is $4)]),
-            [], [withval="$4"])
-
-            dnl Show a message to the user about this option
-            AC_MSG_CHECKING([for the --with-$1 option])
-            if test "$withval" = "yes" ; then
-                AC_MSG_RESULT([yes])
-                $2=1
-                $5
-            dnl NB: by default we don't allow --with-$1=no option
-            dnl     since it does not make much sense !
-            elif test "$6" = "1" -a "$withval" = "no" ; then
-                AC_MSG_RESULT([no])
-                $2=0
-            elif test "$withval" = "auto" ; then
-                AC_MSG_RESULT([will be automatically detected])
-                $2="auto"
-            else
-                AC_MSG_ERROR([
-    Unrecognized option value (allowed values: yes, auto)
-                ])
-            fi
-         ])
-
-
-dnl ---------------------------------------------------------------------------
-dnl WX_STANDARD_OPTIONS([options-to-add])
-dnl
-dnl Adds to the configure script one or more of the following options:
-dnl   --enable-[debug|unicode|shared|wxshared|wxdebug]
-dnl   --with-[gtk|msw|motif|x11|mac|mgl|dfb]
-dnl   --with-wxversion
-dnl Then checks for their presence and eventually set the DEBUG, UNICODE, SHARED,
-dnl PORT, WX_SHARED, WX_DEBUG, variables to one of the "yes", "no", "auto" values.
-dnl
-dnl Note that e.g. UNICODE != WX_UNICODE; the first is the value of the
-dnl --enable-unicode option (in boolean format) while the second indicates
-dnl if wxWidgets was built in Unicode mode (and still is in boolean format).
-dnl ---------------------------------------------------------------------------
-AC_DEFUN([WX_STANDARD_OPTIONS],
-        [
-
-        dnl the following lines will expand to WX_ARG_ENABLE_YESNOAUTO calls if and only if
-        dnl the $1 argument contains respectively the debug,unicode or shared options.
-
-        dnl be careful here not to set debug flag if only "wxdebug" was specified
-        ifelse(regexp([$1], [\bdebug]), [-1],,
-               [WX_ARG_ENABLE_YESNOAUTO([debug], [DEBUG], [Build in debug mode], [auto])])
-
-        ifelse(index([$1], [unicode]), [-1],,
-               [WX_ARG_ENABLE_YESNOAUTO([unicode], [UNICODE], [Build in Unicode mode], [auto])])
-
-        ifelse(regexp([$1], [\bshared]), [-1],,
-               [WX_ARG_ENABLE_YESNOAUTO([shared], [SHARED], [Build as shared library], [auto])])
-
-        dnl WX_ARG_WITH_YESNOAUTO cannot be used for --with-toolkit since it's an option
-        dnl which must be able to accept the auto|gtk1|gtk2|msw|... values
-        ifelse(index([$1], [toolkit]), [-1],,
-               [
-                AC_ARG_WITH([toolkit],
-                            AC_HELP_STRING([--with-toolkit],
-                                           [Build against a specific wxWidgets toolkit (default is auto)]),
-                            [], [withval="auto"])
-
-                dnl Show a message to the user about this option
-                AC_MSG_CHECKING([for the --with-toolkit option])
-                if test "$withval" = "auto" ; then
-                    AC_MSG_RESULT([will be automatically detected])
-                    TOOLKIT="auto"
-                else
-                    TOOLKIT="$withval"
-
-                    dnl PORT must be one of the allowed values
-                    if test "$TOOLKIT" != "gtk1" -a "$TOOLKIT" != "gtk2" -a \
-                            "$TOOLKIT" != "msw" -a "$TOOLKIT" != "motif" -a \
-                            "$TOOLKIT" != "x11" -a "$TOOLKIT" != "mac" -a \
-                            "$TOOLKIT" != "mgl" -a "$TOOLKIT" != "dfb" ; then
-                        AC_MSG_ERROR([
-    Unrecognized option value (allowed values: auto, gtk1, gtk2, msw, motif, x11, mac, mgl, dfb)
-                        ])
-                    fi
-
-                    AC_MSG_RESULT([$TOOLKIT])
-                fi
-               ])
-
-        dnl ****** IMPORTANT *******
-        dnl   Unlike for the UNICODE setting, you can build your program in
-        dnl   shared mode against a static build of wxWidgets. Thus we have the
-        dnl   following option which allows these mixtures. E.g.
-        dnl
-        dnl      ./configure --disable-shared --with-wxshared
-        dnl
-        dnl   will build your library in static mode against the first available
-        dnl   shared build of wxWidgets.
-        dnl
-        dnl   Note that's not possible to do the viceversa:
-        dnl
-        dnl      ./configure --enable-shared --without-wxshared
-        dnl
-        dnl   Doing so you would try to build your library in shared mode against a static
-        dnl   build of wxWidgets. This is not possible (you would mix PIC and non PIC code) !
-        dnl   A check for this combination of options is in WX_DETECT_STANDARD_OPTION_VALUES
-        dnl   (where we know what 'auto' should be expanded to).
-        dnl
-        dnl   If you try to build something in ANSI mode against a UNICODE build
-        dnl   of wxWidgets or in RELEASE mode against a DEBUG build of wxWidgets,
-        dnl   then at best you'll get ton of linking errors !
-        dnl ************************
-
-        ifelse(index([$1], [wxshared]), [-1],,
-               [
-                WX_ARG_WITH_YESNOAUTO(
-                    [wxshared], [WX_SHARED],
-                    [Force building against a shared build of wxWidgets, even if --disable-shared is given],
-                    [auto], [], [1])
-               ])
-
-        dnl Just like for SHARED and WX_SHARED it may happen that some adventurous
-        dnl peoples will want to mix a wxWidgets release build with a debug build of
-        dnl his app/lib. So, we have both DEBUG and WX_DEBUG variables.
-        ifelse(index([$1], [wxdebug]), [-1],,
-               [
-                WX_ARG_WITH_YESNOAUTO(
-                    [wxdebug], [WX_DEBUG],
-                    [Force building against a debug build of wxWidgets, even if --disable-debug is given],
-                    [auto], [], [1])
-               ])
-
-        dnl WX_ARG_WITH_YESNOAUTO cannot be used for --with-wxversion since it's an option
-        dnl which accepts the "auto|2.6|2.7|2.8|2.9|3.0" etc etc values
-        ifelse(index([$1], [wxversion]), [-1],,
-               [
-                AC_ARG_WITH([wxversion],
-                            AC_HELP_STRING([--with-wxversion],
-                                           [Build against a specific version of wxWidgets (default is auto)]),
-                            [], [withval="auto"])
-
-                dnl Show a message to the user about this option
-                AC_MSG_CHECKING([for the --with-wxversion option])
-                if test "$withval" = "auto" ; then
-                    AC_MSG_RESULT([will be automatically detected])
-                    WX_RELEASE="auto"
-                else
-
-                    wx_requested_major_version=`echo $withval | \
-                        sed 's/\([[0-9]]*\).\([[0-9]]*\).*/\1/'`
-                    wx_requested_minor_version=`echo $withval | \
-                        sed 's/\([[0-9]]*\).\([[0-9]]*\).*/\2/'`
-
-                    dnl both vars above must be exactly 1 digit
-                    if test "${#wx_requested_major_version}" != "1" -o \
-                            "${#wx_requested_minor_version}" != "1" ; then
-                        AC_MSG_ERROR([
-    Unrecognized option value (allowed values: auto, 2.6, 2.7, 2.8, 2.9, 3.0)
-                        ])
-                    fi
-
-                    WX_RELEASE="$wx_requested_major_version"".""$wx_requested_minor_version"
-                    AC_MSG_RESULT([$WX_RELEASE])
-                fi
-               ])
-
-        if test "$WX_DEBUG_CONFIGURE" = "1"; then
-            echo "[[dbg]] DEBUG: $DEBUG, WX_DEBUG: $WX_DEBUG"
-            echo "[[dbg]] UNICODE: $UNICODE, WX_UNICODE: $WX_UNICODE"
-            echo "[[dbg]] SHARED: $SHARED, WX_SHARED: $WX_SHARED"
-            echo "[[dbg]] TOOLKIT: $TOOLKIT, WX_TOOLKIT: $WX_TOOLKIT"
-            echo "[[dbg]] VERSION: $VERSION, WX_RELEASE: $WX_RELEASE"
-        fi
-    ])
-
-
-dnl ---------------------------------------------------------------------------
-dnl WX_CONVERT_STANDARD_OPTIONS_TO_WXCONFIG_FLAGS
-dnl
-dnl Sets the WXCONFIG_FLAGS string using the SHARED,DEBUG,UNICODE variable values
-dnl which are different from "auto".
-dnl Thus this macro needs to be called only once all options have been set.
-dnl ---------------------------------------------------------------------------
-AC_DEFUN([WX_CONVERT_STANDARD_OPTIONS_TO_WXCONFIG_FLAGS],
-        [
-        if test "$WX_SHARED" = "1" ; then
-            WXCONFIG_FLAGS="--static=no "
-        elif test "$WX_SHARED" = "0" ; then
-            WXCONFIG_FLAGS="--static=yes "
-        fi
-
-        if test "$WX_DEBUG" = "1" ; then
-            WXCONFIG_FLAGS="$WXCONFIG_FLAGS""--debug=yes "
-        elif test "$WX_DEBUG" = "0" ; then
-            WXCONFIG_FLAGS="$WXCONFIG_FLAGS""--debug=no "
-        fi
-
-        dnl The user should have set WX_UNICODE=UNICODE
-        if test "$WX_UNICODE" = "1" ; then
-            WXCONFIG_FLAGS="$WXCONFIG_FLAGS""--unicode=yes "
-        elif test "$WX_UNICODE" = "0" ; then
-            WXCONFIG_FLAGS="$WXCONFIG_FLAGS""--unicode=no "
-        fi
-
-        if test "$TOOLKIT" != "auto" ; then
-            WXCONFIG_FLAGS="$WXCONFIG_FLAGS""--toolkit=$TOOLKIT "
-        fi
-
-        if test "$WX_RELEASE" != "auto" ; then
-            WXCONFIG_FLAGS="$WXCONFIG_FLAGS""--version=$WX_RELEASE "
-        fi
-
-        dnl strip out the last space of the string
-        WXCONFIG_FLAGS=${WXCONFIG_FLAGS% }
-
-        if test "$WX_DEBUG_CONFIGURE" = "1"; then
-            echo "[[dbg]] WXCONFIG_FLAGS: $WXCONFIG_FLAGS"
-        fi
-    ])
-
-
-dnl ---------------------------------------------------------------------------
-dnl _WX_SELECTEDCONFIG_CHECKFOR([RESULTVAR], [STRING], [MSG]
-dnl                             [, ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]])
-dnl
-dnl Outputs the given MSG. Then searches the given STRING in the wxWidgets
-dnl additional CPP flags and put the result of the search in WX_$RESULTVAR
-dnl also adding the "yes" or "no" message result to MSG.
-dnl ---------------------------------------------------------------------------
-AC_DEFUN([_WX_SELECTEDCONFIG_CHECKFOR],
-        [
-        if test "$$1" = "auto" ; then
-
-            dnl The user does not have particular preferences for this option;
-            dnl so we will detect the wxWidgets relative build setting and use it
-            AC_MSG_CHECKING([$3])
-
-            dnl set WX_$1 variable to 1 if the $WX_SELECTEDCONFIG contains the $2
-            dnl string or to 0 otherwise.
-            dnl NOTE: 'expr match STRING REGEXP' cannot be used since on Mac it
-            dnl       doesn't work; we use 'expr STRING : REGEXP' instead
-            WX_$1=$(expr "$WX_SELECTEDCONFIG" : ".*$2.*")
-
-            if test "$WX_$1" != "0"; then
-                WX_$1=1
-                AC_MSG_RESULT([yes])
-                ifelse([$4], , :, [$4])
-            else
-                WX_$1=0
-                AC_MSG_RESULT([no])
-                ifelse([$5], , :, [$5])
-            fi
-        else
-
-            dnl Use the setting given by the user
-            WX_$1=$$1
-        fi
-    ])
-
-dnl ---------------------------------------------------------------------------
-dnl WX_DETECT_STANDARD_OPTION_VALUES
-dnl
-dnl Detects the values of the following variables:
-dnl 1) WX_RELEASE
-dnl 2) WX_UNICODE
-dnl 3) WX_DEBUG
-dnl 4) WX_SHARED    (and also WX_STATIC)
-dnl 5) WX_PORT
-dnl from the previously selected wxWidgets build; this macro in fact must be
-dnl called *after* calling the WX_CONFIG_CHECK macro.
-dnl
-dnl Note that the WX_VERSION_MAJOR, WX_VERSION_MINOR symbols are already set
-dnl by WX_CONFIG_CHECK macro
-dnl ---------------------------------------------------------------------------
-AC_DEFUN([WX_DETECT_STANDARD_OPTION_VALUES],
-        [
-        dnl IMPORTANT: WX_VERSION contains all three major.minor.micro digits,
-        dnl            while WX_RELEASE only the major.minor ones.
-        WX_RELEASE="$WX_VERSION_MAJOR""$WX_VERSION_MINOR"
-        if test $WX_RELEASE -lt 26 ; then
-
-            AC_MSG_ERROR([
-    Cannot detect the wxWidgets configuration for the selected wxWidgets build
-    since its version is $WX_VERSION < 2.6.0; please install a newer
-    version of wxWidgets.
-                         ])
-        fi
-
-        dnl The wx-config we are using understands the "--selected_config"
-        dnl option which returns an easy-parseable string !
-        WX_SELECTEDCONFIG=$($WX_CONFIG_WITH_ARGS --selected_config)
-
-        if test "$WX_DEBUG_CONFIGURE" = "1"; then
-            echo "[[dbg]] Using wx-config --selected-config"
-            echo "[[dbg]] WX_SELECTEDCONFIG: $WX_SELECTEDCONFIG"
-        fi
-
-
-        dnl we could test directly for WX_SHARED with a line like:
-        dnl    _WX_SELECTEDCONFIG_CHECKFOR([SHARED], [shared],
-        dnl                                [if wxWidgets was built in SHARED mode])
-        dnl but wx-config --selected-config DOES NOT outputs the 'shared'
-        dnl word when wx was built in shared mode; it rather outputs the
-        dnl 'static' word when built in static mode.
-        if test $WX_SHARED = "1"; then
-            STATIC=0
-        elif test $WX_SHARED = "0"; then
-            STATIC=1
-        elif test $WX_SHARED = "auto"; then
-            STATIC="auto"
-        fi
-
-        dnl Now set the WX_UNICODE, WX_DEBUG, WX_STATIC variables
-        _WX_SELECTEDCONFIG_CHECKFOR([UNICODE], [unicode],
-                                    [if wxWidgets was built with UNICODE enabled])
-        _WX_SELECTEDCONFIG_CHECKFOR([DEBUG], [debug],
-                                    [if wxWidgets was built in DEBUG mode])
-        _WX_SELECTEDCONFIG_CHECKFOR([STATIC], [static],
-                                    [if wxWidgets was built in STATIC mode])
-
-        dnl init WX_SHARED from WX_STATIC
-        if test "$WX_STATIC" != "0"; then
-            WX_SHARED=0
-        else
-            WX_SHARED=1
-        fi
-
-        AC_SUBST(WX_UNICODE)
-        AC_SUBST(WX_DEBUG)
-        AC_SUBST(WX_SHARED)
-
-        dnl detect the WX_PORT to use
-        if test "$TOOLKIT" = "auto" ; then
-
-            dnl The user does not have particular preferences for this option;
-            dnl so we will detect the wxWidgets relative build setting and use it
-            AC_MSG_CHECKING([which wxWidgets toolkit was selected])
-
-            WX_GTKPORT1=$(expr "$WX_SELECTEDCONFIG" : ".*gtk1.*")
-            WX_GTKPORT2=$(expr "$WX_SELECTEDCONFIG" : ".*gtk2.*")
-            WX_MSWPORT=$(expr "$WX_SELECTEDCONFIG" : ".*msw.*")
-            WX_MOTIFPORT=$(expr "$WX_SELECTEDCONFIG" : ".*motif.*")
-            WX_OSXCOCOAPORT=$(expr "$WX_SELECTEDCONFIG" : ".*osx_cocoa.*")
-            WX_OSXCARBONPORT=$(expr "$WX_SELECTEDCONFIG" : ".*osx_carbon.*")
-            WX_X11PORT=$(expr "$WX_SELECTEDCONFIG" : ".*x11.*")
-            WX_MGLPORT=$(expr "$WX_SELECTEDCONFIG" : ".*mgl.*")
-            WX_DFBPORT=$(expr "$WX_SELECTEDCONFIG" : ".*dfb.*")
-
-            WX_PORT="unknown"
-            if test "$WX_GTKPORT1" != "0"; then WX_PORT="gtk1"; fi
-            if test "$WX_GTKPORT2" != "0"; then WX_PORT="gtk2"; fi
-            if test "$WX_MSWPORT" != "0"; then WX_PORT="msw"; fi
-            if test "$WX_MOTIFPORT" != "0"; then WX_PORT="motif"; fi
-            if test "$WX_OSXCOCOAPORT" != "0"; then WX_PORT="osx_cocoa"; fi
-            if test "$WX_OSXCARBONPORT" != "0"; then WX_PORT="osx_carbon"; fi
-            if test "$WX_X11PORT" != "0"; then WX_PORT="x11"; fi
-            if test "$WX_MGLPORT" != "0"; then WX_PORT="mgl"; fi
-            if test "$WX_DFBPORT" != "0"; then WX_PORT="dfb"; fi
-
-            dnl NOTE: backward-compatible check for wx2.8; in wx2.9 the mac
-            dnl       ports are called 'osx_cocoa' and 'osx_carbon' (see above)
-            WX_MACPORT=$(expr "$WX_SELECTEDCONFIG" : ".*mac.*")
-            if test "$WX_MACPORT" != "0"; then WX_PORT="mac"; fi
-
-            dnl check at least one of the WX_*PORT has been set !
-
-            if test "$WX_PORT" = "unknown" ; then
-                AC_MSG_ERROR([
-        Cannot detect the currently installed wxWidgets port !
-        Please check your 'wx-config --cxxflags'...
-                            ])
-            fi
-
-            AC_MSG_RESULT([$WX_PORT])
-        else
-
-            dnl Use the setting given by the user
-            if test -z "$TOOLKIT" ; then
-                WX_PORT=$TOOLKIT
-            else
-                dnl try with PORT
-                WX_PORT=$PORT
-            fi
-        fi
-
-        AC_SUBST(WX_PORT)
-
-        if test "$WX_DEBUG_CONFIGURE" = "1"; then
-            echo "[[dbg]] Values of all WX_* options after final detection:"
-            echo "[[dbg]] WX_DEBUG: $WX_DEBUG"
-            echo "[[dbg]] WX_UNICODE: $WX_UNICODE"
-            echo "[[dbg]] WX_SHARED: $WX_SHARED"
-            echo "[[dbg]] WX_RELEASE: $WX_RELEASE"
-            echo "[[dbg]] WX_PORT: $WX_PORT"
-        fi
-
-        dnl Avoid problem described in the WX_STANDARD_OPTIONS which happens when
-        dnl the user gives the options:
-        dnl      ./configure --enable-shared --without-wxshared
-        dnl or just do
-        dnl      ./configure --enable-shared
-        dnl but there is only a static build of wxWidgets available.
-        if test "$WX_SHARED" = "0" -a "$SHARED" = "1"; then
-            AC_MSG_ERROR([
-    Cannot build shared library against a static build of wxWidgets !
-    This error happens because the wxWidgets build which was selected
-    has been detected as static while you asked to build $PACKAGE_NAME
-    as shared library and this is not possible.
-    Use the '--disable-shared' option to build $PACKAGE_NAME
-    as static library or '--with-wxshared' to use wxWidgets as shared library.
-                         ])
-        fi
-
-        dnl now we can finally update the DEBUG,UNICODE,SHARED options
-        dnl to their final values if they were set to 'auto'
-        if test "$DEBUG" = "auto"; then
-            DEBUG=$WX_DEBUG
-        fi
-        if test "$UNICODE" = "auto"; then
-            UNICODE=$WX_UNICODE
-        fi
-        if test "$SHARED" = "auto"; then
-            SHARED=$WX_SHARED
-        fi
-        if test "$TOOLKIT" = "auto"; then
-            TOOLKIT=$WX_PORT
-        fi
-
-        dnl in case the user needs a BUILD=debug/release var...
-        if test "$DEBUG" = "1"; then
-            BUILD="debug"
-        elif test "$DEBUG" = "0" -o "$DEBUG" = ""; then
-            BUILD="release"
-        fi
-
-        dnl respect the DEBUG variable adding the optimize/debug flags
-        dnl NOTE: the CXXFLAGS are merged together with the CPPFLAGS so we
-        dnl       don't need to set them, too
-        if test "$DEBUG" = "1"; then
-            CXXFLAGS="$CXXFLAGS -g -O0"
-            CFLAGS="$CFLAGS -g -O0"
-        else
-            CXXFLAGS="$CXXFLAGS -O2"
-            CFLAGS="$CFLAGS -O2"
-        fi
-    ])
-
-dnl ---------------------------------------------------------------------------
-dnl WX_BOOLOPT_SUMMARY([name of the boolean variable to show summary for],
-dnl                   [what to print when var is 1],
-dnl                   [what to print when var is 0])
-dnl
-dnl Prints $2 when variable $1 == 1 and prints $3 when variable $1 == 0.
-dnl This macro mainly exists just to make configure.ac scripts more readable.
-dnl
-dnl NOTE: you need to use the [" my message"] syntax for 2nd and 3rd arguments
-dnl       if you want that m4 avoid to throw away the spaces prefixed to the
-dnl       argument value.
-dnl ---------------------------------------------------------------------------
-AC_DEFUN([WX_BOOLOPT_SUMMARY],
-        [
-        if test "x$$1" = "x1" ; then
-            echo $2
-        elif test "x$$1" = "x0" ; then
-            echo $3
-        else
-            echo "$1 is $$1"
-        fi
-    ])
-
-dnl ---------------------------------------------------------------------------
-dnl WX_STANDARD_OPTIONS_SUMMARY_MSG
-dnl
-dnl Shows a summary message to the user about the WX_* variable contents.
-dnl This macro is used typically at the end of the configure script.
-dnl ---------------------------------------------------------------------------
-AC_DEFUN([WX_STANDARD_OPTIONS_SUMMARY_MSG],
-        [
-        echo
-        echo "  The wxWidgets build which will be used by $PACKAGE_NAME $PACKAGE_VERSION"
-        echo "  has the following settings:"
-        WX_BOOLOPT_SUMMARY([WX_DEBUG],   ["  - DEBUG build"],  ["  - RELEASE build"])
-        WX_BOOLOPT_SUMMARY([WX_UNICODE], ["  - UNICODE mode"], ["  - ANSI mode"])
-        WX_BOOLOPT_SUMMARY([WX_SHARED],  ["  - SHARED mode"],  ["  - STATIC mode"])
-        echo "  - VERSION: $WX_VERSION"
-        echo "  - PORT: $WX_PORT"
-    ])
-
-
-dnl ---------------------------------------------------------------------------
-dnl WX_STANDARD_OPTIONS_SUMMARY_MSG_BEGIN, WX_STANDARD_OPTIONS_SUMMARY_MSG_END
-dnl
-dnl Like WX_STANDARD_OPTIONS_SUMMARY_MSG macro but these two macros also gives info
-dnl about the configuration of the package which used the wxpresets.
-dnl
-dnl Typical usage:
-dnl    WX_STANDARD_OPTIONS_SUMMARY_MSG_BEGIN
-dnl    echo "   - Package setting 1: $SETTING1"
-dnl    echo "   - Package setting 2: $SETTING1"
-dnl    ...
-dnl    WX_STANDARD_OPTIONS_SUMMARY_MSG_END
-dnl
-dnl ---------------------------------------------------------------------------
-AC_DEFUN([WX_STANDARD_OPTIONS_SUMMARY_MSG_BEGIN],
-        [
-        echo
-        echo " ----------------------------------------------------------------"
-        echo "  Configuration for $PACKAGE_NAME $PACKAGE_VERSION successfully completed."
-        echo "  Summary of main configuration settings for $PACKAGE_NAME:"
-        WX_BOOLOPT_SUMMARY([DEBUG], ["  - DEBUG build"], ["  - RELEASE build"])
-        WX_BOOLOPT_SUMMARY([UNICODE], ["  - UNICODE mode"], ["  - ANSI mode"])
-        WX_BOOLOPT_SUMMARY([SHARED], ["  - SHARED mode"], ["  - STATIC mode"])
-    ])
-
-AC_DEFUN([WX_STANDARD_OPTIONS_SUMMARY_MSG_END],
-        [
-        WX_STANDARD_OPTIONS_SUMMARY_MSG
-        echo
-        echo "  Now, just run make."
-        echo " ----------------------------------------------------------------"
-        echo
-    ])
-
-
-dnl ---------------------------------------------------------------------------
-dnl Deprecated macro wrappers
-dnl ---------------------------------------------------------------------------
-
-AC_DEFUN([AM_OPTIONS_WXCONFIG], [WX_CONFIG_OPTIONS])
-AC_DEFUN([AM_PATH_WXCONFIG], [
-    WX_CONFIG_CHECK([$1],[$2],[$3],[$4],[$5])
-])
-
-
diff --git a/app-eselect/eselect-xvmc/eselect-xvmc-0.3.ebuild b/app-eselect/eselect-xvmc/eselect-xvmc-0.3.ebuild
deleted file mode 100644
index 18ac76848901..000000000000
--- a/app-eselect/eselect-xvmc/eselect-xvmc-0.3.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-DESCRIPTION="Manages XvMC implementations"
-HOMEPAGE="https://www.gentoo.org/"
-SRC_URI=""
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-IUSE=""
-
-DEPEND=""
-RDEPEND=">=app-admin/eselect-1.0.10"
-
-src_install() {
-	insinto /usr/share/eselect/modules
-	newins "${FILESDIR}"/${P}.eselect xvmc.eselect || die "newins failed"
-}
diff --git a/app-eselect/eselect-xvmc/files/eselect-xvmc-0.3.eselect b/app-eselect/eselect-xvmc/files/eselect-xvmc-0.3.eselect
deleted file mode 100644
index 4f3cdccb9170..000000000000
--- a/app-eselect/eselect-xvmc/files/eselect-xvmc-0.3.eselect
+++ /dev/null
@@ -1,189 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-DESCRIPTION="Manage the XvMC implementation used by your system"
-MAINTAINER="cardoe@gentoo.org"
-SVN_DATE='$Date: 2015/03/31 16:58:41 $'
-VERSION=$(svn_date_to_version "${SVN_DATE}" )
-
-XVMCLIBS=(
-"libXvMCNVIDIA_dynamic.so.1"
-"libXvMC.so.1"
-"libviaXvMC.so.1"
-"libviaXvMCPro.so.1"
-"libchromeXvMC.so.1"
-"libchromeXvMCPro.so.1"
-"libXvMCVIA.so"
-"libXvMCVIAPro.so"
-"libI810XvMC.so.1"
-"/usr/lib/libIntelXvMC.so"
-"libAMDXvBA.so.1" )
-XVMCPRETTY=(
-"nvidia"
-"xorg-x11"
-"via"
-"via-pro"
-"openchrome"
-"openchrome-pro"
-"unichrome"
-"unichrome-pro"
-"intel-i815"
-"intel-i915"
-"ati" )
-
-get_implementation_indices() {
-	local ret n
-	for (( n = 0; n < ${#XVMCLIBS[@]}; ++n )); do
-		[[ -e "${ROOT}/usr/lib/${XVMCLIBS[n]}" ]] && ret+=($n)
-	done
-
-	echo ${ret[@]}
-}
-
-get_current_implementation_index() {
-	local n
-	if [[ -f "${ROOT}/etc/X11/XvMCConfig" ]]; then
-		local current=$(< "${ROOT}/etc/X11/XvMCConfig")
-		for (( n = 0; n < ${#XVMCLIBS[@]}; ++n )); do
-			if [[ "${XVMCLIBS[n]}" = "${current}" ]]; then
-				echo "${n}"
-				return
-			fi
-		done
-	fi
-
-	echo "-1"
-}
-
-set_new_implementation() {
-	echo -n "Switching to ${XVMCPRETTY[$1]} XvMC implementation..."
-	touch "${ROOT}/etc/X11/XvMCConfig" 2>&1 > /dev/null
-	if [[ $? -eq 0 ]]; then
-		echo "${XVMCLIBS[$1]}" > "${ROOT}/etc/X11/XvMCConfig"
-		chmod 644 "${ROOT}/etc/X11/XvMCConfig"
-		chown 0:0 "${ROOT}/etc/X11/XvMCConfig"
-		echo " done"
-	else
-		echo " failed!"
-		echo "Insufficient privileges"
-	fi
-}
-
-### list action
-
-## {{{ list stuff
-describe_list() {
-	echo "List Available XvMC implementations"
-}
-
-do_list() {
-	local output n
-	local avail=( $(get_implementation_indices) )
-	local current=$(get_current_implementation_index)
-	write_list_start "Available XvMC implementations  ( $(highlight '*') is current ):"
-
-	if (( ${#avail[@]} )) ; then
-		for n in "${avail[@]}" ; do
-			output[n]="${XVMCPRETTY[n]}"
-			[[ ${current} -eq ${n} ]] && \
-				output[n]+=" $(highlight '*')"
-		done
-		write_numbered_list "${output[@]}"
-	else
-		write_kv_list_entry "(none found)" ""
-	fi
-
-	return 0
-}
-## }}}
-
-### show action
-
-## {{{ show stuff
-describe_show() {
-	echo "Print the current XvMC implementation."
-}
-
-do_show() {
-	local current=$(get_current_implementation_index)
-	write_list_start "Current XvMC implementation:"
-
-	if [[ ${current} -ne -1 ]]; then
-		echo "${XVMCPRETTY[current]}"
-		return 0
-	else
-		echo "(none)"
-		return 2
-	fi
-}
-## }}}
-
-### set action
-
-## {{{ set stuff
-describe_set() {
-	echo "Select the XvMC implementation"
-}
-
-describe_set_parameters() {
-	echo "<target>"
-}
-
-describe_set_options() {
-	echo "<target> : XvMC implementation to activate"
-	echo "--use-old : If an implementation is already set, use that one instead"
-}
-
-do_set() {
-	local current=$(get_current_implementation_index)
-	local avail=( $(get_implementation_indices) )
-	local n new action
-
-	while [[ ${#@} -gt 0 ]]; do
-		local opt=${1}
-		shift
-		case ${opt} in
-			--use-old)
-				if [[ ${current} -gt -1 ]]; then
-					(( ${current} < ${#XVMCPRETTY[@]} )) && action="old-implementation"
-				fi
-				;;
-			*)
-				[[ -z ${action} ]] && action="set-implementation"
-				
-				if is_number ${opt} ; then
-					new=${avail[opt - 1]}
-					if [[ -z ${new} ]]; then
-						die -q "Unrecognized option: ${opt}"
-					fi
-				elif has ${opt} ${XVMCPRETTY[@]}; then
-					for (( n = 0; n < ${#XVMCPRETTY[@]}; ++n )); do
-						[[ "${XVMCPRETTY[n]}" = "${opt}" ]] && new=${n}
-					done
-				else
-					die -q "Unrecognized option: ${opt}"
-				fi
-				;;
-		esac
-	done
-
-	case ${action} in
-		old-implementation)
-			set_new_implementation ${current}
-			return $?
-		;;
-		set-implementation)
-			if [[ -n ${new} ]]; then
-				set_new_implementation ${new}
-				return $?
-			else
-				die -q "Please specify an implementation to set"
-			fi
-		;;
-		*)
-			die -q "Invalid usage of set action."
-	esac
-}
-
-# vim: ts=4 sw=4 noet fdm=marker
diff --git a/app-forensics/libbfio/metadata.xml b/app-forensics/libbfio/metadata.xml
index af67b19a8a02..dd92a9b27328 100644
--- a/app-forensics/libbfio/metadata.xml
+++ b/app-forensics/libbfio/metadata.xml
@@ -1,9 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-<email>zerochaos@gentoo.org</email>
-<name>Rick Farina</name>
-</maintainer>
+	<maintainer>
+		<email>zerochaos@gentoo.org</email>
+		<name>Rick Farina</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">libyal/libbfio</remote-id>
+	</upstream>
 </pkgmetadata>
-
diff --git a/app-forensics/libewf/metadata.xml b/app-forensics/libewf/metadata.xml
index 8c8acdb43b78..dc79c997112f 100644
--- a/app-forensics/libewf/metadata.xml
+++ b/app-forensics/libewf/metadata.xml
@@ -1,12 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>forensics</herd>
-<use>
-	<flag name="bfio">Enables libbfio for chaining file in file handling</flag>
-	<flag name="rawio">Enables raw IO handling</flag>
-	<flag name="ewf">Enables the v1 API</flag>
-	<flag name="fuse">Enable fuse support for ewfmount</flag>
-	<flag name="uuid">Enable UUID support in the ewftools</flag>
-</use>
+	<herd>forensics</herd>
+	<use>
+		<flag name="bfio">Enables libbfio for chaining file in file handling</flag>
+		<flag name="rawio">Enables raw IO handling</flag>
+		<flag name="ewf">Enables the v1 API</flag>
+		<flag name="fuse">Enable fuse support for ewfmount</flag>
+		<flag name="uuid">Enable UUID support in the ewftools</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">libyal/libewf</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/app-i18n/ibus-anthy/metadata.xml b/app-i18n/ibus-anthy/metadata.xml
index 96a29926bf06..6b2f60169a00 100644
--- a/app-i18n/ibus-anthy/metadata.xml
+++ b/app-i18n/ibus-anthy/metadata.xml
@@ -6,6 +6,7 @@
 libanthy.</longdescription>
 	<upstream>
 		<remote-id type="google-code">ibus</remote-id>
+		<remote-id type="github">ibus/ibus</remote-id>
 	</upstream>
 	<use>
 		<flag name="deprecated">Install deprecated pygtk2 library</flag>
diff --git a/app-i18n/ibus-chewing/metadata.xml b/app-i18n/ibus-chewing/metadata.xml
index 7d84776d4dff..57657ad7a713 100644
--- a/app-i18n/ibus-chewing/metadata.xml
+++ b/app-i18n/ibus-chewing/metadata.xml
@@ -5,5 +5,6 @@
 	<longdescription lang="en">The Chewing engine for IBus platform. It provides Chinese input method from libchewing.</longdescription>
 	<upstream>
 		<remote-id type="google-code">ibus</remote-id>
+		<remote-id type="github">ibus/ibus</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/app-i18n/ibus-hangul/metadata.xml b/app-i18n/ibus-hangul/metadata.xml
index 299a127ff9b1..cfe537c73219 100644
--- a/app-i18n/ibus-hangul/metadata.xml
+++ b/app-i18n/ibus-hangul/metadata.xml
@@ -5,5 +5,6 @@
 	<longdescription lang="en">The Hangul engine for IBus platform. It provides Korean input method from libhangul.</longdescription>
 	<upstream>
 		<remote-id type="google-code">ibus</remote-id>
+		<remote-id type="github">ibus/ibus</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/app-i18n/ibus-m17n/metadata.xml b/app-i18n/ibus-m17n/metadata.xml
index 09339d3d5744..a1663ffedc99 100644
--- a/app-i18n/ibus-m17n/metadata.xml
+++ b/app-i18n/ibus-m17n/metadata.xml
@@ -8,9 +8,10 @@
   </longdescription>
   <upstream>
     <remote-id type="cpe">cpe:/a:ibus_project:ibus-m17n</remote-id>
+    <remote-id type="github">ibus/ibus</remote-id>
   </upstream>
   <use>
-    <flag name='gtk'>
+    <flag name="gtk">
       Build the preference interfaces, based on
       <pkg>x11-libs/gtk+</pkg> (GTK+ 2).
     </flag>
diff --git a/app-i18n/ibus-pinyin/metadata.xml b/app-i18n/ibus-pinyin/metadata.xml
index e48d0a4aca00..da4f439af94c 100644
--- a/app-i18n/ibus-pinyin/metadata.xml
+++ b/app-i18n/ibus-pinyin/metadata.xml
@@ -6,12 +6,14 @@
     <email>dlan@gentoo.org</email>
     <name>Yixun Lan</name>
   </maintainer>
-<longdescription lang="en">
+  <longdescription lang="en">
 PinYin engine for IBus platform. It provides a Chinese PinYin input method.
 </longdescription>
-<use>
-  <flag name="boost">Compile against <pkg>dev-libs/boost</pkg> libraries</flag>
-  <flag name="opencc">Enable support for <pkg>app-i18n/opencc</pkg></flag>
-</use>
+  <use>
+    <flag name="boost">Compile against <pkg>dev-libs/boost</pkg> libraries</flag>
+    <flag name="opencc">Enable support for <pkg>app-i18n/opencc</pkg></flag>
+  </use>
+  <upstream>
+    <remote-id type="github">ibus/ibus</remote-id>
+  </upstream>
 </pkgmetadata>
-
diff --git a/app-i18n/ibus-table-code/metadata.xml b/app-i18n/ibus-table-code/metadata.xml
index e81802ffe5c5..7995586c1fcb 100644
--- a/app-i18n/ibus-table-code/metadata.xml
+++ b/app-i18n/ibus-table-code/metadata.xml
@@ -5,5 +5,6 @@
 	<longdescription lang="en">The package contains additional tables for Ibus-Table.</longdescription>
 	<upstream>
 		<remote-id type="google-code">ibus</remote-id>
+		<remote-id type="github">ibus/ibus</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/app-i18n/ibus-table-cyrillic/metadata.xml b/app-i18n/ibus-table-cyrillic/metadata.xml
index b260e7d8963a..c14f190bf59d 100644
--- a/app-i18n/ibus-table-cyrillic/metadata.xml
+++ b/app-i18n/ibus-table-cyrillic/metadata.xml
@@ -5,5 +5,6 @@
 	<longdescription lang="en">ibus-table-cyrillic provides Transit, Russian Traditional, Yawerty input method on IBus-Table on IBus framework.</longdescription>
 	<upstream>
 		<remote-id type="google-code">ibus</remote-id>
+		<remote-id type="github">ibus/ibus</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/app-i18n/ibus-table-extraphrase/metadata.xml b/app-i18n/ibus-table-extraphrase/metadata.xml
index 7c97bd6353d3..3dccf2765c10 100644
--- a/app-i18n/ibus-table-extraphrase/metadata.xml
+++ b/app-i18n/ibus-table-extraphrase/metadata.xml
@@ -4,5 +4,6 @@
 	<herd>cjk</herd>
 	<upstream>
 		<remote-id type="google-code">ibus</remote-id>
+		<remote-id type="github">ibus/ibus</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/app-i18n/ibus-table-latin/metadata.xml b/app-i18n/ibus-table-latin/metadata.xml
index 875d1031b779..d28bbfa34c71 100644
--- a/app-i18n/ibus-table-latin/metadata.xml
+++ b/app-i18n/ibus-table-latin/metadata.xml
@@ -5,5 +5,6 @@
 	<longdescription lang="en">The Latin tables for Ibus-Table.</longdescription>
 	<upstream>
 		<remote-id type="google-code">ibus</remote-id>
+		<remote-id type="github">ibus/ibus</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/app-i18n/ibus-table-tv/metadata.xml b/app-i18n/ibus-table-tv/metadata.xml
index db59448265e5..9cba36082eda 100644
--- a/app-i18n/ibus-table-tv/metadata.xml
+++ b/app-i18n/ibus-table-tv/metadata.xml
@@ -5,5 +5,6 @@
 	<longdescription lang="en">The Thai and Viqr (Vietnamese) tables for Ibus-Table.</longdescription>
 	<upstream>
 		<remote-id type="google-code">ibus</remote-id>
+		<remote-id type="github">ibus/ibus</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/app-i18n/ibus-table/metadata.xml b/app-i18n/ibus-table/metadata.xml
index 46e3a1d32673..be7a0b838864 100644
--- a/app-i18n/ibus-table/metadata.xml
+++ b/app-i18n/ibus-table/metadata.xml
@@ -5,5 +5,6 @@
 	<longdescription lang="en">The package contains general Table engine for IBus platform.</longdescription>
 	<upstream>
 		<remote-id type="google-code">ibus</remote-id>
+		<remote-id type="github">ibus/ibus</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/app-i18n/mozc/metadata.xml b/app-i18n/mozc/metadata.xml
index 61a84a9b2f9c..6f9e8961bd0a 100644
--- a/app-i18n/mozc/metadata.xml
+++ b/app-i18n/mozc/metadata.xml
@@ -12,5 +12,6 @@ Mozc is a Japanese Input Method Editor (IME) designed for multi-platform such as
 	</use>
 	<upstream>
 		<remote-id type="sourceforge">jsoncpp</remote-id>
+		<remote-id type="github">google/mozc</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/app-i18n/opencc/metadata.xml b/app-i18n/opencc/metadata.xml
index e60b8b7f6efa..75a9129447b3 100644
--- a/app-i18n/opencc/metadata.xml
+++ b/app-i18n/opencc/metadata.xml
@@ -6,5 +6,6 @@
 Traditional Chinese and Simplified Chinese.</longdescription>
 	<upstream>
 		<remote-id type="google-code">open-chinese-convert</remote-id>
+		<remote-id type="github">BYVoid/OpenCC</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/app-i18n/uim/metadata.xml b/app-i18n/uim/metadata.xml
index dcb569955398..43ecf63bb11a 100644
--- a/app-i18n/uim/metadata.xml
+++ b/app-i18n/uim/metadata.xml
@@ -1,19 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>cjk</herd>
-<longdescription lang="en">
+  <herd>cjk</herd>
+  <longdescription lang="en">
   uim is a simple, secure and flexible input method library.  At the moment
   Anthy, SKK, Prime, T-code, TUT-code (these are Japanese input method),
   Pinyin (Chinese input method), Hangul (Korean input method), IPA
   (International Phonetic Alphabet) are implemented.  You can extend the
   library with Scheme thus easily, or with C if it becomes rather complicated.
 </longdescription>
-<use>
-  <flag name='anthy'>Enable support for <pkg>app-i18n/anthy</pkg> input method
+  <use>
+    <flag name="anthy">Enable support for <pkg>app-i18n/anthy</pkg> input method
     </flag>
-  <flag name='eb'>Enable support for <pkg>dev-libs/eb</pkg></flag>
-  <flag name='gtk3'>Enable support for <pkg>x11-libs/gtk+</pkg>:3</flag>
-  <flag name='skk'>Enable support for <pkg>app-i18n/skk-jisyo</pkg></flag>
-</use>
+    <flag name="eb">Enable support for <pkg>dev-libs/eb</pkg></flag>
+    <flag name="gtk3">Enable support for <pkg>x11-libs/gtk+</pkg>:3</flag>
+    <flag name="skk">Enable support for <pkg>app-i18n/skk-jisyo</pkg></flag>
+  </use>
+  <upstream>
+    <remote-id type="github">uim/uim</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/app-misc/bijiben/bijiben-3.16.2.ebuild b/app-misc/bijiben/bijiben-3.16.2.ebuild
index 3b7abaa9aeca..8ad723516a49 100644
--- a/app-misc/bijiben/bijiben-3.16.2.ebuild
+++ b/app-misc/bijiben/bijiben-3.16.2.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Bijiben"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE=""
 
 # zeitgeist is optional but automagic
diff --git a/app-misc/gnote/gnote-3.16.2.ebuild b/app-misc/gnote/gnote-3.16.2.ebuild
index a040b8f2bf3a..ed6f966a6779 100644
--- a/app-misc/gnote/gnote-3.16.2.ebuild
+++ b/app-misc/gnote/gnote-3.16.2.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Gnote"
 
 LICENSE="GPL-3+ FDL-1.1"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="debug X"
 
 # Automagic glib-2.32 dep
diff --git a/app-misc/jot/jot-9.0-r1.ebuild b/app-misc/jot/jot-9.0-r1.ebuild
index 0618eb8e45e3..284d8fe4a68c 100644
--- a/app-misc/jot/jot-9.0-r1.ebuild
+++ b/app-misc/jot/jot-9.0-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://www.mit.edu/afs/athena/system/rhlinux/athena-${PV}/free/SRPMS/at
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
+KEYWORDS="amd64 ppc x86"
 IUSE=""
 
 S="${WORKDIR}/athena-${P}"
diff --git a/app-misc/jot/jot-9.0.ebuild b/app-misc/jot/jot-9.0.ebuild
deleted file mode 100644
index 1ec5228bff2f..000000000000
--- a/app-misc/jot/jot-9.0.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-inherit rpm
-
-RH_REV=3
-DESCRIPTION="Print out increasing, decreasing, random, or redundant data"
-HOMEPAGE="http://freshmeat.net/projects/bsd-jot/"
-SRC_URI="http://www.mit.edu/afs/athena/system/rhlinux/athena-${PV}/free/SRPMS/athena-${P}-${RH_REV}.src.rpm"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE=""
-
-S="${WORKDIR}/athena-${P}"
-
-src_install() {
-	einstall || die
-}
diff --git a/app-misc/mmv/Manifest b/app-misc/mmv/Manifest
index 94adcdd0ada8..f12a8a11e7e2 100644
--- a/app-misc/mmv/Manifest
+++ b/app-misc/mmv/Manifest
@@ -1,3 +1,2 @@
-DIST mmv_1.01b-15.diff.gz 10613 SHA256 9ad3e3d47510f816b4a18bae04ea75913588eec92248182f85dd09bc5ad2df13 SHA512 965db30f8981a973c93dec14348c451604fe37fbd5576d5eb0e38de8cef21e5b6c9a3560e46725b6beaac2d9722cb9a874f7eb2b5e9d9cdf22e67eb367991550 WHIRLPOOL 4374d053e65c05747509b4a3759b3330e45504b8325ae60f6e70ed67317e5a6383adf334f73e05f2a1ef89b884452169e5a437d583ef402bb4001ee544034210
 DIST mmv_1.01b-18.debian.tar.gz 13463 SHA256 4af5c83cacb27c7720bf65cac9a4f6c1fe698474a716e2df0fbad9181e6844e7 SHA512 3543aff53c67cab00689d4c8b778447c976a7860a569bd51f74534bec8bd3b67b9e12743bd03bc6fda930748abddd12e16f1965686cbce04bd48bf191fc4127b WHIRLPOOL 57dd2ebb1d075f9479d0466cc39f4cf3ebe3e8457b96a56a0f5d1b63c6ada01ec281fcf5e79220e07256aa1edfb046d8ddf75df8ab6c1ac25ff67074c0760ed2
 DIST mmv_1.01b.orig.tar.gz 25656 SHA256 0399c027ea1e51fd607266c1e33573866d4db89f64a74be8b4a1d2d1ff1fdeef SHA512 4bf4e096b930bdde225ba5de761e968af3aed33dc13194b1a1a79078cd27e158b04aae131b5167cf5f844e35355d67359443cd598db22da15a5af06752438917 WHIRLPOOL 318484c12416174535ba6e77929798418943ae521e339a7f68b1b7a488b4058cbe88de019e07b705879597ef04d6c325c15d2869b224827dca6d9519c8772aa5
diff --git a/app-misc/mmv/mmv-1.01b_p15.ebuild b/app-misc/mmv/mmv-1.01b_p15.ebuild
deleted file mode 100644
index ec7fa57ddfe9..000000000000
--- a/app-misc/mmv/mmv-1.01b_p15.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="3"
-
-inherit eutils flag-o-matic toolchain-funcs
-
-DEB_PATCH_VER=${PV#*_p}
-MY_VER=${PV%_p*}
-
-DESCRIPTION="Move/copy/append/link multiple files according to a set of wildcard patterns"
-HOMEPAGE="http://packages.debian.org/unstable/utils/mmv"
-SRC_URI="
-	mirror://debian/pool/main/m/mmv/${PN}_${MY_VER}.orig.tar.gz
-	mirror://debian/pool/main/m/mmv/${PN}_${MY_VER}-${DEB_PATCH_VER}.diff.gz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ppc x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE=""
-
-S="${WORKDIR}"/${PN}-${MY_VER}.orig
-
-src_prepare() {
-	epatch "${DISTDIR}"/${PN}_${MY_VER}-${DEB_PATCH_VER}.diff.gz
-}
-
-src_compile() {
-	# i wonder how this works on other platforms if CFLAGS from makefile are
-	# overridden, see bug #218082
-	[[ ${CHOST} == *-interix* ]] && append-flags -DIS_SYSV -DHAS_RENAME -DHAS_DIRENT
-	[[ ${CHOST} == *-interix* ]] || append-lfs-flags
-
-	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" || die
-}
-
-src_install() {
-	dobin mmv || die
-	dosym mmv /usr/bin/mcp || die
-	dosym mmv /usr/bin/mln || die
-	dosym mmv /usr/bin/mad || die
-
-	doman mmv.1 || die
-	newman mmv.1 mcp.1 || die
-	newman mmv.1 mln.1 || die
-	newman mmv.1 mad.1 || die
-
-	dodoc ANNOUNCE debian/{changelog,control} || die
-}
diff --git a/app-misc/mmv/mmv-1.01b_p18.ebuild b/app-misc/mmv/mmv-1.01b_p18.ebuild
index 582fa4e005f8..2a4ccf8cda92 100644
--- a/app-misc/mmv/mmv-1.01b_p18.ebuild
+++ b/app-misc/mmv/mmv-1.01b_p18.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~ppc x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ppc x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE=""
 
 S="${WORKDIR}"/${PN}-${MY_VER}.orig
diff --git a/app-misc/screen/screen-9999.ebuild b/app-misc/screen/screen-9999.ebuild
index 21051322e812..3038ad6bd944 100644
--- a/app-misc/screen/screen-9999.ebuild
+++ b/app-misc/screen/screen-9999.ebuild
@@ -5,12 +5,9 @@
 EAPI=5
 
 EGIT_REPO_URI="git://git.savannah.gnu.org/screen.git"
-EGIT_BOOTSTRAP="cd src; ./autogen.sh"
-EGIT_SOURCEDIR="${WORKDIR}/${P}" # needed for setting S later on
+EGIT_CHECKOUT_DIR="${WORKDIR}/${P}" # needed for setting S later on
 
-WANT_AUTOCONF="2.5"
-
-inherit eutils flag-o-matic toolchain-funcs pam autotools user git-2
+inherit eutils flag-o-matic toolchain-funcs pam autotools user git-r3
 
 DESCRIPTION="Full-screen window manager that multiplexes physical terminals between several processes"
 HOMEPAGE="https://www.gnu.org/software/screen/"
@@ -70,15 +67,12 @@ src_configure() {
 		--with-sys-screenrc="${EPREFIX}/etc/screenrc" \
 		--with-pty-mode=0620 \
 		--with-pty-group=5 \
-		--enable-rxvt_osc \
 		--enable-telnet \
-		--enable-colors256 \
 		$(use_enable pam)
 }
 
 src_compile() {
 	LC_ALL=POSIX emake comm.h term.h
-	emake osdef.h
 
 	emake -C doc screen.info
 	default
@@ -115,7 +109,7 @@ src_install() {
 	pamd_mimic_system screen auth
 
 	dodoc \
-		README ChangeLog INSTALL TODO NEWS* patchlevel.h \
+		README ChangeLog INSTALL TODO NEWS* \
 		doc/{FAQ,README.DOTSCREEN,fdpat.ps,window_to_display.ps}
 
 	doman doc/screen.1
diff --git a/app-misc/tracker/tracker-1.4.1.ebuild b/app-misc/tracker/tracker-1.4.1.ebuild
index c4dcd4fff9fd..1406229fc511 100644
--- a/app-misc/tracker/tracker-1.4.1.ebuild
+++ b/app-misc/tracker/tracker-1.4.1.ebuild
@@ -19,7 +19,7 @@ IUSE="cue eds elibc_glibc exif ffmpeg firefox-bookmarks flac gif gsf
 gstreamer gtk iptc +iso +jpeg libav +miner-fs mp3 nautilus networkmanager
 pdf playlist rss stemmer test thunderbird +tiff upnp-av upower +vorbis +xml xmp xps"
 
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 
 REQUIRED_USE="
 	?? ( gstreamer ffmpeg )
diff --git a/app-misc/vifm/vifm-0.8.ebuild b/app-misc/vifm/vifm-0.8.ebuild
index c3ebaca8a34e..78e5318df49a 100644
--- a/app-misc/vifm/vifm-0.8.ebuild
+++ b/app-misc/vifm/vifm-0.8.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/vifm/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~s390 ~x86"
+KEYWORDS="amd64 ppc ~s390 ~x86"
 IUSE="X developer +extended-keys gtk +magic vim vim-syntax"
 
 DEPEND="
diff --git a/app-office/gnucash/Manifest b/app-office/gnucash/Manifest
index 3112de3a938a..e488a91ae6cf 100644
--- a/app-office/gnucash/Manifest
+++ b/app-office/gnucash/Manifest
@@ -1,2 +1,2 @@
-DIST gnucash-2.6.5.tar.bz2 12997511 SHA256 b1b1a943a322e7bf7afb0c2202f491560d4734a2036438bf9820378c34203d65 SHA512 f45daa5a894f8cbe9ea552ccb354b08a4967f0a0f14595b871169a2a48495664a06e0f3dd81b6148b261418b67b76ae4e0ee3e72ec52ff3016c7f15523862538 WHIRLPOOL 38bdd5afec3337f929e4694dea072675baab86a68b730c0fc96c07c7287b0765140514ffd2c241784d857e7eba3d7bdbbf2b3c17f99d881d58095d68282b5d47
 DIST gnucash-2.6.6.tar.bz2 13303707 SHA256 2337c791511ec35ca1ab207bac5f80dd5764df6029adf46a15154df370c97180 SHA512 bfb6f0e444463bd69f7e31f1dc8ff0ea9ba1c103c5d7d0a7a985c765ca17680c9d821bfe39474e2c9d71b655aeba78c1ec6f97f7a8ce8731cfdc335b683e830f WHIRLPOOL 2d917c0ab2f6756ed5205826b881467366b92d7cd1365b4d2531a8432e71fec46f5323fcb017647317cd7788e044fa4601f5179cfef4d65ed86e247eb126cd35
+DIST gnucash-2.6.7.tar.bz2 13529748 SHA256 6c15b12eeddc095d6926d9ea84d885c20b8f52781602c15aa3f672a1f7e2beef SHA512 a5711d5d6b89e9c44a28b9733dd185ed9afbe8d2c719675ced9d3e56ecdb03b62313faa5fee42cff70869baf4a3c29d4f69abc54967e46c3aa7ad766fc5a489d WHIRLPOOL b6aff7d48557a4619bfe27c2088ede6c3d2e6820947f457d2db42bc763d5dc24011afd28eb94e66f7a6f5405f2e44f03ae8a43e2fe7679502ea38ad2bee0e36a
diff --git a/app-office/gnucash/gnucash-2.6.5.ebuild b/app-office/gnucash/gnucash-2.6.5.ebuild
deleted file mode 100644
index 8a7d21015e7f..000000000000
--- a/app-office/gnucash/gnucash-2.6.5.ebuild
+++ /dev/null
@@ -1,120 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="no"
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools eutils gnome2 python-single-r1
-
-DESCRIPTION="A personal finance manager"
-HOMEPAGE="http://www.gnucash.org/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
-IUSE="chipcard debug +doc hbci mysql ofx postgres python quotes sqlite"
-
-# FIXME: rdepend on dev-libs/qof when upstream fix their mess (see configure.ac)
-# libdbi version requirement for sqlite taken from bug #455134
-RDEPEND="
-	>=app-crypt/libsecret-0.18
-	>=dev-libs/glib-2.32.0:2
-	>=dev-libs/popt-1.5
-	>=dev-libs/libxml2-2.5.10:2
-	dev-libs/libxslt
-	>=dev-scheme/guile-1.8.3:12[deprecated,regex]
-	dev-scheme/guile-www
-	gnome-base/libgnomecanvas
-	>=net-libs/webkit-gtk-1.2:2
-	>=sys-libs/zlib-1.1.4
-	>=x11-libs/gtk+-2.24:2
-	>=x11-libs/goffice-0.7.0:0.8[gnome]
-	x11-libs/pango
-	ofx? ( >=dev-libs/libofx-0.9.1 )
-	hbci? ( >=net-libs/aqbanking-5[gtk,ofx?]
-		sys-libs/gwenhywfar[gtk]
-		chipcard? ( sys-libs/libchipcard )
-	)
-	python? ( ${PYTHON_DEPS} )
-	quotes? ( dev-perl/DateManip
-		>=dev-perl/Finance-Quote-1.11
-		dev-perl/HTML-TableExtract )
-	sqlite? ( >=dev-db/libdbi-0.9.0
-		>=dev-db/libdbi-drivers-0.9.0[sqlite] )
-	postgres? ( dev-db/libdbi dev-db/libdbi-drivers[postgres] )
-	mysql? ( dev-db/libdbi dev-db/libdbi-drivers[mysql] )
-"
-DEPEND="${RDEPEND}
-	>=app-text/scrollkeeper-0.3
-	virtual/pkgconfig
-	dev-util/intltool
-	gnome-base/gnome-common
-	sys-devel/libtool
-"
-
-PDEPEND="doc? ( >=app-doc/gnucash-docs-2.2.0 )"
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	# Skip test that needs some locales to be present
-	sed -i -e '/test_suite_gnc_date/d' src/libqof/qof/test/test-qof.c || die
-
-	eautoreconf
-	gnome2_src_prepare
-}
-
-src_configure() {
-	local myconf
-
-	DOCS="doc/README.OFX doc/README.HBCI"
-
-	if use sqlite || use mysql || use postgres ; then
-		myconf+=" --enable-dbi"
-	else
-		myconf+=" --disable-dbi"
-	fi
-
-	# guile wrongly exports LDFLAGS as LIBS which breaks modules
-	# Filter until a better ebuild is available, bug #202205
-	local GUILE_LIBS=""
-	local lib
-	for lib in $(guile-config link); do
-		if [ "${lib#-Wl}" = "$lib" ]; then
-			GUILE_LIBS="$GUILE_LIBS $lib"
-		fi
-	done
-
-	# gtkmm is experimental and shouldn't be enabled, upstream bug #684166
-	gnome2_src_configure \
-		$(use_enable debug) \
-		$(use_enable ofx) \
-		$(use_enable hbci aqbanking) \
-		$(use_enable python) \
-		--disable-doxygen \
-		--disable-gtkmm \
-		--enable-locale-specific-tax \
-		--disable-error-on-warning \
-		 GUILE_LIBS="${GUILE_LIBS}" ${myconf}
-}
-
-src_test() {
-	unset DBUS_SESSION_BUS_ADDRESS
-	GUILE_WARN_DEPRECATED=no \
-	GNC_DOT_DIR="${T}"/.gnucash \
-	emake check
-}
-
-src_install() {
-	# Parallel installation fails from time to time, bug #359123
-	MAKEOPTS="${MAKEOPTS} -j1" gnome2_src_install GNC_DOC_INSTALL_DIR=/usr/share/doc/${PF}
-
-	rm -rf "${ED}"/usr/share/doc/${PF}/{examples/,COPYING,INSTALL,*win32-bin.txt,projects.html}
-	mv "${ED}"/usr/share/doc/${PF} "${T}"/cantuseprepalldocs || die
-	dodoc "${T}"/cantuseprepalldocs/*
-}
diff --git a/app-office/gnucash/gnucash-2.6.7.ebuild b/app-office/gnucash/gnucash-2.6.7.ebuild
new file mode 100644
index 000000000000..acf91da6ab6b
--- /dev/null
+++ b/app-office/gnucash/gnucash-2.6.7.ebuild
@@ -0,0 +1,120 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+PYTHON_COMPAT=( python2_7 )
+
+inherit autotools eutils gnome2 python-single-r1
+
+DESCRIPTION="A personal finance manager"
+HOMEPAGE="http://www.gnucash.org/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="amd64 ~ppc ~ppc64 ~x86"
+IUSE="chipcard debug +doc gnome-keyring hbci mysql ofx postgres python quotes sqlite"
+
+# FIXME: rdepend on dev-libs/qof when upstream fix their mess (see configure.ac)
+# libdbi version requirement for sqlite taken from bug #455134
+RDEPEND="
+	>=dev-libs/glib-2.32.0:2
+	>=dev-libs/popt-1.5
+	>=dev-libs/libxml2-2.5.10:2
+	dev-libs/libxslt
+	>=dev-scheme/guile-1.8.3:12[deprecated,regex]
+	dev-scheme/guile-www
+	gnome-base/libgnomecanvas
+	>=net-libs/webkit-gtk-1.2:2
+	>=sys-libs/zlib-1.1.4
+	>=x11-libs/gtk+-2.24:2
+	>=x11-libs/goffice-0.7.0:0.8[gnome]
+	x11-libs/pango
+	gnome-keyring? ( >=app-crypt/libsecret-0.18 )
+	ofx? ( >=dev-libs/libofx-0.9.1 )
+	hbci? ( >=net-libs/aqbanking-5[gtk,ofx?]
+		sys-libs/gwenhywfar[gtk]
+		chipcard? ( sys-libs/libchipcard )
+	)
+	python? ( ${PYTHON_DEPS} )
+	quotes? ( dev-perl/DateManip
+		>=dev-perl/Finance-Quote-1.11
+		dev-perl/HTML-TableExtract )
+	sqlite? ( >=dev-db/libdbi-0.9.0
+		>=dev-db/libdbi-drivers-0.9.0[sqlite] )
+	postgres? ( dev-db/libdbi dev-db/libdbi-drivers[postgres] )
+	mysql? ( dev-db/libdbi dev-db/libdbi-drivers[mysql] )
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	dev-util/intltool
+	gnome-base/gnome-common
+	sys-devel/libtool
+"
+PDEPEND="doc? ( >=app-doc/gnucash-docs-2.2.0 )"
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	# Skip test that needs some locales to be present
+	sed -i -e '/test_suite_gnc_date/d' src/libqof/qof/test/test-qof.c || die
+
+	eautoreconf
+	gnome2_src_prepare
+}
+
+src_configure() {
+	local myconf
+
+	DOCS="doc/README.OFX doc/README.HBCI"
+
+	if use sqlite || use mysql || use postgres ; then
+		myconf+=" --enable-dbi"
+	else
+		myconf+=" --disable-dbi"
+	fi
+
+	# guile wrongly exports LDFLAGS as LIBS which breaks modules
+	# Filter until a better ebuild is available, bug #202205
+	local GUILE_LIBS=""
+	local lib
+	for lib in $(guile-config link); do
+		if [ "${lib#-Wl}" = "$lib" ]; then
+			GUILE_LIBS="$GUILE_LIBS $lib"
+		fi
+	done
+
+	# gtkmm is experimental and shouldn't be enabled, upstream bug #684166
+	gnome2_src_configure \
+		$(use_enable debug) \
+		$(use_enable gnome-keyring password-storage) \
+		$(use_enable ofx) \
+		$(use_enable hbci aqbanking) \
+		$(use_enable python) \
+		--disable-doxygen \
+		--disable-gtkmm \
+		--enable-locale-specific-tax \
+		--disable-error-on-warning \
+		 GUILE_LIBS="${GUILE_LIBS}" ${myconf}
+}
+
+src_test() {
+	unset DBUS_SESSION_BUS_ADDRESS
+	GUILE_WARN_DEPRECATED=no \
+	GNC_DOT_DIR="${T}"/.gnucash \
+	emake check
+}
+
+src_install() {
+	# Parallel installation fails from time to time, bug #359123
+	MAKEOPTS="${MAKEOPTS} -j1" gnome2_src_install GNC_DOC_INSTALL_DIR=/usr/share/doc/${PF}
+
+	rm -rf "${ED}"/usr/share/doc/${PF}/{examples/,COPYING,INSTALL,*win32-bin.txt,projects.html}
+	mv "${ED}"/usr/share/doc/${PF} "${T}"/cantuseprepalldocs || die
+	dodoc "${T}"/cantuseprepalldocs/*
+}
diff --git a/app-office/gnumeric/gnumeric-1.12.23.ebuild b/app-office/gnumeric/gnumeric-1.12.23.ebuild
index fce3cffa6879..c3a6f8b43da0 100644
--- a/app-office/gnumeric/gnumeric-1.12.23.ebuild
+++ b/app-office/gnumeric/gnumeric-1.12.23.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="http://www.gnumeric.org/"
 LICENSE="GPL-2"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 
 IUSE="+introspection libgda perl python"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/app-office/libreoffice-bin-debug/libreoffice-bin-debug-4.4.5.2.ebuild b/app-office/libreoffice-bin-debug/libreoffice-bin-debug-4.4.5.2.ebuild
index de1531ffeb2d..98db667c2e91 100644
--- a/app-office/libreoffice-bin-debug/libreoffice-bin-debug-4.4.5.2.ebuild
+++ b/app-office/libreoffice-bin-debug/libreoffice-bin-debug-4.4.5.2.ebuild
@@ -47,7 +47,7 @@ SRC_URI="
 IUSE="gnome java kde"
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
+KEYWORDS="-* amd64 x86"
 
 RDEPEND="=app-office/${PN/-debug}-${PVR}[gnome=,java=,kde=]"
 
diff --git a/app-office/libreoffice-bin/libreoffice-bin-4.4.5.2.ebuild b/app-office/libreoffice-bin/libreoffice-bin-4.4.5.2.ebuild
index 4861a30b2f64..e2c1e9bcd64c 100644
--- a/app-office/libreoffice-bin/libreoffice-bin-4.4.5.2.ebuild
+++ b/app-office/libreoffice-bin/libreoffice-bin-4.4.5.2.ebuild
@@ -55,7 +55,7 @@ SRC_URI="
 IUSE="gnome java kde"
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
+KEYWORDS="-* amd64 x86"
 
 BIN_COMMON_DEPEND="
 	=app-text/libexttextcat-3.4*
diff --git a/app-office/libreoffice-l10n/Manifest b/app-office/libreoffice-l10n/Manifest
index bd63db59b09d..3396acb33e80 100644
--- a/app-office/libreoffice-l10n/Manifest
+++ b/app-office/libreoffice-l10n/Manifest
@@ -377,7 +377,7 @@ DIST LibreOffice_5.0.1_Linux_x86_rpm_helppack_om.tar.gz 7934496 SHA256 1f84c621a
 DIST LibreOffice_5.0.1_Linux_x86_rpm_helppack_pl.tar.gz 7933529 SHA256 6762e3aa61d1dea772c89e8f95fbacbcf80035d38e2e6bf19e9c78ff1428df04 SHA512 d03fdeade88f9375c6f5e0f663b2d95e57c8c72ec8cd690aa63df7cf2cc2505104f9691d27c0f3924c6a8736616ae1061c33d3573e361d4d7352823569cedbb4 WHIRLPOOL a68b1980ec5f40303d4cf84a4f76dc9d23f8b11b06579676d6cbb2c72c525888c20bbbd69419947d679b9cac049af32061fec202228881b69b079a8b8fda7516
 DIST LibreOffice_5.0.1_Linux_x86_rpm_helppack_pt-BR.tar.gz 7681612 SHA256 1d9889ea72fea5f750302e70ffd0e99a25caa9d28603e3d46fd40742afd132f5 SHA512 3836fd2a772c7051438cfa85671ba00ba417dc7f8f3090a52a0986647dd7f070b160f9fbf0aea43b63fd4af0b0017d57db7ff2dfa58c4860fd687121c8183812 WHIRLPOOL 3d9d873c15fd491f55aa535a5166b0926a9baeab34a5c37560edba52c221dcd54bf8b3233328e93cc0599c7c37217a2beb1b7932827bf0bb33377f75b335508c
 DIST LibreOffice_5.0.1_Linux_x86_rpm_helppack_pt.tar.gz 7613578 SHA256 854515fe868d5023df4a68dab62b9e425c10ae2b1606bee5470665c1029556bd SHA512 13e51ae0e33bc3cac458fe448eb9fa48db9f3a70f10f8673a24c2a6a1d7fad4c2394277e550f876bd8e1dea7c421bfe4f8848807c4d3651b8e36c89a9038e5a8 WHIRLPOOL 601e79100d8eee159f5ee2cabce487d9e06844202aaf0b92fdedd664988443831543a45196f2188ebf5df7f5ea61cd0a032d2289f2065f152191c32383230604
-DIST LibreOffice_5.0.1_Linux_x86_rpm_helppack_ru.tar.gz 17602 SHA256 622d647019594255d1441c2f14f70644623a82832242647cf145b4d6e751c359 SHA512 bd09c544e75c279eacbbcc3cc2f9133abedcb0099cf53574ed25f7239d57a5e03f84aa47f5532f26cce92d2ec0a7197cc17a3aebf456fd3944faf60d82b15828 WHIRLPOOL f93982046be8cd08868cd7c740128ef13a737c7b2288ab953044df1446bec181d5f52e1bc86785359f23bf0c1b9c51257e3e033d9a9af2883302777c4a9e1802
+DIST LibreOffice_5.0.1_Linux_x86_rpm_helppack_ru.tar.gz 8347026 SHA256 7ed6ca1bf55958e283d98f587e2640c8ffbcecfb4710c2e78a7c25e452a4d70f SHA512 bc86752692e99011508c35f7787b9f2dd50855c7bd1a032edf02e37bff5c21bd4f0ec7269f99ca565f23d59499330eb03a489075262aaef8f9eef3b63d3df6e2 WHIRLPOOL 60a33d8aaa12a2378a01825b65c230893202a8967435e35c09e0d4e7e674bf644c27b2049e5a1b871a2a573274308f8b1523253dc1708493966770280991860b
 DIST LibreOffice_5.0.1_Linux_x86_rpm_helppack_si.tar.gz 7160600 SHA256 2093dca78e0c9373b6b383ced1d2713d8a0c469109ba7a8a236a6c89cf304ef5 SHA512 25a44b9c9976bba35dcb0a232411a837b5c2026a22cfa299517556fcd603ff1220a1e06b120ca23379a0bb21070ef3f6310fade113238d8433a67992ffdebbf0 WHIRLPOOL 9e37ebc4e20b47ce08c9bd9e2779e5dcb4ae08012f5f3e873f808e38fa476fafd4fd47c4438df3d4753c410bd71b87759331fa4d781c72868a08a9123e21001d
 DIST LibreOffice_5.0.1_Linux_x86_rpm_helppack_sk.tar.gz 7436233 SHA256 594346c316157ecb13cf4dd719eddc8babfd63e52918315e4126d964b8ba6bdf SHA512 11abe10f33309e11115ac5342f77c79744a440b2abb7eb32a058a81edd117b7a40aee9065cd73ac3d412968efb2f090310b4e37cf797356981b1b04d41b399b0 WHIRLPOOL 65e5272a0c3a881862f67d31a1d94a097985a82c36dccbe520763aee8aca12c7033b51f28d1c88ab26ad2d6a059eb116bcd728abfe5bf8b14f53242527054770
 DIST LibreOffice_5.0.1_Linux_x86_rpm_helppack_sl.tar.gz 7674908 SHA256 06b89eccac68087418d73663dcda68eacfb9371472497a56a86d77cdfaec982f SHA512 575b60bff8f1bad6b15280b1cb94100ba19220014c81d5667eb5db646e953e183de8809cfafdb71d79bd5e9708c22d8e9dbf4cc383d7ef33c4ec21e5f58e4694 WHIRLPOOL 801191ccd6ed3375f6be12717ea288904638406f90236cfb6d4da2aed53bd077de6861bd229db4638ce619e5ed391eb90b58a38a130f7936a7b1e06929930c5d
@@ -392,7 +392,7 @@ DIST LibreOffice_5.0.1_Linux_x86_rpm_helppack_zh-CN.tar.gz 10641849 SHA256 1f9e2
 DIST LibreOffice_5.0.1_Linux_x86_rpm_helppack_zh-TW.tar.gz 10698600 SHA256 d64d1e0c3a7f2638ed025777011c58cdf67f575a8087e0b67be5b3668973fad3 SHA512 f2f2f47c6f411741fe74685962cfe3ce2293a863493a759658d9fca7b6db6e3afa322538134f8cb0c63fe6a160110cce212e07ac45e3da155f4433bb9f519fa4 WHIRLPOOL 1d2a478f7ded9e954691938fafe3db36ecf116bcf3d5ce8e38c22113398ce9ad52e67d6f55da832180df6f53cf5f7c4ee5a89be485e7e50476d5e8f2c8f38b8f
 DIST LibreOffice_5.0.1_Linux_x86_rpm_langpack_af.tar.gz 1113426 SHA256 c76daa689630b9fdb383c99063cfb8380b3cd4de289c5f7ce343d204ae25c23c SHA512 78912b00f2fa4a99d0cf32df2594fc661c093d18309a86f4819886402ed7f66bbe2a16364c4a352fa6b3bf2d712f1aa6d16717a7f14d731545a71d00fcf9ab96 WHIRLPOOL c3442062f1ef32ef7a22ee10a5f51eb324024f0dae6bbc412bc264d0f90bf8ee85f324029c1385f8080526ed5749a143d2254663613d64c704c0f1285911a12a
 DIST LibreOffice_5.0.1_Linux_x86_rpm_langpack_am.tar.gz 519201 SHA256 dcba55469175f86dba9f4f45cf813a3f178f02bd152da4687cf321ee1ed29749 SHA512 3f6aca1b28d11175652d63dfe55612e04c486217878f08d1d51108b2f8aa7fd7406a3559e4f50827b602934d05aa55f8a07b1cef2c18bc11954cfd9d5e2c614d WHIRLPOOL e9ac40ef4cc586ca10587b0a88a357305e2f2d923aa6cdfe68f341c270cc0960a4b202f3bb80e4fdc872bfcb5f2e7d0f1d4ea6684672ca410ee750904235e5b1
-DIST LibreOffice_5.0.1_Linux_x86_rpm_langpack_ar.tar.gz 540246 SHA256 59fdef3dbb48aa4d598f6f035cef9220776aa92b1084cedc958a4156a8006661 SHA512 525bde0be10a15e83a9ef718e8dc7ce3c1279bfbc31b7ec705e5dbd912e8dd37adbb28189b8cc11ae2dc0b47e635d783e4f555de0331c693944d7bb20dfbfa24 WHIRLPOOL 4fb7876b88c1b90dd36cbc97b7fc55d1e017b921a7b7d6bffda35343e4af3e57fcee7b4de8c2406d1d7a37ddeb70e74ace3f9c747e13ead5ee8504a6dfe62858
+DIST LibreOffice_5.0.1_Linux_x86_rpm_langpack_ar.tar.gz 2260964 SHA256 cc6728eeb5bb268ad2f404f0c6ea84db258e40f1215f2d58f28e9ef1d2c66875 SHA512 7461e957c6fafc1ffe21bdd29e271f432b6960bbb667863fc15563635145c48bcb01bbce0ab70abf6006efba81827f47c64b8b546b31ad0b7da4a1a1bd5f2ea7 WHIRLPOOL 661c498887e6fdd13c95e6a98a3a205be99b58d8ed67ebd31395c59b04d87872db3f630d4efb3cab15c44b216346482bd48839104a18ebfd50afcb3365c924ed
 DIST LibreOffice_5.0.1_Linux_x86_rpm_langpack_as.tar.gz 546397 SHA256 339640a82d4c20fc2d481ac60cff8b2d15af18b5ccda9c53289c2c8ef88a99ce SHA512 a7250ddb2a1cf54a8e469a68a1257981583442bee792b385b7a0b9fb7744f86c650b1159591bd569e12ed17520eff6d72d705dfd0a8a8bd9ce6d77f017f1e6a6 WHIRLPOOL 720030b78f1abd7961c24d09c7b8796343e1390b28f944dfb6a943fb2288e7f13c2cdf4258415ea4a2f4ed32ef6e0783b12206d1b51bd1e76e6c415f78dfde59
 DIST LibreOffice_5.0.1_Linux_x86_rpm_langpack_ast.tar.gz 502005 SHA256 b1715449ae992c69f548566b09101c52211fd63ba93159951e9d97de6e5b5ec3 SHA512 f174c0597ef894702b880c07113e910d63872791ce2a592b18d2f7c50aa1531fa1c042fa33203d17ac434cd62df5f7c7142bc3f2cfbf7ce0d3e7a4b6a969f6e7 WHIRLPOOL e484da2142fa5c872db3b250deff661e4a347db93d4926b13184d0baabee83b39d58d82f594034b4f8b9fc64605d225c34dda07c6a48482a36b66078c26c84fb
 DIST LibreOffice_5.0.1_Linux_x86_rpm_langpack_be.tar.gz 882938 SHA256 b71d317ccaaeae8ac4e4d55ab9a8c1f49cc21b0d659f693ee4c43096aa80ae41 SHA512 4d2600184ad76b8a37ce8e4801618a0cba7629c3ba77567baeaf23b04bfc8aa5d2442314dbe30da4a86ac1bb20d6b6b737458d7eb34249ed712e51d6dc30f28b WHIRLPOOL 41b2162a0890bea109fbf947d80bf10e76ae492bbe56e721d8a281f4c8c22f59d51b6e740a9fb4743f003f944e8d0df694c2d403026793125255a8fb76b9fe8a
diff --git a/app-office/libreoffice-l10n/libreoffice-l10n-4.4.5.2.ebuild b/app-office/libreoffice-l10n/libreoffice-l10n-4.4.5.2.ebuild
index dd5266c1c33f..054b53fa7bcc 100644
--- a/app-office/libreoffice-l10n/libreoffice-l10n-4.4.5.2.ebuild
+++ b/app-office/libreoffice-l10n/libreoffice-l10n-4.4.5.2.ebuild
@@ -14,7 +14,7 @@ BASE_SRC_URI="http://download.documentfoundation.org/${PN/-l10n/}/stable/${MY_PV
 
 LICENSE="|| ( LGPL-3 MPL-1.1 )"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux"
 IUSE="offlinehelp"
 
 #
diff --git a/app-office/libreoffice-l10n/libreoffice-l10n-5.0.1.2.ebuild b/app-office/libreoffice-l10n/libreoffice-l10n-5.0.1.2.ebuild
index 4df68ad0c431..beacbf0064c7 100644
--- a/app-office/libreoffice-l10n/libreoffice-l10n-5.0.1.2.ebuild
+++ b/app-office/libreoffice-l10n/libreoffice-l10n-5.0.1.2.ebuild
@@ -14,8 +14,7 @@ BASE_SRC_URI="http://download.documentfoundation.org/${PN/-l10n/}/stable/${MY_PV
 
 LICENSE="|| ( LGPL-3 MPL-1.1 )"
 SLOT="0"
-#KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-KEYWORDS=""
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
 IUSE="offlinehelp"
 
 #
diff --git a/app-office/libreoffice/libreoffice-4.4.5.2.ebuild b/app-office/libreoffice/libreoffice-4.4.5.2.ebuild
index 534142975b39..24f0563ac1e6 100644
--- a/app-office/libreoffice/libreoffice-4.4.5.2.ebuild
+++ b/app-office/libreoffice/libreoffice-4.4.5.2.ebuild
@@ -90,7 +90,7 @@ unset lo_xt
 LICENSE="|| ( LGPL-3 MPL-1.1 )"
 SLOT="0"
 [[ ${PV} == *9999* ]] || \
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux"
 
 COMMON_DEPEND="
 	${PYTHON_DEPS}
diff --git a/app-office/libreoffice/libreoffice-5.0.1.2.ebuild b/app-office/libreoffice/libreoffice-5.0.1.2.ebuild
index 5cb165c231bf..47bf9d130a94 100644
--- a/app-office/libreoffice/libreoffice-5.0.1.2.ebuild
+++ b/app-office/libreoffice/libreoffice-5.0.1.2.ebuild
@@ -90,8 +90,7 @@ unset lo_xt
 LICENSE="|| ( LGPL-3 MPL-1.1 )"
 SLOT="0"
 [[ ${PV} == *9999* ]] || \
-KEYWORDS=""
-#KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
 
 COMMON_DEPEND="
 	${PYTHON_DEPS}
diff --git a/app-office/pinpoint/Manifest b/app-office/pinpoint/Manifest
index 8a8d57ada897..bcd986fd67b5 100644
--- a/app-office/pinpoint/Manifest
+++ b/app-office/pinpoint/Manifest
@@ -1 +1,2 @@
+DIST pinpoint-0.1.6.tar.xz 773492 SHA256 812a6e49ccd8bcd6cd0927fda98ceb0f2bafb1f18246bd2d75ea96c3c971f34b SHA512 5db48b64eb69fe677b5a4c226e989ce6eaea483396de82fdd644e4c4ed238ad5fd11f956ed6ffd1badbdfa8c9d24e9ec23375572360094721135c3b6a8347c27 WHIRLPOOL de1749d53b1512e0af761ef7457f01975b90a3301bed1b9e53a267349358b849be1f04d9a74aef98b02a6ddbf200c1ecd7dbe466ed9a207f5a1659a311cb0e57
 DIST pinpoint-215ccad331a39c6e95d173938fcfffe6eb4d75d6.tar.xz 708020 SHA256 1303581f09ff6414269fe0642f7ce51094ebc5cee5101ef5b3113054da0bc8e9 SHA512 efbc711e034a968b104cca669fedaae8c1f088f598996843a65849f632ebdbff3df8d36225852b24327c26e2b972b1c5097775531b23ebc3eedf62415346f27e WHIRLPOOL 1c80ee81257c42b10ab860eabd4a95c61a9980b80cfb901ce167e70cf0046586b74e3670bffdb4342adfd378fb02c97ecfb1f4ae59d3e0ce09b205f9ef1e7ebd
diff --git a/app-office/pinpoint/pinpoint-0.1.6.ebuild b/app-office/pinpoint/pinpoint-0.1.6.ebuild
new file mode 100644
index 000000000000..d351269cd77d
--- /dev/null
+++ b/app-office/pinpoint/pinpoint-0.1.6.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+GCONF_DEBUG="no"
+
+inherit gnome2
+
+DESCRIPTION="A tool for making hackers do excellent presentations"
+HOMEPAGE="https://wiki.gnome.org/Apps/Pinpoint"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="amd64 ~x86"
+IUSE="+gstreamer +pdf"
+
+# rsvg is used for svg-in-pdf -- clubbing it under pdf for now
+RDEPEND="
+	>=media-libs/clutter-1.12:1.0
+	>=dev-libs/glib-2.28:2
+	>=x11-libs/cairo-1.9.4
+	x11-libs/pango
+	x11-libs/gdk-pixbuf:2
+	gstreamer? ( media-libs/clutter-gst:3.0 )
+	pdf? ( gnome-base/librsvg:2 )
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+"
+
+src_configure() {
+	# dax support is disabled because we don't have it in tree yet and it's
+	# experimental
+	gnome2_src_configure \
+		--disable-dax \
+		$(use_enable gstreamer cluttergst) \
+		$(use_enable pdf rsvg)
+}
+
+src_install() {
+	gnome2_src_install
+
+	docompress -x /usr/share/doc/${PF}/examples
+	insinto "/usr/share/doc/${PF}/examples"
+	doins introduction.pin bg.jpg bowls.jpg linus.jpg
+}
diff --git a/app-office/skrooge/Manifest b/app-office/skrooge/Manifest
index 233c341c00ba..3a7b0c125db9 100644
--- a/app-office/skrooge/Manifest
+++ b/app-office/skrooge/Manifest
@@ -1,3 +1,4 @@
 DIST skrooge-1.10.0.tar.bz2 12813255 SHA256 aae15e7abf91a7fc217247d3ae5e672f4215a9090f12389cddab68fe5a175c67 SHA512 ff6137208aaacd01ee4f5a9897f69da1c40b168e9711479d0cc06c8e2f0880b5345d5f452ed5aaf53034bf773d06b7d8810166d751f10e9e90a1204429e0369a WHIRLPOOL 4f10e1f6825325f37e8154fb940df2cbea4b813c2c85a11520778b73d8d44435ccb87687139daa85a2a9d2df56c4beee777404f786df5815eef6ac6e0ed46598
 DIST skrooge-1.12.0.tar.bz2 12993707 SHA256 2407e6e7efa7a0f759c91660a419de2e5ba66f2675cfbee300d12736ef928c1d SHA512 8e913e87692374ecd941ea5f52b64f853942f86e8a5b2dee20d978745eaef69d278505dce5ca6a673cf596230e3946ea85e8a80d1123908a6d9a0a59ae9f67c6 WHIRLPOOL 99e313b72479fc065e1b39890780e0119985c17d03d6ce0b51bf58bd92ade7bde29cfbe2c6e9f588a955b6006c2e91c1ec1ab18ccb8170b035bde2b46aaf7282
+DIST skrooge-1.12.5.tar.xz 11727312 SHA256 8050f8aa767743edf6aad3b4c39bfd8962412e10d9c5578c02d0ce6306a8d3d6 SHA512 5612378a57872065c4ebfff0fabca74a9a0df116fc493643bc01a08c2627a8fb45025221ce5b2123b49d2daffa57ea543312192ecfe96aa3189db7ea4c07fe90 WHIRLPOOL ce99a61896d28699d66f9a17e3ccbccfde0d58cb9106b3919a219dd07a4d5650009e75a965600ec2444e51df43e0d918f1badf484d63b2353838fa490a98be52
 DIST skrooge-2.0.0.tar.xz 10365184 SHA256 50da4dde01b85b2b0ba16902a05664910d4f2dbaa828370ee44c9f89e2efd6b5 SHA512 b3c5ff36e858fd2eef39be0cfb4041e6b16c8aa4562b5fea121e21760a4088f722da789ecdeb5d317446b114ae55dea100970e9c98ae4fe7cac716db674c9a96 WHIRLPOOL 25983d39016b30c73e974b440c1439915b1770e6d041b675efc2eb736ee0cf37999fe2f19028f699f2317714e91da17cb02e9a0d8338c02ac5abbfaa3c09854c
diff --git a/app-office/skrooge/skrooge-1.12.5.ebuild b/app-office/skrooge/skrooge-1.12.5.ebuild
new file mode 100644
index 000000000000..a020b82a3a73
--- /dev/null
+++ b/app-office/skrooge/skrooge-1.12.5.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_LINGUAS="ast bg bs ca ca@valencia cs da de el en_GB eo es et fi fr ga gl hu
+ia it ja ko lt mr ms nb nds nl pl pt pt_BR ro ru sk sv tr ug uk zh_CN zh_TW"
+KDE_HANDBOOK="optional"
+inherit kde4-base
+
+DESCRIPTION="Personal finances manager for KDE4, aiming at being simple and intuitive"
+HOMEPAGE="http://www.skrooge.org/"
+SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="4"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug"
+
+DEPEND="
+	$(add_kdebase_dep kactivities)
+	$(add_kdebase_dep kdepimlibs)
+	app-crypt/qca:2[qt4]
+	dev-db/sqlite:3
+	dev-libs/grantlee:0
+	>=dev-libs/libofx-0.9.1
+	dev-libs/qjson
+	dev-qt/qtsql:4[sqlite]
+"
+RDEPEND="${DEPEND}
+	$(add_kdeapps_dep kde-dev-scripts)
+"
+
+# upstream does not ship tests in releases
+if [[ ${KDE_BUILD_TYPE} != live ]]; then
+	RESTRICT="test"
+fi
+
+DOCS=( AUTHORS CHANGELOG README TODO )
+
+src_test() {
+	local mycmakeargs=(
+		-DSKG_BUILD_TEST=ON
+	)
+	kde4-base_src_test
+}
diff --git a/app-office/wps-office/Manifest b/app-office/wps-office/Manifest
index 53b7efaba7e5..70d6e39525c3 100644
--- a/app-office/wps-office/Manifest
+++ b/app-office/wps-office/Manifest
@@ -1,4 +1,4 @@
-DIST wps-office_9.1.0.4953~a18_amd64.deb 67389656 SHA256 e98793e25261bbd92b465eca53300d36e837adb7abb1a74d5241081f7069669f SHA512 8e2d2aba488f359cc841b7513dfd50cb6abc95a4f4abffe7f8d21d0ec3ad0ac97ac35b602fd60688232847a0ba3942e47571cc6ef63d48b52a1a0f4d0dc68c08 WHIRLPOOL 70dc5382cad1de5f490085af35cac58d9edefbd2acfda37ef6bf1739ea3b047d704871a83a3562d73e425f9de86011cc0ca27a582c1133a7ce8f735c606cbc61
-DIST wps-office_9.1.0.4953~a18_i386.deb 74618126 SHA256 f471094a61c0153ef3f63081430151ebbc7cb7a7b6c191e32867f98567473851 SHA512 9e41e6805527ceb6d8099b5c0bac0d6554ee856844c422529c837a8b713acacf056b8e8c2ff311197730cef4179677be0c0246df94022c7431caa054f440af10 WHIRLPOOL 957d21b3d2fe378cc55a3f8c684c23d5c8247bfb91217ddce80e08812518da32cbdee2edfee850c213bb4b0eff2b6b82d6ace77d4b22304349ee6daf88b74ac1
 DIST wps-office_9.1.0.4961~a18p1_amd64.deb 67419632 SHA256 a37c28648d571571351582e0863d252fc7378da87683c335ee93937a09924a6f SHA512 c828f9cc3383a33db533ada811dd8ca2d80599b8c49d9f1a4fd6080386245aae7a5bc71b2e628cacb2bf9c07b2619417afebf990c6332abb4e23ade2ef0f471f WHIRLPOOL c46cf46a6bd8249c5f6643fbc61c03a374e264a3577e66c32e459b95ae7fe4ef663488657a2c4ba4ef79a32dddbe0ae63515f7efcd898dada698528d74778386
 DIST wps-office_9.1.0.4961~a18p1_i386.deb 74647622 SHA256 e5e6f2813d3e778c68c3bc810ebe95ee862700c7ebf823f10a70dffbea1cd81c SHA512 7d90812e4a5a23f7d55f30c24831f8c17825048da14de6689cd8df9c4ce0cfb62982a05da78cbdc314e174b0e965c04852b104dd4d44bd1b76af45fdeba604d8 WHIRLPOOL 83fe9921bb71e2541790bff44728cd3ae5d557819ee25f103f5b3cb4c4e8d4801d2f402029371b8a58d6bdb5459efe8f5f64777b763070ab79d9690915c2b87d
+DIST wps-office_9.1.0.4975~a19p1_amd64.deb 64716800 SHA256 79a49c9db0c4482c894e3c334e38bd299302e1c4bb4cd387f6a615f9e054a25d SHA512 f92415eb8d652afa6601dbea8f87949ed05d970e610c5aedebda21f2b0386a80bcea164f86e7c680946302d2f953067fc88889891a346353e4f15b547ecb8a3a WHIRLPOOL b8603756e4d3b09691974966d62f80dbe1ec668ae2eb5d99bbe2ad39a6c944de89292ede651143d894fad2631f7686036cd4a281ed5265a09f1af6361d75ea77
+DIST wps-office_9.1.0.4975~a19p1_i386.deb 66646188 SHA256 5b843cfc44d062a6b9c8e3b57ca55ffff5bc76dba7d03bc489275ebda4388122 SHA512 79e7ef4b3a7e906aa1811f5caa9bc056994e64c3abbf4ed9b1866d3d935235a092a55623ee4efe2de9a42b8ffe4737deba9cbc24ca187229a82adc05f30ab238 WHIRLPOOL 44f9e4f170decc923f47996683a070d32c10fee78b586c7fc160d5d7173c4197abe5384f78cad5b35349199dd2a81a4de7793299f16d708f0703182bad6e1264
diff --git a/app-office/wps-office/metadata.xml b/app-office/wps-office/metadata.xml
index a34d262c5b8b..1542b99fb278 100644
--- a/app-office/wps-office/metadata.xml
+++ b/app-office/wps-office/metadata.xml
@@ -6,7 +6,6 @@
 	<name>Pacho Ramos</name>
 </maintainer>
 <use>
-	<flag name="corefonts">Ensure <pkg>media-fonts/corefonts</pkg> is present</flag>
 	<flag name="sharedfonts">Preserve fonts from WPS</flag>
 </use>
 </pkgmetadata>
diff --git a/app-office/wps-office/wps-office-9.1.0.4953_alpha18-r1.ebuild b/app-office/wps-office/wps-office-9.1.0.4953_alpha18-r1.ebuild
deleted file mode 100644
index 96fbbd04e127..000000000000
--- a/app-office/wps-office/wps-office-9.1.0.4953_alpha18-r1.ebuild
+++ /dev/null
@@ -1,142 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit fdo-mime font gnome2-utils unpacker versionator
-
-MY_PV="$(get_version_component_range 1-4)"
-MY_V="$(get_version_component_range 5)"
-
-if [ -z "$(get_version_component_range 6)" ]; then
-	MY_SP=""
-else
-	MY_SP="$(get_version_component_range 6)"
-fi
-
-case ${PV} in
-	*_alpha*)
-		MY_BRANCH=${MY_V/alpha/a}
-		;;
-	*_beta*)
-		MY_BRANCH=${MY_V/beta/b}
-		;;
-	*)
-		die "Invalid value for \${PV}: ${PV}"
-		;;
-esac
-MY_VV=${MY_PV}~${MY_BRANCH}${MY_SP}
-
-DESCRIPTION="WPS Office is an office productivity suite"
-HOMEPAGE="http://linux.wps.cn/"
-
-KEYWORDS="~amd64 ~x86"
-
-SRC_URI="
-	x86? ( http://kdl.cc.ksosoft.com/wps-community/download/${MY_BRANCH}/${PN}_${MY_VV}_i386.deb )
-	amd64? ( http://kdl.cc.ksosoft.com/wps-community/download/${MY_BRANCH}/${PN}_${MY_VV}_amd64.deb )
-"
-
-SLOT="0"
-RESTRICT="strip mirror" # mirror as explained at bug #547372
-LICENSE="WPS-EULA"
-IUSE="corefonts +sharedfonts"
-
-UNBUNDLED_LIBS="
-	dev-qt/qtwebkit:4
-	media-libs/tiff:3
-"
-#	dev-qt/qtcore:4
-#	dev-qt/qtdbus:4
-#	media-libs/phonon
-
-NATIVE_DEPEND="
-	app-arch/bzip2
-	dev-libs/expat
-	dev-libs/glib:2
-	dev-libs/libffi
-	dev-libs/libxml2:2
-	media-libs/fontconfig:1.0
-	media-libs/freetype:2
-	media-libs/glu
-	media-libs/gst-plugins-base:0.10
-	media-libs/gstreamer:0.10
-	media-libs/libpng:1.2
-	virtual/opengl
-	media-libs/tiff:3
-	sys-apps/util-linux
-	sys-libs/zlib
-	x11-libs/libdrm
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-	x11-libs/libXau
-	x11-libs/libxcb
-	x11-libs/libXdamage
-	x11-libs/libXdmcp
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXrender
-	x11-libs/libXxf86vm
-	media-libs/libmng
-	net-print/cups
-"
-RDEPEND="
-	${UNBUNDLED_LIBS}
-	${NATIVE_DEPEND}
-	corefonts? ( media-fonts/corefonts )
-	net-nds/openldap
-	dev-db/sqlite:3
-"
-DEPEND=""
-
-S="${WORKDIR}"
-
-src_prepare() {
-	# Remove bundled libs and rely on system versions if possible
-	# Commented lines are about the libs that cannot be unbundled yet.
-	cd "${S}"/opt/kingsoft/wps-office/office6/
-#	rm -f libQtCore.so* || die
-#	rm -f libQtDBus.so* || die
-#	rm -f libQtNetwork.so || die
-	rm -f libQtWebKit.so* || die
-#	rm -f libphonon.so*
-	rm -f libtiff.so.4* || die
-}
-
-src_install() {
-	exeinto /usr/bin
-	exeopts -m0755
-	doexe "${S}"/usr/bin/wps
-	doexe "${S}"/usr/bin/wpp
-	doexe "${S}"/usr/bin/et
-
-	if ! use sharedfonts; then
-		insinto /opt/kingsoft/wps-office/office6/fonts
-		doins -r "${S}"/usr/share/fonts/wps-office/*
-		rm -rf "${S}"/usr/share/fonts || die
-	fi
-
-	insinto /usr
-	doins -r "${S}"/usr/share
-
-	insinto /
-	doins -r "${S}"/opt
-	fperms 0755 /opt/kingsoft/wps-office/office6/{wps,wpp,et}
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	use sharedfonts && font_pkg_postinst
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-	gnome2_icon_cache_update
-}
diff --git a/app-office/wps-office/wps-office-9.1.0.4953_alpha18.ebuild b/app-office/wps-office/wps-office-9.1.0.4953_alpha18.ebuild
deleted file mode 100644
index eb11afb83ec4..000000000000
--- a/app-office/wps-office/wps-office-9.1.0.4953_alpha18.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit fdo-mime font gnome2-utils unpacker versionator
-
-MY_PV="$(get_version_component_range 1-4)"
-MY_V="$(get_version_component_range 5)"
-
-if [ -z "$(get_version_component_range 6)" ]; then
-	MY_SP=""
-else
-	MY_SP="$(get_version_component_range 6)"
-fi
-
-case ${PV} in
-	*_alpha*)
-		MY_BRANCH=${MY_V/alpha/a}
-		;;
-	*_beta*)
-		MY_BRANCH=${MY_V/beta/b}
-		;;
-	*)
-		die "Invalid value for \${PV}: ${PV}"
-		;;
-esac
-MY_VV=${MY_PV}~${MY_BRANCH}${MY_SP}
-
-DESCRIPTION="WPS Office is an office productivity suite"
-HOMEPAGE="http://linux.wps.cn/"
-
-KEYWORDS="~amd64 ~x86"
-
-SRC_URI="
-	x86? ( http://kdl.cc.ksosoft.com/wps-community/download/${MY_BRANCH}/${PN}_${MY_VV}_i386.deb )
-	amd64? ( http://kdl.cc.ksosoft.com/wps-community/download/${MY_BRANCH}/${PN}_${MY_VV}_amd64.deb )
-"
-
-SLOT="0"
-RESTRICT="strip mirror" # mirror as explained at bug #547372
-LICENSE="WPS-EULA"
-IUSE="corefonts +sharedfonts"
-
-NATIVE_DEPEND="
-		app-arch/bzip2
-		dev-libs/expat
-		dev-libs/glib:2
-		dev-libs/libffi
-		dev-libs/libxml2:2
-		media-libs/fontconfig:1.0
-		media-libs/freetype:2
-		media-libs/glu
-		media-libs/gst-plugins-base:0.10
-		media-libs/gstreamer:0.10
-		media-libs/libpng:1.2
-		virtual/opengl
-		media-libs/tiff:3
-		sys-apps/util-linux
-		sys-libs/zlib
-		x11-libs/libdrm
-		x11-libs/libICE
-		x11-libs/libSM
-		x11-libs/libX11
-		x11-libs/libXau
-		x11-libs/libxcb
-		x11-libs/libXdamage
-		x11-libs/libXdmcp
-		x11-libs/libXext
-		x11-libs/libXfixes
-		x11-libs/libXrender
-		x11-libs/libXxf86vm
-		media-libs/libmng
-		net-print/cups
-"
-RDEPEND="
-	${NATIVE_DEPEND}
-	corefonts? ( media-fonts/corefonts )
-	net-nds/openldap
-	dev-db/sqlite:3
-"
-DEPEND=""
-
-S="${WORKDIR}"
-
-src_install() {
-	exeinto /usr/bin
-	exeopts -m0755
-	doexe "${S}"/usr/bin/wps
-	doexe "${S}"/usr/bin/wpp
-	doexe "${S}"/usr/bin/et
-
-	if ! use sharedfonts; then
-		insinto /opt/kingsoft/wps-office/office6/fonts
-		doins -r "${S}"/usr/share/fonts/wps-office/*
-		rm -rf "${S}"/usr/share/fonts || die
-	fi
-
-	insinto /usr
-	doins -r "${S}"/usr/share
-
-	insinto /
-	doins -r "${S}"/opt
-	fperms 0755 /opt/kingsoft/wps-office/office6/{wps,wpp,et}
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	use sharedfonts && font_pkg_postinst
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-	gnome2_icon_cache_update
-}
diff --git a/app-office/wps-office/wps-office-9.1.0.4975_alpha19_p1.ebuild b/app-office/wps-office/wps-office-9.1.0.4975_alpha19_p1.ebuild
new file mode 100644
index 000000000000..cd7c16fa8240
--- /dev/null
+++ b/app-office/wps-office/wps-office-9.1.0.4975_alpha19_p1.ebuild
@@ -0,0 +1,141 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit fdo-mime font gnome2-utils unpacker versionator
+
+MY_PV="$(get_version_component_range 1-4)"
+MY_V="$(get_version_component_range 5)"
+
+if [ -z "$(get_version_component_range 6)" ]; then
+	MY_SP=""
+else
+	MY_SP="$(get_version_component_range 6)"
+fi
+
+case ${PV} in
+	*_alpha*)
+		MY_BRANCH=${MY_V/alpha/a}
+		;;
+	*_beta*)
+		MY_BRANCH=${MY_V/beta/b}
+		;;
+	*)
+		die "Invalid value for \${PV}: ${PV}"
+		;;
+esac
+MY_VV=${MY_PV}~${MY_BRANCH}${MY_SP}
+
+DESCRIPTION="WPS Office is an office productivity suite"
+HOMEPAGE="http://linux.wps.cn/"
+
+KEYWORDS="~amd64 ~x86"
+
+SRC_URI="
+	x86? ( http://kdl.cc.ksosoft.com/wps-community/download/${MY_BRANCH}/${PN}_${MY_VV}_i386.deb )
+	amd64? ( http://kdl.cc.ksosoft.com/wps-community/download/${MY_BRANCH}/${PN}_${MY_VV}_amd64.deb )
+"
+
+SLOT="0"
+RESTRICT="strip mirror" # mirror as explained at bug #547372
+LICENSE="WPS-EULA"
+IUSE="+sharedfonts"
+
+UNBUNDLED_LIBS="
+"
+#	media-libs/tiff:3
+#	dev-qt/qtwebkit:4
+#	dev-qt/qtcore:4
+#	dev-qt/qtdbus:4
+#	media-libs/phonon
+
+NATIVE_DEPEND="
+	app-arch/bzip2
+	dev-libs/expat
+	dev-libs/glib:2
+	dev-libs/libffi
+	dev-libs/libxml2:2
+	media-libs/fontconfig:1.0
+	media-libs/freetype:2
+	media-libs/glu
+	media-libs/gst-plugins-base:0.10
+	media-libs/gstreamer:0.10
+	media-libs/libpng:1.2
+	virtual/opengl
+	media-libs/tiff:3
+	sys-apps/util-linux
+	sys-libs/zlib
+	x11-libs/libdrm
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	x11-libs/libXau
+	x11-libs/libxcb
+	x11-libs/libXdamage
+	x11-libs/libXdmcp
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXrender
+	x11-libs/libXxf86vm
+	media-libs/libmng
+	net-print/cups
+"
+RDEPEND="
+	${UNBUNDLED_LIBS}
+	${NATIVE_DEPEND}
+	net-nds/openldap
+	dev-db/sqlite:3
+"
+DEPEND=""
+
+S="${WORKDIR}"
+
+src_prepare() {
+	# Remove bundled libs and rely on system versions if possible
+	# Commented lines are about the libs that cannot be unbundled yet.
+	cd "${S}"/opt/kingsoft/wps-office/office6/
+#	rm -f libQtCore.so* || die
+#	rm -f libQtDBus.so* || die
+#	rm -f libQtNetwork.so || die
+#	rm -f libQtWebKit.so* || die
+#	rm -f libphonon.so*
+#	rm -f libtiff.so.4* || die
+}
+
+src_install() {
+	exeinto /usr/bin
+	exeopts -m0755
+	doexe "${S}"/usr/bin/wps
+	doexe "${S}"/usr/bin/wpp
+	doexe "${S}"/usr/bin/et
+
+	if ! use sharedfonts; then
+		insinto /opt/kingsoft/wps-office/office6/fonts
+		doins -r "${S}"/usr/share/fonts/wps-office/*
+		rm -rf "${S}"/usr/share/fonts || die
+	fi
+
+	insinto /usr
+	doins -r "${S}"/usr/share
+
+	insinto /
+	doins -r "${S}"/opt
+	fperms 0755 /opt/kingsoft/wps-office/office6/{wps,wpp,et}
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	use sharedfonts && font_pkg_postinst
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+	gnome2_icon_cache_update
+}
diff --git a/app-portage/elogviewer/Manifest b/app-portage/elogviewer/Manifest
index f41a663925c7..5826d0b420e3 100644
--- a/app-portage/elogviewer/Manifest
+++ b/app-portage/elogviewer/Manifest
@@ -1,3 +1,3 @@
 DIST elogviewer-0.6.2.tar.gz 13904 SHA256 27c879a64824dbee50b6f8ddd387047d4bfe80f101fadf24571ba1b12b135dbf SHA512 dccf4dffb87fefb7d9e0609b3312d63b73c1b9c5933819c38b775b049e222687e9da06e63fe8194560f4bb631fa586b4746af9e0a7575eefa782b57d9c1c6e04 WHIRLPOOL 46d04c684b741d337a7c713b3bb375dc78afc99b573a8f229f9970609c6628a5dd6d30e4112c33c19ef7cc24502a5019079a8d70b47a81f199440643926ef80a
 DIST elogviewer-2.1.tar.gz 14968 SHA256 12e13c1fec1651e57cf39f66231a2cf27af5110c1b4944ac84f76de7f9cc7fe7 SHA512 27a34ce67e16a51055246b7169c11c248310b2a1d987018938094301b2602839e48909e3224f7d791343bb691de8e2f0ca7b00bd1477e2b3b43d61a24b4e688f WHIRLPOOL c4ab91936d147121d3ab34d04d5c74587d5c4f61f56e2e1c35e0ceed5d92537d29642599b8c5215c2405c892b00f244a30c980da9270b3afab61cd083227e85e
-DIST elogviewer-2.5.tar.gz 16055 SHA256 1dc005078ebdc7ed9bfbf28e157a06d3eac500d30baa927cbde80268bb90bb05 SHA512 d37b7e1a38cae3528519c80b13a1064b0be967a19ed6a329c0f461e6c8d7c49fe5bf76f0604c82e735a3f3c7276e9be12309bf6a2f8a8b9c079cc9056a700b09 WHIRLPOOL 105db14806569f1051a422677e2c90e65657201aee5f38858df521bdd3b3fc8847c2ae78f965b41c540cac467825b117e5fcef8fb91a25294fa47befce523692
+DIST elogviewer-2.6.tar.gz 16093 SHA256 299c58bdf0394a485cda7688e0e668fc028f83730841322a8e41a49902aba558 SHA512 1ca43c0ddc7dcab6a9e753644866b0a8ec8ddb5a56d2b8a25ab06f9ee1fc759910ef7af6257c3c98b886700121f078409931aada67b2aad03a43f440a0b8f233 WHIRLPOOL 77e85cb24a6a43d8068eb1aadbdba61c4addcd686398005181735ae552edbab6e62d4eefad6722dc744b166736c164f66e29e2b4db92014cef622592e0d09f77
diff --git a/app-portage/elogviewer/elogviewer-2.5.ebuild b/app-portage/elogviewer/elogviewer-2.5.ebuild
deleted file mode 100644
index 25f10cd210ea..000000000000
--- a/app-portage/elogviewer/elogviewer-2.5.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=(python{2_7,3_3,3_4})
-DISABLE_AUTOFORMATTING=true
-inherit distutils-r1 eutils readme.gentoo
-
-DESCRIPTION="Elog viewer for Gentoo"
-HOMEPAGE="https://sourceforge.net/projects/elogviewer"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND="|| (
-		dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]
-		dev-python/PyQt4[${PYTHON_USEDEP},X]
-		dev-python/pyside[${PYTHON_USEDEP},X] )
-	>=sys-apps/portage-2.1
-	$(python_gen_cond_dep 'dev-python/enum34[${PYTHON_USEDEP}]' python{2_7,3_3})
-	"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-DOC_CONTENTS="In order to use this software, you need to activate
-Portage's elog features.  Required is
-	PORTAGE_ELOG_SYSTEM=\"save\"
-and at least one of
-	PORTAGE_ELOG_CLASSES=\"warn error info log qa\"
-More information on the elog system can be found in /etc/make.conf.example
-
-To operate properly this software needs the directory
-${PORT_LOGDIR:-/var/log/portage}/elog created, belonging to group portage.
-To start the software as a user, add yourself to the portage group."
-
-src_install() {
-	mv elogviewer.py elogviewer
-	dobin elogviewer
-	doman elogviewer.1
-	make_desktop_entry ${PN} ${PN} ${PN} System
-	readme.gentoo_src_install
-}
diff --git a/app-portage/elogviewer/elogviewer-2.6.ebuild b/app-portage/elogviewer/elogviewer-2.6.ebuild
new file mode 100644
index 000000000000..475b5c6e6461
--- /dev/null
+++ b/app-portage/elogviewer/elogviewer-2.6.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=(python{2_7,3_3,3_4})
+DISABLE_AUTOFORMATTING=true
+inherit distutils-r1 eutils readme.gentoo
+
+DESCRIPTION="Elog viewer for Gentoo"
+HOMEPAGE="https://sourceforge.net/projects/elogviewer"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~x86-fbsd"
+IUSE=""
+
+RDEPEND="|| (
+		dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]
+		dev-python/PyQt4[${PYTHON_USEDEP},X]
+		dev-python/pyside[${PYTHON_USEDEP},X] )
+	>=sys-apps/portage-2.1
+	$(python_gen_cond_dep 'dev-python/enum34[${PYTHON_USEDEP}]' python{2_7,3_3})
+	"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+DOC_CONTENTS="In order to use this software, you need to activate
+Portage's elog features.  Required is
+	PORTAGE_ELOG_SYSTEM=\"save\"
+and at least one of
+	PORTAGE_ELOG_CLASSES=\"warn error info log qa\"
+More information on the elog system can be found in /etc/make.conf.example
+
+To operate properly this software needs the directory
+${PORT_LOGDIR:-/var/log/portage}/elog created, belonging to group portage.
+To start the software as a user, add yourself to the portage group."
+
+src_install() {
+	mv elogviewer.py elogviewer
+	dobin elogviewer
+	doman elogviewer.1
+	make_desktop_entry ${PN} ${PN} ${PN} System
+	readme.gentoo_src_install
+}
diff --git a/app-shells/autojump/autojump-22.2.4-r1.ebuild b/app-shells/autojump/autojump-22.2.4-r1.ebuild
new file mode 100644
index 000000000000..be4106d02ec1
--- /dev/null
+++ b/app-shells/autojump/autojump-22.2.4-r1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+
+inherit python-r1 python-utils-r1 vcs-snapshot
+
+DESCRIPTION="change directory command that learns"
+HOMEPAGE="https://github.com/joelthelion/autojump"
+SRC_URI="https://github.com/joelthelion/${PN}/archive/release-v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~ppc ~ppc64"
+IUSE="bash-completion python test zsh-completion"
+
+# Not all tests pass. Need investigation.
+RESTRICT="test"
+RDEPEND="bash-completion? ( >=app-shells/bash-4 )
+	python? ( ${PYTHON_DEPS} )
+	zsh-completion? ( app-shells/zsh app-shells/gentoo-zsh-completions )"
+DEPEND="test? ( dev-python/flake8 dev-python/tox )"
+
+src_prepare() {
+	sed -e "s: \(/etc/profile.d\): \"${EPREFIX}\1\":" \
+		-i bin/autojump.sh || die
+}
+
+src_compile() {
+	true
+}
+
+src_install() {
+	dobin bin/autojump
+
+	insinto /etc/profile.d
+	doins bin/${PN}.sh
+
+	insinto /usr/local/share/"${PN}"/
+	if use bash-completion ; then
+		doins bin/${PN}.bash
+	fi
+
+	if use zsh-completion ; then
+		doins bin/${PN}.zsh
+		insinto /usr/share/zsh/site-functions
+		doins bin/_j
+	fi
+
+	if use python ; then
+		python_foreach_impl python_domodule tools/autojump_ipython.py bin/autojump_argparse.py bin/autojump_data.py bin/autojump_utils.py
+
+		einfo "This tool provides \"j\" for ipython, please add"
+		einfo "\"import autojump_ipython\" to your ipy_user_conf.py."
+	fi
+
+	doman docs/${PN}.1
+	dodoc README.md
+}
diff --git a/app-shells/bash/bash-4.3_p39.ebuild b/app-shells/bash/bash-4.3_p39.ebuild
index d754887ce988..f3dcef62e77f 100644
--- a/app-shells/bash/bash-4.3_p39.ebuild
+++ b/app-shells/bash/bash-4.3_p39.ebuild
@@ -38,7 +38,7 @@ SRC_URI="mirror://gnu/bash/${MY_P}.tar.gz $(patches)"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ~ppc ppc64 s390 sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
 IUSE="afs bashlogger examples mem-scramble +net nls plugins +readline vanilla"
 
 DEPEND=">=sys-libs/ncurses-5.2-r2
diff --git a/app-shells/mksh/mksh-51.ebuild b/app-shells/mksh/mksh-51.ebuild
index 157e6dbaf73a..308d0b24f760 100644
--- a/app-shells/mksh/mksh-51.ebuild
+++ b/app-shells/mksh/mksh-51.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="http://mirbsd.de/mksh"
 SRC_URI="http://www.mirbsd.org/MirOS/dist/mir/mksh/${PN}-R${PV}.tgz"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ppc ~x86 ~amd64-linux ~x86-linux"
 IUSE="static"
 DEPEND="static? ( dev-libs/klibc )"
 RDEPEND=""
diff --git a/app-text/blogc/Manifest b/app-text/blogc/Manifest
index 2769e9377920..53fe9744f1d4 100644
--- a/app-text/blogc/Manifest
+++ b/app-text/blogc/Manifest
@@ -1 +1 @@
-DIST blogc-0.1-beta.3.tar.xz 243128 SHA256 08635fb40fed1d7add059a4b516a2ab0c3f76b80852dbbad91576993d197e6ee SHA512 f7f6d8745e79ee69c44ad36f28b346d18edfbbbeac9aef4bbb5f3e7322024236176e8ab0daf906df221d8657ee05b10d0cdd9547fd07a965fdf0210729fd03f7 WHIRLPOOL 6e34c21aa56b5e133366c89912674af466ad6c9e3b1884c73a5653dc1c968064e7d5f7d4135f2814a66443da2b20348c3e5114a4201407bdbf9ac12474d272a3
+DIST blogc-0.1-beta.4.tar.xz 243064 SHA256 db2e32e50b2cf19c937adb6d02b526c809838d1fca14014baba296ce87daeec3 SHA512 2b786b360a187c7c0cf39d0e0c3429ed3f4298be1b8dff63a9fb5b4110805367e967b7d6df1bd10bffa9a7b9c391f96d1bf2c1518d53c952b06aa9f68a8a61d9 WHIRLPOOL 2ebbed31d5d4a2c97acecd0709742681c329e64ce03ef88b8f7f8247e0bfc8471e22ebfa0e9a44afda9f0dbd35e65804dbbf870e9fa44a68acd4c9559fc44b63
diff --git a/app-text/blogc/blogc-0.1_beta3.ebuild b/app-text/blogc/blogc-0.1_beta4.ebuild
index da3dfcab90be..da3dfcab90be 100644
--- a/app-text/blogc/blogc-0.1_beta3.ebuild
+++ b/app-text/blogc/blogc-0.1_beta4.ebuild
diff --git a/app-text/discount/discount-2.1.8a-r1.ebuild b/app-text/discount/discount-2.1.8a-r1.ebuild
index 51f7a5f415d4..10467dc60419 100644
--- a/app-text/discount/discount-2.1.8a-r1.ebuild
+++ b/app-text/discount/discount-2.1.8a-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://www.pell.portland.or.us/~orc/Code/${PN}/${P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="alpha amd64 arm ~ia64 ppc ~ppc64 ~sparc ~x86"
 IUSE="minimal"
 
 src_prepare() {
diff --git a/app-text/epubcheck/metadata.xml b/app-text/epubcheck/metadata.xml
index 63ac5653603a..fc4e4eb003bf 100644
--- a/app-text/epubcheck/metadata.xml
+++ b/app-text/epubcheck/metadata.xml
@@ -4,4 +4,7 @@
   <maintainer>
     <email>flameeyes@gentoo.org</email>
   </maintainer>
+  <upstream>
+    <remote-id type="github">IDPF/epubcheck</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/app-text/evince/evince-3.16.1.ebuild b/app-text/evince/evince-3.16.1.ebuild
index f080717d6fd4..228c4d151dfb 100644
--- a/app-text/evince/evince-3.16.1.ebuild
+++ b/app-text/evince/evince-3.16.1.ebuild
@@ -15,7 +15,7 @@ LICENSE="GPL-2+ CC-BY-SA-3.0"
 # subslot = evd3.(suffix of libevdocument3)-evv3.(suffix of libevview3)
 SLOT="0/evd3.4-evv3.3"
 IUSE="djvu dvi gnome +introspection libsecret nautilus nsplugin +postscript t1lib tiff xps"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x64-solaris"
 
 # Since 2.26.2, can handle poppler without cairo support. Make it optional ?
 # not mature enough
diff --git a/app-text/iso-codes/Manifest b/app-text/iso-codes/Manifest
index 0735bbf381e9..b34edb255365 100644
--- a/app-text/iso-codes/Manifest
+++ b/app-text/iso-codes/Manifest
@@ -1,2 +1,3 @@
 DIST iso-codes-3.57.tar.xz 3773756 SHA256 dd6acd92843b69530fce535d3d6fd947ddb3802f0d5fc1bd214d1cb7d2bf5c47 SHA512 a58e48be152960d2391123e88b48f1c43e0bf0ac880a8d6a3ec7c8154e67fd40f264063cdf7106da9d261a5fb82f64d67545a17f69ec81141f10d1eb2d897424 WHIRLPOOL 9b6de080edc6c54071a8b7584de90af3554f91d77973dceb856570b2c1760ad89a807112903cd24697bab672024d319b72ce3141fdd0dc15405bf54bbd9b53ce
 DIST iso-codes-3.59.tar.xz 3771916 SHA256 63d5ef035a96223f1fc8f36b711082f806e1666852dfc4149eeca8fd435d76ed SHA512 e1ac1c4717fd5a9daf76df109dadb24daa7dbf54b09736409e4cf4162de84038ab81ad03afecd3423d288bba306bf27f1301c03912c70a258a763a72fe8a77b4 WHIRLPOOL d56e8e81c1d6668c34d83035174aad2d393f2643ed8a4ef52f379119bb0d3a214ad9bd62d4087bfde8e3e60e427b1572eb41521dd02f081bd013278b3218bbd2
+DIST iso-codes-3.61.tar.xz 3772736 SHA256 a79bf119afdc20feef12965f26f9d97868819003a76355a6f027a14a6539167d SHA512 c18f4d9f92266bc590e9eb327edfc769abc384a0ffeb80bcff120cafe664019c747e733aa1b33de4179a6beddaa904bc70e2d35971d9edb6eba51592f5d5d07d WHIRLPOOL 74c620e00bfac3e007f58edd509c3204db162b99e3aba93fb02ab27b435925ac2b2886367f25c1749f3fbaf277a37b64e39a8684d8e6faff59ef9d7739108f3c
diff --git a/app-text/iso-codes/iso-codes-3.61.ebuild b/app-text/iso-codes/iso-codes-3.61.ebuild
new file mode 100644
index 000000000000..22f4a6b83881
--- /dev/null
+++ b/app-text/iso-codes/iso-codes-3.61.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+PLOCALES="af am ar as ast az be bg bn bn_IN br bs byn ca crh cs cy da de dz el en eo es et eu fa fi fo fr ga gez gl gu haw he hi hr hu hy ia id is it ja ka kk km kn ko kok ku lt lv mi mk ml mn mr ms mt nb ne nl nn nso oc or pa pl ps pt pt_BR ro ru rw si sk sl so sq sr sr@latin sv sw ta te th ti tig tk tl tr tt tt@iqtelif ug uk ve vi wa wal wo xh zh_CN zh_HK zh_TW zu"
+
+inherit eutils l10n
+
+DESCRIPTION="ISO language, territory, currency, script codes and their translations"
+HOMEPAGE="http://pkg-isocodes.alioth.debian.org/"
+SRC_URI="http://pkg-isocodes.alioth.debian.org/downloads/${P}.tar.xz"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+IUSE=""
+
+RDEPEND=""
+DEPEND="
+	app-arch/xz-utils
+	sys-devel/gettext
+"
+
+# This ebuild does not install any binaries
+RESTRICT="binchecks strip"
+
+src_prepare() {
+	local norm loc all_locales mylinguas
+	local all_norms="iso_15924 iso_3166 iso_3166_2 iso_4217 iso_639 iso_639_3 iso_639_5"
+
+	# l10n_find_plocales_changes doesn't support multiple directories
+	einfo "Looking for new locales ..."
+	for norm in ${all_norms}; do
+		pushd "${norm}" > /dev/null || die
+		for loc in *.po; do
+			all_locales+="${loc%.po} "
+		done
+		popd > /dev/null
+	done
+
+	all_locales=$(echo "${all_locales}" | sed 's/ /\n/g' | sort | uniq)
+	all_locales=${all_locales//[[:space:]]/ }
+	all_locales=${all_locales#[[:space:]]}
+	all_locales=${all_locales%[[:space:]]}
+	if [[ ${PLOCALES} != ${all_locales} ]]; then
+		einfo "There are changes in locales! This ebuild should be updated to:"
+		einfo "PLOCALES=\"${all_locales}\""
+	else
+		einfo "Done"
+	fi
+
+	for norm in ${all_norms}; do
+		einfo "Preparing ${norm} ..."
+		pushd "${norm}" > /dev/null || die
+		mylinguas=
+		for loc in *.po; do
+			if use "linguas_"${loc%.po}; then
+				mylinguas+="${loc} "
+			fi
+		done
+
+		sed -e "s:pofiles =.*:pofiles = ${mylinguas} ${NULL}:" \
+			-e "s:mofiles =.*:mofiles = ${mylinguas//.po/.mo} ${NULL}:" \
+			-i Makefile.am Makefile.in || die "sed in ${norm} folder failed"
+		popd > /dev/null
+	done
+}
diff --git a/app-text/libgxps/Manifest b/app-text/libgxps/Manifest
index 77a1d4aabd3d..048788e63245 100644
--- a/app-text/libgxps/Manifest
+++ b/app-text/libgxps/Manifest
@@ -1 +1,2 @@
 DIST libgxps-0.2.2.tar.xz 302844 SHA256 39d104739bf0db43905c315de1d8002460f1a098576f4418f69294013a5820be SHA512 96fa462cb4bba9cdba3d8cfe416199f8d956d17397e3514aa6168c7acc865a30e9347d8f9850f16a8c2a0a83dc83f7d7d2bd1806e27a2af0914ce53fed2b4467 WHIRLPOOL cc4aeb94d3c989bb8dfc7b4912a1c8d86f46d8cef0051657d7cbdb9d565aaf0d07e65619f643246bc5abd7010e40046cd683ba36a8fa261eb3762bb8ee795b5a
+DIST libgxps-0.2.3.2.tar.xz 323060 SHA256 6ea5f0ed85665a4e6702e31e38b5f1b2e5ae4f3d316a55d7f1fb1799224b4127 SHA512 fc1f8f1a3091efaa60f29a1842e997ed72c9888b8d903b613dd0073468172a8e2d757877207ab81b155fcb3988ec975c91490c20afb4ebae1e03e0e1cc620257 WHIRLPOOL d5069483f105ae1f4e4435c5b2fce18d7175a82354d59f311a0b8582d88a13695886870ef63772d7573dbaa1fdb3c1d68c2e975437d73ec4d24b2281033af399
diff --git a/app-text/libgxps/libgxps-0.2.3.2.ebuild b/app-text/libgxps/libgxps-0.2.3.2.ebuild
new file mode 100644
index 000000000000..a5906161cb9b
--- /dev/null
+++ b/app-text/libgxps/libgxps-0.2.3.2.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GNOME2_LA_PUNT="yes"
+GCONF_DEBUG="yes"
+
+inherit gnome2
+
+DESCRIPTION="Library for handling and rendering XPS documents"
+HOMEPAGE="https://wiki.gnome.org/Projects/libgxps"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="+introspection jpeg lcms static-libs tiff"
+
+RDEPEND="
+	>=app-arch/libarchive-2.8
+	>=dev-libs/glib-2.24:2
+	media-libs/freetype:2
+	media-libs/libpng:0
+	>=x11-libs/cairo-1.10[svg]
+	introspection? ( >=dev-libs/gobject-introspection-0.10.1:= )
+	jpeg? ( virtual/jpeg:0 )
+	lcms? ( media-libs/lcms:2 )
+	tiff? ( media-libs/tiff:0[zlib] )
+"
+DEPEND="${RDEPEND}
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt
+	dev-util/gtk-doc-am
+	virtual/pkgconfig
+"
+
+# There is no automatic test suite, only an interactive test application
+RESTRICT="test"
+
+src_configure() {
+	gnome2_src_configure \
+		--enable-man \
+		--disable-test \
+		$(use_enable introspection) \
+		$(use_with jpeg libjpeg) \
+		$(use_with lcms liblcms2) \
+		$(use_enable static-libs static) \
+		$(use_with tiff libtiff)
+}
diff --git a/app-text/libwps/Manifest b/app-text/libwps/Manifest
index 888ea969a115..f5b149468b1f 100644
--- a/app-text/libwps/Manifest
+++ b/app-text/libwps/Manifest
@@ -1,4 +1,3 @@
 DIST libwps-0.2.9.tar.xz 387340 SHA256 cf9a17a6c0452ab32cce342c1410f1620c66f9cb6f9431b82f95da7fe9730177 SHA512 60ddc8db5a90589248a0a8f90950907ca3be3362983f6c4847670e6eaf4d7ad22a2b6795b0a1b0a1920075f25f1ffcfd581757c26bfb74deacd000e94459da34 WHIRLPOOL bc847cb65c72daa01db5d6f17a20cbaff741fab1fc7a63d789993334b7853009f59c1ca370d7d3798a26b294c96c3435664314b07ff5a2324fa7ca7980378fe8
 DIST libwps-0.3.1.tar.xz 410376 SHA256 bb2c2a7db5121411ba705ccf3452cdce51d9798384fd9621e9702ba802878e93 SHA512 f628e6532b32331c7df0d97a9b71bf1f97347634657148b47d46ba7c2fd888d7fa9ffe52f31cfc24f86688c9c713bfaff360c7fe9f4a92d646cf8f21e7f5c2b1 WHIRLPOOL ebe35fabf22aedccfe3ca35e46971a26332040852357ea0f2241534261c77d597da38766192661ecd6fa24881e0bf9de4a80bdfea300129420d4635924434110
-DIST libwps-0.4.0.tar.xz 463456 SHA256 53f66f67869ebee273d2e9a73b8edbac7d83346e72473035a02580d8ce6c995a SHA512 5c7f1a75d93b1028a55b438c55da4faad198c76b61c83498952d8e8e5faabc757dcece8cdcfa2ca11aa9842a151e9dcbe45b118947ace31670597425225bf493 WHIRLPOOL 8a2ecc699e3f7a2f53a5db3881695da61037dfd3f9a95221e15200c088511221581695212d29a2c89a4d121be04d19c0a50f279b137431c21e05027a3df09c4b
 DIST libwps-0.4.1.tar.xz 476732 SHA256 bf915125d647aec18f63d593eb9385bce1e3cdb48649c1c90782d0e0ff5e976a SHA512 675b1d54436d568a990a305267daf33ebfb064e54b7b220f1ada850db85d1780590e161d27a68aa3b33807fab20a73e862f3dfffb62a8a5ff20192ed6f85063f WHIRLPOOL 56d849615588d2a6e33f1f20367b8ce5685bcc1cac6651fd1f48cda238c851fdaa81658d73557ae5f2e4d4f0ca690517543cbeb0a940bbdca2f3347b938d7d7b
diff --git a/app-text/libwps/libwps-0.4.0.ebuild b/app-text/libwps/libwps-0.4.0.ebuild
deleted file mode 100644
index 8ec30ec4cd01..000000000000
--- a/app-text/libwps/libwps-0.4.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit base eutils
-
-DESCRIPTION="Microsoft Works file word processor format import filter library"
-HOMEPAGE="http://libwps.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
-
-LICENSE="|| ( LGPL-2.1 MPL-2.0 )"
-SLOT="0"
-# KEYWORDS="~alpha ~amd64 ~arm ~x86"
-IUSE="doc debug static-libs"
-
-RDEPEND="
-	app-text/libwpd:0.10
-	dev-libs/boost:=
-	dev-libs/librevenge
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-"
-
-src_configure() {
-	econf \
-		--disable-werror \
-		$(use_enable static-libs static) \
-		--docdir=/usr/share/doc/${PF} \
-		$(use_with doc docs) \
-		$(use_enable debug)
-}
-
-src_install() {
-	default
-	prune_libtool_files --all
-}
diff --git a/app-text/libwps/libwps-0.4.1.ebuild b/app-text/libwps/libwps-0.4.1.ebuild
index 8ec30ec4cd01..5ac9cb1b6c11 100644
--- a/app-text/libwps/libwps-0.4.1.ebuild
+++ b/app-text/libwps/libwps-0.4.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
 
 LICENSE="|| ( LGPL-2.1 MPL-2.0 )"
 SLOT="0"
-# KEYWORDS="~alpha ~amd64 ~arm ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~x86"
 IUSE="doc debug static-libs"
 
 RDEPEND="
diff --git a/app-text/logmerge/metadata.xml b/app-text/logmerge/metadata.xml
index b0a9ab94866d..d5d6737cf207 100644
--- a/app-text/logmerge/metadata.xml
+++ b/app-text/logmerge/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer>
@@ -7,4 +7,7 @@
   <longdescription>
     Merge multiple logs such that multilined entries appear in chronological order without breaks.
   </longdescription>
+  <upstream>
+    <remote-id type="github">ildar-shaimordanov/logmerge</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/app-text/multitail/multitail-6.4.1.ebuild b/app-text/multitail/multitail-6.4.1.ebuild
index edb0d09cca34..84b37450a92d 100644
--- a/app-text/multitail/multitail-6.4.1.ebuild
+++ b/app-text/multitail/multitail-6.4.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.vanheusden.com/multitail/${P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 hppa ~ia64 ~ppc ~sparc ~x86 ~x86-interix ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 hppa ~ia64 ppc ~sparc ~x86 ~x86-interix ~amd64-linux ~x86-linux"
 IUSE="debug examples unicode"
 
 RDEPEND="
diff --git a/app-text/pdf2djvu/Manifest b/app-text/pdf2djvu/Manifest
index f8a8d28141b7..7294ab8e07dd 100644
--- a/app-text/pdf2djvu/Manifest
+++ b/app-text/pdf2djvu/Manifest
@@ -1,2 +1,3 @@
 DIST pdf2djvu-0.7.21.tar.xz 229020 SHA256 12d480cc3ce2369e1f1b39b7f5e6fbb44351d8b07861295d34e6978f58b687b9 SHA512 920e49b23f9c1d1a8f6c0be9257dc175ef94350f6e488d88813eb2586344f373b4b173530031d9aeff24b1ad220cc68a3094d4e821cd3a1511ba01e492ed084f WHIRLPOOL 7d09ca40f330c79c0a1abf9967f9ce5d05cfaa8a5904bf69c751a4ca1cce5da2987c519cc001dd7b3fdaa0822127e3ead269ee723f78c6cc18d1c7666b8b28e5
 DIST pdf2djvu-0.8.1.tar.xz 239164 SHA256 716b1ac2c4328fcfee8b33a0b6cd011b2ebee040de57163978ddd84ffcf9f8e9 SHA512 f61940726a1c04d33ff71c2a9230c4decd81a26ac44c4859cd6929a505b159e21fa06d80ba1c86f464aaeb6246d76ea751a3f35e8211364855d082b1b96465c0 WHIRLPOOL cafe5b07977d6382dd4935d879ad7923b188c042c4b07b6d07a9e600a6d683f1b1d4a3cd1e83d9f82169d9d9bb88ac379625dbf9d81e6b6fe2c51d017b9da95a
+DIST pdf2djvu-0.8.2.tar.xz 234412 SHA256 40b0812e954f374704bd8dbb5952786f6744623a2ec6df1c56de0b8057be93d6 SHA512 72a3ee719b6311824c1f71269787b31cdd600bc8671f0486419f4d023cb10f9d338df18ce33c982ed43f893d441a723bffd502a17287be43a00dc695ca959042 WHIRLPOOL 72863dfc7f4a7d1665de77a3fa12242c83746f4c3a237b45e92fd3111581f55e16a5c020590d12185db13b7035a987ab2efaa8fee9b47adb60f0502703af6a7c
diff --git a/app-text/pdf2djvu/pdf2djvu-0.8.2.ebuild b/app-text/pdf2djvu/pdf2djvu-0.8.2.ebuild
new file mode 100644
index 000000000000..653e9bbc712e
--- /dev/null
+++ b/app-text/pdf2djvu/pdf2djvu-0.8.2.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit python-single-r1 toolchain-funcs
+
+DESCRIPTION="A tool to create DjVu files from PDF files"
+HOMEPAGE="http://jwilk.net/software/pdf2djvu"
+SRC_URI="https://bitbucket.org/jwilk/${PN}/downloads/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+graphicsmagick nls openmp test"
+
+RDEPEND="
+	>=app-text/djvu-3.5.21:=
+	>=app-text/poppler-0.16.7:=
+	dev-libs/libxml2:=
+	dev-libs/libxslt:=
+	graphicsmagick? ( media-gfx/graphicsmagick:= )
+"
+DEPEND="${RDEPEND}
+	dev-cpp/pstreams
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )
+"
+
+REQUIRED_USE="test? ( graphicsmagick ${PYTHON_REQUIRED_USE} )"
+
+pkg_setup() {
+	use test && python-single-r1_pkg_setup
+}
+
+src_configure() {
+	local openmp=--disable-openmp
+	use openmp && tc-has-openmp && openmp=--enable-openmp
+
+	econf \
+		${openmp} \
+		$(use_enable nls) \
+		$(use_with graphicsmagick)
+}
+
+src_install() {
+	default
+	dodoc doc/{changelog,{cjk,credits,djvudigital}.txt}
+}
diff --git a/app-text/rnv/rnv-1.7.11-r1.ebuild b/app-text/rnv/rnv-1.7.11-r1.ebuild
index aa115b86e3fa..5d0d5e3eb55e 100644
--- a/app-text/rnv/rnv-1.7.11-r1.ebuild
+++ b/app-text/rnv/rnv-1.7.11-r1.ebuild
@@ -13,10 +13,9 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="scheme"
 
 RDEPEND="dev-libs/expat
-	scheme? ( dev-scheme/scm[libscm] )"
+	dev-scheme/scm[libscm]"
 DEPEND="${RDEPEND}"
 
 src_prepare() {
diff --git a/app-text/talkfilters/talkfilters-2.3.8-r1.ebuild b/app-text/talkfilters/talkfilters-2.3.8-r1.ebuild
index 3859472e16fa..32fa155f7071 100644
--- a/app-text/talkfilters/talkfilters-2.3.8-r1.ebuild
+++ b/app-text/talkfilters/talkfilters-2.3.8-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://www.hyperrealm.com/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 hppa ~mips ~ppc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 hppa ~mips ppc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE=""
 
 PATCHES=(
diff --git a/app-text/talkfilters/talkfilters-2.3.8.ebuild b/app-text/talkfilters/talkfilters-2.3.8.ebuild
deleted file mode 100644
index 31e67a02e1c1..000000000000
--- a/app-text/talkfilters/talkfilters-2.3.8.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-DESCRIPTION="Convert ordinary English text into text that mimics a stereotyped or otherwise humorous dialect"
-HOMEPAGE="http://www.hyperrealm.com/talkfilters/talkfilters.html"
-SRC_URI="http://www.hyperrealm.com/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 hppa ~mips ppc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE=""
-
-src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
-	dodoc AUTHORS ChangeLog README || die
-}
diff --git a/app-text/tesseract/tesseract-3.04.00-r2.ebuild b/app-text/tesseract/tesseract-3.04.00-r2.ebuild
index a9d814c2ba45..cad15b58aecc 100644
--- a/app-text/tesseract/tesseract-3.04.00-r2.ebuild
+++ b/app-text/tesseract/tesseract-3.04.00-r2.ebuild
@@ -59,14 +59,16 @@ SRC_URI="https://github.com/${MY_PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="alpha amd64 ~arm ppc ~ppc64 ~sparc ~x86"
 
 IUSE="doc examples jpeg opencl osd png +scrollview static-libs tiff training -webp linguas_ar linguas_bg linguas_ca linguas_chr linguas_cs linguas_de linguas_da linguas_el linguas_es linguas_fi linguas_fr linguas_he linguas_hi linguas_hu linguas_id linguas_it linguas_jp linguas_ko linguas_lt linguas_lv linguas_nl linguas_no linguas_pl linguas_pt linguas_ro linguas_ru linguas_sk linguas_sl linguas_sr linguas_sv linguas_th linguas_tl linguas_tr linguas_uk linguas_vi linguas_zh_CN linguas_zh_TW"
 
-# With opencl tiff is necessary regardless of leptonica status   <-- Check this
+# With opencl USE=tiff is necessary in leptonica
 DEPEND=">=media-libs/leptonica-1.71[zlib,tiff?,jpeg?,png?,webp?]
 		opencl? ( virtual/opencl
-				  media-libs/tiff:0 )
+				  media-libs/tiff:0
+				  >=media-libs/leptonica-1.71[zlib,tiff,jpeg?,png?,webp?]
+				)
 	training? (
 	  dev-libs/icu
 	  x11-libs/pango
diff --git a/app-text/yelp-tools/yelp-tools-3.16.1.ebuild b/app-text/yelp-tools/yelp-tools-3.16.1.ebuild
index 9e39f52c026c..7463284ecba5 100644
--- a/app-text/yelp-tools/yelp-tools-3.16.1.ebuild
+++ b/app-text/yelp-tools/yelp-tools-3.16.1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://www.gnome.org/"
 
 LICENSE="|| ( GPL-2+ freedist ) GPL-2+" # yelp.m4 is GPL2 || freely distributable
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~arm-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="
diff --git a/app-text/zemberek-server/metadata.xml b/app-text/zemberek-server/metadata.xml
index d75afba941ef..1484b932b98d 100644
--- a/app-text/zemberek-server/metadata.xml
+++ b/app-text/zemberek-server/metadata.xml
@@ -4,5 +4,6 @@
 	<herd>java</herd>
 	<upstream>
 		<remote-id type="google-code">zemberek</remote-id>
+		<remote-id type="github">ahmetaa/zemberek-nlp</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/app-vim/autoalign/Manifest b/app-vim/autoalign/Manifest
index a6a79db33dd0..91a4065dbd4f 100644
--- a/app-vim/autoalign/Manifest
+++ b/app-vim/autoalign/Manifest
@@ -1 +1,2 @@
 DIST autoalign-13.tar.bz2 10091 SHA256 30151a1d22e94d8be919f0ac097ab348830b943d2672db49afccca707f86b058 SHA512 2ea94b97a9a0a5a2f5488e201be3297d29246a348b07d15b3bdd37a8c294cb3c6941b9d70ac0fda143b6fdcda30df6b228309089303f5dafe2bc4cacd7492fff WHIRLPOOL f7dcd193c74f43db8a9eabbcd200dcf4d9004a3b33d52293e58d17aa707bdc18b8a5a25bdf0a3e149c55806591eefc23b4bc6af1bc0426e97d910ef4ec30d6ea
+DIST autoalign-14.tar.xz 13400 SHA256 7de8566fad877554b83e5c268aa7796d20a32c7b211fe01eb11ac35ee4bf3536 SHA512 40107b8e12c4190c4f31c740d9b7615eb0836f4d159e6071526de768e6f7726849cb0cd93af8674aff7d6cfecc1b7f27d5b894628f426c51941bb914b92944f2 WHIRLPOOL d7db1aacc8068bcc6874721aa1547797551a0b5300fc9ec31cb091cc858a8105aa4feb14c9edb4ad4a592b3b98600ebdf88226622d189cd2849e7fd2a18efb8c
diff --git a/app-vim/autoalign/autoalign-14.ebuild b/app-vim/autoalign/autoalign-14.ebuild
new file mode 100644
index 000000000000..3f0cf76d76be
--- /dev/null
+++ b/app-vim/autoalign/autoalign-14.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI=5
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: automatically align bib, c, c++, tex and vim code"
+HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=884"
+LICENSE="vim"
+KEYWORDS="~alpha ~amd64 ~ia64 ~mips ~ppc ~sparc ~x86"
+IUSE=""
+
+if [[ ${PV} != 9999* ]] ; then
+	SRC_URI="mirror://gentoo/${P}.tar.xz
+		http://dev.gentoo.org/~chutzpah/vim/${P}.tar.xz"
+fi
+
+DEPEND="app-arch/xz-utils"
+RDEPEND=">=app-vim/align-30
+	>=app-vim/cecutil-4"
+
+VIM_PLUGIN_HELPFILES="autoalign"
+VIM_PLUGIN_MESSAGES="filetype"
+
+src_prepare() {
+	# Don't use the cecutil.vim included in the tarball, use the one
+	# provided by app-vim/cecutil instead.
+	rm plugin/cecutil.vim
+}
diff --git a/app-vim/detectindent/Manifest b/app-vim/detectindent/Manifest
index 613df930c4c1..719cb72c8071 100644
--- a/app-vim/detectindent/Manifest
+++ b/app-vim/detectindent/Manifest
@@ -1,2 +1,3 @@
 DIST detectindent-1.0.tar.bz2 1919 SHA256 7ba327295df68583786221f6d87032ae8bf6d7f0eb76262b279722eb4aa35d7e SHA512 5ff01feb65f28428a9df76013d301ed703461ad0c929a3397304f0604fe776dbac4c0f441b2a15661f8f1ace4b25b04e8fc742204e550f5dad844461cba421cd WHIRLPOOL 02ea5436bb0d6413f615906aeee3281f2a72c6814eda87e1f7bfe69f69409f7ffa2e8ccdf81adef625a0366fcc07115c44379b3b6fff7db6795d0be85e506947
 DIST detectindent-1.0_p20110723.tar.bz2 2578 SHA256 8988250178495e615529e54c047cb57d03f01768506c0174e0832afca95356a5 SHA512 e0d42ef676be7c5e78a2f805b08c43e1c1c8b394434cd055afdc096cddb07ddb2ce6215b92fe977ee63ce953200dcbb9e8b55eb81793c936a7f632b0e7e559fe WHIRLPOOL fe9449590c6bb38e65835c8e2ce6248c96bc69a256878bd19e72ed62b108b02ef6c72adf2397b97769971df23ea10221472897d8d3107ed212524be946827ec1
+DIST detectindent-1.0_p20150908.tar.xz 2788 SHA256 2f2e124777940f1efc621e50a679956650348305cf76be8e5c35c0a17b64c041 SHA512 d828d04871e6eeeaa11c109e137fbe70a3b7fa265f569e45d77b8b185f380a200b009aa0a2f0825afdbf344b12d7b8922050c4788decadcb7640bbe3fe9ca8de WHIRLPOOL a7b3c70476a3c35ebb4dbe9bae24307a4f3ed56f0e4e160b6f2f55045a96941a6d4d99ac6513f23af27fda0a8bb98c893588e9261709e7267f75706f0447de8d
diff --git a/app-vim/detectindent/detectindent-1.0_p20150908.ebuild b/app-vim/detectindent/detectindent-1.0_p20150908.ebuild
new file mode 100644
index 000000000000..466ae01f3990
--- /dev/null
+++ b/app-vim/detectindent/detectindent-1.0_p20150908.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: automatically detect file indent settings"
+HOMEPAGE="https://github.com/ciaranm/detectindent"
+LICENSE="vim"
+KEYWORDS="~amd64 ~hppa ~mips ~ppc ~sparc ~x86"
+IUSE=""
+
+if [[ ${PV} != 9999* ]] ; then
+	SRC_URI="mirror://gentoo/${P}.tar.xz
+		http://dev.gentoo.org/~chutzpah/vim/${P}.tar.xz"
+fi
+
+DEPEND="app-arch/xz-utils"
+
+VIM_PLUGIN_HELPFILES="detectindent.txt"
diff --git a/app-vim/detectindent/metadata.xml b/app-vim/detectindent/metadata.xml
index 489199d9e160..98133bbba173 100644
--- a/app-vim/detectindent/metadata.xml
+++ b/app-vim/detectindent/metadata.xml
@@ -6,5 +6,7 @@
 		Vim plugin which automatically detects indent settings for files which
 		do not have modelines.
 	</longdescription>
+	<upstream>
+		<remote-id type="github">ciaranm/detectindent</remote-id>
+	</upstream>
 </pkgmetadata>
-
diff --git a/dev-cpp/ctemplate/metadata.xml b/dev-cpp/ctemplate/metadata.xml
index e3f7acbf8e43..2b4f08135671 100644
--- a/dev-cpp/ctemplate/metadata.xml
+++ b/dev-cpp/ctemplate/metadata.xml
@@ -4,5 +4,6 @@
 	<herd>cpp</herd>
 	<upstream>
 		<remote-id type="google-code">google-ctemplate</remote-id>
+		<remote-id type="github">olafvdspek/ctemplate</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-cpp/glibmm/glibmm-2.44.0.ebuild b/dev-cpp/glibmm/glibmm-2.44.0.ebuild
index 4dea19f19f94..a86098118784 100644
--- a/dev-cpp/glibmm/glibmm-2.44.0.ebuild
+++ b/dev-cpp/glibmm/glibmm-2.44.0.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="http://www.gtkmm.org"
 
 LICENSE="LGPL-2.1+ GPL-2+" # GPL-2+ applies only to the build system
 SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="doc debug examples test"
 
 COMMON_DEPEND="
diff --git a/dev-cpp/glog/metadata.xml b/dev-cpp/glog/metadata.xml
index f53753845dcf..fcf6c17cbcb3 100644
--- a/dev-cpp/glog/metadata.xml
+++ b/dev-cpp/glog/metadata.xml
@@ -11,5 +11,6 @@
 	</use>
 	<upstream>
 		<remote-id type="google-code">google-glog</remote-id>
+		<remote-id type="github">google/glog</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-cpp/gmock/metadata.xml b/dev-cpp/gmock/metadata.xml
index 541e716613f3..6f168ee9907f 100644
--- a/dev-cpp/gmock/metadata.xml
+++ b/dev-cpp/gmock/metadata.xml
@@ -6,5 +6,6 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="google-code">googlemock</remote-id>
+		<remote-id type="github">google/googlemock</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-cpp/gtest/metadata.xml b/dev-cpp/gtest/metadata.xml
index 69c1537c80d2..130be1dacd75 100644
--- a/dev-cpp/gtest/metadata.xml
+++ b/dev-cpp/gtest/metadata.xml
@@ -2,11 +2,12 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>
-	<email>tomka@gentoo.org</email>
-	<name>Thomas Kahle</name>
+		<email>tomka@gentoo.org</email>
+		<name>Thomas Kahle</name>
 	</maintainer>
 	<upstream>
 		<doc lang="en">https://code.google.com/p/googletest/w/list</doc>
 		<remote-id type="google-code">googletest</remote-id>
+		<remote-id type="github">google/googletest</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-cpp/gtkmm/gtkmm-2.24.4-r2.ebuild b/dev-cpp/gtkmm/gtkmm-2.24.4-r2.ebuild
index 63289ed85fc3..847b9afd201d 100644
--- a/dev-cpp/gtkmm/gtkmm-2.24.4-r2.ebuild
+++ b/dev-cpp/gtkmm/gtkmm-2.24.4-r2.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="http://www.gtkmm.org"
 
 LICENSE="LGPL-2.1+"
 SLOT="2.4"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
 IUSE="doc examples test"
 
 COMMON_DEPEND="
diff --git a/dev-cpp/gtkmm/gtkmm-3.16.0.ebuild b/dev-cpp/gtkmm/gtkmm-3.16.0.ebuild
index 37ab08ce2c76..b2cb7fbf8d45 100644
--- a/dev-cpp/gtkmm/gtkmm-3.16.0.ebuild
+++ b/dev-cpp/gtkmm/gtkmm-3.16.0.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="http://www.gtkmm.org"
 
 LICENSE="LGPL-2.1+"
 SLOT="3.0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="aqua doc examples test wayland +X"
 REQUIRED_USE="|| ( aqua wayland X )"
 
diff --git a/dev-cpp/mm-common/mm-common-0.9.8.ebuild b/dev-cpp/mm-common/mm-common-0.9.8.ebuild
index dfb212fbe2fc..15139f67b02b 100644
--- a/dev-cpp/mm-common/mm-common-0.9.8.ebuild
+++ b/dev-cpp/mm-common/mm-common-0.9.8.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="http://www.gtkmm.org/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
 IUSE=""
 
 RDEPEND=""
diff --git a/dev-cpp/sparsehash/metadata.xml b/dev-cpp/sparsehash/metadata.xml
index a4f851005953..3a6027d20c2a 100644
--- a/dev-cpp/sparsehash/metadata.xml
+++ b/dev-cpp/sparsehash/metadata.xml
@@ -4,5 +4,6 @@
 	<herd>cpp</herd>
 	<upstream>
 		<remote-id type="google-code">google-sparsehash</remote-id>
+		<remote-id type="github">google/sparsehash</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-cpp/tbb/tbb-4.3.20150611.ebuild b/dev-cpp/tbb/tbb-4.3.20150611.ebuild
index 8bcd2478da9e..e36e9c384e37 100644
--- a/dev-cpp/tbb/tbb-4.3.20150611.ebuild
+++ b/dev-cpp/tbb/tbb-4.3.20150611.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="http://www.threadingbuildingblocks.org/"
 SRC_URI="http://threadingbuildingblocks.org/sites/default/files/software_releases/source/${MYP}_src.tgz"
 LICENSE="GPL-2-with-exceptions"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ppc ~ppc64 x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
 IUSE="debug doc examples"
 
 DEPEND=""
diff --git a/dev-cpp/yaml-cpp/metadata.xml b/dev-cpp/yaml-cpp/metadata.xml
index 40068b39f78f..03c0c12b8a94 100644
--- a/dev-cpp/yaml-cpp/metadata.xml
+++ b/dev-cpp/yaml-cpp/metadata.xml
@@ -7,5 +7,6 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="google-code">yaml-cpp</remote-id>
+		<remote-id type="github">jbeder/yaml-cpp</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-db/innotop/metadata.xml b/dev-db/innotop/metadata.xml
index 44b249080ca5..667f2932477e 100644
--- a/dev-db/innotop/metadata.xml
+++ b/dev-db/innotop/metadata.xml
@@ -6,5 +6,6 @@
 but with many more features</longdescription>
 	<upstream>
 		<remote-id type="google-code">innotop</remote-id>
+		<remote-id type="github">innotop/innotop</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-db/mariadb/mariadb-10.0.21.ebuild b/dev-db/mariadb/mariadb-10.0.21.ebuild
index bd5a898849ae..9fcdefd4ecad 100644
--- a/dev-db/mariadb/mariadb-10.0.21.ebuild
+++ b/dev-db/mariadb/mariadb-10.0.21.ebuild
@@ -11,7 +11,7 @@ inherit toolchain-funcs mysql-multilib
 IUSE="$IUSE"
 
 # REMEMBER: also update eclass/mysql*.eclass before committing!
-KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 
 # When MY_EXTRAS is bumped, the index should be revised to exclude these.
 EPATCH_EXCLUDE=''
diff --git a/dev-db/mysql/mysql-5.6.26.ebuild b/dev-db/mysql/mysql-5.6.26.ebuild
index 5d9c428f2f4d..689d4aee4db6 100644
--- a/dev-db/mysql/mysql-5.6.26.ebuild
+++ b/dev-db/mysql/mysql-5.6.26.ebuild
@@ -14,7 +14,7 @@ inherit toolchain-funcs mysql-multilib
 IUSE="$IUSE"
 
 # REMEMBER: also update eclass/mysql*.eclass before committing!
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 
 # When MY_EXTRAS is bumped, the index should be revised to exclude these.
 EPATCH_EXCLUDE=''
diff --git a/dev-db/percona-toolkit/Manifest b/dev-db/percona-toolkit/Manifest
index 84e15a8cb5d9..1b29c406a9fd 100644
--- a/dev-db/percona-toolkit/Manifest
+++ b/dev-db/percona-toolkit/Manifest
@@ -1,2 +1,3 @@
 DIST percona-toolkit-2.2.11.tar.gz 1389718 SHA256 848a8a57bf04dc1b2cc2ab555dd594a2c708b76656042ff38b1a91b8ccb1df4b SHA512 d5e34fce1b6b69dfc1a8ecd7bcbe84e586e950976553f4fd30afb887a850770c08990216e41fc194bdd0a5642034905ee2d69c2f8b3781503c9b4aab47017cdb WHIRLPOOL 79e02087c97b86e6e282215cf73c89d7d6842978a1d40d3b9e2a484437e6939a9957c7028feb8690ffc8b915c26627c943204f230f4cb09749bb3e22ec4189ff
+DIST percona-toolkit-2.2.15.tar.gz 1401540 SHA256 ad9fffcee66852ac19c5d138e17474ff48af0083bc0fd8d0a6fb9400bab130f3 SHA512 b7035701909c3587ded1438bef7bdaa4ca1f40b339dbce001826aeadff46335ff39023a020c05ebd3e81a9ede70de26a162c48e5852e47577e7c6b3ec49a57c0 WHIRLPOOL 782134712d7562699f6e1f60299852d67e1bb1193c846c4cf48dba666f4fac44da655157bd2d5dafb4ae89db64e371d8e2e875d0397b8d2c3f257302928873d4
 DIST percona-toolkit-2.2.7.tar.gz 1451687 SHA256 49ed1fa6d46b8211ba82355ec3c9dd0614c3b29fd31993123f2041e85a38891e SHA512 d3d7c4162de08c381810b815600effc683d1b79a8df2ccacd16e2b333924b6634c135f08387784c88867c90ce4ee1b334eae6d7f974e9587008da30b7206c5d3 WHIRLPOOL b6d02d5bc0aafbd8fdabc48efb4fa8e0d04634d31185c2c12c2c2776e36e80f138f7bcd1a6fcd2c079ca0cd25c56e79a6aea0e1615dfc7ad26a553c60716674d
diff --git a/dev-db/percona-toolkit/percona-toolkit-2.2.15.ebuild b/dev-db/percona-toolkit/percona-toolkit-2.2.15.ebuild
new file mode 100644
index 000000000000..f2aba7875e44
--- /dev/null
+++ b/dev-db/percona-toolkit/percona-toolkit-2.2.15.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils perl-app perl-module toolchain-funcs
+
+DESCRIPTION="essential command-line utilities for MySQL"
+HOMEPAGE="http://www.percona.com/software/percona-toolkit/"
+SRC_URI="http://www.percona.com/downloads/${PN}/${PV}/tarball/${P}.tar.gz"
+
+LICENSE="|| ( GPL-2 Artistic )"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+# Package warrants IUSE doc
+IUSE=""
+
+COMMON_DEPEND="dev-perl/DBI
+	dev-perl/DBD-mysql
+	virtual/perl-Time-HiRes"
+RDEPEND="${COMMON_DEPEND}
+	dev-perl/JSON
+	dev-perl/libwww-perl
+	dev-perl/Role-Tiny
+	virtual/perl-File-Path
+	virtual/perl-Getopt-Long
+	virtual/perl-Time-Local
+	virtual/perl-Digest-MD5
+	virtual/perl-IO-Compress
+	virtual/perl-File-Temp
+	virtual/perl-File-Spec
+	virtual/perl-Scalar-List-Utils
+	dev-perl/TermReadKey"
+DEPEND="${COMMON_DEPEND}
+	virtual/perl-ExtUtils-MakeMaker"
+
+src_prepare() {
+	# bug 501904 - CVE-2014-2029
+	# sed -i -e '/^=item --\[no\]version-check/,/^default: yes/{/^default: yes/d}' bin/*
+	epatch "${FILESDIR}/${PN}-2.2.7-no-versioncheck.patch"
+}
+
+# Percona Toolkit does NOT contain the UDF code for Murmur/FNV any more.
+src_install() {
+	perl-module_src_install
+	dodoc docs/percona-toolkit.pod
+}
diff --git a/dev-db/postgresql/files/postgresql-9.4-alpha-fix-read-memory-barrier.patch b/dev-db/postgresql/files/postgresql-9.4-alpha-fix-read-memory-barrier.patch
new file mode 100644
index 000000000000..0ab7242bcd7e
--- /dev/null
+++ b/dev-db/postgresql/files/postgresql-9.4-alpha-fix-read-memory-barrier.patch
@@ -0,0 +1,13 @@
+Index: postgresql-9.4-9.4~beta2/src/include/storage/barrier.h
+===================================================================
+--- postgresql-9.4-9.4~beta2.orig/src/include/storage/barrier.h
++++ postgresql-9.4-9.4~beta2/src/include/storage/barrier.h
+@@ -117,7 +117,7 @@ extern slock_t dummy_spinlock;
+  * read barrier to cover that case.  We might need to add that later.
+  */
+ #define pg_memory_barrier()		__asm__ __volatile__ ("mb" : : : "memory")
+-#define pg_read_barrier()		__asm__ __volatile__ ("rmb" : : : "memory")
++#define pg_read_barrier()		__asm__ __volatile__ ("mb" : : : "memory")
+ #define pg_write_barrier()		__asm__ __volatile__ ("wmb" : : : "memory")
+ #elif defined(__hppa) || defined(__hppa__)		/* HP PA-RISC */
+ 
diff --git a/dev-db/postgresql/files/postgresql-9.5-no-server.patch b/dev-db/postgresql/files/postgresql-9.5-no-server.patch
index 1a12d5b820b2..c5e2c7ddd3b8 100644
--- a/dev-db/postgresql/files/postgresql-9.5-no-server.patch
+++ b/dev-db/postgresql/files/postgresql-9.5-no-server.patch
@@ -1,8 +1,7 @@
-diff --git a/contrib/Makefile b/contrib/Makefile
-index b37d0dd..b56fbf6 100644
---- a/contrib/Makefile
-+++ b/contrib/Makefile
-@@ -5,64 +5,9 @@ top_builddir = ..
+diff -ru a/contrib/Makefile b/contrib/Makefile
+--- a/contrib/Makefile	2015-06-29 15:42:18.000000000 -0400
++++ b/contrib/Makefile	2015-09-06 07:50:51.258463861 -0400
+@@ -5,56 +5,9 @@
  include $(top_builddir)/src/Makefile.global
  
  SUBDIRS = \
@@ -17,7 +16,6 @@ index b37d0dd..b56fbf6 100644
 -		dblink		\
 -		dict_int	\
 -		dict_xsyn	\
--		dummy_seclabel	\
 -		earthdistance	\
 -		file_fdw	\
 -		fuzzystrmatch	\
@@ -30,47 +28,39 @@ index b37d0dd..b56fbf6 100644
  		oid2name	\
 -		pageinspect	\
 -		passwordcheck	\
--		pg_archivecleanup \
 -		pg_buffercache	\
 -		pg_freespacemap \
 -		pg_prewarm	\
 -		pg_standby	\
 -		pg_stat_statements \
--		pg_test_fsync	\
--		pg_test_timing	\
 -		pg_trgm		\
--		pg_upgrade	\
--		pg_upgrade_support \
- 		pgbench		\
 -		pgcrypto	\
 -		pgrowlocks	\
 -		pgstattuple	\
--		pg_xlogdump	\
 -		postgres_fdw	\
 -		seg		\
 -		spi		\
 -		tablefunc	\
 -		tcn		\
 -		test_decoding	\
--		test_parser	\
--		test_shm_mq	\
+-		tsm_system_rows \
+-		tsm_system_time \
 -		tsearch2	\
 -		unaccent	\
--		vacuumlo	\
--		worker_spi
--
+ 		vacuumlo
+ 
 -ifeq ($(with_openssl),yes)
 -SUBDIRS += sslinfo
 -else
 -ALWAYS_SUBDIRS += sslinfo
 -endif
-+		vacuumlo
- 
+-
  ifneq ($(with_uuid),no)
  SUBDIRS += uuid-ossp
-diff -Naur a/src/backend/Makefile b/src/backend/Makefile
---- a/src/backend/Makefile	2013-05-06 20:57:06.000000000 +0000
-+++ b/src/backend/Makefile	2013-06-09 01:50:19.655864258 +0000
+ else
+diff -ru a/src/backend/Makefile b/src/backend/Makefile
+--- a/src/backend/Makefile	2015-06-29 15:42:18.000000000 -0400
++++ b/src/backend/Makefile	2015-09-06 08:01:36.775374842 -0400
 @@ -47,7 +47,7 @@
  
  ##########################################################################
@@ -80,7 +70,7 @@ diff -Naur a/src/backend/Makefile b/src/backend/Makefile
  
  ifneq ($(PORTNAME), cygwin)
  ifneq ($(PORTNAME), win32)
-@@ -116,7 +116,7 @@
+@@ -106,7 +106,7 @@
  endif # aix
  
  # Update the commonly used headers before building the subdirectories
@@ -89,7 +79,7 @@ diff -Naur a/src/backend/Makefile b/src/backend/Makefile
  
  # run this unconditionally to avoid needing to know its dependencies here:
  submake-schemapg:
-@@ -209,23 +209,8 @@
+@@ -199,23 +199,7 @@
  
  ##########################################################################
  
@@ -111,26 +101,36 @@ diff -Naur a/src/backend/Makefile b/src/backend/Makefile
 -	$(INSTALL_DATA) $(srcdir)/utils/misc/postgresql.conf.sample '$(DESTDIR)$(datadir)/postgresql.conf.sample'
 -	$(INSTALL_DATA) $(srcdir)/access/transam/recovery.conf.sample '$(DESTDIR)$(datadir)/recovery.conf.sample'
 +install:
-+
  
  install-bin: postgres $(POSTGRES_IMP) installdirs
  	$(INSTALL_PROGRAM) postgres$(X) '$(DESTDIR)$(bindir)/postgres$(X)'
-diff -Naur a/src/bin/Makefile b/src/bin/Makefile
---- a/src/bin/Makefile	2013-05-06 20:57:06.000000000 +0000
-+++ b/src/bin/Makefile	2013-06-09 01:51:56.143824442 +0000
-@@ -13,8 +13,7 @@
- top_builddir = ../..
+diff -ru a/src/bin/Makefile b/src/bin/Makefile
+--- a/src/bin/Makefile	2015-06-29 15:42:18.000000000 -0400
++++ b/src/bin/Makefile	2015-09-06 08:03:27.014847309 -0400
+@@ -14,20 +14,8 @@
  include $(top_builddir)/src/Makefile.global
  
--SUBDIRS = initdb pg_ctl pg_dump \
--	psql scripts pg_config pg_controldata pg_resetxlog pg_basebackup
-+SUBDIRS = pg_dump psql scripts pg_config
+ SUBDIRS = \
+-	initdb \
+-	pg_archivecleanup \
+-	pg_basebackup \
+ 	pg_config \
+-	pg_controldata \
+-	pg_ctl \
+ 	pg_dump \
+-	pg_resetxlog \
+-	pg_rewind \
+-	pg_test_fsync \
+-	pg_test_timing \
+-	pg_upgrade \
+-	pg_xlogdump \
+-	pgbench \
+ 	psql \
+ 	scripts
  
- ifeq ($(PORTNAME), win32)
- SUBDIRS += pgevent
-diff -Naur a/src/Makefile b/src/Makefile
---- a/src/Makefile	2013-05-06 20:57:06.000000000 +0000
-+++ b/src/Makefile	2013-06-09 01:54:30.479704228 +0000
+diff -ru a/src/Makefile b/src/Makefile
+--- a/src/Makefile	2015-06-29 15:42:18.000000000 -0400
++++ b/src/Makefile	2015-09-06 08:04:25.274568519 -0400
 @@ -15,17 +15,11 @@
  SUBDIRS = \
  	common \
diff --git a/dev-db/postgresql/postgresql-9.4.4-r1.ebuild b/dev-db/postgresql/postgresql-9.4.4-r1.ebuild
new file mode 100644
index 000000000000..2d169c94fef3
--- /dev/null
+++ b/dev-db/postgresql/postgresql-9.4.4-r1.ebuild
@@ -0,0 +1,422 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+PYTHON_COMPAT=( python{2_{6,7},3_{2,3,4}} )
+
+inherit eutils flag-o-matic linux-info multilib pam prefix python-single-r1 \
+		systemd user versionator
+
+KEYWORDS="alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
+
+SLOT="$(get_version_component_range 1-2)"
+
+SRC_URI="mirror://postgresql/source/v${PV}/postgresql-${PV}.tar.bz2"
+
+LICENSE="POSTGRESQL GPL-2"
+DESCRIPTION="PostgreSQL RDBMS"
+HOMEPAGE="http://www.postgresql.org/"
+
+LINGUAS="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr
+		 zh_CN zh_TW"
+IUSE="doc kerberos kernel_linux ldap nls pam perl -pg_legacytimestamp python
+	  +readline selinux +server ssl static-libs tcl threads uuid xml zlib"
+
+for lingua in ${LINGUAS}; do
+	IUSE+=" linguas_${lingua}"
+done
+
+wanted_languages() {
+	local enable_langs
+
+	for lingua in ${LINGUAS} ; do
+		use linguas_${lingua} && enable_langs+="${lingua} "
+	done
+
+	echo -n ${enable_langs}
+}
+
+CDEPEND="
+>=app-eselect/eselect-postgresql-1.2.0
+sys-apps/less
+virtual/libintl
+kerberos? ( virtual/krb5 )
+ldap? ( net-nds/openldap )
+pam? ( virtual/pam )
+perl? ( >=dev-lang/perl-5.8 )
+python? ( ${PYTHON_DEPS} )
+readline? ( sys-libs/readline:0= )
+ssl? ( >=dev-libs/openssl-0.9.6-r1:0= )
+tcl? ( >=dev-lang/tcl-8:0= )
+xml? ( dev-libs/libxml2 dev-libs/libxslt )
+zlib? ( sys-libs/zlib )
+"
+
+# uuid flags -- depend on sys-apps/util-linux for Linux libcs, or if no
+# supported libc in use depend on dev-libs/ossp-uuid. For BSD systems,
+# the libc includes UUID functions.
+UTIL_LINUX_LIBC=( elibc_{glibc,uclibc,musl} )
+BSD_LIBC=( elibc_{Free,Net,Open}BSD )
+
+nest_usedep() {
+	local front back
+	while [[ ${#} -gt 1 ]]; do
+		front+="${1}? ( "
+		back+=" )"
+		shift
+	done
+	echo "${front}${1}${back}"
+}
+
+IUSE+=" ${UTIL_LINUX_LIBC[@]} ${BSD_LIBC[@]}"
+CDEPEND+="
+uuid? (
+	${UTIL_LINUX_LIBC[@]/%/? ( sys-apps/util-linux )}
+	$(nest_usedep ${UTIL_LINUX_LIBC[@]/#/!} ${BSD_LIBC[@]/#/!} dev-libs/ossp-uuid)
+)"
+
+DEPEND="${CDEPEND}
+!!<sys-apps/sandbox-2.0
+sys-devel/bison
+sys-devel/flex
+nls? ( sys-devel/gettext )
+xml? ( virtual/pkgconfig )
+"
+
+RDEPEND="${CDEPEND}
+!dev-db/postgresql-docs:${SLOT}
+!dev-db/postgresql-base:${SLOT}
+!dev-db/postgresql-server:${SLOT}
+selinux? ( sec-policy/selinux-postgresql )
+"
+
+pkg_setup() {
+	use server && CONFIG_CHECK="~SYSVIPC" linux-info_pkg_setup
+
+	enewgroup postgres 70
+	enewuser postgres 70 /bin/bash /var/lib/postgresql postgres
+
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	# Work around PPC{,64} compilation bug where bool is already defined
+	sed '/#ifndef __cplusplus/a #undef bool' -i src/include/c.h || die
+
+	# Set proper run directory
+	sed "s|\(PGSOCKET_DIR\s\+\)\"/tmp\"|\1\"${EPREFIX}/run/postgresql\"|" \
+		-i src/include/pg_config_manual.h || die
+
+	# Fix bug 555198: Correct typo in assembly code for alpha architecture
+	epatch "${FILESDIR}/${PN}-${SLOT}-alpha-fix-read-memory-barrier.patch"
+
+	use server || epatch "${FILESDIR}/${PN}-${SLOT}-no-server.patch"
+
+	# Fix bug 486556 where the server would crash at start up because of
+	# an infinite loop caused by a self-referencing symlink.
+	epatch "${FILESDIR}/postgresql-9.2-9.4-tz-dir-overflow.patch"
+
+	if use pam ; then
+		sed -e "s/\(#define PGSQL_PAM_SERVICE \"postgresql\)/\1-${SLOT}/" \
+			-i src/backend/libpq/auth.c || \
+			die 'PGSQL_PAM_SERVICE rename failed.'
+	fi
+
+	epatch_user
+}
+
+src_configure() {
+	case ${CHOST} in
+		*-darwin*|*-solaris*)
+			use nls && append-libs intl
+			;;
+	esac
+
+	export LDFLAGS_SL="${LDFLAGS}"
+	export LDFLAGS_EX="${LDFLAGS}"
+
+	local PO="${EPREFIX%/}"
+
+	local i uuid_config=""
+	if use uuid; then
+		for i in ${UTIL_LINUX_LIBC[@]}; do
+			use ${i} && uuid_config="--with-uuid=e2fs"
+		done
+		for i in ${BSD_LIBC[@]}; do
+			use ${i} && uuid_config="--with-uuid=bsd"
+		done
+		[[ -z $uuid_config ]] && uuid_config="--with-uuid=ossp"
+	fi
+
+	econf \
+		--prefix="${PO}/usr/$(get_libdir)/postgresql-${SLOT}" \
+		--datadir="${PO}/usr/share/postgresql-${SLOT}" \
+		--docdir="${PO}/usr/share/doc/${PF}" \
+		--includedir="${PO}/usr/include/postgresql-${SLOT}" \
+		--mandir="${PO}/usr/share/postgresql-${SLOT}/man" \
+		--sysconfdir="${PO}/etc/postgresql-${SLOT}" \
+		--with-system-tzdata="${PO}/usr/share/zoneinfo" \
+		$(use_enable !pg_legacytimestamp integer-datetimes) \
+		$(use_enable threads thread-safety) \
+		$(use_with kerberos gssapi) \
+		$(use_with ldap) \
+		$(use_with pam) \
+		$(use_with perl) \
+		$(use_with python) \
+		$(use_with readline) \
+		$(use_with ssl openssl) \
+		$(use_with tcl) \
+		${uuid_config} \
+		$(use_with xml libxml) \
+		$(use_with xml libxslt) \
+		$(use_with zlib) \
+		"$(use_enable nls nls "$(wanted_languages)")"
+}
+
+src_compile() {
+	emake
+	emake -C contrib
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	emake DESTDIR="${D}" install -C contrib
+
+	dodoc README HISTORY doc/{TODO,bug.template}
+
+	# man pages are already built, but if we have the target make them,
+	# they'll be generated from source before being installed so we
+	# manually install man pages.
+	# We use ${SLOT} instead of doman for postgresql.eselect
+	insinto /usr/share/postgresql-${SLOT}/man/
+	doins -r doc/src/sgml/man{1,3,7}
+	if ! use server; then
+		# Remove man pages for non-existent binaries
+		for m in {initdb,pg_{controldata,ctl,resetxlog},post{gres,master}}; do
+			rm "${ED}/usr/share/postgresql-${SLOT}/man/man1/${m}.1"
+		done
+	fi
+	docompress /usr/share/postgresql-${SLOT}/man/man{1,3,7}
+
+	insinto /etc/postgresql-${SLOT}
+	newins src/bin/psql/psqlrc.sample psqlrc
+
+	dodir /etc/eselect/postgresql/slots/${SLOT}
+	echo "postgres_ebuilds=\"\${postgres_ebuilds} ${PF}\"" > \
+		"${ED}/etc/eselect/postgresql/slots/${SLOT}/base"
+
+	use static-libs || find "${ED}" -name '*.a' -delete
+
+	if use doc ; then
+		docinto html
+		dodoc doc/src/sgml/html/*
+
+		docinto sgml
+		dodoc doc/src/sgml/*.{sgml,dsl}
+	fi
+
+	if use server; then
+		sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
+			"${FILESDIR}/${PN}.confd" | newconfd - ${PN}-${SLOT}
+
+		sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
+			"${FILESDIR}/${PN}.init-9.3" | newinitd - ${PN}-${SLOT}
+
+		sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
+			"${FILESDIR}/${PN}.service" | \
+			systemd_newunit - ${PN}-${SLOT}.service
+
+		systemd_newtmpfilesd "${FILESDIR}"/${PN}.tmpfilesd ${PN}-${SLOT}.conf
+
+		newbin "${FILESDIR}"/${PN}-check-db-dir ${PN}-${SLOT}-check-db-dir
+
+		use pam && pamd_mimic system-auth ${PN}-${SLOT} auth account session
+
+		if use prefix ; then
+			keepdir /run/postgresql
+			fperms 0775 /run/postgresql
+		fi
+	fi
+}
+
+pkg_postinst() {
+	postgresql-config update
+
+	elog "If you need a global psqlrc-file, you can place it in:"
+	elog "    ${EROOT%/}/etc/postgresql-${SLOT}/"
+
+	if use server ; then
+		elog
+		elog "Gentoo specific documentation:"
+		elog "https://wiki.gentoo.org/wiki/PostgreSQL"
+		elog
+		elog "Official documentation:"
+		elog "http://www.postgresql.org/docs/${SLOT}/static/index.html"
+		elog
+		elog "The default location of the Unix-domain socket is:"
+		elog "    ${EROOT%/}/run/postgresql/"
+		elog
+		elog "Before initializing the database, you may want to edit PG_INITDB_OPTS"
+		elog "so that it contains your preferred locale in:"
+		elog "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+		elog
+		elog "Then, execute the following command to setup the initial database"
+		elog "environment:"
+		elog "    emerge --config =${CATEGORY}/${PF}"
+	fi
+}
+
+pkg_prerm() {
+	if use server && [[ -z ${REPLACED_BY_VERSION} ]] ; then
+		ewarn "Have you dumped and/or migrated the ${SLOT} database cluster?"
+		ewarn "\thttps://wiki.gentoo.org/wiki/PostgreSQL/QuickStart#Migrating_PostgreSQL"
+
+		ebegin "Resuming removal in 10 seconds (Control-C to cancel)"
+		sleep 10
+		eend 0
+	fi
+}
+
+pkg_postrm() {
+	postgresql-config update
+}
+
+pkg_config() {
+	use server || die "USE flag 'server' not enabled. Nothing to configure."
+
+	[[ -f "${EROOT%/}/etc/conf.d/postgresql-${SLOT}" ]] \
+		&& source "${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+	[[ -z "${PGDATA}" ]] && PGDATA="${EROOT%/}/etc/postgresql-${SLOT}/"
+	[[ -z "${DATA_DIR}" ]] \
+		&& DATA_DIR="${EROOT%/}/var/lib/postgresql/${SLOT}/data"
+
+	# environment.bz2 may not contain the same locale as the current system
+	# locale. Unset and source from the current system locale.
+	if [ -f "${EROOT%/}/etc/env.d/02locale" ]; then
+		unset LANG
+		unset LC_CTYPE
+		unset LC_NUMERIC
+		unset LC_TIME
+		unset LC_COLLATE
+		unset LC_MONETARY
+		unset LC_MESSAGES
+		unset LC_ALL
+		source "${EROOT%/}/etc/env.d/02locale"
+		[ -n "${LANG}" ] && export LANG
+		[ -n "${LC_CTYPE}" ] && export LC_CTYPE
+		[ -n "${LC_NUMERIC}" ] && export LC_NUMERIC
+		[ -n "${LC_TIME}" ] && export LC_TIME
+		[ -n "${LC_COLLATE}" ] && export LC_COLLATE
+		[ -n "${LC_MONETARY}" ] && export LC_MONETARY
+		[ -n "${LC_MESSAGES}" ] && export LC_MESSAGES
+		[ -n "${LC_ALL}" ] && export LC_ALL
+	fi
+
+	einfo "You can modify the paths and options passed to initdb by editing:"
+	einfo "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+	einfo
+	einfo "Information on options that can be passed to initdb are found at:"
+	einfo "    http://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
+	einfo "    http://www.postgresql.org/docs/${SLOT}/static/app-initdb.html"
+	einfo
+	einfo "PG_INITDB_OPTS is currently set to:"
+	if [[ -z "${PG_INITDB_OPTS}" ]] ; then
+		einfo "    (none)"
+	else
+		einfo "    ${PG_INITDB_OPTS}"
+	fi
+	einfo
+	einfo "Configuration files will be installed to:"
+	einfo "    ${PGDATA}"
+	einfo
+	einfo "The database cluster will be created in:"
+	einfo "    ${DATA_DIR}"
+	einfo
+	while [ "$correct" != "true" ] ; do
+		einfo "Are you ready to continue? (y/n)"
+		read answer
+		if [[ $answer =~ ^[Yy]([Ee][Ss])?$ ]] ; then
+			correct="true"
+		elif [[ $answer =~ ^[Nn]([Oo])?$ ]] ; then
+			die "Aborting initialization."
+		else
+			echo "Answer not recognized"
+		fi
+	done
+
+	if [ -n "$(ls -A ${DATA_DIR} 2> /dev/null)" ] ; then
+		eerror "The given directory, '${DATA_DIR}', is not empty."
+		eerror "Modify DATA_DIR to point to an empty directory."
+		die "${DATA_DIR} is not empty."
+	fi
+
+	einfo "Creating the data directory ..."
+	if [[ ${EUID} == 0 ]] ; then
+		mkdir -p "${DATA_DIR}"
+		chown -Rf postgres:postgres "${DATA_DIR}"
+		chmod 0700 "${DATA_DIR}"
+	fi
+
+	einfo "Initializing the database ..."
+
+	if [[ ${EUID} == 0 ]] ; then
+		su postgres -c "${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
+	else
+		"${EROOT%/}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
+	fi
+
+	if [[ "${DATA_DIR%/}" != "${PGDATA%/}" ]] ; then
+		mv "${DATA_DIR%/}"/{pg_{hba,ident},postgresql}.conf "${PGDATA}"
+		ln -s "${PGDATA%/}"/{pg_{hba,ident},postgresql}.conf "${DATA_DIR%/}"
+	fi
+
+	cat <<- EOF >> "${PGDATA%/}"/postgresql.conf
+		# This is here because of https://bugs.gentoo.org/show_bug.cgi?id=518522
+		# On the off-chance that you might need to work with UTF-8 encoded
+		# characters in PL/Perl
+		plperl.on_init = 'use utf8; use re; package utf8; require "utf8_heavy.pl";'
+	EOF
+
+	einfo "The autovacuum function, which was in contrib, has been moved to the main"
+	einfo "PostgreSQL functions starting with 8.1, and starting with 8.4 is now enabled"
+	einfo "by default. You can disable it in the cluster's:"
+	einfo "    ${PGDATA%/}/postgresql.conf"
+	einfo
+	einfo "The PostgreSQL server, by default, will log events to:"
+	einfo "    ${DATA_DIR%/}/postmaster.log"
+	einfo
+	if use prefix ; then
+		einfo "The location of the configuration files have moved to:"
+		einfo "    ${PGDATA}"
+		einfo "To start the server:"
+		einfo "    pg_ctl start -D ${DATA_DIR} -o '-D ${PGDATA} --data-directory=${DATA_DIR}'"
+		einfo "To stop:"
+		einfo "    pg_ctl stop -D ${DATA_DIR}"
+		einfo
+		einfo "Or move the configuration files back:"
+		einfo "mv ${PGDATA}*.conf ${DATA_DIR}"
+	else
+		einfo "You should use the '${EROOT%/}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
+		einfo "instead of 'pg_ctl'."
+	fi
+}
+
+src_test() {
+	einfo ">>> Test phase [check]: ${CATEGORY}/${PF}"
+
+	if use server && [[ ${UID} -ne 0 ]] ; then
+		emake check
+
+		einfo "If you think other tests besides the regression tests are necessary, please"
+		einfo "submit a bug including a patch for this ebuild to enable them."
+	else
+		use server || \
+			ewarn 'Tests cannot be run without the "server" use flag enabled.'
+		[[ ${UID} -eq 0 ]] || \
+			ewarn 'Tests cannot be run as root. Enable "userpriv" in FEATURES.'
+
+		ewarn 'Skipping.'
+	fi
+}
diff --git a/dev-db/vsqlite++/Manifest b/dev-db/vsqlite++/Manifest
index db7a5164dcbc..dc9be57e40c6 100644
--- a/dev-db/vsqlite++/Manifest
+++ b/dev-db/vsqlite++/Manifest
@@ -1,2 +1 @@
-DIST vsqlite++-0.3.12.tar.gz 23720 SHA256 655d53abe7b21b024111565cf9da8ccaa90540e5ff36d7d227c2eaa22305e925 SHA512 5e134de01a3f2c8adab40ae4f598b5c3b095b7503bf1bcc1aae012d3b087ff68b7cd1fc4dbea74b8cfeac82e9a18428efccea3c1e5a229c2aec05f8228c28344 WHIRLPOOL 66c1252ecc2d05ad2a3690141efe4dace892a839b8b649cbf7b96e55de30bc5d384bd22394d94ca112b0f26380baf6b5db0a6c94d469b9cc5777986e9ae61842
 DIST vsqlite++-0.3.13.tar.gz 28195 SHA256 73dea3c0b4b7769254da17182efbf9fc16893c50ed0d544abfdde127b69467d5 SHA512 70fcd16348e3b2a0854b1d496c68fda7e354068aefbd6a5ad21d7a42afebd2bd746f604240475acfeebe00898ab156f9dfd687346fdf5c77d775262db3a5666e WHIRLPOOL 02d79a14dabbc7a2191f40370d94071c95c4dcb72f4eb6ba68b38872296a92473ddfd06a702bb6862fa2a5eac9ac921dd93e3312615bc587b319cf7a64ee5427
diff --git a/dev-db/vsqlite++/vsqlite++-0.3.12.ebuild b/dev-db/vsqlite++/vsqlite++-0.3.12.ebuild
deleted file mode 100644
index 0c1d4099c041..000000000000
--- a/dev-db/vsqlite++/vsqlite++-0.3.12.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-AUTOTOOLS_IN_SOURCE_BUILD=1
-AUTOTOOLS_AUTORECONF=1
-
-inherit autotools-utils
-
-DESCRIPTION="VSQLite++ - A welldesigned and portable SQLite3 Wrapper for C++"
-HOMEPAGE="http://evilissimo.fedorapeople.org/releases/vsqlite--/"
-SRC_URI="https://github.com/vinzenz/vsqlite--/archive/${PV}.tar.gz -> ${P}.tar.gz"
-IUSE="static-libs"
-
-LICENSE="BSD"
-
-SLOT="0"
-
-KEYWORDS="amd64 ppc x86"
-
-DEPEND=">=dev-libs/boost-1.33.1"
-
-RDEPEND="${DEPEND}
-		dev-db/sqlite:3"
-
-DOCS=(AUTHORS COPYING ChangeLog INSTALL NEWS README TODO VERSION)
-
-# package name is vsqlite++, but github / homepage name is vsqlite--
-S="${WORKDIR}/vsqlite---${PV}"
-
-src_prepare() {
-	## remove O3 in AM_CXXFLAGS
-	sed -i -e 's/-O3//' Makefile.am || die
-	autotools-utils_src_prepare
-}
-
-src_configure() {
-	econf $(use_enable static-libs static)
-}
diff --git a/dev-db/vsqlite++/vsqlite++-0.3.13-r1.ebuild b/dev-db/vsqlite++/vsqlite++-0.3.13-r1.ebuild
index 3d4d05d1ef32..a85abd50881d 100644
--- a/dev-db/vsqlite++/vsqlite++-0.3.13-r1.ebuild
+++ b/dev-db/vsqlite++/vsqlite++-0.3.13-r1.ebuild
@@ -17,7 +17,7 @@ LICENSE="BSD"
 
 SLOT="0"
 
-KEYWORDS="amd64 ~ppc x86"
+KEYWORDS="amd64 ppc x86"
 
 DEPEND=">=dev-libs/boost-1.33.1"
 
diff --git a/dev-db/xtrabackup-bin/Manifest b/dev-db/xtrabackup-bin/Manifest
index 8a16ff0a9e76..91cfdd3da6e1 100644
--- a/dev-db/xtrabackup-bin/Manifest
+++ b/dev-db/xtrabackup-bin/Manifest
@@ -1,6 +1,6 @@
 DIST percona-xtrabackup-2.1.9-x86_32.tar.gz 48553967 SHA256 5cff7d0b8ca81a15f4084cf733c3e4ffb1856fbf9306628a493dfc4fa13ca62b SHA512 1095fd84cb8361d8afecf713572ccb7fa792a204474951951bb6e5f526ce3b62ce835020f1ca40cd20290fe4db5b0039bfdcc97d2970f7422fd31293cee0ebd6 WHIRLPOOL 13919d1d7d7b0c80168446d24450b6d41764b09fbed136b0cd1d9493a0392150dddae72cca01262403cbfe0c848efd579acbf509c40715abee2289ea2d00ebc7
 DIST percona-xtrabackup-2.1.9-x86_64.tar.gz 49557534 SHA256 a4821d324bcd6e40db9f8288d8f681efb1ce53e9fd4797e8a862a599d7b6c570 SHA512 93b13414d67d23af1cacbd58033001cec4e7e097d231cd8e665814cfea5e9414e25a98d29738ef0dde72218c7aeb4cd0cb112bcc68f6a70fcc247dc91a80f486 WHIRLPOOL ea9d696da8c4aa30fa73f052f4004b7451ae310c2654ecf5767f82a87d403c9727a7a9260a2ad3cb7d003916366fa041d9a0d69cd669fe98f7d7f867c313a2fb
-DIST percona-xtrabackup-2.2.3-4982-Linux-i686.tar.gz 23872530 SHA256 435586fe3078dc363e0628ee5354ce0837ca282ee4f4a51b9e8417729392e027 SHA512 ee8f1bb18e80e7fe053c73279acc94fbc03856f9593a6daeca398f24a6dc5e4f1af3e30d37101f6bfaef9c45a42ee59dd311739aea5605e5704b5c207eaad67e WHIRLPOOL 2562ac17f851c92ff9a5303b2823bd21aa5148162282a0904945239cdd8bc1b1428d3e3882da8726cccec429db2c4c033536b8d323177c74750c63dd4911e17f
-DIST percona-xtrabackup-2.2.3-4982-Linux-x86_64.tar.gz 24266588 SHA256 00c7efb4c2b8a14bd635eae9ae2b8310db11bab7cc34c051bae85d7f7af9919b SHA512 9a2f52ff2b167523714970d71279a9f929e126dcb7257f238e4c41a546e14c9088c4d1839e30714500e5c781d8b41ccf43750d253422a1e4d8b16ec8efbf08fb WHIRLPOOL 9e3e3d57920dd1d895c15d4cb2cece69f276ec07cc57fb09c89bd0d511ba9958bb55397adad15f0026e4535322034eb8bf38983f86342e2a56e33794d652eba2
+DIST percona-xtrabackup-2.2.12-Linux-i686.tar.gz 25150988 SHA256 8d8954e1ab6b7f1274c8663b92df1d3765af420da01bfdb7f1bf30c0b8188caf SHA512 67965379758eaf89714292a7c75a6d90befa185421bebc0fa3fbedf80cf200630aae576aff9c8f5ee080894fb01143924029b04106dcb8d97faa3bc62887d117 WHIRLPOOL 28deec400462a64d3e32a56cd819c80b9ff659a479e8cd6f28c44d17349293c101919a8dde1e0bbee721c12245a95c6d4901551d8a5f47df4971ca5289d34679
+DIST percona-xtrabackup-2.2.12-Linux-x86_64.tar.gz 25478801 SHA256 73a02e348aa2eca10328af28548eeeb5eea25ba40c1abc5c0b79c4555c48e4ec SHA512 1a42c0c5195ed955c954b741b63952e2f5eeaae7935372292ddbd665f6cfaacc55d0a00b1cb14839184ab28d03cd9771a177b39277c750553932a27cc0947119 WHIRLPOOL f245441f99c209819fa2a1b8bcb08dbe6ff33f09ddcb418db25f1c38636d5983930ebae65ab5702351b36bae38a2a411ebbe7e8b3d72307804b79359db68a91a
 DIST percona-xtrabackup-2.2.5-5027-Linux-i686.tar.gz 24942813 SHA256 b904bb8d7bc48b48aaadf1af8a21df9987198f36c23c576e2a2090c9e06eb55a SHA512 16ca7739e43b65f22ac5ab9cc9e0e701d4b0ecbe179ebac70719902000a36cb37de87446b9a2830813fe2714ffdfa7bccb938961951c01804d8e2ec98f6d7c10 WHIRLPOOL 3d565e29ddaf9f21d3c0e85d49f2ba8379ab1c07961561853abdc197bbf3c4c7aa067e9e0da3d5de96569b41834282e2954a02e4d8169ed0030606c3f4169e6c
 DIST percona-xtrabackup-2.2.5-5027-Linux-x86_64.tar.gz 25313698 SHA256 90b5ca03e872581e95aa3e24972212940417d3c64879b28bc37a848f89bba7e9 SHA512 54576cecd24797730ab0b262558424e2716135de88ccc80dfb7716adfcf404fdb2ac2ceec99b436eb1e31392fffdf5eba122e15070cc0f10906aaf5617bada85 WHIRLPOOL 655143c2a75db8a38b9f97a657c3c199bf1054552a5b638ff8c27d3ad76b1d67b1504628077577664711010c8085b3185a754507c0f330e5603e94ebccbf25d2
diff --git a/dev-db/xtrabackup-bin/xtrabackup-bin-2.2.12.ebuild b/dev-db/xtrabackup-bin/xtrabackup-bin-2.2.12.ebuild
new file mode 100644
index 000000000000..c31eec49530c
--- /dev/null
+++ b/dev-db/xtrabackup-bin/xtrabackup-bin-2.2.12.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+MY_PN="percona-${PN/-bin}"
+MY_P="${MY_PN}-${PV}"
+
+inherit eutils
+
+DESCRIPTION="MySQL hot backup software that performs non-blocking backups for
+InnoDB and XtraDB databases"
+HOMEPAGE="http://www.percona.com/software/percona-xtrabackup"
+SRC_URI="
+	amd64? (
+		http://www.percona.com/downloads/XtraBackup/Percona-XtraBackup-${PV}/binary/tarball/${MY_P}-Linux-x86_64.tar.gz
+	)
+	x86? (
+		http://www.percona.com/downloads/XtraBackup/Percona-XtraBackup-${PV}/binary/tarball/${MY_P}-Linux-i686.tar.gz
+	)"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+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"
+
+if use amd64; then
+	S="${WORKDIR}/${MY_P}-Linux-x86_64"
+elif use x86; then
+	S="${WORKDIR}/${MY_P}-Linux-i686"
+fi
+
+src_prepare() {
+	# bug 501904 - CVE-2014-2029
+	epatch "${FILESDIR}/${PN}-2.1.7-no-versioncheck.patch"
+}
+
+src_install() {
+	for tool in innobackupex xbcrypt xbstream xtrabackup; do
+		dobin bin/${tool}
+		doman man/man1/${tool}.1
+	done
+}
+
+pkg_postinst() {
+	einfo "xtrabackup 2.2.x is for MySQL/MariaDB 5.6 only"
+}
diff --git a/dev-db/xtrabackup-bin/xtrabackup-bin-2.2.3.ebuild b/dev-db/xtrabackup-bin/xtrabackup-bin-2.2.3.ebuild
deleted file mode 100644
index 60dae13b5e9a..000000000000
--- a/dev-db/xtrabackup-bin/xtrabackup-bin-2.2.3.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MY_PN="percona-${PN/-bin}"
-MY_PVR="${PV}-4982"
-MY_P="${MY_PN}-${PV}"
-MY_PF="${MY_PN}-${MY_PVR}"
-
-inherit eutils
-
-DESCRIPTION="MySQL hot backup software that performs non-blocking backups for
-InnoDB and XtraDB databases"
-HOMEPAGE="http://www.percona.com/software/percona-xtrabackup"
-SRC_URI="
-	amd64? (
-		http://www.percona.com/downloads/XtraBackup/XtraBackup-${PV}/binary/tarball/${MY_PF}-Linux-x86_64.tar.gz
-	)
-	x86? (
-		http://www.percona.com/downloads/XtraBackup/XtraBackup-${PV}/binary/tarball/${MY_PF}-Linux-i686.tar.gz
-	)"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="dev-libs/libaio
-	|| ( dev-libs/libgcrypt:0/11 dev-libs/libgcrypt:11/11 )
-	dev-libs/libgpg-error
-	dev-perl/DBD-mysql"
-
-if use amd64; then
-	S="${WORKDIR}/${MY_P}-Linux-x86_64"
-elif use x86; then
-	S="${WORKDIR}/${MY_P}-Linux-i686"
-fi
-
-src_prepare() {
-	# bug 501904 - CVE-2014-2029
-	epatch "${FILESDIR}/${PN}-2.1.7-no-versioncheck.patch"
-}
-
-src_install() {
-	for bin in innobackupex xbcrypt xbstream xtrabackup; do
-		dobin bin/${bin}
-	done
-}
-
-pkg_postinst() {
-	einfo "xtrabackup 2.2.x is for MySQL/MariaDB 5.6 only"
-}
diff --git a/dev-go/go-tools/Manifest b/dev-go/go-tools/Manifest
index 12ffecd8a2e1..e05fd1fff83d 100644
--- a/dev-go/go-tools/Manifest
+++ b/dev-go/go-tools/Manifest
@@ -1,3 +1,4 @@
 DIST go-favicon.ico 1150 SHA256 d76ca702a6d81e20ddd31c8c5a4368130e7c68d990600316f6f1c9509bd38ba7 SHA512 194c4b3c360321a10f714b6755d9155de6129682b4070d19b52d0d5706fcbd1d244ea38c33fd77fe1dec85b3e39720dd0a62f5b126803036fbc8337a9d72fea6 WHIRLPOOL f55a84a28812bffd1fa38e098e6ba7d757bdefc0e20c3d8ef767fb1bc7d6e2cfbb8d1ae0593e81cce17c27f60e6aacf094e6c67b1f592c0546090feab9d3830f
 DIST go-tools-0_pre20150805.tar.gz 1633388 SHA256 80db6fc563df50eb924dbf4f96cef287fc6b89cc8b98595c1dac3c80a118f290 SHA512 80813c2da74c7b25fa2cfd15b2505757e7f466469ac701cb22d190dc83a607f091c4dea207a2e371e53d7a1f5459e7b53e5eea53c95565e958a6eb7fcb212359 WHIRLPOOL 3b000f830d81c35e6f76a9883d9430eb7fe0f546a36579a150a7bd8f825146a0623726a98a7b7f764825c9fee30af1f89b3bbc98efeaf05fe8f64bbb127a1f68
 DIST go-tools-0_pre20150823.tar.gz 1633447 SHA256 12ac4c5e49134a7dcc9c2f3123d20562463d83360a6e1d2fc6ace5ec025a31ae SHA512 6d906bae8433182e7a105a46b92c4f64ac145196ccc72f8934376fc49e5d554182931745e92229c4571323a6eba9ce2f680b5add3844ecb593a194cbbc1b0b63 WHIRLPOOL acb3ac4e5abcc56a37bec461a7e4170e4a45ebd917ed9ca1dd016c92756a01b0ed0887e525bc17acd7a88a34fd5f9495a5ffa63f58a05d547e2fba17c4ff9a8e
+DIST go-tools-0_pre20150902.tar.gz 1630401 SHA256 c5026af549199f62a374b705981cf0f04661497af0d69ee47d54e9992ee44c8f SHA512 437d5178ce5bf6c4d39ad638259e7c18150d2574dffb632003fa0b83a61a9103e666e562aecc6e8412d995e4b5ffacda6bc12b1cfbbea0b22a5ff680a0a7e3e1 WHIRLPOOL bfc7998c3c042059213975dc6864814edf497b5c6ee70c228925bcb7dd283efb4f49d7ac05383b8ae2d85ccc7fbd7663e3c2899bffe47e4e36195bd639bc61c7
diff --git a/dev-go/go-tools/go-tools-0_pre20150902.ebuild b/dev-go/go-tools/go-tools-0_pre20150902.ebuild
new file mode 100644
index 000000000000..7d598bdab2bf
--- /dev/null
+++ b/dev-go/go-tools/go-tools-0_pre20150902.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+EGO_PN="golang.org/x/tools/..."
+
+if [[ ${PV} = *9999* ]]; then
+	inherit golang-vcs
+else
+	EGIT_COMMIT="1330b28"
+	ARCHIVE_URI="https://github.com/golang/tools/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+	inherit golang-vcs-snapshot
+fi
+inherit golang-build
+
+DESCRIPTION="Go Tools"
+HOMEPAGE="https://godoc.org/golang.org/x/tools"
+SRC_URI="${ARCHIVE_URI}
+	http://golang.org/favicon.ico -> go-favicon.ico"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+DEPEND="dev-go/go-net:=
+	!<dev-lang/go-1.5"
+RDEPEND=""
+
+src_prepare() {
+	local go_src="${EGO_PN%/...}"
+	# disable broken tests
+	sed -e 's:TestWeb(:_\0:' \
+		-i src/${go_src}/cmd/godoc/godoc_test.go || die
+	sed -e 's:TestVet(:_\0:' \
+		-i src/${go_src}/cmd/vet/vet_test.go || die
+	sed -e 's:TestImport(:_\0:' \
+		-i src/${go_src}/go/gcimporter/gcimporter_test.go || die
+	sed -e 's:TestImportStdLib(:_\0:' \
+		-i src/${go_src}/go/importer/import_test.go || die
+	sed -e 's:TestStdlib(:_\0:' \
+		-i src/${go_src}/go/loader/stdlib_test.go || die
+	sed -e 's:TestStdlib(:_\0:' \
+		-i src/${go_src}/go/ssa/stdlib_test.go || die
+	sed -e 's:TestGorootTest(:_\0:' \
+		-e 's:TestFoo(:_\0:' \
+		-e 's:TestTestmainPackage(:_\0:' \
+		-i src/${go_src}/go/ssa/interp/interp_test.go || die
+	sed -e 's:TestBar(:_\0:' \
+		-e 's:TestFoo(:_\0:' \
+		-i src/${go_src}/go/ssa/interp/testdata/a_test.go || die
+	sed -e 's:TestCheck(:_\0:' \
+		-i src/${go_src}/go/types/check_test.go || die
+	sed -e 's:TestStdlib(:_\0:' \
+		-e 's:TestStdFixed(:_\0:' \
+		-e 's:TestStdKen(:_\0:' \
+		-i src/${go_src}/go/types/stdlib_test.go || die
+	sed -e 's:TestRepoRootForImportPath(:_\0:' \
+		-i src/${go_src}/go/vcs/vcs_test.go || die
+
+	# Add favicon to the godoc web interface (bug 551030)
+	cp "${DISTDIR}"/go-favicon.ico "src/${go_src}/godoc/static/favicon.ico" ||
+		die
+	sed -e 's:"example.html",:\0\n\t"favicon.ico",:' \
+		-i src/${go_src}/godoc/static/makestatic.go || die
+	sed -e 's:<link type="text/css":<link rel="icon" type="image/png" href="/lib/godoc/favicon.ico">\n\0:' \
+		-i src/${go_src}/godoc/static/godoc.html || die
+}
+
+src_compile() {
+	# Generate static.go with favicon included
+	pushd src/golang.org/x/tools/godoc/static >/dev/null || die
+	go run makestatic.go || die
+	popd >/dev/null
+
+	golang-build_src_compile
+}
+
+src_test() {
+	# Create a writable GOROOT in order to avoid sandbox violations.
+	cp -sR "$(go env GOROOT)" "${T}/goroot" || die
+	mkdir -p "${T}/goroot/test" || die
+	GOROOT="${T}/goroot" golang-build_src_test
+	rm -rf "${T}/goroot"
+}
+
+src_install() {
+	# Create a writable GOROOT in order to avoid sandbox violations.
+	cp -sR "$(go env GOROOT)" "${T}/goroot" || die
+
+	GOROOT="${T}/goroot" golang-build_src_install
+
+	# bug 558818: install binaries in $GOROOT/bin to avoid file collisions
+	exeinto "$(go env GOROOT)/bin"
+	doexe bin/* "${T}/goroot/bin/godoc"
+	dodir /usr/bin
+	ln "${ED}$(go env GOROOT)/bin/godoc" "${ED}usr/bin/godoc" || die
+
+	rm "${D}"$(go env GOROOT)/bin/{cover,vet} || die
+}
diff --git a/dev-haskell/aeson-qq/aeson-qq-0.7.4.ebuild b/dev-haskell/aeson-qq/aeson-qq-0.7.4.ebuild
index 685d9f4dc310..5446f2679267 100644
--- a/dev-haskell/aeson-qq/aeson-qq-0.7.4.ebuild
+++ b/dev-haskell/aeson-qq/aeson-qq-0.7.4.ebuild
@@ -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/aeson-0.6:=[profile?]
diff --git a/dev-haskell/enclosed-exceptions/enclosed-exceptions-1.0.1.1.ebuild b/dev-haskell/enclosed-exceptions/enclosed-exceptions-1.0.1.1.ebuild
index c9bba0c8afc1..46345ab65a27 100644
--- a/dev-haskell/enclosed-exceptions/enclosed-exceptions-1.0.1.1.ebuild
+++ b/dev-haskell/enclosed-exceptions/enclosed-exceptions-1.0.1.1.ebuild
@@ -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/async-2.0:=[profile?]
diff --git a/dev-haskell/glib/Manifest b/dev-haskell/glib/Manifest
index 68f7f0681468..6bd7d85e76b2 100644
--- a/dev-haskell/glib/Manifest
+++ b/dev-haskell/glib/Manifest
@@ -6,3 +6,4 @@ DIST glib-0.12.5.4.tar.gz 46080 SHA256 e63346df27cb45aa7c76bfffe5ba81bb5332b48bd
 DIST glib-0.13.0.6.tar.gz 47966 SHA256 3b434abc2d981f183fa022d57ec14cc2fd880cb74443b9ceaccf9c9f37a0c3c2 SHA512 9ee6aa2afcc2c98d3883d845e06ac9be576718c4f3920567c1150e885747b5884c13966574f2f0d7a7c5e1afd22d63deefbf3be9ed4263ee168927cf6a0e54d7 WHIRLPOOL b6d70d6b9f89196df383ba1b8c4be379e15d09ea0cb473e9a85f661dd63f9fff784cc96b643bcd0a87c58aeb4ccc11bfd993e880faa2b65d0986565787d98eda
 DIST glib-0.13.0.7.tar.gz 47988 SHA256 fe5fb5339a7694c915a388bced3b8d934d78cf51c5369f348fa6f52815dea69b SHA512 357182e65e913323e6cee5709c117152e0fe7ffe3171adacbfa5f553904a9ac98406f1f246b37ea96fdc097235bbccc902b3b4fc459e4bf0c09d92c51bad6791 WHIRLPOOL ad710086350abb4a9f0257b7d52f23b9a5cbf1b560243e5a0384cf2d082bf464dc0ca7a7ba35e55ed86b967d805307c7b3d209de468f0b9b1faeb4dc545df79a
 DIST glib-0.13.1.0.tar.gz 48157 SHA256 df1d250f1f2aeba208b7cb71f7201189b9939f6a5224739e35d94a5aa3d84c87 SHA512 5268c0ed455e5664bb0473a43eeb47dc3da6ee0c522fe72b17e5837f109a791f1323db0c843cc4e32d9804ed04e61e0a4a93f99b857d7badc79b233dd906ad5b WHIRLPOOL b2ac8e6f5798d94ef281d02fa356823a71a7007c61b92d0eb79a9f84ffadfa377b20ca59482f1841b8c0d8625efc9cee5d4db9440edc06f69bfa3ba9e91a25fc
+DIST glib-0.13.2.1.tar.gz 48651 SHA256 9763884736aa7ef2f0bb9e716aba5f87d50e6d068134e486f359490b8112acdf SHA512 c3d42c9ce4e0fbba24dd7d0ddd01040afe853fcfb3c06c9452f24953095f350ba21824aa32ab59f8bf7638cbd0056939b3a6e3d469fb83ce9100ab0017711139 WHIRLPOOL db98f95e618d926d67f09971bb28aa38a1455d20d299cc75c4658c93e4f7c86829e2fa5347b7b29bf68c1208a4f71f75111ee982393302c5d78f0a021e3feabd
diff --git a/dev-haskell/glib/glib-0.13.2.1.ebuild b/dev-haskell/glib/glib-0.13.2.1.ebuild
new file mode 100644
index 000000000000..6287f65782c0
--- /dev/null
+++ b/dev-haskell/glib/glib-0.13.2.1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+# ebuild generated by hackport 0.4.6.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Binding to the GLIB library for Gtk2Hs"
+HOMEPAGE="http://projects.haskell.org/gtk2hs/"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0/${PV}"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="+closure_signals"
+
+RDEPEND=">=dev-haskell/text-1.0.0.0:=[profile?] <dev-haskell/text-1.3:=[profile?]
+	>=dev-haskell/utf8-string-0.2:=[profile?] <dev-haskell/utf8-string-1.1:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+	dev-libs/glib:2
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.18
+	dev-haskell/gtk2hs-buildtools
+	virtual/pkgconfig
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag closure_signals closure_signals)
+}
diff --git a/dev-haskell/haskell-src-exts/haskell-src-exts-1.16.0.1.ebuild b/dev-haskell/haskell-src-exts/haskell-src-exts-1.16.0.1.ebuild
index fd033cd79dab..1a3a974e87d8 100644
--- a/dev-haskell/haskell-src-exts/haskell-src-exts-1.16.0.1.ebuild
+++ b/dev-haskell/haskell-src-exts/haskell-src-exts-1.16.0.1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~ppc ~ppc64 ~sparc x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/cpphs-1.3:=[profile?]
diff --git a/dev-haskell/haskell-src-meta/haskell-src-meta-0.6.0.8-r1.ebuild b/dev-haskell/haskell-src-meta/haskell-src-meta-0.6.0.8-r1.ebuild
index 205975e46e48..c9351506ede2 100644
--- a/dev-haskell/haskell-src-meta/haskell-src-meta-0.6.0.8-r1.ebuild
+++ b/dev-haskell/haskell-src-meta/haskell-src-meta-0.6.0.8-r1.ebuild
@@ -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/haskell-src-exts-1.16:=[profile?] <dev-haskell/haskell-src-exts-1.17:=[profile?]
diff --git a/dev-haskell/pandoc-citeproc/pandoc-citeproc-0.3.1.ebuild b/dev-haskell/pandoc-citeproc/pandoc-citeproc-0.3.1.ebuild
index 11a61e5770c9..a2cce773b9e3 100644
--- a/dev-haskell/pandoc-citeproc/pandoc-citeproc-0.3.1.ebuild
+++ b/dev-haskell/pandoc-citeproc/pandoc-citeproc-0.3.1.ebuild
@@ -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="+bibutils embed_data_files +hexpat +network test_citeproc unicode_collation"
 
 RDEPEND=">=app-text/pandoc-1.12.1:=[profile?]
diff --git a/dev-haskell/safe/safe-0.3.8.ebuild b/dev-haskell/safe/safe-0.3.8.ebuild
index 9bebb8ff0f2f..218838bb1c07 100644
--- a/dev-haskell/safe/safe-0.3.8.ebuild
+++ b/dev-haskell/safe/safe-0.3.8.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc64 x86"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/scientific/scientific-0.2.0.1.ebuild b/dev-haskell/scientific/scientific-0.2.0.1.ebuild
index dffc953e638a..794e488d0c0b 100644
--- a/dev-haskell/scientific/scientific-0.2.0.1.ebuild
+++ b/dev-haskell/scientific/scientific-0.2.0.1.ebuild
@@ -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/hashable-1.1.2:=[profile?] <dev-haskell/hashable-1.3:=[profile?]
diff --git a/dev-haskell/th-expand-syns/th-expand-syns-0.3.0.6.ebuild b/dev-haskell/th-expand-syns/th-expand-syns-0.3.0.6.ebuild
index 0e6d25f46fd1..2eae1834940e 100644
--- a/dev-haskell/th-expand-syns/th-expand-syns-0.3.0.6.ebuild
+++ b/dev-haskell/th-expand-syns/th-expand-syns-0.3.0.6.ebuild
@@ -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/syb:=[profile?]
diff --git a/dev-haskell/th-lift/th-lift-0.7.2.ebuild b/dev-haskell/th-lift/th-lift-0.7.2.ebuild
index 0c19de667dd9..b73c01ba1a74 100644
--- a/dev-haskell/th-lift/th-lift-0.7.2.ebuild
+++ b/dev-haskell/th-lift/th-lift-0.7.2.ebuild
@@ -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/th-orphans/th-orphans-0.11.1.ebuild b/dev-haskell/th-orphans/th-orphans-0.11.1.ebuild
index 03f92bbde7a3..ff195f08d429 100644
--- a/dev-haskell/th-orphans/th-orphans-0.11.1.ebuild
+++ b/dev-haskell/th-orphans/th-orphans-0.11.1.ebuild
@@ -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/mtl:=[profile?]
diff --git a/dev-haskell/th-reify-many/th-reify-many-0.1.3.ebuild b/dev-haskell/th-reify-many/th-reify-many-0.1.3.ebuild
index a6dadae3aca3..1a221e8bc739 100644
--- a/dev-haskell/th-reify-many/th-reify-many-0.1.3.ebuild
+++ b/dev-haskell/th-reify-many/th-reify-many-0.1.3.ebuild
@@ -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/mtl:=[profile?]
diff --git a/dev-haskell/yaml/yaml-0.8.10.1.ebuild b/dev-haskell/yaml/yaml-0.8.10.1.ebuild
index 8d7073156a1f..ca28c675b995 100644
--- a/dev-haskell/yaml/yaml-0.8.10.1.ebuild
+++ b/dev-haskell/yaml/yaml-0.8.10.1.ebuild
@@ -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="no-exe unicode system-libyaml"
 
 RDEPEND=">=dev-haskell/aeson-0.5:=[profile?]
diff --git a/dev-java/boilerpipe/metadata.xml b/dev-java/boilerpipe/metadata.xml
index 4128863055b4..e94379cf02b3 100644
--- a/dev-java/boilerpipe/metadata.xml
+++ b/dev-java/boilerpipe/metadata.xml
@@ -5,5 +5,7 @@
 		<email>ercpe@gentoo.org</email>
 		<name>Johann Schmitz (ercpe)</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">kohlschutter/boilerpipe</remote-id>
+	</upstream>
 </pkgmetadata>
-
diff --git a/dev-java/c3p0/Manifest b/dev-java/c3p0/Manifest
index 938fec84276b..096fb2bf0b46 100644
--- a/dev-java/c3p0/Manifest
+++ b/dev-java/c3p0/Manifest
@@ -1,2 +1,3 @@
 DIST c3p0-0.9.1.2-codegen.tar.bz2 15434 SHA256 c8c920d7cc240e07276525d861f88128f6403e1a123e2526796caa440b9c9025 SHA512 4b20c5307f98dfaf82676d21ec9ade0251c043322b544acea912dbc6a866773180c548aa32764fb73894daa9115ae9eec702846a2112f620e90d1e462c879075 WHIRLPOOL 6df9184ef6c1385217e74dd0a5dd21dffce37be80e7f3bc418a3b83d9062e793f20ef436d641e8f03b7b5a2bcf3ce71d19f1b09dae1660c2f103942a6aa2f1c4
 DIST c3p0-0.9.1.2.src.tgz 380118 SHA256 b837a5668a7fb0cb2338dbe26867ecc91c6e9ea030440107becb999a9a8724d3 SHA512 a33c413b5471d56d72224e3ad74996828854a2a0227bc674d5956612db517348de1f36695d16ab4cbb38827bddbe03952a5518205296fc35ecbd11b536b5aa32 WHIRLPOOL 864fd5eb470024c1f6072a886ba62732d0c1e06ae3f0cc3235b071112f0d4a20b820d4e3b68194e8af0be07567b38f219d2dc8e597f3e5d6b01afa21fb5882b9
+DIST c3p0-0.9.5.1.src.tgz 839657 SHA256 35383e69cad101168575453c5ae5297a7e0fb2ab2cc885373f8d5b7c46254afd SHA512 1843696d48e68f6120a68c42f0eb60c342ed8d1ddcc1d78c500d85c3d7e5e48358d100ecb1e0efa192aba34c5d9221437d53c2a968a42b797ff84bc12db4a724 WHIRLPOOL 04621c0583c918099da5e59a8e2bbbc31ec4e07e73cb9b4377d1ae128606ca3f281cf38e89efa753d2c4367bb8b48d2669b2f405df9680df9616657edcc2219f
diff --git a/dev-java/c3p0/c3p0-0.9.5.1.ebuild b/dev-java/c3p0/c3p0-0.9.5.1.ebuild
new file mode 100644
index 000000000000..8a41d9f1d502
--- /dev/null
+++ b/dev-java/c3p0/c3p0-0.9.5.1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+JAVA_PKG_IUSE="doc source examples test"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Library for augmenting traditional (DriverManager-based) JDBC drivers with JNDI-bindable DataSources"
+HOMEPAGE="http://c3p0.sourceforge.net/"
+
+MY_P="${P}.src"
+
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tgz"
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-macos"
+IUSE=""
+
+CDEPEND="dev-java/log4j:0
+	dev-java/mchange-commons:0"
+DEPEND=">=virtual/jdk-1.6
+	${CDEPEND}
+	test? ( dev-java/junit:4 )
+	"
+RDEPEND=">=virtual/jre-1.6
+	${CDEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+
+java_prepare() {
+	find . -type f -name \*.jar -exec rm -v {} \; || die
+	find . -type f -name \*.class -exec rm -v {} \; || die
+	java-pkg_jar-from --into lib/ mchange-commons
+	java-pkg_jar-from --into lib/ log4j
+
+}
+
+EANT_TEST_TARGET="junit-tests"
+EANT_TEST_GENTOO_CLASSPATH="junit-4"
+
+src_test() {
+	java-pkg-2_src_test
+}
+
+src_install() {
+	java-pkg_newjar build/${P}.jar
+	dodoc README-SRC
+	use doc && java-pkg_dojavadoc build/apidocs
+	use source && java-pkg_dosrc src/java/com/mchange/v2
+	use examples && java-pkg_doexamples src/java/com/mchange/v2/c3p0/example
+}
diff --git a/dev-java/cal10n/cal10n-0.8.1.ebuild b/dev-java/cal10n/cal10n-0.8.1.ebuild
index 22bd2195dc6d..3c8e21a0b4db 100644
--- a/dev-java/cal10n/cal10n-0.8.1.ebuild
+++ b/dev-java/cal10n/cal10n-0.8.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://repo1.maven.org/maven2/ch/qos/${PN}/${PN}-api/${PV}/${PN}-api-${
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ppc ppc64 x86"
 IUSE=""
 
 RDEPEND=">=virtual/jre-1.5"
diff --git a/dev-java/easymock/Manifest b/dev-java/easymock/Manifest
index ad46f066ffe6..469b59a29116 100644
--- a/dev-java/easymock/Manifest
+++ b/dev-java/easymock/Manifest
@@ -1,2 +1 @@
-DIST easymock-3.2.zip 970922 SHA256 3ada340522b94d549a887774d42aaea008fb0aabc6f7e649ad6d23399bc7b80c SHA512 472b0f7183f48dcbd60996a78a69f3be0c9c5762856bf827d9a721b3ff03fca2fb68d3baae970a1de3eee0f293d02b3d9dba3c5634575ba395200e67f767ba3b WHIRLPOOL 5bf9dc61bf4716b88d72cbf80553b2629f7e55ffcd00821e74d8fcdb58160d1a494008d75f39a17ef2319c0bb913ae666f7c7e7d45394f6ad69d032d9e125442
 DIST easymock-3.3.1.zip 1015625 SHA256 06332d947698e615e00baa5441e54f03423912079d81733dc089e57cae138a36 SHA512 0898276df82a99df10e4c91b5b097b6d579914580995b35274ef9d4e0c874266d54c865f96d008becaa210a6307916f6488d0caa205a85caf62920e939becf46 WHIRLPOOL 61e68261374caa1c7a879c28c329e8f3f6a5f067b57bb3c3eb79405b978544e0f3924b5cbe63cdee35964284d3ea602bb039d68461c73869783cf5e555a2d245
diff --git a/dev-java/easymock/easymock-3.2-r1.ebuild b/dev-java/easymock/easymock-3.2-r1.ebuild
deleted file mode 100644
index cbefa0d40e19..000000000000
--- a/dev-java/easymock/easymock-3.2-r1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-JAVA_PKG_IUSE="doc examples source"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Provides Mock Objects for interfaces in JUnit tests by generating them on the fly"
-HOMEPAGE="http://www.easymock.org/"
-SRC_URI="mirror://sourceforge/${PN}/EasyMock/${PV}/${P}.zip"
-
-LICENSE="|| ( MIT Apache-2.0 )"
-SLOT="3.2"
-KEYWORDS="amd64 x86 ~ppc ~ppc64"
-IUSE=""
-
-CDEPEND="dev-java/junit:4
-	dev-java/objenesis:0
-	dev-java/cglib:3"
-
-DEPEND=">=virtual/jdk-1.6
-	app-arch/unzip
-	${CDEPEND}"
-
-RDEPEND=">=virtual/jre-1.6
-	${CDEPEND}"
-
-S="${WORKDIR}/${P}"
-
-JAVA_GENTOO_CLASSPATH="junit-4,objenesis,cglib-3"
-JAVA_SRC_DIR="src"
-
-src_unpack() {
-	default
-
-	cd "${S}" || die
-	unzip ${P}-sources.jar -d src/ || die
-
-	if use examples; then
-		unzip ${P}-samples.jar -d examples/ || die
-	fi
-}
-
-java_prepare() {
-	epatch "${FILESDIR}"/${PV}-no-android.patch
-	rm src/org/easymock/internal/AndroidClassProxyFactory.java || die
-}
-
-src_install() {
-	java-pkg-simple_src_install
-
-	use examples && java-pkg_doexamples examples
-}
diff --git a/dev-java/easymock/easymock-3.3.1.ebuild b/dev-java/easymock/easymock-3.3.1.ebuild
index 446f885bce55..aae38ba8b147 100644
--- a/dev-java/easymock/easymock-3.3.1.ebuild
+++ b/dev-java/easymock/easymock-3.3.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/EasyMock/${PV}/${P}.zip"
 
 LICENSE="|| ( MIT Apache-2.0 )"
 SLOT="3.2"
-KEYWORDS="~amd64 ~x86 ~ppc ~ppc64"
+KEYWORDS="amd64 x86 ppc ppc64"
 IUSE=""
 
 COMMON_DEPEND="
diff --git a/dev-java/glassfish-ejb-api/glassfish-ejb-api-3.2.ebuild b/dev-java/glassfish-ejb-api/glassfish-ejb-api-3.2.ebuild
index 59d58ede8d05..ce2254034950 100644
--- a/dev-java/glassfish-ejb-api/glassfish-ejb-api-3.2.ebuild
+++ b/dev-java/glassfish-ejb-api/glassfish-ejb-api-3.2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://dev.gentoo.org/~tomwij/files/dist/${P}.tar.xz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 CDEPEND="java-virtuals/xmlrpc-api:0
 	java-virtuals/transaction-api:0"
diff --git a/dev-java/glassfish-servlet-api/Manifest b/dev-java/glassfish-servlet-api/Manifest
index f94e1b37ca23..80578b1f8bbb 100644
--- a/dev-java/glassfish-servlet-api/Manifest
+++ b/dev-java/glassfish-servlet-api/Manifest
@@ -1 +1 @@
-DIST glassfish-v2-b44-src.zip 35200817 SHA256 331f6a65aa94b9d79f5b0a726d71afc4726032b3e9d62f2c7ab6fc679790e1b7 SHA512 2c236f37c08ec465959e80c90e3a2f8cdf9d143dc93c7a6bbdcc6e015125f167153f6abfaba4390a5d179b43130458b996498d3f1390588477462bd45ea367ee WHIRLPOOL 71c9b9cbcc194ffe03f4a604b570d618f88b7f08955b573f6b218683fba854267ee83915d26d909d8caf92779a2e15752d6fbce6c402d8ca69b108d18042845b
+DIST javax.servlet-3.1.1-sources.jar 211576 SHA256 c17212d132bf33dc9dcc44ed0e945e92a08cc8ec494ce7cd62de9f9514d63826 SHA512 7f152a389481e0381f041d97a6774a3e762a86b2a8a5413901c472fc2882b9cabd141dd85b46b8a7006cbe677c29c4caee09f3fc934afae857a6c1362efdc7bc WHIRLPOOL 9d794227cc6a119ef61122ec63515e18199bb4239382129b56f88ff74d5fb5b08a2b3259a1cfcde14a0761561beefd0152c853476d6d65039de76d791bd4090c
diff --git a/dev-java/glassfish-servlet-api/files/build_xml.patch b/dev-java/glassfish-servlet-api/files/build_xml.patch
deleted file mode 100644
index 033ebd625271..000000000000
--- a/dev-java/glassfish-servlet-api/files/build_xml.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- build.xml	2007-04-27 03:38:38.000000000 -0400
-+++ build.xml	2007-04-27 03:39:17.000000000 -0400
-@@ -28,7 +28,9 @@
-              target="dist" inheritAll="false"/>
-         <ant dir="${servlet.api.home}/src/jsr245" 
-              target="dist" inheritAll="false"/>
-+<!--
-       <antcall target="prepare-jar"/>
-+-->
-     </target>
- 
-     <!-- build pwc-->
diff --git a/dev-java/glassfish-servlet-api/glassfish-servlet-api-2_beta44.ebuild b/dev-java/glassfish-servlet-api/glassfish-servlet-api-2_beta44.ebuild
deleted file mode 100644
index 795b4314ad8c..000000000000
--- a/dev-java/glassfish-servlet-api/glassfish-servlet-api-2_beta44.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-JAVA_PKG_IUSE="doc source"
-
-inherit base java-pkg-2 java-ant-2
-
-MY_PV="${PV/_beta/-b}"
-DESCRIPTION="Glassfish reference implementation of Servlet API 2.5 and JSP API 2.1"
-HOMEPAGE="https://glassfish.dev.java.net/javaee5/webtier/webtierhome.html"
-SRC_URI="http://download.java.net/javaee5/trunk/promoted/source/glassfish-v${MY_PV}-src.zip"
-LICENSE="CDDL"
-SLOT="2.5"
-KEYWORDS="amd64 x86"
-
-DEPEND=">=virtual/jdk-1.5
-	app-arch/unzip"
-
-RDEPEND=">=virtual/jre-1.5"
-
-S="${WORKDIR}/glassfish/servlet-api/"
-
-PATCHES=( "${FILESDIR}/build_xml.patch" )
-
-src_compile() {
-	eant build $(use doc || echo -Ddocs.uptodate=true)
-}
-
-src_install() {
-	java-pkg_dojar "${S}"/src/jakarta-servletapi-5/jsr154/dist/lib/*.jar
-	java-pkg_dojar "${S}"/src/jsr245/dist/lib/*.jar
-
-	use doc && java-pkg_dojavadoc src/jsr245/build/docs/api
-	use source && java-pkg_dosrc src/*
-}
diff --git a/dev-java/glassfish-servlet-api/glassfish-servlet-api-3.1.1.ebuild b/dev-java/glassfish-servlet-api/glassfish-servlet-api-3.1.1.ebuild
new file mode 100644
index 000000000000..bcdaa586d4eb
--- /dev/null
+++ b/dev-java/glassfish-servlet-api/glassfish-servlet-api-3.1.1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+MY_PN="javax.servlet"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Glassfish reference implementation of Servlet API 2.5 and JSP API 2.1"
+HOMEPAGE="https://glassfish.dev.java.net/javaee5/webtier/webtierhome.html"
+SRC_URI="http://central.maven.org/maven2/org/glassfish/javax.servlet/${PV}/${MY_P}-sources.jar"
+LICENSE="CDDL"
+SLOT="3.1.1"
+KEYWORDS="amd64 x86"
+
+DEPEND=">=virtual/jdk-1.6
+	app-arch/unzip"
+
+RDEPEND=">=virtual/jre-1.6"
diff --git a/dev-java/gson/metadata.xml b/dev-java/gson/metadata.xml
index cb549ed01713..f384ea9a98d2 100644
--- a/dev-java/gson/metadata.xml
+++ b/dev-java/gson/metadata.xml
@@ -3,4 +3,7 @@
 <pkgmetadata>
 	<herd>java</herd>
 	<longdescription>Gson is a Java library that can be used to convert Java Objects into their JSON representation. It can also be used to convert a JSON string to an equivalent Java object. Gson can work with arbitrary Java objects including pre-existing objects that you do not have source-code of.</longdescription>
+	<upstream>
+		<remote-id type="github">google/gson</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-java/guava/guava-13.0.1-r1.ebuild b/dev-java/guava/guava-13.0.1-r1.ebuild
new file mode 100644
index 000000000000..0471a5049c4f
--- /dev/null
+++ b/dev-java/guava/guava-13.0.1-r1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="A collection of Google's core Java libraries"
+HOMEPAGE="https://code.google.com/p/guava-libraries/"
+SRC_URI="http://search.maven.org/remotecontent?filepath=com/google/${PN}/${PN}/${PV}/${P}-sources.jar"
+
+LICENSE="Apache-2.0"
+SLOT="13"
+KEYWORDS="~amd64 ~x86 ~ppc ~ppc64 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+
+CDEPEND="
+	dev-java/jsr305:0
+	java-virtuals/jdk-with-com-sun:0"
+RDEPEND="${CDEPEND}
+	>=virtual/jre-1.6"
+DEPEND="${CDEPEND}
+	app-arch/unzip
+	>=virtual/jdk-1.6"
+
+JAVA_GENTOO_CLASSPATH="jsr305"
diff --git a/dev-java/guava/guava-13.0.1-r2.ebuild b/dev-java/guava/guava-13.0.1-r2.ebuild
new file mode 100644
index 000000000000..2d8d4719e128
--- /dev/null
+++ b/dev-java/guava/guava-13.0.1-r2.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="A collection of Google's core Java libraries"
+HOMEPAGE="https://code.google.com/p/guava-libraries/"
+SRC_URI="http://search.maven.org/remotecontent?filepath=com/google/${PN}/${PN}/${PV}/${P}-sources.jar"
+
+LICENSE="Apache-2.0"
+SLOT="13"
+KEYWORDS="~amd64 ~x86 ~ppc ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+
+CDEPEND="
+	dev-java/jsr305:0
+	java-virtuals/jdk-with-com-sun:0"
+RDEPEND="${CDEPEND}
+	>=virtual/jre-1.7"
+DEPEND="${CDEPEND}
+	app-arch/unzip
+	>=virtual/jdk-1.7"
+
+JAVA_GENTOO_CLASSPATH="jsr305"
diff --git a/dev-java/hamcrest-core/metadata.xml b/dev-java/hamcrest-core/metadata.xml
index 3157d41caefc..1676f06714ee 100644
--- a/dev-java/hamcrest-core/metadata.xml
+++ b/dev-java/hamcrest-core/metadata.xml
@@ -4,5 +4,6 @@
 	<herd>java</herd>
 	<upstream>
 		<remote-id type="google-code">hamcrest</remote-id>
+		<remote-id type="github">hamcrest/</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-java/hamcrest-generator/metadata.xml b/dev-java/hamcrest-generator/metadata.xml
index 3157d41caefc..1676f06714ee 100644
--- a/dev-java/hamcrest-generator/metadata.xml
+++ b/dev-java/hamcrest-generator/metadata.xml
@@ -4,5 +4,6 @@
 	<herd>java</herd>
 	<upstream>
 		<remote-id type="google-code">hamcrest</remote-id>
+		<remote-id type="github">hamcrest/</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-java/hamcrest-integration/metadata.xml b/dev-java/hamcrest-integration/metadata.xml
index 604e0a4238bb..fe6095912db3 100644
--- a/dev-java/hamcrest-integration/metadata.xml
+++ b/dev-java/hamcrest-integration/metadata.xml
@@ -2,5 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>java</herd>
+	<upstream>
+		<remote-id type="github">hamcrest/</remote-id>
+	</upstream>
 </pkgmetadata>
-
diff --git a/dev-java/hamcrest-library/metadata.xml b/dev-java/hamcrest-library/metadata.xml
index 314c8dd8ca46..1676f06714ee 100644
--- a/dev-java/hamcrest-library/metadata.xml
+++ b/dev-java/hamcrest-library/metadata.xml
@@ -4,6 +4,6 @@
 	<herd>java</herd>
 	<upstream>
 		<remote-id type="google-code">hamcrest</remote-id>
+		<remote-id type="github">hamcrest/</remote-id>
 	</upstream>
 </pkgmetadata>
-
diff --git a/dev-java/icedtea-bin/Manifest b/dev-java/icedtea-bin/Manifest
index 2a5d20b21325..2af2548863da 100644
--- a/dev-java/icedtea-bin/Manifest
+++ b/dev-java/icedtea-bin/Manifest
@@ -1,38 +1,20 @@
-DIST icedtea-bin-core-6.1.13.7-amd64.tar.xz 49242728 SHA256 146bc914aa9d2e19d1273f2e0f71888c4ea1130eacc63bd22075f9a79e255f63 SHA512 b9e6509fe3ac033d593863af05d7853b7d4cbaf7dca041035b662dbde7866d56418fd075e4592aaf6640894bb639673a683e9c8add5aaf3c502caabae67ad2ee WHIRLPOOL 05fcd580b9d678a3717692582393d00f8e0f0de621e9edfdd1ecd76269f9d5a0ac87b14416dd49f0df0c572bf99de2436b1b4a15944f771d60c568b51c298706
-DIST icedtea-bin-core-6.1.13.7-ppc.tar.xz 39570240 SHA256 74bee77719b7285c6d91665e572cece092c1f6cee137032c50b9aec35db641d0 SHA512 e13a31f3ee4b60d603019a519047ffea8d97f3c6ff69ed7930c38e85f9051541f5dbe2c526b61175d3bcd371703168ba74949e1c7b44b4c8a790285864466e33 WHIRLPOOL 15f9b33c0edda490b48524996c2f3be263a498d97d969156e41dfbc03e7b780e568db80397a1a4716899c3fa202091bbec1c3358ddd178bdb8c010481e7604a6
-DIST icedtea-bin-core-6.1.13.7-x86.tar.xz 50373836 SHA256 3cc3e7c1fc07370bc7009d0ce7cfc2270de47165c45b8352b429aa1ccca561f2 SHA512 eb3eff46f20ffc93b7babe90aa3b9283119cf369fca503e7bdd7905455b9ac0e2eb389cc77e2e9bb02d802dc846dff75bbd218a844b80fa475e4ff04c88e9cf2 WHIRLPOOL 7593fd10d4c2e95fc02c2a7c94276632b6d99a077ec095018d5003e0c694c63f3e6eb3aa1d872f32911ad5ec2a90eae5f7a40c2784ef1b460e4a24a451369fd2
 DIST icedtea-bin-core-6.1.13.8-amd64.tar.xz 49241032 SHA256 4712f3844d1a56ac545b01cdbc76c9e315480ace3120a99b22e5d904091c8b3e SHA512 5cfff7ff5a0d0b4eef382620e98849c318df342a23ea0bb5764b4032ca7a96a86e67991ad97ec95b35786be0e3ac7a39990104e12ea47cc50c1c7326e933feb2 WHIRLPOOL 2e992d99675095aad1b74492d02f3c1fb393bf9bb1d496ace2036c0a40dbe2b1605783a84131fc5c15aa06834605d1ae962e7fee45556b41176cde54f1357273
-DIST icedtea-bin-core-6.1.13.8-ppc.tar.xz 39585952 SHA256 51a9b4c4167b900467f6b1b614f5808af2fa8ef35f7101e1ddc7f5142b3a3ad3 SHA512 04d72e811852df169a20daad73ed56ec454b98a60dd8943286d9ff382283d6b15c6acb1e0a3bc03ccc1d14333dae3ffdf8060c2a7de30c09d6b9cfacf9d90339 WHIRLPOOL 406782e148b4864cb250686a311e34937324ec3442a821d6bb76a016e2a6f7f06fed4b46d9ab8ff5675c629103b2832828efb8f0017fb193cc01209869bfe4c6
+DIST icedtea-bin-core-6.1.13.8-r1-ppc.tar.xz 39586112 SHA256 782019d78fba6562170382fcbe5fff4fca5feaffef442ceabc93e3b4ed40c035 SHA512 81b678673bae9fb07b9aa4ccc98fb6d3132ace2f776c224510787def831ca765bfd8dbea875ae8049f564268952459a692db1125e9f37eccb6ff3684511fc648 WHIRLPOOL ff9400b7d65b9b3661b679ebad6747b9d3a2de882bc1c281565a6220ca0ef45a8abb6c9b2d1db64f491d55d173dd017780514b2b685ec5d3ce7c5e25cec08c46
 DIST icedtea-bin-core-6.1.13.8-x86.tar.xz 49676360 SHA256 495171e826414051670fade7ac7af2705b3ecc01ba2ef3e63790cd24ec4fe7b5 SHA512 56cd90d21e30f2451f7206b84d80ed0d227f750f7e9155f2401e12ea4b9bbcdd882abbb01cade21e0bfcc05318552bd1e6102cc78aa601654179058f595ca68a WHIRLPOOL 6eabeca6006f84d912686ecd5921466cc5a7f3308b192e3ad9d4cee7a54356923a0c720e8d3d083533ab7b4baea839ed8247db2d1ee43dcd989ed312ff139323
-DIST icedtea-bin-core-7.2.5.5-amd64.tar.xz 52642552 SHA256 cfa0399d93eab61004c6d3c23c7b2b46623c0fde1c8034adc09a6fdae9ba1a26 SHA512 427b134109bfd92a073f10467f030f2bccf7b3fdcc6ec66f63d0ab5a896dfb4cc4904a9b8f5b6833fe4ae73bffb54e97e75a363500ed897a153ea7a687c75e9a WHIRLPOOL 84fa1a480633d2f2459238c11fa58ba514a8eede37f54eebd19effd5e2dcf01bcf1f320c65f150018b52eea3c630c313ba85166ea9d8d44bb61b42c42738b9ad
-DIST icedtea-bin-core-7.2.5.5-arm.tar.xz 43744840 SHA256 5f508eebadbf51a01677f3dcac2678f5a09eb7e9fd8f224fd397961e56a95a73 SHA512 45524bd6e6c1f8f1ac69e2c8891c647e0dd3e4afe272561f17565f4e21b7104fdb9718f12023bfba308d311d661e00122a82c81e61a7bc6a744108495d343dc8 WHIRLPOOL 4e386a6cd5997a1d169550b3e6fcd29ccdb1bf0f7942e3c4ed02521c13afc7531de78c313ad6d50555e8781bb2566b7a10a6393db09e576bf5579ae8615fb4c4
-DIST icedtea-bin-core-7.2.5.5-ppc.tar.xz 42616472 SHA256 36cc4fd0bfef1c2ae0dcad7116dd2a3b6e7a5ff7fd25da1ae47560755415cf2f SHA512 a0f80ae0701b0f51bd165143b16aa9c9ae7314d1b1ccc5c4ef96f37012598bf1d1c7ace0742573562b642354b5f263e1dd97d026bb3d2addbe94b33c208c79b2 WHIRLPOOL 619901211cb099eb405a46bcf1bee5828c523b29ad8013fccaf77a82d3885b9517888c2461960e344aef8cb3c8b4807c909e0f693f3207c1c2dd35f74784ddac
-DIST icedtea-bin-core-7.2.5.5-x86.tar.xz 53895468 SHA256 f32ddce3e2435334aedc9bbda2319f88b4a0e92a9b7ada7afbc2724d8a1cee07 SHA512 e4e085a9e23f75e79f0172986e83bc5b03373826a11f4240c8331c0086521189a611b6a20b4f7f4c28d8e2436dcb046590a06487e14d1d79c454698ac0a5a9bc WHIRLPOOL 0785f0cac8655b6c9843b592bfe71a4c28ec4215e18d0257499ac5207458a159fb8d1c56defe6b3bedf07a0fa299531b51182f6c27abdf24bf801157b3b624a5
-DIST icedtea-bin-core-7.2.5.6-ppc.tar.xz 42626788 SHA256 e6b3d928264fba2fb526266751cba5b08e59d3a79620d4ec35fb40887ad5432d SHA512 f6c55d4d536066576a9dcb318ac3441235a00bb8fea93484bcca3715ba1ea191eeb66907982f48bb1ca4bf01c5733be65c12cd145402041c76f31f3acc4ef51a WHIRLPOOL 729bf0ffbb7e35ea68ed8f5a874f5798e33b7456ce6105244a1ce1f85dee2b747e079b7437613342e9b9e1b9b71e0d85b7c232d84c185c4466bf1e925460c02f
+DIST icedtea-bin-core-7.2.5.6-r1-ppc.tar.xz 42627680 SHA256 c0af7c735b01f0ddb8096c27b6ebbc458cded8ad5a50a129867bab74872cffb3 SHA512 0eb6ff3d44da0fe05cdf2af0e630db74c46fc201c0cb7f0d833442f153b701ece58c60cd5a273d48f233374743090b841810f0caf9640bf5e9977019deb8504b WHIRLPOOL 8c29d11dbe6576d8d485bd67ea13b891848762069823b10216469de0c9e87420d1e7b57e6dc9c640cafe0545ecdbb68fc226ed0a77b1bbee0cdc73c3a3b0932f
 DIST icedtea-bin-core-7.2.6.1-amd64.tar.xz 52856100 SHA256 48d596cf5f9ba52368c48d6cc94e12a3a5d6e8c2ed880e689f005eeeade7cc72 SHA512 4dd5709400033fcdf2948b418b9aa4bbb90a3903d40f6a22571b4b181eec2336b802f100bf1e524ea1d13bfd340e60bb00bcde24d4f80fe925585f1971c55f54 WHIRLPOOL dec45c96d8c1a35bd4d83724eff84aaffc73b5671bbcd8837a3030f2adee9716517f950a2e606d2a4b021a83d25e8feb7457b3b3d83e8da920cf95533c057095
 DIST icedtea-bin-core-7.2.6.1-arm.tar.xz 43914036 SHA256 215dbe4907da2038d0aed3e37149afce56fb837ad3ba0d521cd92b5ebb15c5d5 SHA512 df6179db20db3e12e9688816fee18f1782a3400c91d3bd691cd3fb88322f7855b08582d57ca8a9da3bda1d0c30106518d9d02b911f4f8cc24d95636be22807ee WHIRLPOOL d313aac6f33ff28e873976be055b879e3c8e559022f15c21401ccc5a5c35715a08a43feb60d0c52250161cdea815be2edddd51a6965695287c25627f2779f9d9
 DIST icedtea-bin-core-7.2.6.1-x86.tar.xz 53528524 SHA256 b7f24f28b70c2b0886b94f48daeebe0391cce2e57ad83bd876dd302b67c96d42 SHA512 bf4aac17ff754bacb35e5b597d9bc60d88a7fa40619cf8c9613fa2d2776097e4c781132b4d66a8ca32ed49a2a07556d2a839b818e613116cc2f2b5f9e257d6a1 WHIRLPOOL 0e033c6e819edaa52eab51267a71236aedb9648f3b63f62a35db329e0fda2dc1dddf370c3da115360ffb2bd1c97aac88f6400cea9fb29f6210d9385720489062
-DIST icedtea-bin-doc-6.1.13.7.tar.xz 9845104 SHA256 75e2d37caa2bbcca8d77f4b6b63be7337484f1a0cd35ba784f191ac433b4f8bc SHA512 0f78642a0a27cee3439aac44f2df4cb43dd167c1bdb84c337636357f63195a3dfc4d2157a2368fdc72eceaad73eea17d016ca4f39f4c09a62322abac72111999 WHIRLPOOL 66db5023cd88c241427731aa66f227cab917a389ad89140a9e9174d8da5aa9a83850edd42a9359121633305e542d74c9f9b73788c7683da733c1b407d71df8e0
 DIST icedtea-bin-doc-6.1.13.8.tar.xz 9844756 SHA256 71cffd016040d28366f8e50c983ca55a3af1d7b08a56c501838b78fc0d1837c1 SHA512 36a0691ad720869c2855345bd20dcccd60e7adfa90c511d829131997e9e995ab929a2f24955955b638b21672912a39774deacf72ee3390ae41e3d44e58eea5eb WHIRLPOOL 11892894ddae46a6f999e8e835a5d428fcb86643c20f44639d8b692090468ddecfdd7db4cebef0c422983950cfaf6d337b540effef64c6fb1f7d58ffd2e069e7
-DIST icedtea-bin-doc-7.2.5.5.tar.xz 10599388 SHA256 ced6f04aeb35bdcfbeffff1f631db4ad523e16705fcce3697145cb7af111f8bb SHA512 f55dc8bb5a3c5d0b1016b03605f38f0dcb25adb1b615cd185bce771959ebe079213efb9ad25b46d2a21edf6c4338111eed2efd2e16ef6f1ca8e9458a6de22196 WHIRLPOOL 4a32c77494f7c2dbab4f682f2747f88ace7bedc43f38ffe8ffef84d0b3dfcd3269b1fff91c7e221070fc5bf2057bda1d60168d6dc428242904d2842193a0ab49
 DIST icedtea-bin-doc-7.2.5.6.tar.xz 10420552 SHA256 97cafad29d26e1fba75fd848a3d35de0e84e83f36a9e345852f1d684a81e148b SHA512 53261dbbafad7af9b97cdc9b55430ebbbc7e4975acff7b73013f893eba5583c303abf32d77ab8fb641bac35ac5549c313bc1f4c94c27faed88ab23bc5c22aec4 WHIRLPOOL 6213996e1435acac287b2993814ae1f49c13ce58f9315731d2e327c3f9765b6119202e83735c504919b9487e04de23ee28ac2695f8a67a49652a4c01f19aa0c0
 DIST icedtea-bin-doc-7.2.6.1.tar.xz 10603004 SHA256 33175237a2d35709197a59f26b5ea8bc5f3d60679964b8f3e985714080ce7a0d SHA512 e79ef83cbc7c33defb10bcdf1f5e56e07e3f187d181444a92edbe6cdbf58323c3c009bbddbdca35d2065145290cf5641bb688971b6c1fee337827c3b06394ec6 WHIRLPOOL 15a101cdc4f5cf3426980893e864fe04807c7d552971f249e09bc9bae0fa5c93a7839652c2d4d4099ba07cc32d50bb1d339b6ae6a9b8757776e391d1b30c34d7
-DIST icedtea-bin-examples-6.1.13.7-amd64.tar.xz 1903880 SHA256 1bd0657d389cd046eb1d6dfab32edb66a3a18e97c8ea7d60e066cc5a48fddb3e SHA512 77892fc66c49f746d23a692bf9f6716be613111fc697cb92aef9ad12ba8cebdb32f1d434a6bcfa9237e7a382e613590dc06f8d9b6746cbf381ae8b8e9b47bda9 WHIRLPOOL 1f4d94314430ab12c0aa1cb6fd7d16ceda2a1a3e055982b590877c29d7f2c4ea94c2ebd0d8ce631b98522493a3326d68a2756a3eaa4e043c7a7e0558ae37fb15
-DIST icedtea-bin-examples-6.1.13.7-ppc.tar.xz 1889572 SHA256 c0a4d1f0cdf1bed63c62a7f261c3188bdf53dec288bb501c402325d51677297d SHA512 6c8da2362d25143cafe00c75231125a731b443bcf9325a9baf5807d56e073f551023b6b6a86bc860f615c5f28032f27dbaecf26de79d179a92dd642cc4adee3e WHIRLPOOL d87f7c9cc80481c16e68e31d13c023614b7fbc35e0b39e4adecef2e9a476253460448de935c0988ff349fda3537e900f24b6d38a4ec3805c8a331e3061b19c4f
-DIST icedtea-bin-examples-6.1.13.7-x86.tar.xz 1902248 SHA256 98efdac63222f1bffd65dc791a3bf752e10c8083d23f5d4d6a2b3c0784ba4bca SHA512 247dc6d80425af835c153bd6503e30725183a23b05f0108640040a05ca3f6d86467d174a7e92a64e4513b119040fdafc6ebcc6cffac1bc65aa778f9972f408d7 WHIRLPOOL 8eeabadbab0ad2426d6a191202991c023621f98982b87a1b62f40d2bde6282bf63d095b4c2edff27b950da846385b3cfa0917061f4ff5fab181c9b5d82d2cd0d
 DIST icedtea-bin-examples-6.1.13.8-amd64.tar.xz 1904080 SHA256 29c2933d4fc4c7e240c7406d403a2667a42c5a3faee82413d2255d7dccea6873 SHA512 84771c52b816f4d3f065871df83bdd05408b69941c807de0bdc7ea423cff436878aa58dd5d61cb1bfae35cb37e56e2b5d29be6f6073a744e6af2125d66578713 WHIRLPOOL a08c748dd757c5927abd65088b0961d2dfb716030cc07e64589e5394a434123cb018630766e0223c6578ceb7f67ee0a68f5b2a548b1c9f701a5cc13732b84ecc
 DIST icedtea-bin-examples-6.1.13.8-ppc.tar.xz 1889932 SHA256 62bc68f31b1118d890c2add87a4d14663b0595aeb5fdfd8d904a59a19c4ed7f4 SHA512 22d38c9efa794165e1ecdb8cabb1ecaf8b9c27027cf28562721789c33c1a714e3d226b95a8c5420ff48a769c869ef09c575e76e8995f089037263ddfd72d21c5 WHIRLPOOL 031a8ffb8609028d089d047f1324352db90ef72be951bcedc158f671f2930c4ae5087e65e53ec59e4457a9e09b40ad6848b980b63e3494e0d1dd70721e6e640e
 DIST icedtea-bin-examples-6.1.13.8-x86.tar.xz 1902616 SHA256 cd74d0b8056f7373f370ca62388c2e44786c3b68dccbf30cb9a3bc8ecc8353e4 SHA512 babcc73227115e19fe50b16f79f09e3a35d0c60de44823c3f6617c7276ff4b9efbfb5f03f1149948d4005524b3a136e74b0049a292d83ddf763626fc179d1883 WHIRLPOOL 6621c65b3f871cdc0769dd5361d7a4a17c56f5ca8eb2de1f4abc79ca6343784a5a43834e4906f4d371144615a3b3ed6db44370dc0950508d327587bf2e770ed2
-DIST icedtea-bin-examples-7.2.5.5-amd64.tar.xz 1795668 SHA256 373db6d3bc88e8572a81b03e2dc5b539acb2a48347f6bdc797bf59ad7330e108 SHA512 a34b979094dd337d365d089e49aa6363f201499db2eec3d46edbec2235a55e8d0f488e1329bc699ddbc32c3d11cece95c4678ef5f49d3b4e4fd8a4481739f561 WHIRLPOOL d1112d0ddac4bb329416655e5083e762cb674a5935f655dd0d7759f4950a979b441e6bf3e1be87b596bc0cdb1c226efb96fd0b78b941f53e45c8eec66355b176
-DIST icedtea-bin-examples-7.2.5.5-arm.tar.xz 1778824 SHA256 11b02d038f5d02286200a9d1e58342aef432f0b475d3555068c6ee988407acea SHA512 5e46c15df71684124cdeb6f9ce2978bd86dd795c6c2422d4e67abcee6c230ebee3de8e235b95203fec1e06830253a86ad724d36f843fc2e385d7c3b5cb0e69fb WHIRLPOOL e8930ff6714def3c4dfdf9f1b40d5538a66897d6e9bd397f6167c264f1434889bd15c13ee965ae9db254653c084d47dd6e032c2f8228a6bb2d2c66e8d820f828
-DIST icedtea-bin-examples-7.2.5.5-ppc.tar.xz 1785508 SHA256 0b50cd010ceee2d3c0804897f9934127c4cdfc8c91729df422748ed9a7043365 SHA512 1d7e27b5391ecfa408c5d5e0c1979e732ee43fd3f295311c82d6a9a6f5014136cdbc5f449bf5343b417a66691ff8667364050072d93c2be4b3d7009d6a50980f WHIRLPOOL 42501a028a975e00ebf5449dba0fb6f67c83efa2d8c7639c23b74d96a2d06f576094089432ea28d13eb63dee7c2531fb816d39811e11381cfe33bc8c0ada2f47
-DIST icedtea-bin-examples-7.2.5.5-x86.tar.xz 1794656 SHA256 3ff68a31470260231bbf9b8a9c242705bea4303158ea5b0a739548ce2fe9702b SHA512 59819a6bdc7f74aea90f2a1c1e5714518d28fdf23b508f10fd6ad52707aea9561a4afd12997742e21583fb15008e0fb1213bc677d3930a51f9786b4a54c74f14 WHIRLPOOL dc51882d96791f4a02ee5232efe759ba2f233779765f08c275635430c60f460119e7360a4bb15f676652125c1b6257c8825b909190b51bfcc610f10401362888
 DIST icedtea-bin-examples-7.2.5.6-ppc.tar.xz 1785152 SHA256 5e798c0172e20653df303d2ae334a416bf4c29afff76f425e94d9ef36e81992d SHA512 e3ba6ca13a1f0f76e0a9fc12979b571560bcf74f2c8ae3e23bfd693452f14d7a153ed4fe32058cb9ec8e2071c43cc57094e12a3345f9d36c7d3b8d1744259f05 WHIRLPOOL 05b7463c5d7b36aba805718dbf3c3d37bf30ca2ef61de3672784f20635283c1005443f265821ce52848a35ac656681a125ce31479736435f74db997c82ecae2e
 DIST icedtea-bin-examples-7.2.6.1-amd64.tar.xz 1794976 SHA256 712c0077274e89f601ccd89af5393b959879930d511d5de1b5b377963297fd61 SHA512 70ca271ea0c764fb53009fe4e5f6f3abac9db8e687615c9153a90390fce22fb4f9712fd4a431f7475d2857a7b053b3cd82a9e151f8688e0835cc45dd79a060a3 WHIRLPOOL 53e36eab616a41c70841e37a0be93a0a71dd62169028fc873a52373f8a02c30ae48f5e6b23cdaa9da34d1246029f1737ebc21d519c5763bb0a2aff4c1c6436e5
 DIST icedtea-bin-examples-7.2.6.1-arm.tar.xz 1778216 SHA256 3589b3bfefcfb13f3007852645c72760845014cde52c467a3ba627dfb27f7fc7 SHA512 1ae5b8316bdcf55275e436bfe8647c173be26a9a71ed3f79afa7b2e1d0e556aa7569f95f178c5b183376f6a8418021fcd79e73eae8775177ee1fe50647a23370 WHIRLPOOL d56c37d274b8227ffa2528a3ade58b38f154eade82fc33f545e8b6360a090ecbdf548501d5bf91f5c5a83005f6a42022e83456f02a576ef9bf79ccae2297c7a0
 DIST icedtea-bin-examples-7.2.6.1-x86.tar.xz 1794276 SHA256 21561ec74d5f416f9ce26b849107cd5ed2326d34ecc9fd1315891c3c61cfc13c SHA512 ccf468cf55256fbf2f005762558281f3605b02f7877782d84aaaf5e9cfe030e4d296bc04b21af1c4a98e8ded97e9fafeb33722c81f8a91e5b9b10e864cb5074d WHIRLPOOL 77e70bec0c555c6fa7cc7b8d220aed8d86139bc4f423b96b7fde6d68f1b6176466e53a65f329d0c156925e9f3d7d9e086dbacbc920291c9103a517250faaacb0
-DIST icedtea-bin-src-6.1.13.7.tar.xz 39750536 SHA256 4b778433141b0231da1615266566d1881bf9f1674f5f5721f669dc130710c38d SHA512 43a7baae4874681b438e477790479dbe339a88904deec6c91acf79d09fb25d562f83070e74a8691c51a28b4ebb1f3bd7c9befa52adc4785099e08b84fa8c5eb7 WHIRLPOOL 57d14e18a8365684f5d090f86709d0d3b110ad7fb506e0bae9ff796aebf110c396fa3707bddc85af32e23b004b09d9d107e99fc392a98b5046473b39068f2876
 DIST icedtea-bin-src-6.1.13.8.tar.xz 39773388 SHA256 c01deb2ef8ed9cf58284538e9f52651ff70b8349ec001f13314d69137f99ff4b SHA512 dba0cc027f3ed7589c7cb0ba7d9f1a401ef47a20a5ff502ad7e9b27d0f552a77f28ebbd9032d191ba3ac441955545b632d6fb242f67bc590a5f1a8d855b89ad8 WHIRLPOOL 6b835a7a6123a3843bd74506e52befafbc4792e792798660829d75ede09f6c283933d30d51ba01c87a16095b9faa1795bfec6539cb55709032e22d6395566d19
-DIST icedtea-bin-src-7.2.5.5.tar.xz 39995356 SHA256 c4f7843ffa9a401307d60b3eae192efb2792079d5d75d5954f4e03211b52f094 SHA512 7128e4255a7587d1167f6f2b1978cc0a8f6d079b2f189e5931c424c812c6c668a0afe0390cb492592c4cbf5f9375c11ed5d9ac9870161ad710ddddb7358ba60a WHIRLPOOL 607a4160d724ba38daebda75efe80aaf2ad87f534b3a9d089a43d172b7464fadee7b5e18b03eb1b84c3ec8ec14059023b75c9f16a93907a485c3af7a2cf38b2a
 DIST icedtea-bin-src-7.2.5.6.tar.xz 39999236 SHA256 dba9a16d6ed8ba6bcd1090e469d176c979395a4828ea8875cde271d8bfff4a43 SHA512 9f7c7377d90058fecdbe08259b8b1b0678ba3df1ebfd13b7664088fe3bae0823631b0b548a0b65981c79318b7a63d566c79a6c3b3b77df434d5b4e0b9b8095f6 WHIRLPOOL 214c9fd79be0ef3f650a64c15e02e889475ee27c9c2b975ade20689bd8d2799617b2ba0eae55cb1596b77e987f5b14cd4ccaa583ff5ef4dd83e4dcbedff869af
 DIST icedtea-bin-src-7.2.6.1.tar.xz 40026520 SHA256 60786fec57ebfa29297d03e3cded177fab8de09dbaebf74f82535d92fd3665ba SHA512 d045222dd06db827f0ceb62bb5fded08de66402803a978710d61005f9344d230450101b2fffcb3b8e05676682bd90ebe29e9e1ac57fdfd5197035f130ac483f0 WHIRLPOOL 793dd24fe432e54369490fcba7f8ed95f2e2b428c595570612cecd9a3194df9027fcec29a466f9c97b1c25c55d28eab7fe6565f21ae760cd8ea00f052f3b067d
diff --git a/dev-java/icedtea-bin/icedtea-bin-6.1.13.7.ebuild b/dev-java/icedtea-bin/icedtea-bin-6.1.13.7.ebuild
deleted file mode 100644
index 382769ef989a..000000000000
--- a/dev-java/icedtea-bin/icedtea-bin-6.1.13.7.ebuild
+++ /dev/null
@@ -1,145 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit java-vm-2 prefix versionator
-
-dist="https://dev.gentoo.org/~chewi/distfiles"
-TARBALL_VERSION="${PV}"
-
-DESCRIPTION="A Gentoo-made binary build of the IcedTea JDK"
-HOMEPAGE="http://icedtea.classpath.org"
-SRC_URI="doc? ( ${dist}/${PN}-doc-${TARBALL_VERSION}.tar.xz )
-	source? ( ${dist}/${PN}-src-${TARBALL_VERSION}.tar.xz )"
-
-for arch in amd64 ppc x86; do
-	SRC_URI+="
-		${arch}? (
-			${dist}/${PN}-core-${TARBALL_VERSION}-${arch}.tar.xz
-			examples? ( ${dist}/${PN}-examples-${TARBALL_VERSION}-${arch}.tar.xz )
-		)"
-done
-
-LICENSE="GPL-2-with-linking-exception"
-SLOT="6"
-KEYWORDS="-* amd64 ppc x86"
-
-IUSE="+X +alsa cjk +cups doc examples nsplugin selinux source webstart"
-REQUIRED_USE="nsplugin? ( X )"
-RESTRICT="strip"
-
-# 423161
-QA_PREBUILT="opt/.*"
-
-ALSA_COMMON_DEP="
-	>=media-libs/alsa-lib-1.0"
-CUPS_COMMON_DEP="
-	>=net-print/cups-2.0"
-X_COMMON_DEP="
-	>=media-libs/freetype-2.5:2
-	>=x11-libs/gtk+-2.24:2
-	>=x11-libs/libX11-1.6
-	>=x11-libs/libXext-1.3
-	>=x11-libs/libXi-1.7
-	>=x11-libs/libXrender-0.9.4
-	>=x11-libs/libXtst-1.2"
-
-COMMON_DEP="
-	>=media-libs/giflib-4.1.6-r1
-	>=media-libs/lcms-2.6:2
-	media-libs/libpng:0/16
-	>=sys-devel/gcc-4.8.4
-	>=sys-libs/glibc-2.20
-	>=sys-libs/zlib-1.2.3-r1
-	virtual/jpeg:62"
-
-RDEPEND="${COMMON_DEP}
-	X? (
-		${X_COMMON_DEP}
-		media-fonts/dejavu
-		cjk? (
-			media-fonts/arphicfonts
-			media-fonts/baekmuk-fonts
-			media-fonts/lklug
-			media-fonts/lohit-fonts
-			media-fonts/sazanami
-		)
-	)
-	alsa? ( ${ALSA_COMMON_DEP} )
-	cups? ( ${CUPS_COMMON_DEP} )
-	selinux? ( sec-policy/selinux-java )"
-
-PDEPEND="webstart? ( dev-java/icedtea-web:0 )
-	nsplugin? ( dev-java/icedtea-web:0[nsplugin] )"
-
-src_prepare() {
-	# Ensures HeadlessGraphicsEnvironment is used.
-	if ! use X; then
-		rm -r jre/lib/$(get_system_arch)/xawt || die
-	fi
-
-	# Reprefixify because prefix may be different.
-	sed -i 's:=/:=@GENTOO_PORTAGE_EPREFIX@/:' jre/lib/fontconfig.Gentoo.properties || die
-	eprefixify jre/lib/fontconfig.Gentoo.properties
-}
-
-src_install() {
-	local dest="/opt/${P}"
-	local ddest="${ED}${dest#/}"
-	dodir "${dest}"
-
-	# doins doesn't preserve executable bits.
-	cp -pRP bin include jre lib man "${ddest}" || die
-
-	dodoc doc/{ASSEMBLY_EXCEPTION,AUTHORS,NEWS,README,THIRD_PARTY_README}
-	use doc && dodoc -r doc/html
-
-	if use examples; then
-		cp -pRP demo sample "${ddest}" || die
-	fi
-
-	if use source; then
-		cp src.zip "${ddest}" || die
-	fi
-
-	if use webstart || use nsplugin; then
-		dosym /usr/libexec/icedtea-web/itweb-settings "${dest}/bin/itweb-settings"
-		dosym /usr/libexec/icedtea-web/itweb-settings "${dest}/jre/bin/itweb-settings"
-	fi
-	if use webstart; then
-		dosym /usr/libexec/icedtea-web/javaws "${dest}/bin/javaws"
-		dosym /usr/libexec/icedtea-web/javaws "${dest}/jre/bin/javaws"
-	fi
-
-	set_java_env
-	java-vm_revdep-mask "${dest}"
-	java-vm_sandbox-predict /proc/self/coredump_filter
-}
-
-pkg_preinst() {
-	if has_version "<=dev-java/icedtea-bin-1.10.4:${SLOT}"; then
-		# portage would preserve the symlink otherwise, related to bug #384397
-		rm -f "${EROOT}/usr/lib/jvm/icedtea6-bin"
-		elog "To unify the layout and simplify scripts, the identifier of Icedtea-bin-6*"
-		elog "has changed from 'icedtea6-bin' to 'icedtea-bin-6' starting from version 6.1.10.4"
-		elog "If you had icedtea6-bin as system VM, the change should be automatic, however"
-		elog "build VM settings in /etc/java-config-2/build/jdk.conf are not changed"
-		elog "and the same holds for any user VM settings. Sorry for the inconvenience."
-	fi
-}
-
-pkg_postinst() {
-	if use nsplugin; then
-		if [[ -n ${REPLACING_VERSIONS} ]] && ! version_is_at_least 6.1.13.3-r1 ${REPLACING_VERSIONS} ]]; then
-			elog "The nsplugin for icedtea-bin is now provided by the icedtea-web package"
-			elog "If you had icedtea-bin-6 nsplugin selected, you may see a related error below"
-			elog "The switch should complete properly during the subsequent installation of icedtea-web"
-			elog "Afterwards you may verify the output of 'eselect java-nsplugin list' and adjust accordingly'"
-		fi
-	fi
-
-	# Set as default VM if none exists
-	java-vm-2_pkg_postinst
-}
diff --git a/dev-java/icedtea-bin/icedtea-bin-6.1.13.8-r1.ebuild b/dev-java/icedtea-bin/icedtea-bin-6.1.13.8-r1.ebuild
new file mode 100644
index 000000000000..4ff8ac9b8e56
--- /dev/null
+++ b/dev-java/icedtea-bin/icedtea-bin-6.1.13.8-r1.ebuild
@@ -0,0 +1,150 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit java-vm-2 prefix versionator
+
+dist="https://dev.gentoo.org/~chewi/distfiles"
+TARBALL_VERSION="${PV}"
+
+DESCRIPTION="A Gentoo-made binary build of the IcedTea JDK"
+HOMEPAGE="http://icedtea.classpath.org"
+SRC_URI="doc? ( ${dist}/${PN}-doc-${TARBALL_VERSION}.tar.xz )
+	source? ( ${dist}/${PN}-src-${TARBALL_VERSION}.tar.xz )"
+
+for arch in amd64 ppc x86; do
+	SRC_URI+="
+		${arch}? (
+			${dist}/${PN}-core-${TARBALL_VERSION}$([[ ${arch} = ppc ]] && echo -r1)-${arch}.tar.xz
+			examples? ( ${dist}/${PN}-examples-${TARBALL_VERSION}-${arch}.tar.xz )
+		)"
+done
+
+LICENSE="GPL-2-with-linking-exception"
+SLOT="6"
+KEYWORDS="-* amd64 ppc x86"
+
+IUSE="+awt +alsa cjk +cups doc examples +gtk nsplugin selinux source webstart"
+REQUIRED_USE="gtk? ( awt ) nsplugin? ( awt )"
+
+RESTRICT="preserve-libs strip"
+QA_PREBUILT="opt/.*"
+
+RDEPEND="media-fonts/dejavu
+	>=media-libs/freetype-2.5:2
+	>=media-libs/lcms-2.6:2
+	>=sys-devel/gcc-4.8.4
+	>=sys-libs/glibc-2.20
+	>=sys-libs/zlib-1.2.3-r1
+	virtual/jpeg:62
+	alsa? ( >=media-libs/alsa-lib-1.0 )
+	awt? (
+		>=media-libs/giflib-4.1.6-r1
+		media-libs/libpng:0/16
+		>=x11-libs/libX11-1.6
+		>=x11-libs/libXext-1.3
+		>=x11-libs/libXi-1.7
+		>=x11-libs/libXrender-0.9.4
+		>=x11-libs/libXtst-1.2
+	)
+	cjk? (
+		media-fonts/arphicfonts
+		media-fonts/baekmuk-fonts
+		media-fonts/lklug
+		media-fonts/lohit-fonts
+		media-fonts/sazanami
+	)
+	cups? ( >=net-print/cups-2.0 )
+	gtk? ( >=x11-libs/gtk+-2.24:2 )
+	selinux? ( sec-policy/selinux-java )"
+
+PDEPEND="webstart? ( dev-java/icedtea-web:0 )
+	nsplugin? ( dev-java/icedtea-web:0[nsplugin] )"
+
+src_prepare() {
+	if ! use alsa; then
+		rm -v jre/lib/$(get_system_arch)/libjsoundalsa.* || die
+	fi
+
+	if ! use awt; then
+		rm -vr jre/lib/$(get_system_arch)/{xawt,libsplashscreen.*} \
+		   {,jre/}bin/policytool bin/appletviewer || die
+	fi
+
+	if [[ -n "${EPREFIX}" ]]; then
+		# The binaries are built on a non-prefixed system. The binary
+		# "bfc" fontconfig therefore must be replaced with a plain text
+		# "properties" fontconfig. The "src" file that accompanies the
+		# "bfc" file can be used as a template.
+		rm -v jre/lib/fontconfig.Gentoo.bfc || die
+		mv -v jre/lib/fontconfig.Gentoo.properties{.src,} || die
+		sed -i 's:=/:=@GENTOO_PORTAGE_EPREFIX@/:' jre/lib/fontconfig.Gentoo.properties || die
+		eprefixify jre/lib/fontconfig.Gentoo.properties
+	fi
+}
+
+src_install() {
+	local dest="/opt/${P}"
+	local ddest="${ED}${dest#/}"
+	dodir "${dest}"
+
+	# doins doesn't preserve executable bits.
+	cp -pRP bin include jre lib man "${ddest}" || die
+
+	dodoc doc/{ASSEMBLY_EXCEPTION,AUTHORS,NEWS,README,THIRD_PARTY_README}
+	use doc && dodoc -r doc/html
+
+	if use examples; then
+		cp -pRP demo sample "${ddest}" || die
+	fi
+
+	if use source; then
+		cp src.zip "${ddest}" || die
+	fi
+
+	if use webstart || use nsplugin; then
+		dosym /usr/libexec/icedtea-web/itweb-settings "${dest}/bin/itweb-settings"
+		dosym /usr/libexec/icedtea-web/itweb-settings "${dest}/jre/bin/itweb-settings"
+	fi
+	if use webstart; then
+		dosym /usr/libexec/icedtea-web/javaws "${dest}/bin/javaws"
+		dosym /usr/libexec/icedtea-web/javaws "${dest}/jre/bin/javaws"
+	fi
+
+	# Both icedtea itself and the icedtea ebuild set PAX markings but we
+	# disable them for the icedtea-bin build because the line below will
+	# respect end-user settings when icedtea-bin is actually installed.
+	java-vm_set-pax-markings "${ddest}"
+
+	set_java_env
+	java-vm_revdep-mask "${dest}"
+	java-vm_sandbox-predict /proc/self/coredump_filter
+}
+
+pkg_preinst() {
+	if has_version "<=dev-java/icedtea-bin-1.10.4:${SLOT}"; then
+		# portage would preserve the symlink otherwise, related to bug #384397
+		rm -f "${EROOT}/usr/lib/jvm/icedtea6-bin"
+		elog "To unify the layout and simplify scripts, the identifier of Icedtea-bin-6*"
+		elog "has changed from 'icedtea6-bin' to 'icedtea-bin-6' starting from version 6.1.10.4"
+		elog "If you had icedtea6-bin as system VM, the change should be automatic, however"
+		elog "build VM settings in /etc/java-config-2/build/jdk.conf are not changed"
+		elog "and the same holds for any user VM settings. Sorry for the inconvenience."
+	fi
+}
+
+pkg_postinst() {
+	if use nsplugin; then
+		if [[ -n ${REPLACING_VERSIONS} ]] && ! version_is_at_least 6.1.13.3-r1 ${REPLACING_VERSIONS} ]]; then
+			elog "The nsplugin for icedtea-bin is now provided by the icedtea-web package"
+			elog "If you had icedtea-bin-6 nsplugin selected, you may see a related error below"
+			elog "The switch should complete properly during the subsequent installation of icedtea-web"
+			elog "Afterwards you may verify the output of 'eselect java-nsplugin list' and adjust accordingly'"
+		fi
+	fi
+
+	# Set as default VM if none exists
+	java-vm-2_pkg_postinst
+}
diff --git a/dev-java/icedtea-bin/icedtea-bin-6.1.13.8.ebuild b/dev-java/icedtea-bin/icedtea-bin-6.1.13.8.ebuild
deleted file mode 100644
index 94f9ee2f2712..000000000000
--- a/dev-java/icedtea-bin/icedtea-bin-6.1.13.8.ebuild
+++ /dev/null
@@ -1,150 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit java-vm-2 prefix versionator
-
-dist="https://dev.gentoo.org/~chewi/distfiles"
-TARBALL_VERSION="${PV}"
-
-DESCRIPTION="A Gentoo-made binary build of the IcedTea JDK"
-HOMEPAGE="http://icedtea.classpath.org"
-SRC_URI="doc? ( ${dist}/${PN}-doc-${TARBALL_VERSION}.tar.xz )
-	source? ( ${dist}/${PN}-src-${TARBALL_VERSION}.tar.xz )"
-
-for arch in amd64 ppc x86; do
-	SRC_URI+="
-		${arch}? (
-			${dist}/${PN}-core-${TARBALL_VERSION}-${arch}.tar.xz
-			examples? ( ${dist}/${PN}-examples-${TARBALL_VERSION}-${arch}.tar.xz )
-		)"
-done
-
-LICENSE="GPL-2-with-linking-exception"
-SLOT="6"
-KEYWORDS="-* ~amd64 ~ppc ~x86"
-
-IUSE="+awt +alsa cjk +cups doc examples +gtk nsplugin selinux source webstart"
-REQUIRED_USE="gtk? ( awt ) nsplugin? ( awt )"
-
-RESTRICT="preserve-libs strip"
-QA_PREBUILT="opt/.*"
-
-RDEPEND="media-fonts/dejavu
-	>=media-libs/freetype-2.5:2
-	>=media-libs/lcms-2.6:2
-	>=sys-devel/gcc-4.8.4
-	>=sys-libs/glibc-2.20
-	>=sys-libs/zlib-1.2.3-r1
-	virtual/jpeg:62
-	alsa? ( >=media-libs/alsa-lib-1.0 )
-	awt? (
-		>=media-libs/giflib-4.1.6-r1
-		media-libs/libpng:0/16
-		>=x11-libs/libX11-1.6
-		>=x11-libs/libXext-1.3
-		>=x11-libs/libXi-1.7
-		>=x11-libs/libXrender-0.9.4
-		>=x11-libs/libXtst-1.2
-	)
-	cjk? (
-		media-fonts/arphicfonts
-		media-fonts/baekmuk-fonts
-		media-fonts/lklug
-		media-fonts/lohit-fonts
-		media-fonts/sazanami
-	)
-	cups? ( >=net-print/cups-2.0 )
-	gtk? ( >=x11-libs/gtk+-2.24:2 )
-	selinux? ( sec-policy/selinux-java )"
-
-PDEPEND="webstart? ( dev-java/icedtea-web:0 )
-	nsplugin? ( dev-java/icedtea-web:0[nsplugin] )"
-
-src_prepare() {
-	if ! use alsa; then
-		rm -v jre/lib/$(get_system_arch)/libjsoundalsa.* || die
-	fi
-
-	if ! use awt; then
-		rm -vr jre/lib/$(get_system_arch)/{xawt,libsplashscreen.*} \
-		   {,jre/}bin/policytool bin/appletviewer || die
-	fi
-
-	if [[ -n "${EPREFIX}" ]]; then
-		# The binaries are built on a non-prefixed system. The binary
-		# "bfc" fontconfig therefore must be replaced with a plain text
-		# "properties" fontconfig. The "src" file that accompanies the
-		# "bfc" file can be used as a template.
-		rm -v jre/lib/fontconfig.Gentoo.bfc || die
-		mv -v jre/lib/fontconfig.Gentoo.properties{.src,} || die
-		sed -i 's:=/:=@GENTOO_PORTAGE_EPREFIX@/:' jre/lib/fontconfig.Gentoo.properties || die
-		eprefixify jre/lib/fontconfig.Gentoo.properties
-	fi
-}
-
-src_install() {
-	local dest="/opt/${P}"
-	local ddest="${ED}${dest#/}"
-	dodir "${dest}"
-
-	# doins doesn't preserve executable bits.
-	cp -pRP bin include jre lib man "${ddest}" || die
-
-	dodoc doc/{ASSEMBLY_EXCEPTION,AUTHORS,NEWS,README,THIRD_PARTY_README}
-	use doc && dodoc -r doc/html
-
-	if use examples; then
-		cp -pRP demo sample "${ddest}" || die
-	fi
-
-	if use source; then
-		cp src.zip "${ddest}" || die
-	fi
-
-	if use webstart || use nsplugin; then
-		dosym /usr/libexec/icedtea-web/itweb-settings "${dest}/bin/itweb-settings"
-		dosym /usr/libexec/icedtea-web/itweb-settings "${dest}/jre/bin/itweb-settings"
-	fi
-	if use webstart; then
-		dosym /usr/libexec/icedtea-web/javaws "${dest}/bin/javaws"
-		dosym /usr/libexec/icedtea-web/javaws "${dest}/jre/bin/javaws"
-	fi
-
-	# Both icedtea itself and the icedtea ebuild set PAX markings but we
-	# disable them for the icedtea-bin build because the line below will
-	# respect end-user settings when icedtea-bin is actually installed.
-	java-vm_set-pax-markings "${ddest}"
-
-	set_java_env
-	java-vm_revdep-mask "${dest}"
-	java-vm_sandbox-predict /proc/self/coredump_filter
-}
-
-pkg_preinst() {
-	if has_version "<=dev-java/icedtea-bin-1.10.4:${SLOT}"; then
-		# portage would preserve the symlink otherwise, related to bug #384397
-		rm -f "${EROOT}/usr/lib/jvm/icedtea6-bin"
-		elog "To unify the layout and simplify scripts, the identifier of Icedtea-bin-6*"
-		elog "has changed from 'icedtea6-bin' to 'icedtea-bin-6' starting from version 6.1.10.4"
-		elog "If you had icedtea6-bin as system VM, the change should be automatic, however"
-		elog "build VM settings in /etc/java-config-2/build/jdk.conf are not changed"
-		elog "and the same holds for any user VM settings. Sorry for the inconvenience."
-	fi
-}
-
-pkg_postinst() {
-	if use nsplugin; then
-		if [[ -n ${REPLACING_VERSIONS} ]] && ! version_is_at_least 6.1.13.3-r1 ${REPLACING_VERSIONS} ]]; then
-			elog "The nsplugin for icedtea-bin is now provided by the icedtea-web package"
-			elog "If you had icedtea-bin-6 nsplugin selected, you may see a related error below"
-			elog "The switch should complete properly during the subsequent installation of icedtea-web"
-			elog "Afterwards you may verify the output of 'eselect java-nsplugin list' and adjust accordingly'"
-		fi
-	fi
-
-	# Set as default VM if none exists
-	java-vm-2_pkg_postinst
-}
diff --git a/dev-java/icedtea-bin/icedtea-bin-7.2.5.5.ebuild b/dev-java/icedtea-bin/icedtea-bin-7.2.5.5.ebuild
deleted file mode 100644
index d03ca30b0c06..000000000000
--- a/dev-java/icedtea-bin/icedtea-bin-7.2.5.5.ebuild
+++ /dev/null
@@ -1,174 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit java-vm-2 multilib prefix toolchain-funcs versionator
-
-dist="https://dev.gentoo.org/~chewi/distfiles"
-TARBALL_VERSION="${PV}"
-
-DESCRIPTION="A Gentoo-made binary build of the IcedTea JDK"
-HOMEPAGE="http://icedtea.classpath.org"
-SRC_URI="doc? ( ${dist}/${PN}-doc-${TARBALL_VERSION}.tar.xz )
-	source? ( ${dist}/${PN}-src-${TARBALL_VERSION}.tar.xz )"
-
-for arch in amd64 arm ppc x86; do
-	SRC_URI+="
-		${arch}? (
-			${dist}/${PN}-core-${TARBALL_VERSION}-${arch}.tar.xz
-			examples? ( ${dist}/${PN}-examples-${TARBALL_VERSION}-${arch}.tar.xz )
-		)"
-done
-
-LICENSE="GPL-2-with-linking-exception"
-SLOT="7"
-KEYWORDS="-* amd64 ~arm ppc x86"
-
-IUSE="+X +alsa cjk +cups doc examples nsplugin pulseaudio selinux source webstart"
-REQUIRED_USE="nsplugin? ( X )"
-RESTRICT="strip"
-
-# 423161
-QA_PREBUILT="opt/.*"
-
-ALSA_COMMON_DEP="
-	>=media-libs/alsa-lib-1.0"
-CUPS_COMMON_DEP="
-	>=net-print/cups-2.0"
-X_COMMON_DEP="
-		>=dev-libs/atk-2.12
-		>=dev-libs/glib-2.40:2
-		>=media-libs/fontconfig-2.11:1.0
-		>=media-libs/freetype-2.5.3:2
-		>=x11-libs/cairo-1.12
-		x11-libs/gdk-pixbuf:2
-		>=x11-libs/gtk+-2.24:2
-		>=x11-libs/libX11-1.6
-		>=x11-libs/libXext-1.3
-		>=x11-libs/libXi-1.7
-		>=x11-libs/libXrender-0.9.4
-		>=x11-libs/libXtst-1.2
-		>=x11-libs/pango-1.36"
-
-COMMON_DEP="
-	>=media-libs/giflib-4.1.6-r1
-	>=media-libs/lcms-2.6:2
-	media-libs/libpng:0/16
-	>=sys-devel/gcc-4.8.4
-	>=sys-libs/glibc-2.20
-	>=sys-libs/zlib-1.2.3-r1
-	virtual/jpeg:62"
-
-# cups is needed for X. #390945 #390975
-# gsettings-desktop-schemas is needed for native proxy support. #431972
-RDEPEND="${COMMON_DEP}
-	X? (
-		${CUPS_COMMON_DEP}
-		${X_COMMON_DEP}
-		media-fonts/dejavu
-		cjk? (
-			media-fonts/arphicfonts
-			media-fonts/baekmuk-fonts
-			media-fonts/lklug
-			media-fonts/lohit-fonts
-			media-fonts/sazanami
-		)
-	)
-	alsa? ( ${ALSA_COMMON_DEP} )
-	cups? ( ${CUPS_COMMON_DEP} )
-	selinux? ( sec-policy/selinux-java )
-	>=gnome-base/gsettings-desktop-schemas-3.12.2"
-
-DEPEND="!arm? ( dev-util/patchelf )"
-
-PDEPEND="webstart? ( dev-java/icedtea-web:0[icedtea7] )
-	nsplugin? ( dev-java/icedtea-web:0[icedtea7,nsplugin] )
-	pulseaudio? ( dev-java/icedtea-sound )"
-
-pkg_pretend() {
-	if [[ "$(tc-is-softfloat)" != "no" ]]; then
-		die "These binaries require a hardfloat system."
-	fi
-}
-
-src_prepare() {
-	# Ensures HeadlessGraphicsEnvironment is used.
-	if ! use X; then
-		rm -r jre/lib/$(get_system_arch)/xawt || die
-	fi
-
-	# Reprefixify because prefix may be different.
-	sed -i 's:=/:=@GENTOO_PORTAGE_EPREFIX@/:' jre/lib/fontconfig.Gentoo.properties || die
-	eprefixify jre/lib/fontconfig.Gentoo.properties
-
-	# Fix the RPATHs, except on arm.
-	# https://bugs.gentoo.org/show_bug.cgi?id=543658#c3
-	# https://github.com/NixOS/patchelf/issues/8
-	if use arm; then
-		ewarn "The RPATHs on these binaries are normally modified to avoid"
-		ewarn "conflicts with an icedtea installation built from source. This"
-		ewarn "is currently not possible on ARM so please refrain from"
-		ewarn "installing dev-java/icedtea on the same system."
-	else
-		local old="/usr/$(get_libdir)/icedtea${SLOT}"
-		local new="${EPREFIX}/opt/${P}"
-		local elf rpath
-
-		for elf in $(find -type f -executable ! -name "*.cgi" || die); do
-			rpath=$(patchelf --print-rpath "${elf}" || die "patchelf ${elf}")
-
-			if [[ -n "${rpath}" ]]; then
-				patchelf --set-rpath "${rpath//${old}/${new}}" "${elf}" || die "patchelf ${elf}"
-			fi
-		done
-	fi
-}
-
-src_install() {
-	local dest="/opt/${P}"
-	local ddest="${ED}${dest#/}"
-	dodir "${dest}"
-
-	# doins doesn't preserve executable bits.
-	cp -pRP bin include jre lib man "${ddest}" || die
-
-	dodoc doc/{ASSEMBLY_EXCEPTION,AUTHORS,NEWS,README,THIRD_PARTY_README}
-	use doc && dodoc -r doc/html
-
-	if use examples; then
-		cp -pRP demo sample "${ddest}" || die
-	fi
-
-	if use source; then
-		cp src.zip "${ddest}" || die
-	fi
-
-	if use webstart || use nsplugin; then
-		dosym /usr/libexec/icedtea-web/itweb-settings "${dest}/bin/itweb-settings"
-		dosym /usr/libexec/icedtea-web/itweb-settings "${dest}/jre/bin/itweb-settings"
-	fi
-	if use webstart; then
-		dosym /usr/libexec/icedtea-web/javaws "${dest}/bin/javaws"
-		dosym /usr/libexec/icedtea-web/javaws "${dest}/jre/bin/javaws"
-	fi
-
-	set_java_env
-	java-vm_revdep-mask "${dest}"
-	java-vm_sandbox-predict /proc/self/coredump_filter
-}
-
-pkg_postinst() {
-	if use nsplugin; then
-		if [[ -n ${REPLACING_VERSIONS} ]] && ! version_is_at_least 7.2.4.3 ${REPLACING_VERSIONS} ]]; then
-			elog "The nsplugin for icedtea-bin is now provided by the icedtea-web package"
-			elog "If you had icedtea-bin-7 nsplugin selected, you may see a related error below"
-			elog "The switch should complete properly during the subsequent installation of icedtea-web"
-			elog "Afterwards you may verify the output of 'eselect java-nsplugin list' and adjust accordingly'"
-		fi
-	fi
-
-	# Set as default VM if none exists
-	java-vm-2_pkg_postinst
-}
diff --git a/dev-java/icedtea-bin/icedtea-bin-7.2.5.6-r1.ebuild b/dev-java/icedtea-bin/icedtea-bin-7.2.5.6-r1.ebuild
new file mode 100644
index 000000000000..80e436690a79
--- /dev/null
+++ b/dev-java/icedtea-bin/icedtea-bin-7.2.5.6-r1.ebuild
@@ -0,0 +1,179 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit java-vm-2 multilib prefix toolchain-funcs versionator
+
+dist="https://dev.gentoo.org/~chewi/distfiles"
+TARBALL_VERSION="${PV}"
+
+DESCRIPTION="A Gentoo-made binary build of the IcedTea JDK"
+HOMEPAGE="http://icedtea.classpath.org"
+SRC_URI="doc? ( ${dist}/${PN}-doc-${TARBALL_VERSION}.tar.xz )
+	source? ( ${dist}/${PN}-src-${TARBALL_VERSION}.tar.xz )"
+
+for arch in ppc; do
+	SRC_URI+="
+		${arch}? (
+			${dist}/${PN}-core-${TARBALL_VERSION}$([[ ${arch} = ppc ]] && echo -r1)-${arch}.tar.xz
+			examples? ( ${dist}/${PN}-examples-${TARBALL_VERSION}-${arch}.tar.xz )
+		)"
+done
+
+LICENSE="GPL-2-with-linking-exception"
+SLOT="7"
+KEYWORDS="-* ppc"
+
+IUSE="+alsa +awt cjk +cups doc examples +gtk nsplugin pulseaudio selinux source webstart"
+REQUIRED_USE="gtk? ( awt ) nsplugin? ( awt )"
+
+RESTRICT="preserve-libs strip"
+QA_PREBUILT="opt/.*"
+
+# gsettings-desktop-schemas is needed for native proxy support. #431972
+RDEPEND=">=dev-libs/glib-2.40:2
+	>=gnome-base/gsettings-desktop-schemas-3.12.2
+	media-fonts/dejavu
+	>=media-libs/fontconfig-2.11:1.0
+	>=media-libs/freetype-2.5.3:2
+	>=media-libs/lcms-2.6:2
+	>=sys-devel/gcc-4.8.4
+	>=sys-libs/glibc-2.20
+	>=sys-libs/zlib-1.2.3-r1
+	virtual/jpeg:62
+	alsa? ( >=media-libs/alsa-lib-1.0 )
+	awt? (
+		>=media-libs/giflib-4.1.6-r1
+		media-libs/libpng:0/16
+		>=x11-libs/libX11-1.6
+		>=x11-libs/libXext-1.3
+		>=x11-libs/libXi-1.7
+		>=x11-libs/libXrender-0.9.4
+		>=x11-libs/libXtst-1.2
+	)
+	cjk? (
+		media-fonts/arphicfonts
+		media-fonts/baekmuk-fonts
+		media-fonts/lklug
+		media-fonts/lohit-fonts
+		media-fonts/sazanami
+	)
+	cups? ( >=net-print/cups-2.0 )
+	gtk? (
+		>=dev-libs/atk-2.12
+		>=x11-libs/cairo-1.12
+		x11-libs/gdk-pixbuf:2
+		>=x11-libs/gtk+-2.24:2
+		>=x11-libs/pango-1.36
+	)
+	selinux? ( sec-policy/selinux-java )"
+
+DEPEND="!arm? ( dev-util/patchelf )"
+
+PDEPEND="webstart? ( dev-java/icedtea-web:0[icedtea7] )
+	nsplugin? ( dev-java/icedtea-web:0[icedtea7,nsplugin] )
+	pulseaudio? ( dev-java/icedtea-sound )"
+
+pkg_pretend() {
+	if [[ "$(tc-is-softfloat)" != "no" ]]; then
+		die "These binaries require a hardfloat system."
+	fi
+}
+
+src_prepare() {
+	if ! use alsa; then
+		rm -v jre/lib/$(get_system_arch)/libjsoundalsa.* || die
+	fi
+
+	if ! use awt; then
+		rm -vr jre/lib/$(get_system_arch)/{xawt,libsplashscreen.*} \
+		   {,jre/}bin/policytool bin/appletviewer || die
+	fi
+
+	if ! use gtk; then
+		rm -v jre/lib/$(get_system_arch)/libjavagtk.* || die
+	fi
+
+	if [[ -n "${EPREFIX}" ]]; then
+		# The binaries are built on a non-prefixed system so the
+		# fontconfig needs to have prefixes inserted.
+		sed -i 's:=/:=@GENTOO_PORTAGE_EPREFIX@/:' jre/lib/fontconfig.Gentoo.properties || die
+		eprefixify jre/lib/fontconfig.Gentoo.properties
+	fi
+
+	# Fix the RPATHs, except on arm.
+	# https://bugs.gentoo.org/show_bug.cgi?id=543658#c3
+	# https://github.com/NixOS/patchelf/issues/8
+	if use arm; then
+		ewarn "The RPATHs on these binaries are normally modified to avoid"
+		ewarn "conflicts with an icedtea installation built from source. This"
+		ewarn "is currently not possible on ARM so please refrain from"
+		ewarn "installing dev-java/icedtea on the same system."
+	else
+		local old="/usr/$(get_libdir)/icedtea${SLOT}"
+		local new="${EPREFIX}/opt/${P}"
+		local elf rpath
+
+		for elf in $(find -type f -executable ! -name "*.cgi" || die); do
+			rpath=$(patchelf --print-rpath "${elf}" || die "patchelf ${elf}")
+
+			if [[ -n "${rpath}" ]]; then
+				patchelf --set-rpath "${rpath//${old}/${new}}" "${elf}" || die "patchelf ${elf}"
+			fi
+		done
+	fi
+}
+
+src_install() {
+	local dest="/opt/${P}"
+	local ddest="${ED}${dest#/}"
+	dodir "${dest}"
+
+	# doins doesn't preserve executable bits.
+	cp -pRP bin include jre lib man "${ddest}" || die
+
+	dodoc doc/{ASSEMBLY_EXCEPTION,AUTHORS,NEWS,README,THIRD_PARTY_README}
+	use doc && dodoc -r doc/html
+
+	if use examples; then
+		cp -pRP demo sample "${ddest}" || die
+	fi
+
+	if use source; then
+		cp src.zip "${ddest}" || die
+	fi
+
+	if use webstart || use nsplugin; then
+		dosym /usr/libexec/icedtea-web/itweb-settings "${dest}/bin/itweb-settings"
+		dosym /usr/libexec/icedtea-web/itweb-settings "${dest}/jre/bin/itweb-settings"
+	fi
+	if use webstart; then
+		dosym /usr/libexec/icedtea-web/javaws "${dest}/bin/javaws"
+		dosym /usr/libexec/icedtea-web/javaws "${dest}/jre/bin/javaws"
+	fi
+
+	# Both icedtea itself and the icedtea ebuild set PAX markings but we
+	# disable them for the icedtea-bin build because the line below will
+	# respect end-user settings when icedtea-bin is actually installed.
+	java-vm_set-pax-markings "${ddest}"
+
+	set_java_env
+	java-vm_revdep-mask "${dest}"
+	java-vm_sandbox-predict /proc/self/coredump_filter
+}
+
+pkg_postinst() {
+	if use nsplugin; then
+		if [[ -n ${REPLACING_VERSIONS} ]] && ! version_is_at_least 7.2.4.3 ${REPLACING_VERSIONS} ]]; then
+			elog "The nsplugin for icedtea-bin is now provided by the icedtea-web package"
+			elog "If you had icedtea-bin-7 nsplugin selected, you may see a related error below"
+			elog "The switch should complete properly during the subsequent installation of icedtea-web"
+			elog "Afterwards you may verify the output of 'eselect java-nsplugin list' and adjust accordingly'"
+		fi
+	fi
+
+	# Set as default VM if none exists
+	java-vm-2_pkg_postinst
+}
diff --git a/dev-java/icedtea-bin/icedtea-bin-7.2.5.6.ebuild b/dev-java/icedtea-bin/icedtea-bin-7.2.5.6.ebuild
deleted file mode 100644
index 21861cd84fbe..000000000000
--- a/dev-java/icedtea-bin/icedtea-bin-7.2.5.6.ebuild
+++ /dev/null
@@ -1,179 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit java-vm-2 multilib prefix toolchain-funcs versionator
-
-dist="https://dev.gentoo.org/~chewi/distfiles"
-TARBALL_VERSION="${PV}"
-
-DESCRIPTION="A Gentoo-made binary build of the IcedTea JDK"
-HOMEPAGE="http://icedtea.classpath.org"
-SRC_URI="doc? ( ${dist}/${PN}-doc-${TARBALL_VERSION}.tar.xz )
-	source? ( ${dist}/${PN}-src-${TARBALL_VERSION}.tar.xz )"
-
-for arch in ppc; do
-	SRC_URI+="
-		${arch}? (
-			${dist}/${PN}-core-${TARBALL_VERSION}-${arch}.tar.xz
-			examples? ( ${dist}/${PN}-examples-${TARBALL_VERSION}-${arch}.tar.xz )
-		)"
-done
-
-LICENSE="GPL-2-with-linking-exception"
-SLOT="7"
-KEYWORDS="-* ~ppc"
-
-IUSE="+alsa +awt cjk +cups doc examples +gtk nsplugin pulseaudio selinux source webstart"
-REQUIRED_USE="gtk? ( awt ) nsplugin? ( awt )"
-
-RESTRICT="preserve-libs strip"
-QA_PREBUILT="opt/.*"
-
-# gsettings-desktop-schemas is needed for native proxy support. #431972
-RDEPEND=">=dev-libs/glib-2.40:2
-	>=gnome-base/gsettings-desktop-schemas-3.12.2
-	media-fonts/dejavu
-	>=media-libs/fontconfig-2.11:1.0
-	>=media-libs/freetype-2.5.3:2
-	>=media-libs/lcms-2.6:2
-	>=sys-devel/gcc-4.8.4
-	>=sys-libs/glibc-2.20
-	>=sys-libs/zlib-1.2.3-r1
-	virtual/jpeg:62
-	alsa? ( >=media-libs/alsa-lib-1.0 )
-	awt? (
-		>=media-libs/giflib-4.1.6-r1
-		media-libs/libpng:0/16
-		>=x11-libs/libX11-1.6
-		>=x11-libs/libXext-1.3
-		>=x11-libs/libXi-1.7
-		>=x11-libs/libXrender-0.9.4
-		>=x11-libs/libXtst-1.2
-	)
-	cjk? (
-		media-fonts/arphicfonts
-		media-fonts/baekmuk-fonts
-		media-fonts/lklug
-		media-fonts/lohit-fonts
-		media-fonts/sazanami
-	)
-	cups? ( >=net-print/cups-2.0 )
-	gtk? (
-		>=dev-libs/atk-2.12
-		>=x11-libs/cairo-1.12
-		x11-libs/gdk-pixbuf:2
-		>=x11-libs/gtk+-2.24:2
-		>=x11-libs/pango-1.36
-	)
-	selinux? ( sec-policy/selinux-java )"
-
-DEPEND="!arm? ( dev-util/patchelf )"
-
-PDEPEND="webstart? ( dev-java/icedtea-web:0[icedtea7] )
-	nsplugin? ( dev-java/icedtea-web:0[icedtea7,nsplugin] )
-	pulseaudio? ( dev-java/icedtea-sound )"
-
-pkg_pretend() {
-	if [[ "$(tc-is-softfloat)" != "no" ]]; then
-		die "These binaries require a hardfloat system."
-	fi
-}
-
-src_prepare() {
-	if ! use alsa; then
-		rm -v jre/lib/$(get_system_arch)/libjsoundalsa.* || die
-	fi
-
-	if ! use awt; then
-		rm -vr jre/lib/$(get_system_arch)/{xawt,libsplashscreen.*} \
-		   {,jre/}bin/policytool bin/appletviewer || die
-	fi
-
-	if ! use gtk; then
-		rm -v jre/lib/$(get_system_arch)/libjavagtk.* || die
-	fi
-
-	if [[ -n "${EPREFIX}" ]]; then
-		# The binaries are built on a non-prefixed system so the
-		# fontconfig needs to have prefixes inserted.
-		sed -i 's:=/:=@GENTOO_PORTAGE_EPREFIX@/:' jre/lib/fontconfig.Gentoo.properties || die
-		eprefixify jre/lib/fontconfig.Gentoo.properties
-	fi
-
-	# Fix the RPATHs, except on arm.
-	# https://bugs.gentoo.org/show_bug.cgi?id=543658#c3
-	# https://github.com/NixOS/patchelf/issues/8
-	if use arm; then
-		ewarn "The RPATHs on these binaries are normally modified to avoid"
-		ewarn "conflicts with an icedtea installation built from source. This"
-		ewarn "is currently not possible on ARM so please refrain from"
-		ewarn "installing dev-java/icedtea on the same system."
-	else
-		local old="/usr/$(get_libdir)/icedtea${SLOT}"
-		local new="${EPREFIX}/opt/${P}"
-		local elf rpath
-
-		for elf in $(find -type f -executable ! -name "*.cgi" || die); do
-			rpath=$(patchelf --print-rpath "${elf}" || die "patchelf ${elf}")
-
-			if [[ -n "${rpath}" ]]; then
-				patchelf --set-rpath "${rpath//${old}/${new}}" "${elf}" || die "patchelf ${elf}"
-			fi
-		done
-	fi
-}
-
-src_install() {
-	local dest="/opt/${P}"
-	local ddest="${ED}${dest#/}"
-	dodir "${dest}"
-
-	# doins doesn't preserve executable bits.
-	cp -pRP bin include jre lib man "${ddest}" || die
-
-	dodoc doc/{ASSEMBLY_EXCEPTION,AUTHORS,NEWS,README,THIRD_PARTY_README}
-	use doc && dodoc -r doc/html
-
-	if use examples; then
-		cp -pRP demo sample "${ddest}" || die
-	fi
-
-	if use source; then
-		cp src.zip "${ddest}" || die
-	fi
-
-	if use webstart || use nsplugin; then
-		dosym /usr/libexec/icedtea-web/itweb-settings "${dest}/bin/itweb-settings"
-		dosym /usr/libexec/icedtea-web/itweb-settings "${dest}/jre/bin/itweb-settings"
-	fi
-	if use webstart; then
-		dosym /usr/libexec/icedtea-web/javaws "${dest}/bin/javaws"
-		dosym /usr/libexec/icedtea-web/javaws "${dest}/jre/bin/javaws"
-	fi
-
-	# Both icedtea itself and the icedtea ebuild set PAX markings but we
-	# disable them for the icedtea-bin build because the line below will
-	# respect end-user settings when icedtea-bin is actually installed.
-	java-vm_set-pax-markings "${ddest}"
-
-	set_java_env
-	java-vm_revdep-mask "${dest}"
-	java-vm_sandbox-predict /proc/self/coredump_filter
-}
-
-pkg_postinst() {
-	if use nsplugin; then
-		if [[ -n ${REPLACING_VERSIONS} ]] && ! version_is_at_least 7.2.4.3 ${REPLACING_VERSIONS} ]]; then
-			elog "The nsplugin for icedtea-bin is now provided by the icedtea-web package"
-			elog "If you had icedtea-bin-7 nsplugin selected, you may see a related error below"
-			elog "The switch should complete properly during the subsequent installation of icedtea-web"
-			elog "Afterwards you may verify the output of 'eselect java-nsplugin list' and adjust accordingly'"
-		fi
-	fi
-
-	# Set as default VM if none exists
-	java-vm-2_pkg_postinst
-}
diff --git a/dev-java/icedtea-bin/icedtea-bin-7.2.6.1.ebuild b/dev-java/icedtea-bin/icedtea-bin-7.2.6.1.ebuild
index 5dde0522f792..9b33188ae2ff 100644
--- a/dev-java/icedtea-bin/icedtea-bin-7.2.6.1.ebuild
+++ b/dev-java/icedtea-bin/icedtea-bin-7.2.6.1.ebuild
@@ -24,7 +24,7 @@ done
 
 LICENSE="GPL-2-with-linking-exception"
 SLOT="7"
-KEYWORDS="-* ~amd64 ~arm ~x86"
+KEYWORDS="-* amd64 ~arm x86"
 
 IUSE="+awt +alsa cjk +cups doc examples +gtk nsplugin pulseaudio selinux source webstart"
 REQUIRED_USE="gtk? ( awt ) nsplugin? ( awt )"
diff --git a/dev-java/icedtea/files/6-cacao-dynmaxheap-Makefile.patch b/dev-java/icedtea/files/6-cacao-dynmaxheap-Makefile.patch
new file mode 100644
index 000000000000..dc87ae8b0242
--- /dev/null
+++ b/dev-java/icedtea/files/6-cacao-dynmaxheap-Makefile.patch
@@ -0,0 +1,10 @@
+--- Makefile.in.orig	2015-07-28 07:21:16.447388803 -0700
++++ Makefile.in	2015-09-06 09:13:16.548000000 -0700
+@@ -182,6 +182,7 @@
+ @WITH_RHINO_TRUE@	patches/rhino.patch
+ 
+ @BUILD_CACAO_TRUE@am__append_22 = \
++@BUILD_CACAO_TRUE@	patches/cacao/dynmaxheap.patch \
+ @BUILD_CACAO_TRUE@	patches/cacao/launcher.patch \
+ @BUILD_CACAO_TRUE@	patches/cacao/memory.patch \
+ @BUILD_CACAO_TRUE@	patches/cacao/hotspot/original/memory.patch \
diff --git a/dev-java/icedtea/files/6-cacao-dynmaxheap.patch b/dev-java/icedtea/files/6-cacao-dynmaxheap.patch
new file mode 100644
index 000000000000..33b98183769e
--- /dev/null
+++ b/dev-java/icedtea/files/6-cacao-dynmaxheap.patch
@@ -0,0 +1,42 @@
+# HG changeset patch
+# User James Le Cuirot <chewi@gentoo.org>
+# Date 1441543564 -3600
+#      Sun Sep 06 13:46:04 2015 +0100
+# Node ID d0224f4490d6694e77dcb0ff7eae8e2297b822bf
+# Parent  e215e36be9fc2b7dfe43ff10ec1afe639b289aa5
+Dynamically set the maximum heap size on Linux
+
+diff -r e215e36be9fc -r d0224f4490d6 src/vm/vm.cpp
+--- cacao/cacao/src/vm/vm.cpp	Mon Feb 11 19:31:28 2013 +0100
++++ cacao/cacao/src/vm/vm.cpp	Sun Sep 06 13:46:04 2015 +0100
+@@ -33,6 +33,10 @@
+ #include <errno.h>
+ #include <stdlib.h>
+ 
++#if defined(__LINUX__)
++#include <unistd.h>
++#endif
++
+ #include "vm/types.h"
+ 
+ #include "arch.h"
+@@ -702,6 +706,19 @@
+ 	opt_heapstartsize = HEAP_STARTSIZE;
+ 	opt_stacksize     = STACK_SIZE;
+ 
++#if defined(__LINUX__)
++	// Calculate 1/4 of the physical memory.
++	uint64_t qmem = sysconf(_SC_PHYS_PAGES) * sysconf(_SC_PAGESIZE) / 4;
++
++	if (qmem > INT32_MAX) {
++		// More than 2GB will overflow so cap it.
++		opt_heapmaxsize = 2047 * 1024 * 1024;
++	} else if (qmem > HEAP_MAXSIZE) {
++		// Otherwise use this if greater than default (128MB).
++		opt_heapmaxsize = (s4) qmem;
++	}
++#endif
++
+ 	// First of all, parse the -XX options.
+ 
+ #if defined(ENABLE_VMLOG)
diff --git a/dev-java/icedtea/files/7-cacao-dynmaxheap-Makefile.patch b/dev-java/icedtea/files/7-cacao-dynmaxheap-Makefile.patch
new file mode 100644
index 000000000000..13e30537e2ac
--- /dev/null
+++ b/dev-java/icedtea/files/7-cacao-dynmaxheap-Makefile.patch
@@ -0,0 +1,10 @@
+--- Makefile.in.orig	2015-07-22 14:54:37.116940780 -0700
++++ Makefile.in	2015-09-06 05:05:47.220000000 -0700
+@@ -134,6 +134,7 @@
+ @WITH_RHINO_TRUE@	patches/rhino.patch
+ 
+ @BUILD_CACAO_TRUE@am__append_10 = \
++@BUILD_CACAO_TRUE@	patches/cacao/dynmaxheap.patch \
+ @BUILD_CACAO_TRUE@	patches/cacao/launcher.patch \
+ @BUILD_CACAO_TRUE@	patches/cacao/memory.patch \
+ @BUILD_CACAO_TRUE@	patches/cacao/armhf.patch \
diff --git a/dev-java/icedtea/files/7-cacao-dynmaxheap.patch b/dev-java/icedtea/files/7-cacao-dynmaxheap.patch
new file mode 100644
index 000000000000..33b98183769e
--- /dev/null
+++ b/dev-java/icedtea/files/7-cacao-dynmaxheap.patch
@@ -0,0 +1,42 @@
+# HG changeset patch
+# User James Le Cuirot <chewi@gentoo.org>
+# Date 1441543564 -3600
+#      Sun Sep 06 13:46:04 2015 +0100
+# Node ID d0224f4490d6694e77dcb0ff7eae8e2297b822bf
+# Parent  e215e36be9fc2b7dfe43ff10ec1afe639b289aa5
+Dynamically set the maximum heap size on Linux
+
+diff -r e215e36be9fc -r d0224f4490d6 src/vm/vm.cpp
+--- cacao/cacao/src/vm/vm.cpp	Mon Feb 11 19:31:28 2013 +0100
++++ cacao/cacao/src/vm/vm.cpp	Sun Sep 06 13:46:04 2015 +0100
+@@ -33,6 +33,10 @@
+ #include <errno.h>
+ #include <stdlib.h>
+ 
++#if defined(__LINUX__)
++#include <unistd.h>
++#endif
++
+ #include "vm/types.h"
+ 
+ #include "arch.h"
+@@ -702,6 +706,19 @@
+ 	opt_heapstartsize = HEAP_STARTSIZE;
+ 	opt_stacksize     = STACK_SIZE;
+ 
++#if defined(__LINUX__)
++	// Calculate 1/4 of the physical memory.
++	uint64_t qmem = sysconf(_SC_PHYS_PAGES) * sysconf(_SC_PAGESIZE) / 4;
++
++	if (qmem > INT32_MAX) {
++		// More than 2GB will overflow so cap it.
++		opt_heapmaxsize = 2047 * 1024 * 1024;
++	} else if (qmem > HEAP_MAXSIZE) {
++		// Otherwise use this if greater than default (128MB).
++		opt_heapmaxsize = (s4) qmem;
++	}
++#endif
++
+ 	// First of all, parse the -XX options.
+ 
+ #if defined(ENABLE_VMLOG)
diff --git a/dev-java/icedtea/icedtea-6.1.13.8-r1.ebuild b/dev-java/icedtea/icedtea-6.1.13.8-r1.ebuild
new file mode 100644
index 000000000000..ff53a1134fc1
--- /dev/null
+++ b/dev-java/icedtea/icedtea-6.1.13.8-r1.ebuild
@@ -0,0 +1,351 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+# Build written by Andrew John Hughes (gnu_andrew@member.fsf.org)
+
+# *********************************************************
+# * IF YOU CHANGE THIS EBUILD, CHANGE ICEDTEA-7.* AS WELL *
+# *********************************************************
+
+EAPI="5"
+
+inherit check-reqs java-pkg-2 java-vm-2 multiprocessing pax-utils versionator virtualx
+
+ICEDTEA_PKG=${PN}$(replace_version_separator 1 -)
+ICEDTEA_BRANCH=$(get_version_component_range 1-3)
+OPENJDK_BUILD="36"
+OPENJDK_DATE="22_jul_2015"
+OPENJDK_TARBALL="openjdk-6-src-b${OPENJDK_BUILD}-${OPENJDK_DATE}.tar.xz"
+# Download cacao and jamvm regardless for use with EXTRA_ECONF
+CACAO_TARBALL="68fe50ac34ec.tar.gz"
+JAMVM_TARBALL="jamvm-ec18fb9e49e62dce16c5094ef1527eed619463aa.tar.gz"
+
+CACAO_GENTOO_TARBALL="icedtea-cacao-${CACAO_TARBALL}"
+JAMVM_GENTOO_TARBALL="icedtea-${JAMVM_TARBALL}"
+
+DESCRIPTION="A harness to build OpenJDK using Free Software build tools and dependencies"
+HOMEPAGE="http://icedtea.classpath.org"
+SRC_PKG="${ICEDTEA_PKG}.tar.xz"
+SRC_URI="
+	http://icedtea.classpath.org/download/source/${SRC_PKG}
+	https://java.net/downloads/openjdk6/${OPENJDK_TARBALL}
+	http://icedtea.classpath.org/download/drops/cacao/${CACAO_TARBALL} -> ${CACAO_GENTOO_TARBALL}
+	http://icedtea.classpath.org/download/drops/jamvm/${JAMVM_TARBALL} -> ${JAMVM_GENTOO_TARBALL}"
+
+LICENSE="Apache-1.1 Apache-2.0 GPL-1 GPL-2 GPL-2-with-linking-exception LGPL-2 MPL-1.0 MPL-1.1 public-domain W3C"
+SLOT="6"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+RESTRICT="test"
+
+IUSE="+alsa +awt cacao cjk +cups debug doc examples +gtk javascript
+	+jbootstrap kerberos +nsplugin +nss pax_kernel pulseaudio selinux
+	source systemtap test zero +webstart"
+
+# Ideally the following were optional at build time.
+ALSA_COMMON_DEP="
+	>=media-libs/alsa-lib-1.0"
+CUPS_COMMON_DEP="
+	>=net-print/cups-1.2.12"
+X_COMMON_DEP="
+	>=media-libs/giflib-4.1.6:=
+	>=media-libs/libpng-1.2:0=
+	>=x11-libs/libX11-1.1.3
+	>=x11-libs/libXext-1.1.1
+	>=x11-libs/libXi-1.1.3
+	>=x11-libs/libXrender-0.9.4
+	>=x11-libs/libXtst-1.0.3
+	x11-libs/libXt"
+X_DEPEND="
+	>=x11-libs/libXau-1.0.3
+	>=x11-libs/libXdmcp-1.0.2
+	>=x11-libs/libXinerama-1.0.2
+	x11-proto/inputproto
+	>=x11-proto/xextproto-7.1.1
+	x11-proto/xineramaproto
+	x11-proto/xproto"
+
+COMMON_DEP="
+	>=media-libs/freetype-2.3.5:2=
+	>=media-libs/lcms-2.5
+	>=sys-libs/zlib-1.2.3:=
+	virtual/jpeg:0=
+	javascript? ( dev-java/rhino:1.6 )
+	kerberos? ( virtual/krb5 )
+	nss? ( >=dev-libs/nss-3.12.5-r1 )
+	pulseaudio?  ( >=media-sound/pulseaudio-0.9.11:= )
+	systemtap? ( >=dev-util/systemtap-1 )"
+
+# media-fonts/lklug needs ppc ppc64 keywords
+RDEPEND="${COMMON_DEP}
+	!dev-java/icedtea6
+	!dev-java/icedtea-web:6
+	media-fonts/dejavu
+	alsa? ( ${ALSA_COMMON_DEP} )
+	awt? ( ${X_COMMON_DEP} )
+	cjk? (
+		media-fonts/arphicfonts
+		media-fonts/baekmuk-fonts
+		media-fonts/lklug
+		media-fonts/lohit-fonts
+		media-fonts/sazanami
+	)
+	cups? ( ${CUPS_COMMON_DEP} )
+	gtk? ( >=x11-libs/gtk+-2.8:2 )
+	selinux? ( sec-policy/selinux-java )"
+
+# Only ant-core-1.8.1 has fixed ant -diagnostics when xerces+xalan are not present.
+# ca-certificates, perl and openssl are used for the cacerts keystore generation
+DEPEND="${COMMON_DEP} ${ALSA_COMMON_DEP} ${CUPS_COMMON_DEP} ${X_COMMON_DEP} ${X_DEPEND}
+	|| (
+		>=dev-java/gcj-jdk-4.3
+		dev-java/icedtea-bin:6
+		dev-java/icedtea:6
+	)
+	app-arch/cpio
+	app-arch/unzip
+	app-arch/zip
+	app-misc/ca-certificates
+	>=dev-java/ant-core-1.8.2
+	dev-lang/perl
+	>=dev-libs/libxslt-1.1.26
+	dev-libs/openssl
+	sys-apps/lsb-release
+	virtual/pkgconfig
+	pax_kernel? ( sys-apps/elfix )"
+
+PDEPEND="webstart? ( dev-java/icedtea-web:0 )
+	nsplugin? ( dev-java/icedtea-web:0[nsplugin] )"
+
+S="${WORKDIR}"/${ICEDTEA_PKG}
+
+icedtea_check_requirements() {
+	local CHECKREQS_DISK_BUILD
+
+	if use doc; then
+		CHECKREQS_DISK_BUILD="8500M"
+	else
+		CHECKREQS_DISK_BUILD="8000M"
+	fi
+
+	check-reqs_pkg_${EBUILD_PHASE}
+}
+
+pkg_pretend() {
+	icedtea_check_requirements
+}
+
+pkg_setup() {
+	icedtea_check_requirements
+
+	JAVA_PKG_WANT_BUILD_VM="
+		icedtea-6 icedtea-bin-6
+		gcj-jdk"
+	JAVA_PKG_WANT_SOURCE="1.5"
+	JAVA_PKG_WANT_TARGET="1.5"
+
+	java-vm-2_pkg_setup
+	java-pkg-2_pkg_setup
+}
+
+src_unpack() {
+	unpack ${SRC_PKG}
+}
+
+java_prepare() {
+	# CACAO has a fixed default max heap of 128MB. This sucks.
+	cp "${FILESDIR}"/${SLOT}-cacao-dynmaxheap.patch patches/cacao/dynmaxheap.patch || die
+	epatch "${FILESDIR}"/${SLOT}-cacao-dynmaxheap-Makefile.patch
+
+	# For bootstrap builds as the sandbox control file might not yet exist.
+	addpredict /proc/self/coredump_filter
+
+	# icedtea doesn't like some locales. #330433 #389717
+	export LANG="C" LC_ALL="C"
+}
+
+src_configure() {
+	local cacao_config config hotspot_port use_cacao use_zero zero_config
+	local vm=$(java-pkg_get-current-vm)
+
+	# gcj-jdk ensures ecj is present.
+	if use jbootstrap || has "${vm}" gcj-jdk; then
+		use jbootstrap || einfo "bootstrap is necessary when building with ${vm}, ignoring USE=\"-jbootstrap\""
+		config+=" --enable-bootstrap"
+	else
+		config+=" --disable-bootstrap"
+	fi
+
+	# Use Zero if requested
+	if use zero; then
+		use_zero="yes"
+	fi
+
+	# Use CACAO if requested
+	if use cacao; then
+		use_cacao="yes"
+	fi
+
+	# Are we on a architecture with a HotSpot port?
+	# In-tree JIT ports are available for amd64, arm, sparc and x86.
+	if { use amd64 || use arm || use sparc || use x86; }; then
+		hotspot_port="yes"
+	fi
+
+	# Always use HotSpot as the primary VM if available. #389521 #368669 #357633 ...
+	# Otherwise use CACAO on ppc and Zero on anything else
+	if test "x${hotspot_port}" != "xyes"; then
+		if { use ppc || use ppc64; }; then
+			use_cacao="yes"
+		else
+			use_zero="yes"
+		fi
+	fi
+
+	# Turn on CACAO if needed (non-HS archs) or requested
+	if test "x${use_cacao}" = "xyes"; then
+		if test "x${hotspot_port}" = "xyes"; then
+			ewarn 'Enabling CACAO on an architecture with HotSpot support; issues may result.'
+			ewarn 'If so, please rebuild with USE="-cacao"'
+		fi
+		cacao_config="--enable-cacao"
+	fi
+
+	# Turn on Zero if needed (non-HS/CACAO archs) or requested
+	if test "x${use_zero}" = "xyes"; then
+		zero_config="--enable-zero"
+	fi
+
+	config+=" --with-parallel-jobs=$(makeopts_jobs)"
+
+	if use javascript ; then
+		config+=" --with-rhino=$(java-pkg_getjar rhino-1.6 js.jar)"
+	else
+		config+=" --without-rhino"
+	fi
+
+	unset JAVA_HOME JDK_HOME CLASSPATH JAVAC JAVACFLAGS
+
+	econf ${config} \
+		--with-openjdk-src-zip="${DISTDIR}/${OPENJDK_TARBALL}" \
+		--with-cacao-src-zip="${DISTDIR}/${CACAO_GENTOO_TARBALL}" \
+		--with-jamvm-src-zip="${DISTDIR}/${JAMVM_GENTOO_TARBALL}" \
+		--with-jdk-home="$(java-config -O)" \
+		--with-abs-install-dir="${EPREFIX}/usr/$(get_libdir)/icedtea${SLOT}" \
+		--with-pkgversion="Gentoo package ${PF}" \
+		--disable-downloading --disable-Werror \
+		$(use_enable awt system-gif) \
+		$(use_enable awt system-png) \
+		$(use_enable !debug optimizations) \
+		$(use_enable doc docs) \
+		$(use_enable kerberos system-kerberos) \
+		$(use_enable nss) \
+		$(use_with pax_kernel pax "${EPREFIX}/usr/sbin/paxmark.sh") \
+		$(use_enable pulseaudio pulse-java) \
+		$(use_enable systemtap) \
+		${zero_config} ${cacao_config}
+}
+
+src_compile() {
+	# Would use GENTOO_VM otherwise.
+	export ANT_RESPECT_JAVA_HOME=TRUE
+
+	# With ant >=1.8.2 all required tasks are part of ant-core
+	export ANT_TASKS="none"
+
+	emake
+}
+
+src_test() {
+	# Use Xvfb for tests
+	unset DISPLAY
+
+	Xemake check
+}
+
+src_install() {
+	local dest="/usr/$(get_libdir)/icedtea${SLOT}"
+	local ddest="${ED}${dest#/}"
+	dodir "${dest}"
+
+	dodoc README NEWS AUTHORS
+	dosym /usr/share/doc/${PF} /usr/share/doc/${PN}${SLOT}
+
+	cd openjdk.build/j2sdk-image || die
+
+	if ! use alsa; then
+		rm -v jre/lib/$(get_system_arch)/libjsoundalsa.* || die
+	fi
+
+	if ! use awt ; then
+		rm -vr jre/lib/$(get_system_arch)/{xawt,libsplashscreen.*} \
+		   {,jre/}bin/policytool bin/appletviewer || die
+	fi
+
+	# Don't hide classes
+	rm lib/ct.sym || die
+
+	#402507
+	mkdir jre/.systemPrefs || die
+	touch jre/.systemPrefs/.system.lock || die
+	touch jre/.systemPrefs/.systemRootModFile || die
+
+	# doins doesn't preserve executable bits.
+	cp -vRP bin include jre lib man "${ddest}" || die
+
+	dodoc ASSEMBLY_EXCEPTION THIRD_PARTY_README
+
+	if use doc; then
+		docinto html
+		dodoc -r ../docs/*
+	fi
+
+	if use examples; then
+		cp -vRP demo sample "${ddest}" || die
+	fi
+
+	if use source; then
+		cp src.zip "${ddest}" || die
+	fi
+
+	# provided by icedtea-web but we need it in JAVA_HOME to work with run-java-tool
+	if use webstart || use nsplugin; then
+		dosym /usr/libexec/icedtea-web/itweb-settings ${dest}/bin/itweb-settings
+		dosym /usr/libexec/icedtea-web/itweb-settings ${dest}/jre/bin/itweb-settings
+	fi
+	if use webstart; then
+		dosym /usr/libexec/icedtea-web/javaws ${dest}/bin/javaws
+		dosym /usr/libexec/icedtea-web/javaws ${dest}/jre/bin/javaws
+	fi
+
+	# Fix the permissions.
+	find "${ddest}" \! -type l \( -perm /111 -exec chmod 755 {} \; -o -exec chmod 644 {} \; \) || die
+
+	# Needs to be done before generating cacerts
+	java-vm_set-pax-markings "${ddest}"
+
+	# We need to generate keystore - bug #273306
+	einfo "Generating cacerts file from certificates in ${EPREFIX}/usr/share/ca-certificates/"
+	mkdir "${T}/certgen" && cd "${T}/certgen" || die
+	cp "${FILESDIR}/generate-cacerts.pl" . && chmod +x generate-cacerts.pl || die
+	for c in "${EPREFIX}"/usr/share/ca-certificates/*/*.crt; do
+		openssl x509 -text -in "${c}" >> all.crt || die
+	done
+	./generate-cacerts.pl "${ddest}/bin/keytool" all.crt || die
+	cp -vRP cacerts "${ddest}/jre/lib/security/" || die
+	chmod 644 "${ddest}/jre/lib/security/cacerts" || die
+
+	set_java_env "${FILESDIR}/icedtea.env"
+	java-vm_sandbox-predict /proc/self/coredump_filter
+}
+
+pkg_preinst() {
+	if has_version "<=dev-java/icedtea-6.1.10.4:${SLOT}"; then
+		# portage would preserve the symlink otherwise, related to bug #384397
+		rm -f "${EROOT}/usr/lib/jvm/icedtea6"
+		elog "To unify the layout and simplify scripts, the identifier of Icedtea-6*"
+		elog "has changed from 'icedtea6' to 'icedtea-6' starting from version 6.1.10.4-r1"
+		elog "If you had icedtea6 as system VM, the change should be automatic, however"
+		elog "build VM settings in /etc/java-config-2/build/jdk.conf are not changed"
+		elog "and the same holds for any user VM settings. Sorry for the inconvenience."
+	fi
+}
diff --git a/dev-java/icedtea/icedtea-6.1.13.8.ebuild b/dev-java/icedtea/icedtea-6.1.13.8.ebuild
deleted file mode 100644
index 745d54be40f6..000000000000
--- a/dev-java/icedtea/icedtea-6.1.13.8.ebuild
+++ /dev/null
@@ -1,347 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-# Build written by Andrew John Hughes (gnu_andrew@member.fsf.org)
-
-# *********************************************************
-# * IF YOU CHANGE THIS EBUILD, CHANGE ICEDTEA-7.* AS WELL *
-# *********************************************************
-
-EAPI="5"
-
-inherit check-reqs java-pkg-2 java-vm-2 multiprocessing pax-utils versionator virtualx
-
-ICEDTEA_PKG=${PN}$(replace_version_separator 1 -)
-ICEDTEA_BRANCH=$(get_version_component_range 1-3)
-OPENJDK_BUILD="36"
-OPENJDK_DATE="22_jul_2015"
-OPENJDK_TARBALL="openjdk-6-src-b${OPENJDK_BUILD}-${OPENJDK_DATE}.tar.xz"
-# Download cacao and jamvm regardless for use with EXTRA_ECONF
-CACAO_TARBALL="68fe50ac34ec.tar.gz"
-JAMVM_TARBALL="jamvm-ec18fb9e49e62dce16c5094ef1527eed619463aa.tar.gz"
-
-CACAO_GENTOO_TARBALL="icedtea-cacao-${CACAO_TARBALL}"
-JAMVM_GENTOO_TARBALL="icedtea-${JAMVM_TARBALL}"
-
-DESCRIPTION="A harness to build OpenJDK using Free Software build tools and dependencies"
-HOMEPAGE="http://icedtea.classpath.org"
-SRC_PKG="${ICEDTEA_PKG}.tar.xz"
-SRC_URI="
-	http://icedtea.classpath.org/download/source/${SRC_PKG}
-	https://java.net/downloads/openjdk6/${OPENJDK_TARBALL}
-	http://icedtea.classpath.org/download/drops/cacao/${CACAO_TARBALL} -> ${CACAO_GENTOO_TARBALL}
-	http://icedtea.classpath.org/download/drops/jamvm/${JAMVM_TARBALL} -> ${JAMVM_GENTOO_TARBALL}"
-
-LICENSE="Apache-1.1 Apache-2.0 GPL-1 GPL-2 GPL-2-with-linking-exception LGPL-2 MPL-1.0 MPL-1.1 public-domain W3C"
-SLOT="6"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-RESTRICT="test"
-
-IUSE="+alsa +awt cacao cjk +cups debug doc examples +gtk javascript
-	+jbootstrap kerberos +nsplugin +nss pax_kernel pulseaudio selinux
-	source systemtap test zero +webstart"
-
-# Ideally the following were optional at build time.
-ALSA_COMMON_DEP="
-	>=media-libs/alsa-lib-1.0"
-CUPS_COMMON_DEP="
-	>=net-print/cups-1.2.12"
-X_COMMON_DEP="
-	>=media-libs/giflib-4.1.6:=
-	>=media-libs/libpng-1.2:0=
-	>=x11-libs/libX11-1.1.3
-	>=x11-libs/libXext-1.1.1
-	>=x11-libs/libXi-1.1.3
-	>=x11-libs/libXrender-0.9.4
-	>=x11-libs/libXtst-1.0.3
-	x11-libs/libXt"
-X_DEPEND="
-	>=x11-libs/libXau-1.0.3
-	>=x11-libs/libXdmcp-1.0.2
-	>=x11-libs/libXinerama-1.0.2
-	x11-proto/inputproto
-	>=x11-proto/xextproto-7.1.1
-	x11-proto/xineramaproto
-	x11-proto/xproto"
-
-COMMON_DEP="
-	>=media-libs/freetype-2.3.5:2=
-	>=media-libs/lcms-2.5
-	>=sys-libs/zlib-1.2.3:=
-	virtual/jpeg:0=
-	javascript? ( dev-java/rhino:1.6 )
-	kerberos? ( virtual/krb5 )
-	nss? ( >=dev-libs/nss-3.12.5-r1 )
-	pulseaudio?  ( >=media-sound/pulseaudio-0.9.11:= )
-	systemtap? ( >=dev-util/systemtap-1 )"
-
-# media-fonts/lklug needs ppc ppc64 keywords
-RDEPEND="${COMMON_DEP}
-	!dev-java/icedtea6
-	!dev-java/icedtea-web:6
-	media-fonts/dejavu
-	alsa? ( ${ALSA_COMMON_DEP} )
-	awt? ( ${X_COMMON_DEP} )
-	cjk? (
-		media-fonts/arphicfonts
-		media-fonts/baekmuk-fonts
-		media-fonts/lklug
-		media-fonts/lohit-fonts
-		media-fonts/sazanami
-	)
-	cups? ( ${CUPS_COMMON_DEP} )
-	gtk? ( >=x11-libs/gtk+-2.8:2 )
-	selinux? ( sec-policy/selinux-java )"
-
-# Only ant-core-1.8.1 has fixed ant -diagnostics when xerces+xalan are not present.
-# ca-certificates, perl and openssl are used for the cacerts keystore generation
-DEPEND="${COMMON_DEP} ${ALSA_COMMON_DEP} ${CUPS_COMMON_DEP} ${X_COMMON_DEP} ${X_DEPEND}
-	|| (
-		>=dev-java/gcj-jdk-4.3
-		dev-java/icedtea-bin:6
-		dev-java/icedtea:6
-	)
-	app-arch/cpio
-	app-arch/unzip
-	app-arch/zip
-	app-misc/ca-certificates
-	>=dev-java/ant-core-1.8.2
-	dev-lang/perl
-	>=dev-libs/libxslt-1.1.26
-	dev-libs/openssl
-	sys-apps/lsb-release
-	virtual/pkgconfig
-	pax_kernel? ( sys-apps/elfix )"
-
-PDEPEND="webstart? ( dev-java/icedtea-web:0 )
-	nsplugin? ( dev-java/icedtea-web:0[nsplugin] )"
-
-S="${WORKDIR}"/${ICEDTEA_PKG}
-
-icedtea_check_requirements() {
-	local CHECKREQS_DISK_BUILD
-
-	if use doc; then
-		CHECKREQS_DISK_BUILD="8500M"
-	else
-		CHECKREQS_DISK_BUILD="8000M"
-	fi
-
-	check-reqs_pkg_${EBUILD_PHASE}
-}
-
-pkg_pretend() {
-	icedtea_check_requirements
-}
-
-pkg_setup() {
-	icedtea_check_requirements
-
-	JAVA_PKG_WANT_BUILD_VM="
-		icedtea-6 icedtea-bin-6
-		gcj-jdk"
-	JAVA_PKG_WANT_SOURCE="1.5"
-	JAVA_PKG_WANT_TARGET="1.5"
-
-	java-vm-2_pkg_setup
-	java-pkg-2_pkg_setup
-}
-
-src_unpack() {
-	unpack ${SRC_PKG}
-}
-
-java_prepare() {
-	# For bootstrap builds as the sandbox control file might not yet exist.
-	addpredict /proc/self/coredump_filter
-
-	# icedtea doesn't like some locales. #330433 #389717
-	export LANG="C" LC_ALL="C"
-}
-
-src_configure() {
-	local cacao_config config hotspot_port use_cacao use_zero zero_config
-	local vm=$(java-pkg_get-current-vm)
-
-	# gcj-jdk ensures ecj is present.
-	if use jbootstrap || has "${vm}" gcj-jdk; then
-		use jbootstrap || einfo "bootstrap is necessary when building with ${vm}, ignoring USE=\"-jbootstrap\""
-		config+=" --enable-bootstrap"
-	else
-		config+=" --disable-bootstrap"
-	fi
-
-	# Use Zero if requested
-	if use zero; then
-		use_zero="yes"
-	fi
-
-	# Use CACAO if requested
-	if use cacao; then
-		use_cacao="yes"
-	fi
-
-	# Are we on a architecture with a HotSpot port?
-	# In-tree JIT ports are available for amd64, arm, sparc and x86.
-	if { use amd64 || use arm || use sparc || use x86; }; then
-		hotspot_port="yes"
-	fi
-
-	# Always use HotSpot as the primary VM if available. #389521 #368669 #357633 ...
-	# Otherwise use CACAO on ppc and Zero on anything else
-	if test "x${hotspot_port}" != "xyes"; then
-		if { use ppc || use ppc64; }; then
-			use_cacao="yes"
-		else
-			use_zero="yes"
-		fi
-	fi
-
-	# Turn on CACAO if needed (non-HS archs) or requested
-	if test "x${use_cacao}" = "xyes"; then
-		if test "x${hotspot_port}" = "xyes"; then
-			ewarn 'Enabling CACAO on an architecture with HotSpot support; issues may result.'
-			ewarn 'If so, please rebuild with USE="-cacao"'
-		fi
-		cacao_config="--enable-cacao"
-	fi
-
-	# Turn on Zero if needed (non-HS/CACAO archs) or requested
-	if test "x${use_zero}" = "xyes"; then
-		zero_config="--enable-zero"
-	fi
-
-	config+=" --with-parallel-jobs=$(makeopts_jobs)"
-
-	if use javascript ; then
-		config+=" --with-rhino=$(java-pkg_getjar rhino-1.6 js.jar)"
-	else
-		config+=" --without-rhino"
-	fi
-
-	unset JAVA_HOME JDK_HOME CLASSPATH JAVAC JAVACFLAGS
-
-	econf ${config} \
-		--with-openjdk-src-zip="${DISTDIR}/${OPENJDK_TARBALL}" \
-		--with-cacao-src-zip="${DISTDIR}/${CACAO_GENTOO_TARBALL}" \
-		--with-jamvm-src-zip="${DISTDIR}/${JAMVM_GENTOO_TARBALL}" \
-		--with-jdk-home="$(java-config -O)" \
-		--with-abs-install-dir="${EPREFIX}/usr/$(get_libdir)/icedtea${SLOT}" \
-		--with-pkgversion="Gentoo package ${PF}" \
-		--disable-downloading --disable-Werror \
-		$(use_enable awt system-gif) \
-		$(use_enable awt system-png) \
-		$(use_enable !debug optimizations) \
-		$(use_enable doc docs) \
-		$(use_enable kerberos system-kerberos) \
-		$(use_enable nss) \
-		$(use_with pax_kernel pax "${EPREFIX}/usr/sbin/paxmark.sh") \
-		$(use_enable pulseaudio pulse-java) \
-		$(use_enable systemtap) \
-		${zero_config} ${cacao_config}
-}
-
-src_compile() {
-	# Would use GENTOO_VM otherwise.
-	export ANT_RESPECT_JAVA_HOME=TRUE
-
-	# With ant >=1.8.2 all required tasks are part of ant-core
-	export ANT_TASKS="none"
-
-	emake
-}
-
-src_test() {
-	# Use Xvfb for tests
-	unset DISPLAY
-
-	Xemake check
-}
-
-src_install() {
-	local dest="/usr/$(get_libdir)/icedtea${SLOT}"
-	local ddest="${ED}${dest#/}"
-	dodir "${dest}"
-
-	dodoc README NEWS AUTHORS
-	dosym /usr/share/doc/${PF} /usr/share/doc/${PN}${SLOT}
-
-	cd openjdk.build/j2sdk-image || die
-
-	if ! use alsa; then
-		rm -v jre/lib/$(get_system_arch)/libjsoundalsa.* || die
-	fi
-
-	if ! use awt ; then
-		rm -vr jre/lib/$(get_system_arch)/{xawt,libsplashscreen.*} \
-		   {,jre/}bin/policytool bin/appletviewer || die
-	fi
-
-	# Don't hide classes
-	rm lib/ct.sym || die
-
-	#402507
-	mkdir jre/.systemPrefs || die
-	touch jre/.systemPrefs/.system.lock || die
-	touch jre/.systemPrefs/.systemRootModFile || die
-
-	# doins doesn't preserve executable bits.
-	cp -vRP bin include jre lib man "${ddest}" || die
-
-	dodoc ASSEMBLY_EXCEPTION THIRD_PARTY_README
-
-	if use doc; then
-		docinto html
-		dodoc -r ../docs/*
-	fi
-
-	if use examples; then
-		cp -vRP demo sample "${ddest}" || die
-	fi
-
-	if use source; then
-		cp src.zip "${ddest}" || die
-	fi
-
-	# provided by icedtea-web but we need it in JAVA_HOME to work with run-java-tool
-	if use webstart || use nsplugin; then
-		dosym /usr/libexec/icedtea-web/itweb-settings ${dest}/bin/itweb-settings
-		dosym /usr/libexec/icedtea-web/itweb-settings ${dest}/jre/bin/itweb-settings
-	fi
-	if use webstart; then
-		dosym /usr/libexec/icedtea-web/javaws ${dest}/bin/javaws
-		dosym /usr/libexec/icedtea-web/javaws ${dest}/jre/bin/javaws
-	fi
-
-	# Fix the permissions.
-	find "${ddest}" \! -type l \( -perm /111 -exec chmod 755 {} \; -o -exec chmod 644 {} \; \) || die
-
-	# Needs to be done before generating cacerts
-	java-vm_set-pax-markings "${ddest}"
-
-	# We need to generate keystore - bug #273306
-	einfo "Generating cacerts file from certificates in ${EPREFIX}/usr/share/ca-certificates/"
-	mkdir "${T}/certgen" && cd "${T}/certgen" || die
-	cp "${FILESDIR}/generate-cacerts.pl" . && chmod +x generate-cacerts.pl || die
-	for c in "${EPREFIX}"/usr/share/ca-certificates/*/*.crt; do
-		openssl x509 -text -in "${c}" >> all.crt || die
-	done
-	./generate-cacerts.pl "${ddest}/bin/keytool" all.crt || die
-	cp -vRP cacerts "${ddest}/jre/lib/security/" || die
-	chmod 644 "${ddest}/jre/lib/security/cacerts" || die
-
-	set_java_env "${FILESDIR}/icedtea.env"
-	java-vm_sandbox-predict /proc/self/coredump_filter
-}
-
-pkg_preinst() {
-	if has_version "<=dev-java/icedtea-6.1.10.4:${SLOT}"; then
-		# portage would preserve the symlink otherwise, related to bug #384397
-		rm -f "${EROOT}/usr/lib/jvm/icedtea6"
-		elog "To unify the layout and simplify scripts, the identifier of Icedtea-6*"
-		elog "has changed from 'icedtea6' to 'icedtea-6' starting from version 6.1.10.4-r1"
-		elog "If you had icedtea6 as system VM, the change should be automatic, however"
-		elog "build VM settings in /etc/java-config-2/build/jdk.conf are not changed"
-		elog "and the same holds for any user VM settings. Sorry for the inconvenience."
-	fi
-}
diff --git a/dev-java/icedtea/icedtea-7.2.5.6-r1.ebuild b/dev-java/icedtea/icedtea-7.2.5.6-r1.ebuild
new file mode 100644
index 000000000000..d8a172f95c05
--- /dev/null
+++ b/dev-java/icedtea/icedtea-7.2.5.6-r1.ebuild
@@ -0,0 +1,442 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+# Build written by Andrew John Hughes (gnu_andrew@member.fsf.org)
+
+# *********************************************************
+# * IF YOU CHANGE THIS EBUILD, CHANGE ICEDTEA-6.* AS WELL *
+# *********************************************************
+
+EAPI="5"
+SLOT="7"
+
+inherit check-reqs eutils java-pkg-2 java-vm-2 multiprocessing pax-utils prefix versionator virtualx
+
+ICEDTEA_VER=$(get_version_component_range 2-4)
+ICEDTEA_BRANCH=$(get_version_component_range 2-3)
+ICEDTEA_PKG=icedtea-${ICEDTEA_VER}
+ICEDTEA_PRE=$(get_version_component_range _)
+CORBA_TARBALL="a146d87ff390.tar.bz2"
+JAXP_TARBALL="3d9457280537.tar.bz2"
+JAXWS_TARBALL="bc5d03e92fd3.tar.bz2"
+JDK_TARBALL="48b2e510f78e.tar.bz2"
+LANGTOOLS_TARBALL="a6d3d79b4547.tar.bz2"
+OPENJDK_TARBALL="44f140fd2873.tar.bz2"
+HOTSPOT_TARBALL="383de087ee57.tar.bz2"
+AARCH64_TARBALL="b19bc5aeaa09.tar.bz2"
+
+CACAO_TARBALL="e215e36be9fc.tar.gz"
+JAMVM_TARBALL="jamvm-ec18fb9e49e62dce16c5094ef1527eed619463aa.tar.gz"
+
+CORBA_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-corba-${CORBA_TARBALL}"
+JAXP_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-jaxp-${JAXP_TARBALL}"
+JAXWS_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-jaxws-${JAXWS_TARBALL}"
+JDK_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-jdk-${JDK_TARBALL}"
+LANGTOOLS_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-langtools-${LANGTOOLS_TARBALL}"
+OPENJDK_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-openjdk-${OPENJDK_TARBALL}"
+HOTSPOT_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-hotspot-${HOTSPOT_TARBALL}"
+AARCH64_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-aarch64-${AARCH64_TARBALL}"
+
+CACAO_GENTOO_TARBALL="icedtea-cacao-${CACAO_TARBALL}"
+JAMVM_GENTOO_TARBALL="icedtea-${JAMVM_TARBALL}"
+
+DROP_URL="http://icedtea.classpath.org/download/drops"
+ICEDTEA_URL="${DROP_URL}/icedtea${SLOT}/${ICEDTEA_VER}"
+
+DESCRIPTION="A harness to build OpenJDK using Free Software build tools and dependencies"
+HOMEPAGE="http://icedtea.classpath.org"
+SRC_PKG="${ICEDTEA_PKG}.tar.xz"
+SRC_URI="
+	http://icedtea.classpath.org/download/source/${SRC_PKG}
+	${ICEDTEA_URL}/openjdk.tar.bz2 -> ${OPENJDK_GENTOO_TARBALL}
+	${ICEDTEA_URL}/corba.tar.bz2 -> ${CORBA_GENTOO_TARBALL}
+	${ICEDTEA_URL}/jaxp.tar.bz2 -> ${JAXP_GENTOO_TARBALL}
+	${ICEDTEA_URL}/jaxws.tar.bz2 -> ${JAXWS_GENTOO_TARBALL}
+	${ICEDTEA_URL}/jdk.tar.bz2 -> ${JDK_GENTOO_TARBALL}
+	${ICEDTEA_URL}/langtools.tar.bz2 -> ${LANGTOOLS_GENTOO_TARBALL}
+	arm? ( ${ICEDTEA_URL}/aarch64.tar.bz2 -> ${AARCH64_GENTOO_TARBALL} )
+	arm64? ( ${ICEDTEA_URL}/aarch64.tar.bz2 -> ${AARCH64_GENTOO_TARBALL} )
+	!arm? ( !arm64? ( ${ICEDTEA_URL}/hotspot.tar.bz2 -> ${HOTSPOT_GENTOO_TARBALL} ) )
+	${DROP_URL}/cacao/${CACAO_TARBALL} -> ${CACAO_GENTOO_TARBALL}
+	${DROP_URL}/jamvm/${JAMVM_TARBALL} -> ${JAMVM_GENTOO_TARBALL}"
+
+LICENSE="Apache-1.1 Apache-2.0 GPL-1 GPL-2 GPL-2-with-linking-exception LGPL-2 MPL-1.0 MPL-1.1 public-domain W3C"
+KEYWORDS="~ppc"
+RESTRICT="test"
+
+IUSE="+awt +alsa cacao cjk +cups debug doc examples +gtk infinality
+	jamvm javascript +jbootstrap kerberos +nsplugin nss pax_kernel
+	pulseaudio selinux smartcard source +sunec test zero +webstart"
+
+REQUIRED_USE="gtk? ( awt )"
+
+# Ideally the following were optional at build time.
+ALSA_COMMON_DEP="
+	>=media-libs/alsa-lib-1.0"
+CUPS_COMMON_DEP="
+	>=net-print/cups-1.2.12"
+X_COMMON_DEP="
+	>=media-libs/giflib-4.1.6:=
+	>=media-libs/libpng-1.2:0=
+	>=x11-libs/libX11-1.1.3
+	>=x11-libs/libXext-1.1.1
+	>=x11-libs/libXi-1.1.3
+	>=x11-libs/libXrender-0.9.4
+	>=x11-libs/libXtst-1.0.3
+	x11-libs/libXt"
+X_DEPEND="
+	>=x11-libs/libXau-1.0.3
+	>=x11-libs/libXdmcp-1.0.2
+	>=x11-libs/libXinerama-1.0.2
+	x11-proto/inputproto
+	>=x11-proto/xextproto-7.1.1
+	x11-proto/xineramaproto
+	x11-proto/xproto"
+
+COMMON_DEP="
+	>=dev-libs/glib-2.26:2
+	>=dev-util/systemtap-1
+	media-libs/fontconfig
+	>=media-libs/freetype-2.5.3:2=[infinality?]
+	>=media-libs/lcms-2.5
+	>=sys-libs/zlib-1.2.3:=
+	virtual/jpeg:0=
+	gtk? (
+		>=dev-libs/atk-1.30.0
+		>=x11-libs/cairo-1.8.8:=
+		x11-libs/gdk-pixbuf:2
+		>=x11-libs/gtk+-2.8:2=
+		>=x11-libs/pango-1.24.5
+	)
+	javascript? ( dev-java/rhino:1.6 )
+	kerberos? ( virtual/krb5 )
+	nss? ( >=dev-libs/nss-3.12.5-r1 )
+	smartcard? ( sys-apps/pcsc-lite )
+	sunec? ( >=dev-libs/nss-3.16.1-r1 )"
+
+# gsettings-desktop-schemas is needed for native proxy support. #431972
+RDEPEND="${COMMON_DEP}
+	!dev-java/icedtea:0
+	!dev-java/icedtea-web:7
+	>=gnome-base/gsettings-desktop-schemas-3.12.2
+	media-fonts/dejavu
+	alsa? ( ${ALSA_COMMON_DEP} )
+	awt? ( ${X_COMMON_DEP} )
+	cjk? (
+		media-fonts/arphicfonts
+		media-fonts/baekmuk-fonts
+		media-fonts/lklug
+		media-fonts/lohit-fonts
+		media-fonts/sazanami
+	)
+	cups? ( ${CUPS_COMMON_DEP} )
+	selinux? ( sec-policy/selinux-java )"
+
+# Only ant-core-1.8.1 has fixed ant -diagnostics when xerces+xalan are not present.
+# ca-certificates, perl and openssl are used for the cacerts keystore generation
+DEPEND="${COMMON_DEP} ${ALSA_COMMON_DEP} ${CUPS_COMMON_DEP} ${X_COMMON_DEP} ${X_DEPEND}
+	|| (
+		>=dev-java/gcj-jdk-4.3
+		dev-java/icedtea-bin:7
+		dev-java/icedtea-bin:6
+		dev-java/icedtea:7
+		dev-java/icedtea:6
+	)
+	app-arch/cpio
+	app-arch/unzip
+	app-arch/zip
+	app-misc/ca-certificates
+	>=dev-java/ant-core-1.8.2
+	dev-lang/perl
+	>=dev-libs/libxslt-1.1.26
+	dev-libs/openssl
+	sys-apps/attr
+	sys-apps/lsb-release
+	virtual/pkgconfig
+	pax_kernel? ( sys-apps/elfix )"
+
+PDEPEND="webstart? ( dev-java/icedtea-web:0[icedtea7] )
+	nsplugin? ( dev-java/icedtea-web:0[icedtea7,nsplugin] )
+	pulseaudio? ( dev-java/icedtea-sound )"
+
+S="${WORKDIR}"/${ICEDTEA_PKG}
+
+icedtea_check_requirements() {
+	local CHECKREQS_DISK_BUILD
+
+	if use doc; then
+		CHECKREQS_DISK_BUILD="9000M"
+	else
+		CHECKREQS_DISK_BUILD="8500M"
+	fi
+
+	check-reqs_pkg_${EBUILD_PHASE}
+}
+
+pkg_pretend() {
+	icedtea_check_requirements
+}
+
+pkg_setup() {
+	icedtea_check_requirements
+
+	JAVA_PKG_WANT_BUILD_VM="
+		icedtea-7 icedtea-bin-7
+		icedtea-6 icedtea-bin-6
+		gcj-jdk"
+	JAVA_PKG_WANT_SOURCE="1.5"
+	JAVA_PKG_WANT_TARGET="1.5"
+
+	java-vm-2_pkg_setup
+	java-pkg-2_pkg_setup
+}
+
+src_unpack() {
+	unpack ${SRC_PKG}
+}
+
+java_prepare() {
+	# CACAO has a fixed default max heap of 128MB. This sucks.
+	cp "${FILESDIR}"/${SLOT}-cacao-dynmaxheap.patch patches/cacao/dynmaxheap.patch || die
+	epatch "${FILESDIR}"/${SLOT}-cacao-dynmaxheap-Makefile.patch
+
+	if ! use cups; then
+		# CUPS is always needed at build time but you can at least make it dlopen.
+		sed -i 's/SYSTEM_CUPS="true"/SYSTEM_CUPS="false"/g' Makefile.in || die
+	fi
+
+	# For bootstrap builds as the sandbox control file might not yet exist.
+	addpredict /proc/self/coredump_filter
+
+	# icedtea doesn't like some locales. #330433 #389717
+	export LANG="C" LC_ALL="C"
+}
+
+src_configure() {
+	local cacao_config config hotspot_port hs_tarball jamvm_config use_cacao use_jamvm use_zero zero_config
+	local vm=$(java-pkg_get-current-vm)
+
+	# gcj-jdk ensures ecj is present.
+	if use jbootstrap || has "${vm}" gcj-jdk; then
+		use jbootstrap || einfo "bootstrap is necessary when building with ${vm}, ignoring USE=\"-jbootstrap\""
+		config+=" --enable-bootstrap"
+	else
+		config+=" --disable-bootstrap"
+	fi
+
+	# Use Zero if requested
+	if use zero; then
+		use_zero="yes"
+	fi
+
+	# Use JamVM if requested
+	if use jamvm; then
+		use_jamvm="yes"
+	fi
+
+	# Use CACAO if requested
+	if use cacao; then
+		use_cacao="yes"
+	fi
+
+	# Are we on a architecture with a HotSpot port?
+	# In-tree JIT ports are available for amd64, arm, arm64, ppc64 (be&le), SPARC and x86.
+	if { use amd64 || use arm || use arm64 || use ppc64 || use sparc || use x86; }; then
+		hotspot_port="yes"
+	fi
+
+	# Always use HotSpot as the primary VM if available. #389521 #368669 #357633 ...
+	# Otherwise use CACAO on ppc and Zero on anything else
+	if test "x${hotspot_port}" != "xyes"; then
+		if use ppc; then
+			use_cacao="yes"
+		else
+			use_zero="yes"
+		fi
+	fi
+
+	# Turn on JamVM if needed (non-HS archs) or requested
+	if test "x${use_jamvm}" = "xyes"; then
+		if test "x${hotspot_port}" = "xyes"; then
+			ewarn 'Enabling JamVM on an architecture with HotSpot support; issues may result.'
+			ewarn 'If so, please rebuild with USE="-jamvm"'
+		fi
+		jamvm_config="--enable-jamvm"
+	fi
+
+	# Turn on CACAO if needed (non-HS archs) or requested
+	if test "x${use_cacao}" = "xyes"; then
+		if test "x${hotspot_port}" = "xyes"; then
+			ewarn 'Enabling CACAO on an architecture with HotSpot support; issues may result.'
+			ewarn 'If so, please rebuild with USE="-cacao"'
+		fi
+		cacao_config="--enable-cacao"
+	fi
+
+	# Turn on Zero if needed (non-HS/CACAO archs) or requested
+	if test "x${use_zero}" = "xyes"; then
+		if test "x${hotspot_port}" = "xyes"; then
+			ewarn 'Enabling Zero on an architecture with HotSpot support; performance will be significantly reduced.'
+		fi
+		zero_config="--enable-zero"
+	fi
+
+	# Use appropriate HotSpot tarball for architecture
+	if { use arm || use arm64; }; then
+		hs_tarball="${DISTDIR}/${AARCH64_GENTOO_TARBALL}";
+	else
+		hs_tarball="${DISTDIR}/${HOTSPOT_GENTOO_TARBALL}";
+	fi
+
+	config+=" --with-parallel-jobs=$(makeopts_jobs)"
+
+	if use javascript ; then
+		config+=" --with-rhino=$(java-pkg_getjar rhino-1.6 js.jar)"
+	else
+		config+=" --without-rhino"
+	fi
+
+	unset JAVA_HOME JDK_HOME CLASSPATH JAVAC JAVACFLAGS
+
+	econf ${config} \
+		--with-openjdk-src-zip="${DISTDIR}/${OPENJDK_GENTOO_TARBALL}" \
+		--with-corba-src-zip="${DISTDIR}/${CORBA_GENTOO_TARBALL}" \
+		--with-jaxp-src-zip="${DISTDIR}/${JAXP_GENTOO_TARBALL}" \
+		--with-jaxws-src-zip="${DISTDIR}/${JAXWS_GENTOO_TARBALL}" \
+		--with-jdk-src-zip="${DISTDIR}/${JDK_GENTOO_TARBALL}" \
+		--with-hotspot-src-zip="${hs_tarball}" \
+		--with-langtools-src-zip="${DISTDIR}/${LANGTOOLS_GENTOO_TARBALL}" \
+		--with-cacao-src-zip="${DISTDIR}/${CACAO_GENTOO_TARBALL}" \
+		--with-jamvm-src-zip="${DISTDIR}/${JAMVM_GENTOO_TARBALL}" \
+		--with-jdk-home="$(java-config -O)" \
+		--prefix="${EPREFIX}/usr/$(get_libdir)/icedtea${SLOT}" \
+		--with-pkgversion="Gentoo ${PF}" \
+		--disable-downloading --disable-Werror \
+		--disable-hotspot-tests --disable-jdk-tests \
+		--enable-system-lcms --enable-system-jpeg \
+		--enable-system-zlib \
+		$(use_enable awt system-gif) \
+		$(use_enable awt system-png) \
+		$(use_enable !debug optimizations) \
+		$(use_enable doc docs) \
+		$(use_enable gtk system-gtk) \
+		$(use_enable infinality) \
+		$(use_enable kerberos system-kerberos) \
+		$(use_enable nss) \
+		$(use_with pax_kernel pax "${EPREFIX}/usr/sbin/paxmark.sh") \
+		$(use_enable smartcard system-pcsc) \
+		$(use_enable sunec) \
+		${zero_config} ${cacao_config} ${jamvm_config}
+}
+
+src_compile() {
+	# Would use GENTOO_VM otherwise.
+	export ANT_RESPECT_JAVA_HOME=TRUE
+
+	# With ant >=1.8.2 all required tasks are part of ant-core
+	export ANT_TASKS="none"
+
+	emake
+}
+
+src_test() {
+	# Use Xvfb for tests
+	unset DISPLAY
+
+	Xemake check
+}
+
+src_install() {
+	local dest="/usr/$(get_libdir)/icedtea${SLOT}"
+	local ddest="${ED}${dest#/}"
+	dodir "${dest}"
+
+	dodoc README NEWS AUTHORS
+	dosym /usr/share/doc/${PF} /usr/share/doc/${PN}${SLOT}
+
+	cd openjdk.build/j2sdk-image || die
+
+	if ! use alsa; then
+		rm -v jre/lib/$(get_system_arch)/libjsoundalsa.* || die
+	fi
+
+	if ! use awt; then
+		rm -vr jre/lib/$(get_system_arch)/{xawt,libsplashscreen.*,libjavagtk.*} \
+		   {,jre/}bin/policytool bin/appletviewer || die
+	fi
+
+	# Don't hide classes
+	rm lib/ct.sym || die
+
+	#402507
+	mkdir jre/.systemPrefs || die
+	touch jre/.systemPrefs/.system.lock || die
+	touch jre/.systemPrefs/.systemRootModFile || die
+
+	# doins doesn't preserve executable bits.
+	cp -vRP bin include jre lib man "${ddest}" || die
+
+	dodoc ASSEMBLY_EXCEPTION THIRD_PARTY_README
+
+	if use doc; then
+		docinto html
+		dodoc -r ../docs/*
+	fi
+
+	if use examples; then
+		cp -vRP demo sample "${ddest}" || die
+	fi
+
+	if use source; then
+		cp src.zip "${ddest}" || die
+	fi
+
+	# provided by icedtea-web but we need it in JAVA_HOME to work with run-java-tool
+	if use webstart || use nsplugin; then
+		dosym /usr/libexec/icedtea-web/itweb-settings ${dest}/bin/itweb-settings
+		dosym /usr/libexec/icedtea-web/itweb-settings ${dest}/jre/bin/itweb-settings
+	fi
+	if use webstart; then
+		dosym /usr/libexec/icedtea-web/javaws ${dest}/bin/javaws
+		dosym /usr/libexec/icedtea-web/javaws ${dest}/jre/bin/javaws
+	fi
+
+	# Fix the permissions.
+	find "${ddest}" \! -type l \( -perm /111 -exec chmod 755 {} \; -o -exec chmod 644 {} \; \) || die
+
+	# Needs to be done before generating cacerts
+	java-vm_set-pax-markings "${ddest}"
+
+	# We need to generate keystore - bug #273306
+	einfo "Generating cacerts file from certificates in ${EPREFIX}/usr/share/ca-certificates/"
+	mkdir "${T}/certgen" && cd "${T}/certgen" || die
+	cp "${FILESDIR}/generate-cacerts.pl" . && chmod +x generate-cacerts.pl || die
+	for c in "${EPREFIX}"/usr/share/ca-certificates/*/*.crt; do
+		openssl x509 -text -in "${c}" >> all.crt || die
+	done
+	./generate-cacerts.pl "${ddest}/bin/keytool" all.crt || die
+	cp -vRP cacerts "${ddest}/jre/lib/security/" || die
+	chmod 644 "${ddest}/jre/lib/security/cacerts" || die
+
+	# OpenJDK7 should be able to use fontconfig instead, but wont hurt to
+	# install it anyway. Bug 390663
+	cp "${FILESDIR}"/fontconfig.Gentoo.properties.src "${T}"/fontconfig.Gentoo.properties || die
+	eprefixify "${T}"/fontconfig.Gentoo.properties
+	insinto "${dest}"/jre/lib
+	doins "${T}"/fontconfig.Gentoo.properties
+
+	set_java_env "${FILESDIR}/icedtea.env"
+	java-vm_sandbox-predict /proc/self/coredump_filter
+}
+
+pkg_preinst() {
+	if has_version "<=dev-java/icedtea-7.2.0:7"; then
+		# portage would preserve the symlink otherwise, related to bug #384397
+		rm -f "${EROOT}/usr/lib/jvm/icedtea7"
+		elog "To unify the layout and simplify scripts, the identifier of Icedtea-7*"
+		elog "has changed from 'icedtea7' to 'icedtea-7' starting from version 7.2.0-r1"
+		elog "If you had icedtea7 as system VM, the change should be automatic, however"
+		elog "build VM settings in /etc/java-config-2/build/jdk.conf are not changed"
+		elog "and the same holds for any user VM settings. Sorry for the inconvenience."
+	fi
+}
diff --git a/dev-java/icedtea/icedtea-7.2.5.6.ebuild b/dev-java/icedtea/icedtea-7.2.5.6.ebuild
deleted file mode 100644
index 06dbc68ac67f..000000000000
--- a/dev-java/icedtea/icedtea-7.2.5.6.ebuild
+++ /dev/null
@@ -1,438 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-# Build written by Andrew John Hughes (gnu_andrew@member.fsf.org)
-
-# *********************************************************
-# * IF YOU CHANGE THIS EBUILD, CHANGE ICEDTEA-6.* AS WELL *
-# *********************************************************
-
-EAPI="5"
-SLOT="7"
-
-inherit check-reqs eutils java-pkg-2 java-vm-2 multiprocessing pax-utils prefix versionator virtualx
-
-ICEDTEA_VER=$(get_version_component_range 2-4)
-ICEDTEA_BRANCH=$(get_version_component_range 2-3)
-ICEDTEA_PKG=icedtea-${ICEDTEA_VER}
-ICEDTEA_PRE=$(get_version_component_range _)
-CORBA_TARBALL="a146d87ff390.tar.bz2"
-JAXP_TARBALL="3d9457280537.tar.bz2"
-JAXWS_TARBALL="bc5d03e92fd3.tar.bz2"
-JDK_TARBALL="48b2e510f78e.tar.bz2"
-LANGTOOLS_TARBALL="a6d3d79b4547.tar.bz2"
-OPENJDK_TARBALL="44f140fd2873.tar.bz2"
-HOTSPOT_TARBALL="383de087ee57.tar.bz2"
-AARCH64_TARBALL="b19bc5aeaa09.tar.bz2"
-
-CACAO_TARBALL="e215e36be9fc.tar.gz"
-JAMVM_TARBALL="jamvm-ec18fb9e49e62dce16c5094ef1527eed619463aa.tar.gz"
-
-CORBA_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-corba-${CORBA_TARBALL}"
-JAXP_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-jaxp-${JAXP_TARBALL}"
-JAXWS_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-jaxws-${JAXWS_TARBALL}"
-JDK_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-jdk-${JDK_TARBALL}"
-LANGTOOLS_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-langtools-${LANGTOOLS_TARBALL}"
-OPENJDK_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-openjdk-${OPENJDK_TARBALL}"
-HOTSPOT_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-hotspot-${HOTSPOT_TARBALL}"
-AARCH64_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-aarch64-${AARCH64_TARBALL}"
-
-CACAO_GENTOO_TARBALL="icedtea-cacao-${CACAO_TARBALL}"
-JAMVM_GENTOO_TARBALL="icedtea-${JAMVM_TARBALL}"
-
-DROP_URL="http://icedtea.classpath.org/download/drops"
-ICEDTEA_URL="${DROP_URL}/icedtea${SLOT}/${ICEDTEA_VER}"
-
-DESCRIPTION="A harness to build OpenJDK using Free Software build tools and dependencies"
-HOMEPAGE="http://icedtea.classpath.org"
-SRC_PKG="${ICEDTEA_PKG}.tar.xz"
-SRC_URI="
-	http://icedtea.classpath.org/download/source/${SRC_PKG}
-	${ICEDTEA_URL}/openjdk.tar.bz2 -> ${OPENJDK_GENTOO_TARBALL}
-	${ICEDTEA_URL}/corba.tar.bz2 -> ${CORBA_GENTOO_TARBALL}
-	${ICEDTEA_URL}/jaxp.tar.bz2 -> ${JAXP_GENTOO_TARBALL}
-	${ICEDTEA_URL}/jaxws.tar.bz2 -> ${JAXWS_GENTOO_TARBALL}
-	${ICEDTEA_URL}/jdk.tar.bz2 -> ${JDK_GENTOO_TARBALL}
-	${ICEDTEA_URL}/langtools.tar.bz2 -> ${LANGTOOLS_GENTOO_TARBALL}
-	arm? ( ${ICEDTEA_URL}/aarch64.tar.bz2 -> ${AARCH64_GENTOO_TARBALL} )
-	arm64? ( ${ICEDTEA_URL}/aarch64.tar.bz2 -> ${AARCH64_GENTOO_TARBALL} )
-	!arm? ( !arm64? ( ${ICEDTEA_URL}/hotspot.tar.bz2 -> ${HOTSPOT_GENTOO_TARBALL} ) )
-	${DROP_URL}/cacao/${CACAO_TARBALL} -> ${CACAO_GENTOO_TARBALL}
-	${DROP_URL}/jamvm/${JAMVM_TARBALL} -> ${JAMVM_GENTOO_TARBALL}"
-
-LICENSE="Apache-1.1 Apache-2.0 GPL-1 GPL-2 GPL-2-with-linking-exception LGPL-2 MPL-1.0 MPL-1.1 public-domain W3C"
-KEYWORDS="~ppc"
-RESTRICT="test"
-
-IUSE="+awt +alsa cacao cjk +cups debug doc examples +gtk infinality
-	jamvm javascript +jbootstrap kerberos +nsplugin nss pax_kernel
-	pulseaudio selinux smartcard source +sunec test zero +webstart"
-
-REQUIRED_USE="gtk? ( awt )"
-
-# Ideally the following were optional at build time.
-ALSA_COMMON_DEP="
-	>=media-libs/alsa-lib-1.0"
-CUPS_COMMON_DEP="
-	>=net-print/cups-1.2.12"
-X_COMMON_DEP="
-	>=media-libs/giflib-4.1.6:=
-	>=media-libs/libpng-1.2:0=
-	>=x11-libs/libX11-1.1.3
-	>=x11-libs/libXext-1.1.1
-	>=x11-libs/libXi-1.1.3
-	>=x11-libs/libXrender-0.9.4
-	>=x11-libs/libXtst-1.0.3
-	x11-libs/libXt"
-X_DEPEND="
-	>=x11-libs/libXau-1.0.3
-	>=x11-libs/libXdmcp-1.0.2
-	>=x11-libs/libXinerama-1.0.2
-	x11-proto/inputproto
-	>=x11-proto/xextproto-7.1.1
-	x11-proto/xineramaproto
-	x11-proto/xproto"
-
-COMMON_DEP="
-	>=dev-libs/glib-2.26:2
-	>=dev-util/systemtap-1
-	media-libs/fontconfig
-	>=media-libs/freetype-2.5.3:2=[infinality?]
-	>=media-libs/lcms-2.5
-	>=sys-libs/zlib-1.2.3:=
-	virtual/jpeg:0=
-	gtk? (
-		>=dev-libs/atk-1.30.0
-		>=x11-libs/cairo-1.8.8:=
-		x11-libs/gdk-pixbuf:2
-		>=x11-libs/gtk+-2.8:2=
-		>=x11-libs/pango-1.24.5
-	)
-	javascript? ( dev-java/rhino:1.6 )
-	kerberos? ( virtual/krb5 )
-	nss? ( >=dev-libs/nss-3.12.5-r1 )
-	smartcard? ( sys-apps/pcsc-lite )
-	sunec? ( >=dev-libs/nss-3.16.1-r1 )"
-
-# gsettings-desktop-schemas is needed for native proxy support. #431972
-RDEPEND="${COMMON_DEP}
-	!dev-java/icedtea:0
-	!dev-java/icedtea-web:7
-	>=gnome-base/gsettings-desktop-schemas-3.12.2
-	media-fonts/dejavu
-	alsa? ( ${ALSA_COMMON_DEP} )
-	awt? ( ${X_COMMON_DEP} )
-	cjk? (
-		media-fonts/arphicfonts
-		media-fonts/baekmuk-fonts
-		media-fonts/lklug
-		media-fonts/lohit-fonts
-		media-fonts/sazanami
-	)
-	cups? ( ${CUPS_COMMON_DEP} )
-	selinux? ( sec-policy/selinux-java )"
-
-# Only ant-core-1.8.1 has fixed ant -diagnostics when xerces+xalan are not present.
-# ca-certificates, perl and openssl are used for the cacerts keystore generation
-DEPEND="${COMMON_DEP} ${ALSA_COMMON_DEP} ${CUPS_COMMON_DEP} ${X_COMMON_DEP} ${X_DEPEND}
-	|| (
-		>=dev-java/gcj-jdk-4.3
-		dev-java/icedtea-bin:7
-		dev-java/icedtea-bin:6
-		dev-java/icedtea:7
-		dev-java/icedtea:6
-	)
-	app-arch/cpio
-	app-arch/unzip
-	app-arch/zip
-	app-misc/ca-certificates
-	>=dev-java/ant-core-1.8.2
-	dev-lang/perl
-	>=dev-libs/libxslt-1.1.26
-	dev-libs/openssl
-	sys-apps/attr
-	sys-apps/lsb-release
-	virtual/pkgconfig
-	pax_kernel? ( sys-apps/elfix )"
-
-PDEPEND="webstart? ( dev-java/icedtea-web:0[icedtea7] )
-	nsplugin? ( dev-java/icedtea-web:0[icedtea7,nsplugin] )
-	pulseaudio? ( dev-java/icedtea-sound )"
-
-S="${WORKDIR}"/${ICEDTEA_PKG}
-
-icedtea_check_requirements() {
-	local CHECKREQS_DISK_BUILD
-
-	if use doc; then
-		CHECKREQS_DISK_BUILD="9000M"
-	else
-		CHECKREQS_DISK_BUILD="8500M"
-	fi
-
-	check-reqs_pkg_${EBUILD_PHASE}
-}
-
-pkg_pretend() {
-	icedtea_check_requirements
-}
-
-pkg_setup() {
-	icedtea_check_requirements
-
-	JAVA_PKG_WANT_BUILD_VM="
-		icedtea-7 icedtea-bin-7
-		icedtea-6 icedtea-bin-6
-		gcj-jdk"
-	JAVA_PKG_WANT_SOURCE="1.5"
-	JAVA_PKG_WANT_TARGET="1.5"
-
-	java-vm-2_pkg_setup
-	java-pkg-2_pkg_setup
-}
-
-src_unpack() {
-	unpack ${SRC_PKG}
-}
-
-java_prepare() {
-	if ! use cups; then
-		# CUPS is always needed at build time but you can at least make it dlopen.
-		sed -i 's/SYSTEM_CUPS="true"/SYSTEM_CUPS="false"/g' Makefile.in || die
-	fi
-
-	# For bootstrap builds as the sandbox control file might not yet exist.
-	addpredict /proc/self/coredump_filter
-
-	# icedtea doesn't like some locales. #330433 #389717
-	export LANG="C" LC_ALL="C"
-}
-
-src_configure() {
-	local cacao_config config hotspot_port hs_tarball jamvm_config use_cacao use_jamvm use_zero zero_config
-	local vm=$(java-pkg_get-current-vm)
-
-	# gcj-jdk ensures ecj is present.
-	if use jbootstrap || has "${vm}" gcj-jdk; then
-		use jbootstrap || einfo "bootstrap is necessary when building with ${vm}, ignoring USE=\"-jbootstrap\""
-		config+=" --enable-bootstrap"
-	else
-		config+=" --disable-bootstrap"
-	fi
-
-	# Use Zero if requested
-	if use zero; then
-		use_zero="yes"
-	fi
-
-	# Use JamVM if requested
-	if use jamvm; then
-		use_jamvm="yes"
-	fi
-
-	# Use CACAO if requested
-	if use cacao; then
-		use_cacao="yes"
-	fi
-
-	# Are we on a architecture with a HotSpot port?
-	# In-tree JIT ports are available for amd64, arm, arm64, ppc64 (be&le), SPARC and x86.
-	if { use amd64 || use arm || use arm64 || use ppc64 || use sparc || use x86; }; then
-		hotspot_port="yes"
-	fi
-
-	# Always use HotSpot as the primary VM if available. #389521 #368669 #357633 ...
-	# Otherwise use CACAO on ppc and Zero on anything else
-	if test "x${hotspot_port}" != "xyes"; then
-		if use ppc; then
-			use_cacao="yes"
-		else
-			use_zero="yes"
-		fi
-	fi
-
-	# Turn on JamVM if needed (non-HS archs) or requested
-	if test "x${use_jamvm}" = "xyes"; then
-		if test "x${hotspot_port}" = "xyes"; then
-			ewarn 'Enabling JamVM on an architecture with HotSpot support; issues may result.'
-			ewarn 'If so, please rebuild with USE="-jamvm"'
-		fi
-		jamvm_config="--enable-jamvm"
-	fi
-
-	# Turn on CACAO if needed (non-HS archs) or requested
-	if test "x${use_cacao}" = "xyes"; then
-		if test "x${hotspot_port}" = "xyes"; then
-			ewarn 'Enabling CACAO on an architecture with HotSpot support; issues may result.'
-			ewarn 'If so, please rebuild with USE="-cacao"'
-		fi
-		cacao_config="--enable-cacao"
-	fi
-
-	# Turn on Zero if needed (non-HS/CACAO archs) or requested
-	if test "x${use_zero}" = "xyes"; then
-		if test "x${hotspot_port}" = "xyes"; then
-			ewarn 'Enabling Zero on an architecture with HotSpot support; performance will be significantly reduced.'
-		fi
-		zero_config="--enable-zero"
-	fi
-
-	# Use appropriate HotSpot tarball for architecture
-	if { use arm || use arm64; }; then
-		hs_tarball="${DISTDIR}/${AARCH64_GENTOO_TARBALL}";
-	else
-		hs_tarball="${DISTDIR}/${HOTSPOT_GENTOO_TARBALL}";
-	fi
-
-	config+=" --with-parallel-jobs=$(makeopts_jobs)"
-
-	if use javascript ; then
-		config+=" --with-rhino=$(java-pkg_getjar rhino-1.6 js.jar)"
-	else
-		config+=" --without-rhino"
-	fi
-
-	unset JAVA_HOME JDK_HOME CLASSPATH JAVAC JAVACFLAGS
-
-	econf ${config} \
-		--with-openjdk-src-zip="${DISTDIR}/${OPENJDK_GENTOO_TARBALL}" \
-		--with-corba-src-zip="${DISTDIR}/${CORBA_GENTOO_TARBALL}" \
-		--with-jaxp-src-zip="${DISTDIR}/${JAXP_GENTOO_TARBALL}" \
-		--with-jaxws-src-zip="${DISTDIR}/${JAXWS_GENTOO_TARBALL}" \
-		--with-jdk-src-zip="${DISTDIR}/${JDK_GENTOO_TARBALL}" \
-		--with-hotspot-src-zip="${hs_tarball}" \
-		--with-langtools-src-zip="${DISTDIR}/${LANGTOOLS_GENTOO_TARBALL}" \
-		--with-cacao-src-zip="${DISTDIR}/${CACAO_GENTOO_TARBALL}" \
-		--with-jamvm-src-zip="${DISTDIR}/${JAMVM_GENTOO_TARBALL}" \
-		--with-jdk-home="$(java-config -O)" \
-		--prefix="${EPREFIX}/usr/$(get_libdir)/icedtea${SLOT}" \
-		--with-pkgversion="Gentoo ${PF}" \
-		--disable-downloading --disable-Werror \
-		--disable-hotspot-tests --disable-jdk-tests \
-		--enable-system-lcms --enable-system-jpeg \
-		--enable-system-zlib \
-		$(use_enable awt system-gif) \
-		$(use_enable awt system-png) \
-		$(use_enable !debug optimizations) \
-		$(use_enable doc docs) \
-		$(use_enable gtk system-gtk) \
-		$(use_enable infinality) \
-		$(use_enable kerberos system-kerberos) \
-		$(use_enable nss) \
-		$(use_with pax_kernel pax "${EPREFIX}/usr/sbin/paxmark.sh") \
-		$(use_enable smartcard system-pcsc) \
-		$(use_enable sunec) \
-		${zero_config} ${cacao_config} ${jamvm_config}
-}
-
-src_compile() {
-	# Would use GENTOO_VM otherwise.
-	export ANT_RESPECT_JAVA_HOME=TRUE
-
-	# With ant >=1.8.2 all required tasks are part of ant-core
-	export ANT_TASKS="none"
-
-	emake
-}
-
-src_test() {
-	# Use Xvfb for tests
-	unset DISPLAY
-
-	Xemake check
-}
-
-src_install() {
-	local dest="/usr/$(get_libdir)/icedtea${SLOT}"
-	local ddest="${ED}${dest#/}"
-	dodir "${dest}"
-
-	dodoc README NEWS AUTHORS
-	dosym /usr/share/doc/${PF} /usr/share/doc/${PN}${SLOT}
-
-	cd openjdk.build/j2sdk-image || die
-
-	if ! use alsa; then
-		rm -v jre/lib/$(get_system_arch)/libjsoundalsa.* || die
-	fi
-
-	if ! use awt; then
-		rm -vr jre/lib/$(get_system_arch)/{xawt,libsplashscreen.*,libjavagtk.*} \
-		   {,jre/}bin/policytool bin/appletviewer || die
-	fi
-
-	# Don't hide classes
-	rm lib/ct.sym || die
-
-	#402507
-	mkdir jre/.systemPrefs || die
-	touch jre/.systemPrefs/.system.lock || die
-	touch jre/.systemPrefs/.systemRootModFile || die
-
-	# doins doesn't preserve executable bits.
-	cp -vRP bin include jre lib man "${ddest}" || die
-
-	dodoc ASSEMBLY_EXCEPTION THIRD_PARTY_README
-
-	if use doc; then
-		docinto html
-		dodoc -r ../docs/*
-	fi
-
-	if use examples; then
-		cp -vRP demo sample "${ddest}" || die
-	fi
-
-	if use source; then
-		cp src.zip "${ddest}" || die
-	fi
-
-	# provided by icedtea-web but we need it in JAVA_HOME to work with run-java-tool
-	if use webstart || use nsplugin; then
-		dosym /usr/libexec/icedtea-web/itweb-settings ${dest}/bin/itweb-settings
-		dosym /usr/libexec/icedtea-web/itweb-settings ${dest}/jre/bin/itweb-settings
-	fi
-	if use webstart; then
-		dosym /usr/libexec/icedtea-web/javaws ${dest}/bin/javaws
-		dosym /usr/libexec/icedtea-web/javaws ${dest}/jre/bin/javaws
-	fi
-
-	# Fix the permissions.
-	find "${ddest}" \! -type l \( -perm /111 -exec chmod 755 {} \; -o -exec chmod 644 {} \; \) || die
-
-	# Needs to be done before generating cacerts
-	java-vm_set-pax-markings "${ddest}"
-
-	# We need to generate keystore - bug #273306
-	einfo "Generating cacerts file from certificates in ${EPREFIX}/usr/share/ca-certificates/"
-	mkdir "${T}/certgen" && cd "${T}/certgen" || die
-	cp "${FILESDIR}/generate-cacerts.pl" . && chmod +x generate-cacerts.pl || die
-	for c in "${EPREFIX}"/usr/share/ca-certificates/*/*.crt; do
-		openssl x509 -text -in "${c}" >> all.crt || die
-	done
-	./generate-cacerts.pl "${ddest}/bin/keytool" all.crt || die
-	cp -vRP cacerts "${ddest}/jre/lib/security/" || die
-	chmod 644 "${ddest}/jre/lib/security/cacerts" || die
-
-	# OpenJDK7 should be able to use fontconfig instead, but wont hurt to
-	# install it anyway. Bug 390663
-	cp "${FILESDIR}"/fontconfig.Gentoo.properties.src "${T}"/fontconfig.Gentoo.properties || die
-	eprefixify "${T}"/fontconfig.Gentoo.properties
-	insinto "${dest}"/jre/lib
-	doins "${T}"/fontconfig.Gentoo.properties
-
-	set_java_env "${FILESDIR}/icedtea.env"
-	java-vm_sandbox-predict /proc/self/coredump_filter
-}
-
-pkg_preinst() {
-	if has_version "<=dev-java/icedtea-7.2.0:7"; then
-		# portage would preserve the symlink otherwise, related to bug #384397
-		rm -f "${EROOT}/usr/lib/jvm/icedtea7"
-		elog "To unify the layout and simplify scripts, the identifier of Icedtea-7*"
-		elog "has changed from 'icedtea7' to 'icedtea-7' starting from version 7.2.0-r1"
-		elog "If you had icedtea7 as system VM, the change should be automatic, however"
-		elog "build VM settings in /etc/java-config-2/build/jdk.conf are not changed"
-		elog "and the same holds for any user VM settings. Sorry for the inconvenience."
-	fi
-}
diff --git a/dev-java/java-apicheck/Manifest b/dev-java/java-apicheck/Manifest
new file mode 100644
index 000000000000..e48b49b98caa
--- /dev/null
+++ b/dev-java/java-apicheck/Manifest
@@ -0,0 +1 @@
+DIST java-apicheck-0_p20150907.tar.gz 1550 SHA256 4f8a108e78b556d3400e334d3cd0b972628a8cee97bfe903e656ddbb46368449 SHA512 68a3a5443ea26840a526c2e53451e47e441f6ec15b2ddffef8f5d63a50f1129d18cd65506ecfe0bbf3f9829514697648eff8f64e558f0bd5376b0bf2add70b70 WHIRLPOOL 0640404622635f36c2dab7623510b5ea913a409382b77699c0dea5904fdedf0d83ba5bdf3e2247d3ed3b3b33a2dd271b9ba1d4b2913428adfa01381be1cdbdef
diff --git a/dev-java/java-apicheck/java-apicheck-0_p20150907.ebuild b/dev-java/java-apicheck/java-apicheck-0_p20150907.ebuild
new file mode 100644
index 000000000000..d116fc596635
--- /dev/null
+++ b/dev-java/java-apicheck/java-apicheck-0_p20150907.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+DESCRIPTION="Command line tool to check Java packages for API compatibility"
+HOMEPAGE="https://github.com/gentoo/java-apicheck/"
+SRC_URI="https://github.com/gentoo/java-apicheck/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	dev-java/japitools
+	dev-java/java-config
+	"
+
+src_install() {
+	dobin ${PN}
+}
diff --git a/dev-java/java-apicheck/metadata.xml b/dev-java/java-apicheck/metadata.xml
new file mode 100644
index 000000000000..0715bc757941
--- /dev/null
+++ b/dev-java/java-apicheck/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+	<upstream>
+		<remote-id type="github">gentoo/java-apicheck</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/java-config/java-config-2.2.0.ebuild b/dev-java/java-config/java-config-2.2.0.ebuild
index 79a340743873..0635431b0f4e 100644
--- a/dev-java/java-config/java-config-2.2.0.ebuild
+++ b/dev-java/java-config/java-config-2.2.0.ebuild
@@ -25,5 +25,5 @@ RDEPEND="
 	sys-apps/portage"
 
 python_test() {
-	esetup.py test || die
+	esetup.py test
 }
diff --git a/dev-java/java-xmlbuilder/metadata.xml b/dev-java/java-xmlbuilder/metadata.xml
index 7303cef96964..99c17d026dce 100644
--- a/dev-java/java-xmlbuilder/metadata.xml
+++ b/dev-java/java-xmlbuilder/metadata.xml
@@ -2,4 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>java</herd>
+	<upstream>
+		<remote-id type="github">jmurty/java-xmlbuilder</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-java/jfreesvg/jfreesvg-2.1-r1.ebuild b/dev-java/jfreesvg/jfreesvg-2.1-r1.ebuild
new file mode 100644
index 000000000000..ea0116cb082d
--- /dev/null
+++ b/dev-java/jfreesvg/jfreesvg-2.1-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="JFreeSVG is a fast, light-weight, vector graphics library for the Java platform"
+HOMEPAGE="http://www.jfree.org/jfreesvg/"
+SRC_URI="mirror://sourceforge/jfreegraphics2d/${P}.zip"
+
+LICENSE="GPL-3"
+SLOT="2.1"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="debug"
+
+DEPEND=">=virtual/jdk-1.7
+	app-arch/unzip"
+RDEPEND=">=virtual/jre-1.7"
+
+java_prepare() {
+	find "${WORKDIR}" -name '*.jar' -print -delete || die
+}
+
+src_compile() {
+	if ! use debug; then
+		antflags="-Dbuild.debug=false -Dbuild.optimize=true"
+	fi
+	eant -f ant/build.xml compile $(use_doc) $antflags
+}
+
+src_install() {
+	java-pkg_newjar "./lib/${P}.jar" ${PN}.jar
+	dodoc README.md
+	use doc && java-pkg_dojavadoc javadoc
+	use source && java-pkg_dosrc src/main/java
+}
diff --git a/dev-java/jfreesvg/jfreesvg-2.1.ebuild b/dev-java/jfreesvg/jfreesvg-2.1.ebuild
deleted file mode 100644
index 4678b34b1b7d..000000000000
--- a/dev-java/jfreesvg/jfreesvg-2.1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="JFreeSVG is a fast, light-weight, vector graphics library for the Java platform"
-HOMEPAGE="http://www.jfree.org/jfreesvg/"
-SRC_URI="mirror://sourceforge/jfreegraphics2d/${P}.zip"
-
-LICENSE="GPL-3"
-SLOT="2.1"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="debug"
-
-DEPEND=">=virtual/jdk-1.6
-	app-arch/unzip"
-RDEPEND=">=virtual/jre-1.6"
-
-java_prepare() {
-	find "${WORKDIR}" -name '*.jar' -print -delete || die
-}
-
-src_compile() {
-	if ! use debug; then
-		antflags="-Dbuild.debug=false -Dbuild.optimize=true"
-	fi
-	eant -f ant/build.xml compile $(use_doc) $antflags
-}
-
-src_install() {
-	java-pkg_newjar "./lib/${P}.jar" ${PN}.jar
-	dodoc README.md
-	use doc && java-pkg_dojavadoc javadoc
-	use source && java-pkg_dosrc src/main/java
-}
diff --git a/dev-java/jsoup/Manifest b/dev-java/jsoup/Manifest
index f587ebb3ea9b..6e4097870d09 100644
--- a/dev-java/jsoup/Manifest
+++ b/dev-java/jsoup/Manifest
@@ -1,2 +1 @@
-DIST jsoup-1.7.2.tar.gz 292926 SHA256 b778e2b3687c4ca2255e9a9f5038f54470c0dfee8f9758937afc1f50fac78b38 SHA512 de400a755b4ecf7962b66f2a3f232895c5ce365c18e9c4af4dc654094357248e7f694217a33b8a0415767c1c50c532f6d70f01e04475ecf0c7d1b5607432967f WHIRLPOOL 67ae0eb1459161a46a5bb2c2ce8c646febe0fe5c8f0cbae8c4d620d713c2d6cf982fd4d8364204c72d07fbef0a9df32b5226cb65a718e3b811912b09b7a15911
-DIST jsoup-1.8.1.a.tar.gz 303388 SHA256 788832a1a3fa639fecb71b52c5b1c062663f5b3a21c1451968910c4731393b60 SHA512 4afcc42187fd034e2c6f45d369c4fdd0cc7523f4aa2f2526a21aebdebb8608e1ced51f3d6c8de02ac519eccd5ef415e9b7619450fb2e958a0f7a4d5bf492ed8a WHIRLPOOL 7c1f8a0db34b8907bbc2ce849d85a845956059520202346a1d608e43cb264d2b478738868a2d183d97eff85b8df085ced10130400f2612a26faff7f688e4e698
+DIST jsoup-1.8.3a.zip 370626 SHA256 3a2dd962eb3f3bf0ef14f526d89795836d06bff411e68f0adfcc4a8dd5915876 SHA512 d044231fc70ff6d5428707d56853db77feedbb29a4ea1a501e6fcbaaecb2743bdeeaa8dcf4c76f7d278905b31e83707ad2644e7876a44c9d2325537d647aab85 WHIRLPOOL e1b5d4ed64b4460223b38aea43466465638236edf0ef6bd987430e16bb2bd12796a4900da797320c5bebcd8de0f823533f2a40bfb6cc50ad30183912eb34eee7
diff --git a/dev-java/jsoup/jsoup-1.7.2.ebuild b/dev-java/jsoup/jsoup-1.7.2.ebuild
deleted file mode 100644
index 1744b83d3da8..000000000000
--- a/dev-java/jsoup/jsoup-1.7.2.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit java-pkg-2 java-pkg-simple vcs-snapshot
-
-DESCRIPTION="Java HTML parser that makes sense of real-world HTML soup"
-HOMEPAGE="http://jsoup.org/"
-SRC_URI="https://github.com/jhy/${PN}/archive/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE=""
-
-RDEPEND=">=virtual/jre-1.5"
-DEPEND=">=virtual/jdk-1.5
-	test? ( dev-java/junit:4 )"
-
-S="${WORKDIR}/${P}"
-
-JAVA_SRC_DIR="src/main/java"
-
-java_prepare() {
-	rm pom.xml || die
-	mkdir -p target/classes/org/jsoup/nodes/ || die
-	cp src/main/java/org/jsoup/nodes/*.properties target/classes/org/jsoup/nodes/ || die
-}
-
-src_test() {
-	testcp="${S}/${PN}.jar:$(java-pkg_getjars junit-4):target/tests"
-
-	mkdir target/tests || die
-	ejavac -cp "${testcp}" -d target/tests $(find src/test/java -name "*.java")
-	cp -r src/test/resources/* target/tests || die
-
-	tests=$(find target/tests -name "*Test.class" \
-			| sed -e 's/target\/tests\///g' -e "s/\.class//" -e "s/\//./g" \
-			| grep -vP '\$');
-	ejunit4 -cp "${testcp}" ${tests}
-}
diff --git a/dev-java/jsoup/jsoup-1.8.1.ebuild b/dev-java/jsoup/jsoup-1.8.1.ebuild
deleted file mode 100644
index bac8d54ce0b7..000000000000
--- a/dev-java/jsoup/jsoup-1.8.1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit java-pkg-2 java-pkg-simple vcs-snapshot
-
-MY_PV="${PV}.a"
-
-DESCRIPTION="Java HTML parser that makes sense of real-world HTML soup"
-HOMEPAGE="http://jsoup.org/"
-SRC_URI="https://github.com/jhy/${PN}/archive/${PN}-${MY_PV}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-IUSE=""
-
-RDEPEND=">=virtual/jre-1.5"
-DEPEND=">=virtual/jdk-1.5
-	test? ( dev-java/junit:4 )"
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-JAVA_SRC_DIR="src/main/java"
-
-java_prepare() {
-	rm pom.xml || die
-	mkdir -p target/classes/org/jsoup/nodes/ || die
-	cp src/main/java/org/jsoup/nodes/*.properties target/classes/org/jsoup/nodes/ || die
-}
-
-src_test() {
-	testcp="${S}/${PN}.jar:$(java-pkg_getjars junit-4):target/tests"
-
-	mkdir target/tests || die
-	ejavac -cp "${testcp}" -d target/tests $(find src/test/java -name "*.java")
-	cp -r src/test/resources/* target/tests || die
-
-	tests=$(find target/tests -name "*Test.class" \
-			| sed -e 's/target\/tests\///g' -e "s/\.class//" -e "s/\//./g" \
-			| grep -vP '\$');
-	ejunit4 -cp "${testcp}" ${tests}
-}
diff --git a/dev-java/jsoup/jsoup-1.8.3.ebuild b/dev-java/jsoup/jsoup-1.8.3.ebuild
new file mode 100644
index 000000000000..878940e96667
--- /dev/null
+++ b/dev-java/jsoup/jsoup-1.8.3.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-pkg-simple
+
+MY_PV="${PV}a"
+MY_P="${PN}-${PN}-${MY_PV}"
+
+DESCRIPTION="Java HTML parser that makes sense of real-world HTML soup"
+HOMEPAGE="http://jsoup.org/"
+SRC_URI="https://github.com/jhy/${PN}/archive/${PN}-${MY_PV}.zip"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+IUSE=""
+
+RDEPEND=">=virtual/jre-1.6"
+DEPEND=">=virtual/jdk-1.6
+	test? ( dev-java/junit:4 )"
+
+S="${WORKDIR}/${MY_P}"
+
+JAVA_SRC_DIR="src/main/java"
+
+java_prepare() {
+	rm pom.xml || die
+	mkdir -p target/classes/org/jsoup/nodes/ || die
+	cp src/main/java/org/jsoup/nodes/*.properties target/classes/org/jsoup/nodes/ || die
+}
+
+src_test() {
+	testcp="${S}/${PN}.jar:$(java-pkg_getjars junit-4):target/tests"
+
+	mkdir target/tests || die
+	ejavac -cp "${testcp}" -d target/tests $(find src/test/java -name "*.java")
+	cp -r src/test/resources/* target/tests || die
+
+	tests=$(find target/tests -name "*Test.class" \
+			| sed -e 's/target\/tests\///g' -e "s/\.class//" -e "s/\//./g" \
+			| grep -vP '\$');
+	ejunit4 -cp "${testcp}" ${tests}
+}
diff --git a/dev-java/jvyamlb/metadata.xml b/dev-java/jvyamlb/metadata.xml
index 46ab2b1323bf..76c4f7b31ad5 100644
--- a/dev-java/jvyamlb/metadata.xml
+++ b/dev-java/jvyamlb/metadata.xml
@@ -7,5 +7,6 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="google-code">jvyamlb</remote-id>
+		<remote-id type="github">olabini/jvyamlb</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-java/jython/jython-2.7.0.ebuild b/dev-java/jython/jython-2.7.0.ebuild
index fdf4a09c6d1c..f46891f5c2a4 100644
--- a/dev-java/jython/jython-2.7.0.ebuild
+++ b/dev-java/jython/jython-2.7.0.ebuild
@@ -39,9 +39,9 @@ CDEPEND="dev-java/ant-core:0
 	java-virtuals/servlet-api:3.0
 	readline? ( >=dev-java/libreadline-java-0.8.0:0 )"
 RDEPEND="${CDEPEND}
-	>=virtual/jre-1.6"
+	>=virtual/jre-1.7"
 DEPEND="${CDEPEND}
-	>=virtual/jdk-1.6
+	>=virtual/jdk-1.7
 	app-arch/unzip
 	test? (
 		dev-java/junit:4
diff --git a/dev-java/kryo/metadata.xml b/dev-java/kryo/metadata.xml
index 2d2ccc0795d8..649088ab7d53 100644
--- a/dev-java/kryo/metadata.xml
+++ b/dev-java/kryo/metadata.xml
@@ -7,7 +7,9 @@
 	The goals of the project are speed, efficiency, and an easy to use API. The project
 	is useful any time objects need to be persisted, whether to a file, database, or over
 	the network. Kryo can also perform automatic deep and shallow copying/cloning. This is direct copying
-	from object to object, not object->bytes->object.
+	from object to object, not object-&gt;bytes-&gt;object.
 	</longdescription>
+	<upstream>
+		<remote-id type="github">EsotericSoftware/kryo</remote-id>
+	</upstream>
 </pkgmetadata>
-
diff --git a/dev-java/matrix-toolkits-java/metadata.xml b/dev-java/matrix-toolkits-java/metadata.xml
index 1c59ceec112f..3316a10f58a2 100644
--- a/dev-java/matrix-toolkits-java/metadata.xml
+++ b/dev-java/matrix-toolkits-java/metadata.xml
@@ -4,5 +4,6 @@
   <herd>java</herd>
   <upstream>
     <remote-id type="google-code">matrix-toolkits-java</remote-id>
+    <remote-id type="github">fommil/matrix-toolkits-java</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-java/maven-bin/Manifest b/dev-java/maven-bin/Manifest
index 5d11a8e2cb40..3a51904910dc 100644
--- a/dev-java/maven-bin/Manifest
+++ b/dev-java/maven-bin/Manifest
@@ -5,4 +5,5 @@ DIST apache-maven-3.1.0-bin.tar.gz 5439122 SHA256 59088c62c14b996d597bbd55e72086
 DIST apache-maven-3.1.1-bin.tar.gz 5494427 SHA256 077ed466455991d5abb4748a1d022e2d2a54dc4d557c723ecbacdc857c61d51b SHA512 507d340930cc32268128e8969742dbba34a0144f3e7a561b45f71e254ebff2e6f926fd5c7925081fc94995c3f5b4807caf2204ab70297374857bc66c582610a1 WHIRLPOOL 60aa84a2f6441deb005c41e00b4dbc790f8679d5387ffd6602d8008206718655784822816c9a9898cb9b09c75bb3b3d824c71150e4ac747bd0eb1dabe2bacdcd
 DIST apache-maven-3.2.3-bin.tar.gz 6956162 SHA256 bf3f04aadee3a67158aebdfb0b4cb022063329d459d10fd6b4b02223e10aa8ed SHA512 9c211b17a8109939a776a4ad0e833ce9b301941eb0cfd4e8978634589ea48227cb979b5819c4b151184cff46bb44139c09477e904daa00ac769b0c756859f6f0 WHIRLPOOL 6a254dc8beb6d1d42299dd563da1eaeccff11bbfd18a122cb015ee28e55f59ae0b4e512a48b697fa09004edd8bae7dbef32bce24dbc9f5913b7cdd311a6ec6b3
 DIST apache-maven-3.2.5-bin.tar.gz 7956528 SHA256 8c190264bdf591ff9f1268dc0ad940a2726f9e958e367716a09b8aaa7e74a755 SHA512 0cdbf4c1e045ac7f96c176058f19ebb838bd46caadc4fb479e11eda67efbb66218fe67c370ddec6d2e4d91091ac9e81ff9eea8d64174cbe1e6d5f7e15962cfc5 WHIRLPOOL 79feb96c42dfd2235b0513ce50cf3d684224dcbccb290d2d80565648a6b30af8961b2e3d02d38818ca5c89386c5a25f2a8025e696279a339844535c2d2733f96
+DIST apache-maven-3.3.3-bin.tar.gz 8042383 SHA256 3a8dc4a12ab9f3607a1a2097bbab0150c947ad6719d8f1bb6d5b47d0fb0c4779 SHA512 ca64847b7980f5c406f15d433f86a77dc81aa9676baf09122061c72b3ec5790bc664896c37e0571bb2a0bfb48a1d67b0bff1c67d73d796252a132dd46724ccd5 WHIRLPOOL a3bbce5c92878dbf58f9e63a18cefbb8de90fa4d91ec6ac60cee01b684891a9f757ece5f62659b7838ea347e0d27b8801c10b0e4bf1384446607b60d46a1bf9e
 DIST maven-1.1.tar.gz 7625074 SHA256 6913083d2db1d32ee5e18db7280be0f8ce36224aba3595690e85054f2ad5e731 SHA512 d08e6f4f7568caec718e82d1106ab01a63855061b5ff65134cdb25ba0a4eee875472bceaccffc1425bd0e57918f69f4e48ad2dd0098f2995ba55ad61c64424a0 WHIRLPOOL 2137afc57306d840d04a38a09f5b40d946d10f8216ebff4a3a0a385f475316266339f4b8d07b461a2004d487c6b74a68fc2db5f38cb831ed0947259f1cd08d48
diff --git a/dev-java/maven-bin/maven-bin-3.3.3.ebuild b/dev-java/maven-bin/maven-bin-3.3.3.ebuild
new file mode 100644
index 000000000000..f304b7ee4aaa
--- /dev/null
+++ b/dev-java/maven-bin/maven-bin-3.3.3.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit java-pkg-2
+
+MY_PN=apache-${PN%%-bin}
+MY_PV=${PV/_alpha/-alpha-}
+MY_P="${MY_PN}-${MY_PV}"
+MY_MV="${PV%%.*}"
+
+DESCRIPTION="Project Management and Comprehension Tool for Java"
+SRC_URI="mirror://apache/maven/maven-${MY_MV}/${PV}/binaries/${MY_P}-bin.tar.gz"
+HOMEPAGE="http://maven.apache.org/"
+
+LICENSE="Apache-2.0"
+SLOT="3.3"
+KEYWORDS="~amd64 ~x86"
+
+# TODO: Needs further resolution:
+#
+# - https://bugs.gentoo.org/show_bug.cgi?id=472850
+# - https://bugs.gentoo.org/show_bug.cgi?id=477436
+#
+DEPEND="|| ( app-eselect/eselect-java app-eselect/eselect-maven )
+|| ( dev-java/commons-logging:0 dev-java/log4j:0 dev-java/avalon-logkit:2.0 )
+dev-java/aopalliance:1
+dev-java/avalon-framework:4.1
+dev-java/commons-cli:1
+dev-java/commons-io:1
+dev-java/javax-inject:0
+dev-java/jsoup:0
+dev-java/jsr250:0
+dev-java/juel:0
+dev-java/osgi-core-api:0
+java-virtuals/interceptor-api:0
+java-virtuals/servlet-api:2.4"
+
+RDEPEND=">=virtual/jdk-1.8
+>=virtual/jre-1.8
+${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+MAVEN=${PN}-${SLOT}
+MAVEN_SHARE="/usr/share/${MAVEN}"
+
+java_prepare() {
+	rm -v bin/*.cmd lib/{aopalliance,commons-cli,javax.inject,jsr250}-*.jar || die
+
+	chmod 644 boot/*.jar lib/*.jar conf/settings.xml || die
+
+	# Symlink jars.
+	cd lib || die
+	java-pkg_jar-from aopalliance-1,avalon-framework-4.1,commons-cli-1,commons-io-1,interceptor-api,javax-inject,jsoup,jsr250,juel,osgi-core-api,servlet-api-2.4
+	has_version dev-java/commons-logging:0 && java-pkg_jar-from commons-logging
+	has_version dev-java/avalon-logkit:2.0 && java-pkg_jar-from avalon-logkit-2.0
+	has_version dev-java/log4j:0 && java-pkg_jar-from log4j
+}
+
+# TODO: We should use jars from packages, instead of what is bundled.
+src_install() {
+	dodir "${MAVEN_SHARE}"
+
+	cp -Rp bin boot conf lib "${ED}/${MAVEN_SHARE}" || die "failed to copy"
+
+	java-pkg_regjar "${ED}/${MAVEN_SHARE}"/boot/*.jar
+	java-pkg_regjar "${ED}/${MAVEN_SHARE}"/lib/*.jar
+
+	dodoc NOTICE README.txt
+
+	dodir /usr/bin
+	dosym "${MAVEN_SHARE}/bin/mvn" /usr/bin/mvn-${SLOT}
+
+	# See bug #342901.
+	echo "CONFIG_PROTECT=\"${MAVEN_SHARE}/conf\"" > "${T}/25${MAVEN}" || die
+	doenvd "${T}/25${MAVEN}"
+}
+
+pkg_postinst() {
+	eselect maven update mvn-${SLOT}
+}
+
+pkg_postrm() {
+	eselect maven update
+}
diff --git a/dev-java/mchange-commons/Manifest b/dev-java/mchange-commons/Manifest
new file mode 100644
index 000000000000..d8369fcbf2fb
--- /dev/null
+++ b/dev-java/mchange-commons/Manifest
@@ -0,0 +1 @@
+DIST mchange-commons-java-0.2.10.zip 773768 SHA256 ae3f9d3d12d517d19036a8ede709d9df5e158733aa79e8276e800b508ee278ca SHA512 8196cd4476c3dea55355ba11cc2f801602235de3a977d75eff3835dacaf612647adc0e595e0bf77a6313adcd718d143d08ecf6fd5aa0e6638a419cf1f107c3a9 WHIRLPOOL 8c1f1501001bf94eff17493d0a3efaf0f844381e16c608d4c009d687de4597eef7ad47642b7ae58ef972347ebe6470ebc635ab01483b4b5b5ee7aecab57ecfcf
diff --git a/dev-java/mchange-commons/mchange-commons-0.2.10.ebuild b/dev-java/mchange-commons/mchange-commons-0.2.10.ebuild
new file mode 100644
index 000000000000..545c48201527
--- /dev/null
+++ b/dev-java/mchange-commons/mchange-commons-0.2.10.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source"
+inherit java-pkg-2 java-pkg-simple
+
+MY_PN="${PN}-java"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="a library of arguably useful Java utilities"
+HOMEPAGE="https://github.com/swaldman/mchange-commons-java"
+SRC_URI="https://github.com/swaldman/${MY_PN}/archive/${MY_P}.zip"
+
+LICENSE="CDDL"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~ppc ~ppc64"
+
+IUSE="doc source"
+
+CDEPEND="
+	dev-java/log4j:0
+	dev-java/slf4j-api:0
+	dev-java/typesafe-config:0"
+
+RDEPEND=">=virtual/jre-1.6
+	${CDEPEND}"
+DEPEND=">=virtual/jdk-1.6
+	app-arch/zip
+	${CDEPEND}"
+
+S="${WORKDIR}/${MY_PN}-${MY_P}"
+
+JAVA_SRC_DIR="src/main"
+JAVA_GENTOO_CLASSPATH="log4j,slf4j-api,typesafe-config"
diff --git a/dev-java/mchange-commons/metadata.xml b/dev-java/mchange-commons/metadata.xml
new file mode 100644
index 000000000000..885373c1666a
--- /dev/null
+++ b/dev-java/mchange-commons/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>java</herd>
+  <upstream>
+    <remote-id type="github">swaldman/mchange-commons-java</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-java/mojarra/mojarra-2.2.12.ebuild b/dev-java/mojarra/mojarra-2.2.12.ebuild
index 8a94ed405b29..455992f659ca 100644
--- a/dev-java/mojarra/mojarra-2.2.12.ebuild
+++ b/dev-java/mojarra/mojarra-2.2.12.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://maven.java.net/content/repositories/releases/org/glassfish/java
 
 LICENSE="CDDL"
 SLOT="2.2"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 IUSE=""
 
diff --git a/dev-java/netty-buffer/Manifest b/dev-java/netty-buffer/Manifest
index 2665155da82f..f3f3b5b6250a 100644
--- a/dev-java/netty-buffer/Manifest
+++ b/dev-java/netty-buffer/Manifest
@@ -1,2 +1 @@
-DIST netty-4.0.19.Final.tar.gz 929126 SHA256 065980d0232179a02dc52d55e9017f485c2cbcf14597172cac3bfd2db5dce9ac SHA512 031a251c93b2c475bbf12610f297ed47eacc430ba19e05fd33c12ab768b1d14556cb59d0f9e2a19f87c325b516323cd2ec13a341522825a19d76c27abb13a4cf WHIRLPOOL 8a2c026c62de3a26ef0c432af37b193b10bc826429399dc8fb8016d50cb22359e50087a10edecd69924861bf1f29da02b39810f37db514ba260a1ea9ef2692d0
 DIST netty-4.0.21.Final.tar.gz 960489 SHA256 e1b5572defaa760dcd8ded4d7691e9daf242b2e1885115b722f2f790d9ef9f75 SHA512 5d432e9e433c22b82e67ed3463c6982ca95c2ad823165e1ca9a5046e598878f06aac4221be235f2bda15edfdb22028f2a4f74fb37d431f24a2636e4ec60fae74 WHIRLPOOL 92e96986def775f26286958a9e2c7fe55ab571ad373f9cc25357db71f85f170d7aba7d7854c130c5788f7332665000cd10f666fff06abd0ce57cf4f95008958a
diff --git a/dev-java/netty-buffer/netty-buffer-4.0.19.ebuild b/dev-java/netty-buffer/netty-buffer-4.0.19.ebuild
deleted file mode 100644
index 37449f68d875..000000000000
--- a/dev-java/netty-buffer/netty-buffer-4.0.19.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit java-pkg-2 java-ant-2
-
-MY_PN="netty"
-MY_P="${MY_PN}-${PV}"
-DESCRIPTION="Async event-driven framework for rapid development of high performance network applications"
-HOMEPAGE="http://netty.io/"
-SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/${MY_P}.Final.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-CDEPEND="dev-java/${MY_PN}-common:0"
-
-RDEPEND=">=virtual/jre-1.6
-	${CDEPEND}"
-
-DEPEND=">=virtual/jdk-1.6
-	${CDEPEND}
-	test? (
-		dev-java/ant-core:0
-		dev-java/easymock:3.2
-		dev-java/hamcrest-library:1.3
-		dev-java/junit:4
-	)"
-
-S="${WORKDIR}/${MY_PN}-${MY_P}.Final/${PN/${MY_PN}-}"
-
-EANT_BUILD_TARGET="package"
-EANT_GENTOO_CLASSPATH="${MY_PN}-common"
-JAVA_ANT_REWRITE_CLASSPATH="true"
-
-EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},ant-core,easymock-3.2,hamcrest-library-1.3,junit-4"
-EANT_TEST_EXTRA_ARGS+=" -Djunit.present=true"
-
-java_prepare() {
-	cp "${FILESDIR}"/${P}-build.xml build.xml || die
-
-	# Remove the odd memory restriction in the generated build files.
-	sed -i 's/memoryMaximumSize="256m"//' build.xml || die
-}
-
-src_test() {
-	ANT_TASKS="ant-junit" java-pkg-2_src_test
-}
-
-src_install() {
-	java-pkg_newjar target/${MY_PN}-*.jar ${PN}.jar
-
-	use doc && java-pkg_dojavadoc target/site/apidocs
-	use source && java-pkg_dosrc src/main/java
-}
diff --git a/dev-java/netty-common/netty-common-4.0.21.ebuild b/dev-java/netty-common/netty-common-4.0.21.ebuild
index eeb2263ddc94..52c5735bf687 100644
--- a/dev-java/netty-common/netty-common-4.0.21.ebuild
+++ b/dev-java/netty-common/netty-common-4.0.21.ebuild
@@ -23,9 +23,9 @@ CDEPEND="dev-java/commons-logging:0
 	dev-java/log4j:0
 	dev-java/slf4j-nop:0
 	dev-java/slf4j-api:0"
-RDEPEND=">=virtual/jre-1.6
+RDEPEND=">=virtual/jre-1.7
 		${CDEPEND}"
-DEPEND=">=virtual/jdk-1.6
+DEPEND=">=virtual/jdk-1.7
 		${CDEPEND}"
 
 S="${WORKDIR}/${MY_PN}-${MY_P}.Final/${PN/${MY_PN}-}"
diff --git a/dev-java/netty-transport/Manifest b/dev-java/netty-transport/Manifest
index 2665155da82f..f3f3b5b6250a 100644
--- a/dev-java/netty-transport/Manifest
+++ b/dev-java/netty-transport/Manifest
@@ -1,2 +1 @@
-DIST netty-4.0.19.Final.tar.gz 929126 SHA256 065980d0232179a02dc52d55e9017f485c2cbcf14597172cac3bfd2db5dce9ac SHA512 031a251c93b2c475bbf12610f297ed47eacc430ba19e05fd33c12ab768b1d14556cb59d0f9e2a19f87c325b516323cd2ec13a341522825a19d76c27abb13a4cf WHIRLPOOL 8a2c026c62de3a26ef0c432af37b193b10bc826429399dc8fb8016d50cb22359e50087a10edecd69924861bf1f29da02b39810f37db514ba260a1ea9ef2692d0
 DIST netty-4.0.21.Final.tar.gz 960489 SHA256 e1b5572defaa760dcd8ded4d7691e9daf242b2e1885115b722f2f790d9ef9f75 SHA512 5d432e9e433c22b82e67ed3463c6982ca95c2ad823165e1ca9a5046e598878f06aac4221be235f2bda15edfdb22028f2a4f74fb37d431f24a2636e4ec60fae74 WHIRLPOOL 92e96986def775f26286958a9e2c7fe55ab571ad373f9cc25357db71f85f170d7aba7d7854c130c5788f7332665000cd10f666fff06abd0ce57cf4f95008958a
diff --git a/dev-java/netty-transport/netty-transport-4.0.19.ebuild b/dev-java/netty-transport/netty-transport-4.0.19.ebuild
deleted file mode 100644
index 81341925b9a4..000000000000
--- a/dev-java/netty-transport/netty-transport-4.0.19.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit java-pkg-2 java-ant-2
-
-MY_PN="netty"
-MY_P="${MY_PN}-${PV}"
-DESCRIPTION="Async event-driven framework for rapid development of high performance network applications"
-HOMEPAGE="http://netty.io/"
-SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/${MY_P}.Final.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-CDEPEND="dev-java/${MY_PN}-buffer:0
-	dev-java/${MY_PN}-common:0"
-
-RDEPEND=">=virtual/jre-1.6
-	${CDEPEND}"
-
-DEPEND=">=virtual/jdk-1.6
-	${CDEPEND}
-	test? (
-		dev-java/ant-core:0
-		dev-java/easymock:3.2
-		dev-java/logback:0
-		dev-java/junit:4
-	)"
-
-S="${WORKDIR}/${MY_PN}-${MY_P}.Final/${PN/${MY_PN}-}"
-
-EANT_BUILD_TARGET="package"
-EANT_GENTOO_CLASSPATH="${MY_PN}-buffer,${MY_PN}-common"
-JAVA_ANT_REWRITE_CLASSPATH="true"
-
-EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},ant-core,easymock-3.2,junit-4,logback"
-EANT_TEST_EXTRA_ARGS+=" -Djunit.present=true"
-
-# error: package ch.qos.logback.classic does not exist
-RESTRICT="test"
-
-java_prepare() {
-	cp "${FILESDIR}"/${P}-build.xml build.xml || die
-
-	# Remove the odd memory restriction in the generated build files.
-	sed -i 's/memoryMaximumSize="256m"//' build.xml || die
-}
-
-src_test() {
-	ANT_TASKS="ant-junit" java-pkg-2_src_test
-}
-
-src_install() {
-	java-pkg_newjar target/${MY_PN}-*.jar ${PN}.jar
-
-	use doc && java-pkg_dojavadoc target/site/apidocs
-	use source && java-pkg_dosrc src/main/java
-}
diff --git a/dev-java/netty-transport/netty-transport-4.0.21.ebuild b/dev-java/netty-transport/netty-transport-4.0.21.ebuild
deleted file mode 100644
index f44c11543f4d..000000000000
--- a/dev-java/netty-transport/netty-transport-4.0.21.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-ant-2
-
-MY_PN="netty"
-MY_P="${MY_PN}-${PV}"
-DESCRIPTION="Async event-driven framework for rapid development of high performance network applications"
-HOMEPAGE="http://netty.io/"
-SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/${MY_P}.Final.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-CDEPEND="dev-java/${MY_PN}-buffer:0
-	dev-java/${MY_PN}-common:0"
-
-RDEPEND=">=virtual/jre-1.6
-	${CDEPEND}"
-
-DEPEND=">=virtual/jdk-1.6
-	${CDEPEND}"
-
-S="${WORKDIR}/${MY_PN}-${MY_P}.Final/${PN/${MY_PN}-}"
-
-EANT_BUILD_TARGET="package"
-EANT_GENTOO_CLASSPATH="${MY_PN}-buffer,${MY_PN}-common"
-JAVA_ANT_REWRITE_CLASSPATH="true"
-
-# error: package ch.qos.logback.classic does not exist
-RESTRICT="test"
-
-java_prepare() {
-	cp "${FILESDIR}"/${P}-build.xml build.xml || die
-}
-
-src_install() {
-	java-pkg_newjar target/${MY_PN}-*.jar ${PN}.jar
-
-	use doc && java-pkg_dojavadoc target/site/apidocs
-	use source && java-pkg_dosrc src/main/java/*
-}
diff --git a/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.60-r2.ebuild b/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.60-r2.ebuild
new file mode 100644
index 000000000000..5c7418a14f6e
--- /dev/null
+++ b/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.60-r2.ebuild
@@ -0,0 +1,353 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit eutils java-vm-2 prefix versionator
+
+# This URIs need to be updated when bumping!
+JDK_URI="http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html"
+JCE_URI="http://www.oracle.com/technetwork/java/javase/downloads/jce8-download-2133166.html"
+
+# This is a list of archs supported by this update.
+# Currently arm comes and goes.
+AT_AVAILABLE=( amd64 arm arm64 x86 x64-solaris sparc64-solaris x64-macos )
+
+# Sometimes some or all of the demos are missing, this is to not have to rewrite half
+# the ebuild when it happens.
+DEMOS_AVAILABLE=( amd64 arm arm64 x86 x64-solaris sparc64-solaris x64-macos )
+
+if [[ "$(get_version_component_range 4)" == 0 ]] ; then
+	S_PV="$(get_version_component_range 1-3)"
+else
+	MY_PV_EXT="u$(get_version_component_range 4)"
+	S_PV="$(get_version_component_range 1-4)"
+fi
+
+MY_PV="$(get_version_component_range 2)${MY_PV_EXT}"
+
+AT_amd64="jdk-${MY_PV}-linux-x64.tar.gz"
+AT_arm="jdk-${MY_PV}-linux-arm32-vfp-hflt.tar.gz"
+AT_arm64="jdk-${MY_PV}-linux-arm64-vfp-hflt.tar.gz"
+AT_x86="jdk-${MY_PV}-linux-i586.tar.gz"
+AT_x64_solaris="jdk-${MY_PV}-solaris-x64.tar.gz"
+AT_sparc64_solaris="${AT_sparc_solaris} jdk-${MY_PV}-solaris-sparcv9.tar.gz"
+AT_x64_macos="jdk-${MY_PV}-macosx-x64.dmg"
+
+DEMOS_amd64="jdk-${MY_PV}-linux-x64-demos.tar.gz"
+DEMOS_arm="jdk-${MY_PV}-linux-arm32-vfp-hflt-demos.tar.gz"
+DEMOS_arm64="jdk-${MY_PV}-linux-arm64-vfp-hflt-demos.tar.gz"
+DEMOS_x86="jdk-${MY_PV}-linux-i586-demos.tar.gz"
+DEMOS_x64_solaris="jdk-${MY_PV}-solaris-x64-demos.tar.gz"
+DEMOS_sparc64_solaris="jdk-${MY_PV}-solaris-sparcv9-demos.tar.gz"
+DEMOS_x64_macos="jdk-${MY_PV}-macosx-x86_64-demos.zip"
+
+JCE_DIR="UnlimitedJCEPolicyJDK8"
+JCE_FILE="jce_policy-8.zip"
+
+DESCRIPTION="Oracle's Java SE Development Kit"
+HOMEPAGE="http://www.oracle.com/technetwork/java/javase/"
+for d in "${AT_AVAILABLE[@]}"; do
+	SRC_URI+=" ${d}? ( $(eval "echo \${$(echo AT_${d/-/_})}")"
+	if has ${d} "${DEMOS_AVAILABLE[@]}"; then
+		SRC_URI+=" examples? ( $(eval "echo \${$(echo DEMOS_${d/-/_})}") )"
+	fi
+	SRC_URI+=" )"
+done
+unset d
+SRC_URI+=" jce? ( ${JCE_FILE} )"
+
+LICENSE="Oracle-BCLA-JavaSE examples? ( BSD )"
+SLOT="1.8"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc64-solaris ~x64-solaris"
+IUSE="alsa +awt cups derby doc examples +fontconfig javafx jce nsplugin pax_kernel selinux source"
+REQUIRED_USE="javafx? ( alsa fontconfig )"
+
+RESTRICT="fetch preserve-libs strip"
+QA_PREBUILT="*"
+
+# NOTES:
+#
+# * cups is dlopened.
+#
+# * libpng is also dlopened but only by libsplashscreen, which isn't
+#   important, so we can exclude that.
+#
+# * We still need to work out the exact AWT and JavaFX dependencies
+#   under MacOS. It doesn't appear to use many, if any, of the
+#   dependencies below.
+#
+RDEPEND="!x64-macos? (
+		awt? (
+			x11-libs/libX11
+			x11-libs/libXext
+			x11-libs/libXi
+			x11-libs/libXrender
+		)
+		javafx? (
+			dev-libs/glib:2
+			dev-libs/libxml2:2
+			dev-libs/libxslt
+			media-libs/freetype:2
+			x11-libs/cairo
+			x11-libs/gtk+:2
+			x11-libs/libX11
+			x11-libs/libXtst
+			x11-libs/libXxf86vm
+			x11-libs/pango
+			virtual/opengl
+		)
+	)
+	alsa? ( media-libs/alsa-lib )
+	cups? ( net-print/cups )
+	doc? ( dev-java/java-sdk-docs:${SLOT} )
+	fontconfig? ( media-libs/fontconfig:1.0 )
+	!prefix? ( sys-libs/glibc:* )
+	selinux? ( sec-policy/selinux-java )"
+
+# A PaX header isn't created by scanelf so depend on paxctl to avoid
+# fallback marking. See bug #427642.
+DEPEND="app-arch/zip
+	jce? ( app-arch/unzip )
+	examples? ( x64-macos? ( app-arch/unzip ) )
+	pax_kernel? ( sys-apps/paxctl )"
+
+S="${WORKDIR}/jdk"
+
+check_tarballs_available() {
+	local uri=$1; shift
+	local dl= unavailable=
+	for dl in "${@}" ; do
+		[[ ! -f "${DISTDIR}/${dl}" ]] && unavailable+=" ${dl}"
+	done
+
+	if [[ -n "${unavailable}" ]] ; then
+		if [[ -z ${_check_tarballs_available_once} ]] ; then
+			einfo
+			einfo "Oracle requires you to download the needed files manually after"
+			einfo "accepting their license through a javascript capable web browser."
+			einfo
+			_check_tarballs_available_once=1
+		fi
+		einfo "Download the following files:"
+		for dl in ${unavailable}; do
+			einfo "  ${dl}"
+		done
+		einfo "at '${uri}'"
+		einfo "and move them to '${DISTDIR}'"
+		einfo
+		einfo "If the above mentioned urls do not point to the correct version anymore,"
+		einfo "please download the files from Oracle's java download archive:"
+		einfo
+		einfo "   http://www.oracle.com/technetwork/java/javase/downloads/java-archive-javase8-2177648.html#jdk-${MY_PV}-oth-JPR"
+		einfo
+	fi
+}
+
+pkg_nofetch() {
+	local distfiles=( $(eval "echo \${$(echo AT_${ARCH/-/_})}") )
+	if use examples && has ${ARCH} "${DEMOS_AVAILABLE[@]}"; then
+		distfiles+=( $(eval "echo \${$(echo DEMOS_${ARCH/-/_})}") )
+	fi
+	check_tarballs_available "${JDK_URI}" "${distfiles[@]}"
+
+	use jce && check_tarballs_available "${JCE_URI}" "${JCE_FILE}"
+}
+
+src_unpack() {
+	if use x64-macos ; then
+		pushd "${T}" > /dev/null
+		mkdir dmgmount
+		hdiutil attach "${DISTDIR}"/jdk-${MY_PV}-macosx-x64.dmg \
+			-mountpoint "${T}"/dmgmount
+		local update=$(get_version_component_range 4)
+		[[ ${#update} == 1 ]] && update="0${update}"
+		xar -xf dmgmount/JDK\ $(get_version_component_range 2)\ Update\ ${update}.pkg
+		hdiutil detach "${T}"/dmgmount
+		zcat jdk1${MY_PV%u*}0${update}.pkg/Payload | cpio -idv
+		mv Contents/Home "${WORKDIR}"/jdk${MY_PV}
+		popd > /dev/null
+	else
+		default
+	fi
+
+	# Upstream is changing their versioning scheme every release around 1.8.0.*;
+	# to stop having to change it over and over again, just wildcard match and
+	# live a happy life instead of trying to get this new jdk1.8.0_05 to work.
+	mv "${WORKDIR}"/jdk* "${S}" || die
+}
+
+src_prepare() {
+	if use jce ; then
+		mv "${WORKDIR}"/${JCE_DIR} jre/lib/security/ || die
+	fi
+
+	if [[ -n ${JAVA_PKG_STRICT} ]] ; then
+		eqawarn "Ensure that this only calls trackJavaUsage(). If not, see bug #559936."
+		eqawarn
+		eqawarn "$(./bin/javap -J-Duser.home=${T} -c sun.misc.PostVMInitHook || die)"
+	fi
+
+	# Remove the hook that calls Oracle's evil usage tracker. Not just
+	# because it's evil but because it breaks the sandbox during builds
+	# and we can't find any other feasible way to disable it or make it
+	# write somewhere else. See bug #559936 for details.
+	zip -d jre/lib/rt.jar sun/misc/PostVMInitHook.class || die
+}
+
+src_install() {
+	local dest="/opt/${P}"
+	local ddest="${ED}${dest#/}"
+
+	# Create files used as storage for system preferences.
+	mkdir jre/.systemPrefs || die
+	touch jre/.systemPrefs/.system.lock || die
+	touch jre/.systemPrefs/.systemRootModFile || die
+
+	if ! use alsa ; then
+		rm -vf jre/lib/*/libjsoundalsa.* || die
+	fi
+
+	if ! use awt ; then
+		rm -vf {,jre/}lib/*/lib*{[jx]awt,splashscreen}* \
+		   {,jre/}bin/{javaws,policytool} \
+		   bin/appletviewer || die
+	fi
+
+	if ! use javafx ; then
+		rm -vf jre/lib/*/lib*{decora,fx,glass,prism}* \
+		   jre/lib/*/libgstreamer-lite.* {,jre/}lib/{,ext/}*fx* \
+		   bin/*javafx* || die
+	fi
+
+	if ! use nsplugin ; then
+		rm -vf jre/lib/*/libnpjp2.* || die
+	else
+		local nsplugin=$(echo jre/lib/*/libnpjp2.*)
+	fi
+
+	# Even though plugins linked against multiple ffmpeg versions are
+	# provided, they generally lag behind what Gentoo has available.
+	rm -vf jre/lib/*/libavplugin* || die
+
+	dodoc COPYRIGHT
+	dodir "${dest}"
+	cp -pPR bin include jre lib man "${ddest}" || die
+
+	if use derby ; then
+		cp -pPR	db "${ddest}" || die
+	fi
+
+	if use examples && has ${ARCH} "${DEMOS_AVAILABLE[@]}" ; then
+		cp -pPR demo sample "${ddest}" || die
+	fi
+
+	if use jce ; then
+		dodir "${dest}"/jre/lib/security/strong-jce
+		mv "${ddest}"/jre/lib/security/US_export_policy.jar \
+			"${ddest}"/jre/lib/security/strong-jce || die
+		mv "${ddest}"/jre/lib/security/local_policy.jar \
+			"${ddest}"/jre/lib/security/strong-jce || die
+		dosym "${dest}"/jre/lib/security/${JCE_DIR}/US_export_policy.jar \
+			"${dest}"/jre/lib/security/US_export_policy.jar
+		dosym "${dest}"/jre/lib/security/${JCE_DIR}/local_policy.jar \
+			"${dest}"/jre/lib/security/local_policy.jar
+	fi
+
+	if use nsplugin ; then
+		install_mozilla_plugin "${dest}/${nsplugin}"
+	fi
+
+	if use source ; then
+		cp -v src.zip "${ddest}" || die
+
+		if use javafx ; then
+			cp -v javafx-src.zip "${ddest}" || die
+		fi
+	fi
+
+	if [[ -d jre/lib/desktop ]] ; then
+		# Install desktop file for the Java Control Panel.
+		# Using ${PN}-${SLOT} to prevent file collision with jre and or
+		# other slots.  make_desktop_entry can't be used as ${P} would
+		# end up in filename.
+		newicon jre/lib/desktop/icons/hicolor/48x48/apps/sun-jcontrol.png \
+			sun-jcontrol-${PN}-${SLOT}.png || die
+		sed -e "s#Name=.*#Name=Java Control Panel for Oracle JDK ${SLOT}#" \
+			-e "s#Exec=.*#Exec=/opt/${P}/jre/bin/jcontrol#" \
+			-e "s#Icon=.*#Icon=sun-jcontrol-${PN}-${SLOT}#" \
+			-e "s#Application;##" \
+			-e "/Encoding/d" \
+			jre/lib/desktop/applications/sun_java.desktop \
+			> "${T}"/jcontrol-${PN}-${SLOT}.desktop || die
+		domenu "${T}"/jcontrol-${PN}-${SLOT}.desktop
+	fi
+
+	# Prune all fontconfig files so libfontconfig will be used and only install
+	# a Gentoo specific one if fontconfig is disabled.
+	# http://docs.oracle.com/javase/8/docs/technotes/guides/intl/fontconfig.html
+	rm "${ddest}"/jre/lib/fontconfig.*
+	if ! use fontconfig ; then
+		cp "${FILESDIR}"/fontconfig.Gentoo.properties "${T}"/fontconfig.properties || die
+		eprefixify "${T}"/fontconfig.properties
+		insinto "${dest}"/jre/lib/
+		doins "${T}"/fontconfig.properties
+	fi
+
+	# This needs to be done before CDS - #215225
+	java-vm_set-pax-markings "${ddest}"
+
+	# see bug #207282
+	einfo "Creating the Class Data Sharing archives"
+	case ${ARCH} in
+		arm|ia64)
+			${ddest}/bin/java -client -Xshare:dump || die
+			;;
+		x86)
+			${ddest}/bin/java -client -Xshare:dump || die
+			# limit heap size for large memory on x86 #467518
+			# this is a workaround and shouldn't be needed.
+			${ddest}/bin/java -server -Xms64m -Xmx64m -Xshare:dump || die
+			;;
+		*)
+			${ddest}/bin/java -server -Xshare:dump || die
+			;;
+	esac
+
+	# Remove empty dirs we might have copied.
+	find "${D}" -type d -empty -exec rmdir -v {} + || die
+
+	if use x64-macos ; then
+		# Fix miscellaneous install_name issues.
+		pushd "${ddest}"/jre/lib > /dev/null || die
+		local lib needed nlib npath
+		for lib in \
+			decora_sse glass jfx{media,webkit} \
+			javafx_{font,font_t2k,iio} prism_{common,es2,sw} \
+		; do
+			lib=lib${lib}.dylib
+			einfo "Fixing self-reference of ${lib}"
+			install_name_tool \
+				-id "${EPREFIX}${dest}/jre/lib/${lib}" \
+				"${lib}"
+		done
+		popd > /dev/null
+
+		# This is still jdk1{5,6}, even on Java 8, so don't change it
+		# until you know different.
+		for nlib in jdk1{5,6} ; do
+			install_name_tool -change \
+				/usr/lib/libgcc_s_ppc64.1.dylib \
+				$($(tc-getCC) -print-file-name=libgcc_s_ppc64.1.dylib) \
+				"${ddest}"/lib/visualvm/profiler/lib/deployed/${nlib}/mac/libprofilerinterface.jnilib
+			install_name_tool -id \
+				"${EPREFIX}${dest}"/lib/visualvm/profiler/lib/deployed/${nlib}/mac/libprofilerinterface.jnilib \
+				"${ddest}"/lib/visualvm/profiler/lib/deployed/${nlib}/mac/libprofilerinterface.jnilib
+		done
+	fi
+
+	set_java_env
+	java-vm_revdep-mask
+	java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
+}
diff --git a/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.60.ebuild b/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.60.ebuild
deleted file mode 100644
index 21c8c97aec3a..000000000000
--- a/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.60.ebuild
+++ /dev/null
@@ -1,340 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit eutils java-vm-2 prefix versionator
-
-# This URIs need to be updated when bumping!
-JDK_URI="http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html"
-JCE_URI="http://www.oracle.com/technetwork/java/javase/downloads/jce8-download-2133166.html"
-
-# This is a list of archs supported by this update.
-# Currently arm comes and goes.
-AT_AVAILABLE=( amd64 arm arm64 x86 x64-solaris sparc64-solaris x64-macos )
-
-# Sometimes some or all of the demos are missing, this is to not have to rewrite half
-# the ebuild when it happens.
-DEMOS_AVAILABLE=( amd64 arm arm64 x86 x64-solaris sparc64-solaris x64-macos )
-
-if [[ "$(get_version_component_range 4)" == 0 ]] ; then
-	S_PV="$(get_version_component_range 1-3)"
-else
-	MY_PV_EXT="u$(get_version_component_range 4)"
-	S_PV="$(get_version_component_range 1-4)"
-fi
-
-MY_PV="$(get_version_component_range 2)${MY_PV_EXT}"
-
-AT_amd64="jdk-${MY_PV}-linux-x64.tar.gz"
-AT_arm="jdk-${MY_PV}-linux-arm32-vfp-hflt.tar.gz"
-AT_arm64="jdk-${MY_PV}-linux-arm64-vfp-hflt.tar.gz"
-AT_x86="jdk-${MY_PV}-linux-i586.tar.gz"
-AT_x64_solaris="jdk-${MY_PV}-solaris-x64.tar.gz"
-AT_sparc64_solaris="${AT_sparc_solaris} jdk-${MY_PV}-solaris-sparcv9.tar.gz"
-AT_x64_macos="jdk-${MY_PV}-macosx-x64.dmg"
-
-DEMOS_amd64="jdk-${MY_PV}-linux-x64-demos.tar.gz"
-DEMOS_arm="jdk-${MY_PV}-linux-arm32-vfp-hflt-demos.tar.gz"
-DEMOS_arm64="jdk-${MY_PV}-linux-arm64-vfp-hflt-demos.tar.gz"
-DEMOS_x86="jdk-${MY_PV}-linux-i586-demos.tar.gz"
-DEMOS_x64_solaris="jdk-${MY_PV}-solaris-x64-demos.tar.gz"
-DEMOS_sparc64_solaris="jdk-${MY_PV}-solaris-sparcv9-demos.tar.gz"
-DEMOS_x64_macos="jdk-${MY_PV}-macosx-x86_64-demos.zip"
-
-JCE_DIR="UnlimitedJCEPolicyJDK8"
-JCE_FILE="jce_policy-8.zip"
-
-DESCRIPTION="Oracle's Java SE Development Kit"
-HOMEPAGE="http://www.oracle.com/technetwork/java/javase/"
-for d in "${AT_AVAILABLE[@]}"; do
-	SRC_URI+=" ${d}? ( $(eval "echo \${$(echo AT_${d/-/_})}")"
-	if has ${d} "${DEMOS_AVAILABLE[@]}"; then
-		SRC_URI+=" examples? ( $(eval "echo \${$(echo DEMOS_${d/-/_})}") )"
-	fi
-	SRC_URI+=" )"
-done
-unset d
-SRC_URI+=" jce? ( ${JCE_FILE} )"
-
-LICENSE="Oracle-BCLA-JavaSE examples? ( BSD )"
-SLOT="1.8"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc64-solaris ~x64-solaris"
-IUSE="alsa +awt cups derby doc examples +fontconfig javafx jce nsplugin pax_kernel selinux source"
-REQUIRED_USE="javafx? ( alsa fontconfig )"
-
-RESTRICT="fetch preserve-libs strip"
-QA_PREBUILT="*"
-
-# NOTES:
-#
-# * cups is dlopened.
-#
-# * libpng is also dlopened but only by libsplashscreen, which isn't
-#   important, so we can exclude that.
-#
-# * We still need to work out the exact AWT and JavaFX dependencies
-#   under MacOS. It doesn't appear to use many, if any, of the
-#   dependencies below.
-#
-RDEPEND="!x64-macos? (
-		awt? (
-			x11-libs/libX11
-			x11-libs/libXext
-			x11-libs/libXi
-			x11-libs/libXrender
-		)
-		javafx? (
-			dev-libs/glib:2
-			dev-libs/libxml2:2
-			dev-libs/libxslt
-			media-libs/freetype:2
-			x11-libs/cairo
-			x11-libs/gtk+:2
-			x11-libs/libX11
-			x11-libs/libXtst
-			x11-libs/libXxf86vm
-			x11-libs/pango
-			virtual/opengl
-		)
-	)
-	alsa? ( media-libs/alsa-lib )
-	cups? ( net-print/cups )
-	doc? ( dev-java/java-sdk-docs:${SLOT} )
-	fontconfig? ( media-libs/fontconfig:1.0 )
-	!prefix? ( sys-libs/glibc:* )
-	selinux? ( sec-policy/selinux-java )"
-
-# A PaX header isn't created by scanelf so depend on paxctl to avoid
-# fallback marking. See bug #427642.
-DEPEND="jce? ( app-arch/unzip )
-	examples? ( x64-macos? ( app-arch/unzip ) )
-	pax_kernel? ( sys-apps/paxctl )"
-
-S="${WORKDIR}/jdk"
-
-check_tarballs_available() {
-	local uri=$1; shift
-	local dl= unavailable=
-	for dl in "${@}" ; do
-		[[ ! -f "${DISTDIR}/${dl}" ]] && unavailable+=" ${dl}"
-	done
-
-	if [[ -n "${unavailable}" ]] ; then
-		if [[ -z ${_check_tarballs_available_once} ]] ; then
-			einfo
-			einfo "Oracle requires you to download the needed files manually after"
-			einfo "accepting their license through a javascript capable web browser."
-			einfo
-			_check_tarballs_available_once=1
-		fi
-		einfo "Download the following files:"
-		for dl in ${unavailable}; do
-			einfo "  ${dl}"
-		done
-		einfo "at '${uri}'"
-		einfo "and move them to '${DISTDIR}'"
-		einfo
-		einfo "If the above mentioned urls do not point to the correct version anymore,"
-		einfo "please download the files from Oracle's java download archive:"
-		einfo
-		einfo "   http://www.oracle.com/technetwork/java/javase/downloads/java-archive-javase8-2177648.html#jdk-${MY_PV}-oth-JPR"
-		einfo
-	fi
-}
-
-pkg_nofetch() {
-	local distfiles=( $(eval "echo \${$(echo AT_${ARCH/-/_})}") )
-	if use examples && has ${ARCH} "${DEMOS_AVAILABLE[@]}"; then
-		distfiles+=( $(eval "echo \${$(echo DEMOS_${ARCH/-/_})}") )
-	fi
-	check_tarballs_available "${JDK_URI}" "${distfiles[@]}"
-
-	use jce && check_tarballs_available "${JCE_URI}" "${JCE_FILE}"
-}
-
-src_unpack() {
-	if use x64-macos ; then
-		pushd "${T}" > /dev/null
-		mkdir dmgmount
-		hdiutil attach "${DISTDIR}"/jdk-${MY_PV}-macosx-x64.dmg \
-			-mountpoint "${T}"/dmgmount
-		local update=$(get_version_component_range 4)
-		[[ ${#update} == 1 ]] && update="0${update}"
-		xar -xf dmgmount/JDK\ $(get_version_component_range 2)\ Update\ ${update}.pkg
-		hdiutil detach "${T}"/dmgmount
-		zcat jdk1${MY_PV%u*}0${update}.pkg/Payload | cpio -idv
-		mv Contents/Home "${WORKDIR}"/jdk${MY_PV}
-		popd > /dev/null
-	else
-		default
-	fi
-
-	# Upstream is changing their versioning scheme every release around 1.8.0.*;
-	# to stop having to change it over and over again, just wildcard match and
-	# live a happy life instead of trying to get this new jdk1.8.0_05 to work.
-	mv "${WORKDIR}"/jdk* "${S}" || die
-}
-
-src_prepare() {
-	if use jce ; then
-		mv "${WORKDIR}"/${JCE_DIR} jre/lib/security/ || die
-	fi
-}
-
-src_install() {
-	local dest="/opt/${P}"
-	local ddest="${ED}${dest#/}"
-
-	# Create files used as storage for system preferences.
-	mkdir jre/.systemPrefs || die
-	touch jre/.systemPrefs/.system.lock || die
-	touch jre/.systemPrefs/.systemRootModFile || die
-
-	if ! use alsa ; then
-		rm -vf jre/lib/*/libjsoundalsa.* || die
-	fi
-
-	if ! use awt ; then
-		rm -vf {,jre/}lib/*/lib*{[jx]awt,splashscreen}* \
-		   {,jre/}bin/{javaws,policytool} \
-		   bin/appletviewer || die
-	fi
-
-	if ! use javafx ; then
-		rm -vf jre/lib/*/lib*{decora,fx,glass,prism}* \
-		   jre/lib/*/libgstreamer-lite.* {,jre/}lib/{,ext/}*fx* \
-		   bin/*javafx* || die
-	fi
-
-	if ! use nsplugin ; then
-		rm -vf jre/lib/*/libnpjp2.* || die
-	else
-		local nsplugin=$(echo jre/lib/*/libnpjp2.*)
-	fi
-
-	# Even though plugins linked against multiple ffmpeg versions are
-	# provided, they generally lag behind what Gentoo has available.
-	rm -vf jre/lib/*/libavplugin* || die
-
-	dodoc COPYRIGHT
-	dodir "${dest}"
-	cp -pPR bin include jre lib man "${ddest}" || die
-
-	if use derby ; then
-		cp -pPR	db "${ddest}" || die
-	fi
-
-	if use examples && has ${ARCH} "${DEMOS_AVAILABLE[@]}" ; then
-		cp -pPR demo sample "${ddest}" || die
-	fi
-
-	if use jce ; then
-		dodir "${dest}"/jre/lib/security/strong-jce
-		mv "${ddest}"/jre/lib/security/US_export_policy.jar \
-			"${ddest}"/jre/lib/security/strong-jce || die
-		mv "${ddest}"/jre/lib/security/local_policy.jar \
-			"${ddest}"/jre/lib/security/strong-jce || die
-		dosym "${dest}"/jre/lib/security/${JCE_DIR}/US_export_policy.jar \
-			"${dest}"/jre/lib/security/US_export_policy.jar
-		dosym "${dest}"/jre/lib/security/${JCE_DIR}/local_policy.jar \
-			"${dest}"/jre/lib/security/local_policy.jar
-	fi
-
-	if use nsplugin ; then
-		install_mozilla_plugin "${dest}/${nsplugin}"
-	fi
-
-	if use source ; then
-		cp -v src.zip "${ddest}" || die
-
-		if use javafx ; then
-			cp -v javafx-src.zip "${ddest}" || die
-		fi
-	fi
-
-	if [[ -d jre/lib/desktop ]] ; then
-		# Install desktop file for the Java Control Panel.
-		# Using ${PN}-${SLOT} to prevent file collision with jre and or
-		# other slots.  make_desktop_entry can't be used as ${P} would
-		# end up in filename.
-		newicon jre/lib/desktop/icons/hicolor/48x48/apps/sun-jcontrol.png \
-			sun-jcontrol-${PN}-${SLOT}.png || die
-		sed -e "s#Name=.*#Name=Java Control Panel for Oracle JDK ${SLOT}#" \
-			-e "s#Exec=.*#Exec=/opt/${P}/jre/bin/jcontrol#" \
-			-e "s#Icon=.*#Icon=sun-jcontrol-${PN}-${SLOT}#" \
-			-e "s#Application;##" \
-			-e "/Encoding/d" \
-			jre/lib/desktop/applications/sun_java.desktop \
-			> "${T}"/jcontrol-${PN}-${SLOT}.desktop || die
-		domenu "${T}"/jcontrol-${PN}-${SLOT}.desktop
-	fi
-
-	# Prune all fontconfig files so libfontconfig will be used and only install
-	# a Gentoo specific one if fontconfig is disabled.
-	# http://docs.oracle.com/javase/8/docs/technotes/guides/intl/fontconfig.html
-	rm "${ddest}"/jre/lib/fontconfig.*
-	if ! use fontconfig ; then
-		cp "${FILESDIR}"/fontconfig.Gentoo.properties "${T}"/fontconfig.properties || die
-		eprefixify "${T}"/fontconfig.properties
-		insinto "${dest}"/jre/lib/
-		doins "${T}"/fontconfig.properties
-	fi
-
-	# This needs to be done before CDS - #215225
-	java-vm_set-pax-markings "${ddest}"
-
-	# see bug #207282
-	einfo "Creating the Class Data Sharing archives"
-	case ${ARCH} in
-		arm|ia64)
-			${ddest}/bin/java -client -Xshare:dump || die
-			;;
-		x86)
-			${ddest}/bin/java -client -Xshare:dump || die
-			# limit heap size for large memory on x86 #467518
-			# this is a workaround and shouldn't be needed.
-			${ddest}/bin/java -server -Xms64m -Xmx64m -Xshare:dump || die
-			;;
-		*)
-			${ddest}/bin/java -server -Xshare:dump || die
-			;;
-	esac
-
-	# Remove empty dirs we might have copied.
-	find "${D}" -type d -empty -exec rmdir -v {} + || die
-
-	if use x64-macos ; then
-		# Fix miscellaneous install_name issues.
-		pushd "${ddest}"/jre/lib > /dev/null || die
-		local lib needed nlib npath
-		for lib in \
-			decora_sse glass jfx{media,webkit} \
-			javafx_{font,font_t2k,iio} prism_{common,es2,sw} \
-		; do
-			lib=lib${lib}.dylib
-			einfo "Fixing self-reference of ${lib}"
-			install_name_tool \
-				-id "${EPREFIX}${dest}/jre/lib/${lib}" \
-				"${lib}"
-		done
-		popd > /dev/null
-
-		# This is still jdk1{5,6}, even on Java 8, so don't change it
-		# until you know different.
-		for nlib in jdk1{5,6} ; do
-			install_name_tool -change \
-				/usr/lib/libgcc_s_ppc64.1.dylib \
-				$($(tc-getCC) -print-file-name=libgcc_s_ppc64.1.dylib) \
-				"${ddest}"/lib/visualvm/profiler/lib/deployed/${nlib}/mac/libprofilerinterface.jnilib
-			install_name_tool -id \
-				"${EPREFIX}${dest}"/lib/visualvm/profiler/lib/deployed/${nlib}/mac/libprofilerinterface.jnilib \
-				"${ddest}"/lib/visualvm/profiler/lib/deployed/${nlib}/mac/libprofilerinterface.jnilib
-		done
-	fi
-
-	set_java_env
-	java-vm_revdep-mask
-	java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
-}
diff --git a/dev-java/oracle-jre-bin/oracle-jre-bin-1.8.0.60-r2.ebuild b/dev-java/oracle-jre-bin/oracle-jre-bin-1.8.0.60-r2.ebuild
new file mode 100644
index 000000000000..89907ab5900e
--- /dev/null
+++ b/dev-java/oracle-jre-bin/oracle-jre-bin-1.8.0.60-r2.ebuild
@@ -0,0 +1,237 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit eutils java-vm-2 prefix versionator
+
+# This URIs need updating when bumping!
+JRE_URI="http://www.oracle.com/technetwork/java/javase/downloads/jre8-downloads-2133155.html"
+JCE_URI="http://www.oracle.com/technetwork/java/javase/downloads/jce8-download-2133166.html"
+
+if [[ "$(get_version_component_range 4)" == 0 ]] ; then
+	S_PV="$(get_version_component_range 1-3)"
+else
+	MY_PV_EXT="u$(get_version_component_range 4)"
+	S_PV="$(get_version_component_range 1-4)"
+fi
+
+MY_PV="$(get_version_component_range 2)${MY_PV_EXT}"
+
+AT_amd64="jre-${MY_PV}-linux-x64.tar.gz"
+AT_x86="jre-${MY_PV}-linux-i586.tar.gz"
+
+JCE_DIR="UnlimitedJCEPolicyJDK8"
+JCE_FILE="jce_policy-8.zip"
+
+DESCRIPTION="Oracle's Java SE Runtime Environment"
+HOMEPAGE="http://www.oracle.com/technetwork/java/javase/"
+SRC_URI="
+	amd64? ( ${AT_amd64} )
+	x86? ( ${AT_x86} )
+	jce? ( ${JCE_FILE} )"
+
+LICENSE="Oracle-BCLA-JavaSE"
+SLOT="1.8"
+KEYWORDS="~amd64 ~x86"
+IUSE="alsa +awt cups +fontconfig javafx jce nsplugin pax_kernel selinux"
+
+RESTRICT="fetch preserve-libs strip"
+QA_PREBUILT="*"
+
+# NOTES:
+#
+# * cups is dlopened.
+#
+# * libpng is also dlopened but only by libsplashscreen, which isn't
+#   important, so we can exclude that.
+#
+# * We still need to work out the exact AWT and JavaFX dependencies
+#   under MacOS. It doesn't appear to use many, if any, of the
+#   dependencies below.
+#
+RDEPEND="!x64-macos? (
+		awt? (
+			x11-libs/libX11
+			x11-libs/libXext
+			x11-libs/libXi
+			x11-libs/libXrender
+		)
+		javafx? (
+			dev-libs/glib:2
+			dev-libs/libxml2:2
+			dev-libs/libxslt
+			media-libs/freetype:2
+			x11-libs/cairo
+			x11-libs/gtk+:2
+			x11-libs/libX11
+			x11-libs/libXtst
+			x11-libs/libXxf86vm
+			x11-libs/pango
+			virtual/opengl
+		)
+	)
+	alsa? ( media-libs/alsa-lib )
+	cups? ( net-print/cups )
+	fontconfig? ( media-libs/fontconfig:1.0 )
+	!prefix? ( sys-libs/glibc:* )
+	selinux? ( sec-policy/selinux-java )"
+
+# A PaX header isn't created by scanelf so depend on paxctl to avoid
+# fallback marking. See bug #427642.
+DEPEND="app-arch/zip
+	jce? ( app-arch/unzip )
+	pax_kernel? ( sys-apps/paxctl )"
+
+S="${WORKDIR}/jre"
+
+pkg_nofetch() {
+	local AT_ARCH="AT_${ARCH}"
+	local AT="${!AT_ARCH}"
+
+	einfo "Please download '${AT}' from:"
+	einfo "'${JRE_URI}'"
+	einfo "and move it to '${DISTDIR}'"
+
+	if use jce; then
+		einfo "Also download '${JCE_FILE}' from:"
+		einfo "'${JCE_URI}'"
+		einfo "and move it to '${DISTDIR}'"
+	fi
+
+	einfo
+	einfo "If the above mentioned urls do not point to the correct version anymore,"
+	einfo "please download the files from Oracle's java download archive:"
+	einfo
+	einfo "   http://www.oracle.com/technetwork/java/javase/downloads/java-archive-javase8-2177648.html#jre-${MY_PV}-oth-JPR"
+	einfo
+
+}
+
+src_unpack() {
+	default
+
+	# Upstream is changing their versioning scheme every release around 1.8.0.*;
+	# to stop having to change it over and over again, just wildcard match and
+	# live a happy life instead of trying to get this new jre1.8.0_05 to work.
+	mv "${WORKDIR}"/jre* "${S}" || die
+}
+
+src_prepare() {
+	if use jce ; then
+		mv "${WORKDIR}"/${JCE_DIR} lib/security/ || die
+	fi
+
+	# Remove the hook that calls Oracle's evil usage tracker. Not just
+	# because it's evil but because it breaks the sandbox during builds
+	# and we can't find any other feasible way to disable it or make it
+	# write somewhere else. See bug #559936 for details.
+	zip -d lib/rt.jar sun/misc/PostVMInitHook.class || die
+}
+
+src_install() {
+	local dest="/opt/${P}"
+	local ddest="${ED}${dest#/}"
+
+	# Create files used as storage for system preferences.
+	mkdir .systemPrefs || die
+	touch .systemPrefs/.system.lock || die
+	touch .systemPrefs/.systemRootModFile || die
+
+	if ! use alsa ; then
+		rm -vf lib/*/libjsoundalsa.* || die
+	fi
+
+	if ! use awt ; then
+		rm -vf lib/*/lib*{[jx]awt,splashscreen}* \
+		   bin/{javaws,policytool} || die
+	fi
+
+	if ! use javafx ; then
+		rm -vf lib/*/lib*{decora,fx,glass,prism}* \
+		   lib/*/libgstreamer-lite.* lib/{,ext/}*fx* || die
+	fi
+
+	if ! use nsplugin ; then
+		rm -vf lib/*/libnpjp2.* || die
+	else
+		local nsplugin=$(echo lib/*/libnpjp2.*)
+	fi
+
+	# Even though plugins linked against multiple ffmpeg versions are
+	# provided, they generally lag behind what Gentoo has available.
+	rm -vf lib/*/libavplugin* || die
+
+	dodoc COPYRIGHT
+	dodir "${dest}"
+	cp -pPR	bin lib man "${ddest}" || die
+
+	if use jce ; then
+		dodir ${dest}/lib/security/strong-jce
+		mv "${ddest}"/lib/security/US_export_policy.jar \
+			"${ddest}"/lib/security/strong-jce || die
+		mv "${ddest}"/lib/security/local_policy.jar \
+			"${ddest}"/lib/security/strong-jce || die
+		dosym "${dest}"/lib/security/${JCE_DIR}/US_export_policy.jar \
+			"${dest}"/lib/security/US_export_policy.jar
+		dosym "${dest}"/lib/security/${JCE_DIR}/local_policy.jar \
+			"${dest}"/lib/security/local_policy.jar
+	fi
+
+	if use nsplugin ; then
+		install_mozilla_plugin "${dest}/${nsplugin}"
+	fi
+
+	# Install desktop file for the Java Control Panel.
+	# Using ${PN}-${SLOT} to prevent file collision with jre and or other slots.
+	# make_desktop_entry can't be used as ${P} would end up in filename.
+	newicon lib/desktop/icons/hicolor/48x48/apps/sun-jcontrol.png \
+		sun-jcontrol-${PN}-${SLOT}.png || die
+	sed -e "s#Name=.*#Name=Java Control Panel for Oracle JRE ${SLOT}#" \
+		-e "s#Exec=.*#Exec=/opt/${P}/bin/jcontrol#" \
+		-e "s#Icon=.*#Icon=sun-jcontrol-${PN}-${SLOT}#" \
+		-e "s#Application;##" \
+		-e "/Encoding/d" \
+		lib/desktop/applications/sun_java.desktop > \
+		"${T}"/jcontrol-${PN}-${SLOT}.desktop || die
+	domenu "${T}"/jcontrol-${PN}-${SLOT}.desktop
+
+	# Prune all fontconfig files so libfontconfig will be used and only install
+	# a Gentoo specific one if fontconfig is disabled.
+	# http://docs.oracle.com/javase/8/docs/technotes/guides/intl/fontconfig.html
+	rm "${ddest}"/lib/fontconfig.* || die
+	if ! use fontconfig ; then
+		cp "${FILESDIR}"/fontconfig.Gentoo.properties "${T}"/fontconfig.properties || die
+		eprefixify "${T}"/fontconfig.properties
+		insinto "${dest}"/lib/
+		doins "${T}"/fontconfig.properties
+	fi
+
+	# This needs to be done before CDS - #215225
+	java-vm_set-pax-markings "${ddest}"
+
+	# see bug #207282
+	einfo "Creating the Class Data Sharing archives"
+	case ${ARCH} in
+		arm|ia64)
+			${ddest}/bin/java -client -Xshare:dump || die
+			;;
+		x86)
+			${ddest}/bin/java -client -Xshare:dump || die
+			# limit heap size for large memory on x86 #467518
+			# this is a workaround and shouldn't be needed.
+			${ddest}/bin/java -server -Xms64m -Xmx64m -Xshare:dump || die
+			;;
+		*)
+			${ddest}/bin/java -server -Xshare:dump || die
+			;;
+	esac
+
+	# Remove empty dirs we might have copied.
+	find "${D}" -type d -empty -exec rmdir -v {} + || die
+
+	set_java_env
+	java-vm_revdep-mask
+	java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
+}
diff --git a/dev-java/oracle-jre-bin/oracle-jre-bin-1.8.0.60.ebuild b/dev-java/oracle-jre-bin/oracle-jre-bin-1.8.0.60.ebuild
deleted file mode 100644
index b6ecedea21da..000000000000
--- a/dev-java/oracle-jre-bin/oracle-jre-bin-1.8.0.60.ebuild
+++ /dev/null
@@ -1,230 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit eutils java-vm-2 prefix versionator
-
-# This URIs need updating when bumping!
-JRE_URI="http://www.oracle.com/technetwork/java/javase/downloads/jre8-downloads-2133155.html"
-JCE_URI="http://www.oracle.com/technetwork/java/javase/downloads/jce8-download-2133166.html"
-
-if [[ "$(get_version_component_range 4)" == 0 ]] ; then
-	S_PV="$(get_version_component_range 1-3)"
-else
-	MY_PV_EXT="u$(get_version_component_range 4)"
-	S_PV="$(get_version_component_range 1-4)"
-fi
-
-MY_PV="$(get_version_component_range 2)${MY_PV_EXT}"
-
-AT_amd64="jre-${MY_PV}-linux-x64.tar.gz"
-AT_x86="jre-${MY_PV}-linux-i586.tar.gz"
-
-JCE_DIR="UnlimitedJCEPolicyJDK8"
-JCE_FILE="jce_policy-8.zip"
-
-DESCRIPTION="Oracle's Java SE Runtime Environment"
-HOMEPAGE="http://www.oracle.com/technetwork/java/javase/"
-SRC_URI="
-	amd64? ( ${AT_amd64} )
-	x86? ( ${AT_x86} )
-	jce? ( ${JCE_FILE} )"
-
-LICENSE="Oracle-BCLA-JavaSE"
-SLOT="1.8"
-KEYWORDS="~amd64 ~x86"
-IUSE="alsa +awt cups +fontconfig javafx jce nsplugin pax_kernel selinux"
-
-RESTRICT="fetch preserve-libs strip"
-QA_PREBUILT="*"
-
-# NOTES:
-#
-# * cups is dlopened.
-#
-# * libpng is also dlopened but only by libsplashscreen, which isn't
-#   important, so we can exclude that.
-#
-# * We still need to work out the exact AWT and JavaFX dependencies
-#   under MacOS. It doesn't appear to use many, if any, of the
-#   dependencies below.
-#
-RDEPEND="!x64-macos? (
-		awt? (
-			x11-libs/libX11
-			x11-libs/libXext
-			x11-libs/libXi
-			x11-libs/libXrender
-		)
-		javafx? (
-			dev-libs/glib:2
-			dev-libs/libxml2:2
-			dev-libs/libxslt
-			media-libs/freetype:2
-			x11-libs/cairo
-			x11-libs/gtk+:2
-			x11-libs/libX11
-			x11-libs/libXtst
-			x11-libs/libXxf86vm
-			x11-libs/pango
-			virtual/opengl
-		)
-	)
-	alsa? ( media-libs/alsa-lib )
-	cups? ( net-print/cups )
-	fontconfig? ( media-libs/fontconfig:1.0 )
-	!prefix? ( sys-libs/glibc:* )
-	selinux? ( sec-policy/selinux-java )"
-
-# A PaX header isn't created by scanelf so depend on paxctl to avoid
-# fallback marking. See bug #427642.
-DEPEND="jce? ( app-arch/unzip )
-	pax_kernel? ( sys-apps/paxctl )"
-
-S="${WORKDIR}/jre"
-
-pkg_nofetch() {
-	local AT_ARCH="AT_${ARCH}"
-	local AT="${!AT_ARCH}"
-
-	einfo "Please download '${AT}' from:"
-	einfo "'${JRE_URI}'"
-	einfo "and move it to '${DISTDIR}'"
-
-	if use jce; then
-		einfo "Also download '${JCE_FILE}' from:"
-		einfo "'${JCE_URI}'"
-		einfo "and move it to '${DISTDIR}'"
-	fi
-
-	einfo
-	einfo "If the above mentioned urls do not point to the correct version anymore,"
-	einfo "please download the files from Oracle's java download archive:"
-	einfo
-	einfo "   http://www.oracle.com/technetwork/java/javase/downloads/java-archive-javase8-2177648.html#jre-${MY_PV}-oth-JPR"
-	einfo
-
-}
-
-src_unpack() {
-	default
-
-	# Upstream is changing their versioning scheme every release around 1.8.0.*;
-	# to stop having to change it over and over again, just wildcard match and
-	# live a happy life instead of trying to get this new jre1.8.0_05 to work.
-	mv "${WORKDIR}"/jre* "${S}" || die
-}
-
-src_prepare() {
-	if use jce ; then
-		mv "${WORKDIR}"/${JCE_DIR} lib/security/ || die
-	fi
-}
-
-src_install() {
-	local dest="/opt/${P}"
-	local ddest="${ED}${dest#/}"
-
-	# Create files used as storage for system preferences.
-	mkdir .systemPrefs || die
-	touch .systemPrefs/.system.lock || die
-	touch .systemPrefs/.systemRootModFile || die
-
-	if ! use alsa ; then
-		rm -vf lib/*/libjsoundalsa.* || die
-	fi
-
-	if ! use awt ; then
-		rm -vf lib/*/lib*{[jx]awt,splashscreen}* \
-		   bin/{javaws,policytool} || die
-	fi
-
-	if ! use javafx ; then
-		rm -vf lib/*/lib*{decora,fx,glass,prism}* \
-		   lib/*/libgstreamer-lite.* lib/{,ext/}*fx* || die
-	fi
-
-	if ! use nsplugin ; then
-		rm -vf lib/*/libnpjp2.* || die
-	else
-		local nsplugin=$(echo lib/*/libnpjp2.*)
-	fi
-
-	# Even though plugins linked against multiple ffmpeg versions are
-	# provided, they generally lag behind what Gentoo has available.
-	rm -vf lib/*/libavplugin* || die
-
-	dodoc COPYRIGHT
-	dodir "${dest}"
-	cp -pPR	bin lib man "${ddest}" || die
-
-	if use jce ; then
-		dodir ${dest}/lib/security/strong-jce
-		mv "${ddest}"/lib/security/US_export_policy.jar \
-			"${ddest}"/lib/security/strong-jce || die
-		mv "${ddest}"/lib/security/local_policy.jar \
-			"${ddest}"/lib/security/strong-jce || die
-		dosym "${dest}"/lib/security/${JCE_DIR}/US_export_policy.jar \
-			"${dest}"/lib/security/US_export_policy.jar
-		dosym "${dest}"/lib/security/${JCE_DIR}/local_policy.jar \
-			"${dest}"/lib/security/local_policy.jar
-	fi
-
-	if use nsplugin ; then
-		install_mozilla_plugin "${dest}/${nsplugin}"
-	fi
-
-	# Install desktop file for the Java Control Panel.
-	# Using ${PN}-${SLOT} to prevent file collision with jre and or other slots.
-	# make_desktop_entry can't be used as ${P} would end up in filename.
-	newicon lib/desktop/icons/hicolor/48x48/apps/sun-jcontrol.png \
-		sun-jcontrol-${PN}-${SLOT}.png || die
-	sed -e "s#Name=.*#Name=Java Control Panel for Oracle JRE ${SLOT}#" \
-		-e "s#Exec=.*#Exec=/opt/${P}/bin/jcontrol#" \
-		-e "s#Icon=.*#Icon=sun-jcontrol-${PN}-${SLOT}#" \
-		-e "s#Application;##" \
-		-e "/Encoding/d" \
-		lib/desktop/applications/sun_java.desktop > \
-		"${T}"/jcontrol-${PN}-${SLOT}.desktop || die
-	domenu "${T}"/jcontrol-${PN}-${SLOT}.desktop
-
-	# Prune all fontconfig files so libfontconfig will be used and only install
-	# a Gentoo specific one if fontconfig is disabled.
-	# http://docs.oracle.com/javase/8/docs/technotes/guides/intl/fontconfig.html
-	rm "${ddest}"/lib/fontconfig.* || die
-	if ! use fontconfig ; then
-		cp "${FILESDIR}"/fontconfig.Gentoo.properties "${T}"/fontconfig.properties || die
-		eprefixify "${T}"/fontconfig.properties
-		insinto "${dest}"/lib/
-		doins "${T}"/fontconfig.properties
-	fi
-
-	# This needs to be done before CDS - #215225
-	java-vm_set-pax-markings "${ddest}"
-
-	# see bug #207282
-	einfo "Creating the Class Data Sharing archives"
-	case ${ARCH} in
-		arm|ia64)
-			${ddest}/bin/java -client -Xshare:dump || die
-			;;
-		x86)
-			${ddest}/bin/java -client -Xshare:dump || die
-			# limit heap size for large memory on x86 #467518
-			# this is a workaround and shouldn't be needed.
-			${ddest}/bin/java -server -Xms64m -Xmx64m -Xshare:dump || die
-			;;
-		*)
-			${ddest}/bin/java -server -Xshare:dump || die
-			;;
-	esac
-
-	# Remove empty dirs we might have copied.
-	find "${D}" -type d -empty -exec rmdir -v {} + || die
-
-	set_java_env
-	java-vm_revdep-mask
-	java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
-}
diff --git a/dev-java/osgi-core-api/Manifest b/dev-java/osgi-core-api/Manifest
index d5c0c843e5a7..aff3618168e0 100644
--- a/dev-java/osgi-core-api/Manifest
+++ b/dev-java/osgi-core-api/Manifest
@@ -1,2 +1 @@
-DIST osgi-core-api-4.3-all.zip 337463 SHA256 e03188926e6dfbc87ef7a097226c6cd01e399747d75e03a233961de661b13fbc SHA512 4620e96e0a24661a0d3f3a570598d51ba9068b7204f3dd34179bdca76ad9f2edf2e20c1656f0dc355be647a2b5befc064ff50b8f75167639580fb5ef661292c1 WHIRLPOOL 97634762b8c2042301d78312baff5bc575314d5ded28d673d69f354c1e5b23d3845bd4d90421f6d2fe20574386ae5d88e126da90d1fde8aabe71530cc2b8f65f
 DIST osgi.core-5.0.0.jar 418232 SHA256 22fe6c64753a0479fb450bcb740ea5e51747cca2e1aabb8a582d50c02c3eec94 SHA512 de7c5aa327a4361b81d953951488b84071e525cfd3e50f0334450b8c1b25733248de9459239ee7091f8961ac8b047a0492d692fb7cd408a0ec07df090ea9e2c3 WHIRLPOOL 9164e08ccd6f079898d0dedd33df1ea1f76f3ed4e65fe9205d17e72e6d8f6e5820fbab7a0bbe9633efa85f9ff4a9045813ea9d193dc110f5b6bd7d67a98b621c
diff --git a/dev-java/osgi-core-api/osgi-core-api-4.3.ebuild b/dev-java/osgi-core-api/osgi-core-api-4.3.ebuild
deleted file mode 100644
index 40fa4291c0af..000000000000
--- a/dev-java/osgi-core-api/osgi-core-api-4.3.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="OSGi Service Platform Core API (Companion Code)"
-HOMEPAGE="http://www.osgi.org/Specifications/HomePage"
-SRC_URI="http://www.osgi.org/download/r4v${PV//./}/osgi.core-${PV}.0.jar -> ${P}-all.zip"
-
-LICENSE="Apache-2.0 OSGi-Specification-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="
-	>=virtual/jre-1.5"
-DEPEND="
-	>=virtual/jdk-1.5
-	app-arch/unzip"
-
-JAVA_SRC_DIR="OSGI-OPT/src"
-
-java_prepare() {
-	rm -r org || die
-}
diff --git a/dev-java/osgi-core-api/osgi-core-api-5.0.0.ebuild b/dev-java/osgi-core-api/osgi-core-api-5.0.0.ebuild
index f0528eaa5133..11c36bfa46de 100644
--- a/dev-java/osgi-core-api/osgi-core-api-5.0.0.ebuild
+++ b/dev-java/osgi-core-api/osgi-core-api-5.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -12,7 +12,7 @@ DESCRIPTION="OSGi Service Platform Core API (Companion Code)"
 HOMEPAGE="http://www.osgi.org/Specifications/HomePage"
 SRC_URI="http://www.osgi.org/download/r5/osgi.core-${PV}.jar"
 
-LICENSE="Apache-2.0 OSGi-Specification-2.0"
+LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE=""
diff --git a/dev-java/reflections/metadata.xml b/dev-java/reflections/metadata.xml
index 909a9b33f6fd..4e7ae7699d82 100644
--- a/dev-java/reflections/metadata.xml
+++ b/dev-java/reflections/metadata.xml
@@ -3,4 +3,7 @@
 <pkgmetadata>
 	<herd>java</herd>
 	<longdescription>Reflections scans your classpath, indexes the metadata, allows you to query it on runtime and may save and collect that information for many modules within your project.</longdescription>
+	<upstream>
+		<remote-id type="github">ronmamo/reflections</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-java/sbt/sbt-0.13.8-r1.ebuild b/dev-java/sbt/sbt-0.13.8-r1.ebuild
new file mode 100644
index 000000000000..3c3360f20210
--- /dev/null
+++ b/dev-java/sbt/sbt-0.13.8-r1.ebuild
@@ -0,0 +1,151 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+# repoman gives LIVEVCS.unmasked even with EGIT_COMMIT, so create snapshot
+inherit eutils java-pkg-2 # git-r3
+
+L_PN="sbt-launch"
+L_P="${L_PN}-${PV}"
+
+B_PV="0.13.7"
+BL_P="${L_PN}-${B_PV}"
+B_P="${PN}-${B_PV}"
+
+SV="2.10"
+
+# creating the sbt src snapshot:
+# git clone https://github.com/sbt/sbt.git sbt-0.13.8
+# cd sbt-0.13.8
+# git checkout v0.13.8
+# cd ..
+# tar --owner=portage --group=portage -cjf sbt-0.13.8-src.tar.bz2 sbt-0.13.8
+
+# creating the binary:
+# cd $WORDKIR
+# tar -cjf sbt-0.13.8-gentoo-binary.tar.bz2 sbt-0.13.8/sbt-launch/target/sbt-launch.jar
+
+DESCRIPTION="sbt is a build tool for Scala and Java projects that aims to do the basics well"
+HOMEPAGE="http://www.scala-sbt.org/"
+EGIT_COMMIT="v${PV}"
+EGIT_REPO_URI="https://github.com/sbt/sbt.git"
+SRC_URI="!binary?
+(
+	https://dev.gentoo.org/~gienah/snapshots/${P}-src.tar.bz2
+	https://dev.gentoo.org/~gienah/snapshots/${P}-ivy2-deps.tar.bz2
+	https://dev.gentoo.org/~gienah/snapshots/${P}-sbt-deps.tar.bz2
+	https://dev.gentoo.org/~gienah/snapshots/${P}-test-deps.tar.bz2
+	http://repo.typesafe.com/typesafe/ivy-releases/org.scala-sbt/${L_PN}/${PV}/${L_PN}.jar -> ${BL_P}.jar
+)
+binary? ( https://dev.gentoo.org/~gienah/files/dist/${P}-gentoo-binary.tar.bz2 )"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="binary"
+
+DEPEND="=virtual/jdk-1.7*
+	>=dev-lang/scala-2.10.4-r1:${SV}"
+RDEPEND=">=virtual/jre-1.7
+	dev-lang/scala:*"
+
+# test hangs or fails
+RESTRICT="test"
+
+src_unpack() {
+	# if ! use binary; then
+	# 	git-r3_src_unpack
+	# fi
+	# Unpack tar files only.
+	for f in ${A} ; do
+		[[ ${f} == *".tar."* ]] && unpack ${f}
+	done
+}
+
+java_prepare() {
+	if ! use binary; then
+		# Note: to bump sbt, some things to try are:
+		# 1. remove the https://dev.gentoo.org/~gienah/snapshots/${P}-ivy2-deps.tar.bz2
+		# https://dev.gentoo.org/~gienah/snapshots/${P}-sbt-deps.tar.bz2 and
+		# https://dev.gentoo.org/~gienah/snapshots/${P}-test-deps.tar.bz2 from SRC_URI
+		# 2. Comment the sbt publishLocal line in src_compile.
+		# 3. try:
+		# FEATURES='noclean -test' emerge -v dev-java/sbt
+		# It should fail in src_install since the sbt publishLocal is not done.
+		# Check if it downloads more stuff in
+		# src_compile to ${WORKDIR}/.ivy2 and ${WORKDIR}/.sbt.
+		# 4. If some of the downloads fail, it might be necessary to run the sbt compile
+		# again manually to obtain all the dependencies, if so (with jdk 1.6):
+		# cd to ${S}
+		# export EROOT=/
+		# export WORKDIR='/var/tmp/portage/dev-java/sbt-0.13.8/work'
+		# export SV="2.10"
+		# export B_P=sbt-0.13.7
+		# export PATH="/usr/share/scala-${SV}/bin:${WORKDIR}/${B_P}:${PATH}"
+		# sbt compile
+		# cd ${WORKDIR}
+		# find .ivy2 .sbt -uid 0 -exec chown portage:portage {} \;
+		# 5. cd ${WORKDIR}
+		# tar -cjf sbt-0.13.8-ivy2-deps.tar.bz2 .ivy2
+		# tar -cjf sbt-0.13.8-sbt-deps.tar.bz2 .sbt
+		# 6. It downloads more dependencies for src_test, however the presence of some of these may cause
+		# the src_compile to fail.  So download them seperately as root so we can identify the
+		# additional files.  Note: src_test creates some files in ${WORKDIR}/.m2 which are can
+		# hopefully be ignored. As root:
+		# cd ${S}
+		# sbt test
+		# cd ${WORKDIR}
+		# find .ivy2 .sbt -uid 0 -print
+		# Then add those files to sbt-0.13.8-ivy2-test-deps.tar.bz2 except the files in the directories
+		# .ivy2/local
+		# .ivy2/cache/org.scala-sbt
+		# Something like:
+		# tar --owner=portage --group=portage -cjf sbt-0.13.8-test-deps.tar.bz2 <list of files as described above>
+		# 7. Undo the earlier temporary edits to the ebuild.
+
+		mkdir "${WORKDIR}/${B_P}" || die
+		cp -p "${DISTDIR}/${BL_P}.jar" "${WORKDIR}/${B_P}/${L_PN}.jar" || die
+		cat <<- EOF > "${WORKDIR}/${B_P}/sbt"
+			#!/bin/sh
+			SBT_OPTS="-Xms512M -Xmx1536M -Xss1M -XX:+CMSClassUnloadingEnabled -XX:MaxPermSize=512M"
+			java -Djavac.args="-encoding UTF-8" -Duser.home="${WORKDIR}" \${SBT_OPTS} -jar "${WORKDIR}/${B_P}/sbt-launch.jar" "\$@"
+		EOF
+		chmod u+x "${WORKDIR}/${B_P}/sbt" || die
+		local SCALA_PVR="$(java-config --query=PVR --package=scala-${SV})"
+		local SFV="${SCALA_PVR/-*}"
+		sed -e "s@scalaVersion := \"2.10.4\",@scalaVersion := \"${SFV}\",\n  scalaHome := Some(file(\"/usr/share/scala-${SV}\")),@" \
+			-i "${S}/build.sbt" || die
+	fi
+}
+
+src_compile() {
+	if ! use binary; then
+		export PATH="${EROOT}usr/share/scala-${SV}/bin:${WORKDIR}/${B_P}:${PATH}"
+		einfo "=== sbt compile ..."
+		"${WORKDIR}/${B_P}/sbt" -Dsbt.log.noformat=true compile || die
+		einfo "=== sbt publishLocal ..."
+		cat <<- EOF | "${WORKDIR}/${B_P}/sbt" -Dsbt.log.noformat=true || die
+			set every javaVersionPrefix in javaVersionCheck := Some("1.7")
+			publishLocal
+		EOF
+	fi
+}
+
+src_test() {
+	if ! use binary; then
+		export PATH="${EROOT}usr/share/scala-${SV}/bin:${WORKDIR}/${B_P}:${PATH}"
+		"${WORKDIR}/${B_P}/sbt" -Dsbt.log.noformat=true test || die
+	fi
+}
+
+src_install() {
+	if ! use binary; then
+		pushd sbt-launch/target || die
+		mv ${L_P}.jar ${L_PN}.jar || die
+		popd
+	fi
+	java-pkg_dojar sbt-launch/target/${L_PN}.jar
+	java-pkg_dolauncher sbt --main xsbt.boot.Boot --java_args "-Xms512M -Xmx1536M -Xss1M -XX:+CMSClassUnloadingEnabled -XX:MaxPermSize=512M"
+}
diff --git a/dev-java/slf4j-ext/slf4j-ext-1.7.7.ebuild b/dev-java/slf4j-ext/slf4j-ext-1.7.7.ebuild
index cc798166fb63..43aeb4c368e5 100644
--- a/dev-java/slf4j-ext/slf4j-ext-1.7.7.ebuild
+++ b/dev-java/slf4j-ext/slf4j-ext-1.7.7.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://www.slf4j.org/dist/${P/-ext/}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ppc ppc64 x86"
 IUSE=""
 
 COMMON_DEP="dev-java/slf4j-api:0
diff --git a/dev-java/slf4j-simple/slf4j-simple-1.7.7.ebuild b/dev-java/slf4j-simple/slf4j-simple-1.7.7.ebuild
index ffe05a9cd2ca..9b41e7364c12 100644
--- a/dev-java/slf4j-simple/slf4j-simple-1.7.7.ebuild
+++ b/dev-java/slf4j-simple/slf4j-simple-1.7.7.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://www.slf4j.org/dist/${P/-simple/}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ppc ppc64 x86"
 IUSE="test"
 
 COMMON_DEP="dev-java/slf4j-api:0"
diff --git a/dev-java/snakeyaml/metadata.xml b/dev-java/snakeyaml/metadata.xml
index 8c290ebcf0ab..a37d95efc2a6 100644
--- a/dev-java/snakeyaml/metadata.xml
+++ b/dev-java/snakeyaml/metadata.xml
@@ -6,5 +6,6 @@
 	</longdescription>
 	<upstream>
 		<remote-id type="google-code">snakeyaml</remote-id>
+		<remote-id type="bitbucket">asomov/snakeyaml</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-java/tomcat-jstl-impl/tomcat-jstl-impl-1.2.5.ebuild b/dev-java/tomcat-jstl-impl/tomcat-jstl-impl-1.2.5.ebuild
index 6ac34002d82c..695b680775fb 100644
--- a/dev-java/tomcat-jstl-impl/tomcat-jstl-impl-1.2.5.ebuild
+++ b/dev-java/tomcat-jstl-impl/tomcat-jstl-impl-1.2.5.ebuild
@@ -17,7 +17,7 @@ SRC_URI="http://apache.mirrors.ovh.net/ftp.apache.org/dist/tomcat/taglibs/${MY_P
 
 LICENSE="Apache-2.0"
 SLOT="1.2.5"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="test"
 
 CDEPEND="dev-java/xalan:0
diff --git a/dev-java/tomcat-jstl-spec/tomcat-jstl-spec-1.2.5.ebuild b/dev-java/tomcat-jstl-spec/tomcat-jstl-spec-1.2.5.ebuild
index 64dcb531679e..62f34c4140c0 100644
--- a/dev-java/tomcat-jstl-spec/tomcat-jstl-spec-1.2.5.ebuild
+++ b/dev-java/tomcat-jstl-spec/tomcat-jstl-spec-1.2.5.ebuild
@@ -17,7 +17,7 @@ SRC_URI="http://apache.mirrors.ovh.net/ftp.apache.org/dist/tomcat/taglibs/${MY_P
 
 LICENSE="Apache-2.0"
 SLOT="1.2.5"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="test"
 
 CDEPEND="java-virtuals/servlet-api:3.0"
diff --git a/dev-java/typesafe-config/Manifest b/dev-java/typesafe-config/Manifest
new file mode 100644
index 000000000000..db7a1de38c1a
--- /dev/null
+++ b/dev-java/typesafe-config/Manifest
@@ -0,0 +1 @@
+DIST v1.3.0.zip 363061 SHA256 b3af059bd13e597c5de466595f620cb686d21cfb7abd5bae1fec82d16be42999 SHA512 8b9821de442dc24b8b7be4c5ebc91d57214a32dceda8dc160cfaf801f70b34d2a2df6f8b2cbb744d18be3fbc887f1666f431b52882edcbde408d8adf3681fec4 WHIRLPOOL b2a61f17a269e1d8a533e6235ecdfd2968f452499e4adba61f17b667fe5aa2c07556587f9104d60e990fa268a3220b811f5860f6dd08c2ecd4cb5868833ac1e2
diff --git a/dev-java/typesafe-config/metadata.xml b/dev-java/typesafe-config/metadata.xml
new file mode 100644
index 000000000000..09402e6456b2
--- /dev/null
+++ b/dev-java/typesafe-config/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>java</herd>
+  <upstream>
+    <remote-id type="github">typesafehub/config</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-java/typesafe-config/typesafe-config-1.3.0-r1.ebuild b/dev-java/typesafe-config/typesafe-config-1.3.0-r1.ebuild
new file mode 100644
index 000000000000..23f3b50a50f0
--- /dev/null
+++ b/dev-java/typesafe-config/typesafe-config-1.3.0-r1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit java-pkg-2 java-pkg-simple
+
+JAVA_PKG_IUSE="doc source"
+
+DESCRIPTION="a library of arguably useful Java utilities"
+HOMEPAGE="https://github.com/typesafehub/config"
+SRC_URI="https://github.com/typesafehub/config/archive/v${PV}.zip"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc source"
+
+CDEPEND=""
+
+RDEPEND=">=virtual/jre-1.8
+	${CDEPEND}"
+DEPEND=">=virtual/jdk-1.8
+	app-arch/zip
+	${CDEPEND}"
diff --git a/dev-java/typesafe-config/typesafe-config-1.3.0.ebuild b/dev-java/typesafe-config/typesafe-config-1.3.0.ebuild
new file mode 100644
index 000000000000..34440cdbdaad
--- /dev/null
+++ b/dev-java/typesafe-config/typesafe-config-1.3.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit java-pkg-2 java-pkg-simple
+
+JAVA_PKG_IUSE="doc source"
+
+DESCRIPTION="a library of arguably useful Java utilities"
+HOMEPAGE="https://github.com/typesafehub/config"
+SRC_URI="https://github.com/typesafehub/config/archive/v${PV}.zip"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~ppc ~ppc64"
+IUSE="doc source"
+
+CDEPEND=""
+
+RDEPEND=">=virtual/jre-1.6
+	${CDEPEND}"
+DEPEND=">=virtual/jdk-1.6
+	app-arch/zip
+	${CDEPEND}"
diff --git a/dev-java/zemberek/metadata.xml b/dev-java/zemberek/metadata.xml
index 755a350e8c7f..808a4a60d64c 100644
--- a/dev-java/zemberek/metadata.xml
+++ b/dev-java/zemberek/metadata.xml
@@ -7,5 +7,6 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="google-code">zemberek</remote-id>
+		<remote-id type="github">ahmetaa/zemberek-nlp</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-lang/ekopath/Manifest b/dev-lang/ekopath/Manifest
index 2a1f87d8978d..abafb8480b83 100644
--- a/dev-lang/ekopath/Manifest
+++ b/dev-lang/ekopath/Manifest
@@ -1,2 +1,3 @@
 DIST ekopath-2015-08-09-installer.run 58521154 SHA256 7ecd2a03012e36851f69ab35f18905793212e2feae5c242f48d8f26722c5c1ca SHA512 f7da95fa987b262aafa434487cfb64340b2be754b8e119729de998c0ccddde3bbea4f3994ecd1643dbf5e49f3a48e6173be9d0102f7eb29e41d14f0914893a5b WHIRLPOOL d9cabf4787229ff2027569f7f73095a37b40c654ed0e201478a0e100cfa091ff82f3478c6b41c992288c4711823690bb0958cb1a9209ac595bb4930aaa99af4b
 DIST ekopath-2015-08-11-installer.run 59150939 SHA256 31f491e3744257ae87b735be418287ac4530bf525cd4c61fdb0f2438f0600e4b SHA512 ada2dc774247e5ea76f35f6f9311d58d99ec599e41befc0820650affae88be6916a2dd50bf9e67e4920db2ab16fc185fb088e523c1abc75ed7bfc5ec261e0eb1 WHIRLPOOL 721deca6bb973bf64219709cd0fc95907a2c5cfb447a295e45410939f700244197fd2a382ae537a847c10368af44fcbc538ddc9529769cfa4613eab118362df7
+DIST ekopath-2015-09-10-installer.run 57138157 SHA256 fd4eca09107b9967ba01e508098c00fddbb809ba637e42aa1bb4b7518e947394 SHA512 67f99cbf74e1840de3ee4f1da810031b9e67c1ecfd7de6ff56c8303bdcdf6d9eedbb9eab975d7a6bb1ccbb3c5a65a3f60c7219f2321bd2eb4949f04979142148 WHIRLPOOL d41c1ca250b81d584d4f088ad8b03fe975bbb9fe5d6ef50c2d501904e0f187cefaf41e772c0cbd835106c1fed995a7e754a875fd621314b28bdde19a2a14fb88
diff --git a/dev-lang/ekopath/ekopath-6.0.521_p20150910.ebuild b/dev-lang/ekopath/ekopath-6.0.521_p20150910.ebuild
new file mode 100644
index 000000000000..ab16a2fc6227
--- /dev/null
+++ b/dev-lang/ekopath/ekopath-6.0.521_p20150910.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit versionator multilib pax-utils
+
+MY_PV=$(get_version_component_range 1-3)
+DATE=$(get_version_component_range 4)
+DATE=${DATE#p}
+DATE=${DATE:0:4}-${DATE:4:2}-${DATE:6}
+INSTALLER=${PN}-${DATE}-installer.run
+
+DESCRIPTION="PathScale EKOPath Compiler Suite"
+HOMEPAGE="http://www.pathscale.com/ekopath-compiler-suite"
+SRC_URI="http://c591116.r16.cf2.rackcdn.com/${PN}/nightly/Linux/${INSTALLER}"
+
+LICENSE="all-rights-reserved"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND="!!app-arch/rpm"
+RDEPEND=""
+
+RESTRICT="bindist mirror"
+
+QA_PREBUILT="
+	opt/${PN}/lib/${MY_PV}/x8664/*
+	opt/${PN}/bin/*"
+
+S="${WORKDIR}"
+
+src_unpack() {
+	cp "${DISTDIR}/${INSTALLER}" "${S}/" || die
+	chmod +x "${S}/${INSTALLER}" || die
+}
+
+src_prepare() {
+	cat > 99${PN} <<-EOF
+		PATH=${EROOT%/}/opt/${PN}/bin
+		ROOTPATH=${EROOT%/}/opt/${PN}/bin
+		LDPATH=${EROOT%/}/opt/${PN}/lib:${EROOT%/}/opt/${PN}/lib/${MY_PV}/x8664/64
+		MANPATH=${EROOT%/}/opt/${PN}/docs/man
+	EOF
+}
+
+src_install() {
+	# EI_PAX marking is obsolete and PT_PAX breaks the binary.
+	# We must use XT_PAX to run the installer.
+	if [[ ${PAX_MARKINGS} == "XT" ]]; then
+		pax-mark m "${INSTALLER}"
+	fi
+
+	./"${INSTALLER}" \
+		--prefix "${ED%/}/opt/${PN}" \
+		--mode unattended || die
+
+	if [[ ! -d ${ED%/}/opt/${PN}/lib/${MY_PV} ]]; then
+		local guess
+		cd "${ED%/}/opt/${PN}/lib" && guess=( * )
+
+		if [[ ${guess[@]} ]]; then
+			die "Incorrect release version in PV, guessing it should be: ${guess[*]}"
+		else
+			die "No libdir installed"
+		fi
+	fi
+	[[ -x ${ED%}/opt/${PN}/bin/pathcc ]] || die "No pathcc executable was installed, your hardware is unsupported most likely"
+
+	rm -r "${ED}/opt/${PN}"/uninstall* || die
+	doenvd 99${PN}
+}
diff --git a/dev-lang/go/go-1.5.ebuild b/dev-lang/go/go-1.5.ebuild
index 691efef0696e..6fc180ca12dc 100644
--- a/dev-lang/go/go-1.5.ebuild
+++ b/dev-lang/go/go-1.5.ebuild
@@ -59,9 +59,9 @@ go_arch()
 go_arm()
 {
 	case "${1:-${CHOST}}" in
-		armv5)	echo 5;;
-		armv6)	echo 6;;
-		armv7)	echo 7;;
+		armv5*)	echo 5;;
+		armv6*)	echo 6;;
+		armv7*)	echo 7;;
 		*)
 			die "unknown GOARM for ${1:-${CHOST}}"
 			;;
diff --git a/dev-lang/orc/orc-0.4.24.ebuild b/dev-lang/orc/orc-0.4.24.ebuild
index b468c6b9b80f..80fe7b378175 100644
--- a/dev-lang/orc/orc-0.4.24.ebuild
+++ b/dev-lang/orc/orc-0.4.24.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://gstreamer.freedesktop.org/src/${PN}/${P}.tar.xz"
 
 LICENSE="BSD BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~hppa ~ppc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="examples hardened static-libs"
 
 RDEPEND=""
@@ -41,9 +41,9 @@ src_configure() {
 src_install() {
 	autotools-multilib_src_install
 	if use hardened; then
-		pax-mark m usr/bin/orc-bugreport || die
-		pax-mark m usr/bin/orcc || die
-		pax-mark m usr/$(get_libdir)/liborc*.so* || die
+		pax-mark m "${ED}"usr/bin/orc-bugreport
+		pax-mark m "${ED}"usr/bin/orcc
+		pax-mark m "${ED}"usr/$(get_libdir)/liborc*.so*
 	fi
 }
 
diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest
index 1e54bf291358..bc1b01285547 100644
--- a/dev-lang/php/Manifest
+++ b/dev-lang/php/Manifest
@@ -1,15 +1,10 @@
-DIST php-5.4.41.tar.bz2 12487089 SHA256 5bc4b45a1280ff80a3cf5b8563716f325cfd0121d7fd25aa54d56ff38b3b8272 SHA512 3034adab5e47bd4dedb207d305fcbbdc9ca5bc0869fa1c55c43841101c54e8fd73d36b9ac80a84f74c71f2a23ad390cda7bf60e2347570e542b1db8c3aefa2f7 WHIRLPOOL 68af528ef069c7b6cb3bdc07e25b9bdd2af31dc248ad023a3f7948bfc49886bc7a803e9656fa12e860dd6338da1817fd3d8ca91b066e4e329e255626434e2016
-DIST php-5.4.42.tar.bz2 12708394 SHA256 6285b2e64bfaa69e5d983d7d981b4f254f5259ad3fd591ca832722a4cc1ae0f9 SHA512 74ff03081321418f9afa1e2275198c86a5a6bf2fa923eb414e02256b8228f0b26b67bb818ccfac46a0658d2bd0f5f4113549c8e515e97992b9b646ec215b4744 WHIRLPOOL 21e925aedea63f234cf4269bff44469345a3f34c5d99b95a2c6f2d7ff86f7746ab5321f7b4306294b33952cfe5b2959221874eede09b83dadaea69ed46a1d49b
-DIST php-5.4.43.tar.bz2 12708452 SHA256 25d7724fb00ad1b520f5bad2173717031153d0a8e3de2c75e7a084c76f8ecd6b SHA512 8fcf8a5b8a1f51fcbce19498b693eba0d772fc33fed07934f75f1b28de0c9ef25ab74d989f455c67b8d36f301b1808dbab324f9c5931ea9cd9d88560373d75b1 WHIRLPOOL 844f44aaa955cedff71940a76ee28d3efaf4e530bdc2e66697471afc85f4ec8e257be50a79efba7be87e2be4c45dad19fbff29bcdf100327290ac77b6d82e13e
 DIST php-5.4.44.tar.bz2 12705644 SHA256 8dd59e5ce9248cf36ac3de5412a518b8b24c01ace6c46ce3d12e4ce981a3856d SHA512 5a73311b22741d8fe60a7cd7923fdcf3d7fa26eea8b2366e55a29048012231c9f59bbf4bf089e672352cb6bd4142cd8b37946ecd76bc4400ad55592d895bf4b8 WHIRLPOOL 4367fec1fd6a25b523198516d641316955d178253e04846f27515ac47eac08f783de214ad113f54b91192214d2cc2ec5c4098899dd20b14f13904d1b37715b2c
-DIST php-5.5.25.tar.bz2 13422002 SHA256 68df37e725ddd05675c0df906041038127938ecc52113a54d10e1e4029262c63 SHA512 961e1c48c591bf3c4c6068b2dca9f3cab41925b0845e4886128e75272622ee6e24ca94e2f4cd18874e27d61de7ad7aa238c6040d57c6696f62b77ffa33fec26a WHIRLPOOL efddc221988eb9e46adf2301cc1f1a39740efb27f7a5ba9673b9021d6fd6ee2b894cfe38c3d3af2098afa3f0c92fb9ab31f7cd8abebbacfb3180406f11b48e9a
-DIST php-5.5.26.tar.bz2 13671379 SHA256 816afffdb03ff4c542bc172a2f77f9c69b817df82d60cce05c1b4f578c2c926e SHA512 eaea4160cbf6970d4fcd8b4dd897fc1c8d32397ecd613a39b3a8657e339b9e60dca25afcdf76598a5f763520aa7cdacb1f8338dc3fee5400b28ca27d19205132 WHIRLPOOL e0f63d93bda0d0cefb7309f7f6afe2ee0b8e46ec2005684628803f2c5ed460e577281b6e10f26b999711c061eb40160ef628cd80cb9545b7715c385ee37ae4d0
-DIST php-5.5.27.tar.bz2 13692811 SHA256 c4b4c6a534c0ca67a9ae39bec4f51e52d13e820135dd016eae230e15337e1f70 SHA512 b73eb13000048cb94da186ca505a51bca9d10694b1d4a07a282b9c3d9833138d1e45dd47e9d6acb628b8150e4aeab18f56f6e698251db8ee66a7f88df3816255 WHIRLPOOL 57e11bd9e63d6174f2c19cc283ed52c06487af0ea61827fc345482262e57defc64ec4942c46b3d71c18f53f1b93a22dd3c2d80f00547d9578582f6a6ab50bd00
+DIST php-5.4.45.tar.bz2 12703324 SHA256 4e0d28b1554c95cfaea6fa2b64aac85433f158ce72bb571bcd5574f98f4c6582 SHA512 ba22207da70e5e8ddf9a1f41bbeb54ef4917630006c3412db8f858782baaa3ff49d7e5ca59bed76c37fc11dc518c475b81f33f0f32c533c8f00be338e0b0d9c5 WHIRLPOOL b34e465dd193e9c1f5dedd7c6f279bb10471e31120f2a84246927f160adb1e54ea56563c719e59ed0654e2fd0805cebcc00198d6f6153791edef52fd0f2288a7
 DIST php-5.5.28.tar.bz2 13249927 SHA256 197d2c572e030c177e53d3763d59ac6d363d7c78dc22e6cc1e2ac65573d9c2f3 SHA512 4cb1e90d08bc90b35feaa4aa636d8484089d3b1868b19af99cfb27e815941798732c9a44c046bff5d48b60573657e67daff3991abbe6872a9ab3e1ab6f347b5f WHIRLPOOL 276b354cf3aa7ec3bb31602736fd724c0902832dc1a5f30d0ae288cd7c59f4614efda093a9968049996b7f2a5704d846a26e17f872754abf5be2d7badbf7c74b
-DIST php-5.6.10.tar.bz2 14080915 SHA256 0a579c81c724ea41815eee0caa8ea7d8eeb302458519d8cc4fc5b055577c8c45 SHA512 c2a0d4d7a2d20224591e7e7f3617ed4e6c49d6284797b092a0352c86d3cd88b8c5ec5092e4b97134c06a504a0df31963b191e1ca66b4fc395987bfb0d5ca4643 WHIRLPOOL 7f17e7da5ae70d817e25cdbd87e3cfff83d91a421ac9a0bfbf6f10f3796bd3d34de209da8b9bcc59c80f8573d2685cf9266a2fb3af89870cac90d13324e82e74
-DIST php-5.6.11.tar.bz2 14081292 SHA256 bd6b260816764c267244749ead07482120dbf8d1920ebbbb0dcb2aa411033866 SHA512 c6319939882a7e736cc4311470ff4802439452e45785f57c18f57e7ffaa2bce1df90221e5f44a9f0b778f56ed5fe3d86248bfd44df7537fd9f2151c09a2442e3 WHIRLPOOL 10e7973b8124b1dd3c7ef1d83a74f210b61de2d4979bf0b2f1b1eb3823be9e20bef976c9e028b27d625590db489849475a418747c0e26d3ce5560c390ad938d4
+DIST php-5.5.29.tar.bz2 13698565 SHA256 fbcee579ecc77cad6960a541116aee669cf145c2cd9a54bf60503a870843b946 SHA512 dd1e79d9c7b39be4af2bc72f93e6fc212316f1be38ced36b9de7a17f700550b6030402440a44a1b36690580e5ba083e333a0682f36cdfe65176552d8286191ae WHIRLPOOL d35ee633a9802acbbcdbb4d55031e392016ee0d901755e165119ae954185e6d67291d9ea45e6e634cf51601583c1dce4be92faeadb78c6a7e5ca4c7a8b69bd14
 DIST php-5.6.12.tar.bz2 14094148 SHA256 6f27104272af7b2a996f85e4100fac627630fbdaf39d7bd263f16cf529c8853a SHA512 fba0b5d0474ee0429d77bb8848863e68c22bd08d1d675f73a0b09d001b3bbfc5f4c15237055ad9a2e3367dbc1ad52c98db83c093e524a55ef67e573688e4fb03 WHIRLPOOL ae72ac363edca0481bdf7120db8a6d9d923f4bb448eff2bcf95e2c9895a4fcf6e91f185c81fb879f0c75ca21caded4c68ea61262bc93984b9a1789a8dfcf58dd
-DIST php-5.6.9.tar.bz2 14037070 SHA256 19d3b87b7b8bba3be24cf6d757d16b723a98881c3af8d15469fd25501e9abcb9 SHA512 c00e0fdfc60a84e0a9ebe4702907b86b86a65efc72c26fa86abc1ed79afa21fb1eb10052c1fc2326f5cb9858878f62e1a39c1cd02ea2a96fb8f14c515b26389e WHIRLPOOL e561f0c183314e05ffb34f633eac0f638d1f81d6d0a1445390ffde7baad9ce8798605bdd9a51b1227177e6b0849f752cb342d7168cc94a465406149bfad45947
+DIST php-5.6.13.tar.bz2 14077633 SHA256 6358837c9cbab41b91ede59dbf0670ae0fb925a1369ecbc1a44a27212420f893 SHA512 80e89ae748255d40b466de6c61b4443432fd81ffb1510ae66f809ed0dd07eb4071ded5b7a975f997b2cb28553ac7e27c57b67734e268c894207e9efd78ae76bf WHIRLPOOL 9b0add1b05220f9ef60de2741dcd198d0b44a9813dc1a999e42700ddb1e879f3749056cdfb151a595bc7a14a65a38eca6d0f416ee36ebd013126a92878fd47db
 DIST php-7.0.0RC1.tar.bz2 13882272 SHA256 47fafb124982941dca0ab27020949cc90f80e233cdf08b63b7644e294d0bd203 SHA512 6e099ddd1a2bc01b0bfdcbcd0e35199293af79782b8e9fa26f0dc6bb30a5fab1ff7d552d3e417a1d40d4c87fc1f759e8afbe8a5c735c2f074d18340b1ff7bf2b WHIRLPOOL e8adf87d0ef0cea2deb7e1548fe6a0624f2433a046d4fc823398211fecd22b5e23e15a82ca7d77f611ffae2f23d73c2342946df60db24fe15688101e7daac1f4
+DIST php-7.0.0RC2.tar.bz2 13911099 SHA256 0b047f1f52eb9236d5a2b4b3112fdd269d00a2ec4d3f6269865a917b80786d57 SHA512 9be983a54fad4e6ab9ec488c34c7732ada77f5fc9e7497188a3853d2bf0fa4da2f5f91ade86a0515574463b6093a29e064957779522cff0469bae0a42fde3d7c WHIRLPOOL 21b90babf62a91ef0d2360100255f71eb8b51a04d893c731b658a7c481a5d179e542b5cd09083acd305dea4c40138ba3b59bab66d22effd0f9aacab79cb7b9e2
 DIST php-7.0.0beta1.tar.bz2 14642405 SHA256 04a556a1d9108119c661f6f50ab71f94ad9fb61be3ee08cec8e2710d9df643de SHA512 496388128d5cff5c86bebb253f08e55c6b5957ed33abf96060818c31c3f8b81dd989fc437556b8071b6ba0ebb30e6b251f2b2c3326b204891467ae73c4967d9f WHIRLPOOL 0b33f5bc8df641d04f11c0e8e8a9c6f511521f9bd092392ea2bf25983539f84d1bf636cb90719672032ebdec5c64dc0b9cefe1dbdbb5e28d2c68aab72e950370
 DIST php-patchset-5.4-r2.tar.bz2 5824 SHA256 4a47f4d31f50a244f85349486cdb3474cf315562e097ed4c116c2b9b5730ecef SHA512 3c2523458a627373da7acb93fb2cd621f50b19fe2ba1d30beb62eeaaa39045262b917cfd0b631046fec9c8027cfa99bd0426a079ab45eb172b21d25d6e085dde WHIRLPOOL fe4f015e2f0dc66cc23ef16fb5bb33117952593ae0770d4bcd37ecc1c431cbcc7874189d265696305c60b4e395e7ce902667e38203db46867304868271affdea
diff --git a/dev-lang/php/php-5.4.41.ebuild b/dev-lang/php/php-5.4.41.ebuild
deleted file mode 100644
index 1f6f585ab9d2..000000000000
--- a/dev-lang/php/php-5.4.41.ebuild
+++ /dev/null
@@ -1,802 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils autotools flag-o-matic versionator depend.apache apache-module db-use libtool systemd
-
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-
-function php_get_uri ()
-{
-	case "${1}" in
-		"php-pre")
-			echo "http://downloads.php.net/stas/${2}"
-		;;
-		"php")
-			echo "http://www.php.net/distributions/${2}"
-		;;
-		"olemarkus")
-			echo "https://dev.gentoo.org/~olemarkus/php/${2}"
-		;;
-		"gentoo")
-			echo "mirror://gentoo/${2}"
-		;;
-		*)
-			die "unhandled case in php_get_uri"
-		;;
-	esac
-}
-
-PHP_MV="$(get_major_version)"
-SLOT="$(get_version_component_range 1-2)"
-
-# alias, so we can handle different types of releases (finals, rcs, alphas,
-# betas, ...) w/o changing the whole ebuild
-PHP_PV="${PV/_rc/RC}"
-PHP_PV="${PHP_PV/_alpha/alpha}"
-PHP_PV="${PHP_PV/_beta/beta}"
-PHP_RELEASE="php"
-[[ ${PV} == ${PV/_alpha/} ]] || PHP_RELEASE="php-pre"
-[[ ${PV} == ${PV/_beta/} ]] || PHP_RELEASE="php-pre"
-[[ ${PV} == ${PV/_rc/} ]] || PHP_RELEASE="php-pre"
-PHP_P="${PN}-${PHP_PV}"
-
-PHP_PATCHSET_LOC="olemarkus"
-
-PHP_SRC_URI="$(php_get_uri "${PHP_RELEASE}" "${PHP_P}.tar.bz2")"
-
-PHP_PATCHSET="2"
-PHP_PATCHSET_URI="
-	$(php_get_uri "${PHP_PATCHSET_LOC}" "php-patchset-${SLOT}-r${PHP_PATCHSET}.tar.bz2")"
-
-PHP_FPM_INIT_VER="4"
-PHP_FPM_CONF_VER="1"
-
-SRC_URI="
-	${PHP_SRC_URI}
-	${PHP_PATCHSET_URI}"
-
-DESCRIPTION="The PHP language runtime engine: CLI, CGI, FPM/FastCGI, Apache2 and embed SAPIs"
-HOMEPAGE="http://php.net/"
-LICENSE="PHP-3"
-
-S="${WORKDIR}/${PHP_P}"
-
-# We can build the following SAPIs in the given order
-SAPIS="embed cli cgi fpm apache2"
-
-# SAPIs and SAPI-specific USE flags (cli SAPI is default on):
-IUSE="${IUSE}
-	${SAPIS/cli/+cli}
-	threads"
-
-IUSE="${IUSE} bcmath berkdb bzip2 calendar cdb cjk
-	crypt +ctype curl curlwrappers debug
-	enchant exif +fileinfo +filter firebird
-	flatfile ftp gd gdbm gmp +hash +iconv imap inifile
-	intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit mhash
-	mssql mysql mysqlnd mysqli nls
-	oci8-instant-client odbc pcntl pdo +phar +posix postgres qdbm
-	readline recode selinux +session sharedmem
-	+simplexml snmp soap sockets spell sqlite ssl
-	sybase-ct sysvipc systemd tidy +tokenizer truetype unicode wddx
-	+xml xmlreader xmlwriter xmlrpc xpm xslt zip zlib"
-
-DEPEND="
-	>=app-eselect/eselect-php-0.7.1-r3[apache2?,fpm?]
-	>=dev-libs/libpcre-8.32[unicode]
-	apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=]
-		<www-servers/apache-2.4[threads=] ) )
-	berkdb? ( =sys-libs/db-4* )
-	bzip2? ( app-arch/bzip2 )
-	cdb? ( || ( dev-db/cdb dev-db/tinycdb ) )
-	cjk? ( !gd? (
-		virtual/jpeg:0
-		media-libs/libpng:0=
-		sys-libs/zlib
-	) )
-	crypt? ( >=dev-libs/libmcrypt-2.4 )
-	curl? ( >=net-misc/curl-7.10.5 )
-	enchant? ( app-text/enchant )
-	exif? ( !gd? (
-		virtual/jpeg:0
-		media-libs/libpng:0=
-		sys-libs/zlib
-	) )
-	firebird? ( dev-db/firebird )
-	gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib )
-	gdbm? ( >=sys-libs/gdbm-1.8.0 )
-	gmp? ( >=dev-libs/gmp-4.1.2 )
-	iconv? ( virtual/libiconv )
-	imap? ( virtual/imap-c-client[ssl=] )
-	intl? ( dev-libs/icu:= )
-	iodbc? ( dev-db/libiodbc )
-	kerberos? ( virtual/krb5 )
-	ldap? ( >=net-nds/openldap-1.2.11 )
-	ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 )
-	libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) )
-	mssql? ( dev-db/freetds[mssql] )
-	!mysqlnd? (
-		mysql? ( virtual/mysql )
-		mysqli? ( >=virtual/mysql-4.1 )
-	)
-	nls? ( sys-devel/gettext )
-	oci8-instant-client? ( dev-db/oracle-instantclient-basic )
-	odbc? ( >=dev-db/unixODBC-1.8.13 )
-	postgres? ( dev-db/postgresql )
-	qdbm? ( dev-db/qdbm )
-	readline? ( sys-libs/readline )
-	recode? ( app-text/recode )
-	sharedmem? ( dev-libs/mm )
-	simplexml? ( >=dev-libs/libxml2-2.6.8 )
-	snmp? ( >=net-analyzer/net-snmp-5.2 )
-	soap? ( >=dev-libs/libxml2-2.6.8 )
-	spell? ( >=app-text/aspell-0.50 )
-	sqlite? ( >=dev-db/sqlite-3.7.6.3 )
-	ssl? ( >=dev-libs/openssl-0.9.7 )
-	sybase-ct? ( dev-db/freetds )
-	tidy? ( app-text/htmltidy )
-	truetype? (
-		=media-libs/freetype-2*
-		>=media-libs/t1lib-5.0.0
-		!gd? (
-			virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib )
-	)
-	unicode? ( dev-libs/oniguruma )
-	wddx? ( >=dev-libs/libxml2-2.6.8 )
-	xml? ( >=dev-libs/libxml2-2.6.8 )
-	xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv )
-	xmlreader? ( >=dev-libs/libxml2-2.6.8 )
-	xmlwriter? ( >=dev-libs/libxml2-2.6.8 )
-	xpm? (
-		x11-libs/libXpm
-		virtual/jpeg:0
-		media-libs/libpng:0= sys-libs/zlib
-	)
-	xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 )
-	zip? ( sys-libs/zlib )
-	zlib? ( sys-libs/zlib )
-	virtual/mta
-"
-
-php="=${CATEGORY}/${PF}"
-
-REQUIRED_USE="
-	truetype? ( gd )
-	cjk? ( gd )
-	exif? ( gd )
-
-	xpm? ( gd )
-	gd? ( zlib )
-	simplexml? ( xml )
-	soap? ( xml )
-	wddx? ( xml )
-	xmlrpc? ( || ( xml iconv ) )
-	xmlreader? ( xml )
-	xslt? ( xml )
-	ldap-sasl? ( ldap )
-	mhash? ( hash )
-	phar? ( hash )
-	mysqlnd? ( || (
-		mysql
-		mysqli
-		pdo
-	) )
-
-	qdbm? ( !gdbm )
-	readline? ( !libedit )
-	recode? ( !imap !mysql !mysqli )
-	sharedmem? ( !threads )
-
-	!cli? ( !cgi? ( !fpm? ( !apache2? ( !embed? ( cli ) ) ) ) )"
-
-RDEPEND="${DEPEND}"
-
-RDEPEND="${RDEPEND}
-	fpm? (
-		selinux? ( sec-policy/selinux-phpfpm )
-		systemd? ( sys-apps/systemd ) )"
-
-DEPEND="${DEPEND}
-	sys-devel/flex
-	>=sys-devel/m4-1.4.3
-	>=sys-devel/libtool-1.5.18"
-
-# Allow users to install production version if they want to
-
-case "${PHP_INI_VERSION}" in
-	production|development)
-		;;
-	*)
-		PHP_INI_VERSION="development"
-		;;
-esac
-
-PHP_INI_UPSTREAM="php.ini-${PHP_INI_VERSION}"
-PHP_INI_FILE="php.ini"
-
-want_apache
-
-pkg_setup() {
-	depend.apache_pkg_setup
-}
-
-php_install_ini() {
-	local phpsapi="${1}"
-
-	# work out where we are installing the ini file
-	php_set_ini_dir "${phpsapi}"
-
-	local phpinisrc="${PHP_INI_UPSTREAM}-${phpsapi}"
-	cp "${PHP_INI_UPSTREAM}" "${phpinisrc}"
-
-	# default to /tmp for save_path, bug #282768
-	sed -e 's|^;session.save_path .*$|session.save_path = "'"${EPREFIX}"'/tmp"|g' -i "${phpinisrc}"
-
-	# Set the extension dir
-	sed -e "s|^extension_dir .*$|extension_dir = ${extension_dir}|g" -i "${phpinisrc}"
-
-	# Set the include path to point to where we want to find PEAR packages
-	sed -e 's|^;include_path = ".:/php/includes".*|include_path = ".:'"${EPREFIX}"'/usr/share/php'${PHP_MV}':'"${EPREFIX}"'/usr/share/php"|' -i "${phpinisrc}"
-
-	if use_if_iuse opcache; then
-		elog "Adding opcache to ${phpinisrc}"
-		echo "zend_extension=${PHP_DESTDIR}/$(get_libdir)/opcache.so" >> ${phpinisrc}
-	fi
-
-	dodir "${PHP_INI_DIR#${EPREFIX}}"
-	insinto "${PHP_INI_DIR#${EPREFIX}}"
-	newins "${phpinisrc}" "${PHP_INI_FILE}"
-
-	elog "Installing php.ini for ${phpsapi} into ${PHP_INI_DIR#${EPREFIX}}"
-	elog
-
-	dodir "${PHP_EXT_INI_DIR#${EPREFIX}}"
-	dodir "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}"
-
-	# SAPI-specific handling
-
-	if [[ "${sapi}" == "fpm" ]] ; then
-		[[ -z ${PHP_FPM_CONF_VER} ]] && PHP_FPM_CONF_VER=0
-		einfo "Installing FPM CGI config file php-fpm.conf"
-		insinto "${PHP_INI_DIR#${EPREFIX}}"
-		newins "${FILESDIR}/php-fpm-r${PHP_FPM_CONF_VER}.conf" php-fpm.conf
-
-		# Remove bogus /etc/php-fpm.conf.default (bug 359906)
-		[[ -f "${ED}/etc/php-fpm.conf.default" ]] && rm "${ED}/etc/php-fpm.conf.default"
-	fi
-
-	# Install PHP ini files into /usr/share/php
-
-	dodoc php.ini-development
-	dodoc php.ini-production
-
-}
-
-php_set_ini_dir() {
-	PHP_INI_DIR="${EPREFIX}/etc/php/${1}-php${SLOT}"
-	PHP_EXT_INI_DIR="${PHP_INI_DIR}/ext"
-	PHP_EXT_INI_DIR_ACTIVE="${PHP_INI_DIR}/ext-active"
-}
-
-src_prepare() {
-	# USE=sharedmem (session/mod_mm to be exact) tries to mmap() this path
-	# ([empty session.save_path]/session_mm_[sapi][gid].sem)
-	# there is no easy way to circumvent that, all php calls during
-	# install use -n, so no php.ini file will be used.
-	# As such, this is the easiest way to get around
-	addpredict /session_mm_cli250.sem
-	addpredict /session_mm_cli0.sem
-
-	# Change PHP branding
-	# Get the alpha/beta/rc version
-	sed -re	"s|^(PHP_EXTRA_VERSION=\").*(\")|\1-pl${PR/r/}-gentoo\2|g" \
-		-i configure.in || die "Unable to change PHP branding"
-
-	# Patch PHP to show Gentoo as the server platform
-	sed -e 's/PHP_UNAME=`uname -a | xargs`/PHP_UNAME=`uname -s -n -r -v | xargs`/g' \
-		-i configure.in || die "Failed to fix server platform name"
-
-	# Prevent PHP from activating the Apache config,
-	# as we will do that ourselves
-	sed -i \
-		-e "s,-i -a -n php${PHP_MV},-i -n php${PHP_MV},g" \
-		-e "s,-i -A -n php${PHP_MV},-i -n php${PHP_MV},g" \
-		configure sapi/apache2filter/config.m4 sapi/apache2handler/config.m4
-
-	# Patch PHP to support heimdal instead of mit-krb5
-	if has_version "app-crypt/heimdal" ; then
-		sed -e 's|gssapi_krb5|gssapi|g' -i acinclude.m4 \
-			|| die "Failed to fix heimdal libname"
-		sed -e 's|PHP_ADD_LIBRARY(k5crypto, 1, $1)||g' -i acinclude.m4 \
-			|| die "Failed to fix heimdal crypt library reference"
-	fi
-
-	#Add user patches #357637
-	epatch_user
-
-	#force rebuilding aclocal.m4
-	rm aclocal.m4
-	eautoreconf
-
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		# http://bugs.php.net/bug.php?id=48795, bug #343481
-		sed -i -e '/BUILD_CGI="\\$(CC)/s/CC/CXX/' configure || die
-	fi
-}
-
-src_configure() {
-	addpredict /usr/share/snmp/mibs/.index
-	addpredict /var/lib/net-snmp/mib_indexes
-
-	PHP_DESTDIR="${EPREFIX}/usr/$(get_libdir)/php${SLOT}"
-
-	# This is a global variable and should be in caps. It isn't because the
-	# phpconfutils eclass relies on exactly this name...
-	# for --with-libdir see bug #327025
-	my_conf="
-		--prefix="${PHP_DESTDIR}"
-		--mandir="${PHP_DESTDIR}"/man
-		--infodir="${PHP_DESTDIR}"/info
-		--libdir="${PHP_DESTDIR}"/lib
-		--with-libdir=$(get_libdir)
-		--without-pear
-		$(use_enable threads maintainer-zts)"
-
-	#                             extension		  USE flag        shared
-	my_conf+="
-	$(use_enable bcmath bcmath )
-	$(use_with bzip2 bz2 "${EPREFIX}"/usr)
-	$(use_enable calendar calendar )
-	$(use_enable ctype ctype )
-	$(use_with curl curl "${EPREFIX}"/usr)
-	$(use_with curlwrappers curlwrappers "${EPREFIX}"/usr)
-	$(use_enable xml dom )
-	$(use_with enchant enchant "${EPREFIX}"/usr)
-	$(use_enable exif exif )
-	$(use_enable fileinfo fileinfo )
-	$(use_enable filter filter )
-	$(use_enable ftp ftp )
-	$(use_with nls gettext "${EPREFIX}"/usr)
-	$(use_with gmp gmp "${EPREFIX}"/usr)
-	$(use_enable hash hash )
-	$(use_with mhash mhash "${EPREFIX}"/usr)
-	$(use_with iconv iconv $(use elibc_glibc || use elibc_musl || echo "${EPREFIX}"/usr))
-	$(use_enable intl intl )
-	$(use_enable ipv6 ipv6 )
-	$(use_enable json json )
-	$(use_with kerberos kerberos "${EPREFIX}"/usr)
-	$(use_enable xml libxml )
-	$(use_with xml libxml-dir "${EPREFIX}"/usr)
-	$(use_enable unicode mbstring )
-	$(use_with crypt mcrypt "${EPREFIX}"/usr)
-	$(use_with mssql mssql "${EPREFIX}"/usr)
-	$(use_with unicode onig "${EPREFIX}"/usr)
-	$(use_with ssl openssl "${EPREFIX}"/usr)
-	$(use_with ssl openssl-dir "${EPREFIX}"/usr)
-	$(use_enable pcntl pcntl )
-	$(use_enable phar phar )
-	$(use_enable pdo pdo )
-	$(use_with postgres pgsql "${EPREFIX}"/usr)
-	$(use_enable posix posix )
-	$(use_with spell pspell "${EPREFIX}"/usr)
-	$(use_with recode recode "${EPREFIX}"/usr)
-	$(use_enable simplexml simplexml )
-	$(use_enable sharedmem shmop )
-	$(use_with snmp snmp "${EPREFIX}"/usr)
-	$(use_enable soap soap )
-	$(use_enable sockets sockets )
-	$(use_with sqlite sqlite3 "${EPREFIX}"/usr)
-	$(use_with sybase-ct sybase-ct "${EPREFIX}"/usr)
-	$(use_enable sysvipc sysvmsg )
-	$(use_enable sysvipc sysvsem )
-	$(use_enable sysvipc sysvshm )
-	$(use_with systemd fpm-systemd)
-	$(use_with tidy tidy "${EPREFIX}"/usr)
-	$(use_enable tokenizer tokenizer )
-	$(use_enable wddx wddx )
-	$(use_enable xml xml )
-	$(use_enable xmlreader xmlreader )
-	$(use_enable xmlwriter xmlwriter )
-	$(use_with xmlrpc xmlrpc)
-	$(use_with xslt xsl "${EPREFIX}"/usr)
-	$(use_enable zip zip )
-	$(use_with zlib zlib "${EPREFIX}"/usr)
-	$(use_enable debug debug )"
-
-	# DBA support
-	if use cdb || use berkdb || use flatfile || use gdbm || use inifile \
-		|| use qdbm ; then
-		my_conf="${my_conf} --enable-dba${shared}"
-	fi
-
-	# DBA drivers support
-	my_conf+="
-	$(use_with cdb cdb)
-	$(use_with berkdb db4 ${EPREFIX}/usr)
-	$(use_enable flatfile flatfile )
-	$(use_with gdbm gdbm ${EPREFIX}/usr)
-	$(use_enable inifile inifile )
-	$(use_with qdbm qdbm ${EPREFIX}/usr)"
-
-	# Support for the GD graphics library
-	my_conf+="
-	$(use_with truetype freetype-dir ${EPREFIX}/usr)
-	$(use_with truetype t1lib ${EPREFIX}/usr)
-	$(use_enable cjk gd-jis-conv )
-	$(use_with gd jpeg-dir ${EPREFIX}/usr)
-	$(use_with gd png-dir ${EPREFIX}/usr)
-	$(use_with xpm xpm-dir ${EPREFIX}/usr)"
-	# enable gd last, so configure can pick up the previous settings
-	my_conf+="
-	$(use_with gd gd)"
-
-	# IMAP support
-	if use imap ; then
-		my_conf+="
-		$(use_with imap imap ${EPREFIX}/usr)
-		$(use_with ssl imap-ssl ${EPREFIX}/usr)"
-	fi
-
-	# Interbase/firebird support
-
-	if use firebird ; then
-		my_conf+="
-		$(use_with firebird interbase ${EPREFIX}/usr)"
-	fi
-
-	# LDAP support
-	if use ldap ; then
-		my_conf+="
-		$(use_with ldap ldap ${EPREFIX}/usr)
-		$(use_with ldap-sasl ldap-sasl ${EPREFIX}/usr)"
-	fi
-
-	# MySQL support
-	if use mysql ; then
-		if use mysqlnd ; then
-			my_conf+="
-			$(use_with mysql mysql mysqlnd)"
-		else
-			my_conf+="
-			$(use_with mysql mysql ${EPREFIX}/usr)"
-		fi
-		my_conf+="
-		$(use_with mysql mysql-sock ${EPREFIX}/var/run/mysqld/mysqld.sock)"
-	fi
-
-	# MySQLi support
-	if use mysqlnd ; then
-		my_conf+="
-		$(use_with mysqli mysqli mysqlnd)"
-	else
-		my_conf+="
-		$(use_with mysqli mysqli ${EPREFIX}/usr/bin/mysql_config)"
-	fi
-
-	# ODBC support
-	if use odbc ; then
-		my_conf+="
-		$(use_with odbc unixODBC ${EPREFIX}/usr)"
-	fi
-
-	if use iodbc ; then
-		my_conf+="
-		$(use_with iodbc iodbc ${EPREFIX}/usr)"
-	fi
-
-	# Oracle support
-	if use oci8-instant-client ; then
-		my_conf+="
-		$(use_with oci8-instant-client oci8)"
-	fi
-
-	# PDO support
-	if use pdo ; then
-		my_conf+="
-		$(use_with mssql pdo-dblib )"
-		if use mysqlnd ; then
-			my_conf+="
-			$(use_with mysqlnd pdo-mysql mysqlnd)"
-		else
-			my_conf+="
-			$(use_with mysql pdo-mysql ${EPREFIX}/usr)"
-		fi
-		my_conf+="
-		$(use_with postgres pdo-pgsql )
-		$(use_with sqlite pdo-sqlite ${EPREFIX}/usr)
-		$(use_with odbc pdo-odbc unixODBC,${EPREFIX}/usr)"
-		if use oci8-instant-client ; then
-			my_conf+="
-			$(use_with oci8-instant-client pdo-oci)"
-		fi
-	fi
-
-	# readline/libedit support
-	my_conf+="
-	$(use_with readline readline ${EPREFIX}/usr)
-	$(use_with libedit libedit ${EPREFIX}/usr)"
-
-	# Session support
-	if use session ; then
-		my_conf+="
-		$(use_with sharedmem mm ${EPREFIX}/usr)"
-	else
-		my_conf+="
-		$(use_enable session session )"
-	fi
-
-	# Use pic for shared modules such as apache2's mod_php
-	my_conf="${my_conf} --with-pic"
-
-	# we use the system copy of pcre
-	# --with-pcre-regex affects ext/pcre
-	# --with-pcre-dir affects ext/filter and ext/zip
-	my_conf="${my_conf} --with-pcre-regex=${EPREFIX}/usr --with-pcre-dir=${EPREFIX}/usr"
-
-	# Catch CFLAGS problems
-	# Fixes bug #14067.
-	# Changed order to run it in reverse for bug #32022 and #12021.
-	replace-cpu-flags "k6*" "i586"
-
-	# Support user-passed configuration parameters
-	my_conf="${my_conf} ${EXTRA_ECONF:-}"
-
-	# Support the Apache2 extras, they must be set globally for all
-	# SAPIs to work correctly, especially for external PHP extensions
-
-	mkdir -p "${WORKDIR}/sapis-build"
-	for one_sapi in $SAPIS ; do
-		use "${one_sapi}" || continue
-		php_set_ini_dir "${one_sapi}"
-
-		cp -r "${S}" "${WORKDIR}/sapis-build/${one_sapi}"
-		cd "${WORKDIR}/sapis-build/${one_sapi}"
-
-		sapi_conf="${my_conf} --with-config-file-path=${PHP_INI_DIR}
-			--with-config-file-scan-dir=${PHP_EXT_INI_DIR_ACTIVE}"
-
-		for sapi in $SAPIS ; do
-			case "$sapi" in
-				cli|cgi|embed|fpm)
-					if [[ "${one_sapi}" == "${sapi}" ]] ; then
-						sapi_conf="${sapi_conf} --enable-${sapi}"
-					else
-						sapi_conf="${sapi_conf} --disable-${sapi}"
-					fi
-					;;
-
-				apache2)
-					if [[ "${one_sapi}" == "${sapi}" ]] ; then
-						sapi_conf="${sapi_conf} --with-apxs2=${EPREFIX}/usr/sbin/apxs"
-					else
-						sapi_conf="${sapi_conf} --without-apxs2"
-					fi
-					;;
-			esac
-		done
-
-		econf ${sapi_conf}
-	done
-}
-
-src_compile() {
-	# snmp seems to run during src_compile, too (bug #324739)
-	addpredict /usr/share/snmp/mibs/.index
-	addpredict /var/lib/net-snmp/mib_indexes
-
-	for sapi in ${SAPIS} ; do
-		if use "${sapi}"; then
-			cd "${WORKDIR}/sapis-build/$sapi" || "Failed to change dir to ${WORKDIR}/sapis-build/$1"
-			emake || die "emake failed"
-		fi
-	done
-}
-
-src_install() {
-	# see bug #324739 for what happens when we don't have that
-	addpredict /usr/share/snmp/mibs/.index
-
-	# grab the first SAPI that got built and install common files from there
-	local first_sapi=""
-	for sapi in $SAPIS ; do
-		if use $sapi ; then
-			first_sapi=$sapi
-			break
-		fi
-	done
-
-	# Makefile forgets to create this before trying to write to it...
-	dodir "${PHP_DESTDIR#${EPREFIX}}/bin"
-
-	# Install php environment (without any sapis)
-	cd "${WORKDIR}/sapis-build/$first_sapi"
-	emake INSTALL_ROOT="${D}" \
-		install-build install-headers install-programs \
-		|| die "emake install failed"
-
-	local extension_dir="$("${ED}/${PHP_DESTDIR#${EPREFIX}}/bin/php-config" --extension-dir)"
-
-	# Create the directory where we'll put version-specific php scripts
-	keepdir /usr/share/php${PHP_MV}
-
-	local sapi="", file=""
-	local sapi_list=""
-
-	for sapi in ${SAPIS}; do
-		if use "${sapi}" ; then
-			einfo "Installing SAPI: ${sapi}"
-			cd "${WORKDIR}/sapis-build/${sapi}"
-
-			if [[ "${sapi}" == "apache2" ]] ; then
-				# We're specifically not using emake install-sapi as libtool
-				# may cause unnecessary relink failures (see bug #351266)
-				insinto "${PHP_DESTDIR#${EPREFIX}}/apache2/"
-				newins ".libs/libphp5$(get_libname)" "libphp${PHP_MV}$(get_libname)"
-				keepdir "/usr/$(get_libdir)/apache2/modules"
-			else
-				# needed each time, php_install_ini would reset it
-				local dest="${PHP_DESTDIR#${EPREFIX}}"
-				into "${dest}"
-				case "$sapi" in
-					cli)
-						source="sapi/cli/php"
-						;;
-					cgi)
-						source="sapi/cgi/php-cgi"
-						;;
-					fpm)
-						source="sapi/fpm/php-fpm"
-						;;
-					embed)
-						source="libs/libphp${PHP_MV}$(get_libname)"
-						;;
-					*)
-						die "unhandled sapi in src_install"
-						;;
-				esac
-
-				if [[ "${source}" == *"$(get_libname)" ]]; then
-					dolib.so "${source}" || die "Unable to install ${sapi} sapi"
-				else
-					dobin "${source}" || die "Unable to install ${sapi} sapi"
-					local name="$(basename ${source})"
-					dosym "${dest}/bin/${name}" "/usr/bin/${name}${SLOT}"
-				fi
-			fi
-
-			php_install_ini "${sapi}"
-
-			# construct correct SAPI string for php-config
-			# thanks to ferringb for the bash voodoo
-			if [[ "${sapi}" == "apache2" ]]; then
-				sapi_list="${sapi_list:+${sapi_list} }apache2handler"
-			else
-				sapi_list="${sapi_list:+${sapi_list} }${sapi}"
-			fi
-		fi
-	done
-
-	# Installing opcache module
-	if use_if_iuse opcache ; then
-		dolib.so "modules/opcache$(get_libname)" || die "Unable to install opcache module"
-	fi
-
-	# Install env.d files
-	newenvd "${FILESDIR}/20php5-envd" \
-		"20php${SLOT}"
-	sed -e "s|/lib/|/$(get_libdir)/|g" -i \
-		"${ED}/etc/env.d/20php${SLOT}"
-	sed -e "s|php5|php${SLOT}|g" -i \
-		"${ED}/etc/env.d/20php${SLOT}"
-
-	# set php-config variable correctly (bug #278439)
-	sed -e "s:^\(php_sapis=\)\".*\"$:\1\"${sapi_list}\":" -i \
-		"${ED}/usr/$(get_libdir)/php${SLOT}/bin/php-config"
-
-	if use fpm ; then
-		if use systemd; then
-			systemd_newunit "${FILESDIR}/php-fpm_at.service" "php-fpm@${SLOT}.service"
-		else
-			systemd_newunit "${FILESDIR}/php-fpm_at-simple.service" "php-fpm@${SLOT}.service"
-		fi
-	fi
-}
-
-src_test() {
-	echo ">>> Test phase [test]: ${CATEGORY}/${PF}"
-	PHP_BIN="${WORKDIR}/sapis-build/cli/sapi/cli/php"
-	if [[ ! -x "${PHP_BIN}" ]] ; then
-		ewarn "Test phase requires USE=cli, skipping"
-		return
-	else
-		export TEST_PHP_EXECUTABLE="${PHP_BIN}"
-	fi
-
-	if [[ -x "${WORKDIR}/sapis/cgi/php-cgi" ]] ; then
-		export TEST_PHP_CGI_EXECUTABLE="${WORKDIR}/sapis/cgi/php-cgi"
-	fi
-
-	REPORT_EXIT_STATUS=1 "${TEST_PHP_EXECUTABLE}" -n  -d "session.save_path=${T}" \
-		"${WORKDIR}/sapis-build/cli/run-tests.php" -n -q -d "session.save_path=${T}"
-
-	for name in ${EXPECTED_TEST_FAILURES}; do
-		mv "${name}.out" "${name}.out.orig" 2>/dev/null
-	done
-
-	local failed="$(find -name '*.out')"
-	if [[ ${failed} != "" ]] ; then
-		ewarn "The following test cases failed unexpectedly:"
-		for name in ${failed}; do
-			ewarn "  ${name/.out/}"
-		done
-	else
-		einfo "No unexpected test failures, all fine"
-	fi
-
-	if [[ ${PHP_SHOW_UNEXPECTED_TEST_PASS} == "1" ]] ; then
-		local passed=""
-		for name in ${EXPECTED_TEST_FAILURES}; do
-			[[ -f "${name}.diff" ]] && continue
-			passed="${passed} ${name}"
-		done
-		if [[ ${passed} != "" ]] ; then
-			einfo "The following test cases passed unexpectedly:"
-			for name in ${passed}; do
-				ewarn "  ${passed}"
-			done
-		else
-			einfo "None of the known-to-fail tests passed, all fine"
-		fi
-	fi
-}
-
-pkg_postinst() {
-	# Output some general info to the user
-	if use apache2 ; then
-		APACHE2_MOD_DEFINE="PHP5"
-		APACHE2_MOD_CONF="70_mod_php5"  # actually provided by app-eselect/eselect-php
-		apache-module_pkg_postinst
-	fi
-
-	# Create the symlinks for php
-	for m in ${SAPIS}; do
-		[[ ${m} == 'embed' ]] && continue;
-		if use $m ; then
-			local ci=$(eselect php show $m)
-			if [[ -z $ci ]]; then
-				eselect php set $m php${SLOT}
-				einfo "Switched ${m} to use php:${SLOT}"
-				einfo
-			elif [[ $ci != "php${SLOT}" ]] ; then
-				elog "To switch $m to use php:${SLOT}, run"
-				elog "    eselect php set $m php${SLOT}"
-				elog
-			fi
-		fi
-	done
-
-	elog "Make sure that PHP_TARGETS in ${EPREFIX}/etc/make.conf includes php${SLOT/./-} in order"
-	elog "to compile extensions for the ${SLOT} ABI"
-	elog
-	if ! use readline && use cli ; then
-		ewarn "Note that in order to use php interactivly, you need to enable"
-		ewarn "the readline USE flag or php -a will hang"
-	fi
-	elog
-	elog "This ebuild installed a version of php.ini based on php.ini-${PHP_INI_VERSION} version."
-	elog "You can chose which version of php.ini to install by default by setting PHP_INI_VERSION to either"
-	elog "'production' or 'development' in ${EPREFIX}/etc/make.conf"
-	elog "Both versions of php.ini can be found in ${EPREFIX}/usr/share/doc/${PF}"
-
-	elog
-	elog "For more details on how minor version slotting works (PHP_TARGETS) please read the upgrade guide:"
-	elog "https://www.gentoo.org/proj/en/php/php-upgrading.xml"
-	elog
-}
-
-pkg_prerm() {
-	eselect php cleanup
-}
diff --git a/dev-lang/php/php-5.4.42.ebuild b/dev-lang/php/php-5.4.42.ebuild
deleted file mode 100644
index 9fc7a1c725bf..000000000000
--- a/dev-lang/php/php-5.4.42.ebuild
+++ /dev/null
@@ -1,802 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils autotools flag-o-matic versionator depend.apache apache-module db-use libtool systemd
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-
-function php_get_uri ()
-{
-	case "${1}" in
-		"php-pre")
-			echo "http://downloads.php.net/stas/${2}"
-		;;
-		"php")
-			echo "http://www.php.net/distributions/${2}"
-		;;
-		"olemarkus")
-			echo "https://dev.gentoo.org/~olemarkus/php/${2}"
-		;;
-		"gentoo")
-			echo "mirror://gentoo/${2}"
-		;;
-		*)
-			die "unhandled case in php_get_uri"
-		;;
-	esac
-}
-
-PHP_MV="$(get_major_version)"
-SLOT="$(get_version_component_range 1-2)"
-
-# alias, so we can handle different types of releases (finals, rcs, alphas,
-# betas, ...) w/o changing the whole ebuild
-PHP_PV="${PV/_rc/RC}"
-PHP_PV="${PHP_PV/_alpha/alpha}"
-PHP_PV="${PHP_PV/_beta/beta}"
-PHP_RELEASE="php"
-[[ ${PV} == ${PV/_alpha/} ]] || PHP_RELEASE="php-pre"
-[[ ${PV} == ${PV/_beta/} ]] || PHP_RELEASE="php-pre"
-[[ ${PV} == ${PV/_rc/} ]] || PHP_RELEASE="php-pre"
-PHP_P="${PN}-${PHP_PV}"
-
-PHP_PATCHSET_LOC="olemarkus"
-
-PHP_SRC_URI="$(php_get_uri "${PHP_RELEASE}" "${PHP_P}.tar.bz2")"
-
-PHP_PATCHSET="2"
-PHP_PATCHSET_URI="
-	$(php_get_uri "${PHP_PATCHSET_LOC}" "php-patchset-${SLOT}-r${PHP_PATCHSET}.tar.bz2")"
-
-PHP_FPM_INIT_VER="4"
-PHP_FPM_CONF_VER="1"
-
-SRC_URI="
-	${PHP_SRC_URI}
-	${PHP_PATCHSET_URI}"
-
-DESCRIPTION="The PHP language runtime engine: CLI, CGI, FPM/FastCGI, Apache2 and embed SAPIs"
-HOMEPAGE="http://php.net/"
-LICENSE="PHP-3"
-
-S="${WORKDIR}/${PHP_P}"
-
-# We can build the following SAPIs in the given order
-SAPIS="embed cli cgi fpm apache2"
-
-# SAPIs and SAPI-specific USE flags (cli SAPI is default on):
-IUSE="${IUSE}
-	${SAPIS/cli/+cli}
-	threads"
-
-IUSE="${IUSE} bcmath berkdb bzip2 calendar cdb cjk
-	crypt +ctype curl curlwrappers debug
-	enchant exif +fileinfo +filter firebird
-	flatfile ftp gd gdbm gmp +hash +iconv imap inifile
-	intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit mhash
-	mssql mysql mysqlnd mysqli nls
-	oci8-instant-client odbc pcntl pdo +phar +posix postgres qdbm
-	readline recode selinux +session sharedmem
-	+simplexml snmp soap sockets spell sqlite ssl
-	sybase-ct sysvipc systemd tidy +tokenizer truetype unicode wddx
-	+xml xmlreader xmlwriter xmlrpc xpm xslt zip zlib"
-
-DEPEND="
-	>=app-eselect/eselect-php-0.7.1-r3[apache2?,fpm?]
-	>=dev-libs/libpcre-8.32[unicode]
-	apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=]
-		<www-servers/apache-2.4[threads=] ) )
-	berkdb? ( =sys-libs/db-4* )
-	bzip2? ( app-arch/bzip2 )
-	cdb? ( || ( dev-db/cdb dev-db/tinycdb ) )
-	cjk? ( !gd? (
-		virtual/jpeg:0
-		media-libs/libpng:0=
-		sys-libs/zlib
-	) )
-	crypt? ( >=dev-libs/libmcrypt-2.4 )
-	curl? ( >=net-misc/curl-7.10.5 )
-	enchant? ( app-text/enchant )
-	exif? ( !gd? (
-		virtual/jpeg:0
-		media-libs/libpng:0=
-		sys-libs/zlib
-	) )
-	firebird? ( dev-db/firebird )
-	gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib )
-	gdbm? ( >=sys-libs/gdbm-1.8.0 )
-	gmp? ( >=dev-libs/gmp-4.1.2 )
-	iconv? ( virtual/libiconv )
-	imap? ( virtual/imap-c-client[ssl=] )
-	intl? ( dev-libs/icu:= )
-	iodbc? ( dev-db/libiodbc )
-	kerberos? ( virtual/krb5 )
-	ldap? ( >=net-nds/openldap-1.2.11 )
-	ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 )
-	libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) )
-	mssql? ( dev-db/freetds[mssql] )
-	!mysqlnd? (
-		mysql? ( virtual/mysql )
-		mysqli? ( >=virtual/mysql-4.1 )
-	)
-	nls? ( sys-devel/gettext )
-	oci8-instant-client? ( dev-db/oracle-instantclient-basic )
-	odbc? ( >=dev-db/unixODBC-1.8.13 )
-	postgres? ( dev-db/postgresql )
-	qdbm? ( dev-db/qdbm )
-	readline? ( sys-libs/readline )
-	recode? ( app-text/recode )
-	sharedmem? ( dev-libs/mm )
-	simplexml? ( >=dev-libs/libxml2-2.6.8 )
-	snmp? ( >=net-analyzer/net-snmp-5.2 )
-	soap? ( >=dev-libs/libxml2-2.6.8 )
-	spell? ( >=app-text/aspell-0.50 )
-	sqlite? ( >=dev-db/sqlite-3.7.6.3 )
-	ssl? ( >=dev-libs/openssl-0.9.7 )
-	sybase-ct? ( dev-db/freetds )
-	tidy? ( app-text/htmltidy )
-	truetype? (
-		=media-libs/freetype-2*
-		>=media-libs/t1lib-5.0.0
-		!gd? (
-			virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib )
-	)
-	unicode? ( dev-libs/oniguruma )
-	wddx? ( >=dev-libs/libxml2-2.6.8 )
-	xml? ( >=dev-libs/libxml2-2.6.8 )
-	xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv )
-	xmlreader? ( >=dev-libs/libxml2-2.6.8 )
-	xmlwriter? ( >=dev-libs/libxml2-2.6.8 )
-	xpm? (
-		x11-libs/libXpm
-		virtual/jpeg:0
-		media-libs/libpng:0= sys-libs/zlib
-	)
-	xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 )
-	zip? ( sys-libs/zlib )
-	zlib? ( sys-libs/zlib )
-	virtual/mta
-"
-
-php="=${CATEGORY}/${PF}"
-
-REQUIRED_USE="
-	truetype? ( gd )
-	cjk? ( gd )
-	exif? ( gd )
-
-	xpm? ( gd )
-	gd? ( zlib )
-	simplexml? ( xml )
-	soap? ( xml )
-	wddx? ( xml )
-	xmlrpc? ( || ( xml iconv ) )
-	xmlreader? ( xml )
-	xslt? ( xml )
-	ldap-sasl? ( ldap )
-	mhash? ( hash )
-	phar? ( hash )
-	mysqlnd? ( || (
-		mysql
-		mysqli
-		pdo
-	) )
-
-	qdbm? ( !gdbm )
-	readline? ( !libedit )
-	recode? ( !imap !mysql !mysqli )
-	sharedmem? ( !threads )
-
-	!cli? ( !cgi? ( !fpm? ( !apache2? ( !embed? ( cli ) ) ) ) )"
-
-RDEPEND="${DEPEND}"
-
-RDEPEND="${RDEPEND}
-	fpm? (
-		selinux? ( sec-policy/selinux-phpfpm )
-		systemd? ( sys-apps/systemd ) )"
-
-DEPEND="${DEPEND}
-	sys-devel/flex
-	>=sys-devel/m4-1.4.3
-	>=sys-devel/libtool-1.5.18"
-
-# Allow users to install production version if they want to
-
-case "${PHP_INI_VERSION}" in
-	production|development)
-		;;
-	*)
-		PHP_INI_VERSION="development"
-		;;
-esac
-
-PHP_INI_UPSTREAM="php.ini-${PHP_INI_VERSION}"
-PHP_INI_FILE="php.ini"
-
-want_apache
-
-pkg_setup() {
-	depend.apache_pkg_setup
-}
-
-php_install_ini() {
-	local phpsapi="${1}"
-
-	# work out where we are installing the ini file
-	php_set_ini_dir "${phpsapi}"
-
-	local phpinisrc="${PHP_INI_UPSTREAM}-${phpsapi}"
-	cp "${PHP_INI_UPSTREAM}" "${phpinisrc}"
-
-	# default to /tmp for save_path, bug #282768
-	sed -e 's|^;session.save_path .*$|session.save_path = "'"${EPREFIX}"'/tmp"|g' -i "${phpinisrc}"
-
-	# Set the extension dir
-	sed -e "s|^extension_dir .*$|extension_dir = ${extension_dir}|g" -i "${phpinisrc}"
-
-	# Set the include path to point to where we want to find PEAR packages
-	sed -e 's|^;include_path = ".:/php/includes".*|include_path = ".:'"${EPREFIX}"'/usr/share/php'${PHP_MV}':'"${EPREFIX}"'/usr/share/php"|' -i "${phpinisrc}"
-
-	if use_if_iuse opcache; then
-		elog "Adding opcache to ${phpinisrc}"
-		echo "zend_extension=${PHP_DESTDIR}/$(get_libdir)/opcache.so" >> ${phpinisrc}
-	fi
-
-	dodir "${PHP_INI_DIR#${EPREFIX}}"
-	insinto "${PHP_INI_DIR#${EPREFIX}}"
-	newins "${phpinisrc}" "${PHP_INI_FILE}"
-
-	elog "Installing php.ini for ${phpsapi} into ${PHP_INI_DIR#${EPREFIX}}"
-	elog
-
-	dodir "${PHP_EXT_INI_DIR#${EPREFIX}}"
-	dodir "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}"
-
-	# SAPI-specific handling
-
-	if [[ "${sapi}" == "fpm" ]] ; then
-		[[ -z ${PHP_FPM_CONF_VER} ]] && PHP_FPM_CONF_VER=0
-		einfo "Installing FPM CGI config file php-fpm.conf"
-		insinto "${PHP_INI_DIR#${EPREFIX}}"
-		newins "${FILESDIR}/php-fpm-r${PHP_FPM_CONF_VER}.conf" php-fpm.conf
-
-		# Remove bogus /etc/php-fpm.conf.default (bug 359906)
-		[[ -f "${ED}/etc/php-fpm.conf.default" ]] && rm "${ED}/etc/php-fpm.conf.default"
-	fi
-
-	# Install PHP ini files into /usr/share/php
-
-	dodoc php.ini-development
-	dodoc php.ini-production
-
-}
-
-php_set_ini_dir() {
-	PHP_INI_DIR="${EPREFIX}/etc/php/${1}-php${SLOT}"
-	PHP_EXT_INI_DIR="${PHP_INI_DIR}/ext"
-	PHP_EXT_INI_DIR_ACTIVE="${PHP_INI_DIR}/ext-active"
-}
-
-src_prepare() {
-	# USE=sharedmem (session/mod_mm to be exact) tries to mmap() this path
-	# ([empty session.save_path]/session_mm_[sapi][gid].sem)
-	# there is no easy way to circumvent that, all php calls during
-	# install use -n, so no php.ini file will be used.
-	# As such, this is the easiest way to get around
-	addpredict /session_mm_cli250.sem
-	addpredict /session_mm_cli0.sem
-
-	# Change PHP branding
-	# Get the alpha/beta/rc version
-	sed -re	"s|^(PHP_EXTRA_VERSION=\").*(\")|\1-pl${PR/r/}-gentoo\2|g" \
-		-i configure.in || die "Unable to change PHP branding"
-
-	# Patch PHP to show Gentoo as the server platform
-	sed -e 's/PHP_UNAME=`uname -a | xargs`/PHP_UNAME=`uname -s -n -r -v | xargs`/g' \
-		-i configure.in || die "Failed to fix server platform name"
-
-	# Prevent PHP from activating the Apache config,
-	# as we will do that ourselves
-	sed -i \
-		-e "s,-i -a -n php${PHP_MV},-i -n php${PHP_MV},g" \
-		-e "s,-i -A -n php${PHP_MV},-i -n php${PHP_MV},g" \
-		configure sapi/apache2filter/config.m4 sapi/apache2handler/config.m4
-
-	# Patch PHP to support heimdal instead of mit-krb5
-	if has_version "app-crypt/heimdal" ; then
-		sed -e 's|gssapi_krb5|gssapi|g' -i acinclude.m4 \
-			|| die "Failed to fix heimdal libname"
-		sed -e 's|PHP_ADD_LIBRARY(k5crypto, 1, $1)||g' -i acinclude.m4 \
-			|| die "Failed to fix heimdal crypt library reference"
-	fi
-
-	#Add user patches #357637
-	epatch_user
-
-	#force rebuilding aclocal.m4
-	rm aclocal.m4
-	eautoreconf
-
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		# http://bugs.php.net/bug.php?id=48795, bug #343481
-		sed -i -e '/BUILD_CGI="\\$(CC)/s/CC/CXX/' configure || die
-	fi
-}
-
-src_configure() {
-	addpredict /usr/share/snmp/mibs/.index
-	addpredict /var/lib/net-snmp/mib_indexes
-
-	PHP_DESTDIR="${EPREFIX}/usr/$(get_libdir)/php${SLOT}"
-
-	# This is a global variable and should be in caps. It isn't because the
-	# phpconfutils eclass relies on exactly this name...
-	# for --with-libdir see bug #327025
-	my_conf="
-		--prefix="${PHP_DESTDIR}"
-		--mandir="${PHP_DESTDIR}"/man
-		--infodir="${PHP_DESTDIR}"/info
-		--libdir="${PHP_DESTDIR}"/lib
-		--with-libdir=$(get_libdir)
-		--without-pear
-		$(use_enable threads maintainer-zts)"
-
-	#                             extension		  USE flag        shared
-	my_conf+="
-	$(use_enable bcmath bcmath )
-	$(use_with bzip2 bz2 "${EPREFIX}"/usr)
-	$(use_enable calendar calendar )
-	$(use_enable ctype ctype )
-	$(use_with curl curl "${EPREFIX}"/usr)
-	$(use_with curlwrappers curlwrappers "${EPREFIX}"/usr)
-	$(use_enable xml dom )
-	$(use_with enchant enchant "${EPREFIX}"/usr)
-	$(use_enable exif exif )
-	$(use_enable fileinfo fileinfo )
-	$(use_enable filter filter )
-	$(use_enable ftp ftp )
-	$(use_with nls gettext "${EPREFIX}"/usr)
-	$(use_with gmp gmp "${EPREFIX}"/usr)
-	$(use_enable hash hash )
-	$(use_with mhash mhash "${EPREFIX}"/usr)
-	$(use_with iconv iconv $(use elibc_glibc || use elibc_musl || echo "${EPREFIX}"/usr))
-	$(use_enable intl intl )
-	$(use_enable ipv6 ipv6 )
-	$(use_enable json json )
-	$(use_with kerberos kerberos "${EPREFIX}"/usr)
-	$(use_enable xml libxml )
-	$(use_with xml libxml-dir "${EPREFIX}"/usr)
-	$(use_enable unicode mbstring )
-	$(use_with crypt mcrypt "${EPREFIX}"/usr)
-	$(use_with mssql mssql "${EPREFIX}"/usr)
-	$(use_with unicode onig "${EPREFIX}"/usr)
-	$(use_with ssl openssl "${EPREFIX}"/usr)
-	$(use_with ssl openssl-dir "${EPREFIX}"/usr)
-	$(use_enable pcntl pcntl )
-	$(use_enable phar phar )
-	$(use_enable pdo pdo )
-	$(use_with postgres pgsql "${EPREFIX}"/usr)
-	$(use_enable posix posix )
-	$(use_with spell pspell "${EPREFIX}"/usr)
-	$(use_with recode recode "${EPREFIX}"/usr)
-	$(use_enable simplexml simplexml )
-	$(use_enable sharedmem shmop )
-	$(use_with snmp snmp "${EPREFIX}"/usr)
-	$(use_enable soap soap )
-	$(use_enable sockets sockets )
-	$(use_with sqlite sqlite3 "${EPREFIX}"/usr)
-	$(use_with sybase-ct sybase-ct "${EPREFIX}"/usr)
-	$(use_enable sysvipc sysvmsg )
-	$(use_enable sysvipc sysvsem )
-	$(use_enable sysvipc sysvshm )
-	$(use_with systemd fpm-systemd)
-	$(use_with tidy tidy "${EPREFIX}"/usr)
-	$(use_enable tokenizer tokenizer )
-	$(use_enable wddx wddx )
-	$(use_enable xml xml )
-	$(use_enable xmlreader xmlreader )
-	$(use_enable xmlwriter xmlwriter )
-	$(use_with xmlrpc xmlrpc)
-	$(use_with xslt xsl "${EPREFIX}"/usr)
-	$(use_enable zip zip )
-	$(use_with zlib zlib "${EPREFIX}"/usr)
-	$(use_enable debug debug )"
-
-	# DBA support
-	if use cdb || use berkdb || use flatfile || use gdbm || use inifile \
-		|| use qdbm ; then
-		my_conf="${my_conf} --enable-dba${shared}"
-	fi
-
-	# DBA drivers support
-	my_conf+="
-	$(use_with cdb cdb)
-	$(use_with berkdb db4 ${EPREFIX}/usr)
-	$(use_enable flatfile flatfile )
-	$(use_with gdbm gdbm ${EPREFIX}/usr)
-	$(use_enable inifile inifile )
-	$(use_with qdbm qdbm ${EPREFIX}/usr)"
-
-	# Support for the GD graphics library
-	my_conf+="
-	$(use_with truetype freetype-dir ${EPREFIX}/usr)
-	$(use_with truetype t1lib ${EPREFIX}/usr)
-	$(use_enable cjk gd-jis-conv )
-	$(use_with gd jpeg-dir ${EPREFIX}/usr)
-	$(use_with gd png-dir ${EPREFIX}/usr)
-	$(use_with xpm xpm-dir ${EPREFIX}/usr)"
-	# enable gd last, so configure can pick up the previous settings
-	my_conf+="
-	$(use_with gd gd)"
-
-	# IMAP support
-	if use imap ; then
-		my_conf+="
-		$(use_with imap imap ${EPREFIX}/usr)
-		$(use_with ssl imap-ssl ${EPREFIX}/usr)"
-	fi
-
-	# Interbase/firebird support
-
-	if use firebird ; then
-		my_conf+="
-		$(use_with firebird interbase ${EPREFIX}/usr)"
-	fi
-
-	# LDAP support
-	if use ldap ; then
-		my_conf+="
-		$(use_with ldap ldap ${EPREFIX}/usr)
-		$(use_with ldap-sasl ldap-sasl ${EPREFIX}/usr)"
-	fi
-
-	# MySQL support
-	if use mysql ; then
-		if use mysqlnd ; then
-			my_conf+="
-			$(use_with mysql mysql mysqlnd)"
-		else
-			my_conf+="
-			$(use_with mysql mysql ${EPREFIX}/usr)"
-		fi
-		my_conf+="
-		$(use_with mysql mysql-sock ${EPREFIX}/var/run/mysqld/mysqld.sock)"
-	fi
-
-	# MySQLi support
-	if use mysqlnd ; then
-		my_conf+="
-		$(use_with mysqli mysqli mysqlnd)"
-	else
-		my_conf+="
-		$(use_with mysqli mysqli ${EPREFIX}/usr/bin/mysql_config)"
-	fi
-
-	# ODBC support
-	if use odbc ; then
-		my_conf+="
-		$(use_with odbc unixODBC ${EPREFIX}/usr)"
-	fi
-
-	if use iodbc ; then
-		my_conf+="
-		$(use_with iodbc iodbc ${EPREFIX}/usr)"
-	fi
-
-	# Oracle support
-	if use oci8-instant-client ; then
-		my_conf+="
-		$(use_with oci8-instant-client oci8)"
-	fi
-
-	# PDO support
-	if use pdo ; then
-		my_conf+="
-		$(use_with mssql pdo-dblib )"
-		if use mysqlnd ; then
-			my_conf+="
-			$(use_with mysqlnd pdo-mysql mysqlnd)"
-		else
-			my_conf+="
-			$(use_with mysql pdo-mysql ${EPREFIX}/usr)"
-		fi
-		my_conf+="
-		$(use_with postgres pdo-pgsql )
-		$(use_with sqlite pdo-sqlite ${EPREFIX}/usr)
-		$(use_with odbc pdo-odbc unixODBC,${EPREFIX}/usr)"
-		if use oci8-instant-client ; then
-			my_conf+="
-			$(use_with oci8-instant-client pdo-oci)"
-		fi
-	fi
-
-	# readline/libedit support
-	my_conf+="
-	$(use_with readline readline ${EPREFIX}/usr)
-	$(use_with libedit libedit ${EPREFIX}/usr)"
-
-	# Session support
-	if use session ; then
-		my_conf+="
-		$(use_with sharedmem mm ${EPREFIX}/usr)"
-	else
-		my_conf+="
-		$(use_enable session session )"
-	fi
-
-	# Use pic for shared modules such as apache2's mod_php
-	my_conf="${my_conf} --with-pic"
-
-	# we use the system copy of pcre
-	# --with-pcre-regex affects ext/pcre
-	# --with-pcre-dir affects ext/filter and ext/zip
-	my_conf="${my_conf} --with-pcre-regex=${EPREFIX}/usr --with-pcre-dir=${EPREFIX}/usr"
-
-	# Catch CFLAGS problems
-	# Fixes bug #14067.
-	# Changed order to run it in reverse for bug #32022 and #12021.
-	replace-cpu-flags "k6*" "i586"
-
-	# Support user-passed configuration parameters
-	my_conf="${my_conf} ${EXTRA_ECONF:-}"
-
-	# Support the Apache2 extras, they must be set globally for all
-	# SAPIs to work correctly, especially for external PHP extensions
-
-	mkdir -p "${WORKDIR}/sapis-build"
-	for one_sapi in $SAPIS ; do
-		use "${one_sapi}" || continue
-		php_set_ini_dir "${one_sapi}"
-
-		cp -r "${S}" "${WORKDIR}/sapis-build/${one_sapi}"
-		cd "${WORKDIR}/sapis-build/${one_sapi}"
-
-		sapi_conf="${my_conf} --with-config-file-path=${PHP_INI_DIR}
-			--with-config-file-scan-dir=${PHP_EXT_INI_DIR_ACTIVE}"
-
-		for sapi in $SAPIS ; do
-			case "$sapi" in
-				cli|cgi|embed|fpm)
-					if [[ "${one_sapi}" == "${sapi}" ]] ; then
-						sapi_conf="${sapi_conf} --enable-${sapi}"
-					else
-						sapi_conf="${sapi_conf} --disable-${sapi}"
-					fi
-					;;
-
-				apache2)
-					if [[ "${one_sapi}" == "${sapi}" ]] ; then
-						sapi_conf="${sapi_conf} --with-apxs2=${EPREFIX}/usr/sbin/apxs"
-					else
-						sapi_conf="${sapi_conf} --without-apxs2"
-					fi
-					;;
-			esac
-		done
-
-		econf ${sapi_conf}
-	done
-}
-
-src_compile() {
-	# snmp seems to run during src_compile, too (bug #324739)
-	addpredict /usr/share/snmp/mibs/.index
-	addpredict /var/lib/net-snmp/mib_indexes
-
-	for sapi in ${SAPIS} ; do
-		if use "${sapi}"; then
-			cd "${WORKDIR}/sapis-build/$sapi" || "Failed to change dir to ${WORKDIR}/sapis-build/$1"
-			emake || die "emake failed"
-		fi
-	done
-}
-
-src_install() {
-	# see bug #324739 for what happens when we don't have that
-	addpredict /usr/share/snmp/mibs/.index
-
-	# grab the first SAPI that got built and install common files from there
-	local first_sapi=""
-	for sapi in $SAPIS ; do
-		if use $sapi ; then
-			first_sapi=$sapi
-			break
-		fi
-	done
-
-	# Makefile forgets to create this before trying to write to it...
-	dodir "${PHP_DESTDIR#${EPREFIX}}/bin"
-
-	# Install php environment (without any sapis)
-	cd "${WORKDIR}/sapis-build/$first_sapi"
-	emake INSTALL_ROOT="${D}" \
-		install-build install-headers install-programs \
-		|| die "emake install failed"
-
-	local extension_dir="$("${ED}/${PHP_DESTDIR#${EPREFIX}}/bin/php-config" --extension-dir)"
-
-	# Create the directory where we'll put version-specific php scripts
-	keepdir /usr/share/php${PHP_MV}
-
-	local sapi="", file=""
-	local sapi_list=""
-
-	for sapi in ${SAPIS}; do
-		if use "${sapi}" ; then
-			einfo "Installing SAPI: ${sapi}"
-			cd "${WORKDIR}/sapis-build/${sapi}"
-
-			if [[ "${sapi}" == "apache2" ]] ; then
-				# We're specifically not using emake install-sapi as libtool
-				# may cause unnecessary relink failures (see bug #351266)
-				insinto "${PHP_DESTDIR#${EPREFIX}}/apache2/"
-				newins ".libs/libphp5$(get_libname)" "libphp${PHP_MV}$(get_libname)"
-				keepdir "/usr/$(get_libdir)/apache2/modules"
-			else
-				# needed each time, php_install_ini would reset it
-				local dest="${PHP_DESTDIR#${EPREFIX}}"
-				into "${dest}"
-				case "$sapi" in
-					cli)
-						source="sapi/cli/php"
-						;;
-					cgi)
-						source="sapi/cgi/php-cgi"
-						;;
-					fpm)
-						source="sapi/fpm/php-fpm"
-						;;
-					embed)
-						source="libs/libphp${PHP_MV}$(get_libname)"
-						;;
-					*)
-						die "unhandled sapi in src_install"
-						;;
-				esac
-
-				if [[ "${source}" == *"$(get_libname)" ]]; then
-					dolib.so "${source}" || die "Unable to install ${sapi} sapi"
-				else
-					dobin "${source}" || die "Unable to install ${sapi} sapi"
-					local name="$(basename ${source})"
-					dosym "${dest}/bin/${name}" "/usr/bin/${name}${SLOT}"
-				fi
-			fi
-
-			php_install_ini "${sapi}"
-
-			# construct correct SAPI string for php-config
-			# thanks to ferringb for the bash voodoo
-			if [[ "${sapi}" == "apache2" ]]; then
-				sapi_list="${sapi_list:+${sapi_list} }apache2handler"
-			else
-				sapi_list="${sapi_list:+${sapi_list} }${sapi}"
-			fi
-		fi
-	done
-
-	# Installing opcache module
-	if use_if_iuse opcache ; then
-		dolib.so "modules/opcache$(get_libname)" || die "Unable to install opcache module"
-	fi
-
-	# Install env.d files
-	newenvd "${FILESDIR}/20php5-envd" \
-		"20php${SLOT}"
-	sed -e "s|/lib/|/$(get_libdir)/|g" -i \
-		"${ED}/etc/env.d/20php${SLOT}"
-	sed -e "s|php5|php${SLOT}|g" -i \
-		"${ED}/etc/env.d/20php${SLOT}"
-
-	# set php-config variable correctly (bug #278439)
-	sed -e "s:^\(php_sapis=\)\".*\"$:\1\"${sapi_list}\":" -i \
-		"${ED}/usr/$(get_libdir)/php${SLOT}/bin/php-config"
-
-	if use fpm ; then
-		if use systemd; then
-			systemd_newunit "${FILESDIR}/php-fpm_at.service" "php-fpm@${SLOT}.service"
-		else
-			systemd_newunit "${FILESDIR}/php-fpm_at-simple.service" "php-fpm@${SLOT}.service"
-		fi
-	fi
-}
-
-src_test() {
-	echo ">>> Test phase [test]: ${CATEGORY}/${PF}"
-	PHP_BIN="${WORKDIR}/sapis-build/cli/sapi/cli/php"
-	if [[ ! -x "${PHP_BIN}" ]] ; then
-		ewarn "Test phase requires USE=cli, skipping"
-		return
-	else
-		export TEST_PHP_EXECUTABLE="${PHP_BIN}"
-	fi
-
-	if [[ -x "${WORKDIR}/sapis/cgi/php-cgi" ]] ; then
-		export TEST_PHP_CGI_EXECUTABLE="${WORKDIR}/sapis/cgi/php-cgi"
-	fi
-
-	REPORT_EXIT_STATUS=1 "${TEST_PHP_EXECUTABLE}" -n  -d "session.save_path=${T}" \
-		"${WORKDIR}/sapis-build/cli/run-tests.php" -n -q -d "session.save_path=${T}"
-
-	for name in ${EXPECTED_TEST_FAILURES}; do
-		mv "${name}.out" "${name}.out.orig" 2>/dev/null
-	done
-
-	local failed="$(find -name '*.out')"
-	if [[ ${failed} != "" ]] ; then
-		ewarn "The following test cases failed unexpectedly:"
-		for name in ${failed}; do
-			ewarn "  ${name/.out/}"
-		done
-	else
-		einfo "No unexpected test failures, all fine"
-	fi
-
-	if [[ ${PHP_SHOW_UNEXPECTED_TEST_PASS} == "1" ]] ; then
-		local passed=""
-		for name in ${EXPECTED_TEST_FAILURES}; do
-			[[ -f "${name}.diff" ]] && continue
-			passed="${passed} ${name}"
-		done
-		if [[ ${passed} != "" ]] ; then
-			einfo "The following test cases passed unexpectedly:"
-			for name in ${passed}; do
-				ewarn "  ${passed}"
-			done
-		else
-			einfo "None of the known-to-fail tests passed, all fine"
-		fi
-	fi
-}
-
-pkg_postinst() {
-	# Output some general info to the user
-	if use apache2 ; then
-		APACHE2_MOD_DEFINE="PHP5"
-		APACHE2_MOD_CONF="70_mod_php5"  # actually provided by app-eselect/eselect-php
-		apache-module_pkg_postinst
-	fi
-
-	# Create the symlinks for php
-	for m in ${SAPIS}; do
-		[[ ${m} == 'embed' ]] && continue;
-		if use $m ; then
-			local ci=$(eselect php show $m)
-			if [[ -z $ci ]]; then
-				eselect php set $m php${SLOT}
-				einfo "Switched ${m} to use php:${SLOT}"
-				einfo
-			elif [[ $ci != "php${SLOT}" ]] ; then
-				elog "To switch $m to use php:${SLOT}, run"
-				elog "    eselect php set $m php${SLOT}"
-				elog
-			fi
-		fi
-	done
-
-	elog "Make sure that PHP_TARGETS in ${EPREFIX}/etc/make.conf includes php${SLOT/./-} in order"
-	elog "to compile extensions for the ${SLOT} ABI"
-	elog
-	if ! use readline && use cli ; then
-		ewarn "Note that in order to use php interactivly, you need to enable"
-		ewarn "the readline USE flag or php -a will hang"
-	fi
-	elog
-	elog "This ebuild installed a version of php.ini based on php.ini-${PHP_INI_VERSION} version."
-	elog "You can chose which version of php.ini to install by default by setting PHP_INI_VERSION to either"
-	elog "'production' or 'development' in ${EPREFIX}/etc/make.conf"
-	elog "Both versions of php.ini can be found in ${EPREFIX}/usr/share/doc/${PF}"
-
-	elog
-	elog "For more details on how minor version slotting works (PHP_TARGETS) please read the upgrade guide:"
-	elog "https://www.gentoo.org/proj/en/php/php-upgrading.xml"
-	elog
-}
-
-pkg_prerm() {
-	eselect php cleanup
-}
diff --git a/dev-lang/php/php-5.4.43.ebuild b/dev-lang/php/php-5.4.43.ebuild
deleted file mode 100644
index 9fc7a1c725bf..000000000000
--- a/dev-lang/php/php-5.4.43.ebuild
+++ /dev/null
@@ -1,802 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils autotools flag-o-matic versionator depend.apache apache-module db-use libtool systemd
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-
-function php_get_uri ()
-{
-	case "${1}" in
-		"php-pre")
-			echo "http://downloads.php.net/stas/${2}"
-		;;
-		"php")
-			echo "http://www.php.net/distributions/${2}"
-		;;
-		"olemarkus")
-			echo "https://dev.gentoo.org/~olemarkus/php/${2}"
-		;;
-		"gentoo")
-			echo "mirror://gentoo/${2}"
-		;;
-		*)
-			die "unhandled case in php_get_uri"
-		;;
-	esac
-}
-
-PHP_MV="$(get_major_version)"
-SLOT="$(get_version_component_range 1-2)"
-
-# alias, so we can handle different types of releases (finals, rcs, alphas,
-# betas, ...) w/o changing the whole ebuild
-PHP_PV="${PV/_rc/RC}"
-PHP_PV="${PHP_PV/_alpha/alpha}"
-PHP_PV="${PHP_PV/_beta/beta}"
-PHP_RELEASE="php"
-[[ ${PV} == ${PV/_alpha/} ]] || PHP_RELEASE="php-pre"
-[[ ${PV} == ${PV/_beta/} ]] || PHP_RELEASE="php-pre"
-[[ ${PV} == ${PV/_rc/} ]] || PHP_RELEASE="php-pre"
-PHP_P="${PN}-${PHP_PV}"
-
-PHP_PATCHSET_LOC="olemarkus"
-
-PHP_SRC_URI="$(php_get_uri "${PHP_RELEASE}" "${PHP_P}.tar.bz2")"
-
-PHP_PATCHSET="2"
-PHP_PATCHSET_URI="
-	$(php_get_uri "${PHP_PATCHSET_LOC}" "php-patchset-${SLOT}-r${PHP_PATCHSET}.tar.bz2")"
-
-PHP_FPM_INIT_VER="4"
-PHP_FPM_CONF_VER="1"
-
-SRC_URI="
-	${PHP_SRC_URI}
-	${PHP_PATCHSET_URI}"
-
-DESCRIPTION="The PHP language runtime engine: CLI, CGI, FPM/FastCGI, Apache2 and embed SAPIs"
-HOMEPAGE="http://php.net/"
-LICENSE="PHP-3"
-
-S="${WORKDIR}/${PHP_P}"
-
-# We can build the following SAPIs in the given order
-SAPIS="embed cli cgi fpm apache2"
-
-# SAPIs and SAPI-specific USE flags (cli SAPI is default on):
-IUSE="${IUSE}
-	${SAPIS/cli/+cli}
-	threads"
-
-IUSE="${IUSE} bcmath berkdb bzip2 calendar cdb cjk
-	crypt +ctype curl curlwrappers debug
-	enchant exif +fileinfo +filter firebird
-	flatfile ftp gd gdbm gmp +hash +iconv imap inifile
-	intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit mhash
-	mssql mysql mysqlnd mysqli nls
-	oci8-instant-client odbc pcntl pdo +phar +posix postgres qdbm
-	readline recode selinux +session sharedmem
-	+simplexml snmp soap sockets spell sqlite ssl
-	sybase-ct sysvipc systemd tidy +tokenizer truetype unicode wddx
-	+xml xmlreader xmlwriter xmlrpc xpm xslt zip zlib"
-
-DEPEND="
-	>=app-eselect/eselect-php-0.7.1-r3[apache2?,fpm?]
-	>=dev-libs/libpcre-8.32[unicode]
-	apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=]
-		<www-servers/apache-2.4[threads=] ) )
-	berkdb? ( =sys-libs/db-4* )
-	bzip2? ( app-arch/bzip2 )
-	cdb? ( || ( dev-db/cdb dev-db/tinycdb ) )
-	cjk? ( !gd? (
-		virtual/jpeg:0
-		media-libs/libpng:0=
-		sys-libs/zlib
-	) )
-	crypt? ( >=dev-libs/libmcrypt-2.4 )
-	curl? ( >=net-misc/curl-7.10.5 )
-	enchant? ( app-text/enchant )
-	exif? ( !gd? (
-		virtual/jpeg:0
-		media-libs/libpng:0=
-		sys-libs/zlib
-	) )
-	firebird? ( dev-db/firebird )
-	gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib )
-	gdbm? ( >=sys-libs/gdbm-1.8.0 )
-	gmp? ( >=dev-libs/gmp-4.1.2 )
-	iconv? ( virtual/libiconv )
-	imap? ( virtual/imap-c-client[ssl=] )
-	intl? ( dev-libs/icu:= )
-	iodbc? ( dev-db/libiodbc )
-	kerberos? ( virtual/krb5 )
-	ldap? ( >=net-nds/openldap-1.2.11 )
-	ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 )
-	libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) )
-	mssql? ( dev-db/freetds[mssql] )
-	!mysqlnd? (
-		mysql? ( virtual/mysql )
-		mysqli? ( >=virtual/mysql-4.1 )
-	)
-	nls? ( sys-devel/gettext )
-	oci8-instant-client? ( dev-db/oracle-instantclient-basic )
-	odbc? ( >=dev-db/unixODBC-1.8.13 )
-	postgres? ( dev-db/postgresql )
-	qdbm? ( dev-db/qdbm )
-	readline? ( sys-libs/readline )
-	recode? ( app-text/recode )
-	sharedmem? ( dev-libs/mm )
-	simplexml? ( >=dev-libs/libxml2-2.6.8 )
-	snmp? ( >=net-analyzer/net-snmp-5.2 )
-	soap? ( >=dev-libs/libxml2-2.6.8 )
-	spell? ( >=app-text/aspell-0.50 )
-	sqlite? ( >=dev-db/sqlite-3.7.6.3 )
-	ssl? ( >=dev-libs/openssl-0.9.7 )
-	sybase-ct? ( dev-db/freetds )
-	tidy? ( app-text/htmltidy )
-	truetype? (
-		=media-libs/freetype-2*
-		>=media-libs/t1lib-5.0.0
-		!gd? (
-			virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib )
-	)
-	unicode? ( dev-libs/oniguruma )
-	wddx? ( >=dev-libs/libxml2-2.6.8 )
-	xml? ( >=dev-libs/libxml2-2.6.8 )
-	xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv )
-	xmlreader? ( >=dev-libs/libxml2-2.6.8 )
-	xmlwriter? ( >=dev-libs/libxml2-2.6.8 )
-	xpm? (
-		x11-libs/libXpm
-		virtual/jpeg:0
-		media-libs/libpng:0= sys-libs/zlib
-	)
-	xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 )
-	zip? ( sys-libs/zlib )
-	zlib? ( sys-libs/zlib )
-	virtual/mta
-"
-
-php="=${CATEGORY}/${PF}"
-
-REQUIRED_USE="
-	truetype? ( gd )
-	cjk? ( gd )
-	exif? ( gd )
-
-	xpm? ( gd )
-	gd? ( zlib )
-	simplexml? ( xml )
-	soap? ( xml )
-	wddx? ( xml )
-	xmlrpc? ( || ( xml iconv ) )
-	xmlreader? ( xml )
-	xslt? ( xml )
-	ldap-sasl? ( ldap )
-	mhash? ( hash )
-	phar? ( hash )
-	mysqlnd? ( || (
-		mysql
-		mysqli
-		pdo
-	) )
-
-	qdbm? ( !gdbm )
-	readline? ( !libedit )
-	recode? ( !imap !mysql !mysqli )
-	sharedmem? ( !threads )
-
-	!cli? ( !cgi? ( !fpm? ( !apache2? ( !embed? ( cli ) ) ) ) )"
-
-RDEPEND="${DEPEND}"
-
-RDEPEND="${RDEPEND}
-	fpm? (
-		selinux? ( sec-policy/selinux-phpfpm )
-		systemd? ( sys-apps/systemd ) )"
-
-DEPEND="${DEPEND}
-	sys-devel/flex
-	>=sys-devel/m4-1.4.3
-	>=sys-devel/libtool-1.5.18"
-
-# Allow users to install production version if they want to
-
-case "${PHP_INI_VERSION}" in
-	production|development)
-		;;
-	*)
-		PHP_INI_VERSION="development"
-		;;
-esac
-
-PHP_INI_UPSTREAM="php.ini-${PHP_INI_VERSION}"
-PHP_INI_FILE="php.ini"
-
-want_apache
-
-pkg_setup() {
-	depend.apache_pkg_setup
-}
-
-php_install_ini() {
-	local phpsapi="${1}"
-
-	# work out where we are installing the ini file
-	php_set_ini_dir "${phpsapi}"
-
-	local phpinisrc="${PHP_INI_UPSTREAM}-${phpsapi}"
-	cp "${PHP_INI_UPSTREAM}" "${phpinisrc}"
-
-	# default to /tmp for save_path, bug #282768
-	sed -e 's|^;session.save_path .*$|session.save_path = "'"${EPREFIX}"'/tmp"|g' -i "${phpinisrc}"
-
-	# Set the extension dir
-	sed -e "s|^extension_dir .*$|extension_dir = ${extension_dir}|g" -i "${phpinisrc}"
-
-	# Set the include path to point to where we want to find PEAR packages
-	sed -e 's|^;include_path = ".:/php/includes".*|include_path = ".:'"${EPREFIX}"'/usr/share/php'${PHP_MV}':'"${EPREFIX}"'/usr/share/php"|' -i "${phpinisrc}"
-
-	if use_if_iuse opcache; then
-		elog "Adding opcache to ${phpinisrc}"
-		echo "zend_extension=${PHP_DESTDIR}/$(get_libdir)/opcache.so" >> ${phpinisrc}
-	fi
-
-	dodir "${PHP_INI_DIR#${EPREFIX}}"
-	insinto "${PHP_INI_DIR#${EPREFIX}}"
-	newins "${phpinisrc}" "${PHP_INI_FILE}"
-
-	elog "Installing php.ini for ${phpsapi} into ${PHP_INI_DIR#${EPREFIX}}"
-	elog
-
-	dodir "${PHP_EXT_INI_DIR#${EPREFIX}}"
-	dodir "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}"
-
-	# SAPI-specific handling
-
-	if [[ "${sapi}" == "fpm" ]] ; then
-		[[ -z ${PHP_FPM_CONF_VER} ]] && PHP_FPM_CONF_VER=0
-		einfo "Installing FPM CGI config file php-fpm.conf"
-		insinto "${PHP_INI_DIR#${EPREFIX}}"
-		newins "${FILESDIR}/php-fpm-r${PHP_FPM_CONF_VER}.conf" php-fpm.conf
-
-		# Remove bogus /etc/php-fpm.conf.default (bug 359906)
-		[[ -f "${ED}/etc/php-fpm.conf.default" ]] && rm "${ED}/etc/php-fpm.conf.default"
-	fi
-
-	# Install PHP ini files into /usr/share/php
-
-	dodoc php.ini-development
-	dodoc php.ini-production
-
-}
-
-php_set_ini_dir() {
-	PHP_INI_DIR="${EPREFIX}/etc/php/${1}-php${SLOT}"
-	PHP_EXT_INI_DIR="${PHP_INI_DIR}/ext"
-	PHP_EXT_INI_DIR_ACTIVE="${PHP_INI_DIR}/ext-active"
-}
-
-src_prepare() {
-	# USE=sharedmem (session/mod_mm to be exact) tries to mmap() this path
-	# ([empty session.save_path]/session_mm_[sapi][gid].sem)
-	# there is no easy way to circumvent that, all php calls during
-	# install use -n, so no php.ini file will be used.
-	# As such, this is the easiest way to get around
-	addpredict /session_mm_cli250.sem
-	addpredict /session_mm_cli0.sem
-
-	# Change PHP branding
-	# Get the alpha/beta/rc version
-	sed -re	"s|^(PHP_EXTRA_VERSION=\").*(\")|\1-pl${PR/r/}-gentoo\2|g" \
-		-i configure.in || die "Unable to change PHP branding"
-
-	# Patch PHP to show Gentoo as the server platform
-	sed -e 's/PHP_UNAME=`uname -a | xargs`/PHP_UNAME=`uname -s -n -r -v | xargs`/g' \
-		-i configure.in || die "Failed to fix server platform name"
-
-	# Prevent PHP from activating the Apache config,
-	# as we will do that ourselves
-	sed -i \
-		-e "s,-i -a -n php${PHP_MV},-i -n php${PHP_MV},g" \
-		-e "s,-i -A -n php${PHP_MV},-i -n php${PHP_MV},g" \
-		configure sapi/apache2filter/config.m4 sapi/apache2handler/config.m4
-
-	# Patch PHP to support heimdal instead of mit-krb5
-	if has_version "app-crypt/heimdal" ; then
-		sed -e 's|gssapi_krb5|gssapi|g' -i acinclude.m4 \
-			|| die "Failed to fix heimdal libname"
-		sed -e 's|PHP_ADD_LIBRARY(k5crypto, 1, $1)||g' -i acinclude.m4 \
-			|| die "Failed to fix heimdal crypt library reference"
-	fi
-
-	#Add user patches #357637
-	epatch_user
-
-	#force rebuilding aclocal.m4
-	rm aclocal.m4
-	eautoreconf
-
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		# http://bugs.php.net/bug.php?id=48795, bug #343481
-		sed -i -e '/BUILD_CGI="\\$(CC)/s/CC/CXX/' configure || die
-	fi
-}
-
-src_configure() {
-	addpredict /usr/share/snmp/mibs/.index
-	addpredict /var/lib/net-snmp/mib_indexes
-
-	PHP_DESTDIR="${EPREFIX}/usr/$(get_libdir)/php${SLOT}"
-
-	# This is a global variable and should be in caps. It isn't because the
-	# phpconfutils eclass relies on exactly this name...
-	# for --with-libdir see bug #327025
-	my_conf="
-		--prefix="${PHP_DESTDIR}"
-		--mandir="${PHP_DESTDIR}"/man
-		--infodir="${PHP_DESTDIR}"/info
-		--libdir="${PHP_DESTDIR}"/lib
-		--with-libdir=$(get_libdir)
-		--without-pear
-		$(use_enable threads maintainer-zts)"
-
-	#                             extension		  USE flag        shared
-	my_conf+="
-	$(use_enable bcmath bcmath )
-	$(use_with bzip2 bz2 "${EPREFIX}"/usr)
-	$(use_enable calendar calendar )
-	$(use_enable ctype ctype )
-	$(use_with curl curl "${EPREFIX}"/usr)
-	$(use_with curlwrappers curlwrappers "${EPREFIX}"/usr)
-	$(use_enable xml dom )
-	$(use_with enchant enchant "${EPREFIX}"/usr)
-	$(use_enable exif exif )
-	$(use_enable fileinfo fileinfo )
-	$(use_enable filter filter )
-	$(use_enable ftp ftp )
-	$(use_with nls gettext "${EPREFIX}"/usr)
-	$(use_with gmp gmp "${EPREFIX}"/usr)
-	$(use_enable hash hash )
-	$(use_with mhash mhash "${EPREFIX}"/usr)
-	$(use_with iconv iconv $(use elibc_glibc || use elibc_musl || echo "${EPREFIX}"/usr))
-	$(use_enable intl intl )
-	$(use_enable ipv6 ipv6 )
-	$(use_enable json json )
-	$(use_with kerberos kerberos "${EPREFIX}"/usr)
-	$(use_enable xml libxml )
-	$(use_with xml libxml-dir "${EPREFIX}"/usr)
-	$(use_enable unicode mbstring )
-	$(use_with crypt mcrypt "${EPREFIX}"/usr)
-	$(use_with mssql mssql "${EPREFIX}"/usr)
-	$(use_with unicode onig "${EPREFIX}"/usr)
-	$(use_with ssl openssl "${EPREFIX}"/usr)
-	$(use_with ssl openssl-dir "${EPREFIX}"/usr)
-	$(use_enable pcntl pcntl )
-	$(use_enable phar phar )
-	$(use_enable pdo pdo )
-	$(use_with postgres pgsql "${EPREFIX}"/usr)
-	$(use_enable posix posix )
-	$(use_with spell pspell "${EPREFIX}"/usr)
-	$(use_with recode recode "${EPREFIX}"/usr)
-	$(use_enable simplexml simplexml )
-	$(use_enable sharedmem shmop )
-	$(use_with snmp snmp "${EPREFIX}"/usr)
-	$(use_enable soap soap )
-	$(use_enable sockets sockets )
-	$(use_with sqlite sqlite3 "${EPREFIX}"/usr)
-	$(use_with sybase-ct sybase-ct "${EPREFIX}"/usr)
-	$(use_enable sysvipc sysvmsg )
-	$(use_enable sysvipc sysvsem )
-	$(use_enable sysvipc sysvshm )
-	$(use_with systemd fpm-systemd)
-	$(use_with tidy tidy "${EPREFIX}"/usr)
-	$(use_enable tokenizer tokenizer )
-	$(use_enable wddx wddx )
-	$(use_enable xml xml )
-	$(use_enable xmlreader xmlreader )
-	$(use_enable xmlwriter xmlwriter )
-	$(use_with xmlrpc xmlrpc)
-	$(use_with xslt xsl "${EPREFIX}"/usr)
-	$(use_enable zip zip )
-	$(use_with zlib zlib "${EPREFIX}"/usr)
-	$(use_enable debug debug )"
-
-	# DBA support
-	if use cdb || use berkdb || use flatfile || use gdbm || use inifile \
-		|| use qdbm ; then
-		my_conf="${my_conf} --enable-dba${shared}"
-	fi
-
-	# DBA drivers support
-	my_conf+="
-	$(use_with cdb cdb)
-	$(use_with berkdb db4 ${EPREFIX}/usr)
-	$(use_enable flatfile flatfile )
-	$(use_with gdbm gdbm ${EPREFIX}/usr)
-	$(use_enable inifile inifile )
-	$(use_with qdbm qdbm ${EPREFIX}/usr)"
-
-	# Support for the GD graphics library
-	my_conf+="
-	$(use_with truetype freetype-dir ${EPREFIX}/usr)
-	$(use_with truetype t1lib ${EPREFIX}/usr)
-	$(use_enable cjk gd-jis-conv )
-	$(use_with gd jpeg-dir ${EPREFIX}/usr)
-	$(use_with gd png-dir ${EPREFIX}/usr)
-	$(use_with xpm xpm-dir ${EPREFIX}/usr)"
-	# enable gd last, so configure can pick up the previous settings
-	my_conf+="
-	$(use_with gd gd)"
-
-	# IMAP support
-	if use imap ; then
-		my_conf+="
-		$(use_with imap imap ${EPREFIX}/usr)
-		$(use_with ssl imap-ssl ${EPREFIX}/usr)"
-	fi
-
-	# Interbase/firebird support
-
-	if use firebird ; then
-		my_conf+="
-		$(use_with firebird interbase ${EPREFIX}/usr)"
-	fi
-
-	# LDAP support
-	if use ldap ; then
-		my_conf+="
-		$(use_with ldap ldap ${EPREFIX}/usr)
-		$(use_with ldap-sasl ldap-sasl ${EPREFIX}/usr)"
-	fi
-
-	# MySQL support
-	if use mysql ; then
-		if use mysqlnd ; then
-			my_conf+="
-			$(use_with mysql mysql mysqlnd)"
-		else
-			my_conf+="
-			$(use_with mysql mysql ${EPREFIX}/usr)"
-		fi
-		my_conf+="
-		$(use_with mysql mysql-sock ${EPREFIX}/var/run/mysqld/mysqld.sock)"
-	fi
-
-	# MySQLi support
-	if use mysqlnd ; then
-		my_conf+="
-		$(use_with mysqli mysqli mysqlnd)"
-	else
-		my_conf+="
-		$(use_with mysqli mysqli ${EPREFIX}/usr/bin/mysql_config)"
-	fi
-
-	# ODBC support
-	if use odbc ; then
-		my_conf+="
-		$(use_with odbc unixODBC ${EPREFIX}/usr)"
-	fi
-
-	if use iodbc ; then
-		my_conf+="
-		$(use_with iodbc iodbc ${EPREFIX}/usr)"
-	fi
-
-	# Oracle support
-	if use oci8-instant-client ; then
-		my_conf+="
-		$(use_with oci8-instant-client oci8)"
-	fi
-
-	# PDO support
-	if use pdo ; then
-		my_conf+="
-		$(use_with mssql pdo-dblib )"
-		if use mysqlnd ; then
-			my_conf+="
-			$(use_with mysqlnd pdo-mysql mysqlnd)"
-		else
-			my_conf+="
-			$(use_with mysql pdo-mysql ${EPREFIX}/usr)"
-		fi
-		my_conf+="
-		$(use_with postgres pdo-pgsql )
-		$(use_with sqlite pdo-sqlite ${EPREFIX}/usr)
-		$(use_with odbc pdo-odbc unixODBC,${EPREFIX}/usr)"
-		if use oci8-instant-client ; then
-			my_conf+="
-			$(use_with oci8-instant-client pdo-oci)"
-		fi
-	fi
-
-	# readline/libedit support
-	my_conf+="
-	$(use_with readline readline ${EPREFIX}/usr)
-	$(use_with libedit libedit ${EPREFIX}/usr)"
-
-	# Session support
-	if use session ; then
-		my_conf+="
-		$(use_with sharedmem mm ${EPREFIX}/usr)"
-	else
-		my_conf+="
-		$(use_enable session session )"
-	fi
-
-	# Use pic for shared modules such as apache2's mod_php
-	my_conf="${my_conf} --with-pic"
-
-	# we use the system copy of pcre
-	# --with-pcre-regex affects ext/pcre
-	# --with-pcre-dir affects ext/filter and ext/zip
-	my_conf="${my_conf} --with-pcre-regex=${EPREFIX}/usr --with-pcre-dir=${EPREFIX}/usr"
-
-	# Catch CFLAGS problems
-	# Fixes bug #14067.
-	# Changed order to run it in reverse for bug #32022 and #12021.
-	replace-cpu-flags "k6*" "i586"
-
-	# Support user-passed configuration parameters
-	my_conf="${my_conf} ${EXTRA_ECONF:-}"
-
-	# Support the Apache2 extras, they must be set globally for all
-	# SAPIs to work correctly, especially for external PHP extensions
-
-	mkdir -p "${WORKDIR}/sapis-build"
-	for one_sapi in $SAPIS ; do
-		use "${one_sapi}" || continue
-		php_set_ini_dir "${one_sapi}"
-
-		cp -r "${S}" "${WORKDIR}/sapis-build/${one_sapi}"
-		cd "${WORKDIR}/sapis-build/${one_sapi}"
-
-		sapi_conf="${my_conf} --with-config-file-path=${PHP_INI_DIR}
-			--with-config-file-scan-dir=${PHP_EXT_INI_DIR_ACTIVE}"
-
-		for sapi in $SAPIS ; do
-			case "$sapi" in
-				cli|cgi|embed|fpm)
-					if [[ "${one_sapi}" == "${sapi}" ]] ; then
-						sapi_conf="${sapi_conf} --enable-${sapi}"
-					else
-						sapi_conf="${sapi_conf} --disable-${sapi}"
-					fi
-					;;
-
-				apache2)
-					if [[ "${one_sapi}" == "${sapi}" ]] ; then
-						sapi_conf="${sapi_conf} --with-apxs2=${EPREFIX}/usr/sbin/apxs"
-					else
-						sapi_conf="${sapi_conf} --without-apxs2"
-					fi
-					;;
-			esac
-		done
-
-		econf ${sapi_conf}
-	done
-}
-
-src_compile() {
-	# snmp seems to run during src_compile, too (bug #324739)
-	addpredict /usr/share/snmp/mibs/.index
-	addpredict /var/lib/net-snmp/mib_indexes
-
-	for sapi in ${SAPIS} ; do
-		if use "${sapi}"; then
-			cd "${WORKDIR}/sapis-build/$sapi" || "Failed to change dir to ${WORKDIR}/sapis-build/$1"
-			emake || die "emake failed"
-		fi
-	done
-}
-
-src_install() {
-	# see bug #324739 for what happens when we don't have that
-	addpredict /usr/share/snmp/mibs/.index
-
-	# grab the first SAPI that got built and install common files from there
-	local first_sapi=""
-	for sapi in $SAPIS ; do
-		if use $sapi ; then
-			first_sapi=$sapi
-			break
-		fi
-	done
-
-	# Makefile forgets to create this before trying to write to it...
-	dodir "${PHP_DESTDIR#${EPREFIX}}/bin"
-
-	# Install php environment (without any sapis)
-	cd "${WORKDIR}/sapis-build/$first_sapi"
-	emake INSTALL_ROOT="${D}" \
-		install-build install-headers install-programs \
-		|| die "emake install failed"
-
-	local extension_dir="$("${ED}/${PHP_DESTDIR#${EPREFIX}}/bin/php-config" --extension-dir)"
-
-	# Create the directory where we'll put version-specific php scripts
-	keepdir /usr/share/php${PHP_MV}
-
-	local sapi="", file=""
-	local sapi_list=""
-
-	for sapi in ${SAPIS}; do
-		if use "${sapi}" ; then
-			einfo "Installing SAPI: ${sapi}"
-			cd "${WORKDIR}/sapis-build/${sapi}"
-
-			if [[ "${sapi}" == "apache2" ]] ; then
-				# We're specifically not using emake install-sapi as libtool
-				# may cause unnecessary relink failures (see bug #351266)
-				insinto "${PHP_DESTDIR#${EPREFIX}}/apache2/"
-				newins ".libs/libphp5$(get_libname)" "libphp${PHP_MV}$(get_libname)"
-				keepdir "/usr/$(get_libdir)/apache2/modules"
-			else
-				# needed each time, php_install_ini would reset it
-				local dest="${PHP_DESTDIR#${EPREFIX}}"
-				into "${dest}"
-				case "$sapi" in
-					cli)
-						source="sapi/cli/php"
-						;;
-					cgi)
-						source="sapi/cgi/php-cgi"
-						;;
-					fpm)
-						source="sapi/fpm/php-fpm"
-						;;
-					embed)
-						source="libs/libphp${PHP_MV}$(get_libname)"
-						;;
-					*)
-						die "unhandled sapi in src_install"
-						;;
-				esac
-
-				if [[ "${source}" == *"$(get_libname)" ]]; then
-					dolib.so "${source}" || die "Unable to install ${sapi} sapi"
-				else
-					dobin "${source}" || die "Unable to install ${sapi} sapi"
-					local name="$(basename ${source})"
-					dosym "${dest}/bin/${name}" "/usr/bin/${name}${SLOT}"
-				fi
-			fi
-
-			php_install_ini "${sapi}"
-
-			# construct correct SAPI string for php-config
-			# thanks to ferringb for the bash voodoo
-			if [[ "${sapi}" == "apache2" ]]; then
-				sapi_list="${sapi_list:+${sapi_list} }apache2handler"
-			else
-				sapi_list="${sapi_list:+${sapi_list} }${sapi}"
-			fi
-		fi
-	done
-
-	# Installing opcache module
-	if use_if_iuse opcache ; then
-		dolib.so "modules/opcache$(get_libname)" || die "Unable to install opcache module"
-	fi
-
-	# Install env.d files
-	newenvd "${FILESDIR}/20php5-envd" \
-		"20php${SLOT}"
-	sed -e "s|/lib/|/$(get_libdir)/|g" -i \
-		"${ED}/etc/env.d/20php${SLOT}"
-	sed -e "s|php5|php${SLOT}|g" -i \
-		"${ED}/etc/env.d/20php${SLOT}"
-
-	# set php-config variable correctly (bug #278439)
-	sed -e "s:^\(php_sapis=\)\".*\"$:\1\"${sapi_list}\":" -i \
-		"${ED}/usr/$(get_libdir)/php${SLOT}/bin/php-config"
-
-	if use fpm ; then
-		if use systemd; then
-			systemd_newunit "${FILESDIR}/php-fpm_at.service" "php-fpm@${SLOT}.service"
-		else
-			systemd_newunit "${FILESDIR}/php-fpm_at-simple.service" "php-fpm@${SLOT}.service"
-		fi
-	fi
-}
-
-src_test() {
-	echo ">>> Test phase [test]: ${CATEGORY}/${PF}"
-	PHP_BIN="${WORKDIR}/sapis-build/cli/sapi/cli/php"
-	if [[ ! -x "${PHP_BIN}" ]] ; then
-		ewarn "Test phase requires USE=cli, skipping"
-		return
-	else
-		export TEST_PHP_EXECUTABLE="${PHP_BIN}"
-	fi
-
-	if [[ -x "${WORKDIR}/sapis/cgi/php-cgi" ]] ; then
-		export TEST_PHP_CGI_EXECUTABLE="${WORKDIR}/sapis/cgi/php-cgi"
-	fi
-
-	REPORT_EXIT_STATUS=1 "${TEST_PHP_EXECUTABLE}" -n  -d "session.save_path=${T}" \
-		"${WORKDIR}/sapis-build/cli/run-tests.php" -n -q -d "session.save_path=${T}"
-
-	for name in ${EXPECTED_TEST_FAILURES}; do
-		mv "${name}.out" "${name}.out.orig" 2>/dev/null
-	done
-
-	local failed="$(find -name '*.out')"
-	if [[ ${failed} != "" ]] ; then
-		ewarn "The following test cases failed unexpectedly:"
-		for name in ${failed}; do
-			ewarn "  ${name/.out/}"
-		done
-	else
-		einfo "No unexpected test failures, all fine"
-	fi
-
-	if [[ ${PHP_SHOW_UNEXPECTED_TEST_PASS} == "1" ]] ; then
-		local passed=""
-		for name in ${EXPECTED_TEST_FAILURES}; do
-			[[ -f "${name}.diff" ]] && continue
-			passed="${passed} ${name}"
-		done
-		if [[ ${passed} != "" ]] ; then
-			einfo "The following test cases passed unexpectedly:"
-			for name in ${passed}; do
-				ewarn "  ${passed}"
-			done
-		else
-			einfo "None of the known-to-fail tests passed, all fine"
-		fi
-	fi
-}
-
-pkg_postinst() {
-	# Output some general info to the user
-	if use apache2 ; then
-		APACHE2_MOD_DEFINE="PHP5"
-		APACHE2_MOD_CONF="70_mod_php5"  # actually provided by app-eselect/eselect-php
-		apache-module_pkg_postinst
-	fi
-
-	# Create the symlinks for php
-	for m in ${SAPIS}; do
-		[[ ${m} == 'embed' ]] && continue;
-		if use $m ; then
-			local ci=$(eselect php show $m)
-			if [[ -z $ci ]]; then
-				eselect php set $m php${SLOT}
-				einfo "Switched ${m} to use php:${SLOT}"
-				einfo
-			elif [[ $ci != "php${SLOT}" ]] ; then
-				elog "To switch $m to use php:${SLOT}, run"
-				elog "    eselect php set $m php${SLOT}"
-				elog
-			fi
-		fi
-	done
-
-	elog "Make sure that PHP_TARGETS in ${EPREFIX}/etc/make.conf includes php${SLOT/./-} in order"
-	elog "to compile extensions for the ${SLOT} ABI"
-	elog
-	if ! use readline && use cli ; then
-		ewarn "Note that in order to use php interactivly, you need to enable"
-		ewarn "the readline USE flag or php -a will hang"
-	fi
-	elog
-	elog "This ebuild installed a version of php.ini based on php.ini-${PHP_INI_VERSION} version."
-	elog "You can chose which version of php.ini to install by default by setting PHP_INI_VERSION to either"
-	elog "'production' or 'development' in ${EPREFIX}/etc/make.conf"
-	elog "Both versions of php.ini can be found in ${EPREFIX}/usr/share/doc/${PF}"
-
-	elog
-	elog "For more details on how minor version slotting works (PHP_TARGETS) please read the upgrade guide:"
-	elog "https://www.gentoo.org/proj/en/php/php-upgrading.xml"
-	elog
-}
-
-pkg_prerm() {
-	eselect php cleanup
-}
diff --git a/dev-lang/php/php-5.4.44.ebuild b/dev-lang/php/php-5.4.44.ebuild
index 31424bf7f250..1f6f585ab9d2 100644
--- a/dev-lang/php/php-5.4.44.ebuild
+++ b/dev-lang/php/php-5.4.44.ebuild
@@ -6,7 +6,7 @@ EAPI=5
 
 inherit eutils autotools flag-o-matic versionator depend.apache apache-module db-use libtool systemd
 
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 
 function php_get_uri ()
 {
diff --git a/dev-lang/php/php-5.4.45.ebuild b/dev-lang/php/php-5.4.45.ebuild
new file mode 100644
index 000000000000..71abdd3914a2
--- /dev/null
+++ b/dev-lang/php/php-5.4.45.ebuild
@@ -0,0 +1,802 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils autotools flag-o-matic versionator depend.apache apache-module db-use libtool systemd
+
+KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+
+function php_get_uri ()
+{
+	case "${1}" in
+		"php-pre")
+			echo "http://downloads.php.net/stas/${2}"
+		;;
+		"php")
+			echo "http://www.php.net/distributions/${2}"
+		;;
+		"olemarkus")
+			echo "https://dev.gentoo.org/~olemarkus/php/${2}"
+		;;
+		"gentoo")
+			echo "mirror://gentoo/${2}"
+		;;
+		*)
+			die "unhandled case in php_get_uri"
+		;;
+	esac
+}
+
+PHP_MV="$(get_major_version)"
+SLOT="$(get_version_component_range 1-2)"
+
+# alias, so we can handle different types of releases (finals, rcs, alphas,
+# betas, ...) w/o changing the whole ebuild
+PHP_PV="${PV/_rc/RC}"
+PHP_PV="${PHP_PV/_alpha/alpha}"
+PHP_PV="${PHP_PV/_beta/beta}"
+PHP_RELEASE="php"
+[[ ${PV} == ${PV/_alpha/} ]] || PHP_RELEASE="php-pre"
+[[ ${PV} == ${PV/_beta/} ]] || PHP_RELEASE="php-pre"
+[[ ${PV} == ${PV/_rc/} ]] || PHP_RELEASE="php-pre"
+PHP_P="${PN}-${PHP_PV}"
+
+PHP_PATCHSET_LOC="olemarkus"
+
+PHP_SRC_URI="$(php_get_uri "${PHP_RELEASE}" "${PHP_P}.tar.bz2")"
+
+PHP_PATCHSET="2"
+PHP_PATCHSET_URI="
+	$(php_get_uri "${PHP_PATCHSET_LOC}" "php-patchset-${SLOT}-r${PHP_PATCHSET}.tar.bz2")"
+
+PHP_FPM_INIT_VER="4"
+PHP_FPM_CONF_VER="1"
+
+SRC_URI="
+	${PHP_SRC_URI}
+	${PHP_PATCHSET_URI}"
+
+DESCRIPTION="The PHP language runtime engine: CLI, CGI, FPM/FastCGI, Apache2 and embed SAPIs"
+HOMEPAGE="http://php.net/"
+LICENSE="PHP-3"
+
+S="${WORKDIR}/${PHP_P}"
+
+# We can build the following SAPIs in the given order
+SAPIS="embed cli cgi fpm apache2"
+
+# SAPIs and SAPI-specific USE flags (cli SAPI is default on):
+IUSE="${IUSE}
+	${SAPIS/cli/+cli}
+	threads"
+
+IUSE="${IUSE} bcmath berkdb bzip2 calendar cdb cjk
+	crypt +ctype curl curlwrappers debug
+	enchant exif +fileinfo +filter firebird
+	flatfile ftp gd gdbm gmp +hash +iconv imap inifile
+	intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit mhash
+	mssql mysql mysqlnd mysqli nls
+	oci8-instant-client odbc pcntl pdo +phar +posix postgres qdbm
+	readline recode selinux +session sharedmem
+	+simplexml snmp soap sockets spell sqlite ssl
+	sybase-ct sysvipc systemd tidy +tokenizer truetype unicode wddx
+	+xml xmlreader xmlwriter xmlrpc xpm xslt zip zlib"
+
+DEPEND="
+	>=app-eselect/eselect-php-0.7.1-r3[apache2?,fpm?]
+	>=dev-libs/libpcre-8.32[unicode]
+	apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=]
+		<www-servers/apache-2.4[threads=] ) )
+	berkdb? ( =sys-libs/db-4* )
+	bzip2? ( app-arch/bzip2 )
+	cdb? ( || ( dev-db/cdb dev-db/tinycdb ) )
+	cjk? ( !gd? (
+		virtual/jpeg:0
+		media-libs/libpng:0=
+		sys-libs/zlib
+	) )
+	crypt? ( >=dev-libs/libmcrypt-2.4 )
+	curl? ( >=net-misc/curl-7.10.5 )
+	enchant? ( app-text/enchant )
+	exif? ( !gd? (
+		virtual/jpeg:0
+		media-libs/libpng:0=
+		sys-libs/zlib
+	) )
+	firebird? ( dev-db/firebird )
+	gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib )
+	gdbm? ( >=sys-libs/gdbm-1.8.0 )
+	gmp? ( >=dev-libs/gmp-4.1.2 )
+	iconv? ( virtual/libiconv )
+	imap? ( virtual/imap-c-client[ssl=] )
+	intl? ( dev-libs/icu:= )
+	iodbc? ( dev-db/libiodbc )
+	kerberos? ( virtual/krb5 )
+	ldap? ( >=net-nds/openldap-1.2.11 )
+	ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 )
+	libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) )
+	mssql? ( dev-db/freetds[mssql] )
+	!mysqlnd? (
+		mysql? ( virtual/mysql )
+		mysqli? ( >=virtual/mysql-4.1 )
+	)
+	nls? ( sys-devel/gettext )
+	oci8-instant-client? ( dev-db/oracle-instantclient-basic )
+	odbc? ( >=dev-db/unixODBC-1.8.13 )
+	postgres? ( dev-db/postgresql )
+	qdbm? ( dev-db/qdbm )
+	readline? ( sys-libs/readline )
+	recode? ( app-text/recode )
+	sharedmem? ( dev-libs/mm )
+	simplexml? ( >=dev-libs/libxml2-2.6.8 )
+	snmp? ( >=net-analyzer/net-snmp-5.2 )
+	soap? ( >=dev-libs/libxml2-2.6.8 )
+	spell? ( >=app-text/aspell-0.50 )
+	sqlite? ( >=dev-db/sqlite-3.7.6.3 )
+	ssl? ( >=dev-libs/openssl-0.9.7 )
+	sybase-ct? ( dev-db/freetds )
+	tidy? ( app-text/htmltidy )
+	truetype? (
+		=media-libs/freetype-2*
+		>=media-libs/t1lib-5.0.0
+		!gd? (
+			virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib )
+	)
+	unicode? ( dev-libs/oniguruma )
+	wddx? ( >=dev-libs/libxml2-2.6.8 )
+	xml? ( >=dev-libs/libxml2-2.6.8 )
+	xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv )
+	xmlreader? ( >=dev-libs/libxml2-2.6.8 )
+	xmlwriter? ( >=dev-libs/libxml2-2.6.8 )
+	xpm? (
+		x11-libs/libXpm
+		virtual/jpeg:0
+		media-libs/libpng:0= sys-libs/zlib
+	)
+	xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 )
+	zip? ( sys-libs/zlib )
+	zlib? ( sys-libs/zlib )
+	virtual/mta
+"
+
+php="=${CATEGORY}/${PF}"
+
+REQUIRED_USE="
+	truetype? ( gd )
+	cjk? ( gd )
+	exif? ( gd )
+
+	xpm? ( gd )
+	gd? ( zlib )
+	simplexml? ( xml )
+	soap? ( xml )
+	wddx? ( xml )
+	xmlrpc? ( || ( xml iconv ) )
+	xmlreader? ( xml )
+	xslt? ( xml )
+	ldap-sasl? ( ldap )
+	mhash? ( hash )
+	phar? ( hash )
+	mysqlnd? ( || (
+		mysql
+		mysqli
+		pdo
+	) )
+
+	qdbm? ( !gdbm )
+	readline? ( !libedit )
+	recode? ( !imap !mysql !mysqli )
+	sharedmem? ( !threads )
+
+	!cli? ( !cgi? ( !fpm? ( !apache2? ( !embed? ( cli ) ) ) ) )"
+
+RDEPEND="${DEPEND}"
+
+RDEPEND="${RDEPEND}
+	fpm? (
+		selinux? ( sec-policy/selinux-phpfpm )
+		systemd? ( sys-apps/systemd ) )"
+
+DEPEND="${DEPEND}
+	sys-devel/flex
+	>=sys-devel/m4-1.4.3
+	>=sys-devel/libtool-1.5.18"
+
+# Allow users to install production version if they want to
+
+case "${PHP_INI_VERSION}" in
+	production|development)
+		;;
+	*)
+		PHP_INI_VERSION="development"
+		;;
+esac
+
+PHP_INI_UPSTREAM="php.ini-${PHP_INI_VERSION}"
+PHP_INI_FILE="php.ini"
+
+want_apache
+
+pkg_setup() {
+	depend.apache_pkg_setup
+}
+
+php_install_ini() {
+	local phpsapi="${1}"
+
+	# work out where we are installing the ini file
+	php_set_ini_dir "${phpsapi}"
+
+	local phpinisrc="${PHP_INI_UPSTREAM}-${phpsapi}"
+	cp "${PHP_INI_UPSTREAM}" "${phpinisrc}"
+
+	# default to /tmp for save_path, bug #282768
+	sed -e 's|^;session.save_path .*$|session.save_path = "'"${EPREFIX}"'/tmp"|g' -i "${phpinisrc}"
+
+	# Set the extension dir
+	sed -e "s|^extension_dir .*$|extension_dir = ${extension_dir}|g" -i "${phpinisrc}"
+
+	# Set the include path to point to where we want to find PEAR packages
+	sed -e 's|^;include_path = ".:/php/includes".*|include_path = ".:'"${EPREFIX}"'/usr/share/php'${PHP_MV}':'"${EPREFIX}"'/usr/share/php"|' -i "${phpinisrc}"
+
+	if use_if_iuse opcache; then
+		elog "Adding opcache to ${phpinisrc}"
+		echo "zend_extension=${PHP_DESTDIR}/$(get_libdir)/opcache.so" >> ${phpinisrc}
+	fi
+
+	dodir "${PHP_INI_DIR#${EPREFIX}}"
+	insinto "${PHP_INI_DIR#${EPREFIX}}"
+	newins "${phpinisrc}" "${PHP_INI_FILE}"
+
+	elog "Installing php.ini for ${phpsapi} into ${PHP_INI_DIR#${EPREFIX}}"
+	elog
+
+	dodir "${PHP_EXT_INI_DIR#${EPREFIX}}"
+	dodir "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}"
+
+	# SAPI-specific handling
+
+	if [[ "${sapi}" == "fpm" ]] ; then
+		[[ -z ${PHP_FPM_CONF_VER} ]] && PHP_FPM_CONF_VER=0
+		einfo "Installing FPM CGI config file php-fpm.conf"
+		insinto "${PHP_INI_DIR#${EPREFIX}}"
+		newins "${FILESDIR}/php-fpm-r${PHP_FPM_CONF_VER}.conf" php-fpm.conf
+
+		# Remove bogus /etc/php-fpm.conf.default (bug 359906)
+		[[ -f "${ED}/etc/php-fpm.conf.default" ]] && rm "${ED}/etc/php-fpm.conf.default"
+	fi
+
+	# Install PHP ini files into /usr/share/php
+
+	dodoc php.ini-development
+	dodoc php.ini-production
+
+}
+
+php_set_ini_dir() {
+	PHP_INI_DIR="${EPREFIX}/etc/php/${1}-php${SLOT}"
+	PHP_EXT_INI_DIR="${PHP_INI_DIR}/ext"
+	PHP_EXT_INI_DIR_ACTIVE="${PHP_INI_DIR}/ext-active"
+}
+
+src_prepare() {
+	# USE=sharedmem (session/mod_mm to be exact) tries to mmap() this path
+	# ([empty session.save_path]/session_mm_[sapi][gid].sem)
+	# there is no easy way to circumvent that, all php calls during
+	# install use -n, so no php.ini file will be used.
+	# As such, this is the easiest way to get around
+	addpredict /session_mm_cli250.sem
+	addpredict /session_mm_cli0.sem
+
+	# Change PHP branding
+	# Get the alpha/beta/rc version
+	sed -re	"s|^(PHP_EXTRA_VERSION=\").*(\")|\1-pl${PR/r/}-gentoo\2|g" \
+		-i configure.in || die "Unable to change PHP branding"
+
+	# Patch PHP to show Gentoo as the server platform
+	sed -e 's/PHP_UNAME=`uname -a | xargs`/PHP_UNAME=`uname -s -n -r -v | xargs`/g' \
+		-i configure.in || die "Failed to fix server platform name"
+
+	# Prevent PHP from activating the Apache config,
+	# as we will do that ourselves
+	sed -i \
+		-e "s,-i -a -n php${PHP_MV},-i -n php${PHP_MV},g" \
+		-e "s,-i -A -n php${PHP_MV},-i -n php${PHP_MV},g" \
+		configure sapi/apache2filter/config.m4 sapi/apache2handler/config.m4
+
+	# Patch PHP to support heimdal instead of mit-krb5
+	if has_version "app-crypt/heimdal" ; then
+		sed -e 's|gssapi_krb5|gssapi|g' -i acinclude.m4 \
+			|| die "Failed to fix heimdal libname"
+		sed -e 's|PHP_ADD_LIBRARY(k5crypto, 1, $1)||g' -i acinclude.m4 \
+			|| die "Failed to fix heimdal crypt library reference"
+	fi
+
+	#Add user patches #357637
+	epatch_user
+
+	#force rebuilding aclocal.m4
+	rm aclocal.m4
+	eautoreconf
+
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		# http://bugs.php.net/bug.php?id=48795, bug #343481
+		sed -i -e '/BUILD_CGI="\\$(CC)/s/CC/CXX/' configure || die
+	fi
+}
+
+src_configure() {
+	addpredict /usr/share/snmp/mibs/.index
+	addpredict /var/lib/net-snmp/mib_indexes
+
+	PHP_DESTDIR="${EPREFIX}/usr/$(get_libdir)/php${SLOT}"
+
+	# This is a global variable and should be in caps. It isn't because the
+	# phpconfutils eclass relies on exactly this name...
+	# for --with-libdir see bug #327025
+	my_conf="
+		--prefix="${PHP_DESTDIR}"
+		--mandir="${PHP_DESTDIR}"/man
+		--infodir="${PHP_DESTDIR}"/info
+		--libdir="${PHP_DESTDIR}"/lib
+		--with-libdir=$(get_libdir)
+		--without-pear
+		$(use_enable threads maintainer-zts)"
+
+	#                             extension		  USE flag        shared
+	my_conf+="
+	$(use_enable bcmath bcmath )
+	$(use_with bzip2 bz2 "${EPREFIX}"/usr)
+	$(use_enable calendar calendar )
+	$(use_enable ctype ctype )
+	$(use_with curl curl "${EPREFIX}"/usr)
+	$(use_with curlwrappers curlwrappers "${EPREFIX}"/usr)
+	$(use_enable xml dom )
+	$(use_with enchant enchant "${EPREFIX}"/usr)
+	$(use_enable exif exif )
+	$(use_enable fileinfo fileinfo )
+	$(use_enable filter filter )
+	$(use_enable ftp ftp )
+	$(use_with nls gettext "${EPREFIX}"/usr)
+	$(use_with gmp gmp "${EPREFIX}"/usr)
+	$(use_enable hash hash )
+	$(use_with mhash mhash "${EPREFIX}"/usr)
+	$(use_with iconv iconv $(use elibc_glibc || use elibc_musl || echo "${EPREFIX}"/usr))
+	$(use_enable intl intl )
+	$(use_enable ipv6 ipv6 )
+	$(use_enable json json )
+	$(use_with kerberos kerberos "${EPREFIX}"/usr)
+	$(use_enable xml libxml )
+	$(use_with xml libxml-dir "${EPREFIX}"/usr)
+	$(use_enable unicode mbstring )
+	$(use_with crypt mcrypt "${EPREFIX}"/usr)
+	$(use_with mssql mssql "${EPREFIX}"/usr)
+	$(use_with unicode onig "${EPREFIX}"/usr)
+	$(use_with ssl openssl "${EPREFIX}"/usr)
+	$(use_with ssl openssl-dir "${EPREFIX}"/usr)
+	$(use_enable pcntl pcntl )
+	$(use_enable phar phar )
+	$(use_enable pdo pdo )
+	$(use_with postgres pgsql "${EPREFIX}"/usr)
+	$(use_enable posix posix )
+	$(use_with spell pspell "${EPREFIX}"/usr)
+	$(use_with recode recode "${EPREFIX}"/usr)
+	$(use_enable simplexml simplexml )
+	$(use_enable sharedmem shmop )
+	$(use_with snmp snmp "${EPREFIX}"/usr)
+	$(use_enable soap soap )
+	$(use_enable sockets sockets )
+	$(use_with sqlite sqlite3 "${EPREFIX}"/usr)
+	$(use_with sybase-ct sybase-ct "${EPREFIX}"/usr)
+	$(use_enable sysvipc sysvmsg )
+	$(use_enable sysvipc sysvsem )
+	$(use_enable sysvipc sysvshm )
+	$(use_with systemd fpm-systemd)
+	$(use_with tidy tidy "${EPREFIX}"/usr)
+	$(use_enable tokenizer tokenizer )
+	$(use_enable wddx wddx )
+	$(use_enable xml xml )
+	$(use_enable xmlreader xmlreader )
+	$(use_enable xmlwriter xmlwriter )
+	$(use_with xmlrpc xmlrpc)
+	$(use_with xslt xsl "${EPREFIX}"/usr)
+	$(use_enable zip zip )
+	$(use_with zlib zlib "${EPREFIX}"/usr)
+	$(use_enable debug debug )"
+
+	# DBA support
+	if use cdb || use berkdb || use flatfile || use gdbm || use inifile \
+		|| use qdbm ; then
+		my_conf="${my_conf} --enable-dba${shared}"
+	fi
+
+	# DBA drivers support
+	my_conf+="
+	$(use_with cdb cdb)
+	$(use_with berkdb db4 ${EPREFIX}/usr)
+	$(use_enable flatfile flatfile )
+	$(use_with gdbm gdbm ${EPREFIX}/usr)
+	$(use_enable inifile inifile )
+	$(use_with qdbm qdbm ${EPREFIX}/usr)"
+
+	# Support for the GD graphics library
+	my_conf+="
+	$(use_with truetype freetype-dir ${EPREFIX}/usr)
+	$(use_with truetype t1lib ${EPREFIX}/usr)
+	$(use_enable cjk gd-jis-conv )
+	$(use_with gd jpeg-dir ${EPREFIX}/usr)
+	$(use_with gd png-dir ${EPREFIX}/usr)
+	$(use_with xpm xpm-dir ${EPREFIX}/usr)"
+	# enable gd last, so configure can pick up the previous settings
+	my_conf+="
+	$(use_with gd gd)"
+
+	# IMAP support
+	if use imap ; then
+		my_conf+="
+		$(use_with imap imap ${EPREFIX}/usr)
+		$(use_with ssl imap-ssl ${EPREFIX}/usr)"
+	fi
+
+	# Interbase/firebird support
+
+	if use firebird ; then
+		my_conf+="
+		$(use_with firebird interbase ${EPREFIX}/usr)"
+	fi
+
+	# LDAP support
+	if use ldap ; then
+		my_conf+="
+		$(use_with ldap ldap ${EPREFIX}/usr)
+		$(use_with ldap-sasl ldap-sasl ${EPREFIX}/usr)"
+	fi
+
+	# MySQL support
+	if use mysql ; then
+		if use mysqlnd ; then
+			my_conf+="
+			$(use_with mysql mysql mysqlnd)"
+		else
+			my_conf+="
+			$(use_with mysql mysql ${EPREFIX}/usr)"
+		fi
+		my_conf+="
+		$(use_with mysql mysql-sock ${EPREFIX}/var/run/mysqld/mysqld.sock)"
+	fi
+
+	# MySQLi support
+	if use mysqlnd ; then
+		my_conf+="
+		$(use_with mysqli mysqli mysqlnd)"
+	else
+		my_conf+="
+		$(use_with mysqli mysqli ${EPREFIX}/usr/bin/mysql_config)"
+	fi
+
+	# ODBC support
+	if use odbc ; then
+		my_conf+="
+		$(use_with odbc unixODBC ${EPREFIX}/usr)"
+	fi
+
+	if use iodbc ; then
+		my_conf+="
+		$(use_with iodbc iodbc ${EPREFIX}/usr)"
+	fi
+
+	# Oracle support
+	if use oci8-instant-client ; then
+		my_conf+="
+		$(use_with oci8-instant-client oci8)"
+	fi
+
+	# PDO support
+	if use pdo ; then
+		my_conf+="
+		$(use_with mssql pdo-dblib )"
+		if use mysqlnd ; then
+			my_conf+="
+			$(use_with mysqlnd pdo-mysql mysqlnd)"
+		else
+			my_conf+="
+			$(use_with mysql pdo-mysql ${EPREFIX}/usr)"
+		fi
+		my_conf+="
+		$(use_with postgres pdo-pgsql )
+		$(use_with sqlite pdo-sqlite ${EPREFIX}/usr)
+		$(use_with odbc pdo-odbc unixODBC,${EPREFIX}/usr)"
+		if use oci8-instant-client ; then
+			my_conf+="
+			$(use_with oci8-instant-client pdo-oci)"
+		fi
+	fi
+
+	# readline/libedit support
+	my_conf+="
+	$(use_with readline readline ${EPREFIX}/usr)
+	$(use_with libedit libedit ${EPREFIX}/usr)"
+
+	# Session support
+	if use session ; then
+		my_conf+="
+		$(use_with sharedmem mm ${EPREFIX}/usr)"
+	else
+		my_conf+="
+		$(use_enable session session )"
+	fi
+
+	# Use pic for shared modules such as apache2's mod_php
+	my_conf="${my_conf} --with-pic"
+
+	# we use the system copy of pcre
+	# --with-pcre-regex affects ext/pcre
+	# --with-pcre-dir affects ext/filter and ext/zip
+	my_conf="${my_conf} --with-pcre-regex=${EPREFIX}/usr --with-pcre-dir=${EPREFIX}/usr"
+
+	# Catch CFLAGS problems
+	# Fixes bug #14067.
+	# Changed order to run it in reverse for bug #32022 and #12021.
+	replace-cpu-flags "k6*" "i586"
+
+	# Support user-passed configuration parameters
+	my_conf="${my_conf} ${EXTRA_ECONF:-}"
+
+	# Support the Apache2 extras, they must be set globally for all
+	# SAPIs to work correctly, especially for external PHP extensions
+
+	mkdir -p "${WORKDIR}/sapis-build"
+	for one_sapi in $SAPIS ; do
+		use "${one_sapi}" || continue
+		php_set_ini_dir "${one_sapi}"
+
+		cp -r "${S}" "${WORKDIR}/sapis-build/${one_sapi}"
+		cd "${WORKDIR}/sapis-build/${one_sapi}"
+
+		sapi_conf="${my_conf} --with-config-file-path=${PHP_INI_DIR}
+			--with-config-file-scan-dir=${PHP_EXT_INI_DIR_ACTIVE}"
+
+		for sapi in $SAPIS ; do
+			case "$sapi" in
+				cli|cgi|embed|fpm)
+					if [[ "${one_sapi}" == "${sapi}" ]] ; then
+						sapi_conf="${sapi_conf} --enable-${sapi}"
+					else
+						sapi_conf="${sapi_conf} --disable-${sapi}"
+					fi
+					;;
+
+				apache2)
+					if [[ "${one_sapi}" == "${sapi}" ]] ; then
+						sapi_conf="${sapi_conf} --with-apxs2=${EPREFIX}/usr/sbin/apxs"
+					else
+						sapi_conf="${sapi_conf} --without-apxs2"
+					fi
+					;;
+			esac
+		done
+
+		econf ${sapi_conf}
+	done
+}
+
+src_compile() {
+	# snmp seems to run during src_compile, too (bug #324739)
+	addpredict /usr/share/snmp/mibs/.index
+	addpredict /var/lib/net-snmp/mib_indexes
+
+	for sapi in ${SAPIS} ; do
+		if use "${sapi}"; then
+			cd "${WORKDIR}/sapis-build/$sapi" || "Failed to change dir to ${WORKDIR}/sapis-build/$1"
+			emake || die "emake failed"
+		fi
+	done
+}
+
+src_install() {
+	# see bug #324739 for what happens when we don't have that
+	addpredict /usr/share/snmp/mibs/.index
+
+	# grab the first SAPI that got built and install common files from there
+	local first_sapi=""
+	for sapi in $SAPIS ; do
+		if use $sapi ; then
+			first_sapi=$sapi
+			break
+		fi
+	done
+
+	# Makefile forgets to create this before trying to write to it...
+	dodir "${PHP_DESTDIR#${EPREFIX}}/bin"
+
+	# Install php environment (without any sapis)
+	cd "${WORKDIR}/sapis-build/$first_sapi"
+	emake INSTALL_ROOT="${D}" \
+		install-build install-headers install-programs \
+		|| die "emake install failed"
+
+	local extension_dir="$("${ED}/${PHP_DESTDIR#${EPREFIX}}/bin/php-config" --extension-dir)"
+
+	# Create the directory where we'll put version-specific php scripts
+	keepdir /usr/share/php${PHP_MV}
+
+	local sapi="", file=""
+	local sapi_list=""
+
+	for sapi in ${SAPIS}; do
+		if use "${sapi}" ; then
+			einfo "Installing SAPI: ${sapi}"
+			cd "${WORKDIR}/sapis-build/${sapi}"
+
+			if [[ "${sapi}" == "apache2" ]] ; then
+				# We're specifically not using emake install-sapi as libtool
+				# may cause unnecessary relink failures (see bug #351266)
+				insinto "${PHP_DESTDIR#${EPREFIX}}/apache2/"
+				newins ".libs/libphp5$(get_libname)" "libphp${PHP_MV}$(get_libname)"
+				keepdir "/usr/$(get_libdir)/apache2/modules"
+			else
+				# needed each time, php_install_ini would reset it
+				local dest="${PHP_DESTDIR#${EPREFIX}}"
+				into "${dest}"
+				case "$sapi" in
+					cli)
+						source="sapi/cli/php"
+						;;
+					cgi)
+						source="sapi/cgi/php-cgi"
+						;;
+					fpm)
+						source="sapi/fpm/php-fpm"
+						;;
+					embed)
+						source="libs/libphp${PHP_MV}$(get_libname)"
+						;;
+					*)
+						die "unhandled sapi in src_install"
+						;;
+				esac
+
+				if [[ "${source}" == *"$(get_libname)" ]]; then
+					dolib.so "${source}" || die "Unable to install ${sapi} sapi"
+				else
+					dobin "${source}" || die "Unable to install ${sapi} sapi"
+					local name="$(basename ${source})"
+					dosym "${dest}/bin/${name}" "/usr/bin/${name}${SLOT}"
+				fi
+			fi
+
+			php_install_ini "${sapi}"
+
+			# construct correct SAPI string for php-config
+			# thanks to ferringb for the bash voodoo
+			if [[ "${sapi}" == "apache2" ]]; then
+				sapi_list="${sapi_list:+${sapi_list} }apache2handler"
+			else
+				sapi_list="${sapi_list:+${sapi_list} }${sapi}"
+			fi
+		fi
+	done
+
+	# Installing opcache module
+	if use_if_iuse opcache ; then
+		dolib.so "modules/opcache$(get_libname)" || die "Unable to install opcache module"
+	fi
+
+	# Install env.d files
+	newenvd "${FILESDIR}/20php5-envd" \
+		"20php${SLOT}"
+	sed -e "s|/lib/|/$(get_libdir)/|g" -i \
+		"${ED}/etc/env.d/20php${SLOT}"
+	sed -e "s|php5|php${SLOT}|g" -i \
+		"${ED}/etc/env.d/20php${SLOT}"
+
+	# set php-config variable correctly (bug #278439)
+	sed -e "s:^\(php_sapis=\)\".*\"$:\1\"${sapi_list}\":" -i \
+		"${ED}/usr/$(get_libdir)/php${SLOT}/bin/php-config"
+
+	if use fpm ; then
+		if use systemd; then
+			systemd_newunit "${FILESDIR}/php-fpm_at.service" "php-fpm@${SLOT}.service"
+		else
+			systemd_newunit "${FILESDIR}/php-fpm_at-simple.service" "php-fpm@${SLOT}.service"
+		fi
+	fi
+}
+
+src_test() {
+	echo ">>> Test phase [test]: ${CATEGORY}/${PF}"
+	PHP_BIN="${WORKDIR}/sapis-build/cli/sapi/cli/php"
+	if [[ ! -x "${PHP_BIN}" ]] ; then
+		ewarn "Test phase requires USE=cli, skipping"
+		return
+	else
+		export TEST_PHP_EXECUTABLE="${PHP_BIN}"
+	fi
+
+	if [[ -x "${WORKDIR}/sapis/cgi/php-cgi" ]] ; then
+		export TEST_PHP_CGI_EXECUTABLE="${WORKDIR}/sapis/cgi/php-cgi"
+	fi
+
+	REPORT_EXIT_STATUS=1 "${TEST_PHP_EXECUTABLE}" -n  -d "session.save_path=${T}" \
+		"${WORKDIR}/sapis-build/cli/run-tests.php" -n -q -d "session.save_path=${T}"
+
+	for name in ${EXPECTED_TEST_FAILURES}; do
+		mv "${name}.out" "${name}.out.orig" 2>/dev/null
+	done
+
+	local failed="$(find -name '*.out')"
+	if [[ ${failed} != "" ]] ; then
+		ewarn "The following test cases failed unexpectedly:"
+		for name in ${failed}; do
+			ewarn "  ${name/.out/}"
+		done
+	else
+		einfo "No unexpected test failures, all fine"
+	fi
+
+	if [[ ${PHP_SHOW_UNEXPECTED_TEST_PASS} == "1" ]] ; then
+		local passed=""
+		for name in ${EXPECTED_TEST_FAILURES}; do
+			[[ -f "${name}.diff" ]] && continue
+			passed="${passed} ${name}"
+		done
+		if [[ ${passed} != "" ]] ; then
+			einfo "The following test cases passed unexpectedly:"
+			for name in ${passed}; do
+				ewarn "  ${passed}"
+			done
+		else
+			einfo "None of the known-to-fail tests passed, all fine"
+		fi
+	fi
+}
+
+pkg_postinst() {
+	# Output some general info to the user
+	if use apache2 ; then
+		APACHE2_MOD_DEFINE="PHP5"
+		APACHE2_MOD_CONF="70_mod_php5"  # actually provided by app-eselect/eselect-php
+		apache-module_pkg_postinst
+	fi
+
+	# Create the symlinks for php
+	for m in ${SAPIS}; do
+		[[ ${m} == 'embed' ]] && continue;
+		if use $m ; then
+			local ci=$(eselect php show $m)
+			if [[ -z $ci ]]; then
+				eselect php set $m php${SLOT}
+				einfo "Switched ${m} to use php:${SLOT}"
+				einfo
+			elif [[ $ci != "php${SLOT}" ]] ; then
+				elog "To switch $m to use php:${SLOT}, run"
+				elog "    eselect php set $m php${SLOT}"
+				elog
+			fi
+		fi
+	done
+
+	elog "Make sure that PHP_TARGETS in ${EPREFIX}/etc/make.conf includes php${SLOT/./-} in order"
+	elog "to compile extensions for the ${SLOT} ABI"
+	elog
+	if ! use readline && use cli ; then
+		ewarn "Note that in order to use php interactivly, you need to enable"
+		ewarn "the readline USE flag or php -a will hang"
+	fi
+	elog
+	elog "This ebuild installed a version of php.ini based on php.ini-${PHP_INI_VERSION} version."
+	elog "You can chose which version of php.ini to install by default by setting PHP_INI_VERSION to either"
+	elog "'production' or 'development' in ${EPREFIX}/etc/make.conf"
+	elog "Both versions of php.ini can be found in ${EPREFIX}/usr/share/doc/${PF}"
+
+	elog
+	elog "For more details on how minor version slotting works (PHP_TARGETS) please read the upgrade guide:"
+	elog "https://www.gentoo.org/proj/en/php/php-upgrading.xml"
+	elog
+}
+
+pkg_prerm() {
+	eselect php cleanup
+}
diff --git a/dev-lang/php/php-5.5.25-r1.ebuild b/dev-lang/php/php-5.5.25-r1.ebuild
deleted file mode 100644
index d5740a52dbff..000000000000
--- a/dev-lang/php/php-5.5.25-r1.ebuild
+++ /dev/null
@@ -1,787 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils autotools flag-o-matic versionator depend.apache apache-module db-use libtool systemd
-
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-
-function php_get_uri ()
-{
-	case "${1}" in
-		"php-pre")
-			echo "http://downloads.php.net/dsp/${2}"
-		;;
-		"php")
-			echo "http://www.php.net/distributions/${2}"
-		;;
-		"olemarkus")
-			echo "https://dev.gentoo.org/~olemarkus/php/${2}"
-		;;
-		"gentoo")
-			echo "mirror://gentoo/${2}"
-		;;
-		*)
-			die "unhandled case in php_get_uri"
-		;;
-	esac
-}
-
-PHP_MV="$(get_major_version)"
-SLOT="$(get_version_component_range 1-2)"
-
-# alias, so we can handle different types of releases (finals, rcs, alphas,
-# betas, ...) w/o changing the whole ebuild
-PHP_PV="${PV/_rc/RC}"
-PHP_PV="${PHP_PV/_alpha/alpha}"
-PHP_PV="${PHP_PV/_beta/beta}"
-PHP_RELEASE="php"
-[[ ${PV} == ${PV/_alpha/} ]] || PHP_RELEASE="php-pre"
-[[ ${PV} == ${PV/_beta/} ]] || PHP_RELEASE="php-pre"
-[[ ${PV} == ${PV/_rc/} ]] || PHP_RELEASE="php-pre"
-PHP_P="${PN}-${PHP_PV}"
-
-PHP_SRC_URI="$(php_get_uri "${PHP_RELEASE}" "${PHP_P}.tar.bz2")"
-
-PHP_FPM_CONF_VER="1"
-
-SRC_URI="${PHP_SRC_URI}"
-
-DESCRIPTION="The PHP language runtime engine: CLI, CGI, FPM/FastCGI, Apache2 and embed SAPIs"
-HOMEPAGE="http://php.net/"
-LICENSE="PHP-3"
-
-S="${WORKDIR}/${PHP_P}"
-
-# We can build the following SAPIs in the given order
-SAPIS="embed cli cgi fpm apache2"
-
-# SAPIs and SAPI-specific USE flags (cli SAPI is default on):
-IUSE="${IUSE}
-	${SAPIS/cli/+cli}
-	threads"
-
-IUSE="${IUSE} bcmath berkdb bzip2 calendar cdb cjk
-	crypt +ctype curl debug
-	enchant exif frontbase +fileinfo +filter firebird
-	flatfile ftp gd gdbm gmp +hash +iconv imap inifile
-	intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit mhash
-	mssql mysql libmysqlclient mysqli nls
-	oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm
-	readline recode selinux +session sharedmem
-	+simplexml snmp soap sockets spell sqlite ssl
-	sybase-ct sysvipc systemd tidy +tokenizer truetype unicode vpx wddx
-	+xml xmlreader xmlwriter xmlrpc xpm xslt zip zlib"
-
-DEPEND="
-	>=app-eselect/eselect-php-0.7.1-r3[apache2?,fpm?]
-	>=dev-libs/libpcre-8.32[unicode]
-	apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=]
-		<www-servers/apache-2.4[threads=] ) )
-	berkdb? ( =sys-libs/db-4* )
-	bzip2? ( app-arch/bzip2 )
-	cdb? ( || ( dev-db/cdb dev-db/tinycdb ) )
-	cjk? ( !gd? (
-		virtual/jpeg:0
-		media-libs/libpng:0=
-		sys-libs/zlib
-	) )
-	crypt? ( >=dev-libs/libmcrypt-2.4 )
-	curl? ( >=net-misc/curl-7.10.5 )
-	enchant? ( app-text/enchant )
-	exif? ( !gd? (
-		virtual/jpeg:0
-		media-libs/libpng:0=
-		sys-libs/zlib
-	) )
-	firebird? ( dev-db/firebird )
-	gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib )
-	gdbm? ( >=sys-libs/gdbm-1.8.0 )
-	gmp? ( >=dev-libs/gmp-4.1.2 )
-	iconv? ( virtual/libiconv )
-	imap? ( virtual/imap-c-client[ssl=] )
-	intl? ( dev-libs/icu:= )
-	iodbc? ( dev-db/libiodbc )
-	kerberos? ( virtual/krb5 )
-	ldap? ( >=net-nds/openldap-1.2.11 )
-	ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 )
-	libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) )
-	mssql? ( dev-db/freetds[mssql] )
-	libmysqlclient? (
-		mysql? ( virtual/mysql )
-		mysqli? ( >=virtual/mysql-4.1 )
-	)
-	nls? ( sys-devel/gettext )
-	oci8-instant-client? ( dev-db/oracle-instantclient-basic )
-	odbc? ( >=dev-db/unixODBC-1.8.13 )
-	postgres? ( dev-db/postgresql )
-	qdbm? ( dev-db/qdbm )
-	readline? ( sys-libs/readline )
-	recode? ( app-text/recode )
-	sharedmem? ( dev-libs/mm )
-	simplexml? ( >=dev-libs/libxml2-2.6.8 )
-	snmp? ( >=net-analyzer/net-snmp-5.2 )
-	soap? ( >=dev-libs/libxml2-2.6.8 )
-	spell? ( >=app-text/aspell-0.50 )
-	sqlite? ( >=dev-db/sqlite-3.7.6.3 )
-	ssl? ( >=dev-libs/openssl-0.9.7 )
-	sybase-ct? ( dev-db/freetds )
-	tidy? ( app-text/htmltidy )
-	truetype? (
-		=media-libs/freetype-2*
-		>=media-libs/t1lib-5.0.0
-		!gd? (
-			virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib )
-	)
-	unicode? ( dev-libs/oniguruma )
-	vpx? ( media-libs/libvpx )
-	wddx? ( >=dev-libs/libxml2-2.6.8 )
-	xml? ( >=dev-libs/libxml2-2.6.8 )
-	xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv )
-	xmlreader? ( >=dev-libs/libxml2-2.6.8 )
-	xmlwriter? ( >=dev-libs/libxml2-2.6.8 )
-	xpm? (
-		x11-libs/libXpm
-		virtual/jpeg:0
-		media-libs/libpng:0= sys-libs/zlib
-	)
-	xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 )
-	zip? ( sys-libs/zlib )
-	zlib? ( sys-libs/zlib )
-	virtual/mta
-"
-
-php="=${CATEGORY}/${PF}"
-
-REQUIRED_USE="
-	truetype? ( gd )
-	vpx? ( gd )
-	cjk? ( gd )
-	exif? ( gd )
-
-	xpm? ( gd )
-	gd? ( zlib )
-	simplexml? ( xml )
-	soap? ( xml )
-	wddx? ( xml )
-	xmlrpc? ( || ( xml iconv ) )
-	xmlreader? ( xml )
-	xslt? ( xml )
-	ldap-sasl? ( ldap )
-	mhash? ( hash )
-	phar? ( hash )
-	libmysqlclient? ( || (
-		mysql
-		mysqli
-		pdo
-	) )
-
-	qdbm? ( !gdbm )
-	readline? ( !libedit )
-	recode? ( !imap !mysql !mysqli )
-	sharedmem? ( !threads )
-
-	!cli? ( !cgi? ( !fpm? ( !apache2? ( !embed? ( cli ) ) ) ) )"
-
-RDEPEND="${DEPEND}"
-
-RDEPEND="${RDEPEND}
-	fpm? (
-		selinux? ( sec-policy/selinux-phpfpm )
-		systemd? ( sys-apps/systemd ) )"
-
-DEPEND="${DEPEND}
-	sys-devel/flex
-	>=sys-devel/m4-1.4.3
-	>=sys-devel/libtool-1.5.18"
-
-# Allow users to install production version if they want to
-
-case "${PHP_INI_VERSION}" in
-	production|development)
-		;;
-	*)
-		PHP_INI_VERSION="development"
-		;;
-esac
-
-PHP_INI_UPSTREAM="php.ini-${PHP_INI_VERSION}"
-PHP_INI_FILE="php.ini"
-
-want_apache
-
-pkg_setup() {
-	depend.apache_pkg_setup
-}
-
-php_install_ini() {
-	local phpsapi="${1}"
-
-	# work out where we are installing the ini file
-	php_set_ini_dir "${phpsapi}"
-
-	local phpinisrc="${PHP_INI_UPSTREAM}-${phpsapi}"
-	cp "${PHP_INI_UPSTREAM}" "${phpinisrc}"
-
-	# default to /tmp for save_path, bug #282768
-	sed -e 's|^;session.save_path .*$|session.save_path = "'"${EPREFIX}"'/tmp"|g' -i "${phpinisrc}"
-
-	# Set the extension dir
-	sed -e "s|^extension_dir .*$|extension_dir = ${extension_dir}|g" -i "${phpinisrc}"
-
-	# Set the include path to point to where we want to find PEAR packages
-	sed -e 's|^;include_path = ".:/php/includes".*|include_path = ".:'"${EPREFIX}"'/usr/share/php'${PHP_MV}':'"${EPREFIX}"'/usr/share/php"|' -i "${phpinisrc}"
-
-	dodir "${PHP_INI_DIR#${EPREFIX}}"
-	insinto "${PHP_INI_DIR#${EPREFIX}}"
-	newins "${phpinisrc}" "${PHP_INI_FILE}"
-
-	elog "Installing php.ini for ${phpsapi} into ${PHP_INI_DIR#${EPREFIX}}"
-	elog
-
-	dodir "${PHP_EXT_INI_DIR#${EPREFIX}}"
-	dodir "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}"
-
-	if use_if_iuse opcache; then
-		elog "Adding opcache to $PHP_EXT_INI_DIR"
-		echo "zend_extension=${PHP_DESTDIR}/$(get_libdir)/opcache.so" >> "${D}/${PHP_EXT_INI_DIR}"/opcache.ini
-		dosym "${PHP_EXT_INI_DIR#${EPREFIX}}/opcache.ini" "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}/opcache.ini"
-	fi
-
-	# SAPI-specific handling
-
-	if [[ "${sapi}" == "fpm" ]] ; then
-		[[ -z ${PHP_FPM_CONF_VER} ]] && PHP_FPM_CONF_VER=0
-		einfo "Installing FPM CGI config file php-fpm.conf"
-		insinto "${PHP_INI_DIR#${EPREFIX}}"
-		newins "${FILESDIR}/php-fpm-r${PHP_FPM_CONF_VER}.conf" php-fpm.conf
-
-		# Remove bogus /etc/php-fpm.conf.default (bug 359906)
-		[[ -f "${ED}/etc/php-fpm.conf.default" ]] && rm "${ED}/etc/php-fpm.conf.default"
-	fi
-
-	# Install PHP ini files into /usr/share/php
-
-	dodoc php.ini-development
-	dodoc php.ini-production
-
-}
-
-php_set_ini_dir() {
-	PHP_INI_DIR="${EPREFIX}/etc/php/${1}-php${SLOT}"
-	PHP_EXT_INI_DIR="${PHP_INI_DIR}/ext"
-	PHP_EXT_INI_DIR_ACTIVE="${PHP_INI_DIR}/ext-active"
-}
-
-src_prepare() {
-	# USE=sharedmem (session/mod_mm to be exact) tries to mmap() this path
-	# ([empty session.save_path]/session_mm_[sapi][gid].sem)
-	# there is no easy way to circumvent that, all php calls during
-	# install use -n, so no php.ini file will be used.
-	# As such, this is the easiest way to get around
-	addpredict /session_mm_cli250.sem
-	addpredict /session_mm_cli0.sem
-
-	# Change PHP branding
-	# Get the alpha/beta/rc version
-	sed -re	"s|^(PHP_EXTRA_VERSION=\").*(\")|\1-pl${PR/r/}-gentoo\2|g" \
-		-i configure.in || die "Unable to change PHP branding"
-
-	# Patch PHP to show Gentoo as the server platform
-	sed -e 's/PHP_UNAME=`uname -a | xargs`/PHP_UNAME=`uname -s -n -r -v | xargs`/g' \
-		-i configure.in || die "Failed to fix server platform name"
-
-	# Prevent PHP from activating the Apache config,
-	# as we will do that ourselves
-	sed -i \
-		-e "s,-i -a -n php${PHP_MV},-i -n php${PHP_MV},g" \
-		-e "s,-i -A -n php${PHP_MV},-i -n php${PHP_MV},g" \
-		configure sapi/apache2filter/config.m4 sapi/apache2handler/config.m4
-
-	# Patch PHP to support heimdal instead of mit-krb5
-	if has_version "app-crypt/heimdal" ; then
-		sed -e 's|gssapi_krb5|gssapi|g' -i acinclude.m4 \
-			|| die "Failed to fix heimdal libname"
-		sed -e 's|PHP_ADD_LIBRARY(k5crypto, 1, $1)||g' -i acinclude.m4 \
-			|| die "Failed to fix heimdal crypt library reference"
-	fi
-
-	# Fix build with libvpx-1.4.0, bug #545952 .
-	epatch "${FILESDIR}/${PN}-libvpx.patch"
-
-	#Add user patches #357637
-	epatch_user
-
-	#force rebuilding aclocal.m4
-	rm aclocal.m4
-	eautoreconf
-
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		# http://bugs.php.net/bug.php?id=48795, bug #343481
-		sed -i -e '/BUILD_CGI="\\$(CC)/s/CC/CXX/' configure || die
-	fi
-}
-
-src_configure() {
-	addpredict /usr/share/snmp/mibs/.index
-	addpredict /var/lib/net-snmp/mib_indexes
-
-	PHP_DESTDIR="${EPREFIX}/usr/$(get_libdir)/php${SLOT}"
-
-	# This is a global variable and should be in caps. It isn't because the
-	# phpconfutils eclass relies on exactly this name...
-	# for --with-libdir see bug #327025
-	my_conf="
-		--prefix="${PHP_DESTDIR}"
-		--mandir="${PHP_DESTDIR}"/man
-		--infodir="${PHP_DESTDIR}"/info
-		--libdir="${PHP_DESTDIR}"/lib
-		--with-libdir=$(get_libdir)
-		--without-pear
-		$(use_enable threads maintainer-zts)"
-
-	#                             extension		  USE flag        shared
-	my_conf+="
-	$(use_enable bcmath bcmath )
-	$(use_with bzip2 bz2 "${EPREFIX}"/usr)
-	$(use_enable calendar calendar )
-	$(use_enable ctype ctype )
-	$(use_with curl curl "${EPREFIX}"/usr)
-	$(use_enable xml dom )
-	$(use_with enchant enchant "${EPREFIX}"/usr)
-	$(use_enable exif exif )
-	$(use_enable fileinfo fileinfo )
-	$(use_enable filter filter )
-	$(use_enable ftp ftp )
-	$(use_with nls gettext "${EPREFIX}"/usr)
-	$(use_with gmp gmp "${EPREFIX}"/usr)
-	$(use_enable hash hash )
-	$(use_with mhash mhash "${EPREFIX}"/usr)
-	$(use_with iconv iconv $(use elibc_glibc || use elibc_musl || echo "${EPREFIX}"/usr))
-	$(use_enable intl intl )
-	$(use_enable ipv6 ipv6 )
-	$(use_enable json json )
-	$(use_with kerberos kerberos "${EPREFIX}"/usr)
-	$(use_enable xml libxml )
-	$(use_with xml libxml-dir "${EPREFIX}"/usr)
-	$(use_enable unicode mbstring )
-	$(use_with crypt mcrypt "${EPREFIX}"/usr)
-	$(use_with mssql mssql "${EPREFIX}"/usr)
-	$(use_with unicode onig "${EPREFIX}"/usr)
-	$(use_with ssl openssl "${EPREFIX}"/usr)
-	$(use_with ssl openssl-dir "${EPREFIX}"/usr)
-	$(use_enable pcntl pcntl )
-	$(use_enable phar phar )
-	$(use_enable pdo pdo )
-	$(use_enable opcache opcache )
-	$(use_with postgres pgsql "${EPREFIX}"/usr)
-	$(use_enable posix posix )
-	$(use_with spell pspell "${EPREFIX}"/usr)
-	$(use_with recode recode "${EPREFIX}"/usr)
-	$(use_enable simplexml simplexml )
-	$(use_enable sharedmem shmop )
-	$(use_with snmp snmp "${EPREFIX}"/usr)
-	$(use_enable soap soap )
-	$(use_enable sockets sockets )
-	$(use_with sqlite sqlite3 "${EPREFIX}"/usr)
-	$(use_with sybase-ct sybase-ct "${EPREFIX}"/usr)
-	$(use_enable sysvipc sysvmsg )
-	$(use_enable sysvipc sysvsem )
-	$(use_enable sysvipc sysvshm )
-	$(use_with systemd fpm-systemd)
-	$(use_with tidy tidy "${EPREFIX}"/usr)
-	$(use_enable tokenizer tokenizer )
-	$(use_enable wddx wddx )
-	$(use_enable xml xml )
-	$(use_enable xmlreader xmlreader )
-	$(use_enable xmlwriter xmlwriter )
-	$(use_with xmlrpc xmlrpc)
-	$(use_with xslt xsl "${EPREFIX}"/usr)
-	$(use_enable zip zip )
-	$(use_with zlib zlib "${EPREFIX}"/usr)
-	$(use_enable debug debug )"
-
-	# DBA support
-	if use cdb || use berkdb || use flatfile || use gdbm || use inifile \
-		|| use qdbm ; then
-		my_conf="${my_conf} --enable-dba${shared}"
-	fi
-
-	# DBA drivers support
-	my_conf+="
-	$(use_with cdb cdb)
-	$(use_with berkdb db4 ${EPREFIX}/usr)
-	$(use_enable flatfile flatfile )
-	$(use_with gdbm gdbm ${EPREFIX}/usr)
-	$(use_enable inifile inifile )
-	$(use_with qdbm qdbm ${EPREFIX}/usr)"
-
-	# Support for the GD graphics library
-	my_conf+="
-	$(use_with truetype freetype-dir ${EPREFIX}/usr)
-	$(use_with truetype t1lib ${EPREFIX}/usr)
-	$(use_enable cjk gd-jis-conv )
-	$(use_with gd jpeg-dir ${EPREFIX}/usr)
-	$(use_with gd png-dir ${EPREFIX}/usr)
-	$(use_with xpm xpm-dir ${EPREFIX}/usr)
-	$(use_with vpx vpx-dir ${EPREFIX}/usr)"
-	# enable gd last, so configure can pick up the previous settings
-	my_conf+="
-	$(use_with gd gd)"
-
-	# IMAP support
-	if use imap ; then
-		my_conf+="
-		$(use_with imap imap ${EPREFIX}/usr)
-		$(use_with ssl imap-ssl ${EPREFIX}/usr)"
-	fi
-
-	# Interbase/firebird support
-
-	if use firebird ; then
-		my_conf+="
-		$(use_with firebird interbase ${EPREFIX}/usr)"
-	fi
-
-	# LDAP support
-	if use ldap ; then
-		my_conf+="
-		$(use_with ldap ldap ${EPREFIX}/usr)
-		$(use_with ldap-sasl ldap-sasl ${EPREFIX}/usr)"
-	fi
-
-	# MySQL support
-	local mysqllib="mysqlnd"
-	local mysqlilib="mysqlnd"
-	use libmysqlclient && mysqllib="${EPREFIX}/usr"
-	use libmysqlclient && mysqlilib="${EPREFIX}/usr/bin/mysql_config"
-
-	my_conf+=" $(use_with mysql mysql $mysqllib)"
-	my_conf+=" $(use_with mysqli mysqli $mysqlilib)"
-
-	local mysqlsock=" $(use_with mysql mysql-sock ${EPREFIX}/var/run/mysqld/mysqld.sock)"
-	if use mysql ; then
-		my_conf+="${mysqlsock}"
-	elif use mysqli ; then
-		my_conf+="${mysqlsock}"
-	fi
-
-	# ODBC support
-	if use odbc ; then
-		my_conf+="
-		$(use_with odbc unixODBC ${EPREFIX}/usr)"
-	fi
-
-	if use iodbc ; then
-		my_conf+="
-		$(use_with iodbc iodbc ${EPREFIX}/usr)"
-	fi
-
-	# Oracle support
-	if use oci8-instant-client ; then
-		my_conf+="
-		$(use_with oci8-instant-client oci8)"
-	fi
-
-	# PDO support
-	if use pdo ; then
-		my_conf+="
-		$(use_with mssql pdo-dblib )
-		$(use_with mysql pdo-mysql ${mysqllib})
-		$(use_with postgres pdo-pgsql )
-		$(use_with sqlite pdo-sqlite ${EPREFIX}/usr)
-		$(use_with odbc pdo-odbc unixODBC,${EPREFIX}/usr)"
-		if use oci8-instant-client ; then
-			my_conf+="
-			$(use_with oci8-instant-client pdo-oci)"
-		fi
-	fi
-
-	# readline/libedit support
-	my_conf+="
-	$(use_with readline readline ${EPREFIX}/usr)
-	$(use_with libedit libedit ${EPREFIX}/usr)"
-
-	# Session support
-	if use session ; then
-		my_conf+="
-		$(use_with sharedmem mm ${EPREFIX}/usr)"
-	else
-		my_conf+="
-		$(use_enable session session )"
-	fi
-
-	# Use pic for shared modules such as apache2's mod_php
-	my_conf="${my_conf} --with-pic"
-
-	# we use the system copy of pcre
-	# --with-pcre-regex affects ext/pcre
-	# --with-pcre-dir affects ext/filter and ext/zip
-	my_conf="${my_conf} --with-pcre-regex=${EPREFIX}/usr --with-pcre-dir=${EPREFIX}/usr"
-
-	# Catch CFLAGS problems
-	# Fixes bug #14067.
-	# Changed order to run it in reverse for bug #32022 and #12021.
-	replace-cpu-flags "k6*" "i586"
-
-	# Support user-passed configuration parameters
-	my_conf="${my_conf} ${EXTRA_ECONF:-}"
-
-	# Support the Apache2 extras, they must be set globally for all
-	# SAPIs to work correctly, especially for external PHP extensions
-
-	mkdir -p "${WORKDIR}/sapis-build"
-	for one_sapi in $SAPIS ; do
-		use "${one_sapi}" || continue
-		php_set_ini_dir "${one_sapi}"
-
-		cp -r "${S}" "${WORKDIR}/sapis-build/${one_sapi}"
-		cd "${WORKDIR}/sapis-build/${one_sapi}"
-
-		sapi_conf="${my_conf} --with-config-file-path=${PHP_INI_DIR}
-			--with-config-file-scan-dir=${PHP_EXT_INI_DIR_ACTIVE}"
-
-		for sapi in $SAPIS ; do
-			case "$sapi" in
-				cli|cgi|embed|fpm)
-					if [[ "${one_sapi}" == "${sapi}" ]] ; then
-						sapi_conf="${sapi_conf} --enable-${sapi}"
-					else
-						sapi_conf="${sapi_conf} --disable-${sapi}"
-					fi
-					;;
-
-				apache2)
-					if [[ "${one_sapi}" == "${sapi}" ]] ; then
-						sapi_conf="${sapi_conf} --with-apxs2=${EPREFIX}/usr/sbin/apxs"
-					else
-						sapi_conf="${sapi_conf} --without-apxs2"
-					fi
-					;;
-			esac
-		done
-
-		econf ${sapi_conf}
-	done
-}
-
-src_compile() {
-	# snmp seems to run during src_compile, too (bug #324739)
-	addpredict /usr/share/snmp/mibs/.index
-	addpredict /var/lib/net-snmp/mib_indexes
-
-	for sapi in ${SAPIS} ; do
-		if use "${sapi}"; then
-			cd "${WORKDIR}/sapis-build/$sapi" || "Failed to change dir to ${WORKDIR}/sapis-build/$1"
-			emake || die "emake failed"
-		fi
-	done
-}
-
-src_install() {
-	# see bug #324739 for what happens when we don't have that
-	addpredict /usr/share/snmp/mibs/.index
-
-	# grab the first SAPI that got built and install common files from there
-	local first_sapi=""
-	for sapi in $SAPIS ; do
-		if use $sapi ; then
-			first_sapi=$sapi
-			break
-		fi
-	done
-
-	# Makefile forgets to create this before trying to write to it...
-	dodir "${PHP_DESTDIR#${EPREFIX}}/bin"
-
-	# Install php environment (without any sapis)
-	cd "${WORKDIR}/sapis-build/$first_sapi"
-	emake INSTALL_ROOT="${D}" \
-		install-build install-headers install-programs \
-		|| die "emake install failed"
-
-	local extension_dir="$("${ED}/${PHP_DESTDIR#${EPREFIX}}/bin/php-config" --extension-dir)"
-
-	# Create the directory where we'll put version-specific php scripts
-	keepdir /usr/share/php${PHP_MV}
-
-	local sapi="", file=""
-	local sapi_list=""
-
-	for sapi in ${SAPIS}; do
-		if use "${sapi}" ; then
-			einfo "Installing SAPI: ${sapi}"
-			cd "${WORKDIR}/sapis-build/${sapi}"
-
-			if [[ "${sapi}" == "apache2" ]] ; then
-				# We're specifically not using emake install-sapi as libtool
-				# may cause unnecessary relink failures (see bug #351266)
-				insinto "${PHP_DESTDIR#${EPREFIX}}/apache2/"
-				newins ".libs/libphp5$(get_libname)" "libphp${PHP_MV}$(get_libname)"
-				keepdir "/usr/$(get_libdir)/apache2/modules"
-			else
-				# needed each time, php_install_ini would reset it
-				local dest="${PHP_DESTDIR#${EPREFIX}}"
-				into "${dest}"
-				case "$sapi" in
-					cli)
-						source="sapi/cli/php"
-						;;
-					cgi)
-						source="sapi/cgi/php-cgi"
-						;;
-					fpm)
-						source="sapi/fpm/php-fpm"
-						;;
-					embed)
-						source="libs/libphp${PHP_MV}$(get_libname)"
-						;;
-					*)
-						die "unhandled sapi in src_install"
-						;;
-				esac
-
-				if [[ "${source}" == *"$(get_libname)" ]]; then
-					dolib.so "${source}" || die "Unable to install ${sapi} sapi"
-				else
-					dobin "${source}" || die "Unable to install ${sapi} sapi"
-					local name="$(basename ${source})"
-					dosym "${dest}/bin/${name}" "/usr/bin/${name}${SLOT}"
-				fi
-			fi
-
-			php_install_ini "${sapi}"
-
-			# construct correct SAPI string for php-config
-			# thanks to ferringb for the bash voodoo
-			if [[ "${sapi}" == "apache2" ]]; then
-				sapi_list="${sapi_list:+${sapi_list} }apache2handler"
-			else
-				sapi_list="${sapi_list:+${sapi_list} }${sapi}"
-			fi
-		fi
-	done
-
-	# Installing opcache module
-	if use_if_iuse opcache ; then
-		dolib.so "modules/opcache$(get_libname)" || die "Unable to install opcache module"
-	fi
-
-	# Install env.d files
-	newenvd "${FILESDIR}/20php5-envd" \
-		"20php${SLOT}"
-	sed -e "s|/lib/|/$(get_libdir)/|g" -i \
-		"${ED}/etc/env.d/20php${SLOT}"
-	sed -e "s|php5|php${SLOT}|g" -i \
-		"${ED}/etc/env.d/20php${SLOT}"
-
-	# set php-config variable correctly (bug #278439)
-	sed -e "s:^\(php_sapis=\)\".*\"$:\1\"${sapi_list}\":" -i \
-		"${ED}/usr/$(get_libdir)/php${SLOT}/bin/php-config"
-
-	if use fpm ; then
-		if use systemd; then
-			systemd_newunit "${FILESDIR}/php-fpm_at.service" "php-fpm@${SLOT}.service"
-		else
-			systemd_newunit "${FILESDIR}/php-fpm_at-simple.service" "php-fpm@${SLOT}.service"
-		fi
-	fi
-}
-
-src_test() {
-	echo ">>> Test phase [test]: ${CATEGORY}/${PF}"
-	PHP_BIN="${WORKDIR}/sapis-build/cli/sapi/cli/php"
-	if [[ ! -x "${PHP_BIN}" ]] ; then
-		ewarn "Test phase requires USE=cli, skipping"
-		return
-	else
-		export TEST_PHP_EXECUTABLE="${PHP_BIN}"
-	fi
-
-	if [[ -x "${WORKDIR}/sapis/cgi/php-cgi" ]] ; then
-		export TEST_PHP_CGI_EXECUTABLE="${WORKDIR}/sapis/cgi/php-cgi"
-	fi
-
-	REPORT_EXIT_STATUS=1 "${TEST_PHP_EXECUTABLE}" -n  -d "session.save_path=${T}" \
-		"${WORKDIR}/sapis-build/cli/run-tests.php" -n -q -d "session.save_path=${T}"
-
-	for name in ${EXPECTED_TEST_FAILURES}; do
-		mv "${name}.out" "${name}.out.orig" 2>/dev/null
-	done
-
-	local failed="$(find -name '*.out')"
-	if [[ ${failed} != "" ]] ; then
-		ewarn "The following test cases failed unexpectedly:"
-		for name in ${failed}; do
-			ewarn "  ${name/.out/}"
-		done
-	else
-		einfo "No unexpected test failures, all fine"
-	fi
-
-	if [[ ${PHP_SHOW_UNEXPECTED_TEST_PASS} == "1" ]] ; then
-		local passed=""
-		for name in ${EXPECTED_TEST_FAILURES}; do
-			[[ -f "${name}.diff" ]] && continue
-			passed="${passed} ${name}"
-		done
-		if [[ ${passed} != "" ]] ; then
-			einfo "The following test cases passed unexpectedly:"
-			for name in ${passed}; do
-				ewarn "  ${passed}"
-			done
-		else
-			einfo "None of the known-to-fail tests passed, all fine"
-		fi
-	fi
-}
-
-pkg_postinst() {
-	# Output some general info to the user
-	if use apache2 ; then
-		APACHE2_MOD_DEFINE="PHP5"
-		APACHE2_MOD_CONF="70_mod_php5"  # actually provided by app-eselect/eselect-php
-		apache-module_pkg_postinst
-	fi
-
-	# Create the symlinks for php
-	for m in ${SAPIS}; do
-		[[ ${m} == 'embed' ]] && continue;
-		if use $m ; then
-			local ci=$(eselect php show $m)
-			if [[ -z $ci ]]; then
-				eselect php set $m php${SLOT}
-				einfo "Switched ${m} to use php:${SLOT}"
-				einfo
-			elif [[ $ci != "php${SLOT}" ]] ; then
-				elog "To switch $m to use php:${SLOT}, run"
-				elog "    eselect php set $m php${SLOT}"
-				elog
-			fi
-		fi
-	done
-
-	elog "Make sure that PHP_TARGETS in ${EPREFIX}/etc/make.conf includes php${SLOT/./-} in order"
-	elog "to compile extensions for the ${SLOT} ABI"
-	elog
-	if ! use readline && use cli ; then
-		ewarn "Note that in order to use php interactivly, you need to enable"
-		ewarn "the readline USE flag or php -a will hang"
-	fi
-	elog
-	elog "This ebuild installed a version of php.ini based on php.ini-${PHP_INI_VERSION} version."
-	elog "You can chose which version of php.ini to install by default by setting PHP_INI_VERSION to either"
-	elog "'production' or 'development' in ${EPREFIX}/etc/make.conf"
-	elog "Both versions of php.ini can be found in ${EPREFIX}/usr/share/doc/${PF}"
-
-	elog
-	elog "For more details on how minor version slotting works (PHP_TARGETS) please read the upgrade guide:"
-	elog "https://www.gentoo.org/proj/en/php/php-upgrading.xml"
-	elog
-}
-
-pkg_prerm() {
-	eselect php cleanup
-}
diff --git a/dev-lang/php/php-5.5.26.ebuild b/dev-lang/php/php-5.5.26.ebuild
deleted file mode 100644
index aeedfb4d9ba5..000000000000
--- a/dev-lang/php/php-5.5.26.ebuild
+++ /dev/null
@@ -1,784 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils autotools flag-o-matic versionator depend.apache apache-module db-use libtool systemd
-
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-
-function php_get_uri ()
-{
-	case "${1}" in
-		"php-pre")
-			echo "http://downloads.php.net/dsp/${2}"
-		;;
-		"php")
-			echo "http://www.php.net/distributions/${2}"
-		;;
-		"olemarkus")
-			echo "https://dev.gentoo.org/~olemarkus/php/${2}"
-		;;
-		"gentoo")
-			echo "mirror://gentoo/${2}"
-		;;
-		*)
-			die "unhandled case in php_get_uri"
-		;;
-	esac
-}
-
-PHP_MV="$(get_major_version)"
-SLOT="$(get_version_component_range 1-2)"
-
-# alias, so we can handle different types of releases (finals, rcs, alphas,
-# betas, ...) w/o changing the whole ebuild
-PHP_PV="${PV/_rc/RC}"
-PHP_PV="${PHP_PV/_alpha/alpha}"
-PHP_PV="${PHP_PV/_beta/beta}"
-PHP_RELEASE="php"
-[[ ${PV} == ${PV/_alpha/} ]] || PHP_RELEASE="php-pre"
-[[ ${PV} == ${PV/_beta/} ]] || PHP_RELEASE="php-pre"
-[[ ${PV} == ${PV/_rc/} ]] || PHP_RELEASE="php-pre"
-PHP_P="${PN}-${PHP_PV}"
-
-PHP_SRC_URI="$(php_get_uri "${PHP_RELEASE}" "${PHP_P}.tar.bz2")"
-
-PHP_FPM_CONF_VER="1"
-
-SRC_URI="${PHP_SRC_URI}"
-
-DESCRIPTION="The PHP language runtime engine: CLI, CGI, FPM/FastCGI, Apache2 and embed SAPIs"
-HOMEPAGE="http://php.net/"
-LICENSE="PHP-3"
-
-S="${WORKDIR}/${PHP_P}"
-
-# We can build the following SAPIs in the given order
-SAPIS="embed cli cgi fpm apache2"
-
-# SAPIs and SAPI-specific USE flags (cli SAPI is default on):
-IUSE="${IUSE}
-	${SAPIS/cli/+cli}
-	threads"
-
-IUSE="${IUSE} bcmath berkdb bzip2 calendar cdb cjk
-	crypt +ctype curl debug
-	enchant exif frontbase +fileinfo +filter firebird
-	flatfile ftp gd gdbm gmp +hash +iconv imap inifile
-	intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit mhash
-	mssql mysql libmysqlclient mysqli nls
-	oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm
-	readline recode selinux +session sharedmem
-	+simplexml snmp soap sockets spell sqlite ssl
-	sybase-ct sysvipc systemd tidy +tokenizer truetype unicode vpx wddx
-	+xml xmlreader xmlwriter xmlrpc xpm xslt zip zlib"
-
-DEPEND="
-	>=app-eselect/eselect-php-0.7.1-r3[apache2?,fpm?]
-	>=dev-libs/libpcre-8.32[unicode]
-	apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=]
-		<www-servers/apache-2.4[threads=] ) )
-	berkdb? ( =sys-libs/db-4* )
-	bzip2? ( app-arch/bzip2 )
-	cdb? ( || ( dev-db/cdb dev-db/tinycdb ) )
-	cjk? ( !gd? (
-		virtual/jpeg:0
-		media-libs/libpng:0=
-		sys-libs/zlib
-	) )
-	crypt? ( >=dev-libs/libmcrypt-2.4 )
-	curl? ( >=net-misc/curl-7.10.5 )
-	enchant? ( app-text/enchant )
-	exif? ( !gd? (
-		virtual/jpeg:0
-		media-libs/libpng:0=
-		sys-libs/zlib
-	) )
-	firebird? ( dev-db/firebird )
-	gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib )
-	gdbm? ( >=sys-libs/gdbm-1.8.0 )
-	gmp? ( >=dev-libs/gmp-4.1.2 )
-	iconv? ( virtual/libiconv )
-	imap? ( virtual/imap-c-client[ssl=] )
-	intl? ( dev-libs/icu:= )
-	iodbc? ( dev-db/libiodbc )
-	kerberos? ( virtual/krb5 )
-	ldap? ( >=net-nds/openldap-1.2.11 )
-	ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 )
-	libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) )
-	mssql? ( dev-db/freetds[mssql] )
-	libmysqlclient? (
-		mysql? ( virtual/mysql )
-		mysqli? ( >=virtual/mysql-4.1 )
-	)
-	nls? ( sys-devel/gettext )
-	oci8-instant-client? ( dev-db/oracle-instantclient-basic )
-	odbc? ( >=dev-db/unixODBC-1.8.13 )
-	postgres? ( dev-db/postgresql )
-	qdbm? ( dev-db/qdbm )
-	readline? ( sys-libs/readline )
-	recode? ( app-text/recode )
-	sharedmem? ( dev-libs/mm )
-	simplexml? ( >=dev-libs/libxml2-2.6.8 )
-	snmp? ( >=net-analyzer/net-snmp-5.2 )
-	soap? ( >=dev-libs/libxml2-2.6.8 )
-	spell? ( >=app-text/aspell-0.50 )
-	sqlite? ( >=dev-db/sqlite-3.7.6.3 )
-	ssl? ( >=dev-libs/openssl-0.9.7 )
-	sybase-ct? ( dev-db/freetds )
-	tidy? ( app-text/htmltidy )
-	truetype? (
-		=media-libs/freetype-2*
-		>=media-libs/t1lib-5.0.0
-		!gd? (
-			virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib )
-	)
-	unicode? ( dev-libs/oniguruma )
-	vpx? ( media-libs/libvpx )
-	wddx? ( >=dev-libs/libxml2-2.6.8 )
-	xml? ( >=dev-libs/libxml2-2.6.8 )
-	xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv )
-	xmlreader? ( >=dev-libs/libxml2-2.6.8 )
-	xmlwriter? ( >=dev-libs/libxml2-2.6.8 )
-	xpm? (
-		x11-libs/libXpm
-		virtual/jpeg:0
-		media-libs/libpng:0= sys-libs/zlib
-	)
-	xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 )
-	zip? ( sys-libs/zlib )
-	zlib? ( sys-libs/zlib )
-	virtual/mta
-"
-
-php="=${CATEGORY}/${PF}"
-
-REQUIRED_USE="
-	truetype? ( gd )
-	vpx? ( gd )
-	cjk? ( gd )
-	exif? ( gd )
-
-	xpm? ( gd )
-	gd? ( zlib )
-	simplexml? ( xml )
-	soap? ( xml )
-	wddx? ( xml )
-	xmlrpc? ( || ( xml iconv ) )
-	xmlreader? ( xml )
-	xslt? ( xml )
-	ldap-sasl? ( ldap )
-	mhash? ( hash )
-	phar? ( hash )
-	libmysqlclient? ( || (
-		mysql
-		mysqli
-		pdo
-	) )
-
-	qdbm? ( !gdbm )
-	readline? ( !libedit )
-	recode? ( !imap !mysql !mysqli )
-	sharedmem? ( !threads )
-
-	!cli? ( !cgi? ( !fpm? ( !apache2? ( !embed? ( cli ) ) ) ) )"
-
-RDEPEND="${DEPEND}"
-
-RDEPEND="${RDEPEND}
-	fpm? (
-		selinux? ( sec-policy/selinux-phpfpm )
-		systemd? ( sys-apps/systemd ) )"
-
-DEPEND="${DEPEND}
-	sys-devel/flex
-	>=sys-devel/m4-1.4.3
-	>=sys-devel/libtool-1.5.18"
-
-# Allow users to install production version if they want to
-
-case "${PHP_INI_VERSION}" in
-	production|development)
-		;;
-	*)
-		PHP_INI_VERSION="development"
-		;;
-esac
-
-PHP_INI_UPSTREAM="php.ini-${PHP_INI_VERSION}"
-PHP_INI_FILE="php.ini"
-
-want_apache
-
-pkg_setup() {
-	depend.apache_pkg_setup
-}
-
-php_install_ini() {
-	local phpsapi="${1}"
-
-	# work out where we are installing the ini file
-	php_set_ini_dir "${phpsapi}"
-
-	local phpinisrc="${PHP_INI_UPSTREAM}-${phpsapi}"
-	cp "${PHP_INI_UPSTREAM}" "${phpinisrc}"
-
-	# default to /tmp for save_path, bug #282768
-	sed -e 's|^;session.save_path .*$|session.save_path = "'"${EPREFIX}"'/tmp"|g' -i "${phpinisrc}"
-
-	# Set the extension dir
-	sed -e "s|^extension_dir .*$|extension_dir = ${extension_dir}|g" -i "${phpinisrc}"
-
-	# Set the include path to point to where we want to find PEAR packages
-	sed -e 's|^;include_path = ".:/php/includes".*|include_path = ".:'"${EPREFIX}"'/usr/share/php'${PHP_MV}':'"${EPREFIX}"'/usr/share/php"|' -i "${phpinisrc}"
-
-	dodir "${PHP_INI_DIR#${EPREFIX}}"
-	insinto "${PHP_INI_DIR#${EPREFIX}}"
-	newins "${phpinisrc}" "${PHP_INI_FILE}"
-
-	elog "Installing php.ini for ${phpsapi} into ${PHP_INI_DIR#${EPREFIX}}"
-	elog
-
-	dodir "${PHP_EXT_INI_DIR#${EPREFIX}}"
-	dodir "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}"
-
-	if use_if_iuse opcache; then
-		elog "Adding opcache to $PHP_EXT_INI_DIR"
-		echo "zend_extension=${PHP_DESTDIR}/$(get_libdir)/opcache.so" >> "${D}/${PHP_EXT_INI_DIR}"/opcache.ini
-		dosym "${PHP_EXT_INI_DIR#${EPREFIX}}/opcache.ini" "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}/opcache.ini"
-	fi
-
-	# SAPI-specific handling
-
-	if [[ "${sapi}" == "fpm" ]] ; then
-		[[ -z ${PHP_FPM_CONF_VER} ]] && PHP_FPM_CONF_VER=0
-		einfo "Installing FPM CGI config file php-fpm.conf"
-		insinto "${PHP_INI_DIR#${EPREFIX}}"
-		newins "${FILESDIR}/php-fpm-r${PHP_FPM_CONF_VER}.conf" php-fpm.conf
-
-		# Remove bogus /etc/php-fpm.conf.default (bug 359906)
-		[[ -f "${ED}/etc/php-fpm.conf.default" ]] && rm "${ED}/etc/php-fpm.conf.default"
-	fi
-
-	# Install PHP ini files into /usr/share/php
-
-	dodoc php.ini-development
-	dodoc php.ini-production
-
-}
-
-php_set_ini_dir() {
-	PHP_INI_DIR="${EPREFIX}/etc/php/${1}-php${SLOT}"
-	PHP_EXT_INI_DIR="${PHP_INI_DIR}/ext"
-	PHP_EXT_INI_DIR_ACTIVE="${PHP_INI_DIR}/ext-active"
-}
-
-src_prepare() {
-	# USE=sharedmem (session/mod_mm to be exact) tries to mmap() this path
-	# ([empty session.save_path]/session_mm_[sapi][gid].sem)
-	# there is no easy way to circumvent that, all php calls during
-	# install use -n, so no php.ini file will be used.
-	# As such, this is the easiest way to get around
-	addpredict /session_mm_cli250.sem
-	addpredict /session_mm_cli0.sem
-
-	# Change PHP branding
-	# Get the alpha/beta/rc version
-	sed -re	"s|^(PHP_EXTRA_VERSION=\").*(\")|\1-pl${PR/r/}-gentoo\2|g" \
-		-i configure.in || die "Unable to change PHP branding"
-
-	# Patch PHP to show Gentoo as the server platform
-	sed -e 's/PHP_UNAME=`uname -a | xargs`/PHP_UNAME=`uname -s -n -r -v | xargs`/g' \
-		-i configure.in || die "Failed to fix server platform name"
-
-	# Prevent PHP from activating the Apache config,
-	# as we will do that ourselves
-	sed -i \
-		-e "s,-i -a -n php${PHP_MV},-i -n php${PHP_MV},g" \
-		-e "s,-i -A -n php${PHP_MV},-i -n php${PHP_MV},g" \
-		configure sapi/apache2filter/config.m4 sapi/apache2handler/config.m4
-
-	# Patch PHP to support heimdal instead of mit-krb5
-	if has_version "app-crypt/heimdal" ; then
-		sed -e 's|gssapi_krb5|gssapi|g' -i acinclude.m4 \
-			|| die "Failed to fix heimdal libname"
-		sed -e 's|PHP_ADD_LIBRARY(k5crypto, 1, $1)||g' -i acinclude.m4 \
-			|| die "Failed to fix heimdal crypt library reference"
-	fi
-
-	#Add user patches #357637
-	epatch_user
-
-	#force rebuilding aclocal.m4
-	rm aclocal.m4
-	eautoreconf
-
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		# http://bugs.php.net/bug.php?id=48795, bug #343481
-		sed -i -e '/BUILD_CGI="\\$(CC)/s/CC/CXX/' configure || die
-	fi
-}
-
-src_configure() {
-	addpredict /usr/share/snmp/mibs/.index
-	addpredict /var/lib/net-snmp/mib_indexes
-
-	PHP_DESTDIR="${EPREFIX}/usr/$(get_libdir)/php${SLOT}"
-
-	# This is a global variable and should be in caps. It isn't because the
-	# phpconfutils eclass relies on exactly this name...
-	# for --with-libdir see bug #327025
-	my_conf="
-		--prefix="${PHP_DESTDIR}"
-		--mandir="${PHP_DESTDIR}"/man
-		--infodir="${PHP_DESTDIR}"/info
-		--libdir="${PHP_DESTDIR}"/lib
-		--with-libdir=$(get_libdir)
-		--without-pear
-		$(use_enable threads maintainer-zts)"
-
-	#                             extension		  USE flag        shared
-	my_conf+="
-	$(use_enable bcmath bcmath )
-	$(use_with bzip2 bz2 "${EPREFIX}"/usr)
-	$(use_enable calendar calendar )
-	$(use_enable ctype ctype )
-	$(use_with curl curl "${EPREFIX}"/usr)
-	$(use_enable xml dom )
-	$(use_with enchant enchant "${EPREFIX}"/usr)
-	$(use_enable exif exif )
-	$(use_enable fileinfo fileinfo )
-	$(use_enable filter filter )
-	$(use_enable ftp ftp )
-	$(use_with nls gettext "${EPREFIX}"/usr)
-	$(use_with gmp gmp "${EPREFIX}"/usr)
-	$(use_enable hash hash )
-	$(use_with mhash mhash "${EPREFIX}"/usr)
-	$(use_with iconv iconv $(use elibc_glibc || use elibc_musl || echo "${EPREFIX}"/usr))
-	$(use_enable intl intl )
-	$(use_enable ipv6 ipv6 )
-	$(use_enable json json )
-	$(use_with kerberos kerberos "${EPREFIX}"/usr)
-	$(use_enable xml libxml )
-	$(use_with xml libxml-dir "${EPREFIX}"/usr)
-	$(use_enable unicode mbstring )
-	$(use_with crypt mcrypt "${EPREFIX}"/usr)
-	$(use_with mssql mssql "${EPREFIX}"/usr)
-	$(use_with unicode onig "${EPREFIX}"/usr)
-	$(use_with ssl openssl "${EPREFIX}"/usr)
-	$(use_with ssl openssl-dir "${EPREFIX}"/usr)
-	$(use_enable pcntl pcntl )
-	$(use_enable phar phar )
-	$(use_enable pdo pdo )
-	$(use_enable opcache opcache )
-	$(use_with postgres pgsql "${EPREFIX}"/usr)
-	$(use_enable posix posix )
-	$(use_with spell pspell "${EPREFIX}"/usr)
-	$(use_with recode recode "${EPREFIX}"/usr)
-	$(use_enable simplexml simplexml )
-	$(use_enable sharedmem shmop )
-	$(use_with snmp snmp "${EPREFIX}"/usr)
-	$(use_enable soap soap )
-	$(use_enable sockets sockets )
-	$(use_with sqlite sqlite3 "${EPREFIX}"/usr)
-	$(use_with sybase-ct sybase-ct "${EPREFIX}"/usr)
-	$(use_enable sysvipc sysvmsg )
-	$(use_enable sysvipc sysvsem )
-	$(use_enable sysvipc sysvshm )
-	$(use_with systemd fpm-systemd)
-	$(use_with tidy tidy "${EPREFIX}"/usr)
-	$(use_enable tokenizer tokenizer )
-	$(use_enable wddx wddx )
-	$(use_enable xml xml )
-	$(use_enable xmlreader xmlreader )
-	$(use_enable xmlwriter xmlwriter )
-	$(use_with xmlrpc xmlrpc)
-	$(use_with xslt xsl "${EPREFIX}"/usr)
-	$(use_enable zip zip )
-	$(use_with zlib zlib "${EPREFIX}"/usr)
-	$(use_enable debug debug )"
-
-	# DBA support
-	if use cdb || use berkdb || use flatfile || use gdbm || use inifile \
-		|| use qdbm ; then
-		my_conf="${my_conf} --enable-dba${shared}"
-	fi
-
-	# DBA drivers support
-	my_conf+="
-	$(use_with cdb cdb)
-	$(use_with berkdb db4 ${EPREFIX}/usr)
-	$(use_enable flatfile flatfile )
-	$(use_with gdbm gdbm ${EPREFIX}/usr)
-	$(use_enable inifile inifile )
-	$(use_with qdbm qdbm ${EPREFIX}/usr)"
-
-	# Support for the GD graphics library
-	my_conf+="
-	$(use_with truetype freetype-dir ${EPREFIX}/usr)
-	$(use_with truetype t1lib ${EPREFIX}/usr)
-	$(use_enable cjk gd-jis-conv )
-	$(use_with gd jpeg-dir ${EPREFIX}/usr)
-	$(use_with gd png-dir ${EPREFIX}/usr)
-	$(use_with xpm xpm-dir ${EPREFIX}/usr)
-	$(use_with vpx vpx-dir ${EPREFIX}/usr)"
-	# enable gd last, so configure can pick up the previous settings
-	my_conf+="
-	$(use_with gd gd)"
-
-	# IMAP support
-	if use imap ; then
-		my_conf+="
-		$(use_with imap imap ${EPREFIX}/usr)
-		$(use_with ssl imap-ssl ${EPREFIX}/usr)"
-	fi
-
-	# Interbase/firebird support
-
-	if use firebird ; then
-		my_conf+="
-		$(use_with firebird interbase ${EPREFIX}/usr)"
-	fi
-
-	# LDAP support
-	if use ldap ; then
-		my_conf+="
-		$(use_with ldap ldap ${EPREFIX}/usr)
-		$(use_with ldap-sasl ldap-sasl ${EPREFIX}/usr)"
-	fi
-
-	# MySQL support
-	local mysqllib="mysqlnd"
-	local mysqlilib="mysqlnd"
-	use libmysqlclient && mysqllib="${EPREFIX}/usr"
-	use libmysqlclient && mysqlilib="${EPREFIX}/usr/bin/mysql_config"
-
-	my_conf+=" $(use_with mysql mysql $mysqllib)"
-	my_conf+=" $(use_with mysqli mysqli $mysqlilib)"
-
-	local mysqlsock=" $(use_with mysql mysql-sock ${EPREFIX}/var/run/mysqld/mysqld.sock)"
-	if use mysql ; then
-		my_conf+="${mysqlsock}"
-	elif use mysqli ; then
-		my_conf+="${mysqlsock}"
-	fi
-
-	# ODBC support
-	if use odbc ; then
-		my_conf+="
-		$(use_with odbc unixODBC ${EPREFIX}/usr)"
-	fi
-
-	if use iodbc ; then
-		my_conf+="
-		$(use_with iodbc iodbc ${EPREFIX}/usr)"
-	fi
-
-	# Oracle support
-	if use oci8-instant-client ; then
-		my_conf+="
-		$(use_with oci8-instant-client oci8)"
-	fi
-
-	# PDO support
-	if use pdo ; then
-		my_conf+="
-		$(use_with mssql pdo-dblib )
-		$(use_with mysql pdo-mysql ${mysqllib})
-		$(use_with postgres pdo-pgsql )
-		$(use_with sqlite pdo-sqlite ${EPREFIX}/usr)
-		$(use_with odbc pdo-odbc unixODBC,${EPREFIX}/usr)"
-		if use oci8-instant-client ; then
-			my_conf+="
-			$(use_with oci8-instant-client pdo-oci)"
-		fi
-	fi
-
-	# readline/libedit support
-	my_conf+="
-	$(use_with readline readline ${EPREFIX}/usr)
-	$(use_with libedit libedit ${EPREFIX}/usr)"
-
-	# Session support
-	if use session ; then
-		my_conf+="
-		$(use_with sharedmem mm ${EPREFIX}/usr)"
-	else
-		my_conf+="
-		$(use_enable session session )"
-	fi
-
-	# Use pic for shared modules such as apache2's mod_php
-	my_conf="${my_conf} --with-pic"
-
-	# we use the system copy of pcre
-	# --with-pcre-regex affects ext/pcre
-	# --with-pcre-dir affects ext/filter and ext/zip
-	my_conf="${my_conf} --with-pcre-regex=${EPREFIX}/usr --with-pcre-dir=${EPREFIX}/usr"
-
-	# Catch CFLAGS problems
-	# Fixes bug #14067.
-	# Changed order to run it in reverse for bug #32022 and #12021.
-	replace-cpu-flags "k6*" "i586"
-
-	# Support user-passed configuration parameters
-	my_conf="${my_conf} ${EXTRA_ECONF:-}"
-
-	# Support the Apache2 extras, they must be set globally for all
-	# SAPIs to work correctly, especially for external PHP extensions
-
-	mkdir -p "${WORKDIR}/sapis-build"
-	for one_sapi in $SAPIS ; do
-		use "${one_sapi}" || continue
-		php_set_ini_dir "${one_sapi}"
-
-		cp -r "${S}" "${WORKDIR}/sapis-build/${one_sapi}"
-		cd "${WORKDIR}/sapis-build/${one_sapi}"
-
-		sapi_conf="${my_conf} --with-config-file-path=${PHP_INI_DIR}
-			--with-config-file-scan-dir=${PHP_EXT_INI_DIR_ACTIVE}"
-
-		for sapi in $SAPIS ; do
-			case "$sapi" in
-				cli|cgi|embed|fpm)
-					if [[ "${one_sapi}" == "${sapi}" ]] ; then
-						sapi_conf="${sapi_conf} --enable-${sapi}"
-					else
-						sapi_conf="${sapi_conf} --disable-${sapi}"
-					fi
-					;;
-
-				apache2)
-					if [[ "${one_sapi}" == "${sapi}" ]] ; then
-						sapi_conf="${sapi_conf} --with-apxs2=${EPREFIX}/usr/sbin/apxs"
-					else
-						sapi_conf="${sapi_conf} --without-apxs2"
-					fi
-					;;
-			esac
-		done
-
-		econf ${sapi_conf}
-	done
-}
-
-src_compile() {
-	# snmp seems to run during src_compile, too (bug #324739)
-	addpredict /usr/share/snmp/mibs/.index
-	addpredict /var/lib/net-snmp/mib_indexes
-
-	for sapi in ${SAPIS} ; do
-		if use "${sapi}"; then
-			cd "${WORKDIR}/sapis-build/$sapi" || "Failed to change dir to ${WORKDIR}/sapis-build/$1"
-			emake || die "emake failed"
-		fi
-	done
-}
-
-src_install() {
-	# see bug #324739 for what happens when we don't have that
-	addpredict /usr/share/snmp/mibs/.index
-
-	# grab the first SAPI that got built and install common files from there
-	local first_sapi=""
-	for sapi in $SAPIS ; do
-		if use $sapi ; then
-			first_sapi=$sapi
-			break
-		fi
-	done
-
-	# Makefile forgets to create this before trying to write to it...
-	dodir "${PHP_DESTDIR#${EPREFIX}}/bin"
-
-	# Install php environment (without any sapis)
-	cd "${WORKDIR}/sapis-build/$first_sapi"
-	emake INSTALL_ROOT="${D}" \
-		install-build install-headers install-programs \
-		|| die "emake install failed"
-
-	local extension_dir="$("${ED}/${PHP_DESTDIR#${EPREFIX}}/bin/php-config" --extension-dir)"
-
-	# Create the directory where we'll put version-specific php scripts
-	keepdir /usr/share/php${PHP_MV}
-
-	local sapi="", file=""
-	local sapi_list=""
-
-	for sapi in ${SAPIS}; do
-		if use "${sapi}" ; then
-			einfo "Installing SAPI: ${sapi}"
-			cd "${WORKDIR}/sapis-build/${sapi}"
-
-			if [[ "${sapi}" == "apache2" ]] ; then
-				# We're specifically not using emake install-sapi as libtool
-				# may cause unnecessary relink failures (see bug #351266)
-				insinto "${PHP_DESTDIR#${EPREFIX}}/apache2/"
-				newins ".libs/libphp5$(get_libname)" "libphp${PHP_MV}$(get_libname)"
-				keepdir "/usr/$(get_libdir)/apache2/modules"
-			else
-				# needed each time, php_install_ini would reset it
-				local dest="${PHP_DESTDIR#${EPREFIX}}"
-				into "${dest}"
-				case "$sapi" in
-					cli)
-						source="sapi/cli/php"
-						;;
-					cgi)
-						source="sapi/cgi/php-cgi"
-						;;
-					fpm)
-						source="sapi/fpm/php-fpm"
-						;;
-					embed)
-						source="libs/libphp${PHP_MV}$(get_libname)"
-						;;
-					*)
-						die "unhandled sapi in src_install"
-						;;
-				esac
-
-				if [[ "${source}" == *"$(get_libname)" ]]; then
-					dolib.so "${source}" || die "Unable to install ${sapi} sapi"
-				else
-					dobin "${source}" || die "Unable to install ${sapi} sapi"
-					local name="$(basename ${source})"
-					dosym "${dest}/bin/${name}" "/usr/bin/${name}${SLOT}"
-				fi
-			fi
-
-			php_install_ini "${sapi}"
-
-			# construct correct SAPI string for php-config
-			# thanks to ferringb for the bash voodoo
-			if [[ "${sapi}" == "apache2" ]]; then
-				sapi_list="${sapi_list:+${sapi_list} }apache2handler"
-			else
-				sapi_list="${sapi_list:+${sapi_list} }${sapi}"
-			fi
-		fi
-	done
-
-	# Installing opcache module
-	if use_if_iuse opcache ; then
-		dolib.so "modules/opcache$(get_libname)" || die "Unable to install opcache module"
-	fi
-
-	# Install env.d files
-	newenvd "${FILESDIR}/20php5-envd" \
-		"20php${SLOT}"
-	sed -e "s|/lib/|/$(get_libdir)/|g" -i \
-		"${ED}/etc/env.d/20php${SLOT}"
-	sed -e "s|php5|php${SLOT}|g" -i \
-		"${ED}/etc/env.d/20php${SLOT}"
-
-	# set php-config variable correctly (bug #278439)
-	sed -e "s:^\(php_sapis=\)\".*\"$:\1\"${sapi_list}\":" -i \
-		"${ED}/usr/$(get_libdir)/php${SLOT}/bin/php-config"
-
-	if use fpm ; then
-		if use systemd; then
-			systemd_newunit "${FILESDIR}/php-fpm_at.service" "php-fpm@${SLOT}.service"
-		else
-			systemd_newunit "${FILESDIR}/php-fpm_at-simple.service" "php-fpm@${SLOT}.service"
-		fi
-	fi
-}
-
-src_test() {
-	echo ">>> Test phase [test]: ${CATEGORY}/${PF}"
-	PHP_BIN="${WORKDIR}/sapis-build/cli/sapi/cli/php"
-	if [[ ! -x "${PHP_BIN}" ]] ; then
-		ewarn "Test phase requires USE=cli, skipping"
-		return
-	else
-		export TEST_PHP_EXECUTABLE="${PHP_BIN}"
-	fi
-
-	if [[ -x "${WORKDIR}/sapis/cgi/php-cgi" ]] ; then
-		export TEST_PHP_CGI_EXECUTABLE="${WORKDIR}/sapis/cgi/php-cgi"
-	fi
-
-	REPORT_EXIT_STATUS=1 "${TEST_PHP_EXECUTABLE}" -n  -d "session.save_path=${T}" \
-		"${WORKDIR}/sapis-build/cli/run-tests.php" -n -q -d "session.save_path=${T}"
-
-	for name in ${EXPECTED_TEST_FAILURES}; do
-		mv "${name}.out" "${name}.out.orig" 2>/dev/null
-	done
-
-	local failed="$(find -name '*.out')"
-	if [[ ${failed} != "" ]] ; then
-		ewarn "The following test cases failed unexpectedly:"
-		for name in ${failed}; do
-			ewarn "  ${name/.out/}"
-		done
-	else
-		einfo "No unexpected test failures, all fine"
-	fi
-
-	if [[ ${PHP_SHOW_UNEXPECTED_TEST_PASS} == "1" ]] ; then
-		local passed=""
-		for name in ${EXPECTED_TEST_FAILURES}; do
-			[[ -f "${name}.diff" ]] && continue
-			passed="${passed} ${name}"
-		done
-		if [[ ${passed} != "" ]] ; then
-			einfo "The following test cases passed unexpectedly:"
-			for name in ${passed}; do
-				ewarn "  ${passed}"
-			done
-		else
-			einfo "None of the known-to-fail tests passed, all fine"
-		fi
-	fi
-}
-
-pkg_postinst() {
-	# Output some general info to the user
-	if use apache2 ; then
-		APACHE2_MOD_DEFINE="PHP5"
-		APACHE2_MOD_CONF="70_mod_php5"  # actually provided by app-eselect/eselect-php
-		apache-module_pkg_postinst
-	fi
-
-	# Create the symlinks for php
-	for m in ${SAPIS}; do
-		[[ ${m} == 'embed' ]] && continue;
-		if use $m ; then
-			local ci=$(eselect php show $m)
-			if [[ -z $ci ]]; then
-				eselect php set $m php${SLOT}
-				einfo "Switched ${m} to use php:${SLOT}"
-				einfo
-			elif [[ $ci != "php${SLOT}" ]] ; then
-				elog "To switch $m to use php:${SLOT}, run"
-				elog "    eselect php set $m php${SLOT}"
-				elog
-			fi
-		fi
-	done
-
-	elog "Make sure that PHP_TARGETS in ${EPREFIX}/etc/make.conf includes php${SLOT/./-} in order"
-	elog "to compile extensions for the ${SLOT} ABI"
-	elog
-	if ! use readline && use cli ; then
-		ewarn "Note that in order to use php interactivly, you need to enable"
-		ewarn "the readline USE flag or php -a will hang"
-	fi
-	elog
-	elog "This ebuild installed a version of php.ini based on php.ini-${PHP_INI_VERSION} version."
-	elog "You can chose which version of php.ini to install by default by setting PHP_INI_VERSION to either"
-	elog "'production' or 'development' in ${EPREFIX}/etc/make.conf"
-	elog "Both versions of php.ini can be found in ${EPREFIX}/usr/share/doc/${PF}"
-
-	elog
-	elog "For more details on how minor version slotting works (PHP_TARGETS) please read the upgrade guide:"
-	elog "https://www.gentoo.org/proj/en/php/php-upgrading.xml"
-	elog
-}
-
-pkg_prerm() {
-	eselect php cleanup
-}
diff --git a/dev-lang/php/php-5.5.27.ebuild b/dev-lang/php/php-5.5.27.ebuild
deleted file mode 100644
index dcf83629d198..000000000000
--- a/dev-lang/php/php-5.5.27.ebuild
+++ /dev/null
@@ -1,784 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils autotools flag-o-matic versionator depend.apache apache-module db-use libtool systemd
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-
-function php_get_uri ()
-{
-	case "${1}" in
-		"php-pre")
-			echo "http://downloads.php.net/dsp/${2}"
-		;;
-		"php")
-			echo "http://www.php.net/distributions/${2}"
-		;;
-		"olemarkus")
-			echo "https://dev.gentoo.org/~olemarkus/php/${2}"
-		;;
-		"gentoo")
-			echo "mirror://gentoo/${2}"
-		;;
-		*)
-			die "unhandled case in php_get_uri"
-		;;
-	esac
-}
-
-PHP_MV="$(get_major_version)"
-SLOT="$(get_version_component_range 1-2)"
-
-# alias, so we can handle different types of releases (finals, rcs, alphas,
-# betas, ...) w/o changing the whole ebuild
-PHP_PV="${PV/_rc/RC}"
-PHP_PV="${PHP_PV/_alpha/alpha}"
-PHP_PV="${PHP_PV/_beta/beta}"
-PHP_RELEASE="php"
-[[ ${PV} == ${PV/_alpha/} ]] || PHP_RELEASE="php-pre"
-[[ ${PV} == ${PV/_beta/} ]] || PHP_RELEASE="php-pre"
-[[ ${PV} == ${PV/_rc/} ]] || PHP_RELEASE="php-pre"
-PHP_P="${PN}-${PHP_PV}"
-
-PHP_SRC_URI="$(php_get_uri "${PHP_RELEASE}" "${PHP_P}.tar.bz2")"
-
-PHP_FPM_CONF_VER="1"
-
-SRC_URI="${PHP_SRC_URI}"
-
-DESCRIPTION="The PHP language runtime engine: CLI, CGI, FPM/FastCGI, Apache2 and embed SAPIs"
-HOMEPAGE="http://php.net/"
-LICENSE="PHP-3"
-
-S="${WORKDIR}/${PHP_P}"
-
-# We can build the following SAPIs in the given order
-SAPIS="embed cli cgi fpm apache2"
-
-# SAPIs and SAPI-specific USE flags (cli SAPI is default on):
-IUSE="${IUSE}
-	${SAPIS/cli/+cli}
-	threads"
-
-IUSE="${IUSE} bcmath berkdb bzip2 calendar cdb cjk
-	crypt +ctype curl debug
-	enchant exif frontbase +fileinfo +filter firebird
-	flatfile ftp gd gdbm gmp +hash +iconv imap inifile
-	intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit mhash
-	mssql mysql libmysqlclient mysqli nls
-	oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm
-	readline recode selinux +session sharedmem
-	+simplexml snmp soap sockets spell sqlite ssl
-	sybase-ct sysvipc systemd tidy +tokenizer truetype unicode vpx wddx
-	+xml xmlreader xmlwriter xmlrpc xpm xslt zip zlib"
-
-DEPEND="
-	>=app-eselect/eselect-php-0.7.1-r3[apache2?,fpm?]
-	>=dev-libs/libpcre-8.32[unicode]
-	apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=]
-		<www-servers/apache-2.4[threads=] ) )
-	berkdb? ( =sys-libs/db-4* )
-	bzip2? ( app-arch/bzip2 )
-	cdb? ( || ( dev-db/cdb dev-db/tinycdb ) )
-	cjk? ( !gd? (
-		virtual/jpeg:0
-		media-libs/libpng:0=
-		sys-libs/zlib
-	) )
-	crypt? ( >=dev-libs/libmcrypt-2.4 )
-	curl? ( >=net-misc/curl-7.10.5 )
-	enchant? ( app-text/enchant )
-	exif? ( !gd? (
-		virtual/jpeg:0
-		media-libs/libpng:0=
-		sys-libs/zlib
-	) )
-	firebird? ( dev-db/firebird )
-	gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib )
-	gdbm? ( >=sys-libs/gdbm-1.8.0 )
-	gmp? ( >=dev-libs/gmp-4.1.2 )
-	iconv? ( virtual/libiconv )
-	imap? ( virtual/imap-c-client[ssl=] )
-	intl? ( dev-libs/icu:= )
-	iodbc? ( dev-db/libiodbc )
-	kerberos? ( virtual/krb5 )
-	ldap? ( >=net-nds/openldap-1.2.11 )
-	ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 )
-	libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) )
-	mssql? ( dev-db/freetds[mssql] )
-	libmysqlclient? (
-		mysql? ( virtual/mysql )
-		mysqli? ( >=virtual/mysql-4.1 )
-	)
-	nls? ( sys-devel/gettext )
-	oci8-instant-client? ( dev-db/oracle-instantclient-basic )
-	odbc? ( >=dev-db/unixODBC-1.8.13 )
-	postgres? ( dev-db/postgresql )
-	qdbm? ( dev-db/qdbm )
-	readline? ( sys-libs/readline )
-	recode? ( app-text/recode )
-	sharedmem? ( dev-libs/mm )
-	simplexml? ( >=dev-libs/libxml2-2.6.8 )
-	snmp? ( >=net-analyzer/net-snmp-5.2 )
-	soap? ( >=dev-libs/libxml2-2.6.8 )
-	spell? ( >=app-text/aspell-0.50 )
-	sqlite? ( >=dev-db/sqlite-3.7.6.3 )
-	ssl? ( >=dev-libs/openssl-0.9.7 )
-	sybase-ct? ( dev-db/freetds )
-	tidy? ( app-text/htmltidy )
-	truetype? (
-		=media-libs/freetype-2*
-		>=media-libs/t1lib-5.0.0
-		!gd? (
-			virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib )
-	)
-	unicode? ( dev-libs/oniguruma )
-	vpx? ( media-libs/libvpx )
-	wddx? ( >=dev-libs/libxml2-2.6.8 )
-	xml? ( >=dev-libs/libxml2-2.6.8 )
-	xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv )
-	xmlreader? ( >=dev-libs/libxml2-2.6.8 )
-	xmlwriter? ( >=dev-libs/libxml2-2.6.8 )
-	xpm? (
-		x11-libs/libXpm
-		virtual/jpeg:0
-		media-libs/libpng:0= sys-libs/zlib
-	)
-	xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 )
-	zip? ( sys-libs/zlib )
-	zlib? ( sys-libs/zlib )
-	virtual/mta
-"
-
-php="=${CATEGORY}/${PF}"
-
-REQUIRED_USE="
-	truetype? ( gd )
-	vpx? ( gd )
-	cjk? ( gd )
-	exif? ( gd )
-
-	xpm? ( gd )
-	gd? ( zlib )
-	simplexml? ( xml )
-	soap? ( xml )
-	wddx? ( xml )
-	xmlrpc? ( || ( xml iconv ) )
-	xmlreader? ( xml )
-	xslt? ( xml )
-	ldap-sasl? ( ldap )
-	mhash? ( hash )
-	phar? ( hash )
-	libmysqlclient? ( || (
-		mysql
-		mysqli
-		pdo
-	) )
-
-	qdbm? ( !gdbm )
-	readline? ( !libedit )
-	recode? ( !imap !mysql !mysqli )
-	sharedmem? ( !threads )
-
-	!cli? ( !cgi? ( !fpm? ( !apache2? ( !embed? ( cli ) ) ) ) )"
-
-RDEPEND="${DEPEND}"
-
-RDEPEND="${RDEPEND}
-	fpm? (
-		selinux? ( sec-policy/selinux-phpfpm )
-		systemd? ( sys-apps/systemd ) )"
-
-DEPEND="${DEPEND}
-	sys-devel/flex
-	>=sys-devel/m4-1.4.3
-	>=sys-devel/libtool-1.5.18"
-
-# Allow users to install production version if they want to
-
-case "${PHP_INI_VERSION}" in
-	production|development)
-		;;
-	*)
-		PHP_INI_VERSION="development"
-		;;
-esac
-
-PHP_INI_UPSTREAM="php.ini-${PHP_INI_VERSION}"
-PHP_INI_FILE="php.ini"
-
-want_apache
-
-pkg_setup() {
-	depend.apache_pkg_setup
-}
-
-php_install_ini() {
-	local phpsapi="${1}"
-
-	# work out where we are installing the ini file
-	php_set_ini_dir "${phpsapi}"
-
-	local phpinisrc="${PHP_INI_UPSTREAM}-${phpsapi}"
-	cp "${PHP_INI_UPSTREAM}" "${phpinisrc}"
-
-	# default to /tmp for save_path, bug #282768
-	sed -e 's|^;session.save_path .*$|session.save_path = "'"${EPREFIX}"'/tmp"|g' -i "${phpinisrc}"
-
-	# Set the extension dir
-	sed -e "s|^extension_dir .*$|extension_dir = ${extension_dir}|g" -i "${phpinisrc}"
-
-	# Set the include path to point to where we want to find PEAR packages
-	sed -e 's|^;include_path = ".:/php/includes".*|include_path = ".:'"${EPREFIX}"'/usr/share/php'${PHP_MV}':'"${EPREFIX}"'/usr/share/php"|' -i "${phpinisrc}"
-
-	dodir "${PHP_INI_DIR#${EPREFIX}}"
-	insinto "${PHP_INI_DIR#${EPREFIX}}"
-	newins "${phpinisrc}" "${PHP_INI_FILE}"
-
-	elog "Installing php.ini for ${phpsapi} into ${PHP_INI_DIR#${EPREFIX}}"
-	elog
-
-	dodir "${PHP_EXT_INI_DIR#${EPREFIX}}"
-	dodir "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}"
-
-	if use_if_iuse opcache; then
-		elog "Adding opcache to $PHP_EXT_INI_DIR"
-		echo "zend_extension=${PHP_DESTDIR}/$(get_libdir)/opcache.so" >> "${D}/${PHP_EXT_INI_DIR}"/opcache.ini
-		dosym "${PHP_EXT_INI_DIR#${EPREFIX}}/opcache.ini" "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}/opcache.ini"
-	fi
-
-	# SAPI-specific handling
-
-	if [[ "${sapi}" == "fpm" ]] ; then
-		[[ -z ${PHP_FPM_CONF_VER} ]] && PHP_FPM_CONF_VER=0
-		einfo "Installing FPM CGI config file php-fpm.conf"
-		insinto "${PHP_INI_DIR#${EPREFIX}}"
-		newins "${FILESDIR}/php-fpm-r${PHP_FPM_CONF_VER}.conf" php-fpm.conf
-
-		# Remove bogus /etc/php-fpm.conf.default (bug 359906)
-		[[ -f "${ED}/etc/php-fpm.conf.default" ]] && rm "${ED}/etc/php-fpm.conf.default"
-	fi
-
-	# Install PHP ini files into /usr/share/php
-
-	dodoc php.ini-development
-	dodoc php.ini-production
-
-}
-
-php_set_ini_dir() {
-	PHP_INI_DIR="${EPREFIX}/etc/php/${1}-php${SLOT}"
-	PHP_EXT_INI_DIR="${PHP_INI_DIR}/ext"
-	PHP_EXT_INI_DIR_ACTIVE="${PHP_INI_DIR}/ext-active"
-}
-
-src_prepare() {
-	# USE=sharedmem (session/mod_mm to be exact) tries to mmap() this path
-	# ([empty session.save_path]/session_mm_[sapi][gid].sem)
-	# there is no easy way to circumvent that, all php calls during
-	# install use -n, so no php.ini file will be used.
-	# As such, this is the easiest way to get around
-	addpredict /session_mm_cli250.sem
-	addpredict /session_mm_cli0.sem
-
-	# Change PHP branding
-	# Get the alpha/beta/rc version
-	sed -re	"s|^(PHP_EXTRA_VERSION=\").*(\")|\1-pl${PR/r/}-gentoo\2|g" \
-		-i configure.in || die "Unable to change PHP branding"
-
-	# Patch PHP to show Gentoo as the server platform
-	sed -e 's/PHP_UNAME=`uname -a | xargs`/PHP_UNAME=`uname -s -n -r -v | xargs`/g' \
-		-i configure.in || die "Failed to fix server platform name"
-
-	# Prevent PHP from activating the Apache config,
-	# as we will do that ourselves
-	sed -i \
-		-e "s,-i -a -n php${PHP_MV},-i -n php${PHP_MV},g" \
-		-e "s,-i -A -n php${PHP_MV},-i -n php${PHP_MV},g" \
-		configure sapi/apache2filter/config.m4 sapi/apache2handler/config.m4
-
-	# Patch PHP to support heimdal instead of mit-krb5
-	if has_version "app-crypt/heimdal" ; then
-		sed -e 's|gssapi_krb5|gssapi|g' -i acinclude.m4 \
-			|| die "Failed to fix heimdal libname"
-		sed -e 's|PHP_ADD_LIBRARY(k5crypto, 1, $1)||g' -i acinclude.m4 \
-			|| die "Failed to fix heimdal crypt library reference"
-	fi
-
-	#Add user patches #357637
-	epatch_user
-
-	#force rebuilding aclocal.m4
-	rm aclocal.m4
-	eautoreconf
-
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		# http://bugs.php.net/bug.php?id=48795, bug #343481
-		sed -i -e '/BUILD_CGI="\\$(CC)/s/CC/CXX/' configure || die
-	fi
-}
-
-src_configure() {
-	addpredict /usr/share/snmp/mibs/.index
-	addpredict /var/lib/net-snmp/mib_indexes
-
-	PHP_DESTDIR="${EPREFIX}/usr/$(get_libdir)/php${SLOT}"
-
-	# This is a global variable and should be in caps. It isn't because the
-	# phpconfutils eclass relies on exactly this name...
-	# for --with-libdir see bug #327025
-	my_conf="
-		--prefix="${PHP_DESTDIR}"
-		--mandir="${PHP_DESTDIR}"/man
-		--infodir="${PHP_DESTDIR}"/info
-		--libdir="${PHP_DESTDIR}"/lib
-		--with-libdir=$(get_libdir)
-		--without-pear
-		$(use_enable threads maintainer-zts)"
-
-	#                             extension		  USE flag        shared
-	my_conf+="
-	$(use_enable bcmath bcmath )
-	$(use_with bzip2 bz2 "${EPREFIX}"/usr)
-	$(use_enable calendar calendar )
-	$(use_enable ctype ctype )
-	$(use_with curl curl "${EPREFIX}"/usr)
-	$(use_enable xml dom )
-	$(use_with enchant enchant "${EPREFIX}"/usr)
-	$(use_enable exif exif )
-	$(use_enable fileinfo fileinfo )
-	$(use_enable filter filter )
-	$(use_enable ftp ftp )
-	$(use_with nls gettext "${EPREFIX}"/usr)
-	$(use_with gmp gmp "${EPREFIX}"/usr)
-	$(use_enable hash hash )
-	$(use_with mhash mhash "${EPREFIX}"/usr)
-	$(use_with iconv iconv $(use elibc_glibc || use elibc_musl || echo "${EPREFIX}"/usr))
-	$(use_enable intl intl )
-	$(use_enable ipv6 ipv6 )
-	$(use_enable json json )
-	$(use_with kerberos kerberos "${EPREFIX}"/usr)
-	$(use_enable xml libxml )
-	$(use_with xml libxml-dir "${EPREFIX}"/usr)
-	$(use_enable unicode mbstring )
-	$(use_with crypt mcrypt "${EPREFIX}"/usr)
-	$(use_with mssql mssql "${EPREFIX}"/usr)
-	$(use_with unicode onig "${EPREFIX}"/usr)
-	$(use_with ssl openssl "${EPREFIX}"/usr)
-	$(use_with ssl openssl-dir "${EPREFIX}"/usr)
-	$(use_enable pcntl pcntl )
-	$(use_enable phar phar )
-	$(use_enable pdo pdo )
-	$(use_enable opcache opcache )
-	$(use_with postgres pgsql "${EPREFIX}"/usr)
-	$(use_enable posix posix )
-	$(use_with spell pspell "${EPREFIX}"/usr)
-	$(use_with recode recode "${EPREFIX}"/usr)
-	$(use_enable simplexml simplexml )
-	$(use_enable sharedmem shmop )
-	$(use_with snmp snmp "${EPREFIX}"/usr)
-	$(use_enable soap soap )
-	$(use_enable sockets sockets )
-	$(use_with sqlite sqlite3 "${EPREFIX}"/usr)
-	$(use_with sybase-ct sybase-ct "${EPREFIX}"/usr)
-	$(use_enable sysvipc sysvmsg )
-	$(use_enable sysvipc sysvsem )
-	$(use_enable sysvipc sysvshm )
-	$(use_with systemd fpm-systemd)
-	$(use_with tidy tidy "${EPREFIX}"/usr)
-	$(use_enable tokenizer tokenizer )
-	$(use_enable wddx wddx )
-	$(use_enable xml xml )
-	$(use_enable xmlreader xmlreader )
-	$(use_enable xmlwriter xmlwriter )
-	$(use_with xmlrpc xmlrpc)
-	$(use_with xslt xsl "${EPREFIX}"/usr)
-	$(use_enable zip zip )
-	$(use_with zlib zlib "${EPREFIX}"/usr)
-	$(use_enable debug debug )"
-
-	# DBA support
-	if use cdb || use berkdb || use flatfile || use gdbm || use inifile \
-		|| use qdbm ; then
-		my_conf="${my_conf} --enable-dba${shared}"
-	fi
-
-	# DBA drivers support
-	my_conf+="
-	$(use_with cdb cdb)
-	$(use_with berkdb db4 ${EPREFIX}/usr)
-	$(use_enable flatfile flatfile )
-	$(use_with gdbm gdbm ${EPREFIX}/usr)
-	$(use_enable inifile inifile )
-	$(use_with qdbm qdbm ${EPREFIX}/usr)"
-
-	# Support for the GD graphics library
-	my_conf+="
-	$(use_with truetype freetype-dir ${EPREFIX}/usr)
-	$(use_with truetype t1lib ${EPREFIX}/usr)
-	$(use_enable cjk gd-jis-conv )
-	$(use_with gd jpeg-dir ${EPREFIX}/usr)
-	$(use_with gd png-dir ${EPREFIX}/usr)
-	$(use_with xpm xpm-dir ${EPREFIX}/usr)
-	$(use_with vpx vpx-dir ${EPREFIX}/usr)"
-	# enable gd last, so configure can pick up the previous settings
-	my_conf+="
-	$(use_with gd gd)"
-
-	# IMAP support
-	if use imap ; then
-		my_conf+="
-		$(use_with imap imap ${EPREFIX}/usr)
-		$(use_with ssl imap-ssl ${EPREFIX}/usr)"
-	fi
-
-	# Interbase/firebird support
-
-	if use firebird ; then
-		my_conf+="
-		$(use_with firebird interbase ${EPREFIX}/usr)"
-	fi
-
-	# LDAP support
-	if use ldap ; then
-		my_conf+="
-		$(use_with ldap ldap ${EPREFIX}/usr)
-		$(use_with ldap-sasl ldap-sasl ${EPREFIX}/usr)"
-	fi
-
-	# MySQL support
-	local mysqllib="mysqlnd"
-	local mysqlilib="mysqlnd"
-	use libmysqlclient && mysqllib="${EPREFIX}/usr"
-	use libmysqlclient && mysqlilib="${EPREFIX}/usr/bin/mysql_config"
-
-	my_conf+=" $(use_with mysql mysql $mysqllib)"
-	my_conf+=" $(use_with mysqli mysqli $mysqlilib)"
-
-	local mysqlsock=" $(use_with mysql mysql-sock ${EPREFIX}/var/run/mysqld/mysqld.sock)"
-	if use mysql ; then
-		my_conf+="${mysqlsock}"
-	elif use mysqli ; then
-		my_conf+="${mysqlsock}"
-	fi
-
-	# ODBC support
-	if use odbc ; then
-		my_conf+="
-		$(use_with odbc unixODBC ${EPREFIX}/usr)"
-	fi
-
-	if use iodbc ; then
-		my_conf+="
-		$(use_with iodbc iodbc ${EPREFIX}/usr)"
-	fi
-
-	# Oracle support
-	if use oci8-instant-client ; then
-		my_conf+="
-		$(use_with oci8-instant-client oci8)"
-	fi
-
-	# PDO support
-	if use pdo ; then
-		my_conf+="
-		$(use_with mssql pdo-dblib )
-		$(use_with mysql pdo-mysql ${mysqllib})
-		$(use_with postgres pdo-pgsql )
-		$(use_with sqlite pdo-sqlite ${EPREFIX}/usr)
-		$(use_with odbc pdo-odbc unixODBC,${EPREFIX}/usr)"
-		if use oci8-instant-client ; then
-			my_conf+="
-			$(use_with oci8-instant-client pdo-oci)"
-		fi
-	fi
-
-	# readline/libedit support
-	my_conf+="
-	$(use_with readline readline ${EPREFIX}/usr)
-	$(use_with libedit libedit ${EPREFIX}/usr)"
-
-	# Session support
-	if use session ; then
-		my_conf+="
-		$(use_with sharedmem mm ${EPREFIX}/usr)"
-	else
-		my_conf+="
-		$(use_enable session session )"
-	fi
-
-	# Use pic for shared modules such as apache2's mod_php
-	my_conf="${my_conf} --with-pic"
-
-	# we use the system copy of pcre
-	# --with-pcre-regex affects ext/pcre
-	# --with-pcre-dir affects ext/filter and ext/zip
-	my_conf="${my_conf} --with-pcre-regex=${EPREFIX}/usr --with-pcre-dir=${EPREFIX}/usr"
-
-	# Catch CFLAGS problems
-	# Fixes bug #14067.
-	# Changed order to run it in reverse for bug #32022 and #12021.
-	replace-cpu-flags "k6*" "i586"
-
-	# Support user-passed configuration parameters
-	my_conf="${my_conf} ${EXTRA_ECONF:-}"
-
-	# Support the Apache2 extras, they must be set globally for all
-	# SAPIs to work correctly, especially for external PHP extensions
-
-	mkdir -p "${WORKDIR}/sapis-build"
-	for one_sapi in $SAPIS ; do
-		use "${one_sapi}" || continue
-		php_set_ini_dir "${one_sapi}"
-
-		cp -r "${S}" "${WORKDIR}/sapis-build/${one_sapi}"
-		cd "${WORKDIR}/sapis-build/${one_sapi}"
-
-		sapi_conf="${my_conf} --with-config-file-path=${PHP_INI_DIR}
-			--with-config-file-scan-dir=${PHP_EXT_INI_DIR_ACTIVE}"
-
-		for sapi in $SAPIS ; do
-			case "$sapi" in
-				cli|cgi|embed|fpm)
-					if [[ "${one_sapi}" == "${sapi}" ]] ; then
-						sapi_conf="${sapi_conf} --enable-${sapi}"
-					else
-						sapi_conf="${sapi_conf} --disable-${sapi}"
-					fi
-					;;
-
-				apache2)
-					if [[ "${one_sapi}" == "${sapi}" ]] ; then
-						sapi_conf="${sapi_conf} --with-apxs2=${EPREFIX}/usr/sbin/apxs"
-					else
-						sapi_conf="${sapi_conf} --without-apxs2"
-					fi
-					;;
-			esac
-		done
-
-		econf ${sapi_conf}
-	done
-}
-
-src_compile() {
-	# snmp seems to run during src_compile, too (bug #324739)
-	addpredict /usr/share/snmp/mibs/.index
-	addpredict /var/lib/net-snmp/mib_indexes
-
-	for sapi in ${SAPIS} ; do
-		if use "${sapi}"; then
-			cd "${WORKDIR}/sapis-build/$sapi" || "Failed to change dir to ${WORKDIR}/sapis-build/$1"
-			emake || die "emake failed"
-		fi
-	done
-}
-
-src_install() {
-	# see bug #324739 for what happens when we don't have that
-	addpredict /usr/share/snmp/mibs/.index
-
-	# grab the first SAPI that got built and install common files from there
-	local first_sapi=""
-	for sapi in $SAPIS ; do
-		if use $sapi ; then
-			first_sapi=$sapi
-			break
-		fi
-	done
-
-	# Makefile forgets to create this before trying to write to it...
-	dodir "${PHP_DESTDIR#${EPREFIX}}/bin"
-
-	# Install php environment (without any sapis)
-	cd "${WORKDIR}/sapis-build/$first_sapi"
-	emake INSTALL_ROOT="${D}" \
-		install-build install-headers install-programs \
-		|| die "emake install failed"
-
-	local extension_dir="$("${ED}/${PHP_DESTDIR#${EPREFIX}}/bin/php-config" --extension-dir)"
-
-	# Create the directory where we'll put version-specific php scripts
-	keepdir /usr/share/php${PHP_MV}
-
-	local sapi="", file=""
-	local sapi_list=""
-
-	for sapi in ${SAPIS}; do
-		if use "${sapi}" ; then
-			einfo "Installing SAPI: ${sapi}"
-			cd "${WORKDIR}/sapis-build/${sapi}"
-
-			if [[ "${sapi}" == "apache2" ]] ; then
-				# We're specifically not using emake install-sapi as libtool
-				# may cause unnecessary relink failures (see bug #351266)
-				insinto "${PHP_DESTDIR#${EPREFIX}}/apache2/"
-				newins ".libs/libphp5$(get_libname)" "libphp${PHP_MV}$(get_libname)"
-				keepdir "/usr/$(get_libdir)/apache2/modules"
-			else
-				# needed each time, php_install_ini would reset it
-				local dest="${PHP_DESTDIR#${EPREFIX}}"
-				into "${dest}"
-				case "$sapi" in
-					cli)
-						source="sapi/cli/php"
-						;;
-					cgi)
-						source="sapi/cgi/php-cgi"
-						;;
-					fpm)
-						source="sapi/fpm/php-fpm"
-						;;
-					embed)
-						source="libs/libphp${PHP_MV}$(get_libname)"
-						;;
-					*)
-						die "unhandled sapi in src_install"
-						;;
-				esac
-
-				if [[ "${source}" == *"$(get_libname)" ]]; then
-					dolib.so "${source}" || die "Unable to install ${sapi} sapi"
-				else
-					dobin "${source}" || die "Unable to install ${sapi} sapi"
-					local name="$(basename ${source})"
-					dosym "${dest}/bin/${name}" "/usr/bin/${name}${SLOT}"
-				fi
-			fi
-
-			php_install_ini "${sapi}"
-
-			# construct correct SAPI string for php-config
-			# thanks to ferringb for the bash voodoo
-			if [[ "${sapi}" == "apache2" ]]; then
-				sapi_list="${sapi_list:+${sapi_list} }apache2handler"
-			else
-				sapi_list="${sapi_list:+${sapi_list} }${sapi}"
-			fi
-		fi
-	done
-
-	# Installing opcache module
-	if use_if_iuse opcache ; then
-		dolib.so "modules/opcache$(get_libname)" || die "Unable to install opcache module"
-	fi
-
-	# Install env.d files
-	newenvd "${FILESDIR}/20php5-envd" \
-		"20php${SLOT}"
-	sed -e "s|/lib/|/$(get_libdir)/|g" -i \
-		"${ED}/etc/env.d/20php${SLOT}"
-	sed -e "s|php5|php${SLOT}|g" -i \
-		"${ED}/etc/env.d/20php${SLOT}"
-
-	# set php-config variable correctly (bug #278439)
-	sed -e "s:^\(php_sapis=\)\".*\"$:\1\"${sapi_list}\":" -i \
-		"${ED}/usr/$(get_libdir)/php${SLOT}/bin/php-config"
-
-	if use fpm ; then
-		if use systemd; then
-			systemd_newunit "${FILESDIR}/php-fpm_at.service" "php-fpm@${SLOT}.service"
-		else
-			systemd_newunit "${FILESDIR}/php-fpm_at-simple.service" "php-fpm@${SLOT}.service"
-		fi
-	fi
-}
-
-src_test() {
-	echo ">>> Test phase [test]: ${CATEGORY}/${PF}"
-	PHP_BIN="${WORKDIR}/sapis-build/cli/sapi/cli/php"
-	if [[ ! -x "${PHP_BIN}" ]] ; then
-		ewarn "Test phase requires USE=cli, skipping"
-		return
-	else
-		export TEST_PHP_EXECUTABLE="${PHP_BIN}"
-	fi
-
-	if [[ -x "${WORKDIR}/sapis/cgi/php-cgi" ]] ; then
-		export TEST_PHP_CGI_EXECUTABLE="${WORKDIR}/sapis/cgi/php-cgi"
-	fi
-
-	REPORT_EXIT_STATUS=1 "${TEST_PHP_EXECUTABLE}" -n  -d "session.save_path=${T}" \
-		"${WORKDIR}/sapis-build/cli/run-tests.php" -n -q -d "session.save_path=${T}"
-
-	for name in ${EXPECTED_TEST_FAILURES}; do
-		mv "${name}.out" "${name}.out.orig" 2>/dev/null
-	done
-
-	local failed="$(find -name '*.out')"
-	if [[ ${failed} != "" ]] ; then
-		ewarn "The following test cases failed unexpectedly:"
-		for name in ${failed}; do
-			ewarn "  ${name/.out/}"
-		done
-	else
-		einfo "No unexpected test failures, all fine"
-	fi
-
-	if [[ ${PHP_SHOW_UNEXPECTED_TEST_PASS} == "1" ]] ; then
-		local passed=""
-		for name in ${EXPECTED_TEST_FAILURES}; do
-			[[ -f "${name}.diff" ]] && continue
-			passed="${passed} ${name}"
-		done
-		if [[ ${passed} != "" ]] ; then
-			einfo "The following test cases passed unexpectedly:"
-			for name in ${passed}; do
-				ewarn "  ${passed}"
-			done
-		else
-			einfo "None of the known-to-fail tests passed, all fine"
-		fi
-	fi
-}
-
-pkg_postinst() {
-	# Output some general info to the user
-	if use apache2 ; then
-		APACHE2_MOD_DEFINE="PHP5"
-		APACHE2_MOD_CONF="70_mod_php5"  # actually provided by app-eselect/eselect-php
-		apache-module_pkg_postinst
-	fi
-
-	# Create the symlinks for php
-	for m in ${SAPIS}; do
-		[[ ${m} == 'embed' ]] && continue;
-		if use $m ; then
-			local ci=$(eselect php show $m)
-			if [[ -z $ci ]]; then
-				eselect php set $m php${SLOT}
-				einfo "Switched ${m} to use php:${SLOT}"
-				einfo
-			elif [[ $ci != "php${SLOT}" ]] ; then
-				elog "To switch $m to use php:${SLOT}, run"
-				elog "    eselect php set $m php${SLOT}"
-				elog
-			fi
-		fi
-	done
-
-	elog "Make sure that PHP_TARGETS in ${EPREFIX}/etc/make.conf includes php${SLOT/./-} in order"
-	elog "to compile extensions for the ${SLOT} ABI"
-	elog
-	if ! use readline && use cli ; then
-		ewarn "Note that in order to use php interactivly, you need to enable"
-		ewarn "the readline USE flag or php -a will hang"
-	fi
-	elog
-	elog "This ebuild installed a version of php.ini based on php.ini-${PHP_INI_VERSION} version."
-	elog "You can chose which version of php.ini to install by default by setting PHP_INI_VERSION to either"
-	elog "'production' or 'development' in ${EPREFIX}/etc/make.conf"
-	elog "Both versions of php.ini can be found in ${EPREFIX}/usr/share/doc/${PF}"
-
-	elog
-	elog "For more details on how minor version slotting works (PHP_TARGETS) please read the upgrade guide:"
-	elog "https://www.gentoo.org/proj/en/php/php-upgrading.xml"
-	elog
-}
-
-pkg_prerm() {
-	eselect php cleanup
-}
diff --git a/dev-lang/php/php-5.5.28.ebuild b/dev-lang/php/php-5.5.28.ebuild
index 3e90980a0cd5..aeedfb4d9ba5 100644
--- a/dev-lang/php/php-5.5.28.ebuild
+++ b/dev-lang/php/php-5.5.28.ebuild
@@ -6,7 +6,7 @@ EAPI=5
 
 inherit eutils autotools flag-o-matic versionator depend.apache apache-module db-use libtool systemd
 
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 
 function php_get_uri ()
 {
diff --git a/dev-lang/php/php-5.5.29.ebuild b/dev-lang/php/php-5.5.29.ebuild
new file mode 100644
index 000000000000..9a3c14028589
--- /dev/null
+++ b/dev-lang/php/php-5.5.29.ebuild
@@ -0,0 +1,784 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils autotools flag-o-matic versionator depend.apache apache-module db-use libtool systemd
+
+KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+
+function php_get_uri ()
+{
+	case "${1}" in
+		"php-pre")
+			echo "http://downloads.php.net/dsp/${2}"
+		;;
+		"php")
+			echo "http://www.php.net/distributions/${2}"
+		;;
+		"olemarkus")
+			echo "https://dev.gentoo.org/~olemarkus/php/${2}"
+		;;
+		"gentoo")
+			echo "mirror://gentoo/${2}"
+		;;
+		*)
+			die "unhandled case in php_get_uri"
+		;;
+	esac
+}
+
+PHP_MV="$(get_major_version)"
+SLOT="$(get_version_component_range 1-2)"
+
+# alias, so we can handle different types of releases (finals, rcs, alphas,
+# betas, ...) w/o changing the whole ebuild
+PHP_PV="${PV/_rc/RC}"
+PHP_PV="${PHP_PV/_alpha/alpha}"
+PHP_PV="${PHP_PV/_beta/beta}"
+PHP_RELEASE="php"
+[[ ${PV} == ${PV/_alpha/} ]] || PHP_RELEASE="php-pre"
+[[ ${PV} == ${PV/_beta/} ]] || PHP_RELEASE="php-pre"
+[[ ${PV} == ${PV/_rc/} ]] || PHP_RELEASE="php-pre"
+PHP_P="${PN}-${PHP_PV}"
+
+PHP_SRC_URI="$(php_get_uri "${PHP_RELEASE}" "${PHP_P}.tar.bz2")"
+
+PHP_FPM_CONF_VER="1"
+
+SRC_URI="${PHP_SRC_URI}"
+
+DESCRIPTION="The PHP language runtime engine: CLI, CGI, FPM/FastCGI, Apache2 and embed SAPIs"
+HOMEPAGE="http://php.net/"
+LICENSE="PHP-3"
+
+S="${WORKDIR}/${PHP_P}"
+
+# We can build the following SAPIs in the given order
+SAPIS="embed cli cgi fpm apache2"
+
+# SAPIs and SAPI-specific USE flags (cli SAPI is default on):
+IUSE="${IUSE}
+	${SAPIS/cli/+cli}
+	threads"
+
+IUSE="${IUSE} bcmath berkdb bzip2 calendar cdb cjk
+	crypt +ctype curl debug
+	enchant exif frontbase +fileinfo +filter firebird
+	flatfile ftp gd gdbm gmp +hash +iconv imap inifile
+	intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit mhash
+	mssql mysql libmysqlclient mysqli nls
+	oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm
+	readline recode selinux +session sharedmem
+	+simplexml snmp soap sockets spell sqlite ssl
+	sybase-ct sysvipc systemd tidy +tokenizer truetype unicode vpx wddx
+	+xml xmlreader xmlwriter xmlrpc xpm xslt zip zlib"
+
+DEPEND="
+	>=app-eselect/eselect-php-0.7.1-r3[apache2?,fpm?]
+	>=dev-libs/libpcre-8.32[unicode]
+	apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=]
+		<www-servers/apache-2.4[threads=] ) )
+	berkdb? ( =sys-libs/db-4* )
+	bzip2? ( app-arch/bzip2 )
+	cdb? ( || ( dev-db/cdb dev-db/tinycdb ) )
+	cjk? ( !gd? (
+		virtual/jpeg:0
+		media-libs/libpng:0=
+		sys-libs/zlib
+	) )
+	crypt? ( >=dev-libs/libmcrypt-2.4 )
+	curl? ( >=net-misc/curl-7.10.5 )
+	enchant? ( app-text/enchant )
+	exif? ( !gd? (
+		virtual/jpeg:0
+		media-libs/libpng:0=
+		sys-libs/zlib
+	) )
+	firebird? ( dev-db/firebird )
+	gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib )
+	gdbm? ( >=sys-libs/gdbm-1.8.0 )
+	gmp? ( >=dev-libs/gmp-4.1.2 )
+	iconv? ( virtual/libiconv )
+	imap? ( virtual/imap-c-client[ssl=] )
+	intl? ( dev-libs/icu:= )
+	iodbc? ( dev-db/libiodbc )
+	kerberos? ( virtual/krb5 )
+	ldap? ( >=net-nds/openldap-1.2.11 )
+	ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 )
+	libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) )
+	mssql? ( dev-db/freetds[mssql] )
+	libmysqlclient? (
+		mysql? ( virtual/mysql )
+		mysqli? ( >=virtual/mysql-4.1 )
+	)
+	nls? ( sys-devel/gettext )
+	oci8-instant-client? ( dev-db/oracle-instantclient-basic )
+	odbc? ( >=dev-db/unixODBC-1.8.13 )
+	postgres? ( dev-db/postgresql )
+	qdbm? ( dev-db/qdbm )
+	readline? ( sys-libs/readline )
+	recode? ( app-text/recode )
+	sharedmem? ( dev-libs/mm )
+	simplexml? ( >=dev-libs/libxml2-2.6.8 )
+	snmp? ( >=net-analyzer/net-snmp-5.2 )
+	soap? ( >=dev-libs/libxml2-2.6.8 )
+	spell? ( >=app-text/aspell-0.50 )
+	sqlite? ( >=dev-db/sqlite-3.7.6.3 )
+	ssl? ( >=dev-libs/openssl-0.9.7 )
+	sybase-ct? ( dev-db/freetds )
+	tidy? ( app-text/htmltidy )
+	truetype? (
+		=media-libs/freetype-2*
+		>=media-libs/t1lib-5.0.0
+		!gd? (
+			virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib )
+	)
+	unicode? ( dev-libs/oniguruma )
+	vpx? ( media-libs/libvpx )
+	wddx? ( >=dev-libs/libxml2-2.6.8 )
+	xml? ( >=dev-libs/libxml2-2.6.8 )
+	xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv )
+	xmlreader? ( >=dev-libs/libxml2-2.6.8 )
+	xmlwriter? ( >=dev-libs/libxml2-2.6.8 )
+	xpm? (
+		x11-libs/libXpm
+		virtual/jpeg:0
+		media-libs/libpng:0= sys-libs/zlib
+	)
+	xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 )
+	zip? ( sys-libs/zlib )
+	zlib? ( sys-libs/zlib )
+	virtual/mta
+"
+
+php="=${CATEGORY}/${PF}"
+
+REQUIRED_USE="
+	truetype? ( gd )
+	vpx? ( gd )
+	cjk? ( gd )
+	exif? ( gd )
+
+	xpm? ( gd )
+	gd? ( zlib )
+	simplexml? ( xml )
+	soap? ( xml )
+	wddx? ( xml )
+	xmlrpc? ( || ( xml iconv ) )
+	xmlreader? ( xml )
+	xslt? ( xml )
+	ldap-sasl? ( ldap )
+	mhash? ( hash )
+	phar? ( hash )
+	libmysqlclient? ( || (
+		mysql
+		mysqli
+		pdo
+	) )
+
+	qdbm? ( !gdbm )
+	readline? ( !libedit )
+	recode? ( !imap !mysql !mysqli )
+	sharedmem? ( !threads )
+
+	!cli? ( !cgi? ( !fpm? ( !apache2? ( !embed? ( cli ) ) ) ) )"
+
+RDEPEND="${DEPEND}"
+
+RDEPEND="${RDEPEND}
+	fpm? (
+		selinux? ( sec-policy/selinux-phpfpm )
+		systemd? ( sys-apps/systemd ) )"
+
+DEPEND="${DEPEND}
+	sys-devel/flex
+	>=sys-devel/m4-1.4.3
+	>=sys-devel/libtool-1.5.18"
+
+# Allow users to install production version if they want to
+
+case "${PHP_INI_VERSION}" in
+	production|development)
+		;;
+	*)
+		PHP_INI_VERSION="development"
+		;;
+esac
+
+PHP_INI_UPSTREAM="php.ini-${PHP_INI_VERSION}"
+PHP_INI_FILE="php.ini"
+
+want_apache
+
+pkg_setup() {
+	depend.apache_pkg_setup
+}
+
+php_install_ini() {
+	local phpsapi="${1}"
+
+	# work out where we are installing the ini file
+	php_set_ini_dir "${phpsapi}"
+
+	local phpinisrc="${PHP_INI_UPSTREAM}-${phpsapi}"
+	cp "${PHP_INI_UPSTREAM}" "${phpinisrc}"
+
+	# default to /tmp for save_path, bug #282768
+	sed -e 's|^;session.save_path .*$|session.save_path = "'"${EPREFIX}"'/tmp"|g' -i "${phpinisrc}"
+
+	# Set the extension dir
+	sed -e "s|^extension_dir .*$|extension_dir = ${extension_dir}|g" -i "${phpinisrc}"
+
+	# Set the include path to point to where we want to find PEAR packages
+	sed -e 's|^;include_path = ".:/php/includes".*|include_path = ".:'"${EPREFIX}"'/usr/share/php'${PHP_MV}':'"${EPREFIX}"'/usr/share/php"|' -i "${phpinisrc}"
+
+	dodir "${PHP_INI_DIR#${EPREFIX}}"
+	insinto "${PHP_INI_DIR#${EPREFIX}}"
+	newins "${phpinisrc}" "${PHP_INI_FILE}"
+
+	elog "Installing php.ini for ${phpsapi} into ${PHP_INI_DIR#${EPREFIX}}"
+	elog
+
+	dodir "${PHP_EXT_INI_DIR#${EPREFIX}}"
+	dodir "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}"
+
+	if use_if_iuse opcache; then
+		elog "Adding opcache to $PHP_EXT_INI_DIR"
+		echo "zend_extension=${PHP_DESTDIR}/$(get_libdir)/opcache.so" >> "${D}/${PHP_EXT_INI_DIR}"/opcache.ini
+		dosym "${PHP_EXT_INI_DIR#${EPREFIX}}/opcache.ini" "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}/opcache.ini"
+	fi
+
+	# SAPI-specific handling
+
+	if [[ "${sapi}" == "fpm" ]] ; then
+		[[ -z ${PHP_FPM_CONF_VER} ]] && PHP_FPM_CONF_VER=0
+		einfo "Installing FPM CGI config file php-fpm.conf"
+		insinto "${PHP_INI_DIR#${EPREFIX}}"
+		newins "${FILESDIR}/php-fpm-r${PHP_FPM_CONF_VER}.conf" php-fpm.conf
+
+		# Remove bogus /etc/php-fpm.conf.default (bug 359906)
+		[[ -f "${ED}/etc/php-fpm.conf.default" ]] && rm "${ED}/etc/php-fpm.conf.default"
+	fi
+
+	# Install PHP ini files into /usr/share/php
+
+	dodoc php.ini-development
+	dodoc php.ini-production
+
+}
+
+php_set_ini_dir() {
+	PHP_INI_DIR="${EPREFIX}/etc/php/${1}-php${SLOT}"
+	PHP_EXT_INI_DIR="${PHP_INI_DIR}/ext"
+	PHP_EXT_INI_DIR_ACTIVE="${PHP_INI_DIR}/ext-active"
+}
+
+src_prepare() {
+	# USE=sharedmem (session/mod_mm to be exact) tries to mmap() this path
+	# ([empty session.save_path]/session_mm_[sapi][gid].sem)
+	# there is no easy way to circumvent that, all php calls during
+	# install use -n, so no php.ini file will be used.
+	# As such, this is the easiest way to get around
+	addpredict /session_mm_cli250.sem
+	addpredict /session_mm_cli0.sem
+
+	# Change PHP branding
+	# Get the alpha/beta/rc version
+	sed -re	"s|^(PHP_EXTRA_VERSION=\").*(\")|\1-pl${PR/r/}-gentoo\2|g" \
+		-i configure.in || die "Unable to change PHP branding"
+
+	# Patch PHP to show Gentoo as the server platform
+	sed -e 's/PHP_UNAME=`uname -a | xargs`/PHP_UNAME=`uname -s -n -r -v | xargs`/g' \
+		-i configure.in || die "Failed to fix server platform name"
+
+	# Prevent PHP from activating the Apache config,
+	# as we will do that ourselves
+	sed -i \
+		-e "s,-i -a -n php${PHP_MV},-i -n php${PHP_MV},g" \
+		-e "s,-i -A -n php${PHP_MV},-i -n php${PHP_MV},g" \
+		configure sapi/apache2filter/config.m4 sapi/apache2handler/config.m4
+
+	# Patch PHP to support heimdal instead of mit-krb5
+	if has_version "app-crypt/heimdal" ; then
+		sed -e 's|gssapi_krb5|gssapi|g' -i acinclude.m4 \
+			|| die "Failed to fix heimdal libname"
+		sed -e 's|PHP_ADD_LIBRARY(k5crypto, 1, $1)||g' -i acinclude.m4 \
+			|| die "Failed to fix heimdal crypt library reference"
+	fi
+
+	#Add user patches #357637
+	epatch_user
+
+	#force rebuilding aclocal.m4
+	rm aclocal.m4
+	eautoreconf
+
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		# http://bugs.php.net/bug.php?id=48795, bug #343481
+		sed -i -e '/BUILD_CGI="\\$(CC)/s/CC/CXX/' configure || die
+	fi
+}
+
+src_configure() {
+	addpredict /usr/share/snmp/mibs/.index
+	addpredict /var/lib/net-snmp/mib_indexes
+
+	PHP_DESTDIR="${EPREFIX}/usr/$(get_libdir)/php${SLOT}"
+
+	# This is a global variable and should be in caps. It isn't because the
+	# phpconfutils eclass relies on exactly this name...
+	# for --with-libdir see bug #327025
+	my_conf="
+		--prefix="${PHP_DESTDIR}"
+		--mandir="${PHP_DESTDIR}"/man
+		--infodir="${PHP_DESTDIR}"/info
+		--libdir="${PHP_DESTDIR}"/lib
+		--with-libdir=$(get_libdir)
+		--without-pear
+		$(use_enable threads maintainer-zts)"
+
+	#                             extension		  USE flag        shared
+	my_conf+="
+	$(use_enable bcmath bcmath )
+	$(use_with bzip2 bz2 "${EPREFIX}"/usr)
+	$(use_enable calendar calendar )
+	$(use_enable ctype ctype )
+	$(use_with curl curl "${EPREFIX}"/usr)
+	$(use_enable xml dom )
+	$(use_with enchant enchant "${EPREFIX}"/usr)
+	$(use_enable exif exif )
+	$(use_enable fileinfo fileinfo )
+	$(use_enable filter filter )
+	$(use_enable ftp ftp )
+	$(use_with nls gettext "${EPREFIX}"/usr)
+	$(use_with gmp gmp "${EPREFIX}"/usr)
+	$(use_enable hash hash )
+	$(use_with mhash mhash "${EPREFIX}"/usr)
+	$(use_with iconv iconv $(use elibc_glibc || use elibc_musl || echo "${EPREFIX}"/usr))
+	$(use_enable intl intl )
+	$(use_enable ipv6 ipv6 )
+	$(use_enable json json )
+	$(use_with kerberos kerberos "${EPREFIX}"/usr)
+	$(use_enable xml libxml )
+	$(use_with xml libxml-dir "${EPREFIX}"/usr)
+	$(use_enable unicode mbstring )
+	$(use_with crypt mcrypt "${EPREFIX}"/usr)
+	$(use_with mssql mssql "${EPREFIX}"/usr)
+	$(use_with unicode onig "${EPREFIX}"/usr)
+	$(use_with ssl openssl "${EPREFIX}"/usr)
+	$(use_with ssl openssl-dir "${EPREFIX}"/usr)
+	$(use_enable pcntl pcntl )
+	$(use_enable phar phar )
+	$(use_enable pdo pdo )
+	$(use_enable opcache opcache )
+	$(use_with postgres pgsql "${EPREFIX}"/usr)
+	$(use_enable posix posix )
+	$(use_with spell pspell "${EPREFIX}"/usr)
+	$(use_with recode recode "${EPREFIX}"/usr)
+	$(use_enable simplexml simplexml )
+	$(use_enable sharedmem shmop )
+	$(use_with snmp snmp "${EPREFIX}"/usr)
+	$(use_enable soap soap )
+	$(use_enable sockets sockets )
+	$(use_with sqlite sqlite3 "${EPREFIX}"/usr)
+	$(use_with sybase-ct sybase-ct "${EPREFIX}"/usr)
+	$(use_enable sysvipc sysvmsg )
+	$(use_enable sysvipc sysvsem )
+	$(use_enable sysvipc sysvshm )
+	$(use_with systemd fpm-systemd)
+	$(use_with tidy tidy "${EPREFIX}"/usr)
+	$(use_enable tokenizer tokenizer )
+	$(use_enable wddx wddx )
+	$(use_enable xml xml )
+	$(use_enable xmlreader xmlreader )
+	$(use_enable xmlwriter xmlwriter )
+	$(use_with xmlrpc xmlrpc)
+	$(use_with xslt xsl "${EPREFIX}"/usr)
+	$(use_enable zip zip )
+	$(use_with zlib zlib "${EPREFIX}"/usr)
+	$(use_enable debug debug )"
+
+	# DBA support
+	if use cdb || use berkdb || use flatfile || use gdbm || use inifile \
+		|| use qdbm ; then
+		my_conf="${my_conf} --enable-dba${shared}"
+	fi
+
+	# DBA drivers support
+	my_conf+="
+	$(use_with cdb cdb)
+	$(use_with berkdb db4 ${EPREFIX}/usr)
+	$(use_enable flatfile flatfile )
+	$(use_with gdbm gdbm ${EPREFIX}/usr)
+	$(use_enable inifile inifile )
+	$(use_with qdbm qdbm ${EPREFIX}/usr)"
+
+	# Support for the GD graphics library
+	my_conf+="
+	$(use_with truetype freetype-dir ${EPREFIX}/usr)
+	$(use_with truetype t1lib ${EPREFIX}/usr)
+	$(use_enable cjk gd-jis-conv )
+	$(use_with gd jpeg-dir ${EPREFIX}/usr)
+	$(use_with gd png-dir ${EPREFIX}/usr)
+	$(use_with xpm xpm-dir ${EPREFIX}/usr)
+	$(use_with vpx vpx-dir ${EPREFIX}/usr)"
+	# enable gd last, so configure can pick up the previous settings
+	my_conf+="
+	$(use_with gd gd)"
+
+	# IMAP support
+	if use imap ; then
+		my_conf+="
+		$(use_with imap imap ${EPREFIX}/usr)
+		$(use_with ssl imap-ssl ${EPREFIX}/usr)"
+	fi
+
+	# Interbase/firebird support
+
+	if use firebird ; then
+		my_conf+="
+		$(use_with firebird interbase ${EPREFIX}/usr)"
+	fi
+
+	# LDAP support
+	if use ldap ; then
+		my_conf+="
+		$(use_with ldap ldap ${EPREFIX}/usr)
+		$(use_with ldap-sasl ldap-sasl ${EPREFIX}/usr)"
+	fi
+
+	# MySQL support
+	local mysqllib="mysqlnd"
+	local mysqlilib="mysqlnd"
+	use libmysqlclient && mysqllib="${EPREFIX}/usr"
+	use libmysqlclient && mysqlilib="${EPREFIX}/usr/bin/mysql_config"
+
+	my_conf+=" $(use_with mysql mysql $mysqllib)"
+	my_conf+=" $(use_with mysqli mysqli $mysqlilib)"
+
+	local mysqlsock=" $(use_with mysql mysql-sock ${EPREFIX}/var/run/mysqld/mysqld.sock)"
+	if use mysql ; then
+		my_conf+="${mysqlsock}"
+	elif use mysqli ; then
+		my_conf+="${mysqlsock}"
+	fi
+
+	# ODBC support
+	if use odbc ; then
+		my_conf+="
+		$(use_with odbc unixODBC ${EPREFIX}/usr)"
+	fi
+
+	if use iodbc ; then
+		my_conf+="
+		$(use_with iodbc iodbc ${EPREFIX}/usr)"
+	fi
+
+	# Oracle support
+	if use oci8-instant-client ; then
+		my_conf+="
+		$(use_with oci8-instant-client oci8)"
+	fi
+
+	# PDO support
+	if use pdo ; then
+		my_conf+="
+		$(use_with mssql pdo-dblib )
+		$(use_with mysql pdo-mysql ${mysqllib})
+		$(use_with postgres pdo-pgsql )
+		$(use_with sqlite pdo-sqlite ${EPREFIX}/usr)
+		$(use_with odbc pdo-odbc unixODBC,${EPREFIX}/usr)"
+		if use oci8-instant-client ; then
+			my_conf+="
+			$(use_with oci8-instant-client pdo-oci)"
+		fi
+	fi
+
+	# readline/libedit support
+	my_conf+="
+	$(use_with readline readline ${EPREFIX}/usr)
+	$(use_with libedit libedit ${EPREFIX}/usr)"
+
+	# Session support
+	if use session ; then
+		my_conf+="
+		$(use_with sharedmem mm ${EPREFIX}/usr)"
+	else
+		my_conf+="
+		$(use_enable session session )"
+	fi
+
+	# Use pic for shared modules such as apache2's mod_php
+	my_conf="${my_conf} --with-pic"
+
+	# we use the system copy of pcre
+	# --with-pcre-regex affects ext/pcre
+	# --with-pcre-dir affects ext/filter and ext/zip
+	my_conf="${my_conf} --with-pcre-regex=${EPREFIX}/usr --with-pcre-dir=${EPREFIX}/usr"
+
+	# Catch CFLAGS problems
+	# Fixes bug #14067.
+	# Changed order to run it in reverse for bug #32022 and #12021.
+	replace-cpu-flags "k6*" "i586"
+
+	# Support user-passed configuration parameters
+	my_conf="${my_conf} ${EXTRA_ECONF:-}"
+
+	# Support the Apache2 extras, they must be set globally for all
+	# SAPIs to work correctly, especially for external PHP extensions
+
+	mkdir -p "${WORKDIR}/sapis-build"
+	for one_sapi in $SAPIS ; do
+		use "${one_sapi}" || continue
+		php_set_ini_dir "${one_sapi}"
+
+		cp -r "${S}" "${WORKDIR}/sapis-build/${one_sapi}"
+		cd "${WORKDIR}/sapis-build/${one_sapi}"
+
+		sapi_conf="${my_conf} --with-config-file-path=${PHP_INI_DIR}
+			--with-config-file-scan-dir=${PHP_EXT_INI_DIR_ACTIVE}"
+
+		for sapi in $SAPIS ; do
+			case "$sapi" in
+				cli|cgi|embed|fpm)
+					if [[ "${one_sapi}" == "${sapi}" ]] ; then
+						sapi_conf="${sapi_conf} --enable-${sapi}"
+					else
+						sapi_conf="${sapi_conf} --disable-${sapi}"
+					fi
+					;;
+
+				apache2)
+					if [[ "${one_sapi}" == "${sapi}" ]] ; then
+						sapi_conf="${sapi_conf} --with-apxs2=${EPREFIX}/usr/sbin/apxs"
+					else
+						sapi_conf="${sapi_conf} --without-apxs2"
+					fi
+					;;
+			esac
+		done
+
+		econf ${sapi_conf}
+	done
+}
+
+src_compile() {
+	# snmp seems to run during src_compile, too (bug #324739)
+	addpredict /usr/share/snmp/mibs/.index
+	addpredict /var/lib/net-snmp/mib_indexes
+
+	for sapi in ${SAPIS} ; do
+		if use "${sapi}"; then
+			cd "${WORKDIR}/sapis-build/$sapi" || "Failed to change dir to ${WORKDIR}/sapis-build/$1"
+			emake || die "emake failed"
+		fi
+	done
+}
+
+src_install() {
+	# see bug #324739 for what happens when we don't have that
+	addpredict /usr/share/snmp/mibs/.index
+
+	# grab the first SAPI that got built and install common files from there
+	local first_sapi=""
+	for sapi in $SAPIS ; do
+		if use $sapi ; then
+			first_sapi=$sapi
+			break
+		fi
+	done
+
+	# Makefile forgets to create this before trying to write to it...
+	dodir "${PHP_DESTDIR#${EPREFIX}}/bin"
+
+	# Install php environment (without any sapis)
+	cd "${WORKDIR}/sapis-build/$first_sapi"
+	emake INSTALL_ROOT="${D}" \
+		install-build install-headers install-programs \
+		|| die "emake install failed"
+
+	local extension_dir="$("${ED}/${PHP_DESTDIR#${EPREFIX}}/bin/php-config" --extension-dir)"
+
+	# Create the directory where we'll put version-specific php scripts
+	keepdir /usr/share/php${PHP_MV}
+
+	local sapi="", file=""
+	local sapi_list=""
+
+	for sapi in ${SAPIS}; do
+		if use "${sapi}" ; then
+			einfo "Installing SAPI: ${sapi}"
+			cd "${WORKDIR}/sapis-build/${sapi}"
+
+			if [[ "${sapi}" == "apache2" ]] ; then
+				# We're specifically not using emake install-sapi as libtool
+				# may cause unnecessary relink failures (see bug #351266)
+				insinto "${PHP_DESTDIR#${EPREFIX}}/apache2/"
+				newins ".libs/libphp5$(get_libname)" "libphp${PHP_MV}$(get_libname)"
+				keepdir "/usr/$(get_libdir)/apache2/modules"
+			else
+				# needed each time, php_install_ini would reset it
+				local dest="${PHP_DESTDIR#${EPREFIX}}"
+				into "${dest}"
+				case "$sapi" in
+					cli)
+						source="sapi/cli/php"
+						;;
+					cgi)
+						source="sapi/cgi/php-cgi"
+						;;
+					fpm)
+						source="sapi/fpm/php-fpm"
+						;;
+					embed)
+						source="libs/libphp${PHP_MV}$(get_libname)"
+						;;
+					*)
+						die "unhandled sapi in src_install"
+						;;
+				esac
+
+				if [[ "${source}" == *"$(get_libname)" ]]; then
+					dolib.so "${source}" || die "Unable to install ${sapi} sapi"
+				else
+					dobin "${source}" || die "Unable to install ${sapi} sapi"
+					local name="$(basename ${source})"
+					dosym "${dest}/bin/${name}" "/usr/bin/${name}${SLOT}"
+				fi
+			fi
+
+			php_install_ini "${sapi}"
+
+			# construct correct SAPI string for php-config
+			# thanks to ferringb for the bash voodoo
+			if [[ "${sapi}" == "apache2" ]]; then
+				sapi_list="${sapi_list:+${sapi_list} }apache2handler"
+			else
+				sapi_list="${sapi_list:+${sapi_list} }${sapi}"
+			fi
+		fi
+	done
+
+	# Installing opcache module
+	if use_if_iuse opcache ; then
+		dolib.so "modules/opcache$(get_libname)" || die "Unable to install opcache module"
+	fi
+
+	# Install env.d files
+	newenvd "${FILESDIR}/20php5-envd" \
+		"20php${SLOT}"
+	sed -e "s|/lib/|/$(get_libdir)/|g" -i \
+		"${ED}/etc/env.d/20php${SLOT}"
+	sed -e "s|php5|php${SLOT}|g" -i \
+		"${ED}/etc/env.d/20php${SLOT}"
+
+	# set php-config variable correctly (bug #278439)
+	sed -e "s:^\(php_sapis=\)\".*\"$:\1\"${sapi_list}\":" -i \
+		"${ED}/usr/$(get_libdir)/php${SLOT}/bin/php-config"
+
+	if use fpm ; then
+		if use systemd; then
+			systemd_newunit "${FILESDIR}/php-fpm_at.service" "php-fpm@${SLOT}.service"
+		else
+			systemd_newunit "${FILESDIR}/php-fpm_at-simple.service" "php-fpm@${SLOT}.service"
+		fi
+	fi
+}
+
+src_test() {
+	echo ">>> Test phase [test]: ${CATEGORY}/${PF}"
+	PHP_BIN="${WORKDIR}/sapis-build/cli/sapi/cli/php"
+	if [[ ! -x "${PHP_BIN}" ]] ; then
+		ewarn "Test phase requires USE=cli, skipping"
+		return
+	else
+		export TEST_PHP_EXECUTABLE="${PHP_BIN}"
+	fi
+
+	if [[ -x "${WORKDIR}/sapis/cgi/php-cgi" ]] ; then
+		export TEST_PHP_CGI_EXECUTABLE="${WORKDIR}/sapis/cgi/php-cgi"
+	fi
+
+	REPORT_EXIT_STATUS=1 "${TEST_PHP_EXECUTABLE}" -n  -d "session.save_path=${T}" \
+		"${WORKDIR}/sapis-build/cli/run-tests.php" -n -q -d "session.save_path=${T}"
+
+	for name in ${EXPECTED_TEST_FAILURES}; do
+		mv "${name}.out" "${name}.out.orig" 2>/dev/null
+	done
+
+	local failed="$(find -name '*.out')"
+	if [[ ${failed} != "" ]] ; then
+		ewarn "The following test cases failed unexpectedly:"
+		for name in ${failed}; do
+			ewarn "  ${name/.out/}"
+		done
+	else
+		einfo "No unexpected test failures, all fine"
+	fi
+
+	if [[ ${PHP_SHOW_UNEXPECTED_TEST_PASS} == "1" ]] ; then
+		local passed=""
+		for name in ${EXPECTED_TEST_FAILURES}; do
+			[[ -f "${name}.diff" ]] && continue
+			passed="${passed} ${name}"
+		done
+		if [[ ${passed} != "" ]] ; then
+			einfo "The following test cases passed unexpectedly:"
+			for name in ${passed}; do
+				ewarn "  ${passed}"
+			done
+		else
+			einfo "None of the known-to-fail tests passed, all fine"
+		fi
+	fi
+}
+
+pkg_postinst() {
+	# Output some general info to the user
+	if use apache2 ; then
+		APACHE2_MOD_DEFINE="PHP5"
+		APACHE2_MOD_CONF="70_mod_php5"  # actually provided by app-eselect/eselect-php
+		apache-module_pkg_postinst
+	fi
+
+	# Create the symlinks for php
+	for m in ${SAPIS}; do
+		[[ ${m} == 'embed' ]] && continue;
+		if use $m ; then
+			local ci=$(eselect php show $m)
+			if [[ -z $ci ]]; then
+				eselect php set $m php${SLOT}
+				einfo "Switched ${m} to use php:${SLOT}"
+				einfo
+			elif [[ $ci != "php${SLOT}" ]] ; then
+				elog "To switch $m to use php:${SLOT}, run"
+				elog "    eselect php set $m php${SLOT}"
+				elog
+			fi
+		fi
+	done
+
+	elog "Make sure that PHP_TARGETS in ${EPREFIX}/etc/make.conf includes php${SLOT/./-} in order"
+	elog "to compile extensions for the ${SLOT} ABI"
+	elog
+	if ! use readline && use cli ; then
+		ewarn "Note that in order to use php interactivly, you need to enable"
+		ewarn "the readline USE flag or php -a will hang"
+	fi
+	elog
+	elog "This ebuild installed a version of php.ini based on php.ini-${PHP_INI_VERSION} version."
+	elog "You can chose which version of php.ini to install by default by setting PHP_INI_VERSION to either"
+	elog "'production' or 'development' in ${EPREFIX}/etc/make.conf"
+	elog "Both versions of php.ini can be found in ${EPREFIX}/usr/share/doc/${PF}"
+
+	elog
+	elog "For more details on how minor version slotting works (PHP_TARGETS) please read the upgrade guide:"
+	elog "https://www.gentoo.org/proj/en/php/php-upgrading.xml"
+	elog
+}
+
+pkg_prerm() {
+	eselect php cleanup
+}
diff --git a/dev-lang/php/php-5.6.10.ebuild b/dev-lang/php/php-5.6.10.ebuild
deleted file mode 100644
index aeedfb4d9ba5..000000000000
--- a/dev-lang/php/php-5.6.10.ebuild
+++ /dev/null
@@ -1,784 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils autotools flag-o-matic versionator depend.apache apache-module db-use libtool systemd
-
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-
-function php_get_uri ()
-{
-	case "${1}" in
-		"php-pre")
-			echo "http://downloads.php.net/dsp/${2}"
-		;;
-		"php")
-			echo "http://www.php.net/distributions/${2}"
-		;;
-		"olemarkus")
-			echo "https://dev.gentoo.org/~olemarkus/php/${2}"
-		;;
-		"gentoo")
-			echo "mirror://gentoo/${2}"
-		;;
-		*)
-			die "unhandled case in php_get_uri"
-		;;
-	esac
-}
-
-PHP_MV="$(get_major_version)"
-SLOT="$(get_version_component_range 1-2)"
-
-# alias, so we can handle different types of releases (finals, rcs, alphas,
-# betas, ...) w/o changing the whole ebuild
-PHP_PV="${PV/_rc/RC}"
-PHP_PV="${PHP_PV/_alpha/alpha}"
-PHP_PV="${PHP_PV/_beta/beta}"
-PHP_RELEASE="php"
-[[ ${PV} == ${PV/_alpha/} ]] || PHP_RELEASE="php-pre"
-[[ ${PV} == ${PV/_beta/} ]] || PHP_RELEASE="php-pre"
-[[ ${PV} == ${PV/_rc/} ]] || PHP_RELEASE="php-pre"
-PHP_P="${PN}-${PHP_PV}"
-
-PHP_SRC_URI="$(php_get_uri "${PHP_RELEASE}" "${PHP_P}.tar.bz2")"
-
-PHP_FPM_CONF_VER="1"
-
-SRC_URI="${PHP_SRC_URI}"
-
-DESCRIPTION="The PHP language runtime engine: CLI, CGI, FPM/FastCGI, Apache2 and embed SAPIs"
-HOMEPAGE="http://php.net/"
-LICENSE="PHP-3"
-
-S="${WORKDIR}/${PHP_P}"
-
-# We can build the following SAPIs in the given order
-SAPIS="embed cli cgi fpm apache2"
-
-# SAPIs and SAPI-specific USE flags (cli SAPI is default on):
-IUSE="${IUSE}
-	${SAPIS/cli/+cli}
-	threads"
-
-IUSE="${IUSE} bcmath berkdb bzip2 calendar cdb cjk
-	crypt +ctype curl debug
-	enchant exif frontbase +fileinfo +filter firebird
-	flatfile ftp gd gdbm gmp +hash +iconv imap inifile
-	intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit mhash
-	mssql mysql libmysqlclient mysqli nls
-	oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm
-	readline recode selinux +session sharedmem
-	+simplexml snmp soap sockets spell sqlite ssl
-	sybase-ct sysvipc systemd tidy +tokenizer truetype unicode vpx wddx
-	+xml xmlreader xmlwriter xmlrpc xpm xslt zip zlib"
-
-DEPEND="
-	>=app-eselect/eselect-php-0.7.1-r3[apache2?,fpm?]
-	>=dev-libs/libpcre-8.32[unicode]
-	apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=]
-		<www-servers/apache-2.4[threads=] ) )
-	berkdb? ( =sys-libs/db-4* )
-	bzip2? ( app-arch/bzip2 )
-	cdb? ( || ( dev-db/cdb dev-db/tinycdb ) )
-	cjk? ( !gd? (
-		virtual/jpeg:0
-		media-libs/libpng:0=
-		sys-libs/zlib
-	) )
-	crypt? ( >=dev-libs/libmcrypt-2.4 )
-	curl? ( >=net-misc/curl-7.10.5 )
-	enchant? ( app-text/enchant )
-	exif? ( !gd? (
-		virtual/jpeg:0
-		media-libs/libpng:0=
-		sys-libs/zlib
-	) )
-	firebird? ( dev-db/firebird )
-	gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib )
-	gdbm? ( >=sys-libs/gdbm-1.8.0 )
-	gmp? ( >=dev-libs/gmp-4.1.2 )
-	iconv? ( virtual/libiconv )
-	imap? ( virtual/imap-c-client[ssl=] )
-	intl? ( dev-libs/icu:= )
-	iodbc? ( dev-db/libiodbc )
-	kerberos? ( virtual/krb5 )
-	ldap? ( >=net-nds/openldap-1.2.11 )
-	ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 )
-	libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) )
-	mssql? ( dev-db/freetds[mssql] )
-	libmysqlclient? (
-		mysql? ( virtual/mysql )
-		mysqli? ( >=virtual/mysql-4.1 )
-	)
-	nls? ( sys-devel/gettext )
-	oci8-instant-client? ( dev-db/oracle-instantclient-basic )
-	odbc? ( >=dev-db/unixODBC-1.8.13 )
-	postgres? ( dev-db/postgresql )
-	qdbm? ( dev-db/qdbm )
-	readline? ( sys-libs/readline )
-	recode? ( app-text/recode )
-	sharedmem? ( dev-libs/mm )
-	simplexml? ( >=dev-libs/libxml2-2.6.8 )
-	snmp? ( >=net-analyzer/net-snmp-5.2 )
-	soap? ( >=dev-libs/libxml2-2.6.8 )
-	spell? ( >=app-text/aspell-0.50 )
-	sqlite? ( >=dev-db/sqlite-3.7.6.3 )
-	ssl? ( >=dev-libs/openssl-0.9.7 )
-	sybase-ct? ( dev-db/freetds )
-	tidy? ( app-text/htmltidy )
-	truetype? (
-		=media-libs/freetype-2*
-		>=media-libs/t1lib-5.0.0
-		!gd? (
-			virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib )
-	)
-	unicode? ( dev-libs/oniguruma )
-	vpx? ( media-libs/libvpx )
-	wddx? ( >=dev-libs/libxml2-2.6.8 )
-	xml? ( >=dev-libs/libxml2-2.6.8 )
-	xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv )
-	xmlreader? ( >=dev-libs/libxml2-2.6.8 )
-	xmlwriter? ( >=dev-libs/libxml2-2.6.8 )
-	xpm? (
-		x11-libs/libXpm
-		virtual/jpeg:0
-		media-libs/libpng:0= sys-libs/zlib
-	)
-	xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 )
-	zip? ( sys-libs/zlib )
-	zlib? ( sys-libs/zlib )
-	virtual/mta
-"
-
-php="=${CATEGORY}/${PF}"
-
-REQUIRED_USE="
-	truetype? ( gd )
-	vpx? ( gd )
-	cjk? ( gd )
-	exif? ( gd )
-
-	xpm? ( gd )
-	gd? ( zlib )
-	simplexml? ( xml )
-	soap? ( xml )
-	wddx? ( xml )
-	xmlrpc? ( || ( xml iconv ) )
-	xmlreader? ( xml )
-	xslt? ( xml )
-	ldap-sasl? ( ldap )
-	mhash? ( hash )
-	phar? ( hash )
-	libmysqlclient? ( || (
-		mysql
-		mysqli
-		pdo
-	) )
-
-	qdbm? ( !gdbm )
-	readline? ( !libedit )
-	recode? ( !imap !mysql !mysqli )
-	sharedmem? ( !threads )
-
-	!cli? ( !cgi? ( !fpm? ( !apache2? ( !embed? ( cli ) ) ) ) )"
-
-RDEPEND="${DEPEND}"
-
-RDEPEND="${RDEPEND}
-	fpm? (
-		selinux? ( sec-policy/selinux-phpfpm )
-		systemd? ( sys-apps/systemd ) )"
-
-DEPEND="${DEPEND}
-	sys-devel/flex
-	>=sys-devel/m4-1.4.3
-	>=sys-devel/libtool-1.5.18"
-
-# Allow users to install production version if they want to
-
-case "${PHP_INI_VERSION}" in
-	production|development)
-		;;
-	*)
-		PHP_INI_VERSION="development"
-		;;
-esac
-
-PHP_INI_UPSTREAM="php.ini-${PHP_INI_VERSION}"
-PHP_INI_FILE="php.ini"
-
-want_apache
-
-pkg_setup() {
-	depend.apache_pkg_setup
-}
-
-php_install_ini() {
-	local phpsapi="${1}"
-
-	# work out where we are installing the ini file
-	php_set_ini_dir "${phpsapi}"
-
-	local phpinisrc="${PHP_INI_UPSTREAM}-${phpsapi}"
-	cp "${PHP_INI_UPSTREAM}" "${phpinisrc}"
-
-	# default to /tmp for save_path, bug #282768
-	sed -e 's|^;session.save_path .*$|session.save_path = "'"${EPREFIX}"'/tmp"|g' -i "${phpinisrc}"
-
-	# Set the extension dir
-	sed -e "s|^extension_dir .*$|extension_dir = ${extension_dir}|g" -i "${phpinisrc}"
-
-	# Set the include path to point to where we want to find PEAR packages
-	sed -e 's|^;include_path = ".:/php/includes".*|include_path = ".:'"${EPREFIX}"'/usr/share/php'${PHP_MV}':'"${EPREFIX}"'/usr/share/php"|' -i "${phpinisrc}"
-
-	dodir "${PHP_INI_DIR#${EPREFIX}}"
-	insinto "${PHP_INI_DIR#${EPREFIX}}"
-	newins "${phpinisrc}" "${PHP_INI_FILE}"
-
-	elog "Installing php.ini for ${phpsapi} into ${PHP_INI_DIR#${EPREFIX}}"
-	elog
-
-	dodir "${PHP_EXT_INI_DIR#${EPREFIX}}"
-	dodir "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}"
-
-	if use_if_iuse opcache; then
-		elog "Adding opcache to $PHP_EXT_INI_DIR"
-		echo "zend_extension=${PHP_DESTDIR}/$(get_libdir)/opcache.so" >> "${D}/${PHP_EXT_INI_DIR}"/opcache.ini
-		dosym "${PHP_EXT_INI_DIR#${EPREFIX}}/opcache.ini" "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}/opcache.ini"
-	fi
-
-	# SAPI-specific handling
-
-	if [[ "${sapi}" == "fpm" ]] ; then
-		[[ -z ${PHP_FPM_CONF_VER} ]] && PHP_FPM_CONF_VER=0
-		einfo "Installing FPM CGI config file php-fpm.conf"
-		insinto "${PHP_INI_DIR#${EPREFIX}}"
-		newins "${FILESDIR}/php-fpm-r${PHP_FPM_CONF_VER}.conf" php-fpm.conf
-
-		# Remove bogus /etc/php-fpm.conf.default (bug 359906)
-		[[ -f "${ED}/etc/php-fpm.conf.default" ]] && rm "${ED}/etc/php-fpm.conf.default"
-	fi
-
-	# Install PHP ini files into /usr/share/php
-
-	dodoc php.ini-development
-	dodoc php.ini-production
-
-}
-
-php_set_ini_dir() {
-	PHP_INI_DIR="${EPREFIX}/etc/php/${1}-php${SLOT}"
-	PHP_EXT_INI_DIR="${PHP_INI_DIR}/ext"
-	PHP_EXT_INI_DIR_ACTIVE="${PHP_INI_DIR}/ext-active"
-}
-
-src_prepare() {
-	# USE=sharedmem (session/mod_mm to be exact) tries to mmap() this path
-	# ([empty session.save_path]/session_mm_[sapi][gid].sem)
-	# there is no easy way to circumvent that, all php calls during
-	# install use -n, so no php.ini file will be used.
-	# As such, this is the easiest way to get around
-	addpredict /session_mm_cli250.sem
-	addpredict /session_mm_cli0.sem
-
-	# Change PHP branding
-	# Get the alpha/beta/rc version
-	sed -re	"s|^(PHP_EXTRA_VERSION=\").*(\")|\1-pl${PR/r/}-gentoo\2|g" \
-		-i configure.in || die "Unable to change PHP branding"
-
-	# Patch PHP to show Gentoo as the server platform
-	sed -e 's/PHP_UNAME=`uname -a | xargs`/PHP_UNAME=`uname -s -n -r -v | xargs`/g' \
-		-i configure.in || die "Failed to fix server platform name"
-
-	# Prevent PHP from activating the Apache config,
-	# as we will do that ourselves
-	sed -i \
-		-e "s,-i -a -n php${PHP_MV},-i -n php${PHP_MV},g" \
-		-e "s,-i -A -n php${PHP_MV},-i -n php${PHP_MV},g" \
-		configure sapi/apache2filter/config.m4 sapi/apache2handler/config.m4
-
-	# Patch PHP to support heimdal instead of mit-krb5
-	if has_version "app-crypt/heimdal" ; then
-		sed -e 's|gssapi_krb5|gssapi|g' -i acinclude.m4 \
-			|| die "Failed to fix heimdal libname"
-		sed -e 's|PHP_ADD_LIBRARY(k5crypto, 1, $1)||g' -i acinclude.m4 \
-			|| die "Failed to fix heimdal crypt library reference"
-	fi
-
-	#Add user patches #357637
-	epatch_user
-
-	#force rebuilding aclocal.m4
-	rm aclocal.m4
-	eautoreconf
-
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		# http://bugs.php.net/bug.php?id=48795, bug #343481
-		sed -i -e '/BUILD_CGI="\\$(CC)/s/CC/CXX/' configure || die
-	fi
-}
-
-src_configure() {
-	addpredict /usr/share/snmp/mibs/.index
-	addpredict /var/lib/net-snmp/mib_indexes
-
-	PHP_DESTDIR="${EPREFIX}/usr/$(get_libdir)/php${SLOT}"
-
-	# This is a global variable and should be in caps. It isn't because the
-	# phpconfutils eclass relies on exactly this name...
-	# for --with-libdir see bug #327025
-	my_conf="
-		--prefix="${PHP_DESTDIR}"
-		--mandir="${PHP_DESTDIR}"/man
-		--infodir="${PHP_DESTDIR}"/info
-		--libdir="${PHP_DESTDIR}"/lib
-		--with-libdir=$(get_libdir)
-		--without-pear
-		$(use_enable threads maintainer-zts)"
-
-	#                             extension		  USE flag        shared
-	my_conf+="
-	$(use_enable bcmath bcmath )
-	$(use_with bzip2 bz2 "${EPREFIX}"/usr)
-	$(use_enable calendar calendar )
-	$(use_enable ctype ctype )
-	$(use_with curl curl "${EPREFIX}"/usr)
-	$(use_enable xml dom )
-	$(use_with enchant enchant "${EPREFIX}"/usr)
-	$(use_enable exif exif )
-	$(use_enable fileinfo fileinfo )
-	$(use_enable filter filter )
-	$(use_enable ftp ftp )
-	$(use_with nls gettext "${EPREFIX}"/usr)
-	$(use_with gmp gmp "${EPREFIX}"/usr)
-	$(use_enable hash hash )
-	$(use_with mhash mhash "${EPREFIX}"/usr)
-	$(use_with iconv iconv $(use elibc_glibc || use elibc_musl || echo "${EPREFIX}"/usr))
-	$(use_enable intl intl )
-	$(use_enable ipv6 ipv6 )
-	$(use_enable json json )
-	$(use_with kerberos kerberos "${EPREFIX}"/usr)
-	$(use_enable xml libxml )
-	$(use_with xml libxml-dir "${EPREFIX}"/usr)
-	$(use_enable unicode mbstring )
-	$(use_with crypt mcrypt "${EPREFIX}"/usr)
-	$(use_with mssql mssql "${EPREFIX}"/usr)
-	$(use_with unicode onig "${EPREFIX}"/usr)
-	$(use_with ssl openssl "${EPREFIX}"/usr)
-	$(use_with ssl openssl-dir "${EPREFIX}"/usr)
-	$(use_enable pcntl pcntl )
-	$(use_enable phar phar )
-	$(use_enable pdo pdo )
-	$(use_enable opcache opcache )
-	$(use_with postgres pgsql "${EPREFIX}"/usr)
-	$(use_enable posix posix )
-	$(use_with spell pspell "${EPREFIX}"/usr)
-	$(use_with recode recode "${EPREFIX}"/usr)
-	$(use_enable simplexml simplexml )
-	$(use_enable sharedmem shmop )
-	$(use_with snmp snmp "${EPREFIX}"/usr)
-	$(use_enable soap soap )
-	$(use_enable sockets sockets )
-	$(use_with sqlite sqlite3 "${EPREFIX}"/usr)
-	$(use_with sybase-ct sybase-ct "${EPREFIX}"/usr)
-	$(use_enable sysvipc sysvmsg )
-	$(use_enable sysvipc sysvsem )
-	$(use_enable sysvipc sysvshm )
-	$(use_with systemd fpm-systemd)
-	$(use_with tidy tidy "${EPREFIX}"/usr)
-	$(use_enable tokenizer tokenizer )
-	$(use_enable wddx wddx )
-	$(use_enable xml xml )
-	$(use_enable xmlreader xmlreader )
-	$(use_enable xmlwriter xmlwriter )
-	$(use_with xmlrpc xmlrpc)
-	$(use_with xslt xsl "${EPREFIX}"/usr)
-	$(use_enable zip zip )
-	$(use_with zlib zlib "${EPREFIX}"/usr)
-	$(use_enable debug debug )"
-
-	# DBA support
-	if use cdb || use berkdb || use flatfile || use gdbm || use inifile \
-		|| use qdbm ; then
-		my_conf="${my_conf} --enable-dba${shared}"
-	fi
-
-	# DBA drivers support
-	my_conf+="
-	$(use_with cdb cdb)
-	$(use_with berkdb db4 ${EPREFIX}/usr)
-	$(use_enable flatfile flatfile )
-	$(use_with gdbm gdbm ${EPREFIX}/usr)
-	$(use_enable inifile inifile )
-	$(use_with qdbm qdbm ${EPREFIX}/usr)"
-
-	# Support for the GD graphics library
-	my_conf+="
-	$(use_with truetype freetype-dir ${EPREFIX}/usr)
-	$(use_with truetype t1lib ${EPREFIX}/usr)
-	$(use_enable cjk gd-jis-conv )
-	$(use_with gd jpeg-dir ${EPREFIX}/usr)
-	$(use_with gd png-dir ${EPREFIX}/usr)
-	$(use_with xpm xpm-dir ${EPREFIX}/usr)
-	$(use_with vpx vpx-dir ${EPREFIX}/usr)"
-	# enable gd last, so configure can pick up the previous settings
-	my_conf+="
-	$(use_with gd gd)"
-
-	# IMAP support
-	if use imap ; then
-		my_conf+="
-		$(use_with imap imap ${EPREFIX}/usr)
-		$(use_with ssl imap-ssl ${EPREFIX}/usr)"
-	fi
-
-	# Interbase/firebird support
-
-	if use firebird ; then
-		my_conf+="
-		$(use_with firebird interbase ${EPREFIX}/usr)"
-	fi
-
-	# LDAP support
-	if use ldap ; then
-		my_conf+="
-		$(use_with ldap ldap ${EPREFIX}/usr)
-		$(use_with ldap-sasl ldap-sasl ${EPREFIX}/usr)"
-	fi
-
-	# MySQL support
-	local mysqllib="mysqlnd"
-	local mysqlilib="mysqlnd"
-	use libmysqlclient && mysqllib="${EPREFIX}/usr"
-	use libmysqlclient && mysqlilib="${EPREFIX}/usr/bin/mysql_config"
-
-	my_conf+=" $(use_with mysql mysql $mysqllib)"
-	my_conf+=" $(use_with mysqli mysqli $mysqlilib)"
-
-	local mysqlsock=" $(use_with mysql mysql-sock ${EPREFIX}/var/run/mysqld/mysqld.sock)"
-	if use mysql ; then
-		my_conf+="${mysqlsock}"
-	elif use mysqli ; then
-		my_conf+="${mysqlsock}"
-	fi
-
-	# ODBC support
-	if use odbc ; then
-		my_conf+="
-		$(use_with odbc unixODBC ${EPREFIX}/usr)"
-	fi
-
-	if use iodbc ; then
-		my_conf+="
-		$(use_with iodbc iodbc ${EPREFIX}/usr)"
-	fi
-
-	# Oracle support
-	if use oci8-instant-client ; then
-		my_conf+="
-		$(use_with oci8-instant-client oci8)"
-	fi
-
-	# PDO support
-	if use pdo ; then
-		my_conf+="
-		$(use_with mssql pdo-dblib )
-		$(use_with mysql pdo-mysql ${mysqllib})
-		$(use_with postgres pdo-pgsql )
-		$(use_with sqlite pdo-sqlite ${EPREFIX}/usr)
-		$(use_with odbc pdo-odbc unixODBC,${EPREFIX}/usr)"
-		if use oci8-instant-client ; then
-			my_conf+="
-			$(use_with oci8-instant-client pdo-oci)"
-		fi
-	fi
-
-	# readline/libedit support
-	my_conf+="
-	$(use_with readline readline ${EPREFIX}/usr)
-	$(use_with libedit libedit ${EPREFIX}/usr)"
-
-	# Session support
-	if use session ; then
-		my_conf+="
-		$(use_with sharedmem mm ${EPREFIX}/usr)"
-	else
-		my_conf+="
-		$(use_enable session session )"
-	fi
-
-	# Use pic for shared modules such as apache2's mod_php
-	my_conf="${my_conf} --with-pic"
-
-	# we use the system copy of pcre
-	# --with-pcre-regex affects ext/pcre
-	# --with-pcre-dir affects ext/filter and ext/zip
-	my_conf="${my_conf} --with-pcre-regex=${EPREFIX}/usr --with-pcre-dir=${EPREFIX}/usr"
-
-	# Catch CFLAGS problems
-	# Fixes bug #14067.
-	# Changed order to run it in reverse for bug #32022 and #12021.
-	replace-cpu-flags "k6*" "i586"
-
-	# Support user-passed configuration parameters
-	my_conf="${my_conf} ${EXTRA_ECONF:-}"
-
-	# Support the Apache2 extras, they must be set globally for all
-	# SAPIs to work correctly, especially for external PHP extensions
-
-	mkdir -p "${WORKDIR}/sapis-build"
-	for one_sapi in $SAPIS ; do
-		use "${one_sapi}" || continue
-		php_set_ini_dir "${one_sapi}"
-
-		cp -r "${S}" "${WORKDIR}/sapis-build/${one_sapi}"
-		cd "${WORKDIR}/sapis-build/${one_sapi}"
-
-		sapi_conf="${my_conf} --with-config-file-path=${PHP_INI_DIR}
-			--with-config-file-scan-dir=${PHP_EXT_INI_DIR_ACTIVE}"
-
-		for sapi in $SAPIS ; do
-			case "$sapi" in
-				cli|cgi|embed|fpm)
-					if [[ "${one_sapi}" == "${sapi}" ]] ; then
-						sapi_conf="${sapi_conf} --enable-${sapi}"
-					else
-						sapi_conf="${sapi_conf} --disable-${sapi}"
-					fi
-					;;
-
-				apache2)
-					if [[ "${one_sapi}" == "${sapi}" ]] ; then
-						sapi_conf="${sapi_conf} --with-apxs2=${EPREFIX}/usr/sbin/apxs"
-					else
-						sapi_conf="${sapi_conf} --without-apxs2"
-					fi
-					;;
-			esac
-		done
-
-		econf ${sapi_conf}
-	done
-}
-
-src_compile() {
-	# snmp seems to run during src_compile, too (bug #324739)
-	addpredict /usr/share/snmp/mibs/.index
-	addpredict /var/lib/net-snmp/mib_indexes
-
-	for sapi in ${SAPIS} ; do
-		if use "${sapi}"; then
-			cd "${WORKDIR}/sapis-build/$sapi" || "Failed to change dir to ${WORKDIR}/sapis-build/$1"
-			emake || die "emake failed"
-		fi
-	done
-}
-
-src_install() {
-	# see bug #324739 for what happens when we don't have that
-	addpredict /usr/share/snmp/mibs/.index
-
-	# grab the first SAPI that got built and install common files from there
-	local first_sapi=""
-	for sapi in $SAPIS ; do
-		if use $sapi ; then
-			first_sapi=$sapi
-			break
-		fi
-	done
-
-	# Makefile forgets to create this before trying to write to it...
-	dodir "${PHP_DESTDIR#${EPREFIX}}/bin"
-
-	# Install php environment (without any sapis)
-	cd "${WORKDIR}/sapis-build/$first_sapi"
-	emake INSTALL_ROOT="${D}" \
-		install-build install-headers install-programs \
-		|| die "emake install failed"
-
-	local extension_dir="$("${ED}/${PHP_DESTDIR#${EPREFIX}}/bin/php-config" --extension-dir)"
-
-	# Create the directory where we'll put version-specific php scripts
-	keepdir /usr/share/php${PHP_MV}
-
-	local sapi="", file=""
-	local sapi_list=""
-
-	for sapi in ${SAPIS}; do
-		if use "${sapi}" ; then
-			einfo "Installing SAPI: ${sapi}"
-			cd "${WORKDIR}/sapis-build/${sapi}"
-
-			if [[ "${sapi}" == "apache2" ]] ; then
-				# We're specifically not using emake install-sapi as libtool
-				# may cause unnecessary relink failures (see bug #351266)
-				insinto "${PHP_DESTDIR#${EPREFIX}}/apache2/"
-				newins ".libs/libphp5$(get_libname)" "libphp${PHP_MV}$(get_libname)"
-				keepdir "/usr/$(get_libdir)/apache2/modules"
-			else
-				# needed each time, php_install_ini would reset it
-				local dest="${PHP_DESTDIR#${EPREFIX}}"
-				into "${dest}"
-				case "$sapi" in
-					cli)
-						source="sapi/cli/php"
-						;;
-					cgi)
-						source="sapi/cgi/php-cgi"
-						;;
-					fpm)
-						source="sapi/fpm/php-fpm"
-						;;
-					embed)
-						source="libs/libphp${PHP_MV}$(get_libname)"
-						;;
-					*)
-						die "unhandled sapi in src_install"
-						;;
-				esac
-
-				if [[ "${source}" == *"$(get_libname)" ]]; then
-					dolib.so "${source}" || die "Unable to install ${sapi} sapi"
-				else
-					dobin "${source}" || die "Unable to install ${sapi} sapi"
-					local name="$(basename ${source})"
-					dosym "${dest}/bin/${name}" "/usr/bin/${name}${SLOT}"
-				fi
-			fi
-
-			php_install_ini "${sapi}"
-
-			# construct correct SAPI string for php-config
-			# thanks to ferringb for the bash voodoo
-			if [[ "${sapi}" == "apache2" ]]; then
-				sapi_list="${sapi_list:+${sapi_list} }apache2handler"
-			else
-				sapi_list="${sapi_list:+${sapi_list} }${sapi}"
-			fi
-		fi
-	done
-
-	# Installing opcache module
-	if use_if_iuse opcache ; then
-		dolib.so "modules/opcache$(get_libname)" || die "Unable to install opcache module"
-	fi
-
-	# Install env.d files
-	newenvd "${FILESDIR}/20php5-envd" \
-		"20php${SLOT}"
-	sed -e "s|/lib/|/$(get_libdir)/|g" -i \
-		"${ED}/etc/env.d/20php${SLOT}"
-	sed -e "s|php5|php${SLOT}|g" -i \
-		"${ED}/etc/env.d/20php${SLOT}"
-
-	# set php-config variable correctly (bug #278439)
-	sed -e "s:^\(php_sapis=\)\".*\"$:\1\"${sapi_list}\":" -i \
-		"${ED}/usr/$(get_libdir)/php${SLOT}/bin/php-config"
-
-	if use fpm ; then
-		if use systemd; then
-			systemd_newunit "${FILESDIR}/php-fpm_at.service" "php-fpm@${SLOT}.service"
-		else
-			systemd_newunit "${FILESDIR}/php-fpm_at-simple.service" "php-fpm@${SLOT}.service"
-		fi
-	fi
-}
-
-src_test() {
-	echo ">>> Test phase [test]: ${CATEGORY}/${PF}"
-	PHP_BIN="${WORKDIR}/sapis-build/cli/sapi/cli/php"
-	if [[ ! -x "${PHP_BIN}" ]] ; then
-		ewarn "Test phase requires USE=cli, skipping"
-		return
-	else
-		export TEST_PHP_EXECUTABLE="${PHP_BIN}"
-	fi
-
-	if [[ -x "${WORKDIR}/sapis/cgi/php-cgi" ]] ; then
-		export TEST_PHP_CGI_EXECUTABLE="${WORKDIR}/sapis/cgi/php-cgi"
-	fi
-
-	REPORT_EXIT_STATUS=1 "${TEST_PHP_EXECUTABLE}" -n  -d "session.save_path=${T}" \
-		"${WORKDIR}/sapis-build/cli/run-tests.php" -n -q -d "session.save_path=${T}"
-
-	for name in ${EXPECTED_TEST_FAILURES}; do
-		mv "${name}.out" "${name}.out.orig" 2>/dev/null
-	done
-
-	local failed="$(find -name '*.out')"
-	if [[ ${failed} != "" ]] ; then
-		ewarn "The following test cases failed unexpectedly:"
-		for name in ${failed}; do
-			ewarn "  ${name/.out/}"
-		done
-	else
-		einfo "No unexpected test failures, all fine"
-	fi
-
-	if [[ ${PHP_SHOW_UNEXPECTED_TEST_PASS} == "1" ]] ; then
-		local passed=""
-		for name in ${EXPECTED_TEST_FAILURES}; do
-			[[ -f "${name}.diff" ]] && continue
-			passed="${passed} ${name}"
-		done
-		if [[ ${passed} != "" ]] ; then
-			einfo "The following test cases passed unexpectedly:"
-			for name in ${passed}; do
-				ewarn "  ${passed}"
-			done
-		else
-			einfo "None of the known-to-fail tests passed, all fine"
-		fi
-	fi
-}
-
-pkg_postinst() {
-	# Output some general info to the user
-	if use apache2 ; then
-		APACHE2_MOD_DEFINE="PHP5"
-		APACHE2_MOD_CONF="70_mod_php5"  # actually provided by app-eselect/eselect-php
-		apache-module_pkg_postinst
-	fi
-
-	# Create the symlinks for php
-	for m in ${SAPIS}; do
-		[[ ${m} == 'embed' ]] && continue;
-		if use $m ; then
-			local ci=$(eselect php show $m)
-			if [[ -z $ci ]]; then
-				eselect php set $m php${SLOT}
-				einfo "Switched ${m} to use php:${SLOT}"
-				einfo
-			elif [[ $ci != "php${SLOT}" ]] ; then
-				elog "To switch $m to use php:${SLOT}, run"
-				elog "    eselect php set $m php${SLOT}"
-				elog
-			fi
-		fi
-	done
-
-	elog "Make sure that PHP_TARGETS in ${EPREFIX}/etc/make.conf includes php${SLOT/./-} in order"
-	elog "to compile extensions for the ${SLOT} ABI"
-	elog
-	if ! use readline && use cli ; then
-		ewarn "Note that in order to use php interactivly, you need to enable"
-		ewarn "the readline USE flag or php -a will hang"
-	fi
-	elog
-	elog "This ebuild installed a version of php.ini based on php.ini-${PHP_INI_VERSION} version."
-	elog "You can chose which version of php.ini to install by default by setting PHP_INI_VERSION to either"
-	elog "'production' or 'development' in ${EPREFIX}/etc/make.conf"
-	elog "Both versions of php.ini can be found in ${EPREFIX}/usr/share/doc/${PF}"
-
-	elog
-	elog "For more details on how minor version slotting works (PHP_TARGETS) please read the upgrade guide:"
-	elog "https://www.gentoo.org/proj/en/php/php-upgrading.xml"
-	elog
-}
-
-pkg_prerm() {
-	eselect php cleanup
-}
diff --git a/dev-lang/php/php-5.6.11.ebuild b/dev-lang/php/php-5.6.11.ebuild
deleted file mode 100644
index dcf83629d198..000000000000
--- a/dev-lang/php/php-5.6.11.ebuild
+++ /dev/null
@@ -1,784 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils autotools flag-o-matic versionator depend.apache apache-module db-use libtool systemd
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-
-function php_get_uri ()
-{
-	case "${1}" in
-		"php-pre")
-			echo "http://downloads.php.net/dsp/${2}"
-		;;
-		"php")
-			echo "http://www.php.net/distributions/${2}"
-		;;
-		"olemarkus")
-			echo "https://dev.gentoo.org/~olemarkus/php/${2}"
-		;;
-		"gentoo")
-			echo "mirror://gentoo/${2}"
-		;;
-		*)
-			die "unhandled case in php_get_uri"
-		;;
-	esac
-}
-
-PHP_MV="$(get_major_version)"
-SLOT="$(get_version_component_range 1-2)"
-
-# alias, so we can handle different types of releases (finals, rcs, alphas,
-# betas, ...) w/o changing the whole ebuild
-PHP_PV="${PV/_rc/RC}"
-PHP_PV="${PHP_PV/_alpha/alpha}"
-PHP_PV="${PHP_PV/_beta/beta}"
-PHP_RELEASE="php"
-[[ ${PV} == ${PV/_alpha/} ]] || PHP_RELEASE="php-pre"
-[[ ${PV} == ${PV/_beta/} ]] || PHP_RELEASE="php-pre"
-[[ ${PV} == ${PV/_rc/} ]] || PHP_RELEASE="php-pre"
-PHP_P="${PN}-${PHP_PV}"
-
-PHP_SRC_URI="$(php_get_uri "${PHP_RELEASE}" "${PHP_P}.tar.bz2")"
-
-PHP_FPM_CONF_VER="1"
-
-SRC_URI="${PHP_SRC_URI}"
-
-DESCRIPTION="The PHP language runtime engine: CLI, CGI, FPM/FastCGI, Apache2 and embed SAPIs"
-HOMEPAGE="http://php.net/"
-LICENSE="PHP-3"
-
-S="${WORKDIR}/${PHP_P}"
-
-# We can build the following SAPIs in the given order
-SAPIS="embed cli cgi fpm apache2"
-
-# SAPIs and SAPI-specific USE flags (cli SAPI is default on):
-IUSE="${IUSE}
-	${SAPIS/cli/+cli}
-	threads"
-
-IUSE="${IUSE} bcmath berkdb bzip2 calendar cdb cjk
-	crypt +ctype curl debug
-	enchant exif frontbase +fileinfo +filter firebird
-	flatfile ftp gd gdbm gmp +hash +iconv imap inifile
-	intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit mhash
-	mssql mysql libmysqlclient mysqli nls
-	oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm
-	readline recode selinux +session sharedmem
-	+simplexml snmp soap sockets spell sqlite ssl
-	sybase-ct sysvipc systemd tidy +tokenizer truetype unicode vpx wddx
-	+xml xmlreader xmlwriter xmlrpc xpm xslt zip zlib"
-
-DEPEND="
-	>=app-eselect/eselect-php-0.7.1-r3[apache2?,fpm?]
-	>=dev-libs/libpcre-8.32[unicode]
-	apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=]
-		<www-servers/apache-2.4[threads=] ) )
-	berkdb? ( =sys-libs/db-4* )
-	bzip2? ( app-arch/bzip2 )
-	cdb? ( || ( dev-db/cdb dev-db/tinycdb ) )
-	cjk? ( !gd? (
-		virtual/jpeg:0
-		media-libs/libpng:0=
-		sys-libs/zlib
-	) )
-	crypt? ( >=dev-libs/libmcrypt-2.4 )
-	curl? ( >=net-misc/curl-7.10.5 )
-	enchant? ( app-text/enchant )
-	exif? ( !gd? (
-		virtual/jpeg:0
-		media-libs/libpng:0=
-		sys-libs/zlib
-	) )
-	firebird? ( dev-db/firebird )
-	gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib )
-	gdbm? ( >=sys-libs/gdbm-1.8.0 )
-	gmp? ( >=dev-libs/gmp-4.1.2 )
-	iconv? ( virtual/libiconv )
-	imap? ( virtual/imap-c-client[ssl=] )
-	intl? ( dev-libs/icu:= )
-	iodbc? ( dev-db/libiodbc )
-	kerberos? ( virtual/krb5 )
-	ldap? ( >=net-nds/openldap-1.2.11 )
-	ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 )
-	libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) )
-	mssql? ( dev-db/freetds[mssql] )
-	libmysqlclient? (
-		mysql? ( virtual/mysql )
-		mysqli? ( >=virtual/mysql-4.1 )
-	)
-	nls? ( sys-devel/gettext )
-	oci8-instant-client? ( dev-db/oracle-instantclient-basic )
-	odbc? ( >=dev-db/unixODBC-1.8.13 )
-	postgres? ( dev-db/postgresql )
-	qdbm? ( dev-db/qdbm )
-	readline? ( sys-libs/readline )
-	recode? ( app-text/recode )
-	sharedmem? ( dev-libs/mm )
-	simplexml? ( >=dev-libs/libxml2-2.6.8 )
-	snmp? ( >=net-analyzer/net-snmp-5.2 )
-	soap? ( >=dev-libs/libxml2-2.6.8 )
-	spell? ( >=app-text/aspell-0.50 )
-	sqlite? ( >=dev-db/sqlite-3.7.6.3 )
-	ssl? ( >=dev-libs/openssl-0.9.7 )
-	sybase-ct? ( dev-db/freetds )
-	tidy? ( app-text/htmltidy )
-	truetype? (
-		=media-libs/freetype-2*
-		>=media-libs/t1lib-5.0.0
-		!gd? (
-			virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib )
-	)
-	unicode? ( dev-libs/oniguruma )
-	vpx? ( media-libs/libvpx )
-	wddx? ( >=dev-libs/libxml2-2.6.8 )
-	xml? ( >=dev-libs/libxml2-2.6.8 )
-	xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv )
-	xmlreader? ( >=dev-libs/libxml2-2.6.8 )
-	xmlwriter? ( >=dev-libs/libxml2-2.6.8 )
-	xpm? (
-		x11-libs/libXpm
-		virtual/jpeg:0
-		media-libs/libpng:0= sys-libs/zlib
-	)
-	xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 )
-	zip? ( sys-libs/zlib )
-	zlib? ( sys-libs/zlib )
-	virtual/mta
-"
-
-php="=${CATEGORY}/${PF}"
-
-REQUIRED_USE="
-	truetype? ( gd )
-	vpx? ( gd )
-	cjk? ( gd )
-	exif? ( gd )
-
-	xpm? ( gd )
-	gd? ( zlib )
-	simplexml? ( xml )
-	soap? ( xml )
-	wddx? ( xml )
-	xmlrpc? ( || ( xml iconv ) )
-	xmlreader? ( xml )
-	xslt? ( xml )
-	ldap-sasl? ( ldap )
-	mhash? ( hash )
-	phar? ( hash )
-	libmysqlclient? ( || (
-		mysql
-		mysqli
-		pdo
-	) )
-
-	qdbm? ( !gdbm )
-	readline? ( !libedit )
-	recode? ( !imap !mysql !mysqli )
-	sharedmem? ( !threads )
-
-	!cli? ( !cgi? ( !fpm? ( !apache2? ( !embed? ( cli ) ) ) ) )"
-
-RDEPEND="${DEPEND}"
-
-RDEPEND="${RDEPEND}
-	fpm? (
-		selinux? ( sec-policy/selinux-phpfpm )
-		systemd? ( sys-apps/systemd ) )"
-
-DEPEND="${DEPEND}
-	sys-devel/flex
-	>=sys-devel/m4-1.4.3
-	>=sys-devel/libtool-1.5.18"
-
-# Allow users to install production version if they want to
-
-case "${PHP_INI_VERSION}" in
-	production|development)
-		;;
-	*)
-		PHP_INI_VERSION="development"
-		;;
-esac
-
-PHP_INI_UPSTREAM="php.ini-${PHP_INI_VERSION}"
-PHP_INI_FILE="php.ini"
-
-want_apache
-
-pkg_setup() {
-	depend.apache_pkg_setup
-}
-
-php_install_ini() {
-	local phpsapi="${1}"
-
-	# work out where we are installing the ini file
-	php_set_ini_dir "${phpsapi}"
-
-	local phpinisrc="${PHP_INI_UPSTREAM}-${phpsapi}"
-	cp "${PHP_INI_UPSTREAM}" "${phpinisrc}"
-
-	# default to /tmp for save_path, bug #282768
-	sed -e 's|^;session.save_path .*$|session.save_path = "'"${EPREFIX}"'/tmp"|g' -i "${phpinisrc}"
-
-	# Set the extension dir
-	sed -e "s|^extension_dir .*$|extension_dir = ${extension_dir}|g" -i "${phpinisrc}"
-
-	# Set the include path to point to where we want to find PEAR packages
-	sed -e 's|^;include_path = ".:/php/includes".*|include_path = ".:'"${EPREFIX}"'/usr/share/php'${PHP_MV}':'"${EPREFIX}"'/usr/share/php"|' -i "${phpinisrc}"
-
-	dodir "${PHP_INI_DIR#${EPREFIX}}"
-	insinto "${PHP_INI_DIR#${EPREFIX}}"
-	newins "${phpinisrc}" "${PHP_INI_FILE}"
-
-	elog "Installing php.ini for ${phpsapi} into ${PHP_INI_DIR#${EPREFIX}}"
-	elog
-
-	dodir "${PHP_EXT_INI_DIR#${EPREFIX}}"
-	dodir "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}"
-
-	if use_if_iuse opcache; then
-		elog "Adding opcache to $PHP_EXT_INI_DIR"
-		echo "zend_extension=${PHP_DESTDIR}/$(get_libdir)/opcache.so" >> "${D}/${PHP_EXT_INI_DIR}"/opcache.ini
-		dosym "${PHP_EXT_INI_DIR#${EPREFIX}}/opcache.ini" "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}/opcache.ini"
-	fi
-
-	# SAPI-specific handling
-
-	if [[ "${sapi}" == "fpm" ]] ; then
-		[[ -z ${PHP_FPM_CONF_VER} ]] && PHP_FPM_CONF_VER=0
-		einfo "Installing FPM CGI config file php-fpm.conf"
-		insinto "${PHP_INI_DIR#${EPREFIX}}"
-		newins "${FILESDIR}/php-fpm-r${PHP_FPM_CONF_VER}.conf" php-fpm.conf
-
-		# Remove bogus /etc/php-fpm.conf.default (bug 359906)
-		[[ -f "${ED}/etc/php-fpm.conf.default" ]] && rm "${ED}/etc/php-fpm.conf.default"
-	fi
-
-	# Install PHP ini files into /usr/share/php
-
-	dodoc php.ini-development
-	dodoc php.ini-production
-
-}
-
-php_set_ini_dir() {
-	PHP_INI_DIR="${EPREFIX}/etc/php/${1}-php${SLOT}"
-	PHP_EXT_INI_DIR="${PHP_INI_DIR}/ext"
-	PHP_EXT_INI_DIR_ACTIVE="${PHP_INI_DIR}/ext-active"
-}
-
-src_prepare() {
-	# USE=sharedmem (session/mod_mm to be exact) tries to mmap() this path
-	# ([empty session.save_path]/session_mm_[sapi][gid].sem)
-	# there is no easy way to circumvent that, all php calls during
-	# install use -n, so no php.ini file will be used.
-	# As such, this is the easiest way to get around
-	addpredict /session_mm_cli250.sem
-	addpredict /session_mm_cli0.sem
-
-	# Change PHP branding
-	# Get the alpha/beta/rc version
-	sed -re	"s|^(PHP_EXTRA_VERSION=\").*(\")|\1-pl${PR/r/}-gentoo\2|g" \
-		-i configure.in || die "Unable to change PHP branding"
-
-	# Patch PHP to show Gentoo as the server platform
-	sed -e 's/PHP_UNAME=`uname -a | xargs`/PHP_UNAME=`uname -s -n -r -v | xargs`/g' \
-		-i configure.in || die "Failed to fix server platform name"
-
-	# Prevent PHP from activating the Apache config,
-	# as we will do that ourselves
-	sed -i \
-		-e "s,-i -a -n php${PHP_MV},-i -n php${PHP_MV},g" \
-		-e "s,-i -A -n php${PHP_MV},-i -n php${PHP_MV},g" \
-		configure sapi/apache2filter/config.m4 sapi/apache2handler/config.m4
-
-	# Patch PHP to support heimdal instead of mit-krb5
-	if has_version "app-crypt/heimdal" ; then
-		sed -e 's|gssapi_krb5|gssapi|g' -i acinclude.m4 \
-			|| die "Failed to fix heimdal libname"
-		sed -e 's|PHP_ADD_LIBRARY(k5crypto, 1, $1)||g' -i acinclude.m4 \
-			|| die "Failed to fix heimdal crypt library reference"
-	fi
-
-	#Add user patches #357637
-	epatch_user
-
-	#force rebuilding aclocal.m4
-	rm aclocal.m4
-	eautoreconf
-
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		# http://bugs.php.net/bug.php?id=48795, bug #343481
-		sed -i -e '/BUILD_CGI="\\$(CC)/s/CC/CXX/' configure || die
-	fi
-}
-
-src_configure() {
-	addpredict /usr/share/snmp/mibs/.index
-	addpredict /var/lib/net-snmp/mib_indexes
-
-	PHP_DESTDIR="${EPREFIX}/usr/$(get_libdir)/php${SLOT}"
-
-	# This is a global variable and should be in caps. It isn't because the
-	# phpconfutils eclass relies on exactly this name...
-	# for --with-libdir see bug #327025
-	my_conf="
-		--prefix="${PHP_DESTDIR}"
-		--mandir="${PHP_DESTDIR}"/man
-		--infodir="${PHP_DESTDIR}"/info
-		--libdir="${PHP_DESTDIR}"/lib
-		--with-libdir=$(get_libdir)
-		--without-pear
-		$(use_enable threads maintainer-zts)"
-
-	#                             extension		  USE flag        shared
-	my_conf+="
-	$(use_enable bcmath bcmath )
-	$(use_with bzip2 bz2 "${EPREFIX}"/usr)
-	$(use_enable calendar calendar )
-	$(use_enable ctype ctype )
-	$(use_with curl curl "${EPREFIX}"/usr)
-	$(use_enable xml dom )
-	$(use_with enchant enchant "${EPREFIX}"/usr)
-	$(use_enable exif exif )
-	$(use_enable fileinfo fileinfo )
-	$(use_enable filter filter )
-	$(use_enable ftp ftp )
-	$(use_with nls gettext "${EPREFIX}"/usr)
-	$(use_with gmp gmp "${EPREFIX}"/usr)
-	$(use_enable hash hash )
-	$(use_with mhash mhash "${EPREFIX}"/usr)
-	$(use_with iconv iconv $(use elibc_glibc || use elibc_musl || echo "${EPREFIX}"/usr))
-	$(use_enable intl intl )
-	$(use_enable ipv6 ipv6 )
-	$(use_enable json json )
-	$(use_with kerberos kerberos "${EPREFIX}"/usr)
-	$(use_enable xml libxml )
-	$(use_with xml libxml-dir "${EPREFIX}"/usr)
-	$(use_enable unicode mbstring )
-	$(use_with crypt mcrypt "${EPREFIX}"/usr)
-	$(use_with mssql mssql "${EPREFIX}"/usr)
-	$(use_with unicode onig "${EPREFIX}"/usr)
-	$(use_with ssl openssl "${EPREFIX}"/usr)
-	$(use_with ssl openssl-dir "${EPREFIX}"/usr)
-	$(use_enable pcntl pcntl )
-	$(use_enable phar phar )
-	$(use_enable pdo pdo )
-	$(use_enable opcache opcache )
-	$(use_with postgres pgsql "${EPREFIX}"/usr)
-	$(use_enable posix posix )
-	$(use_with spell pspell "${EPREFIX}"/usr)
-	$(use_with recode recode "${EPREFIX}"/usr)
-	$(use_enable simplexml simplexml )
-	$(use_enable sharedmem shmop )
-	$(use_with snmp snmp "${EPREFIX}"/usr)
-	$(use_enable soap soap )
-	$(use_enable sockets sockets )
-	$(use_with sqlite sqlite3 "${EPREFIX}"/usr)
-	$(use_with sybase-ct sybase-ct "${EPREFIX}"/usr)
-	$(use_enable sysvipc sysvmsg )
-	$(use_enable sysvipc sysvsem )
-	$(use_enable sysvipc sysvshm )
-	$(use_with systemd fpm-systemd)
-	$(use_with tidy tidy "${EPREFIX}"/usr)
-	$(use_enable tokenizer tokenizer )
-	$(use_enable wddx wddx )
-	$(use_enable xml xml )
-	$(use_enable xmlreader xmlreader )
-	$(use_enable xmlwriter xmlwriter )
-	$(use_with xmlrpc xmlrpc)
-	$(use_with xslt xsl "${EPREFIX}"/usr)
-	$(use_enable zip zip )
-	$(use_with zlib zlib "${EPREFIX}"/usr)
-	$(use_enable debug debug )"
-
-	# DBA support
-	if use cdb || use berkdb || use flatfile || use gdbm || use inifile \
-		|| use qdbm ; then
-		my_conf="${my_conf} --enable-dba${shared}"
-	fi
-
-	# DBA drivers support
-	my_conf+="
-	$(use_with cdb cdb)
-	$(use_with berkdb db4 ${EPREFIX}/usr)
-	$(use_enable flatfile flatfile )
-	$(use_with gdbm gdbm ${EPREFIX}/usr)
-	$(use_enable inifile inifile )
-	$(use_with qdbm qdbm ${EPREFIX}/usr)"
-
-	# Support for the GD graphics library
-	my_conf+="
-	$(use_with truetype freetype-dir ${EPREFIX}/usr)
-	$(use_with truetype t1lib ${EPREFIX}/usr)
-	$(use_enable cjk gd-jis-conv )
-	$(use_with gd jpeg-dir ${EPREFIX}/usr)
-	$(use_with gd png-dir ${EPREFIX}/usr)
-	$(use_with xpm xpm-dir ${EPREFIX}/usr)
-	$(use_with vpx vpx-dir ${EPREFIX}/usr)"
-	# enable gd last, so configure can pick up the previous settings
-	my_conf+="
-	$(use_with gd gd)"
-
-	# IMAP support
-	if use imap ; then
-		my_conf+="
-		$(use_with imap imap ${EPREFIX}/usr)
-		$(use_with ssl imap-ssl ${EPREFIX}/usr)"
-	fi
-
-	# Interbase/firebird support
-
-	if use firebird ; then
-		my_conf+="
-		$(use_with firebird interbase ${EPREFIX}/usr)"
-	fi
-
-	# LDAP support
-	if use ldap ; then
-		my_conf+="
-		$(use_with ldap ldap ${EPREFIX}/usr)
-		$(use_with ldap-sasl ldap-sasl ${EPREFIX}/usr)"
-	fi
-
-	# MySQL support
-	local mysqllib="mysqlnd"
-	local mysqlilib="mysqlnd"
-	use libmysqlclient && mysqllib="${EPREFIX}/usr"
-	use libmysqlclient && mysqlilib="${EPREFIX}/usr/bin/mysql_config"
-
-	my_conf+=" $(use_with mysql mysql $mysqllib)"
-	my_conf+=" $(use_with mysqli mysqli $mysqlilib)"
-
-	local mysqlsock=" $(use_with mysql mysql-sock ${EPREFIX}/var/run/mysqld/mysqld.sock)"
-	if use mysql ; then
-		my_conf+="${mysqlsock}"
-	elif use mysqli ; then
-		my_conf+="${mysqlsock}"
-	fi
-
-	# ODBC support
-	if use odbc ; then
-		my_conf+="
-		$(use_with odbc unixODBC ${EPREFIX}/usr)"
-	fi
-
-	if use iodbc ; then
-		my_conf+="
-		$(use_with iodbc iodbc ${EPREFIX}/usr)"
-	fi
-
-	# Oracle support
-	if use oci8-instant-client ; then
-		my_conf+="
-		$(use_with oci8-instant-client oci8)"
-	fi
-
-	# PDO support
-	if use pdo ; then
-		my_conf+="
-		$(use_with mssql pdo-dblib )
-		$(use_with mysql pdo-mysql ${mysqllib})
-		$(use_with postgres pdo-pgsql )
-		$(use_with sqlite pdo-sqlite ${EPREFIX}/usr)
-		$(use_with odbc pdo-odbc unixODBC,${EPREFIX}/usr)"
-		if use oci8-instant-client ; then
-			my_conf+="
-			$(use_with oci8-instant-client pdo-oci)"
-		fi
-	fi
-
-	# readline/libedit support
-	my_conf+="
-	$(use_with readline readline ${EPREFIX}/usr)
-	$(use_with libedit libedit ${EPREFIX}/usr)"
-
-	# Session support
-	if use session ; then
-		my_conf+="
-		$(use_with sharedmem mm ${EPREFIX}/usr)"
-	else
-		my_conf+="
-		$(use_enable session session )"
-	fi
-
-	# Use pic for shared modules such as apache2's mod_php
-	my_conf="${my_conf} --with-pic"
-
-	# we use the system copy of pcre
-	# --with-pcre-regex affects ext/pcre
-	# --with-pcre-dir affects ext/filter and ext/zip
-	my_conf="${my_conf} --with-pcre-regex=${EPREFIX}/usr --with-pcre-dir=${EPREFIX}/usr"
-
-	# Catch CFLAGS problems
-	# Fixes bug #14067.
-	# Changed order to run it in reverse for bug #32022 and #12021.
-	replace-cpu-flags "k6*" "i586"
-
-	# Support user-passed configuration parameters
-	my_conf="${my_conf} ${EXTRA_ECONF:-}"
-
-	# Support the Apache2 extras, they must be set globally for all
-	# SAPIs to work correctly, especially for external PHP extensions
-
-	mkdir -p "${WORKDIR}/sapis-build"
-	for one_sapi in $SAPIS ; do
-		use "${one_sapi}" || continue
-		php_set_ini_dir "${one_sapi}"
-
-		cp -r "${S}" "${WORKDIR}/sapis-build/${one_sapi}"
-		cd "${WORKDIR}/sapis-build/${one_sapi}"
-
-		sapi_conf="${my_conf} --with-config-file-path=${PHP_INI_DIR}
-			--with-config-file-scan-dir=${PHP_EXT_INI_DIR_ACTIVE}"
-
-		for sapi in $SAPIS ; do
-			case "$sapi" in
-				cli|cgi|embed|fpm)
-					if [[ "${one_sapi}" == "${sapi}" ]] ; then
-						sapi_conf="${sapi_conf} --enable-${sapi}"
-					else
-						sapi_conf="${sapi_conf} --disable-${sapi}"
-					fi
-					;;
-
-				apache2)
-					if [[ "${one_sapi}" == "${sapi}" ]] ; then
-						sapi_conf="${sapi_conf} --with-apxs2=${EPREFIX}/usr/sbin/apxs"
-					else
-						sapi_conf="${sapi_conf} --without-apxs2"
-					fi
-					;;
-			esac
-		done
-
-		econf ${sapi_conf}
-	done
-}
-
-src_compile() {
-	# snmp seems to run during src_compile, too (bug #324739)
-	addpredict /usr/share/snmp/mibs/.index
-	addpredict /var/lib/net-snmp/mib_indexes
-
-	for sapi in ${SAPIS} ; do
-		if use "${sapi}"; then
-			cd "${WORKDIR}/sapis-build/$sapi" || "Failed to change dir to ${WORKDIR}/sapis-build/$1"
-			emake || die "emake failed"
-		fi
-	done
-}
-
-src_install() {
-	# see bug #324739 for what happens when we don't have that
-	addpredict /usr/share/snmp/mibs/.index
-
-	# grab the first SAPI that got built and install common files from there
-	local first_sapi=""
-	for sapi in $SAPIS ; do
-		if use $sapi ; then
-			first_sapi=$sapi
-			break
-		fi
-	done
-
-	# Makefile forgets to create this before trying to write to it...
-	dodir "${PHP_DESTDIR#${EPREFIX}}/bin"
-
-	# Install php environment (without any sapis)
-	cd "${WORKDIR}/sapis-build/$first_sapi"
-	emake INSTALL_ROOT="${D}" \
-		install-build install-headers install-programs \
-		|| die "emake install failed"
-
-	local extension_dir="$("${ED}/${PHP_DESTDIR#${EPREFIX}}/bin/php-config" --extension-dir)"
-
-	# Create the directory where we'll put version-specific php scripts
-	keepdir /usr/share/php${PHP_MV}
-
-	local sapi="", file=""
-	local sapi_list=""
-
-	for sapi in ${SAPIS}; do
-		if use "${sapi}" ; then
-			einfo "Installing SAPI: ${sapi}"
-			cd "${WORKDIR}/sapis-build/${sapi}"
-
-			if [[ "${sapi}" == "apache2" ]] ; then
-				# We're specifically not using emake install-sapi as libtool
-				# may cause unnecessary relink failures (see bug #351266)
-				insinto "${PHP_DESTDIR#${EPREFIX}}/apache2/"
-				newins ".libs/libphp5$(get_libname)" "libphp${PHP_MV}$(get_libname)"
-				keepdir "/usr/$(get_libdir)/apache2/modules"
-			else
-				# needed each time, php_install_ini would reset it
-				local dest="${PHP_DESTDIR#${EPREFIX}}"
-				into "${dest}"
-				case "$sapi" in
-					cli)
-						source="sapi/cli/php"
-						;;
-					cgi)
-						source="sapi/cgi/php-cgi"
-						;;
-					fpm)
-						source="sapi/fpm/php-fpm"
-						;;
-					embed)
-						source="libs/libphp${PHP_MV}$(get_libname)"
-						;;
-					*)
-						die "unhandled sapi in src_install"
-						;;
-				esac
-
-				if [[ "${source}" == *"$(get_libname)" ]]; then
-					dolib.so "${source}" || die "Unable to install ${sapi} sapi"
-				else
-					dobin "${source}" || die "Unable to install ${sapi} sapi"
-					local name="$(basename ${source})"
-					dosym "${dest}/bin/${name}" "/usr/bin/${name}${SLOT}"
-				fi
-			fi
-
-			php_install_ini "${sapi}"
-
-			# construct correct SAPI string for php-config
-			# thanks to ferringb for the bash voodoo
-			if [[ "${sapi}" == "apache2" ]]; then
-				sapi_list="${sapi_list:+${sapi_list} }apache2handler"
-			else
-				sapi_list="${sapi_list:+${sapi_list} }${sapi}"
-			fi
-		fi
-	done
-
-	# Installing opcache module
-	if use_if_iuse opcache ; then
-		dolib.so "modules/opcache$(get_libname)" || die "Unable to install opcache module"
-	fi
-
-	# Install env.d files
-	newenvd "${FILESDIR}/20php5-envd" \
-		"20php${SLOT}"
-	sed -e "s|/lib/|/$(get_libdir)/|g" -i \
-		"${ED}/etc/env.d/20php${SLOT}"
-	sed -e "s|php5|php${SLOT}|g" -i \
-		"${ED}/etc/env.d/20php${SLOT}"
-
-	# set php-config variable correctly (bug #278439)
-	sed -e "s:^\(php_sapis=\)\".*\"$:\1\"${sapi_list}\":" -i \
-		"${ED}/usr/$(get_libdir)/php${SLOT}/bin/php-config"
-
-	if use fpm ; then
-		if use systemd; then
-			systemd_newunit "${FILESDIR}/php-fpm_at.service" "php-fpm@${SLOT}.service"
-		else
-			systemd_newunit "${FILESDIR}/php-fpm_at-simple.service" "php-fpm@${SLOT}.service"
-		fi
-	fi
-}
-
-src_test() {
-	echo ">>> Test phase [test]: ${CATEGORY}/${PF}"
-	PHP_BIN="${WORKDIR}/sapis-build/cli/sapi/cli/php"
-	if [[ ! -x "${PHP_BIN}" ]] ; then
-		ewarn "Test phase requires USE=cli, skipping"
-		return
-	else
-		export TEST_PHP_EXECUTABLE="${PHP_BIN}"
-	fi
-
-	if [[ -x "${WORKDIR}/sapis/cgi/php-cgi" ]] ; then
-		export TEST_PHP_CGI_EXECUTABLE="${WORKDIR}/sapis/cgi/php-cgi"
-	fi
-
-	REPORT_EXIT_STATUS=1 "${TEST_PHP_EXECUTABLE}" -n  -d "session.save_path=${T}" \
-		"${WORKDIR}/sapis-build/cli/run-tests.php" -n -q -d "session.save_path=${T}"
-
-	for name in ${EXPECTED_TEST_FAILURES}; do
-		mv "${name}.out" "${name}.out.orig" 2>/dev/null
-	done
-
-	local failed="$(find -name '*.out')"
-	if [[ ${failed} != "" ]] ; then
-		ewarn "The following test cases failed unexpectedly:"
-		for name in ${failed}; do
-			ewarn "  ${name/.out/}"
-		done
-	else
-		einfo "No unexpected test failures, all fine"
-	fi
-
-	if [[ ${PHP_SHOW_UNEXPECTED_TEST_PASS} == "1" ]] ; then
-		local passed=""
-		for name in ${EXPECTED_TEST_FAILURES}; do
-			[[ -f "${name}.diff" ]] && continue
-			passed="${passed} ${name}"
-		done
-		if [[ ${passed} != "" ]] ; then
-			einfo "The following test cases passed unexpectedly:"
-			for name in ${passed}; do
-				ewarn "  ${passed}"
-			done
-		else
-			einfo "None of the known-to-fail tests passed, all fine"
-		fi
-	fi
-}
-
-pkg_postinst() {
-	# Output some general info to the user
-	if use apache2 ; then
-		APACHE2_MOD_DEFINE="PHP5"
-		APACHE2_MOD_CONF="70_mod_php5"  # actually provided by app-eselect/eselect-php
-		apache-module_pkg_postinst
-	fi
-
-	# Create the symlinks for php
-	for m in ${SAPIS}; do
-		[[ ${m} == 'embed' ]] && continue;
-		if use $m ; then
-			local ci=$(eselect php show $m)
-			if [[ -z $ci ]]; then
-				eselect php set $m php${SLOT}
-				einfo "Switched ${m} to use php:${SLOT}"
-				einfo
-			elif [[ $ci != "php${SLOT}" ]] ; then
-				elog "To switch $m to use php:${SLOT}, run"
-				elog "    eselect php set $m php${SLOT}"
-				elog
-			fi
-		fi
-	done
-
-	elog "Make sure that PHP_TARGETS in ${EPREFIX}/etc/make.conf includes php${SLOT/./-} in order"
-	elog "to compile extensions for the ${SLOT} ABI"
-	elog
-	if ! use readline && use cli ; then
-		ewarn "Note that in order to use php interactivly, you need to enable"
-		ewarn "the readline USE flag or php -a will hang"
-	fi
-	elog
-	elog "This ebuild installed a version of php.ini based on php.ini-${PHP_INI_VERSION} version."
-	elog "You can chose which version of php.ini to install by default by setting PHP_INI_VERSION to either"
-	elog "'production' or 'development' in ${EPREFIX}/etc/make.conf"
-	elog "Both versions of php.ini can be found in ${EPREFIX}/usr/share/doc/${PF}"
-
-	elog
-	elog "For more details on how minor version slotting works (PHP_TARGETS) please read the upgrade guide:"
-	elog "https://www.gentoo.org/proj/en/php/php-upgrading.xml"
-	elog
-}
-
-pkg_prerm() {
-	eselect php cleanup
-}
diff --git a/dev-lang/php/php-5.6.12.ebuild b/dev-lang/php/php-5.6.12.ebuild
index 3e90980a0cd5..aeedfb4d9ba5 100644
--- a/dev-lang/php/php-5.6.12.ebuild
+++ b/dev-lang/php/php-5.6.12.ebuild
@@ -6,7 +6,7 @@ EAPI=5
 
 inherit eutils autotools flag-o-matic versionator depend.apache apache-module db-use libtool systemd
 
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 
 function php_get_uri ()
 {
diff --git a/dev-lang/php/php-5.6.13.ebuild b/dev-lang/php/php-5.6.13.ebuild
new file mode 100644
index 000000000000..9a3c14028589
--- /dev/null
+++ b/dev-lang/php/php-5.6.13.ebuild
@@ -0,0 +1,784 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils autotools flag-o-matic versionator depend.apache apache-module db-use libtool systemd
+
+KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+
+function php_get_uri ()
+{
+	case "${1}" in
+		"php-pre")
+			echo "http://downloads.php.net/dsp/${2}"
+		;;
+		"php")
+			echo "http://www.php.net/distributions/${2}"
+		;;
+		"olemarkus")
+			echo "https://dev.gentoo.org/~olemarkus/php/${2}"
+		;;
+		"gentoo")
+			echo "mirror://gentoo/${2}"
+		;;
+		*)
+			die "unhandled case in php_get_uri"
+		;;
+	esac
+}
+
+PHP_MV="$(get_major_version)"
+SLOT="$(get_version_component_range 1-2)"
+
+# alias, so we can handle different types of releases (finals, rcs, alphas,
+# betas, ...) w/o changing the whole ebuild
+PHP_PV="${PV/_rc/RC}"
+PHP_PV="${PHP_PV/_alpha/alpha}"
+PHP_PV="${PHP_PV/_beta/beta}"
+PHP_RELEASE="php"
+[[ ${PV} == ${PV/_alpha/} ]] || PHP_RELEASE="php-pre"
+[[ ${PV} == ${PV/_beta/} ]] || PHP_RELEASE="php-pre"
+[[ ${PV} == ${PV/_rc/} ]] || PHP_RELEASE="php-pre"
+PHP_P="${PN}-${PHP_PV}"
+
+PHP_SRC_URI="$(php_get_uri "${PHP_RELEASE}" "${PHP_P}.tar.bz2")"
+
+PHP_FPM_CONF_VER="1"
+
+SRC_URI="${PHP_SRC_URI}"
+
+DESCRIPTION="The PHP language runtime engine: CLI, CGI, FPM/FastCGI, Apache2 and embed SAPIs"
+HOMEPAGE="http://php.net/"
+LICENSE="PHP-3"
+
+S="${WORKDIR}/${PHP_P}"
+
+# We can build the following SAPIs in the given order
+SAPIS="embed cli cgi fpm apache2"
+
+# SAPIs and SAPI-specific USE flags (cli SAPI is default on):
+IUSE="${IUSE}
+	${SAPIS/cli/+cli}
+	threads"
+
+IUSE="${IUSE} bcmath berkdb bzip2 calendar cdb cjk
+	crypt +ctype curl debug
+	enchant exif frontbase +fileinfo +filter firebird
+	flatfile ftp gd gdbm gmp +hash +iconv imap inifile
+	intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit mhash
+	mssql mysql libmysqlclient mysqli nls
+	oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm
+	readline recode selinux +session sharedmem
+	+simplexml snmp soap sockets spell sqlite ssl
+	sybase-ct sysvipc systemd tidy +tokenizer truetype unicode vpx wddx
+	+xml xmlreader xmlwriter xmlrpc xpm xslt zip zlib"
+
+DEPEND="
+	>=app-eselect/eselect-php-0.7.1-r3[apache2?,fpm?]
+	>=dev-libs/libpcre-8.32[unicode]
+	apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=]
+		<www-servers/apache-2.4[threads=] ) )
+	berkdb? ( =sys-libs/db-4* )
+	bzip2? ( app-arch/bzip2 )
+	cdb? ( || ( dev-db/cdb dev-db/tinycdb ) )
+	cjk? ( !gd? (
+		virtual/jpeg:0
+		media-libs/libpng:0=
+		sys-libs/zlib
+	) )
+	crypt? ( >=dev-libs/libmcrypt-2.4 )
+	curl? ( >=net-misc/curl-7.10.5 )
+	enchant? ( app-text/enchant )
+	exif? ( !gd? (
+		virtual/jpeg:0
+		media-libs/libpng:0=
+		sys-libs/zlib
+	) )
+	firebird? ( dev-db/firebird )
+	gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib )
+	gdbm? ( >=sys-libs/gdbm-1.8.0 )
+	gmp? ( >=dev-libs/gmp-4.1.2 )
+	iconv? ( virtual/libiconv )
+	imap? ( virtual/imap-c-client[ssl=] )
+	intl? ( dev-libs/icu:= )
+	iodbc? ( dev-db/libiodbc )
+	kerberos? ( virtual/krb5 )
+	ldap? ( >=net-nds/openldap-1.2.11 )
+	ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 )
+	libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) )
+	mssql? ( dev-db/freetds[mssql] )
+	libmysqlclient? (
+		mysql? ( virtual/mysql )
+		mysqli? ( >=virtual/mysql-4.1 )
+	)
+	nls? ( sys-devel/gettext )
+	oci8-instant-client? ( dev-db/oracle-instantclient-basic )
+	odbc? ( >=dev-db/unixODBC-1.8.13 )
+	postgres? ( dev-db/postgresql )
+	qdbm? ( dev-db/qdbm )
+	readline? ( sys-libs/readline )
+	recode? ( app-text/recode )
+	sharedmem? ( dev-libs/mm )
+	simplexml? ( >=dev-libs/libxml2-2.6.8 )
+	snmp? ( >=net-analyzer/net-snmp-5.2 )
+	soap? ( >=dev-libs/libxml2-2.6.8 )
+	spell? ( >=app-text/aspell-0.50 )
+	sqlite? ( >=dev-db/sqlite-3.7.6.3 )
+	ssl? ( >=dev-libs/openssl-0.9.7 )
+	sybase-ct? ( dev-db/freetds )
+	tidy? ( app-text/htmltidy )
+	truetype? (
+		=media-libs/freetype-2*
+		>=media-libs/t1lib-5.0.0
+		!gd? (
+			virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib )
+	)
+	unicode? ( dev-libs/oniguruma )
+	vpx? ( media-libs/libvpx )
+	wddx? ( >=dev-libs/libxml2-2.6.8 )
+	xml? ( >=dev-libs/libxml2-2.6.8 )
+	xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv )
+	xmlreader? ( >=dev-libs/libxml2-2.6.8 )
+	xmlwriter? ( >=dev-libs/libxml2-2.6.8 )
+	xpm? (
+		x11-libs/libXpm
+		virtual/jpeg:0
+		media-libs/libpng:0= sys-libs/zlib
+	)
+	xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 )
+	zip? ( sys-libs/zlib )
+	zlib? ( sys-libs/zlib )
+	virtual/mta
+"
+
+php="=${CATEGORY}/${PF}"
+
+REQUIRED_USE="
+	truetype? ( gd )
+	vpx? ( gd )
+	cjk? ( gd )
+	exif? ( gd )
+
+	xpm? ( gd )
+	gd? ( zlib )
+	simplexml? ( xml )
+	soap? ( xml )
+	wddx? ( xml )
+	xmlrpc? ( || ( xml iconv ) )
+	xmlreader? ( xml )
+	xslt? ( xml )
+	ldap-sasl? ( ldap )
+	mhash? ( hash )
+	phar? ( hash )
+	libmysqlclient? ( || (
+		mysql
+		mysqli
+		pdo
+	) )
+
+	qdbm? ( !gdbm )
+	readline? ( !libedit )
+	recode? ( !imap !mysql !mysqli )
+	sharedmem? ( !threads )
+
+	!cli? ( !cgi? ( !fpm? ( !apache2? ( !embed? ( cli ) ) ) ) )"
+
+RDEPEND="${DEPEND}"
+
+RDEPEND="${RDEPEND}
+	fpm? (
+		selinux? ( sec-policy/selinux-phpfpm )
+		systemd? ( sys-apps/systemd ) )"
+
+DEPEND="${DEPEND}
+	sys-devel/flex
+	>=sys-devel/m4-1.4.3
+	>=sys-devel/libtool-1.5.18"
+
+# Allow users to install production version if they want to
+
+case "${PHP_INI_VERSION}" in
+	production|development)
+		;;
+	*)
+		PHP_INI_VERSION="development"
+		;;
+esac
+
+PHP_INI_UPSTREAM="php.ini-${PHP_INI_VERSION}"
+PHP_INI_FILE="php.ini"
+
+want_apache
+
+pkg_setup() {
+	depend.apache_pkg_setup
+}
+
+php_install_ini() {
+	local phpsapi="${1}"
+
+	# work out where we are installing the ini file
+	php_set_ini_dir "${phpsapi}"
+
+	local phpinisrc="${PHP_INI_UPSTREAM}-${phpsapi}"
+	cp "${PHP_INI_UPSTREAM}" "${phpinisrc}"
+
+	# default to /tmp for save_path, bug #282768
+	sed -e 's|^;session.save_path .*$|session.save_path = "'"${EPREFIX}"'/tmp"|g' -i "${phpinisrc}"
+
+	# Set the extension dir
+	sed -e "s|^extension_dir .*$|extension_dir = ${extension_dir}|g" -i "${phpinisrc}"
+
+	# Set the include path to point to where we want to find PEAR packages
+	sed -e 's|^;include_path = ".:/php/includes".*|include_path = ".:'"${EPREFIX}"'/usr/share/php'${PHP_MV}':'"${EPREFIX}"'/usr/share/php"|' -i "${phpinisrc}"
+
+	dodir "${PHP_INI_DIR#${EPREFIX}}"
+	insinto "${PHP_INI_DIR#${EPREFIX}}"
+	newins "${phpinisrc}" "${PHP_INI_FILE}"
+
+	elog "Installing php.ini for ${phpsapi} into ${PHP_INI_DIR#${EPREFIX}}"
+	elog
+
+	dodir "${PHP_EXT_INI_DIR#${EPREFIX}}"
+	dodir "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}"
+
+	if use_if_iuse opcache; then
+		elog "Adding opcache to $PHP_EXT_INI_DIR"
+		echo "zend_extension=${PHP_DESTDIR}/$(get_libdir)/opcache.so" >> "${D}/${PHP_EXT_INI_DIR}"/opcache.ini
+		dosym "${PHP_EXT_INI_DIR#${EPREFIX}}/opcache.ini" "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}/opcache.ini"
+	fi
+
+	# SAPI-specific handling
+
+	if [[ "${sapi}" == "fpm" ]] ; then
+		[[ -z ${PHP_FPM_CONF_VER} ]] && PHP_FPM_CONF_VER=0
+		einfo "Installing FPM CGI config file php-fpm.conf"
+		insinto "${PHP_INI_DIR#${EPREFIX}}"
+		newins "${FILESDIR}/php-fpm-r${PHP_FPM_CONF_VER}.conf" php-fpm.conf
+
+		# Remove bogus /etc/php-fpm.conf.default (bug 359906)
+		[[ -f "${ED}/etc/php-fpm.conf.default" ]] && rm "${ED}/etc/php-fpm.conf.default"
+	fi
+
+	# Install PHP ini files into /usr/share/php
+
+	dodoc php.ini-development
+	dodoc php.ini-production
+
+}
+
+php_set_ini_dir() {
+	PHP_INI_DIR="${EPREFIX}/etc/php/${1}-php${SLOT}"
+	PHP_EXT_INI_DIR="${PHP_INI_DIR}/ext"
+	PHP_EXT_INI_DIR_ACTIVE="${PHP_INI_DIR}/ext-active"
+}
+
+src_prepare() {
+	# USE=sharedmem (session/mod_mm to be exact) tries to mmap() this path
+	# ([empty session.save_path]/session_mm_[sapi][gid].sem)
+	# there is no easy way to circumvent that, all php calls during
+	# install use -n, so no php.ini file will be used.
+	# As such, this is the easiest way to get around
+	addpredict /session_mm_cli250.sem
+	addpredict /session_mm_cli0.sem
+
+	# Change PHP branding
+	# Get the alpha/beta/rc version
+	sed -re	"s|^(PHP_EXTRA_VERSION=\").*(\")|\1-pl${PR/r/}-gentoo\2|g" \
+		-i configure.in || die "Unable to change PHP branding"
+
+	# Patch PHP to show Gentoo as the server platform
+	sed -e 's/PHP_UNAME=`uname -a | xargs`/PHP_UNAME=`uname -s -n -r -v | xargs`/g' \
+		-i configure.in || die "Failed to fix server platform name"
+
+	# Prevent PHP from activating the Apache config,
+	# as we will do that ourselves
+	sed -i \
+		-e "s,-i -a -n php${PHP_MV},-i -n php${PHP_MV},g" \
+		-e "s,-i -A -n php${PHP_MV},-i -n php${PHP_MV},g" \
+		configure sapi/apache2filter/config.m4 sapi/apache2handler/config.m4
+
+	# Patch PHP to support heimdal instead of mit-krb5
+	if has_version "app-crypt/heimdal" ; then
+		sed -e 's|gssapi_krb5|gssapi|g' -i acinclude.m4 \
+			|| die "Failed to fix heimdal libname"
+		sed -e 's|PHP_ADD_LIBRARY(k5crypto, 1, $1)||g' -i acinclude.m4 \
+			|| die "Failed to fix heimdal crypt library reference"
+	fi
+
+	#Add user patches #357637
+	epatch_user
+
+	#force rebuilding aclocal.m4
+	rm aclocal.m4
+	eautoreconf
+
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		# http://bugs.php.net/bug.php?id=48795, bug #343481
+		sed -i -e '/BUILD_CGI="\\$(CC)/s/CC/CXX/' configure || die
+	fi
+}
+
+src_configure() {
+	addpredict /usr/share/snmp/mibs/.index
+	addpredict /var/lib/net-snmp/mib_indexes
+
+	PHP_DESTDIR="${EPREFIX}/usr/$(get_libdir)/php${SLOT}"
+
+	# This is a global variable and should be in caps. It isn't because the
+	# phpconfutils eclass relies on exactly this name...
+	# for --with-libdir see bug #327025
+	my_conf="
+		--prefix="${PHP_DESTDIR}"
+		--mandir="${PHP_DESTDIR}"/man
+		--infodir="${PHP_DESTDIR}"/info
+		--libdir="${PHP_DESTDIR}"/lib
+		--with-libdir=$(get_libdir)
+		--without-pear
+		$(use_enable threads maintainer-zts)"
+
+	#                             extension		  USE flag        shared
+	my_conf+="
+	$(use_enable bcmath bcmath )
+	$(use_with bzip2 bz2 "${EPREFIX}"/usr)
+	$(use_enable calendar calendar )
+	$(use_enable ctype ctype )
+	$(use_with curl curl "${EPREFIX}"/usr)
+	$(use_enable xml dom )
+	$(use_with enchant enchant "${EPREFIX}"/usr)
+	$(use_enable exif exif )
+	$(use_enable fileinfo fileinfo )
+	$(use_enable filter filter )
+	$(use_enable ftp ftp )
+	$(use_with nls gettext "${EPREFIX}"/usr)
+	$(use_with gmp gmp "${EPREFIX}"/usr)
+	$(use_enable hash hash )
+	$(use_with mhash mhash "${EPREFIX}"/usr)
+	$(use_with iconv iconv $(use elibc_glibc || use elibc_musl || echo "${EPREFIX}"/usr))
+	$(use_enable intl intl )
+	$(use_enable ipv6 ipv6 )
+	$(use_enable json json )
+	$(use_with kerberos kerberos "${EPREFIX}"/usr)
+	$(use_enable xml libxml )
+	$(use_with xml libxml-dir "${EPREFIX}"/usr)
+	$(use_enable unicode mbstring )
+	$(use_with crypt mcrypt "${EPREFIX}"/usr)
+	$(use_with mssql mssql "${EPREFIX}"/usr)
+	$(use_with unicode onig "${EPREFIX}"/usr)
+	$(use_with ssl openssl "${EPREFIX}"/usr)
+	$(use_with ssl openssl-dir "${EPREFIX}"/usr)
+	$(use_enable pcntl pcntl )
+	$(use_enable phar phar )
+	$(use_enable pdo pdo )
+	$(use_enable opcache opcache )
+	$(use_with postgres pgsql "${EPREFIX}"/usr)
+	$(use_enable posix posix )
+	$(use_with spell pspell "${EPREFIX}"/usr)
+	$(use_with recode recode "${EPREFIX}"/usr)
+	$(use_enable simplexml simplexml )
+	$(use_enable sharedmem shmop )
+	$(use_with snmp snmp "${EPREFIX}"/usr)
+	$(use_enable soap soap )
+	$(use_enable sockets sockets )
+	$(use_with sqlite sqlite3 "${EPREFIX}"/usr)
+	$(use_with sybase-ct sybase-ct "${EPREFIX}"/usr)
+	$(use_enable sysvipc sysvmsg )
+	$(use_enable sysvipc sysvsem )
+	$(use_enable sysvipc sysvshm )
+	$(use_with systemd fpm-systemd)
+	$(use_with tidy tidy "${EPREFIX}"/usr)
+	$(use_enable tokenizer tokenizer )
+	$(use_enable wddx wddx )
+	$(use_enable xml xml )
+	$(use_enable xmlreader xmlreader )
+	$(use_enable xmlwriter xmlwriter )
+	$(use_with xmlrpc xmlrpc)
+	$(use_with xslt xsl "${EPREFIX}"/usr)
+	$(use_enable zip zip )
+	$(use_with zlib zlib "${EPREFIX}"/usr)
+	$(use_enable debug debug )"
+
+	# DBA support
+	if use cdb || use berkdb || use flatfile || use gdbm || use inifile \
+		|| use qdbm ; then
+		my_conf="${my_conf} --enable-dba${shared}"
+	fi
+
+	# DBA drivers support
+	my_conf+="
+	$(use_with cdb cdb)
+	$(use_with berkdb db4 ${EPREFIX}/usr)
+	$(use_enable flatfile flatfile )
+	$(use_with gdbm gdbm ${EPREFIX}/usr)
+	$(use_enable inifile inifile )
+	$(use_with qdbm qdbm ${EPREFIX}/usr)"
+
+	# Support for the GD graphics library
+	my_conf+="
+	$(use_with truetype freetype-dir ${EPREFIX}/usr)
+	$(use_with truetype t1lib ${EPREFIX}/usr)
+	$(use_enable cjk gd-jis-conv )
+	$(use_with gd jpeg-dir ${EPREFIX}/usr)
+	$(use_with gd png-dir ${EPREFIX}/usr)
+	$(use_with xpm xpm-dir ${EPREFIX}/usr)
+	$(use_with vpx vpx-dir ${EPREFIX}/usr)"
+	# enable gd last, so configure can pick up the previous settings
+	my_conf+="
+	$(use_with gd gd)"
+
+	# IMAP support
+	if use imap ; then
+		my_conf+="
+		$(use_with imap imap ${EPREFIX}/usr)
+		$(use_with ssl imap-ssl ${EPREFIX}/usr)"
+	fi
+
+	# Interbase/firebird support
+
+	if use firebird ; then
+		my_conf+="
+		$(use_with firebird interbase ${EPREFIX}/usr)"
+	fi
+
+	# LDAP support
+	if use ldap ; then
+		my_conf+="
+		$(use_with ldap ldap ${EPREFIX}/usr)
+		$(use_with ldap-sasl ldap-sasl ${EPREFIX}/usr)"
+	fi
+
+	# MySQL support
+	local mysqllib="mysqlnd"
+	local mysqlilib="mysqlnd"
+	use libmysqlclient && mysqllib="${EPREFIX}/usr"
+	use libmysqlclient && mysqlilib="${EPREFIX}/usr/bin/mysql_config"
+
+	my_conf+=" $(use_with mysql mysql $mysqllib)"
+	my_conf+=" $(use_with mysqli mysqli $mysqlilib)"
+
+	local mysqlsock=" $(use_with mysql mysql-sock ${EPREFIX}/var/run/mysqld/mysqld.sock)"
+	if use mysql ; then
+		my_conf+="${mysqlsock}"
+	elif use mysqli ; then
+		my_conf+="${mysqlsock}"
+	fi
+
+	# ODBC support
+	if use odbc ; then
+		my_conf+="
+		$(use_with odbc unixODBC ${EPREFIX}/usr)"
+	fi
+
+	if use iodbc ; then
+		my_conf+="
+		$(use_with iodbc iodbc ${EPREFIX}/usr)"
+	fi
+
+	# Oracle support
+	if use oci8-instant-client ; then
+		my_conf+="
+		$(use_with oci8-instant-client oci8)"
+	fi
+
+	# PDO support
+	if use pdo ; then
+		my_conf+="
+		$(use_with mssql pdo-dblib )
+		$(use_with mysql pdo-mysql ${mysqllib})
+		$(use_with postgres pdo-pgsql )
+		$(use_with sqlite pdo-sqlite ${EPREFIX}/usr)
+		$(use_with odbc pdo-odbc unixODBC,${EPREFIX}/usr)"
+		if use oci8-instant-client ; then
+			my_conf+="
+			$(use_with oci8-instant-client pdo-oci)"
+		fi
+	fi
+
+	# readline/libedit support
+	my_conf+="
+	$(use_with readline readline ${EPREFIX}/usr)
+	$(use_with libedit libedit ${EPREFIX}/usr)"
+
+	# Session support
+	if use session ; then
+		my_conf+="
+		$(use_with sharedmem mm ${EPREFIX}/usr)"
+	else
+		my_conf+="
+		$(use_enable session session )"
+	fi
+
+	# Use pic for shared modules such as apache2's mod_php
+	my_conf="${my_conf} --with-pic"
+
+	# we use the system copy of pcre
+	# --with-pcre-regex affects ext/pcre
+	# --with-pcre-dir affects ext/filter and ext/zip
+	my_conf="${my_conf} --with-pcre-regex=${EPREFIX}/usr --with-pcre-dir=${EPREFIX}/usr"
+
+	# Catch CFLAGS problems
+	# Fixes bug #14067.
+	# Changed order to run it in reverse for bug #32022 and #12021.
+	replace-cpu-flags "k6*" "i586"
+
+	# Support user-passed configuration parameters
+	my_conf="${my_conf} ${EXTRA_ECONF:-}"
+
+	# Support the Apache2 extras, they must be set globally for all
+	# SAPIs to work correctly, especially for external PHP extensions
+
+	mkdir -p "${WORKDIR}/sapis-build"
+	for one_sapi in $SAPIS ; do
+		use "${one_sapi}" || continue
+		php_set_ini_dir "${one_sapi}"
+
+		cp -r "${S}" "${WORKDIR}/sapis-build/${one_sapi}"
+		cd "${WORKDIR}/sapis-build/${one_sapi}"
+
+		sapi_conf="${my_conf} --with-config-file-path=${PHP_INI_DIR}
+			--with-config-file-scan-dir=${PHP_EXT_INI_DIR_ACTIVE}"
+
+		for sapi in $SAPIS ; do
+			case "$sapi" in
+				cli|cgi|embed|fpm)
+					if [[ "${one_sapi}" == "${sapi}" ]] ; then
+						sapi_conf="${sapi_conf} --enable-${sapi}"
+					else
+						sapi_conf="${sapi_conf} --disable-${sapi}"
+					fi
+					;;
+
+				apache2)
+					if [[ "${one_sapi}" == "${sapi}" ]] ; then
+						sapi_conf="${sapi_conf} --with-apxs2=${EPREFIX}/usr/sbin/apxs"
+					else
+						sapi_conf="${sapi_conf} --without-apxs2"
+					fi
+					;;
+			esac
+		done
+
+		econf ${sapi_conf}
+	done
+}
+
+src_compile() {
+	# snmp seems to run during src_compile, too (bug #324739)
+	addpredict /usr/share/snmp/mibs/.index
+	addpredict /var/lib/net-snmp/mib_indexes
+
+	for sapi in ${SAPIS} ; do
+		if use "${sapi}"; then
+			cd "${WORKDIR}/sapis-build/$sapi" || "Failed to change dir to ${WORKDIR}/sapis-build/$1"
+			emake || die "emake failed"
+		fi
+	done
+}
+
+src_install() {
+	# see bug #324739 for what happens when we don't have that
+	addpredict /usr/share/snmp/mibs/.index
+
+	# grab the first SAPI that got built and install common files from there
+	local first_sapi=""
+	for sapi in $SAPIS ; do
+		if use $sapi ; then
+			first_sapi=$sapi
+			break
+		fi
+	done
+
+	# Makefile forgets to create this before trying to write to it...
+	dodir "${PHP_DESTDIR#${EPREFIX}}/bin"
+
+	# Install php environment (without any sapis)
+	cd "${WORKDIR}/sapis-build/$first_sapi"
+	emake INSTALL_ROOT="${D}" \
+		install-build install-headers install-programs \
+		|| die "emake install failed"
+
+	local extension_dir="$("${ED}/${PHP_DESTDIR#${EPREFIX}}/bin/php-config" --extension-dir)"
+
+	# Create the directory where we'll put version-specific php scripts
+	keepdir /usr/share/php${PHP_MV}
+
+	local sapi="", file=""
+	local sapi_list=""
+
+	for sapi in ${SAPIS}; do
+		if use "${sapi}" ; then
+			einfo "Installing SAPI: ${sapi}"
+			cd "${WORKDIR}/sapis-build/${sapi}"
+
+			if [[ "${sapi}" == "apache2" ]] ; then
+				# We're specifically not using emake install-sapi as libtool
+				# may cause unnecessary relink failures (see bug #351266)
+				insinto "${PHP_DESTDIR#${EPREFIX}}/apache2/"
+				newins ".libs/libphp5$(get_libname)" "libphp${PHP_MV}$(get_libname)"
+				keepdir "/usr/$(get_libdir)/apache2/modules"
+			else
+				# needed each time, php_install_ini would reset it
+				local dest="${PHP_DESTDIR#${EPREFIX}}"
+				into "${dest}"
+				case "$sapi" in
+					cli)
+						source="sapi/cli/php"
+						;;
+					cgi)
+						source="sapi/cgi/php-cgi"
+						;;
+					fpm)
+						source="sapi/fpm/php-fpm"
+						;;
+					embed)
+						source="libs/libphp${PHP_MV}$(get_libname)"
+						;;
+					*)
+						die "unhandled sapi in src_install"
+						;;
+				esac
+
+				if [[ "${source}" == *"$(get_libname)" ]]; then
+					dolib.so "${source}" || die "Unable to install ${sapi} sapi"
+				else
+					dobin "${source}" || die "Unable to install ${sapi} sapi"
+					local name="$(basename ${source})"
+					dosym "${dest}/bin/${name}" "/usr/bin/${name}${SLOT}"
+				fi
+			fi
+
+			php_install_ini "${sapi}"
+
+			# construct correct SAPI string for php-config
+			# thanks to ferringb for the bash voodoo
+			if [[ "${sapi}" == "apache2" ]]; then
+				sapi_list="${sapi_list:+${sapi_list} }apache2handler"
+			else
+				sapi_list="${sapi_list:+${sapi_list} }${sapi}"
+			fi
+		fi
+	done
+
+	# Installing opcache module
+	if use_if_iuse opcache ; then
+		dolib.so "modules/opcache$(get_libname)" || die "Unable to install opcache module"
+	fi
+
+	# Install env.d files
+	newenvd "${FILESDIR}/20php5-envd" \
+		"20php${SLOT}"
+	sed -e "s|/lib/|/$(get_libdir)/|g" -i \
+		"${ED}/etc/env.d/20php${SLOT}"
+	sed -e "s|php5|php${SLOT}|g" -i \
+		"${ED}/etc/env.d/20php${SLOT}"
+
+	# set php-config variable correctly (bug #278439)
+	sed -e "s:^\(php_sapis=\)\".*\"$:\1\"${sapi_list}\":" -i \
+		"${ED}/usr/$(get_libdir)/php${SLOT}/bin/php-config"
+
+	if use fpm ; then
+		if use systemd; then
+			systemd_newunit "${FILESDIR}/php-fpm_at.service" "php-fpm@${SLOT}.service"
+		else
+			systemd_newunit "${FILESDIR}/php-fpm_at-simple.service" "php-fpm@${SLOT}.service"
+		fi
+	fi
+}
+
+src_test() {
+	echo ">>> Test phase [test]: ${CATEGORY}/${PF}"
+	PHP_BIN="${WORKDIR}/sapis-build/cli/sapi/cli/php"
+	if [[ ! -x "${PHP_BIN}" ]] ; then
+		ewarn "Test phase requires USE=cli, skipping"
+		return
+	else
+		export TEST_PHP_EXECUTABLE="${PHP_BIN}"
+	fi
+
+	if [[ -x "${WORKDIR}/sapis/cgi/php-cgi" ]] ; then
+		export TEST_PHP_CGI_EXECUTABLE="${WORKDIR}/sapis/cgi/php-cgi"
+	fi
+
+	REPORT_EXIT_STATUS=1 "${TEST_PHP_EXECUTABLE}" -n  -d "session.save_path=${T}" \
+		"${WORKDIR}/sapis-build/cli/run-tests.php" -n -q -d "session.save_path=${T}"
+
+	for name in ${EXPECTED_TEST_FAILURES}; do
+		mv "${name}.out" "${name}.out.orig" 2>/dev/null
+	done
+
+	local failed="$(find -name '*.out')"
+	if [[ ${failed} != "" ]] ; then
+		ewarn "The following test cases failed unexpectedly:"
+		for name in ${failed}; do
+			ewarn "  ${name/.out/}"
+		done
+	else
+		einfo "No unexpected test failures, all fine"
+	fi
+
+	if [[ ${PHP_SHOW_UNEXPECTED_TEST_PASS} == "1" ]] ; then
+		local passed=""
+		for name in ${EXPECTED_TEST_FAILURES}; do
+			[[ -f "${name}.diff" ]] && continue
+			passed="${passed} ${name}"
+		done
+		if [[ ${passed} != "" ]] ; then
+			einfo "The following test cases passed unexpectedly:"
+			for name in ${passed}; do
+				ewarn "  ${passed}"
+			done
+		else
+			einfo "None of the known-to-fail tests passed, all fine"
+		fi
+	fi
+}
+
+pkg_postinst() {
+	# Output some general info to the user
+	if use apache2 ; then
+		APACHE2_MOD_DEFINE="PHP5"
+		APACHE2_MOD_CONF="70_mod_php5"  # actually provided by app-eselect/eselect-php
+		apache-module_pkg_postinst
+	fi
+
+	# Create the symlinks for php
+	for m in ${SAPIS}; do
+		[[ ${m} == 'embed' ]] && continue;
+		if use $m ; then
+			local ci=$(eselect php show $m)
+			if [[ -z $ci ]]; then
+				eselect php set $m php${SLOT}
+				einfo "Switched ${m} to use php:${SLOT}"
+				einfo
+			elif [[ $ci != "php${SLOT}" ]] ; then
+				elog "To switch $m to use php:${SLOT}, run"
+				elog "    eselect php set $m php${SLOT}"
+				elog
+			fi
+		fi
+	done
+
+	elog "Make sure that PHP_TARGETS in ${EPREFIX}/etc/make.conf includes php${SLOT/./-} in order"
+	elog "to compile extensions for the ${SLOT} ABI"
+	elog
+	if ! use readline && use cli ; then
+		ewarn "Note that in order to use php interactivly, you need to enable"
+		ewarn "the readline USE flag or php -a will hang"
+	fi
+	elog
+	elog "This ebuild installed a version of php.ini based on php.ini-${PHP_INI_VERSION} version."
+	elog "You can chose which version of php.ini to install by default by setting PHP_INI_VERSION to either"
+	elog "'production' or 'development' in ${EPREFIX}/etc/make.conf"
+	elog "Both versions of php.ini can be found in ${EPREFIX}/usr/share/doc/${PF}"
+
+	elog
+	elog "For more details on how minor version slotting works (PHP_TARGETS) please read the upgrade guide:"
+	elog "https://www.gentoo.org/proj/en/php/php-upgrading.xml"
+	elog
+}
+
+pkg_prerm() {
+	eselect php cleanup
+}
diff --git a/dev-lang/php/php-5.6.9.ebuild b/dev-lang/php/php-5.6.9.ebuild
deleted file mode 100644
index 950b34da3290..000000000000
--- a/dev-lang/php/php-5.6.9.ebuild
+++ /dev/null
@@ -1,787 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils autotools flag-o-matic versionator depend.apache apache-module db-use libtool systemd
-
-KEYWORDS="alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-
-function php_get_uri ()
-{
-	case "${1}" in
-		"php-pre")
-			echo "http://downloads.php.net/dsp/${2}"
-		;;
-		"php")
-			echo "http://www.php.net/distributions/${2}"
-		;;
-		"olemarkus")
-			echo "https://dev.gentoo.org/~olemarkus/php/${2}"
-		;;
-		"gentoo")
-			echo "mirror://gentoo/${2}"
-		;;
-		*)
-			die "unhandled case in php_get_uri"
-		;;
-	esac
-}
-
-PHP_MV="$(get_major_version)"
-SLOT="$(get_version_component_range 1-2)"
-
-# alias, so we can handle different types of releases (finals, rcs, alphas,
-# betas, ...) w/o changing the whole ebuild
-PHP_PV="${PV/_rc/RC}"
-PHP_PV="${PHP_PV/_alpha/alpha}"
-PHP_PV="${PHP_PV/_beta/beta}"
-PHP_RELEASE="php"
-[[ ${PV} == ${PV/_alpha/} ]] || PHP_RELEASE="php-pre"
-[[ ${PV} == ${PV/_beta/} ]] || PHP_RELEASE="php-pre"
-[[ ${PV} == ${PV/_rc/} ]] || PHP_RELEASE="php-pre"
-PHP_P="${PN}-${PHP_PV}"
-
-PHP_SRC_URI="$(php_get_uri "${PHP_RELEASE}" "${PHP_P}.tar.bz2")"
-
-PHP_FPM_CONF_VER="1"
-
-SRC_URI="${PHP_SRC_URI}"
-
-DESCRIPTION="The PHP language runtime engine: CLI, CGI, FPM/FastCGI, Apache2 and embed SAPIs"
-HOMEPAGE="http://php.net/"
-LICENSE="PHP-3"
-
-S="${WORKDIR}/${PHP_P}"
-
-# We can build the following SAPIs in the given order
-SAPIS="embed cli cgi fpm apache2"
-
-# SAPIs and SAPI-specific USE flags (cli SAPI is default on):
-IUSE="${IUSE}
-	${SAPIS/cli/+cli}
-	threads"
-
-IUSE="${IUSE} bcmath berkdb bzip2 calendar cdb cjk
-	crypt +ctype curl debug
-	enchant exif frontbase +fileinfo +filter firebird
-	flatfile ftp gd gdbm gmp +hash +iconv imap inifile
-	intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit mhash
-	mssql mysql libmysqlclient mysqli nls
-	oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm
-	readline recode selinux +session sharedmem
-	+simplexml snmp soap sockets spell sqlite ssl
-	sybase-ct sysvipc systemd tidy +tokenizer truetype unicode vpx wddx
-	+xml xmlreader xmlwriter xmlrpc xpm xslt zip zlib"
-
-DEPEND="
-	>=app-eselect/eselect-php-0.7.1-r3[apache2?,fpm?]
-	>=dev-libs/libpcre-8.32[unicode]
-	apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=]
-		<www-servers/apache-2.4[threads=] ) )
-	berkdb? ( =sys-libs/db-4* )
-	bzip2? ( app-arch/bzip2 )
-	cdb? ( || ( dev-db/cdb dev-db/tinycdb ) )
-	cjk? ( !gd? (
-		virtual/jpeg:0
-		media-libs/libpng:0=
-		sys-libs/zlib
-	) )
-	crypt? ( >=dev-libs/libmcrypt-2.4 )
-	curl? ( >=net-misc/curl-7.10.5 )
-	enchant? ( app-text/enchant )
-	exif? ( !gd? (
-		virtual/jpeg:0
-		media-libs/libpng:0=
-		sys-libs/zlib
-	) )
-	firebird? ( dev-db/firebird )
-	gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib )
-	gdbm? ( >=sys-libs/gdbm-1.8.0 )
-	gmp? ( >=dev-libs/gmp-4.1.2 )
-	iconv? ( virtual/libiconv )
-	imap? ( virtual/imap-c-client[ssl=] )
-	intl? ( dev-libs/icu:= )
-	iodbc? ( dev-db/libiodbc )
-	kerberos? ( virtual/krb5 )
-	ldap? ( >=net-nds/openldap-1.2.11 )
-	ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 )
-	libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) )
-	mssql? ( dev-db/freetds[mssql] )
-	libmysqlclient? (
-		mysql? ( virtual/mysql )
-		mysqli? ( >=virtual/mysql-4.1 )
-	)
-	nls? ( sys-devel/gettext )
-	oci8-instant-client? ( dev-db/oracle-instantclient-basic )
-	odbc? ( >=dev-db/unixODBC-1.8.13 )
-	postgres? ( dev-db/postgresql )
-	qdbm? ( dev-db/qdbm )
-	readline? ( sys-libs/readline )
-	recode? ( app-text/recode )
-	sharedmem? ( dev-libs/mm )
-	simplexml? ( >=dev-libs/libxml2-2.6.8 )
-	snmp? ( >=net-analyzer/net-snmp-5.2 )
-	soap? ( >=dev-libs/libxml2-2.6.8 )
-	spell? ( >=app-text/aspell-0.50 )
-	sqlite? ( >=dev-db/sqlite-3.7.6.3 )
-	ssl? ( >=dev-libs/openssl-0.9.7 )
-	sybase-ct? ( dev-db/freetds )
-	tidy? ( app-text/htmltidy )
-	truetype? (
-		=media-libs/freetype-2*
-		>=media-libs/t1lib-5.0.0
-		!gd? (
-			virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib )
-	)
-	unicode? ( dev-libs/oniguruma )
-	vpx? ( media-libs/libvpx )
-	wddx? ( >=dev-libs/libxml2-2.6.8 )
-	xml? ( >=dev-libs/libxml2-2.6.8 )
-	xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv )
-	xmlreader? ( >=dev-libs/libxml2-2.6.8 )
-	xmlwriter? ( >=dev-libs/libxml2-2.6.8 )
-	xpm? (
-		x11-libs/libXpm
-		virtual/jpeg:0
-		media-libs/libpng:0= sys-libs/zlib
-	)
-	xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 )
-	zip? ( sys-libs/zlib )
-	zlib? ( sys-libs/zlib )
-	virtual/mta
-"
-
-php="=${CATEGORY}/${PF}"
-
-REQUIRED_USE="
-	truetype? ( gd )
-	vpx? ( gd )
-	cjk? ( gd )
-	exif? ( gd )
-
-	xpm? ( gd )
-	gd? ( zlib )
-	simplexml? ( xml )
-	soap? ( xml )
-	wddx? ( xml )
-	xmlrpc? ( || ( xml iconv ) )
-	xmlreader? ( xml )
-	xslt? ( xml )
-	ldap-sasl? ( ldap )
-	mhash? ( hash )
-	phar? ( hash )
-	libmysqlclient? ( || (
-		mysql
-		mysqli
-		pdo
-	) )
-
-	qdbm? ( !gdbm )
-	readline? ( !libedit )
-	recode? ( !imap !mysql !mysqli )
-	sharedmem? ( !threads )
-
-	!cli? ( !cgi? ( !fpm? ( !apache2? ( !embed? ( cli ) ) ) ) )"
-
-RDEPEND="${DEPEND}"
-
-RDEPEND="${RDEPEND}
-	fpm? (
-		selinux? ( sec-policy/selinux-phpfpm )
-		systemd? ( sys-apps/systemd ) )"
-
-DEPEND="${DEPEND}
-	sys-devel/flex
-	>=sys-devel/m4-1.4.3
-	>=sys-devel/libtool-1.5.18"
-
-# Allow users to install production version if they want to
-
-case "${PHP_INI_VERSION}" in
-	production|development)
-		;;
-	*)
-		PHP_INI_VERSION="development"
-		;;
-esac
-
-PHP_INI_UPSTREAM="php.ini-${PHP_INI_VERSION}"
-PHP_INI_FILE="php.ini"
-
-want_apache
-
-pkg_setup() {
-	depend.apache_pkg_setup
-}
-
-php_install_ini() {
-	local phpsapi="${1}"
-
-	# work out where we are installing the ini file
-	php_set_ini_dir "${phpsapi}"
-
-	local phpinisrc="${PHP_INI_UPSTREAM}-${phpsapi}"
-	cp "${PHP_INI_UPSTREAM}" "${phpinisrc}"
-
-	# default to /tmp for save_path, bug #282768
-	sed -e 's|^;session.save_path .*$|session.save_path = "'"${EPREFIX}"'/tmp"|g' -i "${phpinisrc}"
-
-	# Set the extension dir
-	sed -e "s|^extension_dir .*$|extension_dir = ${extension_dir}|g" -i "${phpinisrc}"
-
-	# Set the include path to point to where we want to find PEAR packages
-	sed -e 's|^;include_path = ".:/php/includes".*|include_path = ".:'"${EPREFIX}"'/usr/share/php'${PHP_MV}':'"${EPREFIX}"'/usr/share/php"|' -i "${phpinisrc}"
-
-	dodir "${PHP_INI_DIR#${EPREFIX}}"
-	insinto "${PHP_INI_DIR#${EPREFIX}}"
-	newins "${phpinisrc}" "${PHP_INI_FILE}"
-
-	elog "Installing php.ini for ${phpsapi} into ${PHP_INI_DIR#${EPREFIX}}"
-	elog
-
-	dodir "${PHP_EXT_INI_DIR#${EPREFIX}}"
-	dodir "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}"
-
-	if use_if_iuse opcache; then
-		elog "Adding opcache to $PHP_EXT_INI_DIR"
-		echo "zend_extension=${PHP_DESTDIR}/$(get_libdir)/opcache.so" >> "${D}/${PHP_EXT_INI_DIR}"/opcache.ini
-		dosym "${PHP_EXT_INI_DIR#${EPREFIX}}/opcache.ini" "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}/opcache.ini"
-	fi
-
-	# SAPI-specific handling
-
-	if [[ "${sapi}" == "fpm" ]] ; then
-		[[ -z ${PHP_FPM_CONF_VER} ]] && PHP_FPM_CONF_VER=0
-		einfo "Installing FPM CGI config file php-fpm.conf"
-		insinto "${PHP_INI_DIR#${EPREFIX}}"
-		newins "${FILESDIR}/php-fpm-r${PHP_FPM_CONF_VER}.conf" php-fpm.conf
-
-		# Remove bogus /etc/php-fpm.conf.default (bug 359906)
-		[[ -f "${ED}/etc/php-fpm.conf.default" ]] && rm "${ED}/etc/php-fpm.conf.default"
-	fi
-
-	# Install PHP ini files into /usr/share/php
-
-	dodoc php.ini-development
-	dodoc php.ini-production
-
-}
-
-php_set_ini_dir() {
-	PHP_INI_DIR="${EPREFIX}/etc/php/${1}-php${SLOT}"
-	PHP_EXT_INI_DIR="${PHP_INI_DIR}/ext"
-	PHP_EXT_INI_DIR_ACTIVE="${PHP_INI_DIR}/ext-active"
-}
-
-src_prepare() {
-	# USE=sharedmem (session/mod_mm to be exact) tries to mmap() this path
-	# ([empty session.save_path]/session_mm_[sapi][gid].sem)
-	# there is no easy way to circumvent that, all php calls during
-	# install use -n, so no php.ini file will be used.
-	# As such, this is the easiest way to get around
-	addpredict /session_mm_cli250.sem
-	addpredict /session_mm_cli0.sem
-
-	# Change PHP branding
-	# Get the alpha/beta/rc version
-	sed -re	"s|^(PHP_EXTRA_VERSION=\").*(\")|\1-pl${PR/r/}-gentoo\2|g" \
-		-i configure.in || die "Unable to change PHP branding"
-
-	# Patch PHP to show Gentoo as the server platform
-	sed -e 's/PHP_UNAME=`uname -a | xargs`/PHP_UNAME=`uname -s -n -r -v | xargs`/g' \
-		-i configure.in || die "Failed to fix server platform name"
-
-	# Prevent PHP from activating the Apache config,
-	# as we will do that ourselves
-	sed -i \
-		-e "s,-i -a -n php${PHP_MV},-i -n php${PHP_MV},g" \
-		-e "s,-i -A -n php${PHP_MV},-i -n php${PHP_MV},g" \
-		configure sapi/apache2filter/config.m4 sapi/apache2handler/config.m4
-
-	# Patch PHP to support heimdal instead of mit-krb5
-	if has_version "app-crypt/heimdal" ; then
-		sed -e 's|gssapi_krb5|gssapi|g' -i acinclude.m4 \
-			|| die "Failed to fix heimdal libname"
-		sed -e 's|PHP_ADD_LIBRARY(k5crypto, 1, $1)||g' -i acinclude.m4 \
-			|| die "Failed to fix heimdal crypt library reference"
-	fi
-
-	# Fix build with libvpx-1.4.0, bug #545952 .
-	epatch "${FILESDIR}/${PN}-libvpx.patch"
-
-	#Add user patches #357637
-	epatch_user
-
-	#force rebuilding aclocal.m4
-	rm aclocal.m4
-	eautoreconf
-
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		# http://bugs.php.net/bug.php?id=48795, bug #343481
-		sed -i -e '/BUILD_CGI="\\$(CC)/s/CC/CXX/' configure || die
-	fi
-}
-
-src_configure() {
-	addpredict /usr/share/snmp/mibs/.index
-	addpredict /var/lib/net-snmp/mib_indexes
-
-	PHP_DESTDIR="${EPREFIX}/usr/$(get_libdir)/php${SLOT}"
-
-	# This is a global variable and should be in caps. It isn't because the
-	# phpconfutils eclass relies on exactly this name...
-	# for --with-libdir see bug #327025
-	my_conf="
-		--prefix="${PHP_DESTDIR}"
-		--mandir="${PHP_DESTDIR}"/man
-		--infodir="${PHP_DESTDIR}"/info
-		--libdir="${PHP_DESTDIR}"/lib
-		--with-libdir=$(get_libdir)
-		--without-pear
-		$(use_enable threads maintainer-zts)"
-
-	#                             extension		  USE flag        shared
-	my_conf+="
-	$(use_enable bcmath bcmath )
-	$(use_with bzip2 bz2 "${EPREFIX}"/usr)
-	$(use_enable calendar calendar )
-	$(use_enable ctype ctype )
-	$(use_with curl curl "${EPREFIX}"/usr)
-	$(use_enable xml dom )
-	$(use_with enchant enchant "${EPREFIX}"/usr)
-	$(use_enable exif exif )
-	$(use_enable fileinfo fileinfo )
-	$(use_enable filter filter )
-	$(use_enable ftp ftp )
-	$(use_with nls gettext "${EPREFIX}"/usr)
-	$(use_with gmp gmp "${EPREFIX}"/usr)
-	$(use_enable hash hash )
-	$(use_with mhash mhash "${EPREFIX}"/usr)
-	$(use_with iconv iconv $(use elibc_glibc || use elibc_musl || echo "${EPREFIX}"/usr))
-	$(use_enable intl intl )
-	$(use_enable ipv6 ipv6 )
-	$(use_enable json json )
-	$(use_with kerberos kerberos "${EPREFIX}"/usr)
-	$(use_enable xml libxml )
-	$(use_with xml libxml-dir "${EPREFIX}"/usr)
-	$(use_enable unicode mbstring )
-	$(use_with crypt mcrypt "${EPREFIX}"/usr)
-	$(use_with mssql mssql "${EPREFIX}"/usr)
-	$(use_with unicode onig "${EPREFIX}"/usr)
-	$(use_with ssl openssl "${EPREFIX}"/usr)
-	$(use_with ssl openssl-dir "${EPREFIX}"/usr)
-	$(use_enable pcntl pcntl )
-	$(use_enable phar phar )
-	$(use_enable pdo pdo )
-	$(use_enable opcache opcache )
-	$(use_with postgres pgsql "${EPREFIX}"/usr)
-	$(use_enable posix posix )
-	$(use_with spell pspell "${EPREFIX}"/usr)
-	$(use_with recode recode "${EPREFIX}"/usr)
-	$(use_enable simplexml simplexml )
-	$(use_enable sharedmem shmop )
-	$(use_with snmp snmp "${EPREFIX}"/usr)
-	$(use_enable soap soap )
-	$(use_enable sockets sockets )
-	$(use_with sqlite sqlite3 "${EPREFIX}"/usr)
-	$(use_with sybase-ct sybase-ct "${EPREFIX}"/usr)
-	$(use_enable sysvipc sysvmsg )
-	$(use_enable sysvipc sysvsem )
-	$(use_enable sysvipc sysvshm )
-	$(use_with systemd fpm-systemd)
-	$(use_with tidy tidy "${EPREFIX}"/usr)
-	$(use_enable tokenizer tokenizer )
-	$(use_enable wddx wddx )
-	$(use_enable xml xml )
-	$(use_enable xmlreader xmlreader )
-	$(use_enable xmlwriter xmlwriter )
-	$(use_with xmlrpc xmlrpc)
-	$(use_with xslt xsl "${EPREFIX}"/usr)
-	$(use_enable zip zip )
-	$(use_with zlib zlib "${EPREFIX}"/usr)
-	$(use_enable debug debug )"
-
-	# DBA support
-	if use cdb || use berkdb || use flatfile || use gdbm || use inifile \
-		|| use qdbm ; then
-		my_conf="${my_conf} --enable-dba${shared}"
-	fi
-
-	# DBA drivers support
-	my_conf+="
-	$(use_with cdb cdb)
-	$(use_with berkdb db4 ${EPREFIX}/usr)
-	$(use_enable flatfile flatfile )
-	$(use_with gdbm gdbm ${EPREFIX}/usr)
-	$(use_enable inifile inifile )
-	$(use_with qdbm qdbm ${EPREFIX}/usr)"
-
-	# Support for the GD graphics library
-	my_conf+="
-	$(use_with truetype freetype-dir ${EPREFIX}/usr)
-	$(use_with truetype t1lib ${EPREFIX}/usr)
-	$(use_enable cjk gd-jis-conv )
-	$(use_with gd jpeg-dir ${EPREFIX}/usr)
-	$(use_with gd png-dir ${EPREFIX}/usr)
-	$(use_with xpm xpm-dir ${EPREFIX}/usr)
-	$(use_with vpx vpx-dir ${EPREFIX}/usr)"
-	# enable gd last, so configure can pick up the previous settings
-	my_conf+="
-	$(use_with gd gd)"
-
-	# IMAP support
-	if use imap ; then
-		my_conf+="
-		$(use_with imap imap ${EPREFIX}/usr)
-		$(use_with ssl imap-ssl ${EPREFIX}/usr)"
-	fi
-
-	# Interbase/firebird support
-
-	if use firebird ; then
-		my_conf+="
-		$(use_with firebird interbase ${EPREFIX}/usr)"
-	fi
-
-	# LDAP support
-	if use ldap ; then
-		my_conf+="
-		$(use_with ldap ldap ${EPREFIX}/usr)
-		$(use_with ldap-sasl ldap-sasl ${EPREFIX}/usr)"
-	fi
-
-	# MySQL support
-	local mysqllib="mysqlnd"
-	local mysqlilib="mysqlnd"
-	use libmysqlclient && mysqllib="${EPREFIX}/usr"
-	use libmysqlclient && mysqlilib="${EPREFIX}/usr/bin/mysql_config"
-
-	my_conf+=" $(use_with mysql mysql $mysqllib)"
-	my_conf+=" $(use_with mysqli mysqli $mysqlilib)"
-
-	local mysqlsock=" $(use_with mysql mysql-sock ${EPREFIX}/var/run/mysqld/mysqld.sock)"
-	if use mysql ; then
-		my_conf+="${mysqlsock}"
-	elif use mysqli ; then
-		my_conf+="${mysqlsock}"
-	fi
-
-	# ODBC support
-	if use odbc ; then
-		my_conf+="
-		$(use_with odbc unixODBC ${EPREFIX}/usr)"
-	fi
-
-	if use iodbc ; then
-		my_conf+="
-		$(use_with iodbc iodbc ${EPREFIX}/usr)"
-	fi
-
-	# Oracle support
-	if use oci8-instant-client ; then
-		my_conf+="
-		$(use_with oci8-instant-client oci8)"
-	fi
-
-	# PDO support
-	if use pdo ; then
-		my_conf+="
-		$(use_with mssql pdo-dblib )
-		$(use_with mysql pdo-mysql ${mysqllib})
-		$(use_with postgres pdo-pgsql )
-		$(use_with sqlite pdo-sqlite ${EPREFIX}/usr)
-		$(use_with odbc pdo-odbc unixODBC,${EPREFIX}/usr)"
-		if use oci8-instant-client ; then
-			my_conf+="
-			$(use_with oci8-instant-client pdo-oci)"
-		fi
-	fi
-
-	# readline/libedit support
-	my_conf+="
-	$(use_with readline readline ${EPREFIX}/usr)
-	$(use_with libedit libedit ${EPREFIX}/usr)"
-
-	# Session support
-	if use session ; then
-		my_conf+="
-		$(use_with sharedmem mm ${EPREFIX}/usr)"
-	else
-		my_conf+="
-		$(use_enable session session )"
-	fi
-
-	# Use pic for shared modules such as apache2's mod_php
-	my_conf="${my_conf} --with-pic"
-
-	# we use the system copy of pcre
-	# --with-pcre-regex affects ext/pcre
-	# --with-pcre-dir affects ext/filter and ext/zip
-	my_conf="${my_conf} --with-pcre-regex=${EPREFIX}/usr --with-pcre-dir=${EPREFIX}/usr"
-
-	# Catch CFLAGS problems
-	# Fixes bug #14067.
-	# Changed order to run it in reverse for bug #32022 and #12021.
-	replace-cpu-flags "k6*" "i586"
-
-	# Support user-passed configuration parameters
-	my_conf="${my_conf} ${EXTRA_ECONF:-}"
-
-	# Support the Apache2 extras, they must be set globally for all
-	# SAPIs to work correctly, especially for external PHP extensions
-
-	mkdir -p "${WORKDIR}/sapis-build"
-	for one_sapi in $SAPIS ; do
-		use "${one_sapi}" || continue
-		php_set_ini_dir "${one_sapi}"
-
-		cp -r "${S}" "${WORKDIR}/sapis-build/${one_sapi}"
-		cd "${WORKDIR}/sapis-build/${one_sapi}"
-
-		sapi_conf="${my_conf} --with-config-file-path=${PHP_INI_DIR}
-			--with-config-file-scan-dir=${PHP_EXT_INI_DIR_ACTIVE}"
-
-		for sapi in $SAPIS ; do
-			case "$sapi" in
-				cli|cgi|embed|fpm)
-					if [[ "${one_sapi}" == "${sapi}" ]] ; then
-						sapi_conf="${sapi_conf} --enable-${sapi}"
-					else
-						sapi_conf="${sapi_conf} --disable-${sapi}"
-					fi
-					;;
-
-				apache2)
-					if [[ "${one_sapi}" == "${sapi}" ]] ; then
-						sapi_conf="${sapi_conf} --with-apxs2=${EPREFIX}/usr/sbin/apxs"
-					else
-						sapi_conf="${sapi_conf} --without-apxs2"
-					fi
-					;;
-			esac
-		done
-
-		econf ${sapi_conf}
-	done
-}
-
-src_compile() {
-	# snmp seems to run during src_compile, too (bug #324739)
-	addpredict /usr/share/snmp/mibs/.index
-	addpredict /var/lib/net-snmp/mib_indexes
-
-	for sapi in ${SAPIS} ; do
-		if use "${sapi}"; then
-			cd "${WORKDIR}/sapis-build/$sapi" || "Failed to change dir to ${WORKDIR}/sapis-build/$1"
-			emake || die "emake failed"
-		fi
-	done
-}
-
-src_install() {
-	# see bug #324739 for what happens when we don't have that
-	addpredict /usr/share/snmp/mibs/.index
-
-	# grab the first SAPI that got built and install common files from there
-	local first_sapi=""
-	for sapi in $SAPIS ; do
-		if use $sapi ; then
-			first_sapi=$sapi
-			break
-		fi
-	done
-
-	# Makefile forgets to create this before trying to write to it...
-	dodir "${PHP_DESTDIR#${EPREFIX}}/bin"
-
-	# Install php environment (without any sapis)
-	cd "${WORKDIR}/sapis-build/$first_sapi"
-	emake INSTALL_ROOT="${D}" \
-		install-build install-headers install-programs \
-		|| die "emake install failed"
-
-	local extension_dir="$("${ED}/${PHP_DESTDIR#${EPREFIX}}/bin/php-config" --extension-dir)"
-
-	# Create the directory where we'll put version-specific php scripts
-	keepdir /usr/share/php${PHP_MV}
-
-	local sapi="", file=""
-	local sapi_list=""
-
-	for sapi in ${SAPIS}; do
-		if use "${sapi}" ; then
-			einfo "Installing SAPI: ${sapi}"
-			cd "${WORKDIR}/sapis-build/${sapi}"
-
-			if [[ "${sapi}" == "apache2" ]] ; then
-				# We're specifically not using emake install-sapi as libtool
-				# may cause unnecessary relink failures (see bug #351266)
-				insinto "${PHP_DESTDIR#${EPREFIX}}/apache2/"
-				newins ".libs/libphp5$(get_libname)" "libphp${PHP_MV}$(get_libname)"
-				keepdir "/usr/$(get_libdir)/apache2/modules"
-			else
-				# needed each time, php_install_ini would reset it
-				local dest="${PHP_DESTDIR#${EPREFIX}}"
-				into "${dest}"
-				case "$sapi" in
-					cli)
-						source="sapi/cli/php"
-						;;
-					cgi)
-						source="sapi/cgi/php-cgi"
-						;;
-					fpm)
-						source="sapi/fpm/php-fpm"
-						;;
-					embed)
-						source="libs/libphp${PHP_MV}$(get_libname)"
-						;;
-					*)
-						die "unhandled sapi in src_install"
-						;;
-				esac
-
-				if [[ "${source}" == *"$(get_libname)" ]]; then
-					dolib.so "${source}" || die "Unable to install ${sapi} sapi"
-				else
-					dobin "${source}" || die "Unable to install ${sapi} sapi"
-					local name="$(basename ${source})"
-					dosym "${dest}/bin/${name}" "/usr/bin/${name}${SLOT}"
-				fi
-			fi
-
-			php_install_ini "${sapi}"
-
-			# construct correct SAPI string for php-config
-			# thanks to ferringb for the bash voodoo
-			if [[ "${sapi}" == "apache2" ]]; then
-				sapi_list="${sapi_list:+${sapi_list} }apache2handler"
-			else
-				sapi_list="${sapi_list:+${sapi_list} }${sapi}"
-			fi
-		fi
-	done
-
-	# Installing opcache module
-	if use_if_iuse opcache ; then
-		dolib.so "modules/opcache$(get_libname)" || die "Unable to install opcache module"
-	fi
-
-	# Install env.d files
-	newenvd "${FILESDIR}/20php5-envd" \
-		"20php${SLOT}"
-	sed -e "s|/lib/|/$(get_libdir)/|g" -i \
-		"${ED}/etc/env.d/20php${SLOT}"
-	sed -e "s|php5|php${SLOT}|g" -i \
-		"${ED}/etc/env.d/20php${SLOT}"
-
-	# set php-config variable correctly (bug #278439)
-	sed -e "s:^\(php_sapis=\)\".*\"$:\1\"${sapi_list}\":" -i \
-		"${ED}/usr/$(get_libdir)/php${SLOT}/bin/php-config"
-
-	if use fpm ; then
-		if use systemd; then
-			systemd_newunit "${FILESDIR}/php-fpm_at.service" "php-fpm@${SLOT}.service"
-		else
-			systemd_newunit "${FILESDIR}/php-fpm_at-simple.service" "php-fpm@${SLOT}.service"
-		fi
-	fi
-}
-
-src_test() {
-	echo ">>> Test phase [test]: ${CATEGORY}/${PF}"
-	PHP_BIN="${WORKDIR}/sapis-build/cli/sapi/cli/php"
-	if [[ ! -x "${PHP_BIN}" ]] ; then
-		ewarn "Test phase requires USE=cli, skipping"
-		return
-	else
-		export TEST_PHP_EXECUTABLE="${PHP_BIN}"
-	fi
-
-	if [[ -x "${WORKDIR}/sapis/cgi/php-cgi" ]] ; then
-		export TEST_PHP_CGI_EXECUTABLE="${WORKDIR}/sapis/cgi/php-cgi"
-	fi
-
-	REPORT_EXIT_STATUS=1 "${TEST_PHP_EXECUTABLE}" -n  -d "session.save_path=${T}" \
-		"${WORKDIR}/sapis-build/cli/run-tests.php" -n -q -d "session.save_path=${T}"
-
-	for name in ${EXPECTED_TEST_FAILURES}; do
-		mv "${name}.out" "${name}.out.orig" 2>/dev/null
-	done
-
-	local failed="$(find -name '*.out')"
-	if [[ ${failed} != "" ]] ; then
-		ewarn "The following test cases failed unexpectedly:"
-		for name in ${failed}; do
-			ewarn "  ${name/.out/}"
-		done
-	else
-		einfo "No unexpected test failures, all fine"
-	fi
-
-	if [[ ${PHP_SHOW_UNEXPECTED_TEST_PASS} == "1" ]] ; then
-		local passed=""
-		for name in ${EXPECTED_TEST_FAILURES}; do
-			[[ -f "${name}.diff" ]] && continue
-			passed="${passed} ${name}"
-		done
-		if [[ ${passed} != "" ]] ; then
-			einfo "The following test cases passed unexpectedly:"
-			for name in ${passed}; do
-				ewarn "  ${passed}"
-			done
-		else
-			einfo "None of the known-to-fail tests passed, all fine"
-		fi
-	fi
-}
-
-pkg_postinst() {
-	# Output some general info to the user
-	if use apache2 ; then
-		APACHE2_MOD_DEFINE="PHP5"
-		APACHE2_MOD_CONF="70_mod_php5"  # actually provided by app-eselect/eselect-php
-		apache-module_pkg_postinst
-	fi
-
-	# Create the symlinks for php
-	for m in ${SAPIS}; do
-		[[ ${m} == 'embed' ]] && continue;
-		if use $m ; then
-			local ci=$(eselect php show $m)
-			if [[ -z $ci ]]; then
-				eselect php set $m php${SLOT}
-				einfo "Switched ${m} to use php:${SLOT}"
-				einfo
-			elif [[ $ci != "php${SLOT}" ]] ; then
-				elog "To switch $m to use php:${SLOT}, run"
-				elog "    eselect php set $m php${SLOT}"
-				elog
-			fi
-		fi
-	done
-
-	elog "Make sure that PHP_TARGETS in ${EPREFIX}/etc/make.conf includes php${SLOT/./-} in order"
-	elog "to compile extensions for the ${SLOT} ABI"
-	elog
-	if ! use readline && use cli ; then
-		ewarn "Note that in order to use php interactivly, you need to enable"
-		ewarn "the readline USE flag or php -a will hang"
-	fi
-	elog
-	elog "This ebuild installed a version of php.ini based on php.ini-${PHP_INI_VERSION} version."
-	elog "You can chose which version of php.ini to install by default by setting PHP_INI_VERSION to either"
-	elog "'production' or 'development' in ${EPREFIX}/etc/make.conf"
-	elog "Both versions of php.ini can be found in ${EPREFIX}/usr/share/doc/${PF}"
-
-	elog
-	elog "For more details on how minor version slotting works (PHP_TARGETS) please read the upgrade guide:"
-	elog "https://www.gentoo.org/proj/en/php/php-upgrading.xml"
-	elog
-}
-
-pkg_prerm() {
-	eselect php cleanup
-}
diff --git a/dev-lang/php/php-7.0.0_rc2.ebuild b/dev-lang/php/php-7.0.0_rc2.ebuild
new file mode 100644
index 000000000000..c81046fe2af2
--- /dev/null
+++ b/dev-lang/php/php-7.0.0_rc2.ebuild
@@ -0,0 +1,760 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils autotools flag-o-matic versionator depend.apache apache-module db-use libtool systemd
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+
+function php_get_uri ()
+{
+	case "${1}" in
+		"php-pre")
+			echo "http://downloads.php.net/ab/${2}"
+		;;
+		"php")
+			echo "http://www.php.net/distributions/${2}"
+		;;
+		"olemarkus")
+			echo "https://dev.gentoo.org/~olemarkus/php/${2}"
+		;;
+		"gentoo")
+			echo "mirror://gentoo/${2}"
+		;;
+		*)
+			die "unhandled case in php_get_uri"
+		;;
+	esac
+}
+
+PHP_MV="$(get_major_version)"
+SLOT="$(get_version_component_range 1-2)"
+
+# alias, so we can handle different types of releases (finals, rcs, alphas,
+# betas, ...) w/o changing the whole ebuild
+PHP_PV="${PV/_rc/RC}"
+PHP_PV="${PHP_PV/_alpha/alpha}"
+PHP_PV="${PHP_PV/_beta/beta}"
+PHP_RELEASE="php"
+[[ ${PV} == ${PV/_alpha/} ]] || PHP_RELEASE="php-pre"
+[[ ${PV} == ${PV/_beta/} ]] || PHP_RELEASE="php-pre"
+[[ ${PV} == ${PV/_rc/} ]] || PHP_RELEASE="php-pre"
+PHP_P="${PN}-${PHP_PV}"
+
+PHP_SRC_URI="$(php_get_uri "${PHP_RELEASE}" "${PHP_P}.tar.bz2")"
+
+PHP_FPM_CONF_VER="1"
+
+SRC_URI="${PHP_SRC_URI}"
+
+DESCRIPTION="The PHP language runtime engine: CLI, CGI, FPM/FastCGI, Apache2 and embed SAPIs"
+HOMEPAGE="http://php.net/"
+LICENSE="PHP-3"
+
+S="${WORKDIR}/${PHP_P}"
+
+# We can build the following SAPIs in the given order
+SAPIS="embed cli cgi fpm apache2"
+
+# SAPIs and SAPI-specific USE flags (cli SAPI is default on):
+IUSE="${IUSE}
+	${SAPIS/cli/+cli}
+	threads"
+
+IUSE="${IUSE} bcmath berkdb bzip2 calendar cdb cjk
+	crypt +ctype curl debug
+	enchant exif frontbase +fileinfo +filter firebird
+	flatfile ftp gd gdbm gmp +hash +iconv imap inifile
+	intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit mhash
+	mysql mysqli nls
+	oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm
+	readline recode selinux +session sharedmem
+	+simplexml snmp soap sockets spell sqlite ssl
+	sysvipc systemd tidy +tokenizer truetype unicode vpx wddx
+	+xml xmlreader xmlwriter xmlrpc xpm xslt zip zlib"
+
+DEPEND="
+	>=app-eselect/eselect-php-0.7.1-r3[apache2?,fpm?]
+	>=dev-libs/libpcre-8.32[unicode]
+	apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=]
+		<www-servers/apache-2.4[threads=] ) )
+	berkdb? ( =sys-libs/db-4* )
+	bzip2? ( app-arch/bzip2 )
+	cdb? ( || ( dev-db/cdb dev-db/tinycdb ) )
+	cjk? ( !gd? (
+		virtual/jpeg:0
+		media-libs/libpng:0=
+		sys-libs/zlib
+	) )
+	crypt? ( >=dev-libs/libmcrypt-2.4 )
+	curl? ( >=net-misc/curl-7.10.5 )
+	enchant? ( app-text/enchant )
+	exif? ( !gd? (
+		virtual/jpeg:0
+		media-libs/libpng:0=
+		sys-libs/zlib
+	) )
+	firebird? ( dev-db/firebird )
+	gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib )
+	gdbm? ( >=sys-libs/gdbm-1.8.0 )
+	gmp? ( >=dev-libs/gmp-4.1.2 )
+	iconv? ( virtual/libiconv )
+	imap? ( virtual/imap-c-client[ssl=] )
+	intl? ( dev-libs/icu:= )
+	iodbc? ( dev-db/libiodbc )
+	kerberos? ( virtual/krb5 )
+	ldap? ( >=net-nds/openldap-1.2.11 )
+	ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 )
+	libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) )
+	nls? ( sys-devel/gettext )
+	oci8-instant-client? ( dev-db/oracle-instantclient-basic )
+	odbc? ( >=dev-db/unixODBC-1.8.13 )
+	postgres? ( dev-db/postgresql )
+	qdbm? ( dev-db/qdbm )
+	readline? ( sys-libs/readline )
+	recode? ( app-text/recode )
+	sharedmem? ( dev-libs/mm )
+	simplexml? ( >=dev-libs/libxml2-2.6.8 )
+	snmp? ( >=net-analyzer/net-snmp-5.2 )
+	soap? ( >=dev-libs/libxml2-2.6.8 )
+	spell? ( >=app-text/aspell-0.50 )
+	sqlite? ( >=dev-db/sqlite-3.7.6.3 )
+	ssl? ( >=dev-libs/openssl-0.9.7 )
+	tidy? ( app-text/htmltidy )
+	truetype? (
+		=media-libs/freetype-2*
+		!gd? (
+			virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib )
+	)
+	unicode? ( dev-libs/oniguruma )
+	vpx? ( media-libs/libvpx )
+	wddx? ( >=dev-libs/libxml2-2.6.8 )
+	xml? ( >=dev-libs/libxml2-2.6.8 )
+	xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv )
+	xmlreader? ( >=dev-libs/libxml2-2.6.8 )
+	xmlwriter? ( >=dev-libs/libxml2-2.6.8 )
+	xpm? (
+		x11-libs/libXpm
+		virtual/jpeg:0
+		media-libs/libpng:0= sys-libs/zlib
+	)
+	xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 )
+	zip? ( sys-libs/zlib )
+	zlib? ( sys-libs/zlib )
+	virtual/mta
+"
+
+php="=${CATEGORY}/${PF}"
+
+REQUIRED_USE="
+	truetype? ( gd )
+	vpx? ( gd )
+	cjk? ( gd )
+	exif? ( gd )
+
+	xpm? ( gd )
+	gd? ( zlib )
+	simplexml? ( xml )
+	soap? ( xml )
+	wddx? ( xml )
+	xmlrpc? ( || ( xml iconv ) )
+	xmlreader? ( xml )
+	xslt? ( xml )
+	ldap-sasl? ( ldap )
+	mhash? ( hash )
+	phar? ( hash )
+
+	qdbm? ( !gdbm )
+	readline? ( !libedit )
+	recode? ( !imap !mysqli )
+	sharedmem? ( !threads )
+
+	mysql? ( || ( mysqli pdo ) )
+
+	!cli? ( !cgi? ( !fpm? ( !apache2? ( !embed? ( cli ) ) ) ) )"
+
+RDEPEND="${DEPEND}"
+
+RDEPEND="${RDEPEND}
+	fpm? (
+		selinux? ( sec-policy/selinux-phpfpm )
+		systemd? ( sys-apps/systemd ) )"
+
+DEPEND="${DEPEND}
+	sys-devel/flex
+	>=sys-devel/m4-1.4.3
+	>=sys-devel/libtool-1.5.18"
+
+# Allow users to install production version if they want to
+
+case "${PHP_INI_VERSION}" in
+	production|development)
+		;;
+	*)
+		PHP_INI_VERSION="development"
+		;;
+esac
+
+PHP_INI_UPSTREAM="php.ini-${PHP_INI_VERSION}"
+PHP_INI_FILE="php.ini"
+
+want_apache
+
+pkg_setup() {
+	depend.apache_pkg_setup
+}
+
+php_install_ini() {
+	local phpsapi="${1}"
+
+	# work out where we are installing the ini file
+	php_set_ini_dir "${phpsapi}"
+
+	local phpinisrc="${PHP_INI_UPSTREAM}-${phpsapi}"
+	cp "${PHP_INI_UPSTREAM}" "${phpinisrc}"
+
+	# default to /tmp for save_path, bug #282768
+	sed -e 's|^;session.save_path .*$|session.save_path = "'"${EPREFIX}"'/tmp"|g' -i "${phpinisrc}"
+
+	# Set the extension dir
+	sed -e "s|^extension_dir .*$|extension_dir = ${extension_dir}|g" -i "${phpinisrc}"
+
+	# Set the include path to point to where we want to find PEAR packages
+	sed -e 's|^;include_path = ".:/php/includes".*|include_path = ".:'"${EPREFIX}"'/usr/share/php'${PHP_MV}':'"${EPREFIX}"'/usr/share/php"|' -i "${phpinisrc}"
+
+	dodir "${PHP_INI_DIR#${EPREFIX}}"
+	insinto "${PHP_INI_DIR#${EPREFIX}}"
+	newins "${phpinisrc}" "${PHP_INI_FILE}"
+
+	elog "Installing php.ini for ${phpsapi} into ${PHP_INI_DIR#${EPREFIX}}"
+	elog
+
+	dodir "${PHP_EXT_INI_DIR#${EPREFIX}}"
+	dodir "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}"
+
+	if use_if_iuse opcache; then
+		elog "Adding opcache to $PHP_EXT_INI_DIR"
+		echo "zend_extension=${PHP_DESTDIR}/$(get_libdir)/opcache.so" >> "${D}/${PHP_EXT_INI_DIR}"/opcache.ini
+		dosym "${PHP_EXT_INI_DIR#${EPREFIX}}/opcache.ini" "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}/opcache.ini"
+	fi
+
+	# SAPI-specific handling
+
+	if [[ "${sapi}" == "fpm" ]] ; then
+		[[ -z ${PHP_FPM_CONF_VER} ]] && PHP_FPM_CONF_VER=0
+		einfo "Installing FPM CGI config file php-fpm.conf"
+		insinto "${PHP_INI_DIR#${EPREFIX}}"
+		newins "${FILESDIR}/php-fpm-r${PHP_FPM_CONF_VER}.conf" php-fpm.conf
+
+		# Remove bogus /etc/php-fpm.conf.default (bug 359906)
+		[[ -f "${ED}/etc/php-fpm.conf.default" ]] && rm "${ED}/etc/php-fpm.conf.default"
+	fi
+
+	# Install PHP ini files into /usr/share/php
+
+	dodoc php.ini-development
+	dodoc php.ini-production
+
+}
+
+php_set_ini_dir() {
+	PHP_INI_DIR="${EPREFIX}/etc/php/${1}-php${SLOT}"
+	PHP_EXT_INI_DIR="${PHP_INI_DIR}/ext"
+	PHP_EXT_INI_DIR_ACTIVE="${PHP_INI_DIR}/ext-active"
+}
+
+src_prepare() {
+	# USE=sharedmem (session/mod_mm to be exact) tries to mmap() this path
+	# ([empty session.save_path]/session_mm_[sapi][gid].sem)
+	# there is no easy way to circumvent that, all php calls during
+	# install use -n, so no php.ini file will be used.
+	# As such, this is the easiest way to get around
+	addpredict /session_mm_cli250.sem
+	addpredict /session_mm_cli0.sem
+
+	# Change PHP branding
+	# Get the alpha/beta/rc version
+	sed -re	"s|^(PHP_EXTRA_VERSION=\").*(\")|\1-pl${PR/r/}-gentoo\2|g" \
+		-i configure.in || die "Unable to change PHP branding"
+
+	# Patch PHP to show Gentoo as the server platform
+	sed -e 's/PHP_UNAME=`uname -a | xargs`/PHP_UNAME=`uname -s -n -r -v | xargs`/g' \
+		-i configure.in || die "Failed to fix server platform name"
+
+	# Patch PHP to support heimdal instead of mit-krb5
+	if has_version "app-crypt/heimdal" ; then
+		sed -e 's|gssapi_krb5|gssapi|g' -i acinclude.m4 \
+			|| die "Failed to fix heimdal libname"
+		sed -e 's|PHP_ADD_LIBRARY(k5crypto, 1, $1)||g' -i acinclude.m4 \
+			|| die "Failed to fix heimdal crypt library reference"
+	fi
+
+	#Add user patches #357637
+	epatch_user
+
+	#force rebuilding aclocal.m4
+	rm aclocal.m4
+	eautoreconf
+
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		# http://bugs.php.net/bug.php?id=48795, bug #343481
+		sed -i -e '/BUILD_CGI="\\$(CC)/s/CC/CXX/' configure || die
+	fi
+}
+
+src_configure() {
+	addpredict /usr/share/snmp/mibs/.index
+	addpredict /var/lib/net-snmp/mib_indexes
+
+	PHP_DESTDIR="${EPREFIX}/usr/$(get_libdir)/php${SLOT}"
+
+	# This is a global variable and should be in caps. It isn't because the
+	# phpconfutils eclass relies on exactly this name...
+	# for --with-libdir see bug #327025
+	my_conf="
+		--prefix="${PHP_DESTDIR}"
+		--mandir="${PHP_DESTDIR}"/man
+		--infodir="${PHP_DESTDIR}"/info
+		--libdir="${PHP_DESTDIR}"/lib
+		--with-libdir=$(get_libdir)
+		--without-pear
+		$(use_enable threads maintainer-zts)"
+
+	#                             extension		  USE flag        shared
+	my_conf+="
+	$(use_enable bcmath bcmath )
+	$(use_with bzip2 bz2 "${EPREFIX}"/usr)
+	$(use_enable calendar calendar )
+	$(use_enable ctype ctype )
+	$(use_with curl curl "${EPREFIX}"/usr)
+	$(use_enable xml dom )
+	$(use_with enchant enchant "${EPREFIX}"/usr)
+	$(use_enable exif exif )
+	$(use_enable fileinfo fileinfo )
+	$(use_enable filter filter )
+	$(use_enable ftp ftp )
+	$(use_with nls gettext "${EPREFIX}"/usr)
+	$(use_with gmp gmp "${EPREFIX}"/usr)
+	$(use_enable hash hash )
+	$(use_with mhash mhash "${EPREFIX}"/usr)
+	$(use_with iconv iconv $(use elibc_glibc || use elibc_musl || echo "${EPREFIX}"/usr))
+	$(use_enable intl intl )
+	$(use_enable ipv6 ipv6 )
+	$(use_enable json json )
+	$(use_with kerberos kerberos "${EPREFIX}"/usr)
+	$(use_enable xml libxml )
+	$(use_with xml libxml-dir "${EPREFIX}"/usr)
+	$(use_enable unicode mbstring )
+	$(use_with crypt mcrypt "${EPREFIX}"/usr)
+	$(use_with unicode onig "${EPREFIX}"/usr)
+	$(use_with ssl openssl "${EPREFIX}"/usr)
+	$(use_with ssl openssl-dir "${EPREFIX}"/usr)
+	$(use_enable pcntl pcntl )
+	$(use_enable phar phar )
+	$(use_enable pdo pdo )
+	$(use_enable opcache opcache )
+	$(use_with postgres pgsql "${EPREFIX}"/usr)
+	$(use_enable posix posix )
+	$(use_with spell pspell "${EPREFIX}"/usr)
+	$(use_with recode recode "${EPREFIX}"/usr)
+	$(use_enable simplexml simplexml )
+	$(use_enable sharedmem shmop )
+	$(use_with snmp snmp "${EPREFIX}"/usr)
+	$(use_enable soap soap )
+	$(use_enable sockets sockets )
+	$(use_with sqlite sqlite3 "${EPREFIX}"/usr)
+	$(use_enable sysvipc sysvmsg )
+	$(use_enable sysvipc sysvsem )
+	$(use_enable sysvipc sysvshm )
+	$(use_with systemd fpm-systemd)
+	$(use_with tidy tidy "${EPREFIX}"/usr)
+	$(use_enable tokenizer tokenizer )
+	$(use_enable wddx wddx )
+	$(use_enable xml xml )
+	$(use_enable xmlreader xmlreader )
+	$(use_enable xmlwriter xmlwriter )
+	$(use_with xmlrpc xmlrpc)
+	$(use_with xslt xsl "${EPREFIX}"/usr)
+	$(use_enable zip zip )
+	$(use_with zlib zlib "${EPREFIX}"/usr)
+	$(use_enable debug debug )"
+
+	# DBA support
+	if use cdb || use berkdb || use flatfile || use gdbm || use inifile \
+		|| use qdbm ; then
+		my_conf="${my_conf} --enable-dba${shared}"
+	fi
+
+	# DBA drivers support
+	my_conf+="
+	$(use_with cdb cdb)
+	$(use_with berkdb db4 ${EPREFIX}/usr)
+	$(use_enable flatfile flatfile )
+	$(use_with gdbm gdbm ${EPREFIX}/usr)
+	$(use_enable inifile inifile )
+	$(use_with qdbm qdbm ${EPREFIX}/usr)"
+
+	# Support for the GD graphics library
+	my_conf+="
+	$(use_with truetype freetype-dir ${EPREFIX}/usr)
+	$(use_enable cjk gd-jis-conv )
+	$(use_with gd jpeg-dir ${EPREFIX}/usr)
+	$(use_with gd png-dir ${EPREFIX}/usr)
+	$(use_with xpm xpm-dir ${EPREFIX}/usr)
+	$(use_with vpx vpx-dir ${EPREFIX}/usr)"
+	# enable gd last, so configure can pick up the previous settings
+	my_conf+="
+	$(use_with gd gd)"
+
+	# IMAP support
+	if use imap ; then
+		my_conf+="
+		$(use_with imap imap ${EPREFIX}/usr)
+		$(use_with ssl imap-ssl ${EPREFIX}/usr)"
+	fi
+
+	# Interbase/firebird support
+
+	if use firebird ; then
+		my_conf+="
+		$(use_with firebird interbase ${EPREFIX}/usr)"
+	fi
+
+	# LDAP support
+	if use ldap ; then
+		my_conf+="
+		$(use_with ldap ldap ${EPREFIX}/usr)
+		$(use_with ldap-sasl ldap-sasl ${EPREFIX}/usr)"
+	fi
+
+	# MySQL support
+	local mysqllib="mysqlnd"
+	local mysqlilib="mysqlnd"
+
+	my_conf+=" $(use_with mysqli mysqli $mysqlilib)"
+
+	local mysqlsock=" $(use_with mysql mysql-sock ${EPREFIX}/var/run/mysqld/mysqld.sock)"
+	if use mysql ; then
+		my_conf+="${mysqlsock}"
+	elif use mysqli ; then
+		my_conf+="${mysqlsock}"
+	fi
+
+	# ODBC support
+	if use odbc ; then
+		my_conf+="
+		$(use_with odbc unixODBC ${EPREFIX}/usr)"
+	fi
+
+	if use iodbc ; then
+		my_conf+="
+		$(use_with iodbc iodbc ${EPREFIX}/usr)"
+	fi
+
+	# Oracle support
+	if use oci8-instant-client ; then
+		my_conf+="
+		$(use_with oci8-instant-client oci8)"
+	fi
+
+	# PDO support
+	if use pdo ; then
+		my_conf+="
+		$(use_with mysql pdo-mysql ${mysqllib})
+		$(use_with postgres pdo-pgsql )
+		$(use_with sqlite pdo-sqlite ${EPREFIX}/usr)
+		$(use_with odbc pdo-odbc unixODBC,${EPREFIX}/usr)"
+		if use oci8-instant-client ; then
+			my_conf+="
+			$(use_with oci8-instant-client pdo-oci)"
+		fi
+	fi
+
+	# readline/libedit support
+	my_conf+="
+	$(use_with readline readline ${EPREFIX}/usr)
+	$(use_with libedit libedit ${EPREFIX}/usr)"
+
+	# Session support
+	if use session ; then
+		my_conf+="
+		$(use_with sharedmem mm ${EPREFIX}/usr)"
+	else
+		my_conf+="
+		$(use_enable session session )"
+	fi
+
+	# Use pic for shared modules such as apache2's mod_php
+	my_conf="${my_conf} --with-pic"
+
+	# we use the system copy of pcre
+	# --with-pcre-regex affects ext/pcre
+	# --with-pcre-dir affects ext/filter and ext/zip
+	my_conf="${my_conf} --with-pcre-regex=${EPREFIX}/usr --with-pcre-dir=${EPREFIX}/usr"
+
+	# Catch CFLAGS problems
+	# Fixes bug #14067.
+	# Changed order to run it in reverse for bug #32022 and #12021.
+	replace-cpu-flags "k6*" "i586"
+
+	# Support user-passed configuration parameters
+	my_conf="${my_conf} ${EXTRA_ECONF:-}"
+
+	# Support the Apache2 extras, they must be set globally for all
+	# SAPIs to work correctly, especially for external PHP extensions
+
+	mkdir -p "${WORKDIR}/sapis-build"
+	for one_sapi in $SAPIS ; do
+		use "${one_sapi}" || continue
+		php_set_ini_dir "${one_sapi}"
+
+		cp -r "${S}" "${WORKDIR}/sapis-build/${one_sapi}"
+		cd "${WORKDIR}/sapis-build/${one_sapi}"
+
+		sapi_conf="${my_conf} --with-config-file-path=${PHP_INI_DIR}
+			--with-config-file-scan-dir=${PHP_EXT_INI_DIR_ACTIVE}"
+
+		for sapi in $SAPIS ; do
+			case "$sapi" in
+				cli|cgi|embed|fpm)
+					if [[ "${one_sapi}" == "${sapi}" ]] ; then
+						sapi_conf="${sapi_conf} --enable-${sapi}"
+					else
+						sapi_conf="${sapi_conf} --disable-${sapi}"
+					fi
+					;;
+
+				apache2)
+					if [[ "${one_sapi}" == "${sapi}" ]] ; then
+						sapi_conf="${sapi_conf} --with-apxs2=${EPREFIX}/usr/sbin/apxs"
+					else
+						sapi_conf="${sapi_conf} --without-apxs2"
+					fi
+					;;
+			esac
+		done
+
+		econf ${sapi_conf}
+	done
+}
+
+src_compile() {
+	# snmp seems to run during src_compile, too (bug #324739)
+	addpredict /usr/share/snmp/mibs/.index
+	addpredict /var/lib/net-snmp/mib_indexes
+
+	for sapi in ${SAPIS} ; do
+		if use "${sapi}"; then
+			cd "${WORKDIR}/sapis-build/$sapi" || "Failed to change dir to ${WORKDIR}/sapis-build/$1"
+			emake || die "emake failed"
+		fi
+	done
+}
+
+src_install() {
+	# see bug #324739 for what happens when we don't have that
+	addpredict /usr/share/snmp/mibs/.index
+
+	# grab the first SAPI that got built and install common files from there
+	local first_sapi=""
+	for sapi in $SAPIS ; do
+		if use $sapi ; then
+			first_sapi=$sapi
+			break
+		fi
+	done
+
+	# Makefile forgets to create this before trying to write to it...
+	dodir "${PHP_DESTDIR#${EPREFIX}}/bin"
+
+	# Install php environment (without any sapis)
+	cd "${WORKDIR}/sapis-build/$first_sapi"
+	emake INSTALL_ROOT="${D}" \
+		install-build install-headers install-programs \
+		|| die "emake install failed"
+
+	local extension_dir="$("${ED}/${PHP_DESTDIR#${EPREFIX}}/bin/php-config" --extension-dir)"
+
+	# Create the directory where we'll put version-specific php scripts
+	keepdir /usr/share/php${PHP_MV}
+
+	local sapi="", file=""
+	local sapi_list=""
+
+	for sapi in ${SAPIS}; do
+		if use "${sapi}" ; then
+			einfo "Installing SAPI: ${sapi}"
+			cd "${WORKDIR}/sapis-build/${sapi}"
+
+			if [[ "${sapi}" == "apache2" ]] ; then
+				# We're specifically not using emake install-sapi as libtool
+				# may cause unnecessary relink failures (see bug #351266)
+				insinto "${PHP_DESTDIR#${EPREFIX}}/apache2/"
+				newins ".libs/libphp${PHP_MV}$(get_libname)" "libphp${PHP_MV}$(get_libname)"
+				keepdir "/usr/$(get_libdir)/apache2/modules"
+			else
+				# needed each time, php_install_ini would reset it
+				local dest="${PHP_DESTDIR#${EPREFIX}}"
+				into "${dest}"
+				case "$sapi" in
+					cli)
+						source="sapi/cli/php"
+						;;
+					cgi)
+						source="sapi/cgi/php-cgi"
+						;;
+					fpm)
+						source="sapi/fpm/php-fpm"
+						;;
+					embed)
+						source="libs/libphp${PHP_MV}$(get_libname)"
+						;;
+					*)
+						die "unhandled sapi in src_install"
+						;;
+				esac
+
+				if [[ "${source}" == *"$(get_libname)" ]]; then
+					dolib.so "${source}" || die "Unable to install ${sapi} sapi"
+				else
+					dobin "${source}" || die "Unable to install ${sapi} sapi"
+					local name="$(basename ${source})"
+					dosym "${dest}/bin/${name}" "/usr/bin/${name}${SLOT}"
+				fi
+			fi
+
+			php_install_ini "${sapi}"
+
+			# construct correct SAPI string for php-config
+			# thanks to ferringb for the bash voodoo
+			if [[ "${sapi}" == "apache2" ]]; then
+				sapi_list="${sapi_list:+${sapi_list} }apache2handler"
+			else
+				sapi_list="${sapi_list:+${sapi_list} }${sapi}"
+			fi
+		fi
+	done
+
+	# Installing opcache module
+	if use_if_iuse opcache ; then
+		dolib.so "modules/opcache$(get_libname)" || die "Unable to install opcache module"
+	fi
+
+	# Install env.d files
+	newenvd "${FILESDIR}/20php5-envd" \
+		"20php${SLOT}"
+	sed -e "s|/lib/|/$(get_libdir)/|g" -i \
+		"${ED}/etc/env.d/20php${SLOT}"
+	sed -e "s|php5|php${SLOT}|g" -i \
+		"${ED}/etc/env.d/20php${SLOT}"
+
+	# set php-config variable correctly (bug #278439)
+	sed -e "s:^\(php_sapis=\)\".*\"$:\1\"${sapi_list}\":" -i \
+		"${ED}/usr/$(get_libdir)/php${SLOT}/bin/php-config"
+
+	if use fpm ; then
+		if use systemd; then
+			systemd_newunit "${FILESDIR}/php-fpm_at.service" "php-fpm@${SLOT}.service"
+		else
+			systemd_newunit "${FILESDIR}/php-fpm_at-simple.service" "php-fpm@${SLOT}.service"
+		fi
+	fi
+}
+
+src_test() {
+	echo ">>> Test phase [test]: ${CATEGORY}/${PF}"
+	PHP_BIN="${WORKDIR}/sapis-build/cli/sapi/cli/php"
+	if [[ ! -x "${PHP_BIN}" ]] ; then
+		ewarn "Test phase requires USE=cli, skipping"
+		return
+	else
+		export TEST_PHP_EXECUTABLE="${PHP_BIN}"
+	fi
+
+	if [[ -x "${WORKDIR}/sapis/cgi/php-cgi" ]] ; then
+		export TEST_PHP_CGI_EXECUTABLE="${WORKDIR}/sapis/cgi/php-cgi"
+	fi
+
+	REPORT_EXIT_STATUS=1 "${TEST_PHP_EXECUTABLE}" -n  -d "session.save_path=${T}" \
+		"${WORKDIR}/sapis-build/cli/run-tests.php" -n -q -d "session.save_path=${T}"
+
+	for name in ${EXPECTED_TEST_FAILURES}; do
+		mv "${name}.out" "${name}.out.orig" 2>/dev/null
+	done
+
+	local failed="$(find -name '*.out')"
+	if [[ ${failed} != "" ]] ; then
+		ewarn "The following test cases failed unexpectedly:"
+		for name in ${failed}; do
+			ewarn "  ${name/.out/}"
+		done
+	else
+		einfo "No unexpected test failures, all fine"
+	fi
+
+	if [[ ${PHP_SHOW_UNEXPECTED_TEST_PASS} == "1" ]] ; then
+		local passed=""
+		for name in ${EXPECTED_TEST_FAILURES}; do
+			[[ -f "${name}.diff" ]] && continue
+			passed="${passed} ${name}"
+		done
+		if [[ ${passed} != "" ]] ; then
+			einfo "The following test cases passed unexpectedly:"
+			for name in ${passed}; do
+				ewarn "  ${passed}"
+			done
+		else
+			einfo "None of the known-to-fail tests passed, all fine"
+		fi
+	fi
+}
+
+pkg_postinst() {
+	# Output some general info to the user
+	if use apache2 ; then
+		APACHE2_MOD_DEFINE="PHP5"
+		APACHE2_MOD_CONF="70_mod_php5"  # actually provided by app-eselect/eselect-php
+		apache-module_pkg_postinst
+	fi
+
+	# Create the symlinks for php
+	for m in ${SAPIS}; do
+		[[ ${m} == 'embed' ]] && continue;
+		if use $m ; then
+			local ci=$(eselect php show $m)
+			if [[ -z $ci ]]; then
+				eselect php set $m php${SLOT}
+				einfo "Switched ${m} to use php:${SLOT}"
+				einfo
+			elif [[ $ci != "php${SLOT}" ]] ; then
+				elog "To switch $m to use php:${SLOT}, run"
+				elog "    eselect php set $m php${SLOT}"
+				elog
+			fi
+		fi
+	done
+
+	elog "Make sure that PHP_TARGETS in ${EPREFIX}/etc/make.conf includes php${SLOT/./-} in order"
+	elog "to compile extensions for the ${SLOT} ABI"
+	elog
+	if ! use readline && use cli ; then
+		ewarn "Note that in order to use php interactivly, you need to enable"
+		ewarn "the readline USE flag or php -a will hang"
+	fi
+	elog
+	elog "This ebuild installed a version of php.ini based on php.ini-${PHP_INI_VERSION} version."
+	elog "You can chose which version of php.ini to install by default by setting PHP_INI_VERSION to either"
+	elog "'production' or 'development' in ${EPREFIX}/etc/make.conf"
+	elog "Both versions of php.ini can be found in ${EPREFIX}/usr/share/doc/${PF}"
+
+	elog
+	elog "For more details on how minor version slotting works (PHP_TARGETS) please read the upgrade guide:"
+	elog "https://www.gentoo.org/proj/en/php/php-upgrading.xml"
+	elog
+}
+
+pkg_prerm() {
+	eselect php cleanup
+}
diff --git a/dev-lang/python/python-2.7.10-r1.ebuild b/dev-lang/python/python-2.7.10-r1.ebuild
new file mode 100644
index 000000000000..acdd808fd314
--- /dev/null
+++ b/dev-lang/python/python-2.7.10-r1.ebuild
@@ -0,0 +1,345 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+WANT_LIBTOOL="none"
+
+inherit autotools eutils flag-o-matic multilib pax-utils python-utils-r1 toolchain-funcs multiprocessing
+
+MY_P="Python-${PV}"
+PATCHSET_VERSION="2.7.10-0"
+
+DESCRIPTION="An interpreted, interactive, object-oriented programming language"
+HOMEPAGE="http://www.python.org/"
+SRC_URI="http://www.python.org/ftp/python/${PV}/${MY_P}.tar.xz
+	https://dev.gentoo.org/~floppym/python/python-gentoo-patches-${PATCHSET_VERSION}.tar.xz"
+
+LICENSE="PSF-2"
+SLOT="2.7"
+#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+IUSE="-berkdb build doc elibc_uclibc examples gdbm hardened ipv6 +ncurses +readline sqlite +ssl +threads tk +wide-unicode wininst +xml"
+
+# Do not add a dependency on dev-lang/python to this ebuild.
+# If you need to apply a patch which requires python for bootstrapping, please
+# run the bootstrap code on your dev box and include the results in the
+# patchset. See bug 447752.
+
+RDEPEND="app-arch/bzip2
+	>=sys-libs/zlib-1.1.3
+	virtual/libffi
+	virtual/libintl
+	xml? ( >=dev-libs/expat-2.1 )
+		berkdb? ( || (
+			sys-libs/db:5.3
+			sys-libs/db:5.2
+			sys-libs/db:5.1
+			sys-libs/db:5.0
+			sys-libs/db: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
+		) )
+		gdbm? ( sys-libs/gdbm[berkdb] )
+		ncurses? (
+			>=sys-libs/ncurses-5.2
+			readline? ( >=sys-libs/readline-4.1 )
+		)
+		sqlite? ( >=dev-db/sqlite-3.3.8:3 )
+		ssl? ( dev-libs/openssl )
+		tk? (
+			>=dev-lang/tk-8.0
+			dev-tcltk/blt
+			dev-tcltk/tix
+		)
+	!!<sys-apps/portage-2.1.9"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	>=sys-devel/autoconf-2.65
+	!sys-devel/gcc[libffi]"
+RDEPEND+=" !build? ( app-misc/mime-types )
+	doc? ( dev-python/python-docs:${SLOT} )"
+PDEPEND="app-eselect/eselect-python
+	app-admin/python-updater"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	if use berkdb; then
+		ewarn "'bsddb' module is out-of-date and no longer maintained inside"
+		ewarn "dev-lang/python. 'bsddb' and 'dbhash' modules have been additionally"
+		ewarn "removed in Python 3. A maintained alternative of 'bsddb3' module"
+		ewarn "is provided by dev-python/bsddb3."
+	else
+		if has_version "=${CATEGORY}/${PN}-${PV%%.*}*[berkdb]"; then
+			ewarn "You are migrating from =${CATEGORY}/${PN}-${PV%%.*}*[berkdb]"
+			ewarn "to =${CATEGORY}/${PN}-${PV%%.*}*[-berkdb]."
+			ewarn "You might need to migrate your databases."
+		fi
+	fi
+}
+
+src_prepare() {
+	# Ensure that internal copies of expat, libffi and zlib are not used.
+	rm -r Modules/expat || die
+	rm -r Modules/_ctypes/libffi* || die
+	rm -r Modules/zlib || die
+
+	if tc-is-cross-compiler; then
+		local EPATCH_EXCLUDE="*_regenerate_platform-specific_modules.patch"
+	fi
+
+	EPATCH_SUFFIX="patch" epatch "${WORKDIR}/patches"
+
+	# Fix for cross-compiling.
+	epatch "${FILESDIR}/python-2.7.5-nonfatal-compileall.patch"
+	epatch "${FILESDIR}/python-2.7.9-ncurses-pkg-config.patch"
+
+	sed -i -e "s:@@GENTOO_LIBDIR@@:$(get_libdir):g" \
+		Lib/distutils/command/install.py \
+		Lib/distutils/sysconfig.py \
+		Lib/site.py \
+		Lib/sysconfig.py \
+		Lib/test/test_site.py \
+		Makefile.pre.in \
+		Modules/Setup.dist \
+		Modules/getpath.c \
+		setup.py || die "sed failed to replace @@GENTOO_LIBDIR@@"
+
+	epatch_user
+
+	eautoreconf
+}
+
+src_configure() {
+		# dbm module can be linked against berkdb or gdbm.
+		# Defaults to gdbm when both are enabled, #204343.
+		local disable
+		use berkdb   || use gdbm || disable+=" dbm"
+		use berkdb   || disable+=" _bsddb"
+		use gdbm     || disable+=" gdbm"
+		use ncurses  || disable+=" _curses _curses_panel"
+		use readline || disable+=" readline"
+		use sqlite   || disable+=" _sqlite3"
+		use ssl      || export PYTHON_DISABLE_SSL="1"
+		use tk       || disable+=" _tkinter"
+		use xml      || disable+=" _elementtree pyexpat" # _elementtree uses pyexpat.
+		export PYTHON_DISABLE_MODULES="${disable}"
+
+		if ! use xml; then
+			ewarn "You have configured Python without XML support."
+			ewarn "This is NOT a recommended configuration as you"
+			ewarn "may face problems parsing any XML documents."
+		fi
+
+	if [[ -n "${PYTHON_DISABLE_MODULES}" ]]; then
+		einfo "Disabled modules: ${PYTHON_DISABLE_MODULES}"
+	fi
+
+	if [[ "$(gcc-major-version)" -ge 4 ]]; then
+		append-flags -fwrapv
+	fi
+
+	filter-flags -malign-double
+
+	[[ "${ARCH}" == "alpha" ]] && append-flags -fPIC
+
+	# https://bugs.gentoo.org/show_bug.cgi?id=50309
+	if is-flagq -O3; then
+		is-flagq -fstack-protector-all && replace-flags -O3 -O2
+		use hardened && replace-flags -O3 -O2
+	fi
+
+	if tc-is-cross-compiler; then
+		# Force some tests that try to poke fs paths.
+		export ac_cv_file__dev_ptc=no
+		export ac_cv_file__dev_ptmx=yes
+	fi
+
+	# Export CXX so it ends up in /usr/lib/python2.X/config/Makefile.
+	tc-export CXX
+	# The configure script fails to use pkg-config correctly.
+	# http://bugs.python.org/issue15506
+	export ac_cv_path_PKG_CONFIG=$(tc-getPKG_CONFIG)
+
+	# Set LDFLAGS so we link modules with -lpython2.7 correctly.
+	# Needed on FreeBSD unless Python 2.7 is already installed.
+	# Please query BSD team before removing this!
+	append-ldflags "-L."
+
+	local dbmliborder
+	if use gdbm; then
+		dbmliborder+="${dbmliborder:+:}gdbm"
+	fi
+	if use berkdb; then
+		dbmliborder+="${dbmliborder:+:}bdb"
+	fi
+
+	BUILD_DIR="${WORKDIR}/${CHOST}"
+	mkdir -p "${BUILD_DIR}" || die
+	cd "${BUILD_DIR}" || die
+
+	ECONF_SOURCE="${S}" OPT="" \
+	econf \
+		--with-fpectl \
+		--enable-shared \
+		$(use_enable ipv6) \
+		$(use_with threads) \
+		$(use wide-unicode && echo "--enable-unicode=ucs4" || echo "--enable-unicode=ucs2") \
+		--infodir='${prefix}/share/info' \
+		--mandir='${prefix}/share/man' \
+		--with-dbmliborder="${dbmliborder}" \
+		--with-libc="" \
+		--enable-loadable-sqlite-extensions \
+		--with-system-expat \
+		--with-system-ffi \
+		--without-ensurepip
+
+	if use threads && grep -q "#define POSIX_SEMAPHORES_NOT_ENABLED 1" pyconfig.h; then
+		eerror "configure has detected that the sem_open function is broken."
+		eerror "Please ensure that /dev/shm is mounted as a tmpfs with mode 1777."
+		die "Broken sem_open function (bug 496328)"
+	fi
+}
+
+src_compile() {
+	# Avoid invoking pgen for cross-compiles.
+	touch Include/graminit.h Python/graminit.c
+
+	cd "${BUILD_DIR}" || die
+	emake
+
+	# Work around bug 329499. See also bug 413751 and 457194.
+	if has_version dev-libs/libffi[pax_kernel]; then
+		pax-mark E python
+	else
+		pax-mark m python
+	fi
+}
+
+src_test() {
+	# Tests will not work when cross compiling.
+	if tc-is-cross-compiler; then
+		elog "Disabling tests due to crosscompiling."
+		return
+	fi
+
+	cd "${BUILD_DIR}" || die
+
+	# Skip failing tests.
+	local skipped_tests="distutils gdb"
+
+	for test in ${skipped_tests}; do
+		mv "${S}"/Lib/test/test_${test}.py "${T}"
+	done
+
+	# Rerun failed tests in verbose mode (regrtest -w).
+	emake test EXTRATESTOPTS="-w" < /dev/tty
+	local result="$?"
+
+	for test in ${skipped_tests}; do
+		mv "${T}/test_${test}.py" "${S}"/Lib/test
+	done
+
+	elog "The following tests have been skipped:"
+	for test in ${skipped_tests}; do
+		elog "test_${test}.py"
+	done
+
+	elog "If you would like to run them, you may:"
+	elog "cd '${EPREFIX}/usr/$(get_libdir)/python${SLOT}/test'"
+	elog "and run the tests separately."
+
+	if [[ "${result}" -ne 0 ]]; then
+		die "emake test failed"
+	fi
+}
+
+src_install() {
+	local libdir=${ED}/usr/$(get_libdir)/python${SLOT}
+
+	cd "${BUILD_DIR}" || die
+	emake DESTDIR="${D}" altinstall
+
+	sed -e "s/\(LDFLAGS=\).*/\1/" -i "${libdir}/config/Makefile" || die "sed failed"
+
+	# Backwards compat with Gentoo divergence.
+	dosym python${SLOT}-config /usr/bin/python-config-${SLOT}
+
+	# Fix collisions between different slots of Python.
+	mv "${ED}usr/bin/2to3" "${ED}usr/bin/2to3-${SLOT}"
+	mv "${ED}usr/bin/pydoc" "${ED}usr/bin/pydoc${SLOT}"
+	mv "${ED}usr/bin/idle" "${ED}usr/bin/idle${SLOT}"
+	rm -f "${ED}usr/bin/smtpd.py"
+
+		use berkdb || rm -r "${libdir}/"{bsddb,dbhash.py,test/test_bsddb*} || die
+		use sqlite || rm -r "${libdir}/"{sqlite3,test/test_sqlite*} || die
+		use tk || rm -r "${ED}usr/bin/idle${SLOT}" "${libdir}/"{idlelib,lib-tk} || die
+		use elibc_uclibc && rm -fr "${libdir}/"{bsddb/test,test}
+
+	use threads || rm -r "${libdir}/multiprocessing" || die
+	use wininst || rm -r "${libdir}/distutils/command/"wininst-*.exe || die
+
+	dodoc "${S}"/Misc/{ACKS,HISTORY,NEWS}
+
+	if use examples; then
+		insinto /usr/share/doc/${PF}/examples
+		doins -r "${S}"/Tools
+	fi
+	insinto /usr/share/gdb/auto-load/usr/$(get_libdir) #443510
+	local libname=$(printf 'e:\n\t@echo $(INSTSONAME)\ninclude Makefile\n' | \
+		emake --no-print-directory -s -f - 2>/dev/null)
+	newins "${S}"/Tools/gdb/libpython.py "${libname}"-gdb.py
+
+	newconfd "${FILESDIR}/pydoc.conf" pydoc-${SLOT}
+	newinitd "${FILESDIR}/pydoc.init" pydoc-${SLOT}
+	sed \
+		-e "s:@PYDOC_PORT_VARIABLE@:PYDOC${SLOT/./_}_PORT:" \
+		-e "s:@PYDOC@:pydoc${SLOT}:" \
+		-i "${ED}etc/conf.d/pydoc-${SLOT}" "${ED}etc/init.d/pydoc-${SLOT}" || die "sed failed"
+
+	# for python-exec
+	python_export python${SLOT} EPYTHON PYTHON PYTHON_SITEDIR
+
+	# if not using a cross-compiler, use the fresh binary
+	if ! tc-is-cross-compiler; then
+		local PYTHON=./python
+		local -x LD_LIBRARY_PATH=${LD_LIBRARY_PATH+${LD_LIBRARY_PATH}:}.
+	fi
+
+	echo "EPYTHON='${EPYTHON}'" > epython.py
+	python_domodule epython.py
+}
+
+pkg_preinst() {
+	if has_version "<${CATEGORY}/${PN}-${SLOT}" && ! has_version "${CATEGORY}/${PN}:2.7"; then
+		python_updater_warning="1"
+	fi
+}
+
+eselect_python_update() {
+	if [[ -z "$(eselect python show)" || ! -f "${EROOT}usr/bin/$(eselect python show)" ]]; then
+		eselect python update
+	fi
+
+	if [[ -z "$(eselect python show --python${PV%%.*})" || ! -f "${EROOT}usr/bin/$(eselect python show --python${PV%%.*})" ]]; then
+		eselect python update --python${PV%%.*}
+	fi
+}
+
+pkg_postinst() {
+	eselect_python_update
+
+	if [[ "${python_updater_warning}" == "1" ]]; then
+		ewarn "You have just upgraded from an older version of Python."
+		ewarn "You should switch active version of Python ${PV%%.*} and run"
+		ewarn "'python-updater [options]' to rebuild Python modules."
+	fi
+}
+
+pkg_postrm() {
+	eselect_python_update
+}
diff --git a/dev-lang/python/python-3.4.3-r1.ebuild b/dev-lang/python/python-3.4.3-r1.ebuild
new file mode 100644
index 000000000000..dc9399c47179
--- /dev/null
+++ b/dev-lang/python/python-3.4.3-r1.ebuild
@@ -0,0 +1,306 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+WANT_LIBTOOL="none"
+
+inherit autotools eutils flag-o-matic multilib pax-utils python-utils-r1 toolchain-funcs multiprocessing
+
+MY_P="Python-${PV/_/}"
+PATCHSET_VERSION="3.4.3-0"
+
+DESCRIPTION="An interpreted, interactive, object-oriented programming language"
+HOMEPAGE="http://www.python.org/"
+SRC_URI="http://www.python.org/ftp/python/${PV%_rc*}/${MY_P}.tar.xz
+	https://dev.gentoo.org/~floppym/python/python-gentoo-patches-${PATCHSET_VERSION}.tar.xz"
+
+LICENSE="PSF-2"
+SLOT="3.4"
+#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+IUSE="build elibc_uclibc examples gdbm hardened ipv6 +ncurses +readline sqlite +ssl +threads tk wininst +xml"
+
+# Do not add a dependency on dev-lang/python to this ebuild.
+# If you need to apply a patch which requires python for bootstrapping, please
+# run the bootstrap code on your dev box and include the results in the
+# patchset. See bug 447752.
+
+RDEPEND="app-arch/bzip2
+	app-arch/xz-utils
+	>=sys-libs/zlib-1.1.3
+	virtual/libffi
+	virtual/libintl
+	xml? ( >=dev-libs/expat-2.1 )
+		gdbm? ( sys-libs/gdbm[berkdb] )
+		ncurses? (
+			>=sys-libs/ncurses-5.2
+			readline? ( >=sys-libs/readline-4.1 )
+		)
+		sqlite? ( >=dev-db/sqlite-3.3.8:3 )
+		ssl? ( dev-libs/openssl )
+		tk? (
+			>=dev-lang/tk-8.0
+			dev-tcltk/blt
+			dev-tcltk/tix
+		)
+	!!<sys-apps/sandbox-2.6-r1"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	>=sys-devel/autoconf-2.65
+	!sys-devel/gcc[libffi]"
+RDEPEND+=" !build? ( app-misc/mime-types )"
+PDEPEND="app-eselect/eselect-python
+	app-admin/python-updater"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	# Ensure that internal copies of expat, libffi and zlib are not used.
+	rm -fr Modules/expat
+	rm -fr Modules/_ctypes/libffi*
+	rm -fr Modules/zlib
+
+	if tc-is-cross-compiler; then
+		# Invokes BUILDPYTHON, which is built for the host arch
+		local EPATCH_EXCLUDE="*_regenerate_platform-specific_modules.patch"
+	fi
+
+	EPATCH_SUFFIX="patch" epatch "${WORKDIR}/patches"
+	epatch "${FILESDIR}/${PN}-3.4.3-ncurses-pkg-config.patch"
+
+	sed -i -e "s:@@GENTOO_LIBDIR@@:$(get_libdir):g" \
+		Lib/distutils/command/install.py \
+		Lib/distutils/sysconfig.py \
+		Lib/site.py \
+		Lib/sysconfig.py \
+		Lib/test/test_site.py \
+		Makefile.pre.in \
+		Modules/Setup.dist \
+		Modules/getpath.c \
+		setup.py || die "sed failed to replace @@GENTOO_LIBDIR@@"
+
+	# Disable ABI flags.
+	sed -e "s/ABIFLAGS=\"\${ABIFLAGS}.*\"/:/" -i configure.ac || die "sed failed"
+
+	epatch_user
+
+	eautoreconf
+}
+
+src_configure() {
+		local disable
+		use gdbm     || disable+=" gdbm"
+		use ncurses  || disable+=" _curses _curses_panel"
+		use readline || disable+=" readline"
+		use sqlite   || disable+=" _sqlite3"
+		use ssl      || export PYTHON_DISABLE_SSL="1"
+		use tk       || disable+=" _tkinter"
+		use xml      || disable+=" _elementtree pyexpat" # _elementtree uses pyexpat.
+		export PYTHON_DISABLE_MODULES="${disable}"
+
+		if ! use xml; then
+			ewarn "You have configured Python without XML support."
+			ewarn "This is NOT a recommended configuration as you"
+			ewarn "may face problems parsing any XML documents."
+		fi
+
+	if [[ -n "${PYTHON_DISABLE_MODULES}" ]]; then
+		einfo "Disabled modules: ${PYTHON_DISABLE_MODULES}"
+	fi
+
+	if [[ "$(gcc-major-version)" -ge 4 ]]; then
+		append-flags -fwrapv
+	fi
+
+	filter-flags -malign-double
+
+	[[ "${ARCH}" == "alpha" ]] && append-flags -fPIC
+
+	# https://bugs.gentoo.org/show_bug.cgi?id=50309
+	if is-flagq -O3; then
+		is-flagq -fstack-protector-all && replace-flags -O3 -O2
+		use hardened && replace-flags -O3 -O2
+	fi
+
+	# Export CXX so it ends up in /usr/lib/python3.X/config/Makefile.
+	tc-export CXX
+	# The configure script fails to use pkg-config correctly.
+	# http://bugs.python.org/issue15506
+	export ac_cv_path_PKG_CONFIG=$(tc-getPKG_CONFIG)
+
+	# Set LDFLAGS so we link modules with -lpython3.2 correctly.
+	# Needed on FreeBSD unless Python 3.2 is already installed.
+	# Please query BSD team before removing this!
+	append-ldflags "-L."
+
+	local dbmliborder
+	if use gdbm; then
+		dbmliborder+="${dbmliborder:+:}gdbm"
+	fi
+
+	BUILD_DIR="${WORKDIR}/${CHOST}"
+	mkdir -p "${BUILD_DIR}" || die
+	cd "${BUILD_DIR}" || die
+
+	ECONF_SOURCE="${S}" OPT="" \
+	econf \
+		--with-fpectl \
+		--enable-shared \
+		$(use_enable ipv6) \
+		$(use_with threads) \
+		--infodir='${prefix}/share/info' \
+		--mandir='${prefix}/share/man' \
+		--with-computed-gotos \
+		--with-dbmliborder="${dbmliborder}" \
+		--with-libc="" \
+		--enable-loadable-sqlite-extensions \
+		--with-system-expat \
+		--with-system-ffi \
+		--without-ensurepip
+
+	if use threads && grep -q "#define POSIX_SEMAPHORES_NOT_ENABLED 1" pyconfig.h; then
+		eerror "configure has detected that the sem_open function is broken."
+		eerror "Please ensure that /dev/shm is mounted as a tmpfs with mode 1777."
+		die "Broken sem_open function (bug 496328)"
+	fi
+}
+
+src_compile() {
+	# Avoid invoking pgen for cross-compiles.
+	touch Include/graminit.h Python/graminit.c || die
+
+	cd "${BUILD_DIR}" || die
+	emake CPPFLAGS="" CFLAGS="" LDFLAGS=""
+
+	# Work around bug 329499. See also bug 413751 and 457194.
+	if has_version dev-libs/libffi[pax_kernel]; then
+		pax-mark E python
+	else
+		pax-mark m python
+	fi
+}
+
+src_test() {
+	# Tests will not work when cross compiling.
+	if tc-is-cross-compiler; then
+		elog "Disabling tests due to crosscompiling."
+		return
+	fi
+
+	cd "${BUILD_DIR}" || die
+
+	# Skip failing tests.
+	local skipped_tests="gdb"
+
+	for test in ${skipped_tests}; do
+		mv "${S}"/Lib/test/test_${test}.py "${T}"
+	done
+
+	local -x PYTHONDONTWRITEBYTECODE=
+	emake test EXTRATESTOPTS="-u-network" CPPFLAGS= CFLAGS= LDFLAGS= < /dev/tty
+	local result=$?
+
+	for test in ${skipped_tests}; do
+		mv "${T}/test_${test}.py" "${S}"/Lib/test
+	done
+
+	elog "The following tests have been skipped:"
+	for test in ${skipped_tests}; do
+		elog "test_${test}.py"
+	done
+
+	elog "If you would like to run them, you may:"
+	elog "cd '${EPREFIX}/usr/$(get_libdir)/python${SLOT}/test'"
+	elog "and run the tests separately."
+
+	if [[ ${result} -ne 0 ]]; then
+		die "emake test failed"
+	fi
+}
+
+src_install() {
+	local libdir=${ED}/usr/$(get_libdir)/python${SLOT}
+
+	cd "${BUILD_DIR}" || die
+
+	emake DESTDIR="${D}" altinstall
+
+	sed \
+		-e "s/\(CONFIGURE_LDFLAGS=\).*/\1/" \
+		-e "s/\(PY_LDFLAGS=\).*/\1/" \
+		-i "${libdir}/config-${SLOT}/Makefile" || die "sed failed"
+
+	# Backwards compat with Gentoo divergence.
+	dosym python${SLOT}-config /usr/bin/python-config-${SLOT}
+
+	# Fix collisions between different slots of Python.
+	rm -f "${ED}usr/$(get_libdir)/libpython3.so"
+
+		use elibc_uclibc && rm -fr "${libdir}/test"
+		use sqlite || rm -fr "${libdir}/"{sqlite3,test/test_sqlite*}
+		use tk || rm -fr "${ED}usr/bin/idle${SLOT}" "${libdir}/"{idlelib,tkinter,test/test_tk*}
+
+	use threads || rm -fr "${libdir}/multiprocessing"
+	use wininst || rm -f "${libdir}/distutils/command/"wininst-*.exe
+
+	dodoc "${S}"/Misc/{ACKS,HISTORY,NEWS}
+
+	if use examples; then
+		insinto /usr/share/doc/${PF}/examples
+		find "${S}"/Tools -name __pycache__ -print0 | xargs -0 rm -fr
+		doins -r "${S}"/Tools
+	fi
+	insinto /usr/share/gdb/auto-load/usr/$(get_libdir) #443510
+	local libname=$(printf 'e:\n\t@echo $(INSTSONAME)\ninclude Makefile\n' | \
+		emake --no-print-directory -s -f - 2>/dev/null)
+	newins "${S}"/Tools/gdb/libpython.py "${libname}"-gdb.py
+
+	newconfd "${FILESDIR}/pydoc.conf" pydoc-${SLOT}
+	newinitd "${FILESDIR}/pydoc.init" pydoc-${SLOT}
+	sed \
+		-e "s:@PYDOC_PORT_VARIABLE@:PYDOC${SLOT/./_}_PORT:" \
+		-e "s:@PYDOC@:pydoc${SLOT}:" \
+		-i "${ED}etc/conf.d/pydoc-${SLOT}" "${ED}etc/init.d/pydoc-${SLOT}" || die "sed failed"
+
+	# for python-exec
+	python_export python${SLOT} EPYTHON PYTHON PYTHON_SITEDIR
+
+	# if not using a cross-compiler, use the fresh binary
+	if ! tc-is-cross-compiler; then
+		local PYTHON=./python
+		local -x LD_LIBRARY_PATH=${LD_LIBRARY_PATH+${LD_LIBRARY_PATH}:}.
+	fi
+
+	echo "EPYTHON='${EPYTHON}'" > epython.py
+	python_domodule epython.py
+}
+
+pkg_preinst() {
+	if has_version "<${CATEGORY}/${PN}-${SLOT}" && ! has_version ">=${CATEGORY}/${PN}-${SLOT}_alpha"; then
+		python_updater_warning="1"
+	fi
+}
+
+eselect_python_update() {
+	if [[ -z "$(eselect python show)" || ! -f "${EROOT}usr/bin/$(eselect python show)" ]]; then
+		eselect python update
+	fi
+
+	if [[ -z "$(eselect python show --python${PV%%.*})" || ! -f "${EROOT}usr/bin/$(eselect python show --python${PV%%.*})" ]]; then
+		eselect python update --python${PV%%.*}
+	fi
+}
+
+pkg_postinst() {
+	eselect_python_update
+
+	if [[ "${python_updater_warning}" == "1" ]]; then
+		ewarn "You have just upgraded from an older version of Python."
+		ewarn
+		ewarn "Please adjust PYTHON_TARGETS (if so desired), and run emerge with the --newuse or --changed-use option to rebuild packages installing python modules."
+	fi
+}
+
+pkg_postrm() {
+	eselect_python_update
+}
diff --git a/dev-lang/rust/rust-1.2.0.ebuild b/dev-lang/rust/rust-1.2.0.ebuild
index cacdbd49b4ee..783db68f33d6 100644
--- a/dev-lang/rust/rust-1.2.0.ebuild
+++ b/dev-lang/rust/rust-1.2.0.ebuild
@@ -33,7 +33,8 @@ DEPEND="${CDEPEND}
 	${PYTHON_DEPS}
 	>=dev-lang/perl-5.0
 	clang? ( sys-devel/clang )
-	system-llvm? ( >=sys-devel/llvm-3.6.0[multitarget(-)] )
+	system-llvm? ( >=sys-devel/llvm-3.6.0[multitarget(-)]
+		<sys-devel/llvm-3.7.0[multitarget(-)] )
 "
 RDEPEND="${CDEPEND}"
 
diff --git a/dev-lang/vala/Manifest b/dev-lang/vala/Manifest
index a901431ed92e..07b57d1f609d 100644
--- a/dev-lang/vala/Manifest
+++ b/dev-lang/vala/Manifest
@@ -3,3 +3,4 @@ DIST vala-0.22.1.tar.xz 2690324 SHA256 92c61b94a427f281ba2537b69135a3be23248b153
 DIST vala-0.24.0.tar.xz 2666032 SHA256 22a37c977512c19cd29c373eaaef96cb2c994795d491106f32387f3f9d1e899c SHA512 a5897af7926affbdb018f0c31d4ec84d3322dc03e7cc64cb8b28c60fd4887a64b94760e061145aab5c36442a0d8665f3e3d584e09502e5f2587860d199317479 WHIRLPOOL d19cdf123abc3689c84c3746729a1452a8a9051271aaa64782db226ab4c276e963fa574900b4d145577d4fd0329cb29f73782b5f67ac1650ad1bdf663096e88f
 DIST vala-0.26.2.tar.xz 2682856 SHA256 37f13f430c56a93b6dac85239084681fd8f31c407d386809c43bc2f2836e03c4 SHA512 9c8dcb59f01e7f77c79f5f9ed996930c23444bddf22898ee775602e54f817b4cbd7c477c9a46a140acca57db9d8047b8fcffdb87f51276ff1719857faed6e535 WHIRLPOOL 492790367f93b0e913ccb1c3c04c098473020f68236f6ec3c70eeb85023bbb913ecef366793996e4952b79dadd4d3687e167d8b9eed87daac950c6d66d9153bc
 DIST vala-0.28.0.tar.xz 2720652 SHA256 0d9e3bd3f82145664875f7c29b2f544ba92d2814f75412948f774c0727fc977f SHA512 4f9adc4a3e672c25b508f5193bb1984e848dcaca059c2eb733e93ca7f58b5d58028a56f4234a62baa30ff50b63d87af24510334eba41630692c5f16e580bad88 WHIRLPOOL cfdd97f90f033b030d768ed66e78b5f86b6e1e50bac34806cd70dda168a5ff3192249d08ee9e020e0ea33d753b20aa69c6e269c65fa193a19e6ae4353912c7d2
+DIST vala-0.28.1.tar.xz 2721228 SHA256 1c0eaea6134b75af17221cb699f13d7236d607bb48192565c3d865c38f184f47 SHA512 41e58eebd7a333a928c52e6493f6677c63f9c6f57da7876b8e9edf138eaf5477a0d18266cdec6029d7c21cd711b709050a2ef99bc6b31ce618fbbef7e0b072af WHIRLPOOL 73b072552f0c8bd18db2255759b73a7711a6170a13c1c96503a3ffad48d3355cbda4064a2e9cefc42b3894d0a91c1979b943bc583f6bdb34ef8d52649ff726c4
diff --git a/dev-lang/vala/vala-0.28.1.ebuild b/dev-lang/vala/vala-0.28.1.ebuild
new file mode 100644
index 000000000000..0fab7d32b229
--- /dev/null
+++ b/dev-lang/vala/vala-0.28.1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+
+inherit gnome2
+
+DESCRIPTION="Compiler for the GObject type system"
+HOMEPAGE="https://wiki.gnome.org/Vala"
+
+LICENSE="LGPL-2.1"
+SLOT="0.28"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND="
+	>=dev-libs/glib-2.24:2
+	>=dev-libs/vala-common-${PV}
+"
+DEPEND="${RDEPEND}
+	!${CATEGORY}/${PN}:0
+	dev-libs/libxslt
+	sys-devel/flex
+	virtual/pkgconfig
+	virtual/yacc
+	test? (
+		dev-libs/dbus-glib
+		>=dev-libs/glib-2.26:2 )
+"
+
+src_configure() {
+	DOCS="AUTHORS ChangeLog MAINTAINERS NEWS README"
+	gnome2_src_configure --disable-unversioned
+}
diff --git a/dev-libs/angelscript/Manifest b/dev-libs/angelscript/Manifest
index 58592bbf1180..71be1c6442a8 100644
--- a/dev-libs/angelscript/Manifest
+++ b/dev-libs/angelscript/Manifest
@@ -1,2 +1,3 @@
 DIST angelscript_2.29.2.zip 1583192 SHA256 c5d549bcd2d04e0dbdfdeea1e1446a34bc9dc449efe0d6fb7fabfb98ee269a8b SHA512 76537a35bfa8f5f90d48a601f4cf1ff6cf8cd648c93b2ea17d3f0fbc7ccaa3d915bbe49d758916d0626a026ece8ecd1646bbb99db41d5a4c9f7c87d915c0d4ff WHIRLPOOL 1f24f56c7601b5f731a4e631f995668f268c26d57dce93944a758c5efd86ed651fd842b16419dad73eb8e7df641ccc5b4a226ccfc99fe1cc9a4c736e5d3076eb
 DIST angelscript_2.30.1.zip 1859238 SHA256 a492331d3ede33f96a3b882bb09fff0f71e6e9479f9b5d78fdcf08585038d583 SHA512 7669e6b9814e3fc913e84018786d5c142b5a60c5e3d5f4d01bfc2e794cf97e1fc347cb7258d7266a3b1d1f813fc6c1a2781680fbe1c1d2275e3fa1ed2a416e52 WHIRLPOOL fff8df92f53f18789d36f3023cdaeb91bbe804dd3e4f6e3ebb54f602a35b6421d0d400850d9bc4bb079cb2e1c25578e1443ecab524ba68b22af4c1f29f0a6429
+DIST angelscript_2.30.2.zip 1640151 SHA256 8c08774bc1ca683124b4996ab4459f4b2b10bdacd860e76f28fb5b504332d7d7 SHA512 a95d1d0050cc18d71ecb20655e74c196654c69b34ae3d1ade6d3a90b952b20851a6255c7285f019046e22d4c3fd1a6100c917a66a7c0d4e00636e4a2c6003bd5 WHIRLPOOL 157f724736bfea7dc31549cb76e88107108eccf046016e848a282cfe70b3bb8968e60424df192c8235eae8b663b0bc6dfea572a68b0404d7e61ea3eaa56d30e2
diff --git a/dev-libs/angelscript/angelscript-2.30.2.ebuild b/dev-libs/angelscript/angelscript-2.30.2.ebuild
new file mode 100644
index 000000000000..09f40c9d8127
--- /dev/null
+++ b/dev-libs/angelscript/angelscript-2.30.2.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit toolchain-funcs multilib-minimal
+
+DESCRIPTION="A flexible, cross-platform scripting library"
+HOMEPAGE="http://www.angelcode.com/angelscript/"
+SRC_URI="http://www.angelcode.com/angelscript/sdk/files/angelscript_${PV}.zip"
+
+LICENSE="ZLIB"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc static-libs"
+
+DEPEND="app-arch/unzip"
+
+S=${WORKDIR}/sdk
+
+pkg_setup() {
+	tc-export CXX AR RANLIB
+}
+
+src_prepare() {
+	multilib_copy_sources
+}
+
+multilib_src_compile() {
+	emake -C ${PN}/projects/gnuc
+}
+
+multilib_src_install() {
+	emake -C ${PN}/projects/gnuc LIBRARYDEST="${D}"/usr/$(get_libdir)/ INCLUDEDEST="${D}"/usr/include/ install
+	use static-libs || { rm "${D}"/usr/$(get_libdir)/libangelscript.a || die ; }
+}
+
+multilib_src_install_all() {
+	use doc && dohtml -r "${WORKDIR}"/sdk/docs/*
+}
diff --git a/dev-libs/appstream-glib/Manifest b/dev-libs/appstream-glib/Manifest
index 1d4cb8f281eb..059eae4f666c 100644
--- a/dev-libs/appstream-glib/Manifest
+++ b/dev-libs/appstream-glib/Manifest
@@ -1,2 +1,3 @@
 DIST appstream-glib-0.3.4.tar.xz 1814472 SHA256 97b948ad992cb985e5bed533446fb5d23632397cfe2833034e11d4c6b47199da SHA512 e128609980512a4975f1226dc41300480c43f311611ac935973e850a53562f7c770622239d4dd1a2ccd88430c2a305c64927a507125f6d7761c04d8ecf0ab502 WHIRLPOOL f80edc738ca5e07255625cc4322d483c2ae753e06d1f84eed1755239c2f87aff0fd13a60bd7bae2e4f4ffecc2760a6c301e98dd085a157448e89fcd91d6e614d
 DIST appstream-glib-0.4.0.tar.xz 1837552 SHA256 f4dee0e86549009f248d38eb643061e82ff0d542f06e1f4af6b36af2f97c2e13 SHA512 54769b47f11f8792ee85ab0922d8a256800c00558ca9e2fcaab30845e3fbd9f4a08d311608f0b600f8ad070d79d5227cd9ac4b644ef6d94e1772e4695c4f1afe WHIRLPOOL da036564be55acc4c0b3d5320f165ac98d6f4754ed74dda8b06d31c7bfd91b10ff3f4ff0d85b141bfa804391befcadecd714a9b110d422cf9286c899714ad58d
+DIST appstream-glib-0.5.0.tar.xz 1818388 SHA256 35d63ca31664918905c3de634766766d98dadcd99d7271fb319f6279b846bf36 SHA512 1c1a1f41d6911c73a25a83396fb183d99ee139378766235b8885ee68c2b738137d55c108e7ea3ec2853e5ac5f17936b87df554bea45a1c19db3caea5bcee5d0d WHIRLPOOL 2a26ce1685ed3c78242c0ef29b4e5dea95ba070e531503f00f378f36974a8e1aa858b66640fe48ccc7c1ace9619671ff3c6d71aaf78e81a6ef5b55ab2be64090
diff --git a/dev-libs/appstream-glib/appstream-glib-0.4.0.ebuild b/dev-libs/appstream-glib/appstream-glib-0.4.0.ebuild
index a1693fbcca6a..be358a0078cc 100644
--- a/dev-libs/appstream-glib/appstream-glib-0.4.0.ebuild
+++ b/dev-libs/appstream-glib/appstream-glib-0.4.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://people.freedesktop.org/~hughsient/${PN}/releases/${P}.tar.xz"
 
 LICENSE="LGPL-2.1"
 SLOT="0/7"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
 IUSE="+introspection nls"
 
 # FIXME: yaml is optional with --enable-dep11 but not
diff --git a/dev-libs/appstream-glib/appstream-glib-0.5.0.ebuild b/dev-libs/appstream-glib/appstream-glib-0.5.0.ebuild
new file mode 100644
index 000000000000..2afcbab45340
--- /dev/null
+++ b/dev-libs/appstream-glib/appstream-glib-0.5.0.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+
+inherit bash-completion-r1 gnome2
+
+DESCRIPTION="Provides GObjects and helper methods to read and write AppStream metadata"
+HOMEPAGE="http://people.freedesktop.org/~hughsient/appstream-glib/"
+SRC_URI="http://people.freedesktop.org/~hughsient/${PN}/releases/${P}.tar.xz"
+
+LICENSE="LGPL-2.1"
+SLOT="0/8" # soname version
+KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="+introspection nls"
+
+# FIXME: yaml is optional with --enable-dep11 but not
+# properly handled in autofoo bug#????
+RDEPEND="
+	app-arch/gcab
+	app-arch/libarchive
+	dev-db/sqlite:3
+	>=dev-libs/glib-2.16.1:2
+	>=media-libs/fontconfig-2.11
+	>=media-libs/freetype-2.4:2
+	>=net-libs/libsoup-2.24:2.4
+	>=x11-libs/gdk-pixbuf-2.14:2
+	x11-libs/gtk+:3
+	x11-libs/pango
+	dev-libs/libyaml
+	introspection? ( >=dev-libs/gobject-introspection-0.9.8:= )
+"
+DEPEND="${RDEPEND}
+	app-text/docbook-xml-dtd:4.3
+	dev-libs/libxslt
+	>=dev-util/gtk-doc-am-1.9
+	>=dev-util/intltool-0.40
+	>=sys-devel/gettext-0.17
+"
+# ${PN} superseeds appdata-tools, require dummy package until all ebuilds
+# are migrated to appstream-glib
+RDEPEND="${RDEPEND}
+	!<dev-util/appdata-tools-0.1.8-r1
+"
+PDEPEND=">=dev-util/appdata-tools-0.1.8-r1"
+
+src_configure() {
+	gnome2_src_configure \
+		--enable-builder \
+		--disable-ostree \
+		--disable-rpm \
+		--disable-static \
+		--enable-dep11 \
+		--enable-man \
+		$(use_enable nls) \
+		$(use_enable introspection) \
+		--with-bashcompletiondir="$(get_bashcompdir)"
+}
diff --git a/dev-libs/atk/atk-2.16.0-r1.ebuild b/dev-libs/atk/atk-2.16.0-r1.ebuild
index 1dd24002a998..3a7b42c03c1f 100644
--- a/dev-libs/atk/atk-2.16.0-r1.ebuild
+++ b/dev-libs/atk/atk-2.16.0-r1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://projects.gnome.org/accessibility/"
 
 LICENSE="LGPL-2+"
 SLOT="0"
-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 ~x86-winnt"
+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 ~x86-winnt"
 IUSE="+introspection nls test"
 
 RDEPEND="
diff --git a/dev-libs/cityhash/metadata.xml b/dev-libs/cityhash/metadata.xml
index 24cbb90cf0c4..18d1743c437e 100644
--- a/dev-libs/cityhash/metadata.xml
+++ b/dev-libs/cityhash/metadata.xml
@@ -5,4 +5,7 @@
 		<email>patrick@gentoo.org</email>
 		<name>Patrick Lauer</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">google/cityhash</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-libs/dietlibc/dietlibc-0.34_pre20140729.ebuild b/dev-libs/dietlibc/dietlibc-0.34_pre20140729.ebuild
index 9a5b416f9f4f..5bb42b8df2de 100644
--- a/dev-libs/dietlibc/dietlibc-0.34_pre20140729.ebuild
+++ b/dev-libs/dietlibc/dietlibc-0.34_pre20140729.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~patrick/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS=" ~alpha ~amd64 ~arm ~ia64 ~mips ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 ~arm ~ia64 ~mips ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 DEPEND=""
diff --git a/dev-libs/double-conversion/metadata.xml b/dev-libs/double-conversion/metadata.xml
index e74139346bfc..6b4f010d7c4a 100644
--- a/dev-libs/double-conversion/metadata.xml
+++ b/dev-libs/double-conversion/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci</herd>
-<longdescription lang='en'>
+  <herd>sci</herd>
+  <longdescription lang="en">
   This library consists of efficient conversion routines that have
   been extracted from the V8 JavaScript engine. The code has been
   refactored and improved so that it can be used more easily in other
   projects.
 </longdescription>
+  <upstream>
+    <remote-id type="github">google/double-conversion</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-libs/folks/folks-0.11.1.ebuild b/dev-libs/folks/folks-0.11.1.ebuild
index 2ac2c2cace5a..673640f94bf2 100644
--- a/dev-libs/folks/folks-0.11.1.ebuild
+++ b/dev-libs/folks/folks-0.11.1.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Folks"
 
 LICENSE="LGPL-2.1+"
 SLOT="0/25" # subslot = libfolks soname version
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-linux"
 
 # TODO: --enable-profiling
 # Vala isn't really optional, https://bugzilla.gnome.org/show_bug.cgi?id=701099
diff --git a/dev-libs/fribidi/Manifest b/dev-libs/fribidi/Manifest
index 71f161d1a110..fbeb02ab7967 100644
--- a/dev-libs/fribidi/Manifest
+++ b/dev-libs/fribidi/Manifest
@@ -1,2 +1,3 @@
 DIST fribidi-0.19.5.tar.bz2 625034 SHA256 501231e4260f83fccedae1cafe983a7de87082e3f5387e0b283d016f7f4cb428 SHA512 0a1216d3ff23f76dd90a1fa5b1eadd1276cfedc07bd636e345df23911d2e23bc3780a5ba2e32f2025b517f7137135fb3de6d337f872932466efe480ece364e43 WHIRLPOOL 5241696a5477f9cd1931213b14a27a21647ccabbaaaa0d2f8112a51efeeb7557b3b614bbb30500cd1ebf17fd4332007c22c42c1667e738dc2a2e94e1c182211a
 DIST fribidi-0.19.6.tar.bz2 639022 SHA256 cba8b7423c817e5adf50d28ec9079d14eafcec9127b9e8c8f1960c5ad585e17d SHA512 0661cf8e0985edfd5bf02c8de32432bf2faacadcaf35aef4e039a28f802a0468288e76b60231ebe7b54f909bd4d3ecc31a1fc94e83d434ae16dd21de6089629e WHIRLPOOL 71a1d1b44a4d58e6e4567f21a7e9f72a925f648a817d1c59d3815c8070e48656889c91afe2c842ca56e2bd8f33c783a4bbf16864514106614a12b8394c03e674
+DIST fribidi-0.19.7.tar.bz2 648299 SHA256 08222a6212bbc2276a2d55c3bf370109ae4a35b689acbc66571ad2a670595a8e SHA512 4bfdda43d961030a8a2ae2c98d2ca5d43c1b59633fa0987920c5537ec69f3f624204ceacc4c474d878cbb417ee2d9e708dfe169cfce6ad584d2f2d5122678b63 WHIRLPOOL 3f101ad3b2ebe6299a61e849a0f46f3393e12a6ade6239db7428772d1389222b76b2d1ad9c1d7c0bb75fc100e7f83859c3ef8b98be6f3e5178555be1920fcf52
diff --git a/dev-libs/fribidi/fribidi-0.19.7.ebuild b/dev-libs/fribidi/fribidi-0.19.7.ebuild
new file mode 100644
index 000000000000..b8ae061a84c3
--- /dev/null
+++ b/dev-libs/fribidi/fribidi-0.19.7.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+AUTOTOOLS_AUTORECONF=1
+
+inherit autotools autotools-multilib
+
+DESCRIPTION="A free implementation of the unicode bidirectional algorithm"
+HOMEPAGE="http://fribidi.org/"
+SRC_URI="http://fribidi.org/download/${P}.tar.bz2"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
+IUSE="static-libs"
+
+RESTRICT="test" #397347
+
+RDEPEND=">=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+DOCS=( AUTHORS NEWS README ChangeLog THANKS TODO )
+
+src_prepare() {
+	# Fix compability with dev-libs/glib >= 2.31
+	sed -i \
+		-e '/include/s:<glib/gstrfuncs.h>:<glib.h>:' \
+		-e '/include/s:<glib/gmem.h>:<glib.h>:' \
+		charset/fribidi-char-sets.c lib/mem.h || die
+
+	autotools-multilib_src_prepare
+}
+
+src_configure() {
+	# --with-glib=yes is required for #345621 to ensure "Requires: glib-2.0" is
+	# present in /usr/lib/pkgconfig/fribidi.pc
+	local myeconfargs=( --with-glib=yes )
+	autotools-multilib_src_configure
+}
diff --git a/dev-libs/fribidi/metadata.xml b/dev-libs/fribidi/metadata.xml
index d9cd2cad66c2..b71a05ca27aa 100644
--- a/dev-libs/fribidi/metadata.xml
+++ b/dev-libs/fribidi/metadata.xml
@@ -2,6 +2,6 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <maintainer>
-<email>maintainer-needed@gentoo.org</email>
+<email>amynka@gentoo.org</email>
 </maintainer>
 </pkgmetadata>
diff --git a/dev-libs/gdl/gdl-3.16.0.ebuild b/dev-libs/gdl/gdl-3.16.0.ebuild
index a50bb72d9341..0cb8bb77f58a 100644
--- a/dev-libs/gdl/gdl-3.16.0.ebuild
+++ b/dev-libs/gdl/gdl-3.16.0.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://developer.gnome.org/gdl/"
 LICENSE="LGPL-2.1+"
 SLOT="3/5" # subslot = libgdl-3 soname version
 IUSE="+introspection"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 
 RDEPEND="
 	dev-libs/glib:2
diff --git a/dev-libs/gjs/gjs-1.43.3.ebuild b/dev-libs/gjs/gjs-1.43.3.ebuild
index 3499b997d758..893dc4d616c0 100644
--- a/dev-libs/gjs/gjs-1.43.3.ebuild
+++ b/dev-libs/gjs/gjs-1.43.3.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Gjs"
 LICENSE="MIT || ( MPL-1.1 LGPL-2+ GPL-2+ )"
 SLOT="0"
 IUSE="+cairo examples gtk test"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 
 RDEPEND="
 	>=dev-libs/glib-2.36:2
diff --git a/dev-libs/glib/glib-2.44.1.ebuild b/dev-libs/glib/glib-2.44.1.ebuild
index d91e744dd360..2c29309d3ea8 100644
--- a/dev-libs/glib/glib-2.44.1.ebuild
+++ b/dev-libs/glib/glib-2.44.1.ebuild
@@ -32,7 +32,7 @@ REQUIRED_USE="
 	test? ( ${PYTHON_REQUIRED_USE} )
 "
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
 
 RDEPEND="
 	!<dev-util/gdbus-codegen-${PV}
diff --git a/dev-libs/gobject-introspection-common/gobject-introspection-common-1.44.0.ebuild b/dev-libs/gobject-introspection-common/gobject-introspection-common-1.44.0.ebuild
index a85f562b8b54..53918df6d61f 100644
--- a/dev-libs/gobject-introspection-common/gobject-introspection-common-1.44.0.ebuild
+++ b/dev-libs/gobject-introspection-common/gobject-introspection-common-1.44.0.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://live.gnome.org/GObjectIntrospection/"
 
 LICENSE="HPND"
 SLOT="0"
-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=""
 
 RDEPEND="!<${CATEGORY}/${PN/-common}-${PV}"
diff --git a/dev-libs/gobject-introspection/gobject-introspection-1.44.0.ebuild b/dev-libs/gobject-introspection/gobject-introspection-1.44.0.ebuild
index 9b2328495d66..dbd8a09d0138 100644
--- a/dev-libs/gobject-introspection/gobject-introspection-1.44.0.ebuild
+++ b/dev-libs/gobject-introspection/gobject-introspection-1.44.0.ebuild
@@ -19,7 +19,7 @@ REQUIRED_USE="
 	${PYTHON_REQUIRED_USE}
 	test? ( cairo )
 "
-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"
 
 # virtual/pkgconfig needed at runtime, bug #505408
 # We force glib and goi to be in sync by this way as explained in bug #518424
diff --git a/dev-libs/iksemel/metadata.xml b/dev-libs/iksemel/metadata.xml
index 437357762b59..e561cde924fa 100644
--- a/dev-libs/iksemel/metadata.xml
+++ b/dev-libs/iksemel/metadata.xml
@@ -4,5 +4,6 @@
 	<herd>net-im</herd>
 	<upstream>
 		<remote-id type="google-code">iksemel</remote-id>
+		<remote-id type="github">meduketto/iksemel</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-libs/jansson/jansson-2.7.ebuild b/dev-libs/jansson/jansson-2.7.ebuild
index 647f4dae76b6..87f06df5ae24 100644
--- a/dev-libs/jansson/jansson-2.7.ebuild
+++ b/dev-libs/jansson/jansson-2.7.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://www.digip.org/jansson/releases/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-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"
 IUSE="doc static-libs"
 
 DEPEND="doc? ( >=dev-python/sphinx-1.0.4 )"
diff --git a/dev-libs/libassuan/Manifest b/dev-libs/libassuan/Manifest
index 88fe96b935a6..3c5e3f5e21d8 100644
--- a/dev-libs/libassuan/Manifest
+++ b/dev-libs/libassuan/Manifest
@@ -3,3 +3,4 @@ DIST libassuan-2.1.2.tar.bz2 516026 SHA256 39f8a7c9349aaaf7ccd937b90660153ec4d2d
 DIST libassuan-2.1.3.tar.bz2 516087 SHA256 fa2170b353c928eb59610e0700c34947f1890634ddf7bcf2366c9c88b4f51d1a SHA512 ff9f6bd3287139307d42cf6fa9445487bf159db9dde2205246eaba2539f6162b419fdd53863929037550b71c2c12f14a39b60086fa6648e532bab498eee935a6 WHIRLPOOL 15e334f6f8ff9a06c72e57f5b7e550765bef96f0bf129c6066d7e066ff727c71e9bf790478350f02c13b5456baa087cbc52924114f67fe236326d6e0149b0fa6
 DIST libassuan-2.2.0.tar.bz2 516800 SHA256 7df58ed70be4b694f77efd1f3b3f103c6311b6b71e04a370382f9fe8204f6ec6 SHA512 716aa957408d51f518f3efd7238af34daab7889e2c2a8ca9611ba0c60db086062c4533c047caab4d41ef20d3cc6a7185ff2e4f06c9113eb177a961f20e877d99 WHIRLPOOL 576a834fdecab1b5adce68819a866067e9b5b6b02d96ea7060875712df547d7dab33ffb94f168b994240df867b4fc2797b51301ccb89113919d0d6661289b50d
 DIST libassuan-2.2.1.tar.bz2 542381 SHA256 949285bb79345362cb72a40c798defefc007031c60f2f10251720bf60a9de2de SHA512 7788c7c1163bbad659e308d7dc4254f9d6c27ff6bf9d9fad2ef7b9f07392799a3c0f57c6cbcc5f39aecaabb9ba8150044a969099b8d53d2eaf47d6022f1d9c4b WHIRLPOOL 2c6d8038b58122f0e2215f99f472400295c0f4a97dd65b4e0b78ffaf242d3e6b79d4eb3cec9e894e43ec307010e57111b5da08cce66bed2b37501680e6064772
+DIST libassuan-2.3.0.tar.bz2 544229 SHA256 87c999f572047fa22a79ab5de4c8a1a5a91f292561b69573965cac7751320452 SHA512 5d13d61b181faee2d61790318d0a4124ecec7616fa1720f90f3c697ca2f56911d7fc935a3ac99eb0c95c5a740e78968b70b28ade614abfd045a9c9ac6d1a14d6 WHIRLPOOL 7ed4e000c523e77f46a4abeb360abf6ae088773586eacb221228d893f61fe78ee0e5d5669bfffd16f96a2d8831b62e71cd0e30a32e96cc651ddf2ba57d52d471
diff --git a/dev-libs/libassuan/libassuan-2.2.1.ebuild b/dev-libs/libassuan/libassuan-2.2.1.ebuild
index c21c40b170cb..dae3724218c2 100644
--- a/dev-libs/libassuan/libassuan-2.2.1.ebuild
+++ b/dev-libs/libassuan/libassuan-2.2.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-3 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs"
 
 RDEPEND=">=dev-libs/libgpg-error-1.8"
diff --git a/dev-libs/libassuan/libassuan-2.3.0.ebuild b/dev-libs/libassuan/libassuan-2.3.0.ebuild
new file mode 100644
index 000000000000..c21c40b170cb
--- /dev/null
+++ b/dev-libs/libassuan/libassuan-2.3.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit libtool eutils
+
+DESCRIPTION="IPC library used by GnuPG and GPGME"
+HOMEPAGE="http://www.gnupg.org/related_software/libassuan/index.en.html"
+SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-3 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="static-libs"
+
+RDEPEND=">=dev-libs/libgpg-error-1.8"
+DEPEND="${RDEPEND}"
+
+DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO )
+
+src_prepare() {
+	default
+
+	# for Solaris .so
+	elibtoolize
+}
+
+src_configure() {
+	econf $(use_enable static-libs static)
+}
+
+src_install() {
+	default
+	# ppl need to use libassuan-config for --cflags and --libs
+	prune_libtool_files
+}
diff --git a/dev-libs/libcgroup/libcgroup-0.41-r1.ebuild b/dev-libs/libcgroup/libcgroup-0.41-r1.ebuild
deleted file mode 100644
index 439a6429920c..000000000000
--- a/dev-libs/libcgroup/libcgroup-0.41-r1.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit autotools eutils flag-o-matic linux-info pam
-
-DESCRIPTION="Tools and libraries to configure and manage kernel control groups"
-HOMEPAGE="http://libcg.sourceforge.net/"
-SRC_URI="mirror://sourceforge/project/libcg/${PN}/v${PV}/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="+daemon elibc_musl pam static-libs +tools"
-
-RDEPEND="pam? ( virtual/pam )"
-
-DEPEND="
-	${RDEPEND}
-	sys-devel/bison
-	sys-devel/flex
-	elibc_musl? ( sys-libs/fts-standalone )
-	"
-REQUIRED_USE="daemon? ( tools )"
-
-DOCS=(README_daemon README README_systemd INSTALL)
-pkg_setup() {
-	local CONFIG_CHECK="~CGROUPS"
-	if use daemon; then
-		CONFIG_CHECK="${CONFIG_CHECK} ~CONNECTOR ~PROC_EVENTS"
-	fi
-	linux-info_pkg_setup
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-replace_DECLS.patch
-	epatch "${FILESDIR}"/${P}-replace_INLCUDES.patch
-	epatch "${FILESDIR}"/${P}-reorder-headers.patch
-
-	# Change rules file location
-	sed -e 's:/etc/cgrules.conf:/etc/cgroup/cgrules.conf:' \
-		-i src/libcgroup-internal.h || die "sed failed"
-	sed -e 's:\(pam_cgroup_la_LDFLAGS.*\):\1\ -avoid-version:' \
-		-i src/pam/Makefile.am || die "sed failed"
-	sed -e 's#/var/run#/run#g' -i configure.in || die "sed failed"
-
-	eautoreconf
-}
-
-src_configure() {
-	local my_conf
-
-	if use pam; then
-		my_conf=" --enable-pam-module-dir=$(getpam_mod_dir) "
-	fi
-
-	use elibc_musl && append-ldflags "-lfts"
-	econf \
-		$(use_enable daemon) \
-		$(use_enable pam) \
-		$(use_enable tools) \
-		${my_conf}
-}
-
-src_test() {
-	# Use mount cgroup to build directory
-	# sandbox restricted to trivial build,
-	# possible kill Diego tanderbox ;)
-	true
-}
-
-src_install() {
-	prune_libtool_files --all
-
-	insinto /etc/cgroup
-	doins samples/*.conf || die
-
-	if use tools; then
-		newconfd "${FILESDIR}"/cgconfig.confd cgconfig || die
-		newinitd "${FILESDIR}"/cgconfig.initd cgconfig || die
-	fi
-
-	if use daemon; then
-		newconfd "${FILESDIR}"/cgred.confd cgred || die
-		newinitd "${FILESDIR}"/cgred.initd cgred || die
-	fi
-}
-
-pkg_postinst() {
-	elog "Read the kernel docs on cgroups, related schedulers, and the"
-	elog "block I/O controllers.  The Redhat Resource Management Guide"
-	elog "is also helpful.  DO NOT enable the cgroup namespace subsytem"
-	elog "if you want a custom config, rule processing, etc.  This option"
-	elog "should only be enabled for a VM environment.  The UID wildcard"
-	elog "rules seem to work only without a custom config (since wildcards"
-	elog "don't work in config blocks).  Specific user-id configs *do*"
-	elog "work, but be careful about how the mem limits add up if using"
-	elog "the memory.limit_* directives.  There should be a basic task"
-	elog "partitioning into the default group when running cgred with no"
-	elog "specific config blocks or rules (other than the mount directive)."
-	elog "See the docs for the pam module config, and as always, RTFM..."
-}
diff --git a/dev-libs/libcgroup/libcgroup-0.41-r2.ebuild b/dev-libs/libcgroup/libcgroup-0.41-r2.ebuild
new file mode 100644
index 000000000000..ab19abc21d6f
--- /dev/null
+++ b/dev-libs/libcgroup/libcgroup-0.41-r2.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit autotools eutils flag-o-matic linux-info pam
+
+DESCRIPTION="Tools and libraries to configure and manage kernel control groups"
+HOMEPAGE="http://libcg.sourceforge.net/"
+SRC_URI="mirror://sourceforge/project/libcg/${PN}/v${PV}/${P}.tar.bz2"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="+daemon elibc_musl pam static-libs +tools"
+
+RDEPEND="pam? ( virtual/pam )"
+
+DEPEND="
+	${RDEPEND}
+	sys-devel/bison
+	sys-devel/flex
+	elibc_musl? ( sys-libs/fts-standalone )
+	"
+REQUIRED_USE="daemon? ( tools )"
+
+DOCS=(README_daemon README README_systemd INSTALL)
+pkg_setup() {
+	local CONFIG_CHECK="~CGROUPS"
+	if use daemon; then
+		CONFIG_CHECK="${CONFIG_CHECK} ~CONNECTOR ~PROC_EVENTS"
+	fi
+	linux-info_pkg_setup
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-replace_DECLS.patch
+	epatch "${FILESDIR}"/${P}-replace_INLCUDES.patch
+	epatch "${FILESDIR}"/${P}-reorder-headers.patch
+
+	# Change rules file location
+	sed -e 's:/etc/cgrules.conf:/etc/cgroup/cgrules.conf:' \
+		-i src/libcgroup-internal.h || die "sed failed"
+	sed -e 's:\(pam_cgroup_la_LDFLAGS.*\):\1\ -avoid-version:' \
+		-i src/pam/Makefile.am || die "sed failed"
+	sed -e 's#/var/run#/run#g' -i configure.in || die "sed failed"
+
+	eautoreconf
+}
+
+src_configure() {
+	local my_conf
+
+	if use pam; then
+		my_conf=" --enable-pam-module-dir=$(getpam_mod_dir) "
+	fi
+
+	use elibc_musl && append-ldflags "-lfts"
+	econf \
+		$(use_enable static-libs static) \
+		$(use_enable daemon) \
+		$(use_enable pam) \
+		$(use_enable tools) \
+		${my_conf}
+}
+
+src_test() {
+	# Use mount cgroup to build directory
+	# sandbox restricted to trivial build,
+	# possible kill Diego tanderbox ;)
+	true
+}
+
+src_install() {
+	default
+	prune_libtool_files --all
+
+	insinto /etc/cgroup
+	doins samples/*.conf || die
+
+	if use tools; then
+		newconfd "${FILESDIR}"/cgconfig.confd cgconfig || die
+		newinitd "${FILESDIR}"/cgconfig.initd cgconfig || die
+	fi
+
+	if use daemon; then
+		newconfd "${FILESDIR}"/cgred.confd cgred || die
+		newinitd "${FILESDIR}"/cgred.initd cgred || die
+	fi
+}
+
+pkg_postinst() {
+	elog "Read the kernel docs on cgroups, related schedulers, and the"
+	elog "block I/O controllers.  The Redhat Resource Management Guide"
+	elog "is also helpful.  DO NOT enable the cgroup namespace subsytem"
+	elog "if you want a custom config, rule processing, etc.  This option"
+	elog "should only be enabled for a VM environment.  The UID wildcard"
+	elog "rules seem to work only without a custom config (since wildcards"
+	elog "don't work in config blocks).  Specific user-id configs *do*"
+	elog "work, but be careful about how the mem limits add up if using"
+	elog "the memory.limit_* directives.  There should be a basic task"
+	elog "partitioning into the default group when running cgred with no"
+	elog "specific config blocks or rules (other than the mount directive)."
+	elog "See the docs for the pam module config, and as always, RTFM..."
+}
diff --git a/dev-libs/libdivsufsort/metadata.xml b/dev-libs/libdivsufsort/metadata.xml
index 5cb9324943ab..4b9870736208 100644
--- a/dev-libs/libdivsufsort/metadata.xml
+++ b/dev-libs/libdivsufsort/metadata.xml
@@ -5,4 +5,7 @@
 		<email>mgorny@gentoo.org</email>
 		<name>Michał Górny</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">y-256/libdivsufsort</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-libs/libdnet/metadata.xml b/dev-libs/libdnet/metadata.xml
index fb093adfd4cc..08918c9b021a 100644
--- a/dev-libs/libdnet/metadata.xml
+++ b/dev-libs/libdnet/metadata.xml
@@ -4,5 +4,6 @@
 	<herd>netmon</herd>
 	<upstream>
 		<remote-id type="google-code">libdnet</remote-id>
+		<remote-id type="github">dugsong/libdnet</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-libs/libev/libev-4.19.ebuild b/dev-libs/libev/libev-4.19.ebuild
index 8a7a142ff5e9..8699eba2a935 100644
--- a/dev-libs/libev/libev-4.19.ebuild
+++ b/dev-libs/libev/libev-4.19.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://dist.schmorp.de/libev/${P}.tar.gz
 
 LICENSE="|| ( BSD GPL-2 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="elibc_glibc static-libs"
 
 # Bug #283558
diff --git a/dev-libs/libexplain/Manifest b/dev-libs/libexplain/Manifest
index 844d82d604c3..e78ffb63e620 100644
--- a/dev-libs/libexplain/Manifest
+++ b/dev-libs/libexplain/Manifest
@@ -1,2 +1 @@
-DIST libexplain-1.3.tar.gz 4742321 SHA256 18b76bd95f9476edc627ae3a3414e364e14c7f461df0c7925919fc9bddce643a SHA512 2af805f8f51912ad2d74326df3b6e7f5423a9af68a930c8f765eb839d2348a4c8e176c81eb6c953795764d08faff97d71132e68fcfcf09242575b0eab7b53120 WHIRLPOOL 83258f5432b0eb374c808e8696c99d8b6798dc87887f18582d57d23668d976e81c2e9d0212852153b00a59ca71f3f63b8ddd110759a3e34a79868d97a98aa20a
 DIST libexplain-1.4.tar.gz 4770006 SHA256 28863b65eccc74934e237cac41364cb3c1802c36c9e2318ed0417460fee83f80 SHA512 c236732f57d0688fed173c27474a00a39c9ac6d5dfbd22f3b68b5d0fff7a70fb130bcedbeb174767f4fd2c012148025e92635cc8df2b958774a3cfba58e6ff2c WHIRLPOOL ce3131c68d57c3d867960eaf2451d5aed152276c85e0182fee70b6499ebbee29ae0fea6d1a84aaefa927c9b983677953003b1a253e54ab3fc516d2b70dc3a3c1
diff --git a/dev-libs/libexplain/libexplain-1.3.ebuild b/dev-libs/libexplain/libexplain-1.3.ebuild
deleted file mode 100644
index 3dbe8fd2aab3..000000000000
--- a/dev-libs/libexplain/libexplain-1.3.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-AUTOTOOLS_AUTORECONF=yes
-AUTOTOOLS_IN_SOURCE_BUILD=1
-
-inherit autotools-utils
-
-DESCRIPTION="Library which may be used to explain Unix and Linux system call errors"
-HOMEPAGE="http://libexplain.sourceforge.net/"
-SRC_URI="http://libexplain.sourceforge.net/${P}.tar.gz"
-
-SLOT="0"
-KEYWORDS="amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-LICENSE="GPL-3 LGPL-3"
-IUSE="doc static-libs"
-
-RDEPEND="
-	sys-libs/libcap
-	>=sys-libs/glibc-2.11
-	sys-process/lsof"
-DEPEND="${RDEPEND}
-	>=sys-kernel/linux-headers-2.6.35
-	app-text/ghostscript-gpl
-	sys-apps/groff
-"
-
-DOCS=( README )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.45-configure.patch
-)
-
-src_prepare() {
-	# Portage incompatible test
-	sed \
-		-e '/t0524a/d' \
-		-e '/t0363a/d' \
-		-i Makefile.in || die
-
-	cp "${S}"/etc/configure.ac "${S}" || die
-
-	autotools-utils_src_prepare
-}
-
-src_compile() {
-	autotools-utils_src_compile
-	use doc && autotools-utils_src_compile all-doc
-}
diff --git a/dev-libs/libexplain/libexplain-1.4.ebuild b/dev-libs/libexplain/libexplain-1.4.ebuild
index 3fe85c83ee1a..d46c1d7f5412 100644
--- a/dev-libs/libexplain/libexplain-1.4.ebuild
+++ b/dev-libs/libexplain/libexplain-1.4.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="http://libexplain.sourceforge.net/"
 SRC_URI="http://libexplain.sourceforge.net/${P}.tar.gz"
 
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 LICENSE="GPL-3 LGPL-3"
 IUSE="static-libs"
 
diff --git a/dev-libs/libgcrypt/Manifest b/dev-libs/libgcrypt/Manifest
index 536d9dca6832..608b99b6d2ef 100644
--- a/dev-libs/libgcrypt/Manifest
+++ b/dev-libs/libgcrypt/Manifest
@@ -1,2 +1,3 @@
 DIST libgcrypt-1.5.4.tar.bz2 1512982 SHA256 d5f88d9f41a46953dc250cdb8575129b37ee2208401b7fa338c897f667c7fb33 SHA512 fe7e1d07eb10ee4ea8054bc955c35dc4b2109db645a08a6fa7757bf1e77a612e03c0838f9766086f04270b3621f34ccae0d6333f117cff204ccad9018c8a7908 WHIRLPOOL 221082d028a90235a3ddcc774b1772a8b8daec989a24b341491849e653e2ecb5cb0e3c8989a3f426524e39b28ebbe1b48532d5d9de7c54f4bdc19b450e22e4dc
 DIST libgcrypt-1.6.3.tar.bz2 2494052 SHA256 41b4917b93ae34c6a0e2127378d7a4d66d805a2a86a09911d4f9bd871db7025f SHA512 09a84fcc4d3d755df21f46302a549af4ba788d829ff7fa0cf65eeec033bc3744503f8fe3f4be55a51cc17b1b1b487736c328d7d7bc909f13139600236298c549 WHIRLPOOL dd331afed5c8116df8a55742a7b559791c554a97c32983d64ab196a6d47c2d6bd7e15f8a63dda43947961bb269963185b98927ff0695c3f6d3b939face41e450
+DIST libgcrypt-1.6.4.tar.bz2 2549820 SHA256 c9bc2c7fe2e5f4ea13b0c74f9d24bcbb1ad889bb39297d8082aebf23f4336026 SHA512 d2abc81fc3e3acf58f3bf18db449bfb4bdbc28fe62f695276ddd35f34434996b0d686bb48a4724e5134c80ea6cab08ce04f4a0989cb9a72f2497ec833bb24df1 WHIRLPOOL 708de5d55845177aa38dc227920dd64eeef8105427d5c88b8196ca47978f577d57f3cd85cd4627af6574e6ab780b815c1cbc8c8ad02aaba72ef176810f7a8865
diff --git a/dev-libs/libgcrypt/libgcrypt-1.5.4.ebuild b/dev-libs/libgcrypt/libgcrypt-1.5.4.ebuild
deleted file mode 100644
index ba7b57329c1c..000000000000
--- a/dev-libs/libgcrypt/libgcrypt-1.5.4.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-AUTOTOOLS_AUTORECONF=1
-
-inherit autotools-utils
-
-DESCRIPTION="General purpose crypto library based on the code used in GnuPG"
-HOMEPAGE="http://www.gnupg.org/"
-SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1 MIT"
-SLOT="0/11" # subslot = soname major version
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="static-libs"
-
-RDEPEND=">=dev-libs/libgpg-error-1.8"
-DEPEND="${RDEPEND}"
-
-DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.5.0-uscore.patch
-	"${FILESDIR}"/${PN}-multilib-syspath.patch
-	"${FILESDIR}"/${P}-clang-arm.patch
-)
-
-src_configure() {
-	local myeconfargs=(
-		--disable-padlock-support # bug 201917
-		--disable-dependency-tracking
-		--enable-noexecstack
-		--disable-O-flag-munging
-		$(use_enable static-libs static)
-
-		# disabled due to various applications requiring privileges
-		# after libgcrypt drops them (bug #468616)
-		--without-capabilities
-
-		# http://trac.videolan.org/vlc/ticket/620
-		# causes bus-errors on sparc64-solaris
-		$([[ ${CHOST} == *86*-darwin* ]] && echo "--disable-asm")
-		$([[ ${CHOST} == sparcv9-*-solaris* ]] && echo "--disable-asm")
-	)
-	autotools-utils_src_configure
-}
diff --git a/dev-libs/libgcrypt/libgcrypt-1.6.3-r3.ebuild b/dev-libs/libgcrypt/libgcrypt-1.6.3-r3.ebuild
deleted file mode 100644
index 6f5f5b5c5dfb..000000000000
--- a/dev-libs/libgcrypt/libgcrypt-1.6.3-r3.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-AUTOTOOLS_AUTORECONF=1
-WANT_AUTOMAKE=1.14
-
-inherit autotools-multilib flag-o-matic
-
-DESCRIPTION="General purpose crypto library based on the code used in GnuPG"
-HOMEPAGE="http://www.gnupg.org/"
-SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1 MIT"
-SLOT="0/20" # subslot = soname major version
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc static-libs"
-
-RDEPEND=">=dev-libs/libgpg-error-1.12[${MULTILIB_USEDEP}]
-	abi_x86_32? (
-		!<=app-emulation/emul-linux-x86-baselibs-20131008-r19
-		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32]
-	)"
-DEPEND="${RDEPEND}
-	doc? ( sys-apps/texinfo )"
-
-DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.6.1-uscore.patch
-	"${FILESDIR}"/${PN}-multilib-syspath.patch
-	"${FILESDIR}"/${P}-freebsd-mpi.patch
-)
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/libgcrypt-config
-)
-
-multilib_src_configure() {
-	if [[ ${CHOST} == *86*-solaris* ]] ; then
-		# ASM code uses GNU ELF syntax, divide in particular, we need to
-		# allow this via ASFLAGS, since we don't have a flag-o-matic
-		# function for that, we'll have to abuse cflags for this
-		append-cflags -Wa,--divide
-	fi
-	local myeconfargs=(
-		--disable-padlock-support # bug 201917
-		--disable-dependency-tracking
-		--enable-noexecstack
-		--disable-O-flag-munging
-		$(use_enable static-libs static)
-
-		# disabled due to various applications requiring privileges
-		# after libgcrypt drops them (bug #468616)
-		--without-capabilities
-
-		# http://trac.videolan.org/vlc/ticket/620
-		# causes bus-errors on sparc64-solaris
-		$([[ ${CHOST} == *86*-darwin* ]] && echo "--disable-asm")
-		$([[ ${CHOST} == sparcv9-*-solaris* ]] && echo "--disable-asm")
-	)
-	autotools-utils_src_configure
-}
-
-multilib_src_compile() {
-	emake
-	multilib_is_native_abi && use doc && emake -C doc gcrypt.pdf
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" install
-	multilib_is_native_abi && use doc && dodoc doc/gcrypt.pdf
-}
diff --git a/dev-libs/libgcrypt/libgcrypt-1.6.3-r4.ebuild b/dev-libs/libgcrypt/libgcrypt-1.6.3-r4.ebuild
index 73fe172d1b92..e08a6617c06a 100644
--- a/dev-libs/libgcrypt/libgcrypt-1.6.3-r4.ebuild
+++ b/dev-libs/libgcrypt/libgcrypt-1.6.3-r4.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1 MIT"
 SLOT="0/20" # subslot = soname major version
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc static-libs +threads"
 
 RDEPEND=">=dev-libs/libgpg-error-1.12[${MULTILIB_USEDEP}]
@@ -23,7 +23,7 @@ RDEPEND=">=dev-libs/libgpg-error-1.12[${MULTILIB_USEDEP}]
 		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32]
 	)"
 DEPEND="${RDEPEND}
-	doc? ( sys-apps/texinfo )"
+	doc? ( virtual/texi2dvi )"
 
 DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO )
 
@@ -66,7 +66,7 @@ multilib_src_configure() {
 
 multilib_src_compile() {
 	emake
-	multilib_is_native_abi && use doc && emake -C doc gcrypt.pdf
+	multilib_is_native_abi && use doc && VARTEXFONTS="${T}/fonts" emake -C doc gcrypt.pdf
 }
 
 multilib_src_install() {
diff --git a/dev-libs/libgcrypt/libgcrypt-1.6.3-r5.ebuild b/dev-libs/libgcrypt/libgcrypt-1.6.3-r5.ebuild
new file mode 100644
index 000000000000..21d6356857f4
--- /dev/null
+++ b/dev-libs/libgcrypt/libgcrypt-1.6.3-r5.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+AUTOTOOLS_AUTORECONF=1
+WANT_AUTOMAKE=1.14
+
+inherit autotools-multilib flag-o-matic
+
+DESCRIPTION="General purpose crypto library based on the code used in GnuPG"
+HOMEPAGE="http://www.gnupg.org/"
+SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
+
+LICENSE="LGPL-2.1 MIT"
+SLOT="0/20" # subslot = soname major version
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc static-libs +threads"
+
+RDEPEND=">=dev-libs/libgpg-error-1.12[${MULTILIB_USEDEP}]
+	abi_x86_32? (
+		!<=app-emulation/emul-linux-x86-baselibs-20131008-r19
+		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32]
+	)"
+DEPEND="${RDEPEND}
+	doc? ( virtual/texi2dvi )"
+
+DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.6.1-uscore.patch
+	"${FILESDIR}"/${PN}-multilib-syspath.patch
+	"${FILESDIR}"/${P}-freebsd-mpi.patch
+)
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/libgcrypt-config
+)
+
+multilib_src_configure() {
+	if [[ ${CHOST} == *86*-solaris* ]] ; then
+		# ASM code uses GNU ELF syntax, divide in particular, we need to
+		# allow this via ASFLAGS, since we don't have a flag-o-matic
+		# function for that, we'll have to abuse cflags for this
+		append-cflags -Wa,--divide
+	fi
+	local myeconfargs=(
+		--disable-dependency-tracking
+		--enable-noexecstack
+		--disable-O-flag-munging
+		$(use_enable static-libs static)
+		$(use_enable threads)
+
+		# disabled due to various applications requiring privileges
+		# after libgcrypt drops them (bug #468616)
+		--without-capabilities
+
+		# http://trac.videolan.org/vlc/ticket/620
+		# causes bus-errors on sparc64-solaris
+		$([[ ${CHOST} == *86*-darwin* ]] && echo "--disable-asm")
+		$([[ ${CHOST} == sparcv9-*-solaris* ]] && echo "--disable-asm")
+	)
+	autotools-utils_src_configure
+}
+
+multilib_src_compile() {
+	emake
+	multilib_is_native_abi && use doc && VARTEXFONTS="${T}/fonts" emake -C doc gcrypt.pdf
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" install
+	multilib_is_native_abi && use doc && dodoc doc/gcrypt.pdf
+}
diff --git a/dev-libs/libgcrypt/libgcrypt-1.6.4.ebuild b/dev-libs/libgcrypt/libgcrypt-1.6.4.ebuild
new file mode 100644
index 000000000000..226009c17381
--- /dev/null
+++ b/dev-libs/libgcrypt/libgcrypt-1.6.4.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+AUTOTOOLS_AUTORECONF=1
+WANT_AUTOMAKE=1.14
+
+inherit autotools-multilib flag-o-matic
+
+DESCRIPTION="General purpose crypto library based on the code used in GnuPG"
+HOMEPAGE="http://www.gnupg.org/"
+SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
+
+LICENSE="LGPL-2.1 MIT"
+SLOT="0/20" # subslot = soname major version
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc static-libs +threads"
+
+RDEPEND=">=dev-libs/libgpg-error-1.12[${MULTILIB_USEDEP}]
+	abi_x86_32? (
+		!<=app-emulation/emul-linux-x86-baselibs-20131008-r19
+		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32]
+	)"
+DEPEND="${RDEPEND}
+	doc? ( virtual/texi2dvi )"
+
+DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.6.1-uscore.patch
+	"${FILESDIR}"/${PN}-multilib-syspath.patch
+)
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/libgcrypt-config
+)
+
+multilib_src_configure() {
+	if [[ ${CHOST} == *86*-solaris* ]] ; then
+		# ASM code uses GNU ELF syntax, divide in particular, we need to
+		# allow this via ASFLAGS, since we don't have a flag-o-matic
+		# function for that, we'll have to abuse cflags for this
+		append-cflags -Wa,--divide
+	fi
+	local myeconfargs=(
+		--disable-dependency-tracking
+		--enable-noexecstack
+		--disable-O-flag-munging
+		$(use_enable static-libs static)
+		$(use_enable threads)
+
+		# disabled due to various applications requiring privileges
+		# after libgcrypt drops them (bug #468616)
+		--without-capabilities
+
+		# http://trac.videolan.org/vlc/ticket/620
+		# causes bus-errors on sparc64-solaris
+		$([[ ${CHOST} == *86*-darwin* ]] && echo "--disable-asm")
+		$([[ ${CHOST} == sparcv9-*-solaris* ]] && echo "--disable-asm")
+	)
+	autotools-utils_src_configure
+}
+
+multilib_src_compile() {
+	emake
+	multilib_is_native_abi && use doc && VARTEXFONTS="${T}/fonts" emake -C doc gcrypt.pdf
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" install
+	multilib_is_native_abi && use doc && dodoc doc/gcrypt.pdf
+}
diff --git a/dev-libs/libgdata/libgdata-0.17.2.ebuild b/dev-libs/libgdata/libgdata-0.17.2.ebuild
index 3df650fc7903..27492d5c9202 100644
--- a/dev-libs/libgdata/libgdata-0.17.2.ebuild
+++ b/dev-libs/libgdata/libgdata-0.17.2.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/libgdata"
 LICENSE="LGPL-2.1+"
 SLOT="0/22" # subslot = libgdata soname version
 IUSE="gnome +introspection static-libs test vala"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 REQUIRED_IUSE="vala? ( introspection )"
 
 # gtk+ is needed for gdk
diff --git a/dev-libs/libgit2-glib/libgit2-glib-0.22.8.ebuild b/dev-libs/libgit2-glib/libgit2-glib-0.22.8.ebuild
index e4d8b1f5a9b4..634696071a8b 100644
--- a/dev-libs/libgit2-glib/libgit2-glib-0.22.8.ebuild
+++ b/dev-libs/libgit2-glib/libgit2-glib-0.22.8.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Libgit2-glib"
 
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="python ssh +vala"
 
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/dev-libs/libgit2/libgit2-0.22.3.ebuild b/dev-libs/libgit2/libgit2-0.22.3.ebuild
index 1b480cdc8822..a73e01b07644 100644
--- a/dev-libs/libgit2/libgit2-0.22.3.ebuild
+++ b/dev-libs/libgit2/libgit2-0.22.3.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86 ~ppc-macos"
+	KEYWORDS="amd64 ~x86 ~ppc-macos"
 fi
 
 DESCRIPTION="A linkable library for Git"
diff --git a/dev-libs/libgpg-error/Manifest b/dev-libs/libgpg-error/Manifest
index 3647d8085b85..ff88d9d7a541 100644
--- a/dev-libs/libgpg-error/Manifest
+++ b/dev-libs/libgpg-error/Manifest
@@ -1,3 +1,4 @@
 DIST libgpg-error-1.13.tar.bz2 489948 SHA256 f8aba9038d8a46cefe6a6c4a7e4527144c029eb4e3ca1ed27011b962102c9b0a SHA512 db35cff54f12fef121f62bd989147acb8a2bc0711564e7153c1d10c5542e3530d3b3e172210320d312a8438372a099977dc72905e1fcdc29eddfacf8d34998fe WHIRLPOOL 1460d2fe700d33d247090acd400e014162c179ae70f0b9ee432103a52928efe31f0c774da493d7ad468fe165c831e05aacc3959d6dcbf497791673c4959a4e29
 DIST libgpg-error-1.18.tar.bz2 718070 SHA256 9ff1d6e61d4cef7c1d0607ceef6d40dc33f3da7a3094170c3718c00153d80810 SHA512 0b434361b134af4d535f34879425ef1c8102da27ebeb307abc73371f4fc5e3636aaf89f7903f79a1019a8a29b866907bb15cc02c11bbcd589b339909fe80760d WHIRLPOOL f70138d2f236204afdbfa869c91fd24046432071e9cb1586fee69b2cde45aefb06569da148668a0d0ed7affd7820e88a96f7f4f858e5dadf60f7fe3b624e83fd
 DIST libgpg-error-1.19.tar.bz2 761622 SHA256 53120e1333d5c5d28d87ff2854e9e98719c8e214152f17ad5291704d25c4978b SHA512 24ac1799260611f6fe3d0931fbb735f6e7e9d3a794190fba71c71d0324230f635655db96db134a1ddf56ea9c46654feb4ea2649c31e6ee31c9fd1ca41e86b56b WHIRLPOOL 479dbb813d5ff20fa232ece85a6321dd7daccb961851ef39fdc9d21a4f3250a4edc7c9e350bd880203bf7fa3b651ca9d9a862a7306c8f834c8879c8661fee2a5
+DIST libgpg-error-1.20.tar.bz2 770279 SHA256 3266895ce3419a7fb093e63e95e2ee3056c481a9bc0d6df694cfd26f74e72522 SHA512 7736f22a9ee23d27f8d74c275ee92a7d41b48468619af8df70ea4c07000beb03801c6f322735a91100a2b5eb97fca56fce476e4a6eca0054e8a81c44d9b1e1d3 WHIRLPOOL c72548d2ac48eec16111d059462fbefaa887d308900eade5a6803227abb6b2ff10b1ac4f7427f11d6a3130bd21026055efff70af77c4e79db0779759c46384ba
diff --git a/dev-libs/libgpg-error/libgpg-error-1.19.ebuild b/dev-libs/libgpg-error/libgpg-error-1.19.ebuild
index 8299779d0140..6be5be302322 100644
--- a/dev-libs/libgpg-error/libgpg-error-1.19.ebuild
+++ b/dev-libs/libgpg-error/libgpg-error-1.19.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="common-lisp nls static-libs"
 
 RDEPEND="nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] )
diff --git a/dev-libs/libgpg-error/libgpg-error-1.20.ebuild b/dev-libs/libgpg-error/libgpg-error-1.20.ebuild
new file mode 100644
index 000000000000..a05911e9e63f
--- /dev/null
+++ b/dev-libs/libgpg-error/libgpg-error-1.20.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils libtool multilib-minimal toolchain-funcs
+
+DESCRIPTION="Contains error handling functions used by GnuPG software"
+HOMEPAGE="http://www.gnupg.org/related_software/libgpg-error"
+SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="common-lisp nls static-libs +threads"
+
+RDEPEND="nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] )
+	abi_x86_32? (
+		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
+		!<=app-emulation/emul-linux-x86-baselibs-20131008-r12
+	)"
+DEPEND="${RDEPEND}
+	nls? ( sys-devel/gettext )"
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/gpg-error-config
+)
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/gpg-error.h
+)
+
+src_prepare() {
+	epatch_user
+	elibtoolize
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		CC_FOR_BUILD=$(tc-getBUILD_CC)
+		$(use_enable nls)
+		$(use_enable static-libs static)
+		$(use_enable threads)
+		$(use_enable common-lisp languages)
+	)
+
+	multilib_is_native_abi || myeconfargs+=(
+		--disable-languages
+	)
+
+	ECONF_SOURCE=${S} \
+		econf "${myeconfargs[@]}"
+}
+
+multilib_src_install_all() {
+	einstalldocs
+
+	# library has no dependencies, so it does not need the .la file
+	prune_libtool_files --all
+}
diff --git a/dev-libs/libgusb/Manifest b/dev-libs/libgusb/Manifest
index d932fd130425..18451f575cbf 100644
--- a/dev-libs/libgusb/Manifest
+++ b/dev-libs/libgusb/Manifest
@@ -1,2 +1,2 @@
-DIST libgusb-0.2.4.tar.xz 273832 SHA256 437966fb45e30b8e757b2c200daf5d4e7dd22bf5aa80e151e3b1807270d38083 SHA512 51b51a613718507d5bcc5789c9583f48e31269cee6a673d1ebdfcca974c78b9395dddc9de0f09f925283798fa349e99b4e4ee4f7d67726235015d19c57f305c4 WHIRLPOOL 5e515aa4ad2a363067fdfe15507bb589e5200cdb505497bbe99d6440c05f853eea52ca776ea64743768d669e73a328a660f9cda894fbfdc1d4246de46b5b7fed
 DIST libgusb-0.2.5.tar.xz 275948 SHA256 a3ad56773548695292f49b62df1eb7fb1e87e1e0c9d3982e80f65f47095fa492 SHA512 6ac07c40faf6919991f5cbc3e5fd0523b7486b5437a6ac3d0bd1cfd05d645fe25e311366bb507d1b7af2fe913ae869523c052a7571cd8191914f8b1a81a4c22a WHIRLPOOL 3da2b781ef8df7912aababe174f83c020ac24fefc754303dd38beebd49fceaf40138cd601ffa11b02e2512e0e2ebe3727b1cdee89d0b504962d82a3898fd8c0f
+DIST libgusb-0.2.6.tar.xz 276608 SHA256 6f638bdbc4e77643c0a198a300e50b592ad326e56bddf359de15e04689209c06 SHA512 4b13166f4b02f1c10ee074564d1e25de0b4763a19b83f56d40b2f43b595cfeb1c7fe4ecdeceaf0b32f51f2156d1e26c42a976cab5db4ad269533b803dbc27bdb WHIRLPOOL d976567c41ef6ef11232ac999b9efd14667312112efec8bb4d4700a0e2d89f0310eabe7542ceda66df3d39bc95f92c88f1da90e6c5b563bd4fb20da2eeabadbb
diff --git a/dev-libs/libgusb/libgusb-0.2.4.ebuild b/dev-libs/libgusb/libgusb-0.2.4.ebuild
deleted file mode 100644
index 2ac801ebe32a..000000000000
--- a/dev-libs/libgusb/libgusb-0.2.4.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-GCONF_DEBUG="no"
-VALA_USE_DEPEND="vapigen"
-
-inherit eutils gnome2 multilib-minimal vala
-
-DESCRIPTION="GObject wrapper for libusb"
-HOMEPAGE="https://gitorious.org/gusb/"
-SRC_URI="http://people.freedesktop.org/~hughsient/releases/${P}.tar.xz"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
-
-IUSE="+introspection static-libs vala"
-REQUIRED_USE="vala? ( introspection )"
-
-# Yes, we really need API from dev-libs/libusb-1.0.19, not virtual/libusb
-RDEPEND="
-	>=dev-libs/glib-2.28:2[${MULTILIB_USEDEP}]
-	>=dev-libs/libusb-1.0.19[udev,${MULTILIB_USEDEP}]
-	introspection? ( >=dev-libs/gobject-introspection-1.29 )
-"
-DEPEND="${RDEPEND}
-	app-arch/xz-utils
-	dev-libs/libxslt
-	dev-util/gtk-doc-am
-	virtual/pkgconfig[${MULTILIB_USEDEP}]
-	vala? ( $(vala_depend) )
-"
-
-# Tests try to access usb devices in /dev
-RESTRICT="test"
-
-multilib_src_configure() {
-	ECONF_SOURCE=${S} \
-	gnome2_src_configure \
-		$(multilib_native_use_enable introspection) \
-		$(use_enable static-libs static) \
-		$(multilib_native_use_enable vala)
-
-	if multilib_is_native_abi; then
-		ln -s "${S}"/docs/api/html docs/api/html || die
-	fi
-}
-
-multilib_src_install() {
-	gnome2_src_install
-}
diff --git a/dev-libs/libgusb/libgusb-0.2.6.ebuild b/dev-libs/libgusb/libgusb-0.2.6.ebuild
new file mode 100644
index 000000000000..82d647026274
--- /dev/null
+++ b/dev-libs/libgusb/libgusb-0.2.6.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+GCONF_DEBUG="no"
+VALA_USE_DEPEND="vapigen"
+
+inherit eutils gnome2 multilib-minimal vala
+
+DESCRIPTION="GObject wrapper for libusb"
+HOMEPAGE="https://github.com/hughsie/libgusb"
+SRC_URI="http://people.freedesktop.org/~hughsient/releases/${P}.tar.xz"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+
+IUSE="+introspection static-libs vala"
+REQUIRED_USE="vala? ( introspection )"
+
+# Yes, we really need API from dev-libs/libusb-1.0.19, not virtual/libusb
+RDEPEND="
+	>=dev-libs/glib-2.28:2[${MULTILIB_USEDEP}]
+	virtual/libusb:1[udev,${MULTILIB_USEDEP}]
+	introspection? ( >=dev-libs/gobject-introspection-1.29:= )
+"
+DEPEND="${RDEPEND}
+	dev-libs/libxslt
+	dev-util/gtk-doc-am
+	virtual/pkgconfig[${MULTILIB_USEDEP}]
+	vala? ( $(vala_depend) )
+"
+
+# Tests try to access usb devices in /dev
+RESTRICT="test"
+
+multilib_src_configure() {
+	ECONF_SOURCE=${S} \
+	gnome2_src_configure \
+		$(multilib_native_use_enable introspection) \
+		$(use_enable static-libs static) \
+		$(multilib_native_use_enable vala)
+
+	if multilib_is_native_abi; then
+		ln -s "${S}"/docs/api/html docs/api/html || die
+	fi
+}
+
+multilib_src_install() {
+	gnome2_src_install
+}
diff --git a/dev-libs/libgweather/libgweather-3.16.1.ebuild b/dev-libs/libgweather/libgweather-3.16.1.ebuild
index 59987d785237..73ff2b320fbc 100644
--- a/dev-libs/libgweather/libgweather-3.16.1.ebuild
+++ b/dev-libs/libgweather/libgweather-3.16.1.ebuild
@@ -17,7 +17,7 @@ SLOT="2/3-6" # subslot = 3-(libgweather-3 soname suffix)
 IUSE="glade +introspection vala"
 REQUIRED_USE="vala? ( introspection )"
 
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris"
 
 COMMON_DEPEND="
 	>=x11-libs/gtk+-3.13.5:3[introspection?]
diff --git a/dev-libs/libinput/Manifest b/dev-libs/libinput/Manifest
index 7bec1ba0c214..056aea1989ef 100644
--- a/dev-libs/libinput/Manifest
+++ b/dev-libs/libinput/Manifest
@@ -1,8 +1,4 @@
-DIST libinput-0.13.0.tar.xz 540300 SHA256 6cecaf7fde525f1d81474cbd495ce526d5e34c845d3e9d6f3e2565b7048cc61a SHA512 d07b35cec8d8cd3f75d7f8916fda4723e6a7b94bf457e249ee2b93e9a7c60b9999508d071b8959c7fb3676d13a3b5430c71f2bf579572cab87bcc4e655ab69ab WHIRLPOOL 944a1336d764d6359f65a4d3ac8d3150caf1b0db649a6dea2eaf52fae2b2e14a2ffac8b3de93280115d296c773bb7fc0d6c771e98514f76061fb8814bf0d56ff
-DIST libinput-0.18.0.tar.xz 623740 SHA256 64a70f96bab17a22eaf2fd7af17cf83def3388374096c7623be9448f62808cda SHA512 352a941a03942ed486f4d0d1ce09c928b5230bb041f71d6d906307cd208d23071b85f885658e9118cf29a72686dcd76c2c66c1b3291f48745efd40e6e5dfe38b WHIRLPOOL 50a6e2f58ef35746fec615bb61f9859347853f3fbc6044903975668e50f92fa6713a4bf05e6e038ebe5184a7fd496778b6b64d582607b0f183d44404e327587b
-DIST libinput-0.19.0.tar.xz 627800 SHA256 69a97da47ef8fa9debadaa8ee11005b9b5183bd2b87c5aa7827b7c388a5acc5d SHA512 773e59ff0e797c206410f417fcc8cb775dd0e87277a598cf7bacd2f116df1e62de9e99b12b318de0d098ad43882728fa19334ed4e2ae1f8f39bc28c255307c5a WHIRLPOOL adac12649898714306ab59f7af08a7edfdc133bdd9703b7896cde2a771111b60b5a359182698ab9cb46cd8a66dfc3d422bd9a0bceb940a83f9ecfdc9dccbc21d
-DIST libinput-0.20.0.tar.xz 647668 SHA256 175bdfce97cfab13a2a0d02c3138fcf02f60c8fcd098835a97128ff114d7125d SHA512 5c38024d4f0f7c4a7f50b5bfe1ebcb60778643ab053798847b48c704dbf19de3443d98ea508f1dd72577567f949fe85bc80ff1706e6a0896d02449485b41b1a6 WHIRLPOOL c92b82b477cb09744815a6b07293f1a4b8347a630c75628ad0b0e510bfe8a47e8e916128520946a17cf8273ad0c5fa6c0d464f124c70eac6e89611aedd170bdc
-DIST libinput-0.21.0.tar.xz 658788 SHA256 7cce7a9e510dfe5c4a19ad00e9350808d4f59f8611fd2b5e87213c507283f550 SHA512 676d5353ca9fb6b6a3f76f4e2d2ab4c78b09240c0bba5d4e06049e2f6fc913ed99cdc60880d00d34c2f3367937e3fca03f0d3d8baaf3d3348d4f2edba1b600a5 WHIRLPOOL a6367e7edc797292937bc956d3ed6c2d73987f058d4eeddc43436115f8674ba1ff558ca9f7b5b6d56420fe64210565d47fae9dfe188b8ebedc91d2b991901721
 DIST libinput-0.7.0.tar.xz 440228 SHA256 129f485afe5e4a9394641293991c97cb99f5f3338340d0d65b704ff463d1579e SHA512 0e03ab7ca98c4574997742b7d8912000fb176d7a3e2c381b7e63139f78455374f8f38284e226fe443d5a524f34be8995317b91fc0190795a97b10af060423b77 WHIRLPOOL 664510fc33cb718b56600553332bb3eb587b3f4a40f81d4a80dd218882aba204522bcbbfab98f3ae0c6447d3a39cc98b9d88aea5f8e3c21da0803b93d64ad321
 DIST libinput-0.9.0.tar.xz 510512 SHA256 309043976f41f5451c2a4b1c25bc2993b18aecb22524d797f21eb6b6c968ff0d SHA512 a6f718215428eda45ac00c25d0b62ada84bf924822cb66e0a9b28f4cfc36e7d1678f2dfb47afae16ce4c277d589adcf97aefe8e2e5a154873b649fe4a84527a1 WHIRLPOOL 23da6dbcd7b17000cea641e0931db8a9b2ad34b0655e4e31b0419ff4799adc59d2646b10316e073ad49695ebd652c150abf05c39d15c735ecb1d97f6f8c1d8de
 DIST libinput-1.0.0.tar.xz 785056 SHA256 afbd2751c000a4e5833624b6177a6919ad259f0bca44093947421c885fd42c0f SHA512 b6fc7973982cb2826fc5beb514e954d7673023628739a86d18b2522b1ad0ecf55f9d6c83e6307c10c633c57d6b61227898aded6a22a2de536c0f14f27d23b903 WHIRLPOOL 13304875b753127ada76bf18ba56ea9828d6532db5eefce56439ede83eeeb43b6da6aa59f763d2c912de838221ee53fd7d02bf865e80316a24c412ea001d3043
+DIST libinput-1.0.1.tar.xz 800244 SHA256 482fb35119b457ba65a8bebaa47e4f6b4dbd77e59c320014a22296847b7ff99e SHA512 17efc6ddd58aadcd30aecb4d1b8b6ad32f6f61c592f29b0a99aac7d49e5cb814038874d9e8996cd6726f15c58bf4239169564c650a3250a87a9ec6fd3110c5bb WHIRLPOOL 0bba6b4a58ca0020ebcbffe5675d75832b4ed67a350ca141d990f9db522a2eee942543f475d76c1f2b816b849074f4a50e30bcb3adc99bd4abdea1a43800a2d5
diff --git a/dev-libs/libinput/files/libinput-0.18.0-includes.patch b/dev-libs/libinput/files/libinput-0.18.0-includes.patch
deleted file mode 100644
index 22e292d6d2fb..000000000000
--- a/dev-libs/libinput/files/libinput-0.18.0-includes.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 984dec0ed1c52087a4a32e181a1c09817881de39 Mon Sep 17 00:00:00 2001
-From: Gilles Dartiguelongue <eva@gentoo.org>
-Date: Tue, 23 Jun 2015 11:31:56 +0200
-Subject: [PATCH] Add missing includes for *stat
-
----
- src/evdev.c | 1 +
- src/path.c  | 1 +
- 2 files changed, 2 insertions(+)
-
-diff --git a/src/evdev.c b/src/evdev.c
-index 7e1e5c8..cfcdc34 100644
---- a/src/evdev.c
-+++ b/src/evdev.c
-@@ -29,6 +29,7 @@
- #include <stdbool.h>
- #include <stdlib.h>
- #include <string.h>
-+#include <sys/stat.h>
- #include "linux/input.h"
- #include <unistd.h>
- #include <fcntl.h>
-diff --git a/src/path.c b/src/path.c
-index 92535cd..ab4d065 100644
---- a/src/path.c
-+++ b/src/path.c
-@@ -26,6 +26,7 @@
- #include <errno.h>
- #include <fcntl.h>
- #include <string.h>
-+#include <sys/stat.h>
- #include <libudev.h>
- 
- #include "path.h"
--- 
-2.4.3
-
diff --git a/dev-libs/libinput/libinput-0.13.0-r1.ebuild b/dev-libs/libinput/libinput-0.13.0-r1.ebuild
deleted file mode 100644
index a8ff917d5e73..000000000000
--- a/dev-libs/libinput/libinput-0.13.0-r1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit eutils udev
-
-DESCRIPTION="Library to handle input devices in Wayland"
-HOMEPAGE="http://www.freedesktop.org/wiki/Software/libinput/"
-SRC_URI="http://www.freedesktop.org/software/${PN}/${P}.tar.xz"
-
-# License appears to be a variant of libtiff
-LICENSE="libtiff"
-SLOT="0/10"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE=""
-RESTRICT="test"
-
-RDEPEND="
-	>=dev-libs/libevdev-0.4
-	>=sys-libs/mtdev-1.1
-	virtual/libudev
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
-
-src_configure() {
-	# Doc handling in kinda strange but everything
-	# is available in the tarball already.
-	sed -e 's/^\(SUBDIRS =.*\)doc\(.*\)$/\1\2/' \
-		-i Makefile.am Makefile.in || die
-}
-
-src_configure() {
-	# gui can be built but will not be installed
-	# building documentation silently fails with graphviz syntax errors
-	econf \
-		--disable-documentation \
-		--disable-event-gui \
-		--disable-tests \
-		--with-udev-dir="$(get_udevdir)"
-}
-
-src_install() {
-	emake install DESTDIR="${D}" || die
-	dodoc -r doc/html
-	prune_libtool_files
-}
diff --git a/dev-libs/libinput/libinput-0.18.0.ebuild b/dev-libs/libinput/libinput-0.18.0.ebuild
deleted file mode 100644
index b104b57dd10d..000000000000
--- a/dev-libs/libinput/libinput-0.18.0.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit eutils udev
-
-DESCRIPTION="Library to handle input devices in Wayland"
-HOMEPAGE="http://www.freedesktop.org/wiki/Software/libinput/"
-SRC_URI="http://www.freedesktop.org/software/${PN}/${P}.tar.xz"
-
-LICENSE="MIT"
-SLOT="0/10"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="test"
-# Tests require write access to udev rules directory which is a no-no for live system.
-# Other tests are just about logs, exported symbols and autotest of the test library.
-RESTRICT="test"
-
-RDEPEND="
-	>=dev-libs/libevdev-0.4
-	>=sys-libs/mtdev-1.1
-	virtual/libudev
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
-#	test? (
-#		>=dev-libs/check-0.9.10
-#		dev-util/valgrind
-#		sys-libs/libunwind )
-
-src_prepare() {
-	# Fix missing include for *stat, upstream #91069
-	epatch "${FILESDIR}"/${PN}-0.18.0-includes.patch
-}
-
-src_configure() {
-	# Doc handling in kinda strange but everything
-	# is available in the tarball already.
-	sed -e 's/^\(SUBDIRS =.*\)doc\(.*\)$/\1\2/' \
-		-i Makefile.am Makefile.in || die
-}
-
-src_configure() {
-	# gui can be built but will not be installed
-	# building documentation silently fails with graphviz syntax errors
-	econf \
-		--disable-documentation \
-		--disable-event-gui \
-		$(use_enable test tests) \
-		--with-udev-dir="$(get_udevdir)"
-}
-
-src_install() {
-	emake install DESTDIR="${D}"
-	dodoc -r doc/html
-	prune_libtool_files
-}
diff --git a/dev-libs/libinput/libinput-0.19.0.ebuild b/dev-libs/libinput/libinput-0.19.0.ebuild
deleted file mode 100644
index b1aa4c8175e7..000000000000
--- a/dev-libs/libinput/libinput-0.19.0.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils udev
-
-DESCRIPTION="Library to handle input devices in Wayland"
-HOMEPAGE="http://www.freedesktop.org/wiki/Software/libinput/"
-SRC_URI="http://www.freedesktop.org/software/${PN}/${P}.tar.xz"
-
-LICENSE="MIT"
-SLOT="0/10"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="test"
-# Tests require write access to udev rules directory which is a no-no for live system.
-# Other tests are just about logs, exported symbols and autotest of the test library.
-RESTRICT="test"
-
-RDEPEND="
-	>=dev-libs/libevdev-0.4
-	>=sys-libs/mtdev-1.1
-	virtual/libudev
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
-#	test? (
-#		>=dev-libs/check-0.9.10
-#		dev-util/valgrind
-#		sys-libs/libunwind )
-
-src_configure() {
-	# Doc handling in kinda strange but everything
-	# is available in the tarball already.
-	sed -e 's/^\(SUBDIRS =.*\)doc\(.*\)$/\1\2/' \
-		-i Makefile.am Makefile.in || die
-}
-
-src_configure() {
-	# gui can be built but will not be installed
-	# building documentation silently fails with graphviz syntax errors
-	econf \
-		--disable-documentation \
-		--disable-event-gui \
-		$(use_enable test tests) \
-		--with-udev-dir="$(get_udevdir)"
-}
-
-src_install() {
-	emake install DESTDIR="${D}"
-	dodoc -r doc/html
-	prune_libtool_files
-}
diff --git a/dev-libs/libinput/libinput-0.20.0.ebuild b/dev-libs/libinput/libinput-0.20.0.ebuild
deleted file mode 100644
index b1aa4c8175e7..000000000000
--- a/dev-libs/libinput/libinput-0.20.0.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils udev
-
-DESCRIPTION="Library to handle input devices in Wayland"
-HOMEPAGE="http://www.freedesktop.org/wiki/Software/libinput/"
-SRC_URI="http://www.freedesktop.org/software/${PN}/${P}.tar.xz"
-
-LICENSE="MIT"
-SLOT="0/10"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="test"
-# Tests require write access to udev rules directory which is a no-no for live system.
-# Other tests are just about logs, exported symbols and autotest of the test library.
-RESTRICT="test"
-
-RDEPEND="
-	>=dev-libs/libevdev-0.4
-	>=sys-libs/mtdev-1.1
-	virtual/libudev
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
-#	test? (
-#		>=dev-libs/check-0.9.10
-#		dev-util/valgrind
-#		sys-libs/libunwind )
-
-src_configure() {
-	# Doc handling in kinda strange but everything
-	# is available in the tarball already.
-	sed -e 's/^\(SUBDIRS =.*\)doc\(.*\)$/\1\2/' \
-		-i Makefile.am Makefile.in || die
-}
-
-src_configure() {
-	# gui can be built but will not be installed
-	# building documentation silently fails with graphviz syntax errors
-	econf \
-		--disable-documentation \
-		--disable-event-gui \
-		$(use_enable test tests) \
-		--with-udev-dir="$(get_udevdir)"
-}
-
-src_install() {
-	emake install DESTDIR="${D}"
-	dodoc -r doc/html
-	prune_libtool_files
-}
diff --git a/dev-libs/libinput/libinput-0.21.0.ebuild b/dev-libs/libinput/libinput-0.21.0.ebuild
deleted file mode 100644
index b1aa4c8175e7..000000000000
--- a/dev-libs/libinput/libinput-0.21.0.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils udev
-
-DESCRIPTION="Library to handle input devices in Wayland"
-HOMEPAGE="http://www.freedesktop.org/wiki/Software/libinput/"
-SRC_URI="http://www.freedesktop.org/software/${PN}/${P}.tar.xz"
-
-LICENSE="MIT"
-SLOT="0/10"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="test"
-# Tests require write access to udev rules directory which is a no-no for live system.
-# Other tests are just about logs, exported symbols and autotest of the test library.
-RESTRICT="test"
-
-RDEPEND="
-	>=dev-libs/libevdev-0.4
-	>=sys-libs/mtdev-1.1
-	virtual/libudev
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
-#	test? (
-#		>=dev-libs/check-0.9.10
-#		dev-util/valgrind
-#		sys-libs/libunwind )
-
-src_configure() {
-	# Doc handling in kinda strange but everything
-	# is available in the tarball already.
-	sed -e 's/^\(SUBDIRS =.*\)doc\(.*\)$/\1\2/' \
-		-i Makefile.am Makefile.in || die
-}
-
-src_configure() {
-	# gui can be built but will not be installed
-	# building documentation silently fails with graphviz syntax errors
-	econf \
-		--disable-documentation \
-		--disable-event-gui \
-		$(use_enable test tests) \
-		--with-udev-dir="$(get_udevdir)"
-}
-
-src_install() {
-	emake install DESTDIR="${D}"
-	dodoc -r doc/html
-	prune_libtool_files
-}
diff --git a/dev-libs/libinput/libinput-1.0.1.ebuild b/dev-libs/libinput/libinput-1.0.1.ebuild
new file mode 100644
index 000000000000..dcb3736e293d
--- /dev/null
+++ b/dev-libs/libinput/libinput-1.0.1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils udev
+
+DESCRIPTION="Library to handle input devices in Wayland"
+HOMEPAGE="http://www.freedesktop.org/wiki/Software/libinput/"
+SRC_URI="http://www.freedesktop.org/software/${PN}/${P}.tar.xz"
+
+LICENSE="MIT"
+SLOT="0/10"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="test"
+# Tests require write access to udev rules directory which is a no-no for live system.
+# Other tests are just about logs, exported symbols and autotest of the test library.
+RESTRICT="test"
+
+RDEPEND="
+	>=dev-libs/libevdev-0.4
+	>=sys-libs/mtdev-1.1
+	virtual/libudev
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+#	test? (
+#		>=dev-libs/check-0.9.10
+#		dev-util/valgrind
+#		sys-libs/libunwind )
+
+src_configure() {
+	# Doc handling in kinda strange but everything
+	# is available in the tarball already.
+	sed -e 's/^\(SUBDIRS =.*\)doc\(.*\)$/\1\2/' \
+		-i Makefile.am Makefile.in || die
+}
+
+src_configure() {
+	# gui can be built but will not be installed
+	# building documentation silently fails with graphviz syntax errors
+	econf \
+		--disable-documentation \
+		--disable-event-gui \
+		$(use_enable test tests) \
+		--with-udev-dir="$(get_udevdir)"
+}
+
+src_install() {
+	emake install DESTDIR="${D}"
+	dodoc -r doc/html
+	prune_libtool_files
+}
diff --git a/dev-libs/liblouis/metadata.xml b/dev-libs/liblouis/metadata.xml
index b723de1dbba2..2d30215f74d8 100644
--- a/dev-libs/liblouis/metadata.xml
+++ b/dev-libs/liblouis/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>accessibility</herd>
+	<herd>accessibility</herd>
+	<upstream>
+		<remote-id type="github">liblouis/liblouis</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-libs/libmemcached/libmemcached-1.0.18-r3.ebuild b/dev-libs/libmemcached/libmemcached-1.0.18-r3.ebuild
index c0efa575fa31..bb00b9424ac6 100644
--- a/dev-libs/libmemcached/libmemcached-1.0.18-r3.ebuild
+++ b/dev-libs/libmemcached/libmemcached-1.0.18-r3.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://launchpad.net/${PN}/1.0/${PV}/+download/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~sparc-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm hppa ~ia64 ppc ~ppc64 ~sh ~sparc ~x86 ~sparc-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="debug hsieh +libevent sasl static-libs"
 
 DEPEND="net-misc/memcached
diff --git a/dev-libs/libnl/libnl-3.2.26.ebuild b/dev-libs/libnl/libnl-3.2.26.ebuild
index 344b178da927..3470ce9c9f42 100644
--- a/dev-libs/libnl/libnl-3.2.26.ebuild
+++ b/dev-libs/libnl/libnl-3.2.26.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 "
 LICENSE="LGPL-2.1 utils? ( GPL-2 )"
 SLOT="3"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~ia64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~ia64-linux ~x86-linux"
 IUSE="static-libs python utils"
 
 RDEPEND="python? ( ${PYTHON_DEPS} )
diff --git a/dev-libs/liboobs/metadata.xml b/dev-libs/liboobs/metadata.xml
index 0dbc49da363a..211a06ad5e15 100644
--- a/dev-libs/liboobs/metadata.xml
+++ b/dev-libs/liboobs/metadata.xml
@@ -1,11 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>gnome</herd>
-	<maintainer>
-		<email>eva@gentoo.org</email>
-		<name>Gilles Dartiguelongue</name>
-	</maintainer>
+	<herd>lxqt</herd>
 	<longdescription lang="en">
 		Liboobs is a wrapping library to the System Tools Backends, it will
 		provide easy to access GObjects to system configuration details, like
diff --git a/dev-libs/libpeas/libpeas-1.14.0-r1.ebuild b/dev-libs/libpeas/libpeas-1.14.0-r1.ebuild
index 12a0066a730d..744daafa040e 100644
--- a/dev-libs/libpeas/libpeas-1.14.0-r1.ebuild
+++ b/dev-libs/libpeas/libpeas-1.14.0-r1.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://developer.gnome.org/libpeas/stable/"
 
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux"
 IUSE="+gtk glade jit lua +python"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} ?? ( $(python_gen_useflags 'python3*') ) )"
 
diff --git a/dev-libs/libpwquality/Manifest b/dev-libs/libpwquality/Manifest
index 901bc53f53ea..dd35c3bebba1 100644
--- a/dev-libs/libpwquality/Manifest
+++ b/dev-libs/libpwquality/Manifest
@@ -1,2 +1,2 @@
-DIST libpwquality-1.2.3.tar.bz2 367794 SHA256 b11c79ce7b03cdf878fccb653e67bd430155cc6fd224efbbb3e78842f752516a SHA512 1591f40feee4ad95d666887fbd04fc675ff2630a2cd080a7ef616f59af543751ef34910a085d880e8d75051ebeee747847b8015e66a7c315b955df62f926ccd2 WHIRLPOOL 9aff4c547758a2bc2d918f2411371f3b35231c6846d77b497275176842f8f48df3b66f419ddaee88e1fccc2e1a6b947e5b1e72215db74dbc978089d7c0afdf5b
 DIST libpwquality-1.2.4.tar.bz2 394060 SHA256 9ad67be364a66dc8b334a473c77d9f531137ee0e9d85d81f567f410a375857c7 SHA512 63ead296320e8eadc1a3341c28b015f9dbbf30e610e9226a11018d81aeb412d0e211753ebdb45f959c35cedfc6ed580bba9e6b0f8822c3b5f38062428f637049 WHIRLPOOL 94166db5bba425fb19a9a27fe27eb082716e887b90fa2d2bd64e56f4d9202c6cc1f7f16779185a5c44ce3145f8a8df92ecca9b6628ae63daba99aca4d5a9c1a9
+DIST libpwquality-1.3.0.tar.bz2 423910 SHA256 74d2ea90e103323c1f2d6a6cc9617cdae6877573eddb31aaf31a40f354cc2d2a SHA512 c3817c7a5ca962b161911b97b413a0db7c34a99ba2cd191435024abdbe060e248c0f88436f24d3992dcb1b00d34b88afb731ef1fd23efc3ad1abe56d4d7d53ea WHIRLPOOL b6451083551a13be259d1a81eb089889d9ee430c30afb2555aa2e5e7c4240febc71b152ce3c210b592a56db8988fc88a827d8e9f368c5aa478d5babf4e316b8c
diff --git a/dev-libs/libpwquality/libpwquality-1.2.3.ebuild b/dev-libs/libpwquality/libpwquality-1.2.3.ebuild
deleted file mode 100644
index 8b619a0a0993..000000000000
--- a/dev-libs/libpwquality/libpwquality-1.2.3.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils multilib pam python-r1 toolchain-funcs
-
-DESCRIPTION="Library for password quality checking and generating random passwords"
-HOMEPAGE="https://fedorahosted.org/libpwquality/"
-SRC_URI="https://fedorahosted.org/releases/l/i/${PN}/${P}.tar.bz2"
-
-LICENSE="|| ( BSD GPL-2 )"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 ~sh ~sparc x86"
-IUSE="pam python static-libs"
-
-RDEPEND="
-	>=sys-libs/cracklib-2.8:=
-	pam? ( virtual/pam )
-	python? ( ${PYTHON_DEPS} )
-"
-DEPEND="${RDEPEND}
-	>=sys-devel/gettext-0.15
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	# ensure pkgconfig files go in /usr
-	sed -e 's:\(pkgconfigdir *=\).*:\1 '${EPREFIX}/usr/$(get_libdir)'/pkgconfig:' \
-		-i src/Makefile.{am,in} || die "sed failed"
-	use python && python_copy_sources
-}
-
-src_configure() {
-	# Install library in /lib for pam
-	configuring() {
-		local sitedir
-		econf \
-			--libdir="${EPREFIX}/$(get_libdir)" \
-			$(use_enable pam) \
-			--with-securedir="${EPREFIX}/$(getpam_mod_dir)" \
-			$(use_enable python python-bindings) \
-			$(usex python "--with-pythonsitedir=$(use python && python_get_sitedir)" "") \
-			$(use_enable static-libs static)
-	}
-	if_use_python_python_foreach_impl configuring
-}
-
-src_compile() {
-	if_use_python_python_foreach_impl default
-}
-
-src_test() {
-	if_use_python_python_foreach_impl default
-}
-
-src_install() {
-	if_use_python_python_foreach_impl default
-	if use static-libs; then
-		# Do not install static libs in /lib
-		mkdir -p "${ED}usr/$(get_libdir)"
-		mv "${ED}$(get_libdir)/libpwquality.a" "${ED}/usr/$(get_libdir)/" || die
-		gen_usr_ldscript libpwquality.so
-	fi
-	prune_libtool_files --modules
-}
-
-if_use_python_python_foreach_impl() {
-	if use python; then
-		python_foreach_impl run_in_build_dir "$@"
-	else
-		"$@"
-	fi
-}
diff --git a/dev-libs/libpwquality/libpwquality-1.3.0.ebuild b/dev-libs/libpwquality/libpwquality-1.3.0.ebuild
new file mode 100644
index 000000000000..08ee767078c7
--- /dev/null
+++ b/dev-libs/libpwquality/libpwquality-1.3.0.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+
+inherit eutils multilib pam python-r1 toolchain-funcs
+
+DESCRIPTION="Library for password quality checking and generating random passwords"
+HOMEPAGE="https://fedorahosted.org/libpwquality/"
+SRC_URI="https://fedorahosted.org/releases/l/i/${PN}/${P}.tar.bz2"
+
+LICENSE="|| ( BSD GPL-2 )"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="pam python static-libs"
+
+RDEPEND="
+	>=sys-libs/cracklib-2.8:=
+	pam? ( virtual/pam )
+	python? ( ${PYTHON_DEPS} )
+"
+DEPEND="${RDEPEND}
+	>=sys-devel/gettext-0.18.2
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	# ensure pkgconfig files go in /usr
+	sed -e 's:\(pkgconfigdir *=\).*:\1 '${EPREFIX}/usr/$(get_libdir)'/pkgconfig:' \
+		-i src/Makefile.{am,in} || die "sed failed"
+	use python && python_copy_sources
+}
+
+src_configure() {
+	# Install library in /lib for pam
+	configuring() {
+		local sitedir
+		econf \
+			--libdir="${EPREFIX}/$(get_libdir)" \
+			$(use_enable pam) \
+			--with-securedir="${EPREFIX}/$(getpam_mod_dir)" \
+			$(use_enable python python-bindings) \
+			$(usex python "--with-pythonsitedir=$(use python && python_get_sitedir)" "") \
+			$(use_enable static-libs static)
+	}
+	if_use_python_python_foreach_impl configuring
+}
+
+src_compile() {
+	if_use_python_python_foreach_impl default
+}
+
+src_test() {
+	if_use_python_python_foreach_impl default
+}
+
+src_install() {
+	if_use_python_python_foreach_impl default
+	if use static-libs; then
+		# Do not install static libs in /lib
+		mkdir -p "${ED}usr/$(get_libdir)"
+		mv "${ED}$(get_libdir)/libpwquality.a" "${ED}/usr/$(get_libdir)/" || die
+		gen_usr_ldscript libpwquality.so
+	fi
+	prune_libtool_files --modules
+}
+
+if_use_python_python_foreach_impl() {
+	if use python; then
+		python_foreach_impl run_in_build_dir "$@"
+	else
+		"$@"
+	fi
+}
diff --git a/dev-libs/libtar/libtar-1.2.20-r3.ebuild b/dev-libs/libtar/libtar-1.2.20-r3.ebuild
index af9b25b65d7f..64342920b93d 100644
--- a/dev-libs/libtar/libtar-1.2.20-r3.ebuild
+++ b/dev-libs/libtar/libtar-1.2.20-r3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://dev.gentoo.org/~pinkbyte/distfiles/snapshots/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc ~ppc64 sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 ppc ppc64 sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="static-libs zlib"
 
 RDEPEND="zlib? ( sys-libs/zlib )
diff --git a/dev-libs/libtasn1/Manifest b/dev-libs/libtasn1/Manifest
index a0cdb84065b3..28214e6b8ac3 100644
--- a/dev-libs/libtasn1/Manifest
+++ b/dev-libs/libtasn1/Manifest
@@ -1 +1,2 @@
 DIST libtasn1-4.5.tar.gz 1850279 SHA256 89b3b5dce119273431544ecb305081f3530911001bb12e5d76588907edb71bda SHA512 9319c7109b006f6f1f52c5cc0ff4b076db0037fb977535e04980dc3a9b3195ef20a451f04771d0eff1d1a104557cc14ccd5147f82e4229230d6539046e7f5108 WHIRLPOOL 9a3673f576f0ff44889c00f4c24e3f2d9b27f0be1d53058b292ed56f89b2b4efbd0ac0f9721daa0ed1116b541146e86b8f42d9e8857bdc9d0ba8bacb5415a9dd
+DIST libtasn1-4.6.tar.gz 1852124 SHA256 3462fc25e2d2536878c39a8825f5e36ba2e2611b27ef535e064f4c56258e508b SHA512 865215b21ff13cd3998e1dbc893a0c9897e08611549a22e0aa42e068e8531c4b28226fe16bc27e1018cf3e0d481f86fa70d15a29a68b1aad155c4fa4f84a3d81 WHIRLPOOL fe2801328190b4ee75c379db6ab2fd7480641f2a2d25109bcc225d4e09431c580dad7f89342704ae20832dabebceadf38dc932ccb8d0aa3fab1e91e3b27e4b5a
diff --git a/dev-libs/libtasn1/libtasn1-4.6.ebuild b/dev-libs/libtasn1/libtasn1-4.6.ebuild
new file mode 100644
index 000000000000..00b5a07c6c5f
--- /dev/null
+++ b/dev-libs/libtasn1/libtasn1-4.6.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit autotools-multilib
+
+DESCRIPTION="ASN.1 library"
+HOMEPAGE="https://www.gnu.org/software/libtasn1/"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3 LGPL-2.1"
+SLOT="0/6" # subslot = libtasn1 soname version
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="doc static-libs"
+
+DEPEND=">=dev-lang/perl-5.6
+	sys-apps/help2man
+	virtual/yacc"
+RDEPEND="
+	abi_x86_32? (
+		!<=app-emulation/emul-linux-x86-baselibs-20131008-r16
+		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
+	)"
+
+DOCS=( AUTHORS ChangeLog NEWS README THANKS )
+
+src_configure() {
+	local myeconfargs
+	[[ "${VALGRIND_TESTS}" == "0" ]] && myeconfargs+=( --disable-valgrind-tests )
+	autotools-multilib_src_configure
+}
+
+src_install() {
+	autotools-multilib_src_install
+
+	if use doc ; then
+		dodoc doc/libtasn1.pdf
+		dohtml doc/reference/html/*
+	fi
+}
diff --git a/dev-libs/mathjax/Manifest b/dev-libs/mathjax/Manifest
index dda9cac6e8fb..c53d25df19cf 100644
--- a/dev-libs/mathjax/Manifest
+++ b/dev-libs/mathjax/Manifest
@@ -1,3 +1,3 @@
-DIST mathjax-2.1.tar.gz 8834936 SHA256 f1a1aaa8b91ad5c749b3767ebd75294a7c305646f320d106899e2ea9227613d6 SHA512 b90399df7e06a77250fc76d9fd2de0c53c781e5897b85a01cf3a4ec033deea479e15d7d20ddad2730444d786fb6814ee88b5553ab89d7143fbf8f5b1b27fc330 WHIRLPOOL 499421b90f55ea34e379e3aa79fb37ef10c5704a8f019a775c59ff62172ee2de98e7a20576681b4976778117ca811eab221fa0d1af0dab9de86b0b712c41a323
 DIST mathjax-2.2.tar.gz 8974100 SHA256 7879b59d2992bc31cda0d8b9d4f8fb47d4435f3129e421be46cc6d3136ed7449 SHA512 11987a959a7b154ea8df4ad93ce6193eed930affcfbfd2ba3fd965356c3ea957ef73a3ea6830a841bbe81f64ed0d9a78ab9fd74d0cbf011671b7d174cdc1f80c WHIRLPOOL 5bfba913fe1d768561c52154b714791afd8721673c2b404e3f4dd2b0c18855843521baf6ac534bb07826d475f83e81b4131e218d2e359f329b9cc8f143e40899
-DIST mathjax-2.4.tar.gz 23048619 SHA256 f1450bafe63599729df7a879e40127f29cfc265abc4a0626bf9d274ed261cbeb SHA512 ee1662b3253fc77aa05d718b215c25b09cd28c0ac4a192537f9965b685452855439e192f0a816a7a1046b721cfa66558c5d4a1a1972db2ea351f2b9c71f24df0 WHIRLPOOL a1e68cfe968a2f36e3e693f0a03351d6c2bb8019f2b20975d6c4805839fb24793f31a12aebe68acabbada3dbf2c54f8da17641ead0451a122fd8e584700f11f6
+DIST mathjax-2.4.0.tar.gz 23048567 SHA256 cd7175e1e352793942a976bf40692b954b5169bd28533921a8a8dd4ec865d855 SHA512 1f1cd590d0d584e38a51920e1d92e7dd1e0b8a0660b1ad29b522a5ced4d6c1f7d00074500d726aeee04c04f10c963944d1ef6aa2a662d7b53df609f9270b8de0 WHIRLPOOL 0b9dc53d1070a587261e770fe16a118171b40fa4d5de88a580726c1b9181d6d264c936eb68721798610e7d15a69c861d4b0454566ea1072a541c80a4bd5b6093
+DIST mathjax-2.5.3.tar.gz 23257294 SHA256 d24fcd6e66db4d79177513fbd25be9b75bff30f2a379199e8a05d5051fed5df3 SHA512 007b3d4e7d4224746ea8996838f6d208ee6dd04a6c2e3dc38b6e7ad83421732d4f5c5b9b6714183d0a25a46fdc1a9cd73a6ca769f29dbe3f36c79a5ca0ee1178 WHIRLPOOL a25f492d649dca6a0fe99602d8aecbf8538aef5bec56fd41b72208f68deac733f3e6ca109b2eb351c1d3ee3de6ed8b75eb3724b85cae8f717a6ac78b788fea96
diff --git a/dev-libs/mathjax/mathjax-2.1.ebuild b/dev-libs/mathjax/mathjax-2.1.ebuild
deleted file mode 100644
index adcf7408d480..000000000000
--- a/dev-libs/mathjax/mathjax-2.1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-DESCRIPTION="JavaScript display engine for LaTeX, MathML and AsciiMath"
-HOMEPAGE="http://www.mathjax.org/"
-SRC_URI="https://github.com/mathjax/MathJax/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc examples"
-
-RESTRICT="binchecks"
-
-S=${WORKDIR}/MathJax-${PV}
-
-make_webconf() {
-	# web server config file - should we really do this?
-	cat > $1 <<-EOF
-		Alias /MathJax/ ${EPREFIX}${webinstalldir}/
-		Alias /mathjax/ ${EPREFIX}${webinstalldir}/
-
-		<Directory ${EPREFIX}${webinstalldir}>
-			Options None
-			AllowOverride None
-			Order allow,deny
-			Allow from all
-		</Directory>
-	EOF
-}
-
-src_prepare() {
-	find . -name .gitignore -delete || die
-}
-
-src_install() {
-	dodoc README*
-	use doc && dohtml -r docs/html/*
-	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins -r test/*
-	fi
-	rm -rf test docs LICENSE README* || die
-
-	webinstalldir=/usr/share/${PN}
-	insinto ${webinstalldir}
-	doins -r *
-
-	make_webconf MathJax.conf
-	insinto /etc/httpd/conf.d
-	doins MathJax.conf
-}
diff --git a/dev-libs/mathjax/mathjax-2.4.0.ebuild b/dev-libs/mathjax/mathjax-2.4.0.ebuild
new file mode 100644
index 000000000000..663ef8b95735
--- /dev/null
+++ b/dev-libs/mathjax/mathjax-2.4.0.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+DESCRIPTION="JavaScript display engine for LaTeX, MathML and AsciiMath"
+HOMEPAGE="http://www.mathjax.org/"
+SRC_URI="https://github.com/mathjax/MathJax/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc examples"
+
+RESTRICT="binchecks strip"
+
+S=${WORKDIR}/MathJax-${PV}
+
+make_webconf() {
+	# web server config file - should we really do this?
+	cat > $1 <<-EOF
+		Alias /MathJax/ ${EPREFIX}${webinstalldir}/
+		Alias /mathjax/ ${EPREFIX}${webinstalldir}/
+
+		<Directory ${EPREFIX}${webinstalldir}>
+			Options None
+			AllowOverride None
+			Order allow,deny
+			Allow from all
+		</Directory>
+	EOF
+}
+
+src_prepare() {
+	find . -name .gitignore -delete || die
+}
+
+src_install() {
+	dodoc README*
+	use doc && dohtml -r docs/html/*
+	if use examples; then
+		insinto /usr/share/doc/${PF}/examples
+		doins -r test/*
+	fi
+	rm -rf test docs LICENSE README* || die
+
+	webinstalldir=/usr/share/${PN}
+	insinto ${webinstalldir}
+	doins -r *
+
+	make_webconf MathJax.conf
+	insinto /etc/httpd/conf.d
+	doins MathJax.conf
+}
diff --git a/dev-libs/mathjax/mathjax-2.4.ebuild b/dev-libs/mathjax/mathjax-2.4.ebuild
deleted file mode 100644
index a4ff2ef3aff3..000000000000
--- a/dev-libs/mathjax/mathjax-2.4.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-DESCRIPTION="JavaScript display engine for LaTeX, MathML and AsciiMath"
-HOMEPAGE="http://www.mathjax.org/"
-SRC_URI="https://github.com/mathjax/MathJax/archive/v${PV}-latest.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc examples"
-
-RESTRICT="binchecks"
-
-S=${WORKDIR}/MathJax-${PV}-latest
-
-make_webconf() {
-	# web server config file - should we really do this?
-	cat > $1 <<-EOF
-		Alias /MathJax/ ${EPREFIX}${webinstalldir}/
-		Alias /mathjax/ ${EPREFIX}${webinstalldir}/
-
-		<Directory ${EPREFIX}${webinstalldir}>
-			Options None
-			AllowOverride None
-			Order allow,deny
-			Allow from all
-		</Directory>
-	EOF
-}
-
-src_prepare() {
-	find . -name .gitignore -delete || die
-}
-
-src_install() {
-	dodoc README*
-	use doc && dohtml -r docs/html/*
-	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins -r test/*
-	fi
-	rm -rf test docs LICENSE README* || die
-
-	webinstalldir=/usr/share/${PN}
-	insinto ${webinstalldir}
-	doins -r *
-
-	make_webconf MathJax.conf
-	insinto /etc/httpd/conf.d
-	doins MathJax.conf
-}
diff --git a/dev-libs/mathjax/mathjax-2.5.3.ebuild b/dev-libs/mathjax/mathjax-2.5.3.ebuild
new file mode 100644
index 000000000000..a0042a5a30fb
--- /dev/null
+++ b/dev-libs/mathjax/mathjax-2.5.3.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+DESCRIPTION="JavaScript display engine for LaTeX, MathML and AsciiMath"
+HOMEPAGE="http://www.mathjax.org/"
+SRC_URI="https://github.com/mathjax/MathJax/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc examples"
+
+RESTRICT="binchecks strip"
+
+S=${WORKDIR}/MathJax-${PV}
+
+make_webconf() {
+	# web server config file - should we really do this?
+	cat > $1 <<-EOF
+		Alias /MathJax/ ${EPREFIX}${webinstalldir}/
+		Alias /mathjax/ ${EPREFIX}${webinstalldir}/
+
+		<Directory ${EPREFIX}${webinstalldir}>
+			Options None
+			AllowOverride None
+			Order allow,deny
+			Allow from all
+		</Directory>
+	EOF
+}
+
+src_prepare() {
+	find . -name .gitignore -delete || die
+}
+
+src_install() {
+	dodoc README*
+	use doc && dohtml -r docs/html/*
+	if use examples; then
+		insinto /usr/share/${PN}/examples
+		doins -r test/*
+	fi
+	rm -r test docs LICENSE README* || die
+
+	webinstalldir=/usr/share/${PN}
+	insinto ${webinstalldir}
+	doins -r *
+
+	make_webconf MathJax.conf
+	insinto /etc/httpd/conf.d
+	doins MathJax.conf
+}
diff --git a/dev-libs/ntl/ntl-9.3.0.ebuild b/dev-libs/ntl/ntl-9.3.0.ebuild
index 632db28656c2..1a063659edc7 100644
--- a/dev-libs/ntl/ntl-9.3.0.ebuild
+++ b/dev-libs/ntl/ntl-9.3.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.shoup.net/ntl/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="doc static-libs test"
 
 RDEPEND="dev-libs/gmp:=
diff --git a/dev-libs/opensc/Manifest b/dev-libs/opensc/Manifest
index 85aa3c0f6012..89772b6c84d6 100644
--- a/dev-libs/opensc/Manifest
+++ b/dev-libs/opensc/Manifest
@@ -1,3 +1,4 @@
 DIST opensc-0.12.2.tar.gz 1738553 SHA256 50e7371c0f45a3ed887098b712554905e3ef639d4dfca5ac90b8af5f69f1e675 SHA512 544971f2c79723f618806c7043f0f1ffc25332752cbcaec97ffb1c99f9a2dff2237a6e5f5e020a4b9878921fec3a5234ca7e4fe9c8175c3f6142b169fcc65334 WHIRLPOOL 4969811d68d72e82c3a2b0297d5ff9aaca083b6ef8e66223d4385dce35cd9560cdda7cca8ccd38b52eb55465dbd6f8704485778b21d2a88bb548a5bbd87071e2
 DIST opensc-0.13.0.tar.gz 1946899 SHA256 abde46ae53b12b3273e40c532ffd4f7d423a51e0919a5234761453c17c089b14 SHA512 2d33088ff208f6a492dea896a0c0ccbf79b21bbcd953eb89cc7659fd60feb3e9258c2cdbb3112c30b16c3b4ef5bcfc914e0c3783894ac0b119a67116c1703a51 WHIRLPOOL 25934d790f3f855136aac263a49c0d49b604b748b9bad9f7de62d3781f37dc3e318c7fa9a20280fe7ca806ad6ea8d9ec104ba9a8a45b82237039fd965777d6e8
 DIST opensc-0.14.0.tar.gz 2039158 SHA256 facdca215f74d999b286ae246ada8d8fcb97ce58f0a6dd30d8b1c180101e9bf0 SHA512 f5b39ff5de13e9171dfd27953145abf2adf7beb3663094e43d5472a7d2c6a37c61b36993a67d3c362ff2ecf789b3b8fa4803038ba34e14f755f789c75e2978da WHIRLPOOL 1eba0c2bac92fe849e627dca4338332caff7919fd607118520352f3a69dde74adf9f7ef57e4314feceb777d8e17fe7a6abcc16f9094fc7e83287404a36b24cac
+DIST opensc-0.15.0.tar.gz 2153075 SHA256 399b2107a69e3f67e4e76dc2dbd951dbced8e534b1e0f919e176aea9b85970d7 SHA512 8d5f84206faa7f673be4ea559025b1317c69636bee0265c466f4fdc5a0a78c7f091df946f90d7622cc5497d57a782bce47edbc67b2c7338053dcd848708399ac WHIRLPOOL 94df395fc1a6d34d0deafd1b3815d2cff70112c73c20427bfa656fb5fe34ed9bf09afd87aca4f272ff447b91625d2aeac2450ad96ebaa2bcc3f9fb92d420fe17
diff --git a/dev-libs/opensc/opensc-0.15.0.ebuild b/dev-libs/opensc/opensc-0.15.0.ebuild
new file mode 100644
index 000000000000..3fc15f81db5f
--- /dev/null
+++ b/dev-libs/opensc/opensc-0.15.0.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils
+
+DESCRIPTION="Libraries and applications to access smartcards"
+HOMEPAGE="https://github.com/OpenSC/OpenSC/wiki"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="doc +pcsc-lite secure-messaging openct ctapi readline ssl zlib"
+
+RDEPEND="zlib? ( sys-libs/zlib )
+	readline? ( sys-libs/readline:0= )
+	ssl? ( dev-libs/openssl:0= )
+	openct? ( >=dev-libs/openct-0.5.0 )
+	pcsc-lite? ( >=sys-apps/pcsc-lite-1.3.0 )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt"
+
+REQUIRED_USE="
+	pcsc-lite? ( !openct !ctapi )
+	openct? ( !pcsc-lite !ctapi )
+	ctapi? ( !pcsc-lite !openct )
+	|| ( pcsc-lite openct ctapi )"
+
+src_configure() {
+	econf \
+		--docdir="/usr/share/doc/${PF}" \
+		--htmldir='$(docdir)/html' \
+		--disable-static \
+		$(use_enable doc) \
+		$(use_enable openct) \
+		$(use_enable readline) \
+		$(use_enable zlib) \
+		$(use_enable secure-messaging sm) \
+		$(use_enable ssl openssl) \
+		$(use_enable pcsc-lite pcsc) \
+		$(use_enable openct) \
+		$(use_enable ctapi)
+}
+
+src_install() {
+	default
+	find "${ED}"/usr -name '*.la' -delete
+}
diff --git a/dev-libs/openssl/openssl-1.0.2d.ebuild b/dev-libs/openssl/openssl-1.0.2d.ebuild
index 6b4277416a34..8947be663df1 100644
--- a/dev-libs/openssl/openssl-1.0.2d.ebuild
+++ b/dev-libs/openssl/openssl-1.0.2d.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://openssl/source/${MY_P}.tar.gz
 
 LICENSE="openssl"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
 IUSE="+asm bindist gmp kerberos rfc3779 sctp cpu_flags_x86_sse2 static-libs test +tls-heartbeat vanilla zlib"
 RESTRICT="!bindist? ( bindist )"
 
diff --git a/dev-libs/qjson/qjson-0.8.1-r1.ebuild b/dev-libs/qjson/qjson-0.8.1-r1.ebuild
index 60ff1967786a..2cd205801cc6 100644
--- a/dev-libs/qjson/qjson-0.8.1-r1.ebuild
+++ b/dev-libs/qjson/qjson-0.8.1-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://github/flavio/qjson/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~arm hppa ~ppc ppc64 ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="amd64 ~arm hppa ppc ppc64 ~x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="debug doc test"
 
 RDEPEND=">=dev-qt/qtcore-4.8.6:4[${MULTILIB_USEDEP}]"
diff --git a/dev-libs/uchardet/metadata.xml b/dev-libs/uchardet/metadata.xml
index 08e15306aeac..bfe4d0155d48 100644
--- a/dev-libs/uchardet/metadata.xml
+++ b/dev-libs/uchardet/metadata.xml
@@ -10,4 +10,7 @@
 		<email>nikoli@gmx.us</email>
 		<name>Nikoli</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">BYVoid/uchardet</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-libs/vala-common/Manifest b/dev-libs/vala-common/Manifest
index 418160131fc1..18ad2ddd6ce7 100644
--- a/dev-libs/vala-common/Manifest
+++ b/dev-libs/vala-common/Manifest
@@ -1,3 +1,4 @@
 DIST vala-0.24.0.tar.xz 2666032 SHA256 22a37c977512c19cd29c373eaaef96cb2c994795d491106f32387f3f9d1e899c SHA512 a5897af7926affbdb018f0c31d4ec84d3322dc03e7cc64cb8b28c60fd4887a64b94760e061145aab5c36442a0d8665f3e3d584e09502e5f2587860d199317479 WHIRLPOOL d19cdf123abc3689c84c3746729a1452a8a9051271aaa64782db226ab4c276e963fa574900b4d145577d4fd0329cb29f73782b5f67ac1650ad1bdf663096e88f
 DIST vala-0.26.2.tar.xz 2682856 SHA256 37f13f430c56a93b6dac85239084681fd8f31c407d386809c43bc2f2836e03c4 SHA512 9c8dcb59f01e7f77c79f5f9ed996930c23444bddf22898ee775602e54f817b4cbd7c477c9a46a140acca57db9d8047b8fcffdb87f51276ff1719857faed6e535 WHIRLPOOL 492790367f93b0e913ccb1c3c04c098473020f68236f6ec3c70eeb85023bbb913ecef366793996e4952b79dadd4d3687e167d8b9eed87daac950c6d66d9153bc
 DIST vala-0.28.0.tar.xz 2720652 SHA256 0d9e3bd3f82145664875f7c29b2f544ba92d2814f75412948f774c0727fc977f SHA512 4f9adc4a3e672c25b508f5193bb1984e848dcaca059c2eb733e93ca7f58b5d58028a56f4234a62baa30ff50b63d87af24510334eba41630692c5f16e580bad88 WHIRLPOOL cfdd97f90f033b030d768ed66e78b5f86b6e1e50bac34806cd70dda168a5ff3192249d08ee9e020e0ea33d753b20aa69c6e269c65fa193a19e6ae4353912c7d2
+DIST vala-0.28.1.tar.xz 2721228 SHA256 1c0eaea6134b75af17221cb699f13d7236d607bb48192565c3d865c38f184f47 SHA512 41e58eebd7a333a928c52e6493f6677c63f9c6f57da7876b8e9edf138eaf5477a0d18266cdec6029d7c21cd711b709050a2ef99bc6b31ce618fbbef7e0b072af WHIRLPOOL 73b072552f0c8bd18db2255759b73a7711a6170a13c1c96503a3ffad48d3355cbda4064a2e9cefc42b3894d0a91c1979b943bc583f6bdb34ef8d52649ff726c4
diff --git a/dev-libs/vala-common/vala-common-0.28.1.ebuild b/dev-libs/vala-common/vala-common-0.28.1.ebuild
new file mode 100644
index 000000000000..d0429d0678ac
--- /dev/null
+++ b/dev-libs/vala-common/vala-common-0.28.1.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GNOME_ORG_MODULE="vala"
+
+inherit gnome.org
+
+DESCRIPTION="Build infrastructure for packages that use Vala"
+HOMEPAGE="https://wiki.gnome.org/Vala"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x64-solaris"
+IUSE=""
+
+# Previously ${PN} was part of dev-lang/vala
+RDEPEND="
+	!<dev-lang/vala-0.10.4-r2
+	!<dev-lang/vala-0.12.1-r1:0.12
+	!<dev-lang/vala-0.14.2-r2:0.14
+	!<dev-lang/vala-0.16.1-r2:0.16
+	!<dev-lang/vala-0.17.5:0.18
+"
+DEPEND=""
+
+src_configure() { :; }
+
+src_compile() { :; }
+
+src_install() {
+	insinto /usr/share/aclocal
+	doins vala.m4 vapigen/vapigen.m4
+	insinto /usr/share/vala
+	doins vapigen/Makefile.vapigen
+}
+
+pkg_postinst() {
+	# Hack to prevent alternatives_auto_makesym in previously installed
+	# dev-lang/vala's pkg_postrm from overwriting vala-common's files
+	if has_version '<dev-lang/vala-0.10.4-r2:0.10' && [[ -f "${EROOT}usr/share/aclocal/vala-0-10.m4" ]]; then
+		ebegin "Removing old vala-0.10 macros"
+		rm "${EROOT}usr/share/aclocal/vala-0-10.m4" &> /dev/null
+		eend $?
+	fi
+	if has_version '<dev-lang/vala-0.12.1-r1:0.12' && [[ -f "${EROOT}usr/share/aclocal/vala-0-12.m4" ]]; then
+		ebegin "Removing old vala-0.12 macros"
+		rm "${EROOT}usr/share/aclocal/vala-0-12.m4" &> /dev/null
+		eend $?
+	fi
+	if has_version '<dev-lang/vala-0.14.2-r2:0.14' && [[ -f "${EROOT}usr/share/aclocal/vala-0-14.m4" ]]; then
+		ebegin "Removing old vala-0.14 macros"
+		rm "${EROOT}usr/share/aclocal/vala-0-14.m4" &> /dev/null
+		eend $?
+	fi
+	if has_version '<dev-lang/vala-0.16.1-r2:0.16' && [[ -f "${EROOT}usr/share/aclocal/vala-0-16.m4" ]]; then
+		ebegin "Removing old vala-0.16 macros"
+		rm "${EROOT}usr/share/aclocal/vala-0-14.m4" &> /dev/null
+		eend $?
+		if [[ -f "${EROOT}usr/share/vala-0.16/Makefile.vapigen" ]]; then
+			ebegin "Removing old vala-0.16 makefile template"
+			rm "${EROOT}usr/share/vala-0.16/Makefile.vapigen" &> /dev/null
+			eend $?
+		fi
+	fi
+	if has_version '<dev-lang/vala-0.17.5:0.18' && [[ -f "${EROOT}usr/share/aclocal/vala-0-18.m4" ]]; then
+		ebegin "Removing old vala-0.18 macros"
+		rm "${EROOT}usr/share/aclocal/vala-0-12.m4" &> /dev/null
+		eend $?
+		if [[ -f "${EROOT}usr/share/vala-0.18/Makefile.vapigen" ]]; then
+			ebegin "Removing old vala-0.18 makefile template"
+			rm "${EROOT}usr/share/vala-0.18/Makefile.vapigen" &> /dev/null
+			eend $?
+		fi
+	fi
+}
diff --git a/dev-libs/wayland/wayland-1.7.0.ebuild b/dev-libs/wayland/wayland-1.7.0.ebuild
index a1d85ff23b3b..169d14c7f993 100644
--- a/dev-libs/wayland/wayland-1.7.0.ebuild
+++ b/dev-libs/wayland/wayland-1.7.0.ebuild
@@ -24,7 +24,7 @@ fi
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE="doc static-libs"
 
 RDEPEND=">=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}]
diff --git a/dev-lisp/sbcl/Manifest b/dev-lisp/sbcl/Manifest
index 3482acabf75b..a3c2b937453a 100644
--- a/dev-lisp/sbcl/Manifest
+++ b/dev-lisp/sbcl/Manifest
@@ -12,6 +12,8 @@ DIST sbcl-1.2.13-source.tar.bz2 5567609 SHA256 e6d93a94cbf821b2c500a9440ca640588
 DIST sbcl-1.2.13-x86-64-linux-binary.tar.bz2 10154344 SHA256 900e58adb9a449e3b5177207908a361de71be1e3aec712aff731ba9a9903f3ab SHA512 483aafc9b38cf317ea764d66e1faf70560cca4c04355ae0a0669692c985034335ec155fc9557acab8cc5f2ee668615985950b2fa96d0acc900b74aceeeafb64c WHIRLPOOL bc9218f7a32194a19b12cd218b2ebfb1dbce01717289241ba62a1b39a424fc2d0620c80b536d1c0a605322e99c52ae0f01d943bd93b7e4c1388ae9b7ab7464bc
 DIST sbcl-1.2.14-source.tar.bz2 5565538 SHA256 b9146dd6460c05bca508f6dda83003580911833eedd51dbc09d8eca80b0f5c06 SHA512 471b215419f9303e010cbfb99866e09a43cc68a63680b5267662a12585b145b9f520592c37c81eabfe81b102255cd82fabb74cca731d8c3eed50747df34a6e2c WHIRLPOOL e89cd4c2ff1b2716c0ba62aed6d2107f05094c053c91db8a14638a80a5b63f83102fc1c125164edf251ed2ca507e00c298a9278efe83ad5f3b27ab53ddd48131
 DIST sbcl-1.2.14-x86-64-linux-binary.tar.bz2 9723047 SHA256 e06a43a3490a2d9239b55a0e64b8c46d285ea509a940456013bfe90ba6a2dd2c SHA512 7c079c68104a44fd004b371f533502f478a7294b5577c7fd900adcdf22be1a18bdedeab3be259606c059d14c38c639f061866969ccd56e24fe64198dd96bf20c WHIRLPOOL 738f20eeeb50aef368c7fcdb7979a4c10f72f5889a9e7e0220a48be54d57f141ea0b2b59e10422878b227d5bdfe57eecaacdd6b3936a30535453c96925099806
+DIST sbcl-1.2.15-source.tar.bz2 5585753 SHA256 d95a6e8a4b658f9973825f8d44d6195a645b0d6a33d865324c0c658b8bcb1651 SHA512 a34947cff6d8e54068942df307a84a755d2ddb549d2da394545d3d37a821a8cccc3f4cab30741948e000c06bb3e422963e29a349007143a64bb97cc013c45771 WHIRLPOOL 13b413327525961f29dac6f91fb100383a3be515abc1db0255d94b5c1448b0f749defa5a36033883b57747412f5ec4646e303260f39ce7caa4f73dbea82ff231
+DIST sbcl-1.2.15-x86-64-linux-binary.tar.bz2 9799234 SHA256 5c1db23dfa6b8d2c0a66fe0b08928dd7dc50499be022388587e370d1d377ebae SHA512 15d4173d80b38f3dc32445a605e95618dd02386ca007e162b36a2f5808ab7f925f8246ccb4a68b02ec5d09af74919818ca2254e6593862b074f4b715796fc8ca WHIRLPOOL 29d40cb1c7c2af4a4b4666dacb373fc8af82fe95f058ca54d9232e75c957803d5b20338d74f37b87de05ce395b8954c2c89ed90d95a29570b40fcd76df4b634b
 DIST sbcl-1.2.7-armhf-linux-binary.tar.bz2 9914851 SHA256 5e75a328882b739befcf5c38e8039b830668a8ca7bafe56a9e13ef23f39eb253 SHA512 2c82bdfe4f070a43964e694f81ccdbb84f8dd3bf77c807343daadff877b518fcd52e05513691543ca076c2b6de8bcf8b2e672b31f5ed3f545bedb02bbf7cd868 WHIRLPOOL 8e0eab53a9bfe10a1ccaa5c950e9fe045aeaa23f9f66ca98badd5a0fce3ad5828c0059904c73584dd4591fb3f9b2eefb5210a19f2de9fd8d699d48b0cee3bbef
 DIST sbcl-1.2.7-powerpc-linux-binary.tar.bz2 9884585 SHA256 d2f86db4f6fe2b6e6bbc6353ce28dead1b142ed36885080b97304db55aae2861 SHA512 7b9fef12d3d6397adec6a0c26d1431a18b8d91b5bf009034eb2501de9fd60dc04dd2e3cd2d9feb9204d4631360aea88ba07a9ad75dad0767b5dcc5e62e84e790 WHIRLPOOL 4b884ab946e8c54775970aa502054f42a92d01257449796c7d1a6bd1ff5835ddae1c94aa5d936a7a5b115183c6cee5251034646559e4435a6663896fa302c4be
 DIST sbcl-1.2.7-x86-64-solaris-binary.tar.bz2 10438955 SHA256 a0a13e83b35dbac36284459747a03c6db20cd089864e16a6380a12a6aa138115 SHA512 9566cebf8fc29ead1f919309e3f98aeb618e97b34c80f53d1f739f1a3f4ef4cbaebd1c67f0b32172a0cdf14dc405eb75d0e916dedf3b8a758cdec2368d25f5c1 WHIRLPOOL 4946b9a4463c92517233298f898510ca57b4127da93d7d42cf28005bbd96b8d1eba7472f73029f45d6c0e75f3de5b893a34f33feee92a60cef8ae4f2b4d4fa0e
diff --git a/dev-lisp/sbcl/sbcl-1.2.15.ebuild b/dev-lisp/sbcl/sbcl-1.2.15.ebuild
new file mode 100644
index 000000000000..fd1bea7afdfa
--- /dev/null
+++ b/dev-lisp/sbcl/sbcl-1.2.15.ebuild
@@ -0,0 +1,236 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit multilib eutils flag-o-matic pax-utils
+
+#same order as http://www.sbcl.org/platform-table.html
+BV_X86=1.2.7
+BV_AMD64=1.2.15
+BV_PPC=1.2.7
+BV_SPARC=1.0.28
+BV_ALPHA=1.0.28
+BV_ARM=1.2.7
+BV_PPC_MACOS=1.0.47
+BV_X86_MACOS=1.1.6
+BV_X64_MACOS=1.1.8
+BV_SPARC_SOLARIS=1.0.23
+BV_X86_SOLARIS=1.2.7
+BV_X64_SOLARIS=1.2.7
+
+DESCRIPTION="Steel Bank Common Lisp (SBCL) is an implementation of ANSI Common Lisp"
+HOMEPAGE="http://sbcl.sourceforge.net/"
+SRC_URI="mirror://sourceforge/sbcl/${P}-source.tar.bz2
+	x86? ( mirror://sourceforge/sbcl/${PN}-${BV_X86}-x86-linux-binary.tar.bz2 )
+	amd64? ( mirror://sourceforge/sbcl/${PN}-${BV_AMD64}-x86-64-linux-binary.tar.bz2 )
+	ppc? ( mirror://sourceforge/sbcl/${PN}-${BV_PPC}-powerpc-linux-binary.tar.bz2 )
+	sparc? ( mirror://sourceforge/sbcl/${PN}-${BV_SPARC}-sparc-linux-binary.tar.bz2 )
+	alpha? ( mirror://sourceforge/sbcl/${PN}-${BV_ALPHA}-alpha-linux-binary.tar.bz2 )
+	arm? ( mirror://sourceforge/sbcl/${PN}-${BV_ARM}-armhf-linux-binary.tar.bz2 )
+	ppc-macos? ( mirror://sourceforge/sbcl/${PN}-${BV_PPC_MACOS}-powerpc-darwin-binary.tar.bz2 )
+	x86-macos? ( mirror://sourceforge/sbcl/${PN}-${BV_X86_MACOS}-x86-darwin-binary.tar.bz2 )
+	x64-macos? ( mirror://sourceforge/sbcl/${PN}-${BV_X64_MACOS}-x86-64-darwin-binary.tar.bz2 )
+	sparc-solaris? ( mirror://sourceforge/sbcl/${PN}-${BV_SPARC_SOLARIS}-sparc-solaris-binary.tar.bz2 )
+	x86-solaris? ( mirror://sourceforge/sbcl/${PN}-${BV_X86_SOLARIS}-x86-solaris-binary.tar.bz2 )
+	x64-solaris? ( mirror://sourceforge/sbcl/${PN}-${BV_X64_SOLARIS}-x86-64-solaris-binary.tar.bz2 )"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x86-solaris"
+IUSE="debug doc source +threads +unicode pax_kernel zlib"
+
+CDEPEND=">=dev-lisp/asdf-3.1:="
+DEPEND="${CDEPEND}
+		doc? ( sys-apps/texinfo >=media-gfx/graphviz-2.26.0 )
+		pax_kernel? ( sys-apps/paxctl sys-apps/elfix )"
+RDEPEND="${CDEPEND}
+		!prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.6 ) )"
+
+# Disable warnings about executable stacks, as this won't be fixed soon by upstream
+QA_EXECSTACK="usr/bin/sbcl"
+
+CONFIG="${S}/customize-target-features.lisp"
+ENVD="${T}/50sbcl"
+
+# Prevent ASDF from using the system libraries
+CL_SOURCE_REGISTRY="(:source-registry :ignore-inherited-configuration)"
+ASDF_OUTPUT_TRANSLATIONS="(:output-translations :ignore-inherited-configuration)"
+
+usep() {
+	use ${1} && echo "true" || echo "false"
+}
+
+sbcl_feature() {
+	echo "$( [[ ${1} == "true" ]] && echo "(enable ${2})" || echo "(disable ${2})")" >> "${CONFIG}"
+}
+
+sbcl_apply_features() {
+	sed 's/^X//' > "${CONFIG}" <<-'EOF'
+	(lambda (list)
+	X  (flet ((enable  (x) (pushnew x list))
+	X         (disable (x) (setf list (remove x list))))
+	EOF
+	if use x86 || use amd64; then
+		sbcl_feature "$(usep threads)" ":sb-thread"
+	fi
+	sbcl_feature "true" ":sb-ldb"
+	sbcl_feature "false" ":sb-test"
+	sbcl_feature "$(usep unicode)" ":sb-unicode"
+	sbcl_feature "$(usep zlib)" ":sb-core-compression"
+	sbcl_feature "$(usep debug)" ":sb-xref-for-internals"
+	sed 's/^X//' >> "${CONFIG}" <<-'EOF'
+	X    )
+	X  list)
+	EOF
+	cat "${CONFIG}"
+}
+
+src_unpack() {
+	unpack ${A}
+	mv sbcl-*-* sbcl-binary || die
+	cd "${S}"
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/gentoo-fix_install_man.patch
+	# bug #468482
+	epatch "${FILESDIR}"/concurrency-test-1.2.6.patch
+	# bugs #486552, #527666, #517004
+	epatch "${FILESDIR}"/bsd-sockets-test-1.2.11.patch
+
+	epatch "${FILESDIR}"/${PN}-1.2.11-solaris.patch
+	epatch "${FILESDIR}"/${PN}-1.2.13-verbose-build.patch
+
+	# To make the hardened compiler NOT compile with -fPIE -pie
+	if gcc-specs-pie ; then
+		einfo "Disabling PIE..."
+		epatch "${FILESDIR}"/${PN}-1.1.17-gentoo-fix_nopie_for_hardened_toolchain.patch
+	fi
+
+	# bug #526194
+	sed -e "s@CFLAGS =.*\$@CFLAGS = ${CFLAGS} -g -Wall -Wsign-compare@" \
+		-e "s@LINKFLAGS =.*\$@LINKFLAGS = ${LDFLAGS} -g@" \
+		-i src/runtime/GNUmakefile || die
+
+	sed -e "s@SBCL_PREFIX=\"/usr/local\"@SBCL_PREFIX=\"${EPREFIX}/usr\"@" \
+		-i make-config.sh || die
+
+	cp "${EPREFIX}"/usr/share/common-lisp/source/asdf/build/asdf.lisp contrib/asdf/ || die
+
+	use source && sed 's%"$(BUILD_ROOT)%$(MODULE).lisp "$(BUILD_ROOT)%' -i contrib/vanilla-module.mk
+
+	# Some shells(such as dash) don't have "time" as builtin
+	# and we don't want to DEPEND on sys-process/time
+	sed "s,^time ,," -i make.sh || die
+	sed "s,/lib,/$(get_libdir),g" -i install.sh || die
+	# #define SBCL_HOME ...
+	sed "s,/usr/local/lib,${EPREFIX}/usr/$(get_libdir),g" -i src/runtime/runtime.c || die
+	# change location of /etc/sbclrc ...
+	sed  "s,/etc/sbclrc,${EPREFIX}/etc/sbclrc,g" -i src/code/toplevel.lisp || die
+
+	find . -type f -name .cvsignore -delete
+}
+
+src_configure() {
+	# customizing SBCL version as per
+	# http://sbcl.cvs.sourceforge.net/sbcl/sbcl/doc/PACKAGING-SBCL.txt?view=markup
+	echo -e ";;; Auto-generated by Gentoo\n\"gentoo-${PR}\"" > branch-version.lisp-expr
+
+	# applying customizations
+	sbcl_apply_features
+}
+
+src_compile() {
+	local bindir="${WORKDIR}"/sbcl-binary
+
+	strip-unsupported-flags ; filter-flags -fomit-frame-pointer
+
+	if host-is-pax ; then
+		# To disable PaX on hardened systems
+		pax-mark -mr "${bindir}"/src/runtime/sbcl
+
+		# Hack to disable PaX on second GENESIS stage
+		sed -i -e '/^[ \t]*echo \/\/doing warm init - compilation phase$/a\    paxmark.sh -mr \.\/src\/runtime\/sbcl' \
+			"${S}"/make-target-2.sh || die "Cannot disable PaX on second GENESIS runtime"
+	fi
+
+	# clear the environment to get rid of non-ASCII strings, see bug 174702
+	# set HOME for paludis
+	env - HOME="${T}" PATH="${PATH}" \
+		CC="$(tc-getCC)" AS="$(tc-getAS)" LD="$(tc-getLD)" \
+		CPPFLAGS="${CPPFLAGS}" CFLAGS="${CFLAGS}" ASFLAGS="${ASFLAGS}" LDFLAGS="${LDFLAGS}" \
+		GNUMAKE=make ./make.sh \
+		"sh ${bindir}/run-sbcl.sh --no-sysinit --no-userinit --disable-debugger" \
+		|| die "make failed"
+
+	# need to set HOME because libpango(used by graphviz) complains about it
+	if use doc; then
+		env - HOME="${T}" PATH="${PATH}" \
+			CL_SOURCE_REGISTRY="(:source-registry :ignore-inherited-configuration)" \
+			ASDF_OUTPUT_TRANSLATIONS="(:output-translations :ignore-inherited-configuration)" \
+			make -C doc/manual info html || die "Cannot build manual"
+		env - HOME="${T}" PATH="${PATH}" \
+			CL_SOURCE_REGISTRY="(:source-registry :ignore-inherited-configuration)" \
+			ASDF_OUTPUT_TRANSLATIONS="(:output-translations :ignore-inherited-configuration)" \
+			make -C doc/internals info html || die "Cannot build internal docs"
+	fi
+}
+
+src_test() {
+	ewarn "Unfortunately, it is known that some tests fail eg."
+	ewarn "run-program.impure.lisp. This is an issue of the upstream's"
+	ewarn "development and not of Gentoo's side. Please, before filing"
+	ewarn "any bug(s) search for older submissions. Thank you."
+	time ( cd tests && sh run-tests.sh )
+}
+
+src_install() {
+	# install system-wide initfile
+	dodir /etc/
+	sed 's/^X//' > "${ED}"/etc/sbclrc <<-EOF
+	;;; The following is required if you want source location functions to
+	;;; work in SLIME, for example.
+	X
+	(setf (logical-pathname-translations "SYS")
+	X      '(("SYS:SRC;**;*.*.*" #p"${EPREFIX}/usr/$(get_libdir)/sbcl/src/**/*.*")
+	X        ("SYS:CONTRIB;**;*.*.*" #p"${EPREFIX}/usr/$(get_libdir)/sbcl/**/*.*")))
+	X
+	;;; Setup ASDF2
+	(load "${EPREFIX}/etc/common-lisp/gentoo-init.lisp")
+	EOF
+
+	# Install documentation
+	unset SBCL_HOME
+	INSTALL_ROOT="${ED}/usr" LIB_DIR="${EPREFIX}/usr/$(get_libdir)" DOC_DIR="${ED}/usr/share/doc/${PF}" \
+		sh install.sh || die "install.sh failed"
+
+	# bug #517008
+	pax-mark -mr "${D}"/usr/bin/sbcl
+
+	# rm empty directories lest paludis complain about this
+	find "${ED}" -empty -type d -exec rmdir -v {} +
+
+	if use doc; then
+		dohtml -r doc/manual/
+		doinfo doc/manual/*.info*
+		dohtml -r doc/internals/sbcl-internals
+		doinfo doc/internals/sbcl-internals.info
+		docinto internals-notes && dodoc doc/internals-notes/*
+	else
+		rm -Rv "${ED}/usr/share/doc/${PF}" || die
+	fi
+
+	dodoc BUGS CREDITS INSTALL NEWS OPTIMIZATIONS PRINCIPLES README TLA TODO
+
+	# install the SBCL source
+	if use source; then
+		./clean.sh
+		cp -av src "${ED}/usr/$(get_libdir)/sbcl/" || die
+	fi
+
+	# necessary for running newly-saved images
+	echo "SBCL_HOME=${EPREFIX}/usr/$(get_libdir)/${PN}" > "${ENVD}"
+	echo "SBCL_SOURCE_ROOT=${EPREFIX}/usr/$(get_libdir)/${PN}/src" >> "${ENVD}"
+	doenvd "${ENVD}"
+}
diff --git a/dev-lua/lanes/lanes-3.10.0.ebuild b/dev-lua/lanes/lanes-3.10.0.ebuild
index c08fc51dd24d..40b6385f4970 100644
--- a/dev-lua/lanes/lanes-3.10.0.ebuild
+++ b/dev-lua/lanes/lanes-3.10.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/LuaLanes/lanes/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE=""
 
 COMMON_DEPEND=">=dev-lang/lua-5.1"
diff --git a/dev-ml/core_kernel/Manifest b/dev-ml/core_kernel/Manifest
index df81f63fd697..3092c23a3c06 100644
--- a/dev-ml/core_kernel/Manifest
+++ b/dev-ml/core_kernel/Manifest
@@ -1,4 +1 @@
-DIST core_kernel-112.06.02.tar.gz 452217 SHA256 edb53c71dac1744e4d79c98bb4defc9703b22bc6ed3db6f5efc527ec91febac8 SHA512 36bddbebe943fea14f7e40c55939ee2004aa1b8d28efdea89c29808af5940553c2ea252e21a9c2a6bbb5c7210e24c3d320f67737ac988e6844d1cc4a4d6eeb87 WHIRLPOOL b75d7d165c43af0a8024275583b0dc9d40ce43528f36b9a3896fad5df131afa31b066d6cd78416f84468af60950c2cd7f0713c57a7b11afc6fc559376e5f5545
-DIST core_kernel-112.17.00.tar.gz 458291 SHA256 18aa416e917e84c368f25ecb2e5e11c92e411310476db5ea67fd3352d5ef469c SHA512 6f586dec373d57ff9bc04be1fbaf265c4740a12dffd99ca3909a23056874f402e19ec61f30879f247c44715ccdbbfb1cc8d496256fd512ba78909b956a2ee1a7 WHIRLPOOL 940522269f21380fbd8b3c14151427ce82301f74df16f5499584d85d31dc96e9f6f7f3563a2471c598d0aa601e8678b3a33cdcc524c18c776b0571990162dffb
-DIST core_kernel-112.24.tar.gz 498860 SHA256 93e1f21e35ade98a2bfbe45ba76eef4a8ad3fed97cdc0769f96e0fcc86d6a761 SHA512 2cc54e580dbcdfba76cdaca76531b1d161d85c686b7cae296cb0ef424f8b01da3af19e0b54ea29954dd2fd96ee797360a40a213a11869b11f28891271756cbd3 WHIRLPOOL 964db4c0760835083a1204655be3b7982813b0e2aa59b02a4142e65bc6568737d1b57d2a8cacb0ab33376e3464630cba8b55dcda08ba680142b16961d668fbec
 DIST core_kernel-112.35.00.tar.gz 513245 SHA256 792303cb06fa580c2c0fa25589e19be8f08714850db86d0077b1712bfe0ef662 SHA512 abdc16bb9eea9af7e322e190a0d229f95bb99fdc6f721f485663e59ba16f15cab5a2d2507721e53e71351051268b3f3fe487fc9e1579564020a81d79a1aeb175 WHIRLPOOL 2e7bc43fe1087380f0ae0b5efbce620ecd4e6160d124db14767be65183904b63fb19a9cf13c144e6745a11f1e8694ee1fc9084bcefd7cc36838de118681b8d35
diff --git a/dev-ml/core_kernel/core_kernel-112.06.02.ebuild b/dev-ml/core_kernel/core_kernel-112.06.02.ebuild
deleted file mode 100644
index 79cf21ab9d63..000000000000
--- a/dev-ml/core_kernel/core_kernel-112.06.02.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-OASIS_BUILD_DOCS=1
-OASIS_BUILD_TESTS=1
-
-inherit oasis
-
-DESCRIPTION="System-independent part of Core"
-HOMEPAGE="http://www.janestreet.com/ocaml"
-SRC_URI="http://ocaml.janestreet.com/ocaml-core/${PV}/individual/${P}.tar.gz
-	https://dev.gentoo.org/~aballier/distfiles/${P}.tar.gz"
-
-LICENSE="LGPL-2.1-with-linking-exception"
-SLOT="0/${PV}"
-KEYWORDS="~amd64"
-IUSE=""
-RESTRICT="test"
-
-RDEPEND="
-	>=dev-ml/bin-prot-112.06.00:=
-	>=dev-ml/comparelib-109.27.00:=
-	>=dev-ml/fieldslib-109.20.00:=
-	>=dev-ml/herelib-109.35.00:=
-	>=dev-ml/pa_ounit-109.27.00:=
-	>=dev-ml/pipebang-109.15.00:=
-	>=dev-ml/sexplib-109.20.00:=
-	>=dev-ml/variantslib-109.15.00:=
-	dev-ml/custom_printf:=
-	dev-ml/pa_test:=
-	dev-ml/enumerate:=
-	dev-ml/pa_bench:=
-	>=dev-ml/typerep-111.17:=
-	dev-ml/camlp4:=
-	!dev-ml/zero
-	"
-DEPEND="${RDEPEND}
-	test? (
-		dev-ml/pa_ounit
-		>=dev-ml/core-109.60.00
-	)"
-DOCS=( "README.md" )
diff --git a/dev-ml/core_kernel/core_kernel-112.17.00.ebuild b/dev-ml/core_kernel/core_kernel-112.17.00.ebuild
deleted file mode 100644
index 3bf476ce4785..000000000000
--- a/dev-ml/core_kernel/core_kernel-112.17.00.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-OASIS_BUILD_DOCS=1
-OASIS_BUILD_TESTS=1
-
-inherit oasis
-
-DESCRIPTION="System-independent part of Core"
-HOMEPAGE="http://www.janestreet.com/ocaml"
-SRC_URI="http://ocaml.janestreet.com/ocaml-core/${PV%.*}/files/${P}.tar.gz"
-
-LICENSE="LGPL-2.1-with-linking-exception"
-SLOT="0/${PV}"
-KEYWORDS="~amd64"
-IUSE=""
-
-RDEPEND="
-	>=dev-ml/bin-prot-112.17.00:=
-	>=dev-ml/comparelib-109.27.00:=
-	>=dev-ml/fieldslib-109.20.00:=
-	>=dev-ml/herelib-109.35.00:=
-	>=dev-ml/pa_ounit-109.27.00:=
-	>=dev-ml/pipebang-109.15.00:=
-	>=dev-ml/sexplib-109.20.00:=
-	>=dev-ml/variantslib-109.15.00:=
-	dev-ml/pa_test:=
-	dev-ml/enumerate:=
-	dev-ml/pa_bench:=
-	>=dev-ml/typerep-111.17:=
-	dev-ml/camlp4:=
-	!dev-ml/zero
-	"
-DEPEND="${RDEPEND}
-	test? (
-		dev-ml/pa_ounit
-		>=dev-ml/core-109.60.00
-	)"
-DOCS=( "README.md" )
diff --git a/dev-ml/core_kernel/core_kernel-112.24.00.ebuild b/dev-ml/core_kernel/core_kernel-112.24.00.ebuild
deleted file mode 100644
index 3f95c6a055ee..000000000000
--- a/dev-ml/core_kernel/core_kernel-112.24.00.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-OASIS_BUILD_DOCS=1
-OASIS_BUILD_TESTS=1
-
-inherit oasis
-
-DESCRIPTION="System-independent part of Core"
-HOMEPAGE="http://www.janestreet.com/ocaml"
-SRC_URI="http://ocaml.janestreet.com/ocaml-core/${PV%.*}/files/${P%.*}.tar.gz"
-
-LICENSE="LGPL-2.1-with-linking-exception"
-SLOT="0/${PV}"
-KEYWORDS="~amd64"
-IUSE=""
-
-RDEPEND="
-	>=dev-ml/bin-prot-112.17.00:=
-	>=dev-ml/comparelib-109.27.00:=
-	>=dev-ml/fieldslib-109.20.00:=
-	>=dev-ml/herelib-109.35.00:=
-	>=dev-ml/pa_ounit-109.27.00:=
-	>=dev-ml/pipebang-109.15.00:=
-	>=dev-ml/sexplib-109.20.00:=
-	>=dev-ml/variantslib-109.15.00:=
-	dev-ml/pa_test:=
-	dev-ml/enumerate:=
-	dev-ml/pa_bench:=
-	>=dev-ml/typerep-111.17:=
-	dev-ml/camlp4:=
-	!dev-ml/zero
-	"
-DEPEND="${RDEPEND}
-	test? (
-		dev-ml/pa_ounit
-		>=dev-ml/core-109.60.00
-	)"
-DOCS=( "README.md" )
diff --git a/dev-ml/core_kernel/core_kernel-112.35.00.ebuild b/dev-ml/core_kernel/core_kernel-112.35.00.ebuild
index 3bf476ce4785..9c8dd9153b59 100644
--- a/dev-ml/core_kernel/core_kernel-112.35.00.ebuild
+++ b/dev-ml/core_kernel/core_kernel-112.35.00.ebuild
@@ -27,6 +27,7 @@ RDEPEND="
 	>=dev-ml/pipebang-109.15.00:=
 	>=dev-ml/sexplib-109.20.00:=
 	>=dev-ml/variantslib-109.15.00:=
+	dev-ml/custom_printf:=
 	dev-ml/pa_test:=
 	dev-ml/enumerate:=
 	dev-ml/pa_bench:=
diff --git a/dev-perl/Archive-Zip/Archive-Zip-1.450.0.ebuild b/dev-perl/Archive-Zip/Archive-Zip-1.450.0.ebuild
deleted file mode 100644
index 1e55afa4d7db..000000000000
--- a/dev-perl/Archive-Zip/Archive-Zip-1.450.0.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-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/Archive-Zip-1.460.0.ebuild b/dev-perl/Archive-Zip/Archive-Zip-1.460.0.ebuild
deleted file mode 100644
index d2668d698039..000000000000
--- a/dev-perl/Archive-Zip/Archive-Zip-1.460.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MODULE_AUTHOR=PHRED
-MODULE_VERSION=1.46
-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="test"
-
-RDEPEND="
-	>=virtual/perl-Compress-Raw-Zlib-2.17.0
-	>=virtual/perl-File-Spec-0.800.0
-	virtual/perl-File-Temp
-	virtual/perl-IO
-"
-DEPEND="${RDEPEND}
-	virtual/perl-ExtUtils-MakeMaker
-	test? ( >=virtual/perl-Test-Simple-0.880.0 )
-"
-
-SRC_TEST=do
diff --git a/dev-perl/Archive-Zip/Archive-Zip-1.500.0.ebuild b/dev-perl/Archive-Zip/Archive-Zip-1.500.0.ebuild
new file mode 100644
index 000000000000..89972c5d9ca5
--- /dev/null
+++ b/dev-perl/Archive-Zip/Archive-Zip-1.500.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+MODULE_AUTHOR=PHRED
+MODULE_VERSION=1.50
+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="test"
+
+RDEPEND="
+	>=virtual/perl-Compress-Raw-Zlib-2.17.0
+	>=virtual/perl-File-Spec-0.800.0
+	virtual/perl-File-Temp
+	virtual/perl-IO
+"
+DEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? ( >=virtual/perl-Test-Simple-0.880.0 )
+"
+
+SRC_TEST="do parallel"
diff --git a/dev-perl/Archive-Zip/Manifest b/dev-perl/Archive-Zip/Manifest
index 40228fcf3ebc..22145c0e029c 100644
--- a/dev-perl/Archive-Zip/Manifest
+++ b/dev-perl/Archive-Zip/Manifest
@@ -1,5 +1,4 @@
 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
-DIST Archive-Zip-1.46.tar.gz 186426 SHA256 6630ebeba753a7025126028eb290040ce44d86e8ced77017e31b75863348e524 SHA512 b1aee295cd6b9f64b5168d978ac5ba756c503c868b952b0ce345914196b9f249a54ed1a063c43d11b41bf247e0bfe51c6dc0219e93c545823b61a7b969e81981 WHIRLPOOL c9a444aa9d494d2621a8615d9dd5ca80708bf3295db916bbba0e52d41d23256975e34468fe009261610fb901ecea69e3e3b6dbd132c9622a3ec209f45f945b8d
 DIST Archive-Zip-1.48.tar.gz 192695 SHA256 01cb4fbc491f9890ceabc33e9888f85261f3d17f884d2b9d8e54564befd9e09f SHA512 b636c870712d51afe1934ef6246e6654e0248052df49dcafdccf9bcde377f4822bd78a48ec39d9971fdaa80b5eb68ee9956553f98004e8edb9f9cc80903d1728 WHIRLPOOL 61c2972db1b953f8a9953ffa7b22a378519c5d817e106214c6d5598ec006bd7d7bb3bcdd383c5d60e244c4c80262224b555b91102794cc98ea263362a529c788
 DIST Archive-Zip-1.49.tar.gz 192903 SHA256 991622ea495daf395abcd69c3b9b8ac92a10435c8d9562d50e30ef395dcc9451 SHA512 78e34f4a122ff5ad516d9efa983de8ba7995b87107148658e5d4100d3d428c361c4ab2674fce1bc87cc4068bdd3277ea810a878175a5c3b4eed691c79a260664 WHIRLPOOL 77d57b0bf8c5b9820dd13302797a278b2db5ad3f5cd8df981115a7eff3ed794ca5b93d3df3403013ae4a124b26911891e6b365bca6e44950375a0086feba4254
+DIST Archive-Zip-1.50.tar.gz 188086 SHA256 514020ac15a3442867267f294f155065b4c0b1a09e6106837359d28d1e3e0eeb SHA512 3b79da1edb1e0c9bc72206a33d7ec1e44eec008b28de17236f7f40808deccf8c394c6fc66eb0efe9b60490a58b4e72f6c428a157147b812e1b148db867a2582d WHIRLPOOL cb252199d4c2ffbca5e8e4b4cef968e655bdf63b997a56a55ef22e9c11d4f5c0cc08a99d0facca75a4890a04fe8e389bf3644f894ddec38fe54e3d77856288cc
diff --git a/dev-perl/B-Hooks-Parser/B-Hooks-Parser-0.120.0-r1.ebuild b/dev-perl/B-Hooks-Parser/B-Hooks-Parser-0.120.0-r1.ebuild
deleted file mode 100644
index 6c26266ca96f..000000000000
--- a/dev-perl/B-Hooks-Parser/B-Hooks-Parser-0.120.0-r1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MODULE_AUTHOR=ETHER
-MODULE_VERSION=0.12
-inherit perl-module
-
-DESCRIPTION="Interface to perls parser variables"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RDEPEND="dev-perl/B-Hooks-OP-Check"
-DEPEND="${RDEPEND}
-	>=dev-perl/ExtUtils-Depends-0.302
-	test? ( dev-perl/Test-Exception
-		dev-perl/B-Hooks-EndOfScope )"
-SRC_TEST=do
diff --git a/dev-perl/B-Hooks-Parser/B-Hooks-Parser-0.160.0.ebuild b/dev-perl/B-Hooks-Parser/B-Hooks-Parser-0.160.0.ebuild
new file mode 100644
index 000000000000..70b5fd4286cd
--- /dev/null
+++ b/dev-perl/B-Hooks-Parser/B-Hooks-Parser-0.160.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+MODULE_AUTHOR=ETHER
+MODULE_VERSION=0.16
+inherit perl-module
+
+DESCRIPTION="Interface to perls parser variables"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND=">=dev-perl/B-Hooks-OP-Check-0.180.0"
+DEPEND="${RDEPEND}
+	>=dev-perl/ExtUtils-Depends-0.302.0
+	virtual/perl-ExtUtils-MakeMaker
+	test? (
+		dev-perl/Test-Exception
+		dev-perl/B-Hooks-EndOfScope
+		virtual/perl-File-Spec
+		virtual/perl-Test-Simple
+	)
+"
+
+SRC_TEST="do parallel"
diff --git a/dev-perl/B-Hooks-Parser/Manifest b/dev-perl/B-Hooks-Parser/Manifest
index 598f91f04265..e3996034de92 100644
--- a/dev-perl/B-Hooks-Parser/Manifest
+++ b/dev-perl/B-Hooks-Parser/Manifest
@@ -1,2 +1,2 @@
-DIST B-Hooks-Parser-0.12.tar.gz 72662 SHA256 cddbc1e664975ef1e35b5f9361ff993d9005507201463f9e5561a056ffbadb25 SHA512 d6c6cbe521362ec9b5efd7d4b920f26bd35a8d37073d2f803d9e0a6d1965b712ea4ba5d2cc8f4d8195fd3f71c7a247202055295395df733c997eb0c3d290a7e5 WHIRLPOOL 9c38e6b29193de7f1748130e3e25d24168beab0b43da3bdfe64355925fd11c21ece983f313d594a60c7e634b00da6ce68b163116662a88aa952cb66b7c71c415
 DIST B-Hooks-Parser-0.13.tar.gz 83951 SHA256 f6c838e59f52e21ccc0b2c9d85d6f7ba33119098ad3a261698b01690c2619646 SHA512 f1729830350d25f5decc4b08be23591920683d86d910bec99b478e58905dee6cc384af305b665a8a90dc48b9b819df6cbc975cf606b495448d25d00e3357a149 WHIRLPOOL d6505cbb95834b0a6084af24ba4f1ba96704016cf0180a79e479036d98567c29fbc42f60b91e5c72068e5403dc581d56c5b0493e173965ee571f9ce442094725
+DIST B-Hooks-Parser-0.16.tar.gz 84593 SHA256 24e65268da41976fe3055091554848f6ef6eedd0c5c1a708b0fca5fe10cabab6 SHA512 5079b7233b5d69c4347cace3131e736c973d6c63daf063b39338d2b91dd44880fbfb255b9e9aac291ec0614e747115d14c2b7e13425336b97352ee1a41a10a2a WHIRLPOOL 9c53d5621b1648ef3636282cf51cc23b619fc4ece408a29e4980789fbf053642d89c98ae319c17a8217789727a6239e99d5be2fd05f04fa5861cecccd7d7bd83
diff --git a/dev-perl/CPAN-Changes/CPAN-Changes-0.400.2.ebuild b/dev-perl/CPAN-Changes/CPAN-Changes-0.400.2.ebuild
new file mode 100644
index 000000000000..58f55db9743a
--- /dev/null
+++ b/dev-perl/CPAN-Changes/CPAN-Changes-0.400.2.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+MODULE_AUTHOR=HAARG
+MODULE_VERSION=0.400002
+inherit perl-module
+
+DESCRIPTION='Read and write Changes files'
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="
+	>=virtual/perl-Text-Tabs+Wrap-0.3.0
+	>=virtual/perl-version-0.990.600
+"
+DEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? ( >=virtual/perl-Test-Simple-0.960.0 )
+"
+
+SRC_TEST="do parallel"
diff --git a/dev-perl/CPAN-Changes/Manifest b/dev-perl/CPAN-Changes/Manifest
index 93dc409d5c57..50b598e3e04e 100644
--- a/dev-perl/CPAN-Changes/Manifest
+++ b/dev-perl/CPAN-Changes/Manifest
@@ -1,2 +1,3 @@
 DIST CPAN-Changes-0.27.tar.gz 35558 SHA256 386ca683109fa0a88064c2105dab5ea361d8e6de96cb065e8501ddffb6ffb191 SHA512 0034d51f27111bc376220afb35c72b958c6debd7c9f5cf5778705a45fa85a9f8609d0bdd62928a30a6d203301140591d96a8964308ca4a6617847e35099d72ac WHIRLPOOL a127fe1f00062373a4b54d55cf33be3cd5a2d24210f7f381ac7006f05b3c18e8988ab1a1b1bf853083bbdb700aae770b7d1323cd3607174e670f2056fb284d87
 DIST CPAN-Changes-0.30.tar.gz 37095 SHA256 e4ac13555163f22a7f99a9494f9db28c68b02447e08bce230515fc36a5cfa1ab SHA512 d262881ac574328714aa4b10b5e2e3d0c2f282dcd9f98b93df2ddb854b9601a9b2c324e22fbb1a8a491e67ddd334879a88bd6f407421366fa3b2eb3e6af40f4d WHIRLPOOL 1befce0638bf63ebc7ac29104f925a87398a6bce4fd7c57330eaa9f5fe20eb9af57037ef800129fa675a786be06884199f37a02a2e6073ea22623891432de116
+DIST CPAN-Changes-0.400002.tar.gz 21361 SHA256 01eedea90d07468cb58e4a50bfa3bb1d4eeda9073596add1118fc359153abe8d SHA512 d359073d9d5ed2126835d4895c1ee5288cc09e72202ba77441bb25cf13e9cd0f16d4040b7e2cf1785efd6e8ccbe7908415fb4fefeebe9c0548d838d2ac850dfb WHIRLPOOL 4a3cdd3cab1bee0b69372b0b5096ffdb625d013cf47744d7e2d466fa0d400bb2bb57057dd21d1cdb588df852f2792cd662128fba84cda7a0ff5762786cd90a8d
diff --git a/dev-perl/CPAN-Perl-Releases/CPAN-Perl-Releases-2.100.0.ebuild b/dev-perl/CPAN-Perl-Releases/CPAN-Perl-Releases-2.100.0.ebuild
deleted file mode 100644
index 00622f0907a0..000000000000
--- a/dev-perl/CPAN-Perl-Releases/CPAN-Perl-Releases-2.100.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-MODULE_AUTHOR=BINGOS
-MODULE_VERSION=2.10
-inherit perl-module
-
-DESCRIPTION='Mapping Perl releases on CPAN to the location of the tarballs'
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	virtual/perl-ExtUtils-MakeMaker
-	test? (
-		virtual/perl-File-Spec
-		virtual/perl-IO
-		>=virtual/perl-Test-Simple-0.470.0
-	)
-"
-
-SRC_TEST="do parallel"
diff --git a/dev-perl/CPAN-Perl-Releases/CPAN-Perl-Releases-2.340.0.ebuild b/dev-perl/CPAN-Perl-Releases/CPAN-Perl-Releases-2.340.0.ebuild
new file mode 100644
index 000000000000..a87410bf0d68
--- /dev/null
+++ b/dev-perl/CPAN-Perl-Releases/CPAN-Perl-Releases-2.340.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+MODULE_AUTHOR=BINGOS
+MODULE_VERSION=2.34
+inherit perl-module
+
+DESCRIPTION='Mapping Perl releases on CPAN to the location of the tarballs'
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? (
+		virtual/perl-File-Spec
+		virtual/perl-IO
+		>=virtual/perl-Test-Simple-0.470.0
+	)
+"
+
+SRC_TEST="do parallel"
diff --git a/dev-perl/CPAN-Perl-Releases/Manifest b/dev-perl/CPAN-Perl-Releases/Manifest
index 05c64d9c9485..48b85083ded5 100644
--- a/dev-perl/CPAN-Perl-Releases/Manifest
+++ b/dev-perl/CPAN-Perl-Releases/Manifest
@@ -1,2 +1,2 @@
-DIST CPAN-Perl-Releases-2.10.tar.gz 23180 SHA256 674be6e2808ec595bb73cef82126a83bbdb98c9844f600769aed9c54bc1c48f3 SHA512 f5f07becb3215d6d18332edd1e9260eaf6d9539ea7d00753bbc7088ca0d2ebd75196dc2fa8df42c2f1ab4aeec6891c67238555aab7a8756531d52cde31c8e1c1 WHIRLPOOL a9339267f66145f19d3d639f7dadf7b28a9962d1d5c783537d7429be490a2b4c8c7e26780254c2d6f84ef8e3d5c3ae0573ed2527aeeb5d8b800fa050c616ee81
 DIST CPAN-Perl-Releases-2.14.tar.gz 23361 SHA256 f25b724425ce874fc9c8dfc9a68635ee4f1607933a5c7d8d6f91fd5e958ab94b SHA512 413445ae36df4b9c93e7094242d2d7b54a943f2bbc0b2763ea0aebf0bdced7d7ae1a9996d39677053510715cd2862684504097b28864ebdbdaa7cf838a55bd53 WHIRLPOOL 248816017577b555a4e6829366f018da2d3b41d4ddb1ad29d461dcb6d2f4fb266ca0afb914646bdc3df595d1d5df712153685316fc586bebabf7cecf2ccb4423
+DIST CPAN-Perl-Releases-2.34.tar.gz 24163 SHA256 a4e3236b024c2b1b2f837222f433e6108b7adf926ec0883d205921d0d8e0928c SHA512 160014056e17cf6d6a111fd59beb4c5c6b574f992346821b5ed97e2d5b6e69ccfd0033572093eecfd8ed5384727ebb1dc56f7e59238573c85a182badc8cfe3cc WHIRLPOOL 7431e6a9e58e77b1d331611cbb4a31071e6285ccba659613ad74190032f29b10da100402c819b7014450facacddc8279cd610a6879cdae66a7e8104bfe3ad415
diff --git a/dev-perl/CSS-Packer/CSS-Packer-2.0.0.ebuild b/dev-perl/CSS-Packer/CSS-Packer-2.0.0.ebuild
new file mode 100644
index 000000000000..cc0c6a320250
--- /dev/null
+++ b/dev-perl/CSS-Packer/CSS-Packer-2.0.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+MODULE_AUTHOR=LEEJO
+MODULE_VERSION=2.00
+inherit perl-module
+
+DESCRIPTION='Another CSS minifier'
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="
+	>=dev-perl/Regexp-RegGrp-1.1.1_rc
+"
+DEPEND="${RDEPEND}
+	>=virtual/perl-ExtUtils-MakeMaker-6.590.0
+	test? ( virtual/perl-Test-Simple )
+"
+
+SRC_TEST="do parallel"
diff --git a/dev-perl/CSS-Packer/Manifest b/dev-perl/CSS-Packer/Manifest
index acd94bbb096e..03b9090c2996 100644
--- a/dev-perl/CSS-Packer/Manifest
+++ b/dev-perl/CSS-Packer/Manifest
@@ -1 +1,2 @@
 DIST CSS-Packer-1.002001.tar.gz 31201 SHA256 1cfb9d1d40861337f01ed9b449d3d258ab636fab03d978e0c21801624beb3e38 SHA512 d6dce678b7e9d661efa9cfbbe971865f8e89d589d5fe4b05032c8386c043f80f1700ead0e1526dfc0624f2e3514cec3d008578d503e8f494db8dbc866916c483 WHIRLPOOL fffeb4df7b33b3fc53fc29787516d715499552db82f65e086781271bb8b19ad063c1e5ee9bbc641db9c3d52f84e05d195349d8980315d4e53d397ba4d76f94d7
+DIST CSS-Packer-2.00.tar.gz 33199 SHA256 f4ad99319c6490e9c8d33f91bd1a465cce873584c152307340d3645d48640f85 SHA512 2b41bf85297ad5882a2a6fb5fd72c1d3c6b0c9073283a66ae2e99798c749e111e667ef2b6c2ca589198817c366d3070b1150182886f64f476a982420c2c6527b WHIRLPOOL 3c5079c824ac8f03df76f46b9611fca6d8a354c4dc3c943e3c40dcebc115298ba9c290f4fa8121a7f2445610b390da920c4b72b4a468ccf8566cd1bb5e629eb2
diff --git a/dev-perl/Canary-Stability/Canary-Stability-2006.ebuild b/dev-perl/Canary-Stability/Canary-Stability-2006.ebuild
index e9912f91bb17..2c24bac670d3 100644
--- a/dev-perl/Canary-Stability/Canary-Stability-2006.ebuild
+++ b/dev-perl/Canary-Stability/Canary-Stability-2006.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Canary to check perl compatibility for schmorp's modules"
 
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc64 ~x86"
 IUSE=""
 
 RDEPEND=""
diff --git a/dev-perl/Convert-BinHex/Convert-BinHex-1.124.0.ebuild b/dev-perl/Convert-BinHex/Convert-BinHex-1.124.0.ebuild
new file mode 100644
index 000000000000..4b81842fe395
--- /dev/null
+++ b/dev-perl/Convert-BinHex/Convert-BinHex-1.124.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+MODULE_AUTHOR=STEPHEN
+MODULE_VERSION=1.124
+inherit perl-module
+
+DESCRIPTION="Extract data from Macintosh BinHex files"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~x86"
+IUSE="test"
+
+RDEPEND="
+	virtual/perl-Carp
+	virtual/perl-Exporter
+"
+DEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? (
+		dev-perl/File-Slurp
+		virtual/perl-File-Temp
+		virtual/perl-autodie
+		virtual/perl-Test-Simple
+		dev-perl/Test-Most
+	)
+"
+
+SRC_TEST="do parallel"
diff --git a/dev-perl/Convert-BinHex/Manifest b/dev-perl/Convert-BinHex/Manifest
index 6e0fd5b40539..932ff2296ba5 100644
--- a/dev-perl/Convert-BinHex/Manifest
+++ b/dev-perl/Convert-BinHex/Manifest
@@ -1 +1,2 @@
 DIST Convert-BinHex-1.123.tar.gz 75876 SHA256 bd2028056297087a94d14d5390878f9aa69b0a6d186fe23f0925271e5bcfc440 SHA512 dc856ce8db67217e6e60daa59de2255348d0e5f9fc2d40e71a5f8fa36619a22e7deb9517b8fe7621d7f608f33ec12cd78bfd7ab65bd65e371ee720170c29129f WHIRLPOOL 97f3314e5a3903ae80dd39638dd9095f7bd35aca31eaf3093b39a8a5e7b941ac6d981f3fc611f1224521ad4c0a38a23bbd474099f0a2b054fe095bafdbe18e68
+DIST Convert-BinHex-1.124.tar.gz 73095 SHA256 42907b960ca70aa7be69b340ed567e8dd0b9d5e06541a5d89aa3a34255dabdb9 SHA512 79cc903c3c68680309ceab8312f909c32b8b90bdde3424081c1b81fac0371799f11a6d37702d14a58a5ca843706e3c4e8adf61daafd5fc2ab3922e49de8ec697 WHIRLPOOL 82c6e6003f183ccaba5e00d1e8ef24bd8f633d2b455521e1e13ea138a5753c36b8dfb763b8fb47283d7f21d4bad132114c1bd9262bab4202be6a5659f3fe4a7e
diff --git a/dev-perl/Convert-Binary-C/Convert-Binary-C-0.770.0.ebuild b/dev-perl/Convert-Binary-C/Convert-Binary-C-0.770.0.ebuild
new file mode 100644
index 000000000000..6be991eeeada
--- /dev/null
+++ b/dev-perl/Convert-Binary-C/Convert-Binary-C-0.770.0.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+MODULE_AUTHOR=MHX
+MODULE_VERSION=0.77
+inherit perl-module
+
+DESCRIPTION="Binary Data Conversion using C Types"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="virtual/perl-ExtUtils-MakeMaker"
+
+MAKEOPTS+=" -j1"
+SRC_TEST="do"
diff --git a/dev-perl/Convert-Binary-C/Manifest b/dev-perl/Convert-Binary-C/Manifest
index a4be452a8908..eed080a4310b 100644
--- a/dev-perl/Convert-Binary-C/Manifest
+++ b/dev-perl/Convert-Binary-C/Manifest
@@ -1 +1,2 @@
 DIST Convert-Binary-C-0.76.tar.gz 1562755 SHA256 4f0ce8dcee618f9a2309161994545b1d019742387627bf647459033ae94952e5 SHA512 d86b436866ce4ab3d346807dad8db7e453119334593cc203e96dc6c07214bf13717ad2a0ad0cc164d0a41429a161c17c82f711232572a4ab71eabba11649ae10 WHIRLPOOL 95fadda022c3147d274abd90156a536e401f45dce4f4767c4f372d4551273b119705f86e7198ca3c0d23dc1fcb2782307f21c3953b39871be1a67367a43b7a87
+DIST Convert-Binary-C-0.77.tar.gz 1562435 SHA256 fe33824fbdd20920658b36e0cd50bcb0d2924c83ab3240b861340d558dd7fc91 SHA512 662f1dc2080f3e432727553067826f09d20f30f0dbe09154eea4cbbdd5020d32f6839806365741e4aa54e8cb85eb948787904204cb2e029b9ec7eae605599d45 WHIRLPOOL 35227fcf1d1833c92ad9ea6a9e28a122307868285f0a7709c7392c6d626477b6e1a9c35a399590303c18f08dc48f35a7e17b6384a5ddb84d39b566dda148c9b8
diff --git a/dev-perl/Convert-UUlib/Convert-UUlib-1.500.0.ebuild b/dev-perl/Convert-UUlib/Convert-UUlib-1.500.0.ebuild
new file mode 100644
index 000000000000..b58488f00a89
--- /dev/null
+++ b/dev-perl/Convert-UUlib/Convert-UUlib-1.500.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+MODULE_AUTHOR=MLEHMANN
+MODULE_VERSION=1.5
+inherit perl-module
+
+DESCRIPTION="A Perl interface to the uulib library"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc64 ~x86"
+IUSE=""
+
+PATCHES=( "${FILESDIR}/${P}-unbundle.patch" )
+
+RDEPEND="
+	>=dev-libs/uulib-0.5.20-r1
+"
+DEPEND="${RDEPEND}
+	>=virtual/perl-ExtUtils-MakeMaker-6.520.0
+	dev-perl/Canary-Stability
+"
+
+SRC_TEST="do parallel"
diff --git a/dev-perl/Convert-UUlib/Manifest b/dev-perl/Convert-UUlib/Manifest
index 5bc389009657..7489ef77fd9e 100644
--- a/dev-perl/Convert-UUlib/Manifest
+++ b/dev-perl/Convert-UUlib/Manifest
@@ -1 +1,2 @@
 DIST Convert-UUlib-1.4.tar.gz 232006 SHA256 a85fe375bad0b7b8411719b27ac395ba804356d2fc528e9f127e1018cd95efcf SHA512 97dae96b173cfdaf35126f70a883b3462977c3bfb281334f2e54c66ba518ce936ae3046d911ed0a39974df47d0b46bc286afb01faa0d934895402049b3f79cfd WHIRLPOOL d195a34fc1dec5dfd971d6908afef9f7e68856ca82104dea92514132ff1dbf846e322265a17c531746cf76e8892aa2ea5f8c694d10aa6ed7eec3262a5058489b
+DIST Convert-UUlib-1.5.tar.gz 236213 SHA256 0cd81bc21377fad191f89aa427733efe5b7e75ca1889e9317945ad448c6388ea SHA512 92c8b6f3a72546dca21018ddf2863113904f550e3ed950a1898ed4abfcc48738e9ca374f5adbc3226df2db6beeb0e12879ae52cdd067a030c199766d53603ec1 WHIRLPOOL 59faba3ce22e4e9c7f464f2e1980524cb29cb0cf6b145765f4f2291e545ec74a27955b63375a3b9dad69a085800ed18bcc8f494dcfdbb0bce2b7363e356978ec
diff --git a/dev-perl/Convert-UUlib/files/Convert-UUlib-1.500.0-unbundle.patch b/dev-perl/Convert-UUlib/files/Convert-UUlib-1.500.0-unbundle.patch
new file mode 100644
index 000000000000..70ebebb4be3b
--- /dev/null
+++ b/dev-perl/Convert-UUlib/files/Convert-UUlib-1.500.0-unbundle.patch
@@ -0,0 +1,37 @@
+diff -ruN Convert-UUlib-1.5.orig/Makefile.PL Convert-UUlib-1.5/Makefile.PL
+--- Convert-UUlib-1.5.orig/Makefile.PL	2015-07-11 03:56:33.000000000 +0200
++++ Convert-UUlib-1.5/Makefile.PL	2015-09-07 00:13:44.355717466 +0200
+@@ -2,23 +2,6 @@
+ 
+ use Canary::Stability Convert::UUlib => 1;
+ 
+-sub MY::postamble {
+-    my $postamble =<<'END';
+-
+-uulib/Makefile:
+-	cd uulib && ./configure --with-cc='$(CC)' --with-cflags='$(OPTIMIZE) $(CFLAGS) $(CCCDLFLAGS)'
+-
+-clean::
+-	-cd uulib && make distclean
+-
+-force:
+-
+-$(MYEXTLIB): uulib/Makefile uulib/uulib.c force
+-	cd uulib && $(MAKE) all
+-
+-END
+-}
+-
+ WriteMakefile(
+     'dist'	=> {
+ 	            PREOP	=> 'pod2text UUlib.pm | tee README >$(DISTVNAME)/README; chmod -R u=rwX,go=rX . ; chmod -R u=rwX,go=rX . ;',
+@@ -27,8 +10,7 @@
+ 	           },
+     'NAME'	=> 'Convert::UUlib',
+     'VERSION_FROM' => 'UUlib.pm',
+-    'MYEXTLIB'  => 'uulib/libuu$(LIB_EXT)',
+-    'LIBS'	=> [''],
++    'LIBS'	=> ['-luu'],
+     'DEFINE'	=> '',
+     'INC'	=> '',
+     CONFIGURE_REQUIRES => {
diff --git a/dev-perl/Crypt-Rijndael/Crypt-Rijndael-1.130.0.ebuild b/dev-perl/Crypt-Rijndael/Crypt-Rijndael-1.130.0.ebuild
new file mode 100644
index 000000000000..32b8043ddf30
--- /dev/null
+++ b/dev-perl/Crypt-Rijndael/Crypt-Rijndael-1.130.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+MODULE_AUTHOR=LEONT
+MODULE_VERSION=1.13
+inherit perl-module
+
+DESCRIPTION="Crypt::CBC compliant Rijndael encryption module"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ia64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+IUSE="test"
+
+DEPEND="
+	virtual/perl-ExtUtils-MakeMaker
+	test? (
+		virtual/perl-Test-Simple
+		dev-perl/Test-Pod
+		dev-perl/Test-Pod-Coverage
+	)
+"
+
+SRC_TEST="do parallel"
diff --git a/dev-perl/Crypt-Rijndael/Manifest b/dev-perl/Crypt-Rijndael/Manifest
index 5dc27de90725..09500bb7839e 100644
--- a/dev-perl/Crypt-Rijndael/Manifest
+++ b/dev-perl/Crypt-Rijndael/Manifest
@@ -1,2 +1,3 @@
 DIST Crypt-Rijndael-1.11.tar.gz 23536 SHA256 8f8833bc8839e0d4aa3c26d86d2f39ceb9b13e52a9f5e4fd928da2e71989d3b4 SHA512 57a20811351e4376b10aed11fe6cb932575d2b5d0155d01780f69598b06b28e9eb3036ae322fbc844dd2dda37db2d02a61462caf5d5af5d6dd4ac585c348262a WHIRLPOOL c0c25050e21efd4154beb93402d776087557da5c77adff23a2438b38113713ea0005bcea1aec8a2cd2ef36ad6bdd19abbec2637245aba44397025637c6dccdd7
 DIST Crypt-Rijndael-1.12.tar.gz 24512 SHA256 a096d2194e2967a899693ecbc2bb3595be1b89829cab8384288c09846ea7ffe5 SHA512 bd61e6d9e63abb6d3c335b17d8acdf246cb4c583287fca5568e6ecd1a8334e31dba9c45726a5ad3540bccf293fcbdb20ffd1b240a76b07770e26bcad83ee4164 WHIRLPOOL adf1b6dc22a57193c9135af3dc094864e088361364f03f14c1109ca7d1d0633e523ba61fd10aac1d14d1724c7451dc53b7f829ca6b3094e05fbf7083254c7cec
+DIST Crypt-Rijndael-1.13.tar.gz 71724 SHA256 cd7209a6dfe0a3dc8caffe1aa2233b0e6effec7572d76a7a93feefffe636214e SHA512 46eea4eb6568d9bb70685314c6a29214552787c8cf138adb77271d07b85c16d83ee3faa53e6c3b7d0abb5cb735827407e970f954ae93123dfeaebb5fb34f1329 WHIRLPOOL 9ea6245e4c96b75331ad3a717db3b4be8a3ac2e72ec8eda74c253aed4fe6a209724663caff7380732ac251e9229e6ba29e1f441e3e252000ad6e6a1e28d31eab
diff --git a/dev-perl/CryptX/CryptX-0.006.ebuild b/dev-perl/CryptX/CryptX-0.006.ebuild
deleted file mode 100644
index 3755f48a4073..000000000000
--- a/dev-perl/CryptX/CryptX-0.006.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-MODULE_AUTHOR="MIK"
-
-inherit perl-module
-
-DESCRIPTION="Self-contained crypto toolkit"
-
-LICENSE="|| ( Artistic GPL-1 GPL-2 GPL-3 )"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND="dev-perl/Module-Build"
diff --git a/dev-perl/CryptX/CryptX-0.012.ebuild b/dev-perl/CryptX/CryptX-0.012.ebuild
deleted file mode 100644
index 3755f48a4073..000000000000
--- a/dev-perl/CryptX/CryptX-0.012.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-MODULE_AUTHOR="MIK"
-
-inherit perl-module
-
-DESCRIPTION="Self-contained crypto toolkit"
-
-LICENSE="|| ( Artistic GPL-1 GPL-2 GPL-3 )"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND="dev-perl/Module-Build"
diff --git a/dev-perl/CryptX/CryptX-0.25.0.ebuild b/dev-perl/CryptX/CryptX-0.25.0.ebuild
new file mode 100644
index 000000000000..30b3de9e59f3
--- /dev/null
+++ b/dev-perl/CryptX/CryptX-0.25.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+MODULE_AUTHOR=MIK
+MODULE_VERSION=0.025
+inherit perl-module
+
+DESCRIPTION="Self-contained crypto toolkit"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="
+	>=virtual/perl-Exporter-5.590.0
+	>=dev-perl/JSON-2.10.0
+	>=virtual/perl-MIME-Base64-3.110.0
+"
+DEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-CBuilder
+	dev-perl/Module-Build
+	test? ( >=virtual/perl-Test-Simple-0.880.0 )
+"
+
+SRC_TEST="do parallel"
diff --git a/dev-perl/CryptX/Manifest b/dev-perl/CryptX/Manifest
index a089502ee9b5..d82c34945e2d 100644
--- a/dev-perl/CryptX/Manifest
+++ b/dev-perl/CryptX/Manifest
@@ -1,3 +1,2 @@
-DIST CryptX-0.006.tar.gz 1010671 SHA256 78affdbc28a0ce4de37fcefdf72f2097b2ba34c2e0b9100e1cc8f0b038102f4d SHA512 407b4e3adb406a61fccb14491d2ff794ec3655a1cf78f73c7fe2ea177aa72312f69bcc5d5fa17beefd86661233703194afaec0f1717cb0dc91a1847a7b228bcf WHIRLPOOL 3b85591597cc0f42c0231623c3fe82f044828e5e5a6e975ac53831f6cc1311fd4d97fb9f0becc2564172d41ca0bc89ca2a6e0f254e8af572d1377696930e693a
-DIST CryptX-0.012.tar.gz 1002487 SHA256 a3cff52cc57a28453b2997600bee040b9504446c9f9484a3009e860c85c6de2f SHA512 fb24cac81c650baee50d90f0fd2463cdfccaeb87d5e56ef01bb2c47ddf53553592958b5dc8a9b3fa9750f7b35d2d8e88dd2fc63407f29ceb6d8b9cda788e3161 WHIRLPOOL a5332d3730f742e4e5980bb1f168f1d599a101b505c1c623769a3db8dd562b1da4f874d8d8f427a49df553836dee02aac00dce4d2274c6eb7f66c0ff6769f5f6
 DIST CryptX-0.021.tar.gz 1230263 SHA256 155bf8ff158e8e8e252c16ff16655d1ec22866e56b10dea5e419e77e53d1b2f7 SHA512 091426d4bf7de82758c8e21a3db9e65d3e43bf7ef8071d76f50dfbb70b22939a963deafe0a32124a0a6f548ebeed5884997ed1a48007146b3425a9453214e7c7 WHIRLPOOL c2f5bba9d98feb5e7364f82386d56989896673ed89b52139db94cd1490f49850ecd993d9f49d08d8f5383720d51327cec1cfc9fbec67fb1b6da80239b204f10c
+DIST CryptX-0.025.tar.gz 1322492 SHA256 f8b7e3ec1713c8dfe3eef9d114f45f223b97e2340f81a20589b5605fa49cfe38 SHA512 73495601ff9ca70090dc2eb75ab382ef34ca1357b4f6cf82c07fe5c1a38ab5b4cf8fa79b44dcf9145be13ca0b2e7e5e99903d5a9fd425de2e46526fd4ac17554 WHIRLPOOL 12c338aca513b5ccbce69359acb99e5ca1182a61467d864050990e68fe8f2010604676f39fe650890ae8b37745954364f781e0d7ee6d20c1658a782c81500f65
diff --git a/dev-perl/DBD-SQLite/DBD-SQLite-1.370.0-r1.ebuild b/dev-perl/DBD-SQLite/DBD-SQLite-1.370.0-r1.ebuild
deleted file mode 100644
index 9bb0e463c2c7..000000000000
--- a/dev-perl/DBD-SQLite/DBD-SQLite-1.370.0-r1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MODULE_AUTHOR=ADAMK
-MODULE_VERSION=1.37
-inherit perl-module
-
-DESCRIPTION="Self Contained RDBMS in a DBI Driver"
-
-SLOT="0"
-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 ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
-IUSE="test"
-
-RDEPEND="
-	>=dev-db/sqlite-3.6.22[extensions(+)]
-	>=dev-perl/DBI-1.57
-	!<dev-perl/DBD-SQLite-1
-"
-DEPEND="${RDEPEND}
-	test? (
-		>=virtual/perl-Test-Simple-0.86
-	)
-"
-
-SRC_TEST="do"
-
-src_prepare() {
-	perl-module_src_prepare
-	sed -i 's/^if ( 0 )/if ( 1 )/' "${S}"/Makefile.PL || die
-	# remove bundled sqlite (rt.cpan#61361)
-	for i in sqlite3{.c,.h,ext.h} ; do
-		rm ${i} || die
-		sed -i -e "/^${i}\$/d" MANIFEST || die
-	done
-
-	myconf="SQLITE_LOCATION=${EPREFIX}/usr"
-}
diff --git a/dev-perl/DBD-SQLite/DBD-SQLite-1.400.0-r1.ebuild b/dev-perl/DBD-SQLite/DBD-SQLite-1.400.0-r1.ebuild
deleted file mode 100644
index b2bacd41d62d..000000000000
--- a/dev-perl/DBD-SQLite/DBD-SQLite-1.400.0-r1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MODULE_AUTHOR=ISHIGAKI
-MODULE_VERSION=1.40
-inherit perl-module
-
-DESCRIPTION="Self Contained RDBMS in a DBI Driver"
-
-SLOT="0"
-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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-IUSE="test"
-
-RDEPEND="
-	>=dev-db/sqlite-3.6.22[extensions(+)]
-	>=dev-perl/DBI-1.57
-	!<dev-perl/DBD-SQLite-1
-"
-DEPEND="${RDEPEND}
-	test? (
-		>=virtual/perl-Test-Simple-0.86
-	)
-"
-
-SRC_TEST="do"
-
-src_prepare() {
-	perl-module_src_prepare
-	sed -i 's/^if ( 0 )/if ( 1 )/' "${S}"/Makefile.PL || die
-	# remove bundled sqlite (rt.cpan#61361)
-	for i in sqlite3{.c,.h,ext.h} ; do
-		rm ${i} || die
-		sed -i -e "/^${i}\$/d" MANIFEST || die
-	done
-
-	myconf="SQLITE_LOCATION=${EPREFIX}/usr"
-}
diff --git a/dev-perl/DBD-SQLite/DBD-SQLite-1.480.0.ebuild b/dev-perl/DBD-SQLite/DBD-SQLite-1.480.0.ebuild
new file mode 100644
index 000000000000..8da7a13c1752
--- /dev/null
+++ b/dev-perl/DBD-SQLite/DBD-SQLite-1.480.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+MODULE_AUTHOR=ISHIGAKI
+MODULE_VERSION=1.48
+inherit perl-module
+
+DESCRIPTION="Self Contained RDBMS in a DBI Driver"
+
+SLOT="0"
+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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+IUSE="test"
+
+RDEPEND="
+	>=dev-db/sqlite-3.6.22[extensions(+)]
+	>=dev-perl/DBI-1.570.0
+	!<dev-perl/DBD-SQLite-1
+	virtual/perl-Scalar-List-Utils
+"
+DEPEND="${RDEPEND}
+	>=virtual/perl-ExtUtils-MakeMaker-6.480.0
+	test? (
+		>=virtual/perl-File-Spec-0.820.0
+		>=virtual/perl-Test-Simple-0.420.0
+	)
+"
+
+SRC_TEST="do"
+
+src_prepare() {
+	perl-module_src_prepare
+	sed -i 's/^if ( 0 )/if ( 1 )/' "${S}"/Makefile.PL || die
+	# remove bundled sqlite (rt.cpan#61361)
+	for i in sqlite3{.c,.h,ext.h} ; do
+		rm ${i} || die
+		sed -i -e "/^${i}\$/d" MANIFEST || die
+	done
+
+	myconf="SQLITE_LOCATION=${EPREFIX}/usr"
+}
diff --git a/dev-perl/DBD-SQLite/Manifest b/dev-perl/DBD-SQLite/Manifest
index d6d55d524518..d08cd47e8c45 100644
--- a/dev-perl/DBD-SQLite/Manifest
+++ b/dev-perl/DBD-SQLite/Manifest
@@ -1,4 +1,3 @@
 DIST DBD-SQLite-1.35.tar.gz 1467375 SHA256 ff08d1ee50c057d03ab2901aa7896fda2226c30b85c0999f5858cd2a81b4bc7d SHA512 36ac23aa84c19aff170b5505f6d80c1a577176b2738030e3b161147b9b738fa76ab9a6a620c4ff4a2b9f6abd62520e9fd78111177e8bf347fca28ff8c97b31ca WHIRLPOOL e67e25bd8e8b70ba9bae603a0c0d608111871fdb126398cf8dd392df1544f4e7298ff7e605cc1a1f204efa4cbe679a4f178183ab1bd3cd370b4c1cd79a8c9d10
-DIST DBD-SQLite-1.37.tar.gz 1515353 SHA256 a131761c58e051be968ec21bef5d7549acfd2ba60dd2bf9ae342aaf8e99e2705 SHA512 12ed926065b4283c69945400cbeebe66173161a2e7eb29cde4d8fab6d5aafaf57c456b0e2ac3bf01643ef2e2de9e7924b1e20c7b482dc17096d160861ff236a4 WHIRLPOOL 4afed397006f732b7af798da1117fb57123b6db8780a36ed699ed3f1ca156aa892bfec0fd447b2dc91c36f355af7a22b53820a19ab1ad1f58e998c132ae21407
-DIST DBD-SQLite-1.40.tar.gz 1571899 SHA256 21fb65e740b6265512c82232b4ad8f75c19ac84c216830112656274eb8e375fb SHA512 4d7af59eca0a168d8ce2d2fafe83f24eb3f4eefa8b621ef92d7fab00edc3a1452247b2e4b3f230f88aa29add74581fb2546a47d440a127a5eee7a67aa2999acc WHIRLPOOL 8ebf7e4b9c3652b84fe38f350c30717f7df7617c5874b3f39088250b6b3350bc46d325ed0c917194002eba5e361cd623dd8307ea4f617c5fdab84875717e3aa3
 DIST DBD-SQLite-1.46.tar.gz 1718862 SHA256 b2b179136cd7c0df7b0e4840ff3f46330f161e5fc646279748afa7a3144f7cc0 SHA512 1fbec00d99de9766450003716c8ef6eccdd08b3bc4523180d3fe1046404e3cdcdc3b893146cabf695dfb98bc3484018436412d47c134ce4a89c5348f0edc6012 WHIRLPOOL 2b15f4f9a3cd62cf00ac5058fb8aa54ba94b203e9061d909b688d49f67d5583f2ed992ee97bcbee91baa98799e675c0c423a05b52f345f50ff8366e507c70c6f
+DIST DBD-SQLite-1.48.tar.gz 1769115 SHA256 b397230f5d4cdc9923f91c62da9e535234f3055c528ede75afd7d24698030ea6 SHA512 9c00decdb6730c0e4be3fdd01fef6ebad0452cbe1b5141c23fee7d0c5ca0089f3cd4e5d70d331e959ec50546bb10154a3c2db4bfd27993912d5c788cef0a81ee WHIRLPOOL 8313333ba47203d2eb1434266af250dcfe9e360d697155d82bb24b6f0c0abf650d3cc787e6b9c93144e790de16aa1c318032626f867977b8dfeee92be53c3b12
diff --git a/dev-perl/DBI/DBI-1.631.0.ebuild b/dev-perl/DBI/DBI-1.631.0.ebuild
deleted file mode 100644
index 240e8010be0c..000000000000
--- a/dev-perl/DBI/DBI-1.631.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MODULE_AUTHOR=TIMB
-MODULE_VERSION=1.631
-inherit perl-module eutils
-
-DESCRIPTION="The Perl DBI Module"
-
-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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="test"
-
-RDEPEND="
-	>=dev-perl/PlRPC-0.200.0
-	>=virtual/perl-Sys-Syslog-0.170.0
-	virtual/perl-File-Spec
-	!<=dev-perl/SQL-Statement-1.330.0
-"
-#	!<=dev-perl/DBD-Amazon-0.100.0
-#	!<=dev-perl/DBD-AnyData-0.110.0
-#	!<=dev-perl/DBD-CSV-0.360.0
-#	!<=dev-perl/DBD-Google-0.510.0
-#	!<=dev-perl/DBD-PO-2.100.0
-#	!<=dev-perl/DBD-RAM-0.72.0
-DEPEND="${RDEPEND}
-	>=virtual/perl-ExtUtils-MakeMaker-6.480.0
-	test? (
-		>=virtual/perl-Test-Simple-0.900.0
-	)
-"
-
-SRC_TEST="do"
-mydoc="ToDo"
-MAKEOPTS="${MAKEOPTS} -j1"
diff --git a/dev-perl/DBI/DBI-1.634.0.ebuild b/dev-perl/DBI/DBI-1.634.0.ebuild
new file mode 100644
index 000000000000..675393aa5a90
--- /dev/null
+++ b/dev-perl/DBI/DBI-1.634.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+MODULE_AUTHOR=TIMB
+MODULE_VERSION=1.634
+inherit perl-module eutils
+
+DESCRIPTION="Database independent interface for Perl"
+
+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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="test"
+
+RDEPEND="
+	>=dev-perl/PlRPC-0.200.0
+	>=virtual/perl-Sys-Syslog-0.170.0
+	virtual/perl-File-Spec
+	!<=dev-perl/SQL-Statement-1.330.0
+"
+DEPEND="${RDEPEND}
+	>=virtual/perl-ExtUtils-MakeMaker-6.480.0
+	test? (
+		>=virtual/perl-Test-Simple-0.900.0
+	)
+"
+
+SRC_TEST="do parallel"
+
+mydoc="ToDo"
+MAKEOPTS="${MAKEOPTS} -j1"
diff --git a/dev-perl/DBI/Manifest b/dev-perl/DBI/Manifest
index 949b8dca7007..17dd749ab214 100644
--- a/dev-perl/DBI/Manifest
+++ b/dev-perl/DBI/Manifest
@@ -1,3 +1,3 @@
 DIST DBI-1.628.tar.gz 586733 SHA256 46c834f4ba1b28c8d8a2db8095835a67fc69a9585761523aea3a74437a969b52 SHA512 34bb50ba7c0364e064fd5a05ea5415e43e40d082ed299503beccf2cba7b2ddd8f1e79e96606f35f9da279175ac16531da96d3762a71e9e63570f6db7b683f3a1 WHIRLPOOL 95b72f418c5957dcc4051a889363ce020d6dfb4fcd30216d88c61e8ec66ed30822432343409418e342c62c67dabb91ab464338b14fe316ab20a38350b86f48a4
-DIST DBI-1.631.tar.gz 589096 SHA256 d70a7420863055917fe204c83e6a83838c58f7483baa68499727720899cdd511 SHA512 7ed04167cfeb1f256613f06179d5280bbbf53e1d93d3306d5654f7278572f5cb131fb9ad16403cde05215c741cedd77e51b7cbdef15b5d4ea9dc79490775fa9e WHIRLPOOL eb7b6eadd5626941867ac14b47e3b0a6081d594f77ab54fcda56b2887037c3abcbc560246b2faff917a24759bca7e97e1ca438edb3f21d19044bddd0489f06ed
 DIST DBI-1.633.tar.gz 592307 SHA256 e2c1badcc9f672bf31630b36ecd230f7eb04dbf055e6daf7edeed0e9ebcf5ee7 SHA512 cd945a9b4f2d8c9ccf84d2f57772765b6f16652302271696a85ed8633fa40f6e70a908430ef6f189e4eba1454585327296c446909da26f093d6763ddb7d7cf08 WHIRLPOOL 31ecd1c178e79fc42520faff7d76e3d7809adde556c9fee9d2d99df11e19b782bc8e6ff622cc81792132a3ffa67c3a639f3ad6cdacf01c516212e353515e3daf
+DIST DBI-1.634.tar.gz 595020 SHA256 250712f385864818abfba409420d16d9ee61f1cc73ac85159d054a5ee86d1450 SHA512 42e2b94d5e4cdcd57aaa43519fa1464a4d7132ed09426bb8cb7092b0ee57edde168105a25d02dcdeb304c6bc13c1ad97bc27b54b5f6af05eeaba011d5dab3c44 WHIRLPOOL 53b4b8caa8161b6d6fd999b039c31018060e018bc1b0e24163017e1128db1b29e2c798f8d91e64d2e3653088fd502efb440f21ae0fd8754d3d29803ea405057d
diff --git a/dev-perl/Data-UUID/Data-UUID-1.219.0-r1.ebuild b/dev-perl/Data-UUID/Data-UUID-1.219.0-r1.ebuild
deleted file mode 100644
index 60f0d6d4c9d4..000000000000
--- a/dev-perl/Data-UUID/Data-UUID-1.219.0-r1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MODULE_AUTHOR=RJBS
-MODULE_VERSION=1.219
-inherit perl-module
-
-DESCRIPTION="Perl extension for generating Globally/Universally Unique Identifiers (GUIDs/UUIDs)"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND="virtual/perl-Digest-MD5"
-DEPEND="${RDEPEND}"
-
-SRC_TEST="do"
diff --git a/dev-perl/Data-UUID/Data-UUID-1.221.0.ebuild b/dev-perl/Data-UUID/Data-UUID-1.221.0.ebuild
new file mode 100644
index 000000000000..ca6e5e05ac73
--- /dev/null
+++ b/dev-perl/Data-UUID/Data-UUID-1.221.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+MODULE_AUTHOR=RJBS
+MODULE_VERSION=1.221
+inherit perl-module
+
+DESCRIPTION="Perl extension for generating Globally/Universally Unique Identifiers (GUIDs/UUIDs)"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND="
+	virtual/perl-Digest-MD5
+"
+DEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+"
+
+SRC_TEST="do parallel"
diff --git a/dev-perl/Data-UUID/Manifest b/dev-perl/Data-UUID/Manifest
index 781f6b3922e3..a8ca3bfbcf2d 100644
--- a/dev-perl/Data-UUID/Manifest
+++ b/dev-perl/Data-UUID/Manifest
@@ -1,3 +1,3 @@
 DIST Data-UUID-1.217.tar.gz 15907 SHA256 18c0c41998b211b4249102367400d2d3aa7df479c3a3368a32c0d6c0299bfe6d SHA512 b6920f6a4519d1249823d0aa17e622b9e098c8669aaf8361440d8d8531582530ef0c6cd365f0919b272880a69e2b833b8337f480c30276cf4a75088a3d758030 WHIRLPOOL 1a54497a55bcacc4d60639b3e2b4df0aad03c498c44e32f61c7e9bf685a88638138bf3e794073beac87ebc62e78f4d1385fcd1ed54b1dfeaefbd8e5b5c6cc63f
-DIST Data-UUID-1.219.tar.gz 16760 SHA256 c736d39a6fabf163423b85d94c62cbba6f57ca2f3115e21a0d0c91c23836da28 SHA512 b4a09c0615876b5d0c8304459eb54300fc7e4f808969e3ccc2a929e2d47159cf0aa55e501e8f2a2a795ec31d7e7701978fd4c834eda2c19abc7e131fcb39b35e WHIRLPOOL a367cd686408f758069779c290f99a746ca01f5dc8ab074bf13fc175f9a03555abfe3c01e3d0996a7f3cd24bcecd6081654d10d37cb86ed30cae3b2f213d690d
 DIST Data-UUID-1.220.tar.gz 16905 SHA256 99533b06e4348d704e3d2252d7d41aa652680a1bd5af04e1dc8ce7e84e74f960 SHA512 6d4508cd37f06c549276c1021781a5cf81cb823eaad0152447e9515b9ecf4fb8c6d1c5bfe44eda3296adde6a50d5f6c435269eb5db6207f669d1e12b68fdf657 WHIRLPOOL 1584ab2dd400bc88fb68ccfc3783eff1bf0d2876629fa09779dfa73ff5f7a0dfe03e62560b88df5f0c2e30db1fe124fd0000592e5b04a632c7b0107c9f658005
+DIST Data-UUID-1.221.tar.gz 17041 SHA256 3cc7b2a3a7b74b45a059e013f7fd878078500ea4b7269036f84556b022078667 SHA512 fa40219890f9adeb486a7ff636603d8695d81765ee858e396130100aaba96b524d80eef76e0c06eac2086fe3bb2d26114d94459466d29ddc82a7a7fcb2f5adac WHIRLPOOL 1aff0953df75d0fa6906b3473b618af4fc4f89651c4eeaaf9f9ea319629a390984555b1873faff2a502251ac05a294c27a9574037042778a250872eafe950fba
diff --git a/dev-perl/Data-Validate-Domain/Data-Validate-Domain-0.110.0.ebuild b/dev-perl/Data-Validate-Domain/Data-Validate-Domain-0.110.0.ebuild
new file mode 100644
index 000000000000..444bff1033aa
--- /dev/null
+++ b/dev-perl/Data-Validate-Domain/Data-Validate-Domain-0.110.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+MODULE_AUTHOR=DROLSKY
+MODULE_VERSION=0.11
+
+inherit perl-module
+
+DESCRIPTION="Domain and host name validation"
+
+SLOT="0"
+KEYWORDS="~amd64 ~hppa"
+IUSE="test"
+
+RDEPEND="
+	virtual/perl-Exporter
+	dev-perl/Net-Domain-TLD
+"
+DEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? (
+		virtual/perl-File-Spec
+		>=virtual/perl-Test-Simple-0.960.0
+	)
+"
+
+SRC_TEST="do parallel"
diff --git a/dev-perl/Data-Validate-Domain/Manifest b/dev-perl/Data-Validate-Domain/Manifest
index 41302c8d15c5..ee9ab916736b 100644
--- a/dev-perl/Data-Validate-Domain/Manifest
+++ b/dev-perl/Data-Validate-Domain/Manifest
@@ -1 +1,2 @@
 DIST Data-Validate-Domain-0.10.tar.gz 7988 SHA256 be17fbc945c8ab3faac8870bed99704c023919863e583c56b43e9df05ef7a39a SHA512 d6ba6f63ef09cdb92f65d96451109ee0104b3ced164800cc07939b368d53d37043753e659d46ca8586bf8614c2c1908dc5ca36a5e7ffaae94e4a822a8fd44653 WHIRLPOOL d799bef9734870f22724bebd59a2f34360d1a1b145f4be2301bbb89a8fc8350771cd4175dc4c6e0e5db83bbcc2bf262b7510848f3d433b57a3e207556804ba1c
+DIST Data-Validate-Domain-0.11.tar.gz 26678 SHA256 f2ae0830f423a46080b185ffc2428c9a37278167a8d19bfdeec26d977b43822c SHA512 871ad620a9c6021bdc25895ca78c12bf6b9f515b3e139864f0c52c9067d65c9f5dad95f21d30d59a57b1a808b373a132cff7f347832705af081d4a435d0872e1 WHIRLPOOL bb5ad9b77e08b62423d0624ccbecbbc72a35ed1172ad92fd052c967599d8dbd8f7c76b819d35d063c2138240cd6520eea51185b0a5729784d6b9ab933f631e58
diff --git a/dev-perl/DateManip/DateManip-6.430.0.ebuild b/dev-perl/DateManip/DateManip-6.430.0.ebuild
deleted file mode 100644
index 73d30d18a39f..000000000000
--- a/dev-perl/DateManip/DateManip-6.430.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MY_PN=Date-Manip
-MODULE_AUTHOR=SBECK
-MODULE_VERSION=6.43
-inherit perl-module
-
-DESCRIPTION="Perl date manipulation routines"
-
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
-IUSE="test"
-
-RDEPEND="
-	virtual/perl-Storable
-"
-DEPEND="${RDEPEND}
-	>=dev-perl/Module-Build-0.390.0
-	test? (
-		dev-perl/Test-Pod
-		dev-perl/Test-Pod-Coverage
-		dev-perl/Test-Inter
-	)
-"
-
-SRC_TEST="do"
-
-mydoc="HISTORY"
diff --git a/dev-perl/DateManip/DateManip-6.510.0.ebuild b/dev-perl/DateManip/DateManip-6.510.0.ebuild
new file mode 100644
index 000000000000..ffa50dc9e7e7
--- /dev/null
+++ b/dev-perl/DateManip/DateManip-6.510.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+MY_PN=Date-Manip
+MODULE_AUTHOR=SBECK
+MODULE_VERSION=6.51
+inherit perl-module
+
+DESCRIPTION="Perl date manipulation routines"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
+IUSE="test"
+
+RDEPEND="
+	virtual/perl-Carp
+	virtual/perl-Data-Dumper
+	virtual/perl-Encode
+	virtual/perl-File-Spec
+	virtual/perl-IO
+	virtual/perl-Storable
+"
+DEPEND="${RDEPEND}
+	>=dev-perl/Module-Build-0.210.0
+	test? (
+		dev-perl/Test-Pod
+		dev-perl/Test-Pod-Coverage
+		dev-perl/Test-Inter
+		virtual/perl-Test-Simple
+	)
+"
+
+SRC_TEST="do parallel"
+
+mydoc="HISTORY"
diff --git a/dev-perl/DateManip/Manifest b/dev-perl/DateManip/Manifest
index c987f3915cc1..6d29d878dd03 100644
--- a/dev-perl/DateManip/Manifest
+++ b/dev-perl/DateManip/Manifest
@@ -1,3 +1,3 @@
 DIST Date-Manip-6.41.tar.gz 1975272 SHA256 f7f654d8a85836bfbb248e21dd2ad39e592aa259f247bf77ef791ff19360de09 SHA512 c958fd58c8905e63945835cbe83205efafd4466d8cc3c1a61ec52ae948679c27c525143d5509b4a384c0c05d045702fdb0c86d91968ef24f73d983b2e7042860 WHIRLPOOL 507e63e2665144f0f94cbcd40ea4c0109eda1dd89f3f95ae7249e4204cb213546ca07af5478da534e930cfe77fe27e1fff806c85d4872a4f99109070a9cb8ffc
-DIST Date-Manip-6.43.tar.gz 1764121 SHA256 3fbb6f0a3acfbc1693aa80a4bd3482bd81d6b1f33f54cd907582bf30e4418f4b SHA512 00b60957f11c076ecb6f971911d33c438d68e9b9c22ca7425cdd700c397ce6f0d4e876a9d666295a009c2efd9bf617af633662b7ea29d4ee07e2b48927bc5020 WHIRLPOOL 445f7073ba8cfbfefb828990c5f624eff253d45a5cb9d368fc2b5b0295cf5abebd4a9599677caaa317212b8b84bdeac642a251c2e9bc5809c110578be81c7e6e
 DIST Date-Manip-6.49.tar.gz 15472097 SHA256 3e5aa3b351f92186630c27b1de2cba0d322142d0ff4ac12319681e20ce8b89b9 SHA512 013b008b7591068da63820c751ff1988cc203df3f865c85487f058fc3d75e28c2506f50618b4a8f300c635ddef9005071d231ba6aeae1f39374f4a4e7f89e479 WHIRLPOOL aa58fce70f5dab1ca6d78ac3ca80c169ddb6a387f3a7f2607d143c1e29471e9bdd2a9701cd913ebeaabe7b4714f53628af7b09c80f1ceae36578aab3c4f8bafb
+DIST Date-Manip-6.51.tar.gz 1799860 SHA256 23bca630398d33ee16d6d8b285206dfdfa93739da771d30e40ed6a28b0c8db29 SHA512 96e0ef8374680a6adb3a064509d50a0e9288b14ce1e728b181e0f344ff85dfeb7b26ad4117fcfc35d3a6e4d6db3e97da242e2f6a11a88a11571a9b1f169f8e54 WHIRLPOOL e22746dcbd39e19412000c4cd20a09757c20c12c5407b7206eccac80942376e2d02d0b856380fe13956734208717db0497d8e2be89bcfd34744216223e0f2446
diff --git a/dev-perl/DateTime-Locale/DateTime-Locale-0.460.0.ebuild b/dev-perl/DateTime-Locale/DateTime-Locale-0.460.0.ebuild
new file mode 100644
index 000000000000..7dd6ce4c48ae
--- /dev/null
+++ b/dev-perl/DateTime-Locale/DateTime-Locale-0.460.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+MODULE_AUTHOR=DROLSKY
+MODULE_VERSION=0.46
+inherit perl-module
+
+DESCRIPTION="Localization support for DateTime"
+
+LICENSE="|| ( Artistic GPL-2 ) unicode"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+IUSE="test"
+
+RDEPEND="
+	virtual/perl-Carp
+	>=dev-perl/Dist-CheckConflicts-0.20.0
+	dev-perl/List-MoreUtils
+	dev-perl/Params-Validate
+"
+DEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? (
+		virtual/perl-File-Spec
+		virtual/perl-Storable
+		>=virtual/perl-Test-Simple-0.960.0
+	)
+"
+
+SRC_TEST="do parallel"
diff --git a/dev-perl/DateTime-Locale/Manifest b/dev-perl/DateTime-Locale/Manifest
index 4ae4e1fad23f..a5f7d2b28813 100644
--- a/dev-perl/DateTime-Locale/Manifest
+++ b/dev-perl/DateTime-Locale/Manifest
@@ -1 +1,2 @@
 DIST DateTime-Locale-0.45.tar.gz 1079736 SHA256 8aa1b8db0baccc26ed88f8976a228d2cdf4f6ed4e10fc88c1501ecd8f3ccaf9c SHA512 dc2707b4ae5c3fd2bdaf9a5c61182925a9579474d2b5181a9350fac1a04240388cab63672384cde1a4a710cd4820305bf60d072f7f646251cdc630cf41b210df WHIRLPOOL 817e46997ef395de6dfe9c10fcbce8c18c62ad6c797b6747ec060e6f61c63a980b46b2942b3f59a3dcd6e4d8fe843f5de5d1b0e3444a9aebd41c92e47b970fe3
+DIST DateTime-Locale-0.46.tar.gz 2556441 SHA256 b4ceaa0dc0b89d4eb180eb970a927cf376e3d04ef42de98de2e034cd2021348d SHA512 36a13c10efca1299f4705a98bedd640d235df7478554f398648e124a3ecccfcd72b16b18882836d6e415e2114feb2dda4260f24774c6f741a705b1ba63b4363f WHIRLPOOL a1e071d01dfc2ce5c3250120162adcf1903569e40adfaab72f29ea5ff0daaab5a5ae29f6649c8c878a293d0b39425bb68639c0b89dd2831601701c2536000a8f
diff --git a/dev-perl/DateTime-TimeZone/DateTime-TimeZone-1.930.0.ebuild b/dev-perl/DateTime-TimeZone/DateTime-TimeZone-1.930.0.ebuild
new file mode 100644
index 000000000000..de447e5d848a
--- /dev/null
+++ b/dev-perl/DateTime-TimeZone/DateTime-TimeZone-1.930.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+MODULE_AUTHOR=DROLSKY
+MODULE_VERSION=1.93
+inherit perl-module
+
+DESCRIPTION="Time zone object base class and factory"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+IUSE="test"
+
+RDEPEND="
+	>=dev-perl/Class-Singleton-1.30.0
+	virtual/perl-File-Spec
+	dev-perl/List-AllUtils
+	virtual/perl-Scalar-List-Utils
+	dev-perl/Module-Runtime
+	>=dev-perl/Params-Validate-0.720.0
+	dev-perl/Try-Tiny
+	virtual/perl-parent
+"
+DEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? (
+		virtual/perl-File-Spec
+		virtual/perl-File-Temp
+		virtual/perl-Storable
+		dev-perl/Test-Fatal
+		dev-perl/Test-Requires
+		>=virtual/perl-Test-Simple-0.960.0
+	)
+"
+
+SRC_TEST="do parallel"
diff --git a/dev-perl/DateTime-TimeZone/Manifest b/dev-perl/DateTime-TimeZone/Manifest
index 3e891dea083e..3c0d390aa62a 100644
--- a/dev-perl/DateTime-TimeZone/Manifest
+++ b/dev-perl/DateTime-TimeZone/Manifest
@@ -1,2 +1,3 @@
 DIST DateTime-TimeZone-1.81.tar.gz 884344 SHA256 62f74919227aa996600ab508b999c658e3aa5789098ade189cf82dd2d9e6833d SHA512 1b110fea68cf872d3ec125685936e63f8dc68f36a5170579961e543d82a15d7f12537d2f4f7c5ee2ae6a4cb6584ea32923a7f165cbfc650138f6d2737d996b2d WHIRLPOOL 26fd835248b5aba7fd0e8436f16007333057bcec575513df19bf5c91e32f3ffafb8e2d2c5ab9d95b9d88590075860079991a53009e3f6e93a669676988a891db
 DIST DateTime-TimeZone-1.88.tar.gz 889504 SHA256 42c40ffdaf379533d34a4d083f8b0027f44c46e63324cbb1d4e291856cf1f9ff SHA512 f35370c842f5e6f6d13dfc2bd864a89fd847108854a2a4aadee1cd9d5743ab121a108a9352f56db08a987b040d84089cd4adf4b3b200d6c4aa9fe2279984c6fe WHIRLPOOL d17e763461e96a457b0ef1ac8135db51d906e201b3eb4cf3eb87fad9492a6f8f8bfa22df86599ad8c69ced557c8ff595dccbe54b30b0fe32be494ebd7d26befc
+DIST DateTime-TimeZone-1.93.tar.gz 891870 SHA256 d97e6387270da0caec089809612a68b97c3e77830ac5b9468d52f5c8fa5218be SHA512 8b9d136dadcbbac0de624e091a19fdeb4b12b62c01d1a550dd32670c841a2c7b7b51066bd1e297010cacda24522b37f23b931535b67859b58b0760ba85f5f7c6 WHIRLPOOL e41d86a65dc405b4b9493c9467544f87923bdc2bf299dc82d9a1b85a24d98c80373201f3d2e92d0aa665acf50dd746fefe91471307a0340367891efa78edfcb0
diff --git a/dev-perl/DateTime/DateTime-1.120.0.ebuild b/dev-perl/DateTime/DateTime-1.120.0.ebuild
deleted file mode 100644
index 27a8f2d5613e..000000000000
--- a/dev-perl/DateTime/DateTime-1.120.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MODULE_AUTHOR=DROLSKY
-MODULE_VERSION=1.12
-inherit perl-module
-
-DESCRIPTION="A date and time object"
-
-LICENSE="Artistic-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
-IUSE="test"
-
-RDEPEND="
-	>=dev-perl/Params-Validate-0.760.0
-	>=dev-perl/DateTime-TimeZone-1.90.0
-	>=dev-perl/DateTime-Locale-0.440.0
-"
-DEPEND="${RDEPEND}
-	dev-perl/Module-Build
-	test? (
-		dev-perl/Test-Fatal
-	)
-"
-
-SRC_TEST="do"
diff --git a/dev-perl/DateTime/DateTime-1.200.0.ebuild b/dev-perl/DateTime/DateTime-1.200.0.ebuild
new file mode 100644
index 000000000000..b2069b7bc5a8
--- /dev/null
+++ b/dev-perl/DateTime/DateTime-1.200.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+MODULE_AUTHOR=DROLSKY
+MODULE_VERSION=1.20
+inherit perl-module
+
+DESCRIPTION="A date and time object"
+
+LICENSE="Artistic-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+IUSE="test"
+
+RDEPEND="
+	virtual/perl-Carp
+	>=dev-perl/DateTime-Locale-0.410.0
+	>=dev-perl/DateTime-TimeZone-1.740.0
+	>=dev-perl/Params-Validate-0.760.0
+	virtual/perl-Scalar-List-Utils
+	dev-perl/Try-Tiny
+	virtual/perl-XSLoader
+"
+DEPEND="${RDEPEND}
+	>=dev-perl/Module-Build-0.280.0
+	test? (
+		virtual/perl-ExtUtils-MakeMaker
+		virtual/perl-File-Spec
+		virtual/perl-Storable
+		dev-perl/Test-Fatal
+		>=virtual/perl-Test-Simple-0.880.0
+		>=dev-perl/Test-Warnings-0.5.0
+	)
+"
+
+SRC_TEST="do parallel"
diff --git a/dev-perl/DateTime/Manifest b/dev-perl/DateTime/Manifest
index b77e75926668..7669dba57cb2 100644
--- a/dev-perl/DateTime/Manifest
+++ b/dev-perl/DateTime/Manifest
@@ -1,3 +1,3 @@
 DIST DateTime-1.03.tar.gz 174369 SHA256 384f97c73da02492d771d6b5c3b37f6b18c2e12f4db3246b1d61ff19c6d6ad6d SHA512 6764b8bd8ccb22429d17dfc48412a0223481ae43249920347ae91514dbbe0d2f820601372b9cdae312d0ba9460c9abeae9e189afb1666b90e27b09f3daaf335f WHIRLPOOL 93903c881305ab2ca99aecb16c3100f74e0d32576565703feb6897d112056bc5b20d69f7ded92910574b514179a13adb3cd584a7910c55043eb492e9e34b7a3d
-DIST DateTime-1.12.tar.gz 206862 SHA256 e65a333806d000825724cfa23d7d33539b853b6e819d4922d2a68579416374ce SHA512 a3fde7b6d76753026b2ff3ac91761b69da3e207a51d24d693c2cf681ff9028cf6f46186e5ebf1993124d1255d080d27d7449f28eaa156b5e032e6e946dddd0a9 WHIRLPOOL 1d262bd1c788227d84b0843f182039a1007c8ac6ae7bd2cc84c9245f2fc7094aec636d4a187a25527f2e7613819d0b0bf44a3117c4aa7d190e242e966853d95a
 DIST DateTime-1.18.tar.gz 212053 SHA256 bada2c9fe3e79429f7c84592d9a9defd3a8c71f7b584389d450aa324340d913a SHA512 664cc7dacd94fb34d0b185ebfb855ce671f0c9fdbe7097617306cd3e9083fabc07acb3ca024944fe3736d52c0ed3c840c916f9af3d5c4cad0dddfcc61a25ec12 WHIRLPOOL efd79a1cd62a9e0159b3b194c0458faa1a469f0b205de618068b3536f715a7131b1aabda217a63f3b80a455aec6187468f27fd6a1ce3e04bc2f8064751d9ca1f
+DIST DateTime-1.20.tar.gz 220697 SHA256 ac909ca4e26f2713940302ad1fd8068de0a6970416a5a88a812cceb155becb0d SHA512 b0374407683da3b68d0a127a2899deb8222f3bbd3e1f68481a000ca8c7fbde69bf4e43253b4cdd68f97b0a0ee7d8ed9d7a08fda8b5bf713b0f02ba722cd3aff9 WHIRLPOOL 0554f0d60fc57410aeecee8afa22997479bf9749eb1e46bd57f369a2ba98d8b4e8c06298304cd1bdec42879864440fe5e34f8df97def6188454caf14988e9143
diff --git a/dev-perl/Devel-Caller/Devel-Caller-2.60.0.ebuild b/dev-perl/Devel-Caller/Devel-Caller-2.60.0.ebuild
index 3e557062a237..8e9ca7cacde9 100644
--- a/dev-perl/Devel-Caller/Devel-Caller-2.60.0.ebuild
+++ b/dev-perl/Devel-Caller/Devel-Caller-2.60.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Meatier versions of caller"
 
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~x86"
 IUSE=""
 
 DEPEND="dev-perl/PadWalker"
diff --git a/dev-perl/Devel-Cover/Devel-Cover-1.170.0.ebuild b/dev-perl/Devel-Cover/Devel-Cover-1.170.0.ebuild
deleted file mode 100644
index 8300a6cecd4a..000000000000
--- a/dev-perl/Devel-Cover/Devel-Cover-1.170.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-MODULE_AUTHOR=PJCJ
-MODULE_VERSION=1.17
-inherit perl-module
-
-DESCRIPTION='Code coverage metrics for Perl'
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RDEPEND="
-	virtual/perl-Digest-MD5
-	virtual/perl-Storable
-"
-DEPEND="
-	virtual/perl-ExtUtils-MakeMaker
-	test? (
-		virtual/perl-Test-Simple
-		dev-perl/Test-Warn
-	)
-"
-SRC_TEST="do parallel"
diff --git a/dev-perl/Devel-Cover/Devel-Cover-1.200.0.ebuild b/dev-perl/Devel-Cover/Devel-Cover-1.200.0.ebuild
new file mode 100644
index 000000000000..7ac2bcba12c3
--- /dev/null
+++ b/dev-perl/Devel-Cover/Devel-Cover-1.200.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+MODULE_AUTHOR=PJCJ
+MODULE_VERSION=1.20
+inherit perl-module
+
+DESCRIPTION='Code coverage metrics for Perl'
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="
+	virtual/perl-Digest-MD5
+	virtual/perl-Storable
+"
+DEPEND="
+	virtual/perl-ExtUtils-MakeMaker
+	test? (
+		virtual/perl-Test-Simple
+	)
+"
+
+SRC_TEST="do parallel"
diff --git a/dev-perl/Devel-Cover/Manifest b/dev-perl/Devel-Cover/Manifest
index a9dfbd434e96..d8c9a6e62aed 100644
--- a/dev-perl/Devel-Cover/Manifest
+++ b/dev-perl/Devel-Cover/Manifest
@@ -1,2 +1,2 @@
-DIST Devel-Cover-1.17.tar.gz 204752 SHA256 d2e5b73dec6b9b9971fc10d27b3996e59bdce1446abd5ae988f9185beff9f5cc SHA512 fec1b6064b8ae4d9d03bd273b6857e692a2953bf7f97169e9e99c8d0cdfa587c5a9c397d0044ea7cde2031dcf7f100c51135ebbd8af3197fb58c9920fad69a9a WHIRLPOOL 17a518a23dd405714545065bd28f199e977ad22e59d5eaaa9aed64d029298154dbda80d800b02144dc04bf0da4157053a21a88fcd246b9519d3c8a23ace7c984
 DIST Devel-Cover-1.18.tar.gz 207365 SHA256 95f73ffcabfe6948fd926305958a1116501c0461eeef0aa6e1c8979c79efcb12 SHA512 1d11ccd48fd93a8a4c0096f95fbed10de603ba8b2ed78fa90528f88588825a4d897c916376687e9bd1eca95642a1f11c7fdd17b7c116116a0a67a4422139bf21 WHIRLPOOL ff755f8b35dcff1aa1b98eff5a95b62eaf50857c9c273d8d0d17e2898b4ff2a6b2e82169427301736f0619ce372080aff25609c5df0c363df5ec931d509de037
+DIST Devel-Cover-1.20.tar.gz 223004 SHA256 0377cc0362968cf25bd1140e4927b48916ddf3de53c76856dcfe1b0e1a3a89c1 SHA512 2c51eb033c9e37dfbe2d0cbf664b5044a99f5cac4c3e87aeada7829a5d130ec0efc390b5fb2e6795c39d01bfb4d18c4249bf81aeee639841f51b9f306b918faa WHIRLPOOL aa02321a2b66c42ed924fab37ac90e197683cdd5412d9ae70e906edf4cd0f206a8299d2e17b2517d83f2128a435e1a9749d90747e0cca967e29f90aa8aa9c347
diff --git a/dev-perl/Devel-LexAlias/Devel-LexAlias-0.50.0.ebuild b/dev-perl/Devel-LexAlias/Devel-LexAlias-0.50.0.ebuild
index d71dd50fcdce..48adff4464e1 100644
--- a/dev-perl/Devel-LexAlias/Devel-LexAlias-0.50.0.ebuild
+++ b/dev-perl/Devel-LexAlias/Devel-LexAlias-0.50.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Alias lexical variables"
 
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~x86"
 IUSE=""
 
 DEPEND=">=dev-perl/Devel-Caller-2.03"
diff --git a/dev-perl/Devel-OverloadInfo/Devel-OverloadInfo-0.2.0.ebuild b/dev-perl/Devel-OverloadInfo/Devel-OverloadInfo-0.2.0.ebuild
index ab8be8d3fbf8..50dd867fe261 100644
--- a/dev-perl/Devel-OverloadInfo/Devel-OverloadInfo-0.2.0.ebuild
+++ b/dev-perl/Devel-OverloadInfo/Devel-OverloadInfo-0.2.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Introspect overloaded operators"
 
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="~amd64 ~arm ~hppa ~x86"
 IUSE="test"
 
 # Scalar::Util -> Scalar-List-Utils
diff --git a/dev-perl/Devel-PatchPerl/Devel-PatchPerl-1.280.0.ebuild b/dev-perl/Devel-PatchPerl/Devel-PatchPerl-1.280.0.ebuild
deleted file mode 100644
index 0f771443674f..000000000000
--- a/dev-perl/Devel-PatchPerl/Devel-PatchPerl-1.280.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-MODULE_AUTHOR=BINGOS
-MODULE_VERSION=1.28
-inherit perl-module
-
-DESCRIPTION="Patch perl source a la Devel::PPPort's buildperl.pl"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	>=dev-perl/File-pushd-1.0.0
-	virtual/perl-IO
-	virtual/perl-MIME-Base64
-	dev-perl/Module-Pluggable
-"
-DEPEND="${RDEPEND}
-	>=virtual/perl-ExtUtils-MakeMaker-6.300.0
-"
-
-SRC_TEST="do parallel"
diff --git a/dev-perl/Devel-PatchPerl/Devel-PatchPerl-1.380.0.ebuild b/dev-perl/Devel-PatchPerl/Devel-PatchPerl-1.380.0.ebuild
new file mode 100644
index 000000000000..cb2a469b333a
--- /dev/null
+++ b/dev-perl/Devel-PatchPerl/Devel-PatchPerl-1.380.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+MODULE_AUTHOR=BINGOS
+MODULE_VERSION=1.38
+inherit perl-module
+
+DESCRIPTION="Patch perl source a la Devel::PPPort's buildperl.pl"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	>=dev-perl/File-pushd-1.0.0
+	virtual/perl-IO
+	virtual/perl-MIME-Base64
+	dev-perl/Module-Pluggable
+"
+DEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+"
+
+SRC_TEST="do parallel"
diff --git a/dev-perl/Devel-PatchPerl/Manifest b/dev-perl/Devel-PatchPerl/Manifest
index 4fd8dfdee79b..78416a256f65 100644
--- a/dev-perl/Devel-PatchPerl/Manifest
+++ b/dev-perl/Devel-PatchPerl/Manifest
@@ -1,2 +1,2 @@
-DIST Devel-PatchPerl-1.28.tar.gz 94259 SHA256 03085cd6a8b565a4f789c838e8208a8377e0d1aeb7f5becc3b0d3219409d6b82 SHA512 e48592305c842c4504a49fa9f74bbf3c5378e10afee4c1c8eb079de61a13f4777a2df4d57a5944776488ed94d37f3831bccfbf3359c73f2233ec4d5f09ea583b WHIRLPOOL 01002f1165858db0adfd70cfd50b34631449855626ca43a5f877e8adc0c9bd4bcf2d88b675909b4521c53ffafd3b16b9059e8c55f45d4d6ea4c2d4191e3bde70
 DIST Devel-PatchPerl-1.34.tar.gz 108652 SHA256 be294c95841f521a6b53f429e4fd2fc6f4b34a7fa1d66a8bba7434d5d12af643 SHA512 9e25285dd0a9c67357e627bd144fc43e5fa7644e6f647f9e69e84550c63e1173ca068cee8a883be6540c1d7a4f16533c7751552dfcf525260da187ea41a4e6b1 WHIRLPOOL 7b9761ce66db4cbe08ee1c1f1f8d473d1b0afc47aabf34b2de931019554691363acb41ba499e2939397484d8c8839c6a5d0855dc49650e836bc4fd9f7e54e905
+DIST Devel-PatchPerl-1.38.tar.gz 109406 SHA256 f3e55d9211f984c5956e7decd85e5d59b4d1613d3543bb4007be6f3d89ae2725 SHA512 4762d956107d7d86f1208ec706df5399493a388f8af24c741c20ef1aaa8b9202e1f6528725c2ee7e33e192c9c1b8d218774fcc5b4428d48683d1c56679fd134a WHIRLPOOL e9415fffde1afe6fc610d8c253d9724444ef88f2a05d719721ed148e24ca72298eed62a3096583906a80c5cba4ced12a1fafccd5f214dcd11a96f3781733cfa2
diff --git a/dev-perl/Devel-REPL/Devel-REPL-1.3.27.ebuild b/dev-perl/Devel-REPL/Devel-REPL-1.3.27.ebuild
new file mode 100644
index 000000000000..c766c9a4cd87
--- /dev/null
+++ b/dev-perl/Devel-REPL/Devel-REPL-1.3.27.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+MODULE_AUTHOR=ETHER
+MODULE_VERSION=1.003027
+inherit perl-module
+
+DESCRIPTION="A modern perl interactive shell"
+
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~x86"
+IUSE="test"
+
+RDEPEND="
+	dev-perl/File-HomeDir
+	virtual/perl-File-Spec
+	dev-perl/Module-Runtime
+	>=dev-perl/Moose-0.930.0
+	>=dev-perl/MooseX-Getopt-0.180.0
+	>=dev-perl/MooseX-Object-Pluggable-0.0.9
+	virtual/perl-Scalar-List-Utils
+	dev-perl/Task-Weaken
+	virtual/perl-Term-ANSIColor
+	virtual/perl-Time-HiRes
+	dev-perl/namespace-autoclean
+	dev-perl/App-Nopaste
+	dev-perl/B-Keywords
+	dev-perl/Data-Dump-Streamer
+	dev-perl/Data-Dumper-Concise
+	dev-perl/File-Next
+	dev-perl/Lexical-Persistence
+	dev-perl/Module-Refresh
+	dev-perl/PPI
+	dev-perl/Sys-SigAction
+"
+# B::Concise? => perl
+# Devel::Peek => perl
+# Term::ReadLine => perl
+
+DEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? (
+		virtual/perl-File-Spec
+		dev-perl/Test-Fatal
+		virtual/perl-Test-Simple
+		virtual/perl-if
+	)
+"
+
+SRC_TEST="do parallel"
diff --git a/dev-perl/Devel-REPL/Manifest b/dev-perl/Devel-REPL/Manifest
index 12cd8e0ab375..ba3ec20a75fe 100644
--- a/dev-perl/Devel-REPL/Manifest
+++ b/dev-perl/Devel-REPL/Manifest
@@ -1 +1,2 @@
 DIST Devel-REPL-1.003014.tar.gz 54177 SHA256 3a7337e54dc0ae87120fbf89b0e032c0c5c6f74599fe07127b575dafd41586f2 SHA512 5ee90a29c42c929d7301d5f4fb854148366feeab62c7c0df5d7ff9a75c089eef16b1b8651bffae0edc72891f0c098e9dab285c7a6bdf611aaee99d39a0a3dd59 WHIRLPOOL 03fbd531999f88880e705dc51af0e06a76552756933d5977ed228dc2e0d74a65a9cca2e9a1ecc6ecf9fda230bd6cbde7f173075d6e974e476b9155884bed84f4
+DIST Devel-REPL-1.003027.tar.gz 59295 SHA256 c332ae2facae81618d71854d34f32d95c37dfc5aa9a37ae6f04c3d33833889ae SHA512 6541b5b59b2fbadc1a5d6994ab653feae1f142531612c1efc36ced15bac2d9a356401f6737b8b3bb43e20af066382e134176ad28ec359e8de2ed2cb955c2d2aa WHIRLPOOL f44f708b0563018caa7af6f342610afeae35bfe2f8c04a6ba695424ec484b68533242952bb54bca2dce6748cf3d0f0fe2f924bd6a9b9a1f81e9b1c9eb15ff72b
diff --git a/dev-perl/Eval-Closure/Eval-Closure-0.130.0.ebuild b/dev-perl/Eval-Closure/Eval-Closure-0.130.0.ebuild
index a54d5d8c7b6c..6dfc2cda176d 100644
--- a/dev-perl/Eval-Closure/Eval-Closure-0.130.0.ebuild
+++ b/dev-perl/Eval-Closure/Eval-Closure-0.130.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="safely and cleanly create closures via string eval"
 
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd ~x64-macos"
+KEYWORDS="~amd64 ~hppa ~ppc ~x86 ~x86-fbsd ~x64-macos"
 IUSE="test minimal"
 
 # Scalar::Util -> Scalar-List-Utils
diff --git a/dev-perl/File-Find-Rule-Perl/File-Find-Rule-Perl-1.130.0.ebuild b/dev-perl/File-Find-Rule-Perl/File-Find-Rule-Perl-1.130.0.ebuild
index 7ab4b10183a9..322ab913e0d3 100644
--- a/dev-perl/File-Find-Rule-Perl/File-Find-Rule-Perl-1.130.0.ebuild
+++ b/dev-perl/File-Find-Rule-Perl/File-Find-Rule-Perl-1.130.0.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="Common rules for searching for Perl things"
 
 LICENSE="|| ( Artistic GPL-1 GPL-2 GPL-3 )"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="~amd64 ~arm ~hppa ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/dev-perl/Module-Runtime-Conflicts/Module-Runtime-Conflicts-0.2.0.ebuild b/dev-perl/Module-Runtime-Conflicts/Module-Runtime-Conflicts-0.2.0.ebuild
index beb771be1430..9bd4486addde 100644
--- a/dev-perl/Module-Runtime-Conflicts/Module-Runtime-Conflicts-0.2.0.ebuild
+++ b/dev-perl/Module-Runtime-Conflicts/Module-Runtime-Conflicts-0.2.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Provide information on conflicts for Module::Runtime"
 
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="~amd64 ~arm ~hppa ~x86"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/Moose/Moose-2.140.500.ebuild b/dev-perl/Moose/Moose-2.140.500.ebuild
index c33f0169c31f..8c11d440d9ad 100644
--- a/dev-perl/Moose/Moose-2.140.500.ebuild
+++ b/dev-perl/Moose/Moose-2.140.500.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="A postmodern object system for Perl 5"
 
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~x86-fbsd ~x64-macos"
+KEYWORDS="~amd64 ~arm ~hppa ~x86 ~x86-fbsd ~x64-macos"
 IUSE="test"
 
 CONFLICTS="
diff --git a/dev-perl/SNMP_Session/metadata.xml b/dev-perl/SNMP_Session/metadata.xml
index 68c550016736..a8c317e614dc 100644
--- a/dev-perl/SNMP_Session/metadata.xml
+++ b/dev-perl/SNMP_Session/metadata.xml
@@ -4,5 +4,6 @@
 	<herd>perl</herd>
 	<upstream>
 		<remote-id type="google-code">snmp-session</remote-id>
+		<remote-id type="github">sleinen/snmp-session</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-perl/Sub-Identify/Sub-Identify-0.40.0-r1.ebuild b/dev-perl/Sub-Identify/Sub-Identify-0.40.0-r1.ebuild
index 673f1bb18670..a91438b8a2c9 100644
--- a/dev-perl/Sub-Identify/Sub-Identify-0.40.0-r1.ebuild
+++ b/dev-perl/Sub-Identify/Sub-Identify-0.40.0-r1.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Retrieve names of code references"
 
 SLOT="0"
-KEYWORDS="amd64 ~arm ppc x86 ~ppc-macos ~x64-macos ~x86-solaris"
+KEYWORDS="amd64 ~arm ~hppa ppc x86 ~ppc-macos ~x64-macos ~x86-solaris"
 IUSE="test"
 
 RDEPEND=""
diff --git a/dev-perl/Test-CleanNamespaces/Test-CleanNamespaces-0.180.0.ebuild b/dev-perl/Test-CleanNamespaces/Test-CleanNamespaces-0.180.0.ebuild
index 0d0320a96709..e17a0f5e2960 100644
--- a/dev-perl/Test-CleanNamespaces/Test-CleanNamespaces-0.180.0.ebuild
+++ b/dev-perl/Test-CleanNamespaces/Test-CleanNamespaces-0.180.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Check for uncleaned imports"
 
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="~amd64 ~arm ~hppa ~x86"
 IUSE="test minimal"
 
 # r:Test::Builder -> Test-Simple
diff --git a/dev-perl/Test-Differences/Test-Differences-0.630.0.ebuild b/dev-perl/Test-Differences/Test-Differences-0.630.0.ebuild
index 30450cd7f7c0..091a26b78147 100644
--- a/dev-perl/Test-Differences/Test-Differences-0.630.0.ebuild
+++ b/dev-perl/Test-Differences/Test-Differences-0.630.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Test strings and data structures and show differences if not ok"
 
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~x86"
 IUSE="test"
 
 RDEPEND="dev-perl/Text-Diff
diff --git a/dev-perl/Test-Most/Test-Most-0.340.0.ebuild b/dev-perl/Test-Most/Test-Most-0.340.0.ebuild
index 8eefa355d5a1..ae81b2a2fe28 100644
--- a/dev-perl/Test-Most/Test-Most-0.340.0.ebuild
+++ b/dev-perl/Test-Most/Test-Most-0.340.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Most commonly needed test functions and features"
 
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~x86"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-perl/Try-Tiny/Manifest b/dev-perl/Try-Tiny/Manifest
index 9e103b40c08a..dc6c2534d243 100644
--- a/dev-perl/Try-Tiny/Manifest
+++ b/dev-perl/Try-Tiny/Manifest
@@ -1,2 +1,3 @@
 DIST Try-Tiny-0.18.tar.gz 16499 SHA256 4ec6fa76eda43ceb10598ea9950c815b332bb4e927b11a62d247c447faca4a1a SHA512 2e21298a22670c58a702a5a168a43dc48a213ef407bd7be3b3676522ea17735ea22dc835aa89c4e57e53af030e3310c881e9432c527435d827351f2230af0de5 WHIRLPOOL 5822a52848a4716cbbe882d95e11e9ff486a4fd6c29d1601c00bfcce0e3517bba54e281308acf539c47df6708a7abb869a5c3bad2432c8ee10877e3414a9ea83
 DIST Try-Tiny-0.19.tar.gz 17165 SHA256 57ae3341b03af36a052922d88e1ebf1c17828b25da69dfbe98ac8b113c181aec SHA512 5a642da7e55becb41109bfbb1e44999bde6904c4c5b961658b3ddb5958c84320f02ba7e081f36e7381dd04ae7174373e0c69587f49882b35202e8a45f6eb5115 WHIRLPOOL 6398d05e865b6c155ff9774f72ea6e2b0610d1968750a0d3d41687dedbc10930cf9a15de15fb739f5ca4f0c048879ee00479986ec1ebec48bd54c6ea2dc3661c
+DIST Try-Tiny-0.22.tar.gz 18311 SHA256 60fba46f4693d33d54539104f9001df008dabb400b6837e9605c39a6ee6a1b19 SHA512 4e39b4da16480bb2b93c05e8e016e9d1b5a68f29c527b19bbf9333442ca708e88dd2720a5812d141a152ae088ed1fcb1ce179018c2d0fe105545256396b2ccc4 WHIRLPOOL 1d260b96ef061e7a8ae605e5168bbac807a93387bcb3e085e2b305b8196fedebbebdaa3ac190edbd4c3772b8fd1e46219e6718ee849b8ae0b1d6e0360a88c82d
diff --git a/dev-perl/Try-Tiny/Try-Tiny-0.220.0.ebuild b/dev-perl/Try-Tiny/Try-Tiny-0.220.0.ebuild
new file mode 100644
index 000000000000..e2cf52ceca6a
--- /dev/null
+++ b/dev-perl/Try-Tiny/Try-Tiny-0.220.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+MODULE_AUTHOR=DOY
+MODULE_VERSION=0.22
+inherit perl-module
+
+DESCRIPTION="Minimal try/catch with proper localization of $@"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+IUSE="test"
+
+RDEPEND="
+	virtual/perl-Carp
+	>=virtual/perl-Exporter-5.570.0
+"
+DEPEND="${RDEPEND}
+	>=virtual/perl-ExtUtils-MakeMaker-6.300.0
+	test? (
+		dev-perl/Sub-Name
+		>=dev-perl/Capture-Tiny-0.120.0
+		virtual/perl-File-Spec
+		virtual/perl-Test-Simple
+		virtual/perl-if
+	)
+"
+
+SRC_TEST="do parallel"
diff --git a/dev-perl/UNIVERSAL-isa/Manifest b/dev-perl/UNIVERSAL-isa/Manifest
index b53a634d5071..07219e1b0461 100644
--- a/dev-perl/UNIVERSAL-isa/Manifest
+++ b/dev-perl/UNIVERSAL-isa/Manifest
@@ -1 +1,2 @@
 DIST UNIVERSAL-isa-1.20120726.tar.gz 12371 SHA256 c1b0ef6909c92dd5a0727e932b48c7f3ec7cbd73695ac527280b2174754a54e1 SHA512 f611e8b4b64969dae861ca8488f9a6ffc9871fa1565e994d6245e2c1af3a53a3bf18d60614b8859a2fb2276ef46c5af78a3c304d0d58128a792ac4c95cb96c03 WHIRLPOOL 0d2d7a65688df92bb1084a9571bd2602e145e76c02a0eb70cc5de3591f17fc84c4154c6dfd4083693613383ccd640cd8c4242a70087d3204c967d40bec3cd645
+DIST UNIVERSAL-isa-1.20150614.tar.gz 27124 SHA256 6ebf0376b9e8970087330000114d80a57f7520cea193f4f3440385d888ed2fd4 SHA512 f35ac6dd8762702f47ff7df5276ffd8a1ccfeeb531751cd41fc08f374c6309f76ea0cf1e57e1386b39ae46003464ac1f819f987777708d191eee171474122362 WHIRLPOOL a2b8c808706fb85d67fa43ffea93d449ea6646f69f2a98bdd9b69e6828797239730203c70ab8d3537795bed6ea9a74fb40fb385de8c12a68ecf115e9a3b79e8c
diff --git a/dev-perl/UNIVERSAL-isa/UNIVERSAL-isa-1.201.506.140.ebuild b/dev-perl/UNIVERSAL-isa/UNIVERSAL-isa-1.201.506.140.ebuild
new file mode 100644
index 000000000000..ac4e2cdf4ed0
--- /dev/null
+++ b/dev-perl/UNIVERSAL-isa/UNIVERSAL-isa-1.201.506.140.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+MODULE_AUTHOR=ETHER
+MODULE_VERSION=1.20150614
+inherit perl-module
+
+DESCRIPTION="Attempt to recover from people calling UNIVERSAL::isa as a function"
+
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~x86 ~ppc-aix"
+IUSE="test"
+
+RDEPEND="
+	virtual/perl-Scalar-List-Utils
+"
+DEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? (
+		virtual/perl-File-Spec
+		virtual/perl-Test-Simple
+	)
+"
+
+SRC_TEST="do parallel"
diff --git a/dev-perl/UNIVERSAL-require/Manifest b/dev-perl/UNIVERSAL-require/Manifest
index 2456f18b323f..1d54c79af742 100644
--- a/dev-perl/UNIVERSAL-require/Manifest
+++ b/dev-perl/UNIVERSAL-require/Manifest
@@ -1,2 +1,2 @@
-DIST UNIVERSAL-require-0.15.tar.gz 5011 SHA256 dc1f11a3b88488639283e21c20d410c748b43dc4e544b48e2732908bea32792b SHA512 060bfbd80983bcfe785c89940e68c40a4621d0c6c4f8456939d27115e4fc7289730bbace76674e4d898d32788c1bc13027d417b28e3369721f1a5a985cb53ec4 WHIRLPOOL 1d4fb6bcb8118e3ed6a635dec2deb187e5ef214e3b06946a89c30775271ccee2c42d4407c68dbd78e4eb0605562467f4070f00a86d0b65de36a4044391572d18
 DIST UNIVERSAL-require-0.16.tar.gz 5412 SHA256 42fdf1b90c60cd07a078b34c59447faa39186a8992633d891d936d9a861b7d39 SHA512 d1d11edbe60fe02df659fc66a3237783400230cc133789293f6a7945ea498ea2d3ce42d7b3186d6349c624c801f237abc8e48c66c0a76c8d0a35742ed08a4e32 WHIRLPOOL 8ad3e9fd1ea9bfac93a07a9139f76ef66f0f4585555abc38f7c233e3542cb58ba9bf972af5a1dff6fd5b53288df603ce50c4f460024e08a45175b11764ce1f00
+DIST UNIVERSAL-require-0.18.tar.gz 5885 SHA256 b2a736a87967a143dab58c8a110501d5235bcdd2c8b2a3bfffcd3c0bd06b38ed SHA512 4e1dbb62f850a2f3da3301e37862d03ad89106e9fd55ac8161ae56eff936948f87b9215c734c103d8031e1b712847bff86de43329f65f00e7e34ee83bb66c22d WHIRLPOOL da655999921001f41a594d7a8ab73e5f5fc5d258bea7c58c9ba7a061d7b195a593dd9ddb9ce3ef0284989a4ed8ef28ce4ebe83df783e5d80906b990a773cab73
diff --git a/dev-perl/UNIVERSAL-require/UNIVERSAL-require-0.150.0-r1.ebuild b/dev-perl/UNIVERSAL-require/UNIVERSAL-require-0.150.0-r1.ebuild
deleted file mode 100644
index fc771ca98efa..000000000000
--- a/dev-perl/UNIVERSAL-require/UNIVERSAL-require-0.150.0-r1.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MODULE_AUTHOR=NEILB
-MODULE_VERSION=0.15
-inherit perl-module
-
-DESCRIPTION="UNIVERSAL::require - require() modules from a variable"
-
-SLOT="0"
-KEYWORDS="amd64 ~ia64 ~ppc sparc x86 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE=""
-
-SRC_TEST="do"
diff --git a/dev-perl/UNIVERSAL-require/UNIVERSAL-require-0.180.0.ebuild b/dev-perl/UNIVERSAL-require/UNIVERSAL-require-0.180.0.ebuild
new file mode 100644
index 000000000000..c0f0752eac47
--- /dev/null
+++ b/dev-perl/UNIVERSAL-require/UNIVERSAL-require-0.180.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+MODULE_AUTHOR=NEILB
+MODULE_VERSION=0.18
+inherit perl-module
+
+DESCRIPTION="UNIVERSAL::require - require() modules from a variable"
+
+SLOT="0"
+KEYWORDS="~amd64 ~ia64 ~ppc ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="test"
+
+RDEPEND="
+	virtual/perl-Carp
+"
+DEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? ( >=virtual/perl-Test-Simple-0.470.0 )
+"
+
+SRC_TEST="do parallel"
diff --git a/dev-perl/URI-Find/Manifest b/dev-perl/URI-Find/Manifest
index 103ec85c1b5d..35fd6b63dbc5 100644
--- a/dev-perl/URI-Find/Manifest
+++ b/dev-perl/URI-Find/Manifest
@@ -1 +1,2 @@
 DIST URI-Find-20111103.tar.gz 24708 SHA256 79c56264b15fb8876bc3f4ced8ba6b9497c4c7abc0e49571d3da1549825cebc5 SHA512 b824163fa1ec7829566a876bc6405bb1822fe256507aa7c0f2a429983bbd5618ca31193cd89731e0447b5080902ac7de0a50de28ed6288fe147273eeb0ee782e WHIRLPOOL 678e4007188f004c4ed17a404347c80997ea6c58632308aa8a3f1ae19a0067ddc687ed5e022fa748a725a252a31334f05e04e0e68c9c7a504d513ba15e7a0583
+DIST URI-Find-20140709.tar.gz 28453 SHA256 c0c34c5f7eddacc1c6553099015fe776797f1ec5a70e11e6e8fa68810224ec33 SHA512 c7f560ceb08802ba0be08f6f2e46ef8056d36b11eb70af41adea6179f9950a8bfe0b27a813d054c8585c808979653afc9630583b3c02b99ad9c91dbadc8c3f65 WHIRLPOOL 00e85f4189dbaeee578b1c0030a483d83b86d9026161de28b00df208b55a47b1199e50b93073b2bb88addc528ead6fd7c1a0f9921e6d367ee868219b113d6c48
diff --git a/dev-perl/URI-Find/URI-Find-20140709.0.0.ebuild b/dev-perl/URI-Find/URI-Find-20140709.0.0.ebuild
new file mode 100644
index 000000000000..f4c269d14450
--- /dev/null
+++ b/dev-perl/URI-Find/URI-Find-20140709.0.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+MODULE_AUTHOR=MSCHWERN
+MODULE_VERSION=20140709
+inherit perl-module
+
+DESCRIPTION="Find URIs in plain text"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x86-solaris"
+IUSE="test"
+
+RDEPEND="
+	>=dev-perl/URI-1.600.0
+"
+DEPEND="${RDEPEND}
+	>=dev-perl/Module-Build-0.300.0
+	test? (
+		>=virtual/perl-Test-Simple-0.880.0
+		dev-perl/Test-Pod
+	)
+"
+
+SRC_TEST="do parallel"
diff --git a/dev-perl/URI/Manifest b/dev-perl/URI/Manifest
index ff688673dcac..ce3f80030fc4 100644
--- a/dev-perl/URI/Manifest
+++ b/dev-perl/URI/Manifest
@@ -1,3 +1,3 @@
 DIST URI-1.60.tar.gz 81196 SHA256 1f92d3dc64acb8845e9917c945e22b9a5275aeb9ff924eb7873c3b7a5c0d2377 SHA512 8a4ea901ad16595a76eec85f690369f30b2ff46e8f7d8512fb800113b0f30ede7ea7e7f407174e58b95e7e5423c202c032858883b913a4642a6ee489940a6136 WHIRLPOOL 16d470306d23e029c22ad7eaf7fcdf44178b0ef49ed27f254b104006698e2edfe4636f434a0f7161a1c18eb23b451b38b7df6427a2567b3983fd0bc423dc5f60
-DIST URI-1.67.tar.gz 82883 SHA256 7088d43d5f4902becfa5e0627751f5e6d0e0bdd1637b2d39e70ce807068a274e SHA512 4e7c6c55a4444b419e3e75ad09f42e2ae0c1ef812f0f894ce3231742a1c6e484115518ff665b1f759d1bd331394f1feaf0a652781114a8cd41419fa1a899018e WHIRLPOOL 003126e41c6910ed42816e1e62a2d7afabfca1ef82581e938e5e82f50e206df6e1bda48431ad62e91ce2e2f26ded0f8f08b619cb3e0e9d9edaf7831d38c312ca
 DIST URI-1.68.tar.gz 99425 SHA256 c840d30f7657bfd4b2acbb311bd764232911cd3dc97e92415fbd0a242185c358 SHA512 1c17d293c633c909a468887b6aadf9f91a8c0477e5e6be7a97d6573ac58e5ad213c67f122a3d3a20238b7f094d69cef5cd4415caafe1844b18f7300942d5d233 WHIRLPOOL 075a626aab99433a0a8e51f5e03c3751ac1a616ad2a08de08bf10d0e0a7d9272cedfeb8d87235c863b11a90217059c8a92a13b84b1fa81d76fa035847453bca6
+DIST URI-1.69.tar.gz 99836 SHA256 b74b16ea626b6f8061821bb350674c638a98be1fc766eadb24fec6635998b42d SHA512 4e58cd450c58be4c3e0254c8e53bd0b4d3516468efb466c933343efc12191856bfc6c0d5c3de3b523e66d4930c2426f0089d5cd9ece7b4a5b8aff0a9596064cc WHIRLPOOL 331c632a0d4457b07ba03c1fe477065b27bd2abd0c4406f328befb3daca29bee4b1c61fbb34b3a44edb868e941e2957d0c0258384753068d55f15240d44f7d62
diff --git a/dev-perl/URI/URI-1.670.0.ebuild b/dev-perl/URI/URI-1.670.0.ebuild
deleted file mode 100644
index f6bd54875422..000000000000
--- a/dev-perl/URI/URI-1.670.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MODULE_AUTHOR=ETHER
-MODULE_VERSION=1.67
-inherit perl-module
-
-DESCRIPTION="Uniform Resource Identifiers (absolute and relative)"
-
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~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="test"
-
-RDEPEND="
-	>=virtual/perl-Exporter-5.570.0
-	>=virtual/perl-MIME-Base64-2
-	virtual/perl-Scalar-List-Utils
-"
-DEPEND="${RDEPEND}
-	virtual/perl-ExtUtils-MakeMaker
-	test? (
-		virtual/perl-File-Temp
-		>=virtual/perl-Test-Simple-0.960.0
-	)
-"
-
-SRC_TEST=no # see ChangeLog, uses network tests
-
-mydoc="rfc2396.txt"
diff --git a/dev-perl/URI/URI-1.690.0.ebuild b/dev-perl/URI/URI-1.690.0.ebuild
new file mode 100644
index 000000000000..037206f4964d
--- /dev/null
+++ b/dev-perl/URI/URI-1.690.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+MODULE_AUTHOR=ETHER
+MODULE_VERSION=1.69
+inherit perl-module
+
+DESCRIPTION="Uniform Resource Identifiers (absolute and relative)"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~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="test"
+
+RDEPEND="
+	>=virtual/perl-Exporter-5.570.0
+	>=virtual/perl-MIME-Base64-2
+	virtual/perl-Scalar-List-Utils
+"
+DEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? (
+		virtual/perl-File-Temp
+		>=virtual/perl-Test-Simple-0.960.0
+	)
+"
+
+SRC_TEST=no # see ChangeLog, uses network tests
+
+mydoc="rfc2396.txt"
diff --git a/dev-perl/Variable-Magic/Manifest b/dev-perl/Variable-Magic/Manifest
index d7f8a8bfdd7e..9e184a9508de 100644
--- a/dev-perl/Variable-Magic/Manifest
+++ b/dev-perl/Variable-Magic/Manifest
@@ -1,2 +1,3 @@
 DIST Variable-Magic-0.53.tar.gz 58153 SHA256 18fd97b913b383df0c8f1e91cabe82bfc450d7aec8d5f62f9d015884cf7abed7 SHA512 b0198fee5675c4b395b06a97c9c7c936e39329484846afea731d82136067e041d4ddd658c3a26dc9c268c7ed95b468329bd994f0d51a2ecf0c34efdb8e16c7d5 WHIRLPOOL a0a97de33416c95e492c4b61cd4d0274ffba969df337685ce858b33890361c01a499fdfbd268fbd09095f32489fc0a4a7969a47c60874322abcbcf1b724803c3
 DIST Variable-Magic-0.57.tar.gz 70530 SHA256 4dc0427c08f608473f84e890d50363ee0f8b271283841f977a3e2dc5b7ad5ca2 SHA512 ee585ed1858021cd0005c0a6ff33f5b9e50714ab9fe78a40feca8ae9e5c9cb8250fb1d75813b0055467f8abbe8c04c7b7211c4922627a0f0cb75eb76e3908282 WHIRLPOOL ded608078add265c2820ce33594ba2c6dd90cc1a40bc2ef7d53d09089d79f4ab3f718cb2b973094a4cd398595081b63ae335b3c2cae78d13cefd9fe7b2af9416
+DIST Variable-Magic-0.58.tar.gz 73506 SHA256 036d6a18b2014fbe3a9e2c033157bd62dd82b175dbe63e12d7c874aed61f10fa SHA512 0318dc08c73f4680731fda15c35301454cf12cd366c8276b80f36441ecbc92edd6659238a80d0749d1faa25c1dcb4ec1c3d652f1a3d96694c93967507a903ed1 WHIRLPOOL 28b74cfbe2999a522397449802506e8ff06323b33d4fdeab34f9f8f8145c27e91d1b574c2371c0bf0a3c36993fe526902a63d5b7d09009e3493f2405a76d4539
diff --git a/dev-perl/Variable-Magic/Variable-Magic-0.580.0.ebuild b/dev-perl/Variable-Magic/Variable-Magic-0.580.0.ebuild
new file mode 100644
index 000000000000..3c0b405757f5
--- /dev/null
+++ b/dev-perl/Variable-Magic/Variable-Magic-0.580.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+MODULE_AUTHOR=VPIT
+MODULE_VERSION=0.58
+inherit perl-module
+
+DESCRIPTION="Associate user-defined magic to variables from Perl"
+
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~x86 ~ppc-aix ~x64-macos"
+IUSE="test"
+
+RDEPEND="
+	virtual/perl-Carp
+	virtual/perl-Exporter
+	virtual/perl-XSLoader
+"
+DEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? (
+		virtual/perl-Test-Simple
+		dev-perl/Test-Pod
+		dev-perl/Test-Pod-Coverage
+	)
+"
+
+SRC_TEST="do parallel"
diff --git a/dev-perl/google-api-adwords-perl/metadata.xml b/dev-perl/google-api-adwords-perl/metadata.xml
index e5b91425a40f..5f765fb3b118 100644
--- a/dev-perl/google-api-adwords-perl/metadata.xml
+++ b/dev-perl/google-api-adwords-perl/metadata.xml
@@ -5,4 +5,7 @@
   <maintainer>
     <email>flameeyes@gentoo.org</email>
   </maintainer>
+  <upstream>
+    <remote-id type="github">googleads/googleads-perl-lib</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-perl/gtk2-fu/Manifest b/dev-perl/gtk2-fu/Manifest
deleted file mode 100644
index 677a8115724f..000000000000
--- a/dev-perl/gtk2-fu/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST Gtk2Fu-0.11.tar.gz 24630 SHA256 ae1076c2623e56627dec3cd93e8c7cbad49cf8e7f43d92cc3da034f0a9600202 SHA512 e68fc40c55914b9a58ac832715fe7da58b35ad901026ce8f9eb3e9e32d41029529b32a0b9442cb9416f0ae52e6d248c963148ecf1e04e6ce62d0fca3833086d2 WHIRLPOOL df40692155b09d4219912b710fac4ce0972e79eec772c577b8f96fc25e342c58b02859bd72387a2f48d8bfcf162c9725fee04356a8a47bfb6240d5e440169e21
-DIST Gtk2Fu-0.110.0-patch.tar.bz2 486 SHA256 d28e0df28edba3638805d02aa000213b0c03dc76714521b2e13afed30d211e8e SHA512 f850e310255869a9fc3cb207dca71fa768e919f90217d2392687b127c6353fe0dc895c509b4e1297308ce49bb484e3d91cef52e9ed202eafab771ca8146ae660 WHIRLPOOL 3518cb5334b9fbe0495652d0ea50c3a7f9f20b2ac5f465a0a5e6418f4a794284513d1cdf4a4920c5f9967b30d7f685c45dc5b5aa08b471937d9e4312e7f6b03e
diff --git a/dev-perl/gtk2-fu/gtk2-fu-0.110.0-r2.ebuild b/dev-perl/gtk2-fu/gtk2-fu-0.110.0-r2.ebuild
deleted file mode 100644
index 5d20bbe14a71..000000000000
--- a/dev-perl/gtk2-fu/gtk2-fu-0.110.0-r2.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MY_PN=Gtk2Fu
-MODULE_AUTHOR=DAMS
-MODULE_VERSION=0.11
-inherit perl-module
-
-DESCRIPTION="gtk2-fu is a layer on top of perl gtk2, that brings power, simplicity and speed of development"
-SRC_URI+="
-https://dev.gentoo.org/~tove/distfiles/${CATEGORY}/${MY_PN:-${PN}}/${MY_PN:-${PN}}-${PV}-patch.tar.bz2"
-
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ppc ppc64 x86"
-IUSE="test"
-
-RDEPEND="dev-perl/gtk2-perl"
-DEPEND="${RDEPEND}
-	dev-perl/Module-Build
-	test? (
-		dev-perl/Test-Pod
-		dev-perl/Test-Pod-Coverage
-	)"
-
-SRC_TEST="do"
-EPATCH_SUFFIX=patch
-PATCHES=(
-	"${WORKDIR}"/${MY_PN:-${PN}}-patch
-)
-
-PERL_RM_FILES=(
-	t/pod-coverage.t
-	t/pod.t
-)
diff --git a/dev-perl/gtk2-fu/metadata.xml b/dev-perl/gtk2-fu/metadata.xml
deleted file mode 100644
index 2f196da350b2..000000000000
--- a/dev-perl/gtk2-fu/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <herd>perl</herd>
-  <upstream>
-    <remote-id type="cpan">Gtk2Fu</remote-id>
-    <remote-id type="cpan-module">Gtk2::Box</remote-id>
-    <remote-id type="cpan-module">Gtk2::Widget</remote-id>
-    <remote-id type="cpan-module">Gtk2::Window</remote-id>
-    <remote-id type="cpan-module">Gtk2::WrappedLabel</remote-id>
-    <remote-id type="cpan-module">Gtk2Fu</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-perl/perltidy/perltidy-20140711.0.0.ebuild b/dev-perl/perltidy/perltidy-20140711.0.0.ebuild
index ec30703edb28..47a2fabe55eb 100644
--- a/dev-perl/perltidy/perltidy-20140711.0.0.ebuild
+++ b/dev-perl/perltidy/perltidy-20140711.0.0.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="http://perltidy.sourceforge.net/ ${HOMEPAGE}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
 IUSE=""
 
 SRC_TEST="do"
diff --git a/dev-python/CacheControl/CacheControl-0.11.5.ebuild b/dev-python/CacheControl/CacheControl-0.11.5.ebuild
index 60020bb51a70..3b451f4a2e4c 100644
--- a/dev-python/CacheControl/CacheControl-0.11.5.ebuild
+++ b/dev-python/CacheControl/CacheControl-0.11.5.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~hppa ~mips ~ppc64 ~x86"
 IUSE="redis test"
 
 RDEPEND="
diff --git a/dev-python/Numdifftools/Manifest b/dev-python/Numdifftools/Manifest
index 708796bbecd3..bf94cc8fa8ab 100644
--- a/dev-python/Numdifftools/Manifest
+++ b/dev-python/Numdifftools/Manifest
@@ -1,2 +1,3 @@
 DIST Numdifftools-0.6.0.zip 184293 SHA256 56bee55a361c263dd250fcd009923ee9289dbc9bde635fe10b41d84e6a404549 SHA512 57c3a63e9fc2738478534cd81542d1398667824c80ad5263610be29bec38209f4f9963ad61f2b02327724946567d61fe310a9e82b1b301d1b36fe229f33445bd WHIRLPOOL 9780391abf8774137b3aaa03c88bed521ff6367c7bdefdb23c7e412e162ec8c81a6724a7af525ccddb69673b0afa1c862dbf7285f0faa659af46f758ad48ae9b
 DIST numdifftools-0.7.7.zip 181520 SHA256 c5a309a7a0b58f6177dc7e3d55c2830c07ca2715c9c706644d500fc4eca97c4d SHA512 ccb5f8a06bf21dfb803004fa104d36e07cdbebb72682d84577506cca6fc63abd2e4b1c13cbc960ad691ee70bef616c282b8dbb682f78d1ff8d230213afd58428 WHIRLPOOL b6579d64f1e6beded914189b392952988eb1396ee9ad06d4ba4b3edfbe4666c1e7de35cf1405c38422aa459e9a631a94d8f821a9fe22309a681043883ec56ae2
+DIST numdifftools-0.9.12.zip 236823 SHA256 eee07f03eaa9531c34949bfbb27b0fade7b1e927dd9daf18342d13fc1ee88eaa SHA512 00c78abac0c08beb72ec11bcddd74165db773a0fa9b4eee10290a27c4c143f1593254e058898dc12aee1afc6bad5bb2849451e6018129aa32e808eee1b97420c WHIRLPOOL aef074b9aaf4caecfad8bff75ccb8bd95e36373e2dd4e1dfc4b700fa1925b9b8652d6c483f81133c82e857abae6f2628e9166c77d6b102db3f9bb58c72e682a7
diff --git a/dev-python/Numdifftools/Numdifftools-0.9.12.ebuild b/dev-python/Numdifftools/Numdifftools-0.9.12.ebuild
new file mode 100644
index 000000000000..60c050dcfcab
--- /dev/null
+++ b/dev-python/Numdifftools/Numdifftools-0.9.12.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4} )
+
+inherit distutils-r1
+
+MY_PN=numdifftools
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Solves automatic numerical differentiation problems in one or more variables"
+HOMEPAGE="https://pypi.python.org/pypi/Numdifftools https://github.com/pbrod/numdifftools"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.zip"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND="
+	>=dev-python/algopy-0.4[${PYTHON_USEDEP}]
+	dev-python/matplotlib[${PYTHON_USEDEP}]
+	>=dev-python/numpy-1.9.0[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	>=sci-libs/scipy-0.8[${PYTHON_USEDEP}]
+	"
+DEPEND="
+	>=dev-python/setuptools-0.9[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-runner[${PYTHON_USEDEP}]
+	)"
+
+# Seems to be broken
+# https://github.com/pbrod/numdifftools/issues/11
+# https://github.com/pbrod/numdifftools/issues/12
+RESTRICT="test"
+
+S="${WORKDIR}"/${MY_P}
+
+python_prepare_all() {
+	sed \
+		-e "/numpydoc/d" \
+		-i requirements.txt || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/alabaster/alabaster-0.7.6.ebuild b/dev-python/alabaster/alabaster-0.7.6.ebuild
index 6b7197a2f205..a4b1dc36a34a 100644
--- a/dev-python/alabaster/alabaster-0.7.6.ebuild
+++ b/dev-python/alabaster/alabaster-0.7.6.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://github.com/bitprophet/alabaster"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc64 ~x86"
 SLOT="0"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/asset/Manifest b/dev-python/asset/Manifest
index c9db91b82600..ea6d035399b0 100644
--- a/dev-python/asset/Manifest
+++ b/dev-python/asset/Manifest
@@ -1,2 +1,3 @@
 DIST asset-0.6.1.tar.gz 20613 SHA256 071fcbf93b03d791b4e301c1459dc6bd1779407f9c0326fa136f03449c4bb4c4 SHA512 6fa20888220e83a0a122b8ab63e531551724c64476c3fce8f47f784731710fa3328fa4ac3855bde5fb4caed47274f0492e14df438cf7857c0e5437f33217b672 WHIRLPOOL ca266bb9969e7b4f1b8a7940928ac3dac169374b5c7e44af091f112dcee975ed8d699bcf864645c2122ca3b503e54357a25884d7d2f97c32ae6ad67d67354fc9
 DIST asset-0.6.2.tar.gz 20961 SHA256 5d4e5735a28408e84a61cbf22b41736fa2dfbe8807df2a4b50d2fa8ef3e0f0f9 SHA512 c1337b28cb55127e987003f2c4f14df6dd2b86252e8884a44e10f6aede2387ddeb007f8e0426417dc1ec1fa56c4d5d4491173bf451542caf9f6ac5c78b871f90 WHIRLPOOL b68c268ad8b446da1770105aec70e3e45969a4906c290831c22375c9a7c2788f7c64493ad6970e20b5521a2a6d016aef708098b2b03549703e059678ba51e89c
+DIST asset-0.6.3.tar.gz 21110 SHA256 1ac30617c42afb30c7bdaf87ff933e956067287b4b2d6cc04e34bd658b5bde46 SHA512 3898b1cac3cabd7aa9134ebbc2d47924f3cb4940b884a835f45fb9e5ffcf502f55f74322bdf1f99fbb3ecdeb07056ac32eba245b0456adc8bc7cc1230814c336 WHIRLPOOL 4122457260312645c2c2d17a1185d93be8c34a5dfd5358c35c07ec3650ac1af89252bea94ed1e27252ee4011115390348fb7a4b07928a8cae4644ba40913466e
diff --git a/dev-python/asset/asset-0.6.3.ebuild b/dev-python/asset/asset-0.6.3.ebuild
new file mode 100644
index 000000000000..33886f2c06a1
--- /dev/null
+++ b/dev-python/asset/asset-0.6.3.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4} )
+
+inherit distutils-r1
+
+DESCRIPTION="A package resource and symbol loading helper library"
+HOMEPAGE="https://pypi.python.org/pypi/asset https://github.com/metagriffin/asset"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-3+"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND="
+	>=dev-python/globre-0.0.5[${PYTHON_USEDEP}]
+	>=dev-python/six-1.4.1[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	test? (
+		>=dev-python/nose-1.3.0[${PYTHON_USEDEP}]
+		>=dev-python/pxml-0.2.11[${PYTHON_USEDEP}]
+	)"
+
+python_test() {
+	nosetests --verbose || die
+}
diff --git a/dev-python/attrdict/attrdict-2.0.0.ebuild b/dev-python/attrdict/attrdict-2.0.0.ebuild
index bc776d9514f5..541e0acfd87f 100644
--- a/dev-python/attrdict/attrdict-2.0.0.ebuild
+++ b/dev-python/attrdict/attrdict-2.0.0.ebuild
@@ -3,6 +3,7 @@
 # $Id$
 
 EAPI=5
+
 PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
 
 inherit distutils-r1
@@ -26,5 +27,5 @@ DEPEND="
 RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
 
 python_test() {
-	esetup.py nosetests || die "tests failed under ${EPYTHON}"
+	esetup.py nosetests
 }
diff --git a/dev-python/bcrypt/bcrypt-1.1.1.ebuild b/dev-python/bcrypt/bcrypt-1.1.1.ebuild
index 7ccbce5ccda7..0f422d8605e1 100644
--- a/dev-python/bcrypt/bcrypt-1.1.1.ebuild
+++ b/dev-python/bcrypt/bcrypt-1.1.1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
 
 SLOT="0"
 LICENSE="Apache-2.0"
-KEYWORDS="amd64 ia64 ppc64 ~x86"
+KEYWORDS="amd64 ia64 ppc ppc64 ~x86"
 IUSE="test"
 
 DEPEND="
diff --git a/dev-python/beautifulsoup/beautifulsoup-4.4.0.ebuild b/dev-python/beautifulsoup/beautifulsoup-4.4.0.ebuild
index a5009b6e05fa..48f6ba4bab9e 100644
--- a/dev-python/beautifulsoup/beautifulsoup-4.4.0.ebuild
+++ b/dev-python/beautifulsoup/beautifulsoup-4.4.0.ebuild
@@ -26,8 +26,9 @@ RDEPEND="$(python_gen_cond_dep 'dev-python/html5lib[${PYTHON_USEDEP}]' python2_7
 		$(python_gen_cond_dep 'dev-python/lxml[${PYTHON_USEDEP}]' python2_7 'python3*')"
 DEPEND="doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
 	test? ( dev-python/nose[${PYTHON_USEDEP}]
-		!dev-python/chardet[${PYTHON_USEDEP}] )"
+		!!dev-python/chardet )"
 # See https://bugs.launchpad.net/beautifulsoup/+bug/1471359 to explain need for blocker
+[[ ${PV} == 4.4.0 ]] || die "Don't forget to remove the chardet blocker!"
 
 S=${WORKDIR}/${MY_P}
 
diff --git a/dev-python/botocore/Manifest b/dev-python/botocore/Manifest
index d6c5d9ada5bc..368525ec5966 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -1,3 +1,3 @@
 DIST 1.1.11.tar.gz 1975224 SHA256 b4e6edc12177dd4f720259aa7027bab00fb9db2029e40e77e67c552ef9f41132 SHA512 b0b10299d93314de582cfd21511987fe210df1618c49f6c706c4341a3a635a85cd48d8848a69f83391a227ab5dc3881509a02b4cc47b1e27d18cf353d4de850b WHIRLPOOL 21e662fe7f713a98e5e16225e3860585f0abb8e4a47b5f0ae52262a929a32ce563e1108c80602c9c2136180957c1b8bb4b89d8b9fc84415c155212d326f08b90
-DIST botocore-1.1.7.tar.gz 1966396 SHA256 50d90705815aff4dd4e2be503ad42c0fb52874053046de9042bc16563a8ecd68 SHA512 4aba7712b7154362a52f46e2c0d28d0ff0d096d7741e99760848a23338420be290b3b91892cb764f4aca21122b208533a5b1e33bf23bce76b09e0bb5560b6764 WHIRLPOOL 9871171175dd88bf69171966c3fe8c410f07b0340381d64925d7c7ccf108664ba97f9785ffd61e3518ff9ce834eee7c405420d37c071acb1c655dd8c38f2ae95
 DIST botocore-1.1.8.tar.gz 1969137 SHA256 338fed0119d819a60b2b7cf1a1a38f93603c5f012a2a483b713425816a43a57c SHA512 24c17057ce600873fb37ecd6712defe8339a36cc11cb77afd2417b68bef63e46ebb22dbe320e5c4bb7f948aee6fb3fc90336c021c6adf2d7902cab8ce6d214f2 WHIRLPOOL 54872902565ad7af5932517a554a4577445aa2539c1668f5d672f7e60b84efae6ad0af68e98d9cc3ed2fb4204936c6881bf17cda0ef821a2ee6e8f60b1cf6b20
+DIST botocore-1.2.0.tar.gz 1993122 SHA256 59f2b9109d2cef499679b1676622e653b6a74be8ce20f84104fe631eb5434972 SHA512 8a336c4895e61246f36fdacb7a90c192a6db8b543331b25a6abc153b4b7fd3dd1f06a7c2f64451a12d900ebebb0ae86d1fe0b8011e22a7b09fd6143a6b8a7072 WHIRLPOOL 3bc375a0949ff7a4cb5e97b766681c8a71f65183c36afd9900275ac54ea0bebea94bb655bf8020752ed1f9e85c9cca775fc3f531133ffb7ce535a5bfe1daf246
diff --git a/dev-python/botocore/botocore-1.1.7.ebuild b/dev-python/botocore/botocore-1.1.7.ebuild
deleted file mode 100644
index a9e058563f4a..000000000000
--- a/dev-python/botocore/botocore-1.1.7.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
-
-inherit distutils-r1 vcs-snapshot
-
-DESCRIPTION="Low-level, data-driven core of boto 3."
-HOMEPAGE="https://github.com/boto/botocore"
-SRC_URI="https://github.com/boto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="doc test"
-
-CDEPEND="
-	>=dev-python/docutils-0.10[${PYTHON_USEDEP}]
-	~dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-2.1[${PYTHON_USEDEP}]
-	<dev-python/python-dateutil-3.0.0[${PYTHON_USEDEP}]
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? (
-		>=dev-python/guzzle_sphinx_theme-0.7.10[${PYTHON_USEDEP}]
-		<dev-python/guzzle_sphinx_theme-0.8[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.1.3[${PYTHON_USEDEP}]
-		<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
-	)
-	test? (
-		${CDEPEND}
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-	)
-"
-RDEPEND="${CDEPEND}"
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	nosetests tests/unit || die "tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/build/html/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/botocore/botocore-1.2.0.ebuild b/dev-python/botocore/botocore-1.2.0.ebuild
new file mode 100644
index 000000000000..5908e96eca5c
--- /dev/null
+++ b/dev-python/botocore/botocore-1.2.0.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
+
+inherit distutils-r1 vcs-snapshot
+
+DESCRIPTION="Low-level, data-driven core of boto 3."
+HOMEPAGE="https://github.com/boto/botocore"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="doc test"
+
+CDEPEND="
+	>=dev-python/docutils-0.10[${PYTHON_USEDEP}]
+	~dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
+	>=dev-python/python-dateutil-2.1[${PYTHON_USEDEP}]
+	<dev-python/python-dateutil-3.0.0[${PYTHON_USEDEP}]
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? (
+		>=dev-python/guzzle_sphinx_theme-0.7.10[${PYTHON_USEDEP}]
+		<dev-python/guzzle_sphinx_theme-0.8[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.1.3[${PYTHON_USEDEP}]
+		<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
+	)
+	test? (
+		${CDEPEND}
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+	)
+"
+RDEPEND="${CDEPEND}"
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	nosetests tests/unit || die "tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/build/html/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/botocore/metadata.xml b/dev-python/botocore/metadata.xml
index a82bafe4480d..2df0b5cad9d4 100644
--- a/dev-python/botocore/metadata.xml
+++ b/dev-python/botocore/metadata.xml
@@ -9,5 +9,6 @@
 	</longdescription>
 	<upstream>
 		<remote-id type="github">boto/botocore</remote-id>
+		<remote-id type="pypi">botocore</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/bpython/bpython-0.14.2.ebuild b/dev-python/bpython/bpython-0.14.2.ebuild
index 6d90b5849035..8f389d7b0a89 100644
--- a/dev-python/bpython/bpython-0.14.2.ebuild
+++ b/dev-python/bpython/bpython-0.14.2.ebuild
@@ -11,11 +11,8 @@ PYTHON_REQ_USE="ncurses"
 inherit distutils-r1
 
 DESCRIPTION="Syntax highlighting and autocompletion for the Python interpreter"
-HOMEPAGE="http://www.bpython-interpreter.org/ https://bitbucket.org/bobf/bpython/ https://pypi.python.org/pypi/bpython"
-SRC_URI="
-	http://www.bpython-interpreter.org/releases/${P}.tar.gz
-	mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
-	"
+HOMEPAGE="http://www.bpython-interpreter.org/ https://github.com/bpython/bpython https://pypi.python.org/pypi/bpython"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
@@ -24,7 +21,6 @@ IUSE="doc test"
 
 RDEPEND="
 	>=dev-python/curtsies-0.1.18[${PYTHON_USEDEP}]
-	<dev-python/curtsies-0.2.0[${PYTHON_USEDEP}]
 	dev-python/greenlet[${PYTHON_USEDEP}]
 	dev-python/jedi[${PYTHON_USEDEP}]
 	dev-python/pygments[${PYTHON_USEDEP}]
diff --git a/dev-python/cachetools/metadata.xml b/dev-python/cachetools/metadata.xml
index d5dfd322223c..a9d3cb9fbac7 100644
--- a/dev-python/cachetools/metadata.xml
+++ b/dev-python/cachetools/metadata.xml
@@ -7,4 +7,7 @@
 	</maintainer>
 	<longdescription lang="en">
 	</longdescription>
+	<upstream>
+		<remote-id type="pypi">cachetools</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/certifi/Manifest b/dev-python/certifi/Manifest
index 7a410e57f13f..0c7a81b02920 100644
--- a/dev-python/certifi/Manifest
+++ b/dev-python/certifi/Manifest
@@ -1,2 +1,3 @@
 DIST certifi-14.05.14.tar.gz 168608 SHA256 1e1bcbacd6357c151ae37cf0290dcc809721d32ce21fd6b7339568f3ddef1b69 SHA512 5edba0cc432c27212e31085fb3c2f2ded6fa177d716116111517c25b980d9fc206a9a6d47e2c001762e951ff50203b269d0eb245a039df20188b1136f3b700b2 WHIRLPOOL 54c3f7a8da25693f5df890c5bc348242350a7a63bc0094d5fbb08a4f89c79fcc3ce0bbf0cdeac7d2dfca5ebe5601a7ae5ec4fef492a6cf9afe6ecf5119d47f8b
 DIST certifi-2015.04.28.tar.gz 370682 SHA256 99785e6cf715cdcde59dee05a676e99f04835a71e7ced201ca317401c322ba96 SHA512 c63287d9e0814226a1eb6ea0f6d1a53f0fd88995c0c2541e404efd0c70471fae01cb56ecca5425c6754342c28c96948ba912bd860bf2d336bba95a0b751f8f99 WHIRLPOOL e235b016ca30332359f9172cf907f9372714371efcccf5bc2b82e08538ca1620f6854697201a6a3d1de5d25e74f5b3fede68e3c46255a9cd28b1f87b8dfa97b2
+DIST certifi-2015.9.6.2.tar.gz 368588 SHA256 dc3a2b2d9d1033dbf27586366ae61b9d7c44d8c3a6f29694ffcbb0618ea7aea6 SHA512 78166fa708e7f5162bc36c5b552b1c19e316f4f540db5733167730e9d3a7610b90622546b9e49bc539d9d4de543a169046d24fbbcded98b74f68351a91d15f31 WHIRLPOOL 4c1f075ea41d00819325bd49213c39f0af3f7e0393a2ea8b4c6efbfc38e828ee8e6b807da4a43974182a65565c6eed76d491d09f03841c9f96251d15bf19f9b7
diff --git a/dev-python/certifi/certifi-2015.04.28.ebuild b/dev-python/certifi/certifi-2015.04.28.ebuild
index 9bab36ba3613..1e8ccc5746e8 100644
--- a/dev-python/certifi/certifi-2015.04.28.ebuild
+++ b/dev-python/certifi/certifi-2015.04.28.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{3,4} pypy )
+PYTHON_COMPAT=( python2_7 python3_{3,4} pypy pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/certifi/certifi-2015.9.6.2.ebuild b/dev-python/certifi/certifi-2015.9.6.2.ebuild
new file mode 100644
index 000000000000..ea8cc9ce6a7a
--- /dev/null
+++ b/dev-python/certifi/certifi-2015.9.6.2.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Python package for providing Mozilla's CA Bundle"
+HOMEPAGE="http://certifi.io/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="amd64 arm hppa mips ppc ppc64 x86"
+IUSE=""
+
+RDEPEND=""
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/cffi/cffi-1.1.2.ebuild b/dev-python/cffi/cffi-1.1.2.ebuild
index 09bfb62abed3..d7b6335d2916 100644
--- a/dev-python/cffi/cffi-1.1.2.ebuild
+++ b/dev-python/cffi/cffi-1.1.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="alpha ~amd64 arm ~arm64 hppa ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="alpha ~amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
 IUSE="doc"
 
 RDEPEND="
diff --git a/dev-python/colorama/colorama-0.3.3.ebuild b/dev-python/colorama/colorama-0.3.3.ebuild
index f52552fa81bf..aeba8f1b8aa0 100644
--- a/dev-python/colorama/colorama-0.3.3.ebuild
+++ b/dev-python/colorama/colorama-0.3.3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~hppa ~mips ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="examples"
 
 python_install_all() {
diff --git a/dev-python/crumbs/Manifest b/dev-python/crumbs/Manifest
index 4b79e7206f8d..e45c1949305a 100644
--- a/dev-python/crumbs/Manifest
+++ b/dev-python/crumbs/Manifest
@@ -1,3 +1,4 @@
 DIST crumbs-1.2.2.tar.gz 7721 SHA256 eb3ea05bab4ba34501e2d18da151d7036bfd68e948383d3f7303891463ff590f SHA512 be20aa24ef25d3fac1cba7e653b06e0ab394286032f7f01320c53ba88cff363a72d6302a44da7019acd3f2f04ea98d7a2f4d01b5f9f9cc0327391346a4a4ebf6 WHIRLPOOL 73f834900b19c2fd4dacb705ca6af5bc89fab6f8712115e3e894775c7bf6e5d87071faa2a5152350e1d7244751e2d6a9e07732c88e3ca40aae56ece560d77f72
 DIST crumbs-2.0.0.tar.gz 13134 SHA256 776634a652205791f30419dbd3f89f26eecb0bf041348690f4552deb7f61ebc1 SHA512 b518041ed7d3d1026b83901f3ffa2faf1da30fb39c598eb88eebabfeb3489c4ce2b2de1f0267bdb3e7d9366509efe0e109f54ec45b9297345f1224c2de5213c5 WHIRLPOOL 64b7e09898c5861ab950fae1331ef973f4c42cc57e2204f23aaf11dce8eb84b817d9ee44b58acebbb909d1266a38eed419a615e8102cc76a46b4b41bb846592f
 DIST crumbs-2.0.1.tar.gz 12377 SHA256 b537d608b9c54d8fc0bd73a4a60599fe2a68ba66ecd05f3f45a25d2301f439ca SHA512 d15a8f3484f8178a1d41555d1783fdf6356c97f05247cf3daf6c56af9e0bd2795ee187f7fde549f5e23b4883317608cc40a71dedfaf49e544c87a12a0f97738a WHIRLPOOL a74e0e61726ca7dbeb702ce92b369137b7c21da5e224a365c9fbf3e6221859c6307329447c6835ff824950d0155cf180d62616f10b6f3084cb041751e9e8d0c4
+DIST crumbs-2.0.2.tar.gz 19639 SHA256 4a520626d4f7687f45caa2fa85963b1e931e13156edab83b3738c7bbe7c8be91 SHA512 68786ccc0287e3aa3e62d351f38c01c16fc40b64d016a6f855d312292d4ae3e1e68e493fc2d621527fb82a7c7dc87df4b2b5ba04288d9cb8ccd2e7337fd51381 WHIRLPOOL ad04976b65d8f972053c104fd945b299341cb7ac8513e5e9b49f41af876aef37190870201c3403af55981070ccd5bb7879230ececa41264722763e6545792f13
diff --git a/dev-python/crumbs/crumbs-2.0.2.ebuild b/dev-python/crumbs/crumbs-2.0.2.ebuild
new file mode 100644
index 000000000000..f7cbe8c9405c
--- /dev/null
+++ b/dev-python/crumbs/crumbs-2.0.2.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
+
+inherit distutils-r1
+
+DESCRIPTION="Generalized all-in-one parameters module"
+HOMEPAGE="https://github.com/alunduil/crumbs"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="doc test"
+
+CDEPEND="dev-python/pyinotify[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}] )
+	test? (
+		${CDEPEND}
+		dev-python/coverage[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+	)
+"
+RDEPEND="${CDEPEND}"
+
+python_compile_all() {
+	use doc && esetup.py build_sphinx
+
+	distutils-r1_python_compile_all
+}
+
+python_test() {
+	nosetests || die "Tests failed on ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/cryptography-vectors/Manifest b/dev-python/cryptography-vectors/Manifest
index 12cace2dea05..c14e7ba47c77 100644
--- a/dev-python/cryptography-vectors/Manifest
+++ b/dev-python/cryptography-vectors/Manifest
@@ -10,4 +10,5 @@ DIST cryptography_vectors-0.9.1.tar.gz 24986147 SHA256 46cf6c05103b5f83056b5eb5d
 DIST cryptography_vectors-0.9.2.tar.gz 24986082 SHA256 b443ca0c75383e7c6acba89acbb7de3f591e3a63f7cc7601e589f323bdc52b4c SHA512 152b8d44d4b9c979a060435016d16d8052e15ad6e3b20086fd1a3a38818843817ddfef72ba6d3c02e034747a4bd9c2a7eb171426d69f27bcc57988a6576d73b7 WHIRLPOOL 1dc6018215bbc5d518c232636757ef5962f06435b5bc1d2fad259158a422fe53a089aa149ba9188c274772a3d3a8438ba3a847dd2147752c91d3310705d2091c
 DIST cryptography_vectors-0.9.3.tar.gz 24986101 SHA256 aa3949852323aebb5d33e6a461caa25190f05a042ceb63b20c2810f83f855e43 SHA512 53bc8e1284c7fa9e1723866149edb3b7f2ef6ddc7f04e79ee6f11cfa00b4e32e81c8202ac4a99ffbc251687ca1d9305c2ebb3dc5ce295241646a5fb3e7ee877b WHIRLPOOL 0e1edcc8e796d2a490781dbf3608cc609f6a66f08f7add962b5f5659df2654666efabd7d81cb135e951e8834c243c8572de4483a1018c9c7239083edda95ea9d
 DIST cryptography_vectors-0.9.tar.gz 24983458 SHA256 d4accc8f5fb763cb65021c0e792a2884b8956ccfb467bc6b59124159e9746bca SHA512 6c3eff20139a9c714305dc09919633deff346ac6186df196a6ab130219b3a6467be33ffd64c9582d960505113e062975e0d9f2e5ffbe051ad47c6513a1580227 WHIRLPOOL b001f8c420139ab14e761dcc9c94322e82f8f6c6b7009cf1bdb025e6d5212aa7d4cb3a35e503d685c7216ee75edbcf370981e169ccff707daacb42d273f21266
+DIST cryptography_vectors-1.0.1.tar.gz 25005401 SHA256 e4ea240cb991a493bf2172056398b50f7c9e3cfbd809149b4887740a3d854cc4 SHA512 d77e5132f12111bed6cfa9c52cc3dd55f592980c76b9b370f1013d9d91a72c17b5bed49b9e2982b1e2aef7efccc02c0fc11f9706f7628affc94920cbc37c44a4 WHIRLPOOL c7b3a9f601997c6e0966402e08828c56ac5ee03017f1663394e69ae2cd6d4dc907b2c49d9c9a7b7893ef4f2d6fb283fd308987264c027baf21d5756be3f14508
 DIST cryptography_vectors-1.0.tar.gz 25003925 SHA256 e7277818b7bd99b502ee79d37cf5b9405577c39171919014756181b947ea0234 SHA512 e426e06d03b2e720cf7177a2d746dc45a2bc04455379d3231952543f3621e4829b43cedc09f7a96b7eba695b5424f8189916d4a7acafc08ca4cacb1965e672af WHIRLPOOL 397840e9c76cf8d50f85cf664d1dcab9cc9eb495c0d29830eb34d62d11c5b9f36f4e466d176d290c22febfecba85ca19358616cd3c8c967a060743175be7f852
diff --git a/dev-python/cryptography-vectors/cryptography-vectors-1.0.1.ebuild b/dev-python/cryptography-vectors/cryptography-vectors-1.0.1.ebuild
new file mode 100644
index 000000000000..ecbe8ef1b6e9
--- /dev/null
+++ b/dev-python/cryptography-vectors/cryptography-vectors-1.0.1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4} pypy pypy3 )
+
+inherit distutils-r1
+
+MY_PN=${PN/-/_}
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Test vectors for the cryptography package"
+HOMEPAGE="https://pypi.python.org/pypi/cryptography-vectors/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
+
+LICENSE="|| ( Apache-2.0 BSD )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND=""
+
+S=${WORKDIR}/${MY_P}
diff --git a/dev-python/cryptography/Manifest b/dev-python/cryptography/Manifest
index 2cf50adba134..e23e1903c3e9 100644
--- a/dev-python/cryptography/Manifest
+++ b/dev-python/cryptography/Manifest
@@ -7,4 +7,5 @@ DIST cryptography-0.8.2.tar.gz 268288 SHA256 1c9a022ab3decaf152093e2ef2d5ee4258c
 DIST cryptography-0.8.tar.gz 268083 SHA256 e54601e4dec2b8acb90f5ed3b93d23d280964adbefe1723ac82acc453a694480 SHA512 e17d2d31f1d6da782eb3531ca9dded14e137ddc61893ef17a8238997274a85e77e8a957e1eec3ed3960675694f97750ca1f6821a2e8d974795bca3b2be49e196 WHIRLPOOL ecef7a807934006ce2266ba0636a9a8b5bd30a49931ba9c83dabbd1bd6b47523dd3d32205d1ac4f94f2a8bfe4c1b23ac36fcddf4092d9e756beda74379dfc7dd
 DIST cryptography-0.9.2.tar.gz 302972 SHA256 bc9ddd1442ce67a5bbd5598eced127de000da55f0ce25498b1174746c0290b3c SHA512 3d13f0284d484911b1f7067966f3727de9019d24af379b1adb1e0377888680b9385792e481888d2b357bce20f250a948c22b34743b4aeb955d736e8ae9ca88da WHIRLPOOL 0832bfdaff40e89750d92ffd5298be5c39fc1b4606ee7f769a68fb469e9e2175837f1b3f660f774a793538e050f2081fd69201f882a5bd77713e1bacd3115370
 DIST cryptography-0.9.3.tar.gz 303075 SHA256 aed022f738dd9adb840d92960b0464ea1fbb222ba118938858eb93fe25151c2d SHA512 828dd6d3af940c91f77b9bcefb34ca9cc3ac05606d707889ff35bf708c3536414db46f8db7d7dcbffe2ad1f82834bc9edab1b28b05fee3f2a5f9f5a56abd697c WHIRLPOOL 33eb42741cf2426ffe16d50d0f555fee65637d812f9510016ceb708f9c591f38de2d65e4b4118f744ff9b73596727160501ec5d077bfe0935d088586909b979d
+DIST cryptography-1.0.1.tar.gz 332242 SHA256 cfe3092a6a929bc3a97c3b752044b79d09c9b210860c7b4eb5061aea29dcbfd3 SHA512 a813084f09113baf17ea344dc2bc71fc09a164908661e8a469997c5212a30c09f65b87f84df0f2c70a38b3529faeb78e08430054d065bd46fc625a1bd62d1ddb WHIRLPOOL f7039799f11da6f95826936e5279d8e9be8971af33601058a910a34d62e1f53879ce93fb69dbd3909d3a2890680c1dabc3a5ce812b34c6882764aafd9ab0ce94
 DIST cryptography-1.0.tar.gz 331438 SHA256 211c02fe77d791d7fc437227ba1c046268d5da665e05d8a53fc19f4f74c21001 SHA512 a4e4f8b054a357e0856a67b246ba770f38222f45f0d8c3185bdfe20593f4d5a20d2082a0c7b9986d5b557dc2b43a0903bcb37eba10e4ca1d83f903fea6c39753 WHIRLPOOL c36bead358e8d30785f3d565366a0a8ec7b356cd31274aac7d0fe0286d36af52916fb3840000d22c53e487d26adb6d42b6dd69d1d7d5aed2fe20dc8cbef86e77
diff --git a/dev-python/cryptography/cryptography-1.0.1.ebuild b/dev-python/cryptography/cryptography-1.0.1.ebuild
new file mode 100644
index 000000000000..89753712433b
--- /dev/null
+++ b/dev-python/cryptography/cryptography-1.0.1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+# only works with >=pypy-2.6
+PYTHON_COMPAT=( python2_7 python3_{3,4} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Library providing cryptographic recipes and primitives"
+HOMEPAGE="https://github.com/pyca/cryptography/ https://pypi.python.org/pypi/cryptography/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="|| ( Apache-2.0 BSD )"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND="
+	dev-libs/openssl:0
+	$(python_gen_cond_dep '>=dev-python/cffi-1.1.0:=[${PYTHON_USEDEP}]' 'python*')
+	$(python_gen_cond_dep 'dev-python/enum34[${PYTHON_USEDEP}]' python2_7 python3_3 pypy)
+	>=dev-python/idna-2.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep 'dev-python/ipaddress[${PYTHON_USEDEP}]' python2_7 pypy)
+	>=dev-python/pyasn1-0.1.8[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/six-1.4.1[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '>=virtual/pypy-2.6.0' pypy )
+	"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		~dev-python/cryptography-vectors-${PV}[${PYTHON_USEDEP}]
+		dev-python/iso8601[${PYTHON_USEDEP}]
+		dev-python/pretend[${PYTHON_USEDEP}]
+		>=dev-python/pytest-2.4.2[${PYTHON_USEDEP}]
+	)"
+
+DOCS=( AUTHORS.rst CONTRIBUTING.rst README.rst )
+
+python_test() {
+	py.test -v || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/ctypesgen/ctypesgen-0_p72-r1.ebuild b/dev-python/ctypesgen/ctypesgen-0_p72-r1.ebuild
index 818f70d7b87b..64e51b60f602 100644
--- a/dev-python/ctypesgen/ctypesgen-0_p72-r1.ebuild
+++ b/dev-python/ctypesgen/ctypesgen-0_p72-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
-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=""
 
 DEPEND=""
diff --git a/dev-python/ctypesgen/metadata.xml b/dev-python/ctypesgen/metadata.xml
index 301d2207cc29..d704e40edecb 100644
--- a/dev-python/ctypesgen/metadata.xml
+++ b/dev-python/ctypesgen/metadata.xml
@@ -2,4 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>python</herd>
+	<upstream>
+		<remote-id type="github">davidjamesca/ctypesgen</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/debtcollector/metadata.xml b/dev-python/debtcollector/metadata.xml
index d5dfd322223c..002659d5cd96 100644
--- a/dev-python/debtcollector/metadata.xml
+++ b/dev-python/debtcollector/metadata.xml
@@ -7,4 +7,7 @@
 	</maintainer>
 	<longdescription lang="en">
 	</longdescription>
+	<upstream>
+		<remote-id type="pypi">debtcollector</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/decoratortools/decoratortools-1.8-r1.ebuild b/dev-python/decoratortools/decoratortools-1.8-r1.ebuild
index 35617956e3a9..56090682916e 100644
--- a/dev-python/decoratortools/decoratortools-1.8-r1.ebuild
+++ b/dev-python/decoratortools/decoratortools-1.8-r1.ebuild
@@ -3,6 +3,7 @@
 # $Id$
 
 EAPI="5"
+
 PYTHON_COMPAT=( python2_7 pypy )
 
 inherit distutils-r1
@@ -19,7 +20,8 @@ SLOT="0"
 KEYWORDS="amd64 ~ia64 ppc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE=""
 
-DEPEND="app-arch/unzip
+DEPEND="
+	app-arch/unzip
 	dev-python/setuptools[${PYTHON_USEDEP}]"
 RDEPEND=""
 
@@ -31,5 +33,5 @@ python_prepare_all() {
 }
 
 python_test() {
-	esetup.py test && einfo "Tests passed under ${EPYTHON}" || die "Tests failed under ${EPYTHON}"
+	esetup.py test
 }
diff --git a/dev-python/defusedxml/defusedxml-0.4.1-r1.ebuild b/dev-python/defusedxml/defusedxml-0.4.1-r1.ebuild
index 44a9452cb399..d61df2728855 100644
--- a/dev-python/defusedxml/defusedxml-0.4.1-r1.ebuild
+++ b/dev-python/defusedxml/defusedxml-0.4.1-r1.ebuild
@@ -3,6 +3,7 @@
 # $Id$
 
 EAPI=5
+
 PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
 PYTHON_REQ_USE="xml(+)"
 
@@ -18,7 +19,7 @@ LICENSE="PSF-2"
 SLOT="0"
 
 python_test() {
-	esetup.py test || die "Tests failed under ${EPYTHON}"
+	esetup.py test
 }
 
 python_install_all() {
diff --git a/dev-python/distlib/distlib-0.2.1.ebuild b/dev-python/distlib/distlib-0.2.1.ebuild
index 7b1a1e41147c..7339924601aa 100644
--- a/dev-python/distlib/distlib-0.2.1.ebuild
+++ b/dev-python/distlib/distlib-0.2.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
 
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~hppa ~mips ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 python_test() {
diff --git a/dev-python/django-appconf/Manifest b/dev-python/django-appconf/Manifest
index be65e5bb5787..8dc842b1c7ed 100644
--- a/dev-python/django-appconf/Manifest
+++ b/dev-python/django-appconf/Manifest
@@ -1 +1,2 @@
 DIST django-appconf-0.6.tar.gz 14072 SHA256 d3f4bcabcb3a9559775c5f4e94cef47f936b1df63703542bc8d912637452e75c SHA512 d2a4aea07eeabdc32ed85cf0625702f3e7861b82d1e47660f3761dedff42a3bd3bfcc54dc3d46072758bea1a34af160f7a908bf0925c05b7409f1224f4a7245d WHIRLPOOL f357a26a28476048ce97a1b85309c87382e750bb1ff9ea8552e194423e815b8945da5367200872096ede6177133094314e9a4a4ca4c5a058b273ab46aacb5091
+DIST django-appconf-1.0.1.tar.gz 16743 SHA256 ba1375fb1024e8e91547504d4392321795c989fde500b96ebc7c93884f786e60 SHA512 b6075bed0372f7f9da7c7af49124a08a2d119533ea15b284529166bcc09e61a541ce179a696dd426a9323ea1874c219880869ef7934345f4d40b1b3201eb2c6d WHIRLPOOL db6d03024b25442a3db71163f6c130c504756a52cf8454f38e4f0c4667c3e4a147b65f0b679a8300f83fd9aecdf1d5f35cb1b1879c988dd5536ab5976ddcb1c0
diff --git a/dev-python/django-appconf/django-appconf-1.0.1.ebuild b/dev-python/django-appconf/django-appconf-1.0.1.ebuild
new file mode 100644
index 000000000000..7e5638dd9ebf
--- /dev/null
+++ b/dev-python/django-appconf/django-appconf-1.0.1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+
+inherit distutils-r1
+
+DESCRIPTION="A helper class for handling configuration defaults of packaged apps gracefully"
+HOMEPAGE="https://github.com/jezdez/django-appconf http://django-appconf.readthedocs.org/ https://pypi.python.org/pypi/django-appconf"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+RDEPEND="
+	>=dev-python/django-1.4.1[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? ( dev-python/django-discover-runner[${PYTHON_USEDEP}]
+		dev-python/flake8[${PYTHON_USEDEP}]
+		dev-python/coverage[${PYTHON_USEDEP}] )"
+
+PATCHES=( "${FILESDIR}"/docs.patch )
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	cd appconf/tests || die
+	set -- django-admin.py test appconf --settings=appconf.test_settings
+	echo "$@"
+	"$@" || die "Testing failed with ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && HTML_DOCS=( docs/_build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/django-appconf/metadata.xml b/dev-python/django-appconf/metadata.xml
index 0c00bb319787..a1cc6e29c4f7 100644
--- a/dev-python/django-appconf/metadata.xml
+++ b/dev-python/django-appconf/metadata.xml
@@ -4,5 +4,6 @@
   <herd>python</herd>
   <upstream>
     <remote-id type="github">jezdez/django-appconf</remote-id>
+    <remote-id type="pypi">django-appconf</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-python/django/django-1.8.4.ebuild b/dev-python/django/django-1.8.4.ebuild
index 142d3e3ab9c1..915004919505 100644
--- a/dev-python/django/django-1.8.4.ebuild
+++ b/dev-python/django/django-1.8.4.ebuild
@@ -22,7 +22,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="doc sqlite test"
 
 RDEPEND=""
diff --git a/dev-python/doctest-ignore-unicode/Manifest b/dev-python/doctest-ignore-unicode/Manifest
new file mode 100644
index 000000000000..bf20ae21895d
--- /dev/null
+++ b/dev-python/doctest-ignore-unicode/Manifest
@@ -0,0 +1 @@
+DIST doctest-ignore-unicode-0.1.2.tar.gz 2270 SHA256 fc90b2d0846477285c6b67fc4cb4d6f39fcf76d8752f4df0a241486f31512ad5 SHA512 ac88d1cc90b1db21b21b121cddde246314d8a3e399ea0e96f1cd4f7812949cebdd0850566a90d47da01ea159bb8d69c8a73ee05c62cc40d0839d4701f2f330d3 WHIRLPOOL 5769ff459cee4b55d325061158b4b7726c15489bd3acd45ef6028cf10748c2e0f70ebe4f5a99c59a17cbd800a4edf927eec924ed73297bab0b1c5a6edceeb0ea
diff --git a/dev-python/doctest-ignore-unicode/doctest-ignore-unicode-0.1.2.ebuild b/dev-python/doctest-ignore-unicode/doctest-ignore-unicode-0.1.2.ebuild
new file mode 100644
index 000000000000..0231f0b0f3fa
--- /dev/null
+++ b/dev-python/doctest-ignore-unicode/doctest-ignore-unicode-0.1.2.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Add flag to ignore unicode literal prefixes in doctests"
+HOMEPAGE="https://pypi.python.org/pypi/doctest-ignore-unicode http://github.com/gnublade/doctest-ignore-unicode"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="Apache-2.0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND="
+	dev-python/nose[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	"
diff --git a/dev-python/doctest-ignore-unicode/metadata.xml b/dev-python/doctest-ignore-unicode/metadata.xml
new file mode 100644
index 000000000000..9ff7a6400d92
--- /dev/null
+++ b/dev-python/doctest-ignore-unicode/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>python</herd>
+	<maintainer>
+		<email>jlec@gentoo.org</email>
+		<name>Justin Lecher</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">pxml</remote-id>
+		<remote-id type="github">metagriffin/pxml</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/doublex/doublex-1.7.ebuild b/dev-python/doublex/doublex-1.7.ebuild
index 414cc621dbff..4fbe1c86fad3 100644
--- a/dev-python/doublex/doublex-1.7.ebuild
+++ b/dev-python/doublex/doublex-1.7.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=5
+
 PYTHON_COMPAT=( python2_7 )
 
 inherit distutils-r1
@@ -25,11 +26,11 @@ DEPEND="
 RDEPEND=""
 
 python_test() {
-	esetup.py test || die "Tests failed under ${EPYTHON}"
+	esetup.py test
 }
 
 python_install_all() {
 	distutils-r1_python_install_all
 
-	rm "${D}"/usr/README.rst || die "Couldn't remove spurious README.rst"
+	rm "${ED}"/usr/README.rst || die "Couldn't remove spurious README.rst"
 }
diff --git a/dev-python/doublex/doublex-1.8.1.ebuild b/dev-python/doublex/doublex-1.8.1.ebuild
index 84fe635528c5..d803de866df7 100644
--- a/dev-python/doublex/doublex-1.8.1.ebuild
+++ b/dev-python/doublex/doublex-1.8.1.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=5
+
 PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
 
 inherit distutils-r1 vcs-snapshot
@@ -32,7 +33,7 @@ python_compile_all() {
 }
 
 python_test() {
-	esetup.py test || die "Tests failed under ${EPYTHON}"
+	esetup.py test
 }
 
 python_install_all() {
@@ -40,5 +41,5 @@ python_install_all() {
 
 	distutils-r1_python_install_all
 
-	rm "${D}"/usr/README.rst || die "Couldn't remove spurious README.rst"
+	rm "${ED}"/usr/README.rst || die "Couldn't remove spurious README.rst"
 }
diff --git a/dev-python/dpkt/metadata.xml b/dev-python/dpkt/metadata.xml
index 00e58c73a3d2..9cde35f5398e 100644
--- a/dev-python/dpkt/metadata.xml
+++ b/dev-python/dpkt/metadata.xml
@@ -4,5 +4,6 @@
 	<herd>python</herd>
 	<upstream>
 		<remote-id type="google-code">dpkt</remote-id>
+		<remote-id type="github">kbandla/dpkt</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/elasticsearch-curator/Manifest b/dev-python/elasticsearch-curator/Manifest
index 70b47b7d97b1..957572604910 100644
--- a/dev-python/elasticsearch-curator/Manifest
+++ b/dev-python/elasticsearch-curator/Manifest
@@ -1,6 +1,8 @@
 DIST elasticsearch-1.4.2.tar.gz 27734207 SHA256 31dd6c049745f7dac201f94852b778b0841d6869d358fd80d4c897d0bf73b53c SHA512 b82e644b0b81489ce0d4fc72ca0efa3545c55c4d947faec2537035d440be83bac0f794f1a2863d87649e36f87d250c1f4e46ae57053b50948f47f9ff2a3bf6b6 WHIRLPOOL ac40778a999bc92230547b1405f259b7d348983767a87c71e18ed9ef45367ebf0b5b0517ef57bd423fa47ce4387e982aa7ee4a4ec9b2be75a4771e8d737f0cc5
 DIST elasticsearch-1.4.4.tar.gz 27900004 SHA256 a3158d474e68520664debaea304be22327fc7ee1f410e0bfd940747b413e8586 SHA512 afc24c5d778d346e24c656e040fb7d0036e16ae42b35ca4f97b2e4d31dc815467ae5462f922ea5222307acf0fa0579f6cd38c603bc996c1f4ba723aa6a2b01ed WHIRLPOOL 37a1a057539ae29525a78fa51f3d19f403e389129e54054edfa1bbd08d12bdbb88acb4e879b6795aa63d583fd70eedefcae5b13b6bf1a7c8314e3aafa49e2b33
 DIST elasticsearch-1.7.0.tar.gz 28501532 SHA256 6fabed2db09e1b88587df15269df328ecef33e155b3c675a2a6d2299bda09c95 SHA512 090186218d7bfcef2f1cf497b08edeae71f2bdae1ddbe97a04e3e288c9a41bdf069ee7ef51202596b17ac9a33840edc4d655a08313ecb732a1f37029b60740d4 WHIRLPOOL 0dfd8f5095dfbbbcda788da0661fc5ec9af7d2fa174dbb365ad021ff7e48d42035f63a45ba6cb9fc20fc8e86500fc81cfcb2f0c46f99015b6f84a2c2be762bd4
+DIST elasticsearch-1.7.1.tar.gz 28500556 SHA256 86a0c20eea6ef55b14345bff5adf896e6332437b19180c4582a346394abde019 SHA512 88786d277cb3228a5e477068fc5ff723e0b5aa47411cea5c55d15ae769f2fb123d274e29c592a9e0f655deedb9db62f296af5aff4e8b56539928025a3375daaa WHIRLPOOL 2218ec3603314a60b38e903b3f00681512306efe1892350ced71c060a24924391d66cb9273d6db5ebb781d60808a2f3ab4c77c57baa03714db143c3718602bf5
 DIST elasticsearch-curator-2.1.2.tar.gz 35706 SHA256 93185f57e4fcd84970b78936271c3ddcba69c54d9a799acafe7d16483134cce0 SHA512 4bc4f74ab7d710173f173d47ad5e8c8918267bbc888a2b1b301e799747f73375b159671940cf7d3cc62361adbb320bc3e772d149eb7ff227d4893788810946f1 WHIRLPOOL 156e92a0a5fa4797651d1c066b955304b082edcda815784c5ddb5a025c93f9b4f222f15e5d7ce74e4740bd1c3ab5e67fe21e651186e0062ff3f0e418b0390b09
 DIST elasticsearch-curator-3.0.0.tar.gz 55418 SHA256 72ec58f15344649dbfec54c80731e6b0b80bb3c0575061ca75580d49f9982fe0 SHA512 acf2a86af682118a0c5ece1d8b557e6b43ada667f8c172cd7d8f66280b07e5e79ec6da5a674b338348fc1e94a6d2bcffd8e1ff61f7bd9ef43cd6458eb371c50a WHIRLPOOL bab3479082209c1efea77b6385a49782617143fd28c6956c13cbc3c1d36256c3d45c316abb3b6982e5822b811ac69a18cfcaa5dc4ec4e3634b155a241d0cb0f4
 DIST elasticsearch-curator-3.2.3.tar.gz 82745 SHA256 f3e499719cd7e0d13a6e7e339c034ed91039f9295767484bd217574fd1a04a9e SHA512 55668d7c5d0cda386983f499e93bba5f2ff1520569ee6e3ac296b1dc86daf302ec6a5c5c8c0eb48e821ace2c40fa523990a06dcd1099b1359dd15ae5dbfe5ae4 WHIRLPOOL 06ac9e72a43731ba864fb883b2a89da82e0a12249ba3962f9ce9ebe2fb41dbea6bb378cf05d365e1379d3836183a0c75aae4e8c87b123a211f55cbf0258e7d53
+DIST elasticsearch-curator-3.3.0.tar.gz 85260 SHA256 e55ec74df61b8afc05a27bb1791cf07131b54d0fccede6bd5ce8815f350c9a7b SHA512 030644137f2065d89ea44d19f71a5b54d2a216891f9f83984e131cd0c29d348a8a38dc292a076e13c2b87e6a25c30b6ed85780878f5bcaae1f4f0d57f4f6df24 WHIRLPOOL 80f2b6ad95e3f34b5adb6c55fc2ca7c8b31108bedc474735b5023d40c49930ab33993cb087c9d5928e67e907d2ed87a99b7fa4b5951ff91638bc4da7b725820b
diff --git a/dev-python/elasticsearch-curator/elasticsearch-curator-2.1.2.ebuild b/dev-python/elasticsearch-curator/elasticsearch-curator-2.1.2.ebuild
index 81749c806cfb..7c31ccf637ae 100644
--- a/dev-python/elasticsearch-curator/elasticsearch-curator-2.1.2.ebuild
+++ b/dev-python/elasticsearch-curator/elasticsearch-curator-2.1.2.ebuild
@@ -64,7 +64,7 @@ python_test() {
 	done
 
 	export TEST_ES_SERVER="localhost:${ES_PORT}"
-	esetup.py test || die "Tests failed on ${EPYTHON}"
+	esetup.py test
 
 	pkill -F ${PID}
 }
diff --git a/dev-python/elasticsearch-curator/elasticsearch-curator-3.0.0.ebuild b/dev-python/elasticsearch-curator/elasticsearch-curator-3.0.0.ebuild
index 8fcfbd883479..e60bb49c71b3 100644
--- a/dev-python/elasticsearch-curator/elasticsearch-curator-3.0.0.ebuild
+++ b/dev-python/elasticsearch-curator/elasticsearch-curator-3.0.0.ebuild
@@ -69,7 +69,7 @@ python_test() {
 	done
 
 	export TEST_ES_SERVER="localhost:${ES_PORT}"
-	esetup.py test || die "Tests failed on ${EPYTHON}"
+	esetup.py test
 
 	pkill -F ${PID}
 }
diff --git a/dev-python/elasticsearch-curator/elasticsearch-curator-3.2.3.ebuild b/dev-python/elasticsearch-curator/elasticsearch-curator-3.2.3.ebuild
index 0300333aeb21..c32cbae3ed08 100644
--- a/dev-python/elasticsearch-curator/elasticsearch-curator-3.2.3.ebuild
+++ b/dev-python/elasticsearch-curator/elasticsearch-curator-3.2.3.ebuild
@@ -74,7 +74,7 @@ python_test() {
 	done
 
 	export TEST_ES_SERVER="localhost:${ES_PORT}"
-	esetup.py test || die "Tests failed on ${EPYTHON}"
+	esetup.py test
 
 	pkill -F ${PID}
 }
diff --git a/dev-python/elasticsearch-curator/elasticsearch-curator-3.3.0.ebuild b/dev-python/elasticsearch-curator/elasticsearch-curator-3.3.0.ebuild
new file mode 100644
index 000000000000..3516ab8ebd2e
--- /dev/null
+++ b/dev-python/elasticsearch-curator/elasticsearch-curator-3.3.0.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+
+MY_PN="curator"
+ES_VERSION="1.7.1"
+
+inherit distutils-r1
+
+DESCRIPTION="Tending time-series indices in Elasticsearch"
+HOMEPAGE="https://github.com/elasticsearch/curator"
+SRC_URI="https://github.com/elasticsearch/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	test? ( https://download.elasticsearch.org/elasticsearch/elasticsearch/elasticsearch-${ES_VERSION}.tar.gz )"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+RDEPEND="
+	>=dev-python/elasticsearch-py-1.6.0[${PYTHON_USEDEP}]
+	<dev-python/elasticsearch-py-2.0.0[${PYTHON_USEDEP}]
+	>=dev-python/click-3.3[${PYTHON_USEDEP}]
+	dev-python/certifi[${PYTHON_USEDEP}]
+	>=dev-python/urllib3-1.8.3[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/sphinx[${PYTHON_USEDEP}]
+	test? ( ${RDEPEND}
+		|| ( virtual/jre:1.8 virtual/jre:1.7 )
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/coverage[${PYTHON_USEDEP}]
+		dev-python/nosexcover[${PYTHON_USEDEP}]
+		dev-python/six[${PYTHON_USEDEP}] )"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+python_test() {
+	ES="${WORKDIR}/elasticsearch-${ES_VERSION}"
+	ES_PORT="25123"
+	ES_LOG="${ES}/logs/elasticsearch.log"
+	PID="${ES}/elasticsearch.pid"
+
+	# run Elasticsearch instance on custom port
+	sed -i "s/#http.port: 9200/http.port: ${ES_PORT}/g; \
+		s/#cluster.name: elasticsearch/cluster.name: gentoo-es-curator-test/g" \
+		${ES}/config/elasticsearch.yml
+
+	# Elasticsearch 1.6+ needs to set path.repo
+	echo "path.repo: /" >> ${ES}/config/elasticsearch.yml
+
+	# start local instance of elasticsearch
+	${ES}/bin/elasticsearch -d -p ${PID}
+
+	for i in `seq 10`; do
+		grep -q "started" ${ES_LOG} 2> /dev/null
+		if [ $? -eq 0 ]; then
+			einfo "Elasticsearch started"
+			eend 0
+			break
+		elif grep -q 'BindException\[Address already in use\]' "${ES_LOG}" 2>/dev/null; then
+			eend 1
+			eerror "Elasticsearch already running"
+			die "Cannot start Elasticsearch for tests"
+		else
+			einfo "Waiting for Elasticsearch"
+			eend 1
+			sleep 2
+			continue
+		fi
+	done
+
+	export TEST_ES_SERVER="localhost:${ES_PORT}"
+	esetup.py test
+
+	pkill -F ${PID}
+}
+
+python_compile_all() {
+	cd docs || die
+	emake man $(usex doc html "")
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+	doman docs/_build/man/*
+	distutils-r1_python_install_all
+
+}
+
+pkg_postinst() {
+	ewarn ""
+	ewarn "For Python 3 support information please read: http://click.pocoo.org/3/python3/"
+	ewarn ""
+	ewarn "Example usage on Python 3:"
+	ewarn "export LC_ALL=en_US.UTF-8"
+	ewarn "export LANG=en_US.UTF-8"
+	ewarn "curator ..."
+}
diff --git a/dev-python/execnet/Manifest b/dev-python/execnet/Manifest
index 82658ac0e0f6..4c3ce4900599 100644
--- a/dev-python/execnet/Manifest
+++ b/dev-python/execnet/Manifest
@@ -1,2 +1,3 @@
 DIST execnet-1.2.0.tar.gz 163876 SHA256 951714caa0ae80237f4ffc1f08450e9e2e5f8f902beaf1ad294020875d6f8c2c SHA512 bf4eb1c07832628863f3d315510628343bc4504050311a277a86100a825df8ed5f6b65f58db28ea6733f3886b6007eae7fd33586721374f9ffb3687e9b95d5c4 WHIRLPOOL 898d9427d55e316f2cdfe06d8dadd0f40d8d2374802b419c9b7aac279eed36919f8dc0084c9c253b3b3d75e9dd50ec2748ef2227e803bf900d7d8b0d5395c45e
 DIST execnet-1.3.0.tar.gz 170489 SHA256 ecdfd5613cc78fe99aaf3e351bc870d1428202d78744ea48c893bf34a1fcbdbe SHA512 b047639ede7f5eeb600358bf983d1db617438a8ed9dcaa6e0ba470fe15703f2ce8d3f413a6b6dc575c0090744fde82ba3ba0e684bdeda86a6261941125c71a10 WHIRLPOOL 54d6cebfabcabfd5c3baebadd66fe8837c79cead4900ec1b9d55478d2eb2cbd77be9dfbb108b4049836b5cd316316bd4304b11377d372e5d5b8ef23f684e5838
+DIST execnet-1.4.1.tar.gz 171041 SHA256 f66dd4a7519725a1b7e14ad9ae7d3df8e09b2da88062386e08e941cafc0ef3e6 SHA512 e8c0c32e873f8585ff4d4da3b9cbd40046479370f5653f67a98c9029d4535a619731d1b825332fe4af4dc5ebc9ab11ee879ef45df07f08943b1e1685f2255790 WHIRLPOOL 487c31617b78e4eeed9dc75ae8f01ade33aad35f7547677ec007b688071dd56e69c4f4b92cf9355dee7cea97bf6eac09f508099f104cf52d6c9fe3860e4fd3c9
diff --git a/dev-python/execnet/execnet-1.3.0.ebuild b/dev-python/execnet/execnet-1.3.0.ebuild
index 212256b81886..c91ab84a2840 100644
--- a/dev-python/execnet/execnet-1.3.0.ebuild
+++ b/dev-python/execnet/execnet-1.3.0.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
+PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/execnet/execnet-1.4.1.ebuild b/dev-python/execnet/execnet-1.4.1.ebuild
new file mode 100644
index 000000000000..7e5cad3119e4
--- /dev/null
+++ b/dev-python/execnet/execnet-1.4.1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Rapid multi-Python deployment"
+HOMEPAGE="http://codespeak.net/execnet/ https://pypi.python.org/pypi/execnet/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+RDEPEND=">=dev-python/apipkg-1.4[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? (	dev-python/pytest[${PYTHON_USEDEP}]	)"
+
+#PATCHES=( "${FILESDIR}"/1.2.0-tests.patch )
+
+python_prepare_all() {
+	# Remove doctest that access an i'net site
+	rm doc/example/test_info.txt || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && emake -C doc html
+}
+
+python_test() {
+	# https://bitbucket.org/hpk42/execnet/issue/10
+	unset PYTHONDONTWRITEBYTECODE
+	py.test testing || die "Tests fail with ${EPYTHON}"
+
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/_build/html/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/fasteners/metadata.xml b/dev-python/fasteners/metadata.xml
index d5dfd322223c..570772c84f56 100644
--- a/dev-python/fasteners/metadata.xml
+++ b/dev-python/fasteners/metadata.xml
@@ -7,4 +7,8 @@
 	</maintainer>
 	<longdescription lang="en">
 	</longdescription>
+	<upstream>
+		<remote-id type="pypi">fasteners</remote-id>
+		<remote-id type="github">harlowja/fasteners</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/flake8/flake8-2.0-r1.ebuild b/dev-python/flake8/flake8-2.0-r1.ebuild
index 238e26e81fc1..a226f0360954 100644
--- a/dev-python/flake8/flake8-2.0-r1.ebuild
+++ b/dev-python/flake8/flake8-2.0-r1.ebuild
@@ -28,5 +28,5 @@ RDEPEND="
 "
 
 python_test() {
-	esetup.py test || die "Tests failed for ${EPYTHON}"
+	esetup.py test
 }
diff --git a/dev-python/flask-cors/Manifest b/dev-python/flask-cors/Manifest
index f291c524a16e..493ef34d5bb3 100644
--- a/dev-python/flask-cors/Manifest
+++ b/dev-python/flask-cors/Manifest
@@ -1,2 +1,3 @@
 DIST flask-cors-1.8.0.tar.gz 17368 SHA256 da01f3ecf6d3d5c9c45ccdd95e6f93bc04a31f403ff5e4ad2e6c0fca99eb2cf1 SHA512 185a4e5785223d547373ff40d18dee2112a8da2dec2ecb39cb7b7c394e9220551e46302590870393c35902dd12e58d3d7cd4fb8fa052828b21d4107457a080fa WHIRLPOOL 1631d5c8e4521a31adcf061a6fbb21b9019835d3718ff02d16d2fe48af57d23d6cef01d740887d6b592ee420ba0c74ccb27a3a402547257823bc7a894793373a
 DIST flask-cors-1.9.0.tar.gz 22846 SHA256 d1237b21c3f98ea8bed387efdf1db1d1078df9c480f8fe06db21ff130420200b SHA512 0ed2d4fdd80b43bbbcab4257c3917ea12b39a9da89989e3cad5575d1ebca1523f9cefaca6c36b4dae81629f65936b2cdf3af04c789b28cc03d5660062c2a0e56 WHIRLPOOL 8356937c86d67da4084405d2a1565165da07a467f979c324d72dc4630f3abb7b1f2f906d700592a730a94a19fa12346014788863fa2f7041b5a015300349e16d
+DIST flask-cors-2.1.0.tar.gz 28038 SHA256 749fc78f18f677317cb44d8ee3fdd3a5914ec1c5f5340d10e2ac020d405c7ed1 SHA512 235162749485588e9112a52a833a43e68ad1737997628dc51cc30358d01837f427ba33872ecb1fff8e821b84c3de0a15a1c89c57f2407ef0cacafae9ca354640 WHIRLPOOL d71d1ea44954a6a691b1442a176d58413c4b99674e0e055af991b370fd39c0f5cb9ddffec7add635db8fcdbc93b6b0b7395e861b487863f458c7741d52215d0f
diff --git a/dev-python/flask-cors/flask-cors-2.1.0.ebuild b/dev-python/flask-cors/flask-cors-2.1.0.ebuild
new file mode 100644
index 000000000000..d417f44502f2
--- /dev/null
+++ b/dev-python/flask-cors/flask-cors-2.1.0.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
+
+inherit distutils-r1
+
+MY_PN="Flask-Cors"
+MY_P="${MY_PN}-${PV}"
+
+if [[ "${PV}" == "9999" ]]; then
+	inherit git-2
+	EGIT_REPO_URI="git://github.com/wcdolphin/${PN}.git"
+	SRC_URI=""
+else
+	SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz -> ${P}.tar.gz"
+fi
+
+DESCRIPTION="A Flask extension for Cross Origin Resource Sharing (CORS)"
+HOMEPAGE="https://github.com/wcdolphin/flask-cors https://pypi.python.org/pypi/Flask-Cors"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+RDEPEND="dev-python/flask[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? (
+		${RDEPEND}
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		>=dev-python/python-docs-2.7.6-r1:2.7
+		dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
+	)
+	test? (
+		${RDEPEND}
+		dev-python/nose[${PYTHON_USEDEP}]
+	)"
+
+S="${WORKDIR}/${MY_P}"
+
+python_prepare_all() {
+	if use doc; then
+		local PYTHON_DOC_ATOM=$(best_version --host-root dev-python/python-docs:2.7)
+		local PYTHON_DOC_VERSION="${PYTHON_DOC_ATOM#dev-python/python-docs-}"
+		local PYTHON_DOC="/usr/share/doc/python-docs-${PYTHON_DOC_VERSION}/html"
+		local PYTHON_DOC_INVENTORY="${PYTHON_DOC}/objects.inv"
+		sed -i "s|'http://docs.python.org/': None|'${PYTHON_DOC}': '${PYTHON_DOC_INVENTORY}'|" docs/conf.py || die
+	fi
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	esetup.py test
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/functools32/functools32-3.2.3.ebuild b/dev-python/functools32/functools32-3.2.3.ebuild
index 2a3ffeb6579c..74a20afa79bf 100644
--- a/dev-python/functools32/functools32-3.2.3.ebuild
+++ b/dev-python/functools32/functools32-3.2.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}-2.tar.gz"
 
 SLOT="0"
 LICENSE="PSF-2.4"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86 ~ppc ~ppc64 ~amd64-linux ~x86-linux"
 IUSE=""
 
 S="${WORKDIR}"/${P}-2
diff --git a/dev-python/functools32/metadata.xml b/dev-python/functools32/metadata.xml
index 301d2207cc29..19ce0c1ed660 100644
--- a/dev-python/functools32/metadata.xml
+++ b/dev-python/functools32/metadata.xml
@@ -2,4 +2,8 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>python</herd>
+	<upstream>
+		<remote-id type="pypi">functools32</remote-id>
+		<remote-id type="github">MiCHiLU/python-functools32</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/futurist/metadata.xml b/dev-python/futurist/metadata.xml
index d5dfd322223c..52c7b02068b0 100644
--- a/dev-python/futurist/metadata.xml
+++ b/dev-python/futurist/metadata.xml
@@ -7,4 +7,7 @@
 	</maintainer>
 	<longdescription lang="en">
 	</longdescription>
+	<upstream>
+		<remote-id type="pypi">futurist</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/gevent/gevent-1.0.2.ebuild b/dev-python/gevent/gevent-1.0.2.ebuild
index 561498f2ea1a..62ba098cfbe3 100644
--- a/dev-python/gevent/gevent-1.0.2.ebuild
+++ b/dev-python/gevent/gevent-1.0.2.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/surfly/${PN}/releases/download/v${MY_PV}/${MY_P}.tar
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc examples"
 
 RDEPEND="dev-libs/libev
diff --git a/dev-python/globre/Manifest b/dev-python/globre/Manifest
index c4a769236e57..54dd30a6201b 100644
--- a/dev-python/globre/Manifest
+++ b/dev-python/globre/Manifest
@@ -1 +1,2 @@
 DIST globre-0.1.2.tar.gz 18465 SHA256 64203a0caca50cf2048cc4cc18b8abf452dfb7822b79ea9950f7c0ee03f51d9b SHA512 1e1a406b2a07ae551ba9b1b18dc92fc0728d2e0ad01c63a2108736430d893c427011b74883f5c84040426603ac8f46346a672e50a96502b315c02f81e6dff82c WHIRLPOOL eb4d5017438a946577d19ec2e2a2208a0edd5b4dd6136ce4aa71f73bd866b893396cc4b6cc4b9f592307d1116e2c04d54c83f3a47bc42e4738c29bbf915256dc
+DIST globre-0.1.3.tar.gz 19205 SHA256 482527dc342a88945edfbfe4d78b0c546b163b2a6579863ebfd6b3b5df222e5a SHA512 430c09cd459a9131da4ae086cff608c269445219fce5c86fa344e038eb3fa0cac1bbdf3d153d099083fc3ea1b45135a800420c230d44f5503beaf910d494cb37 WHIRLPOOL 35735832cad2bd4c00ddb211cb80a0f99b37a32d5914a1f87c9c32117f34a81e2b079a9e9bd052eee8c134c83eedefd4a3c9c446796ee2933050e241d7e774a7
diff --git a/dev-python/globre/globre-0.1.3.ebuild b/dev-python/globre/globre-0.1.3.ebuild
new file mode 100644
index 000000000000..ad75c8fa06ae
--- /dev/null
+++ b/dev-python/globre/globre-0.1.3.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4} )
+
+inherit distutils-r1
+
+DESCRIPTION="A glob matching library, providing an interface similar to the 're' module"
+HOMEPAGE="https://pypi.python.org/pypi/globre https://github.com/metagriffin/globre"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-3+"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/nose-1.3.0[${PYTHON_USEDEP}]
+	)"
+
+python_test() {
+	nosetests --verbose || die
+}
diff --git a/dev-python/gmpy/metadata.xml b/dev-python/gmpy/metadata.xml
index f60e7204ca7a..946960966eee 100644
--- a/dev-python/gmpy/metadata.xml
+++ b/dev-python/gmpy/metadata.xml
@@ -10,6 +10,7 @@
 </longdescription>
   <upstream>
     <remote-id type="pypi">gmpy2</remote-id>
+    <remote-id type="github">aleaxit/gmpy</remote-id>
   </upstream>
   <use>
     <flag name="mpir">Use <pkg>sci-libs/mpir</pkg> as gmp implementation</flag>
diff --git a/dev-python/greenlet/greenlet-0.4.9.ebuild b/dev-python/greenlet/greenlet-0.4.9.ebuild
index 9017b17e9552..5cd7a424bc6a 100644
--- a/dev-python/greenlet/greenlet-0.4.9.ebuild
+++ b/dev-python/greenlet/greenlet-0.4.9.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm -hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm -hppa ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc"
 
 DEPEND="
diff --git a/dev-python/gst-python/gst-python-1.4.0.ebuild b/dev-python/gst-python/gst-python-1.4.0.ebuild
index f878a637716c..fca0458ac418 100644
--- a/dev-python/gst-python/gst-python-1.4.0.ebuild
+++ b/dev-python/gst-python/gst-python-1.4.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://gstreamer.freedesktop.org/src/${PN}/${P}.tar.xz"
 
 LICENSE="LGPL-2"
 SLOT="1.0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-python/html5lib/Manifest b/dev-python/html5lib/Manifest
index 16dd3e9650af..922d9fa72503 100644
--- a/dev-python/html5lib/Manifest
+++ b/dev-python/html5lib/Manifest
@@ -1,2 +1,3 @@
 DIST html5lib-0.99999.tar.gz 887806 SHA256 6b0bc7e9f77bb2a8ace636a827d8fb6e2f0b53e20cf0cb5e3e5b970454f8370b SHA512 ce440a03c949194a7e10cfd31557e83e60aee7899cd470e55940b5841f26ba1103ad83b96cdde7dc4eede3cf4b969bdad2c4b8530da3bc761c3ca928f149c68f WHIRLPOOL ef85ec5d2ff4edca0f66deb4ef8a1bb21ce51db33763892eefbef6bcd71000e4b3aa171434b8f2a2f0f04e21c7166d49f41acf76191acaf8fd789d5c8cc35f28
 DIST html5lib-0.999999.tar.gz 889015 SHA256 e372b66f4997f8e1de970ea755d0a528d7222d2aa9bd55aac078c7ef39b8f6c3 SHA512 ca6a5cd282099424bd770e6a38ce07d5782a3153a3d0480bc090410e8deb4f7673a1da71fb00cd097fdf7154d6f8a4f2656054666f1465d7f306233d6720d33b WHIRLPOOL 6cfe531db44ea16c07a2ed1fd8f43a44513dfb3f99b075e4ff070dab97addd1addae3b1f9cadcc116c778323e27d229f0d90f4890858d6cdd9c72106a45c8e7f
+DIST html5lib-0.9999999.tar.gz 889312 SHA256 2612a191a8d5842bfa057e41ba50bbb9dcb722419d2408c78cff4758d0754868 SHA512 1748a1921f4bc93b7f208d89701eeabfe507e40515dd2e88ece239ba7c1704c8ae9dc4eea310164c7b207225dce910f78a8b34f826f4f87a2992365c07089c28 WHIRLPOOL 48dbd278e247e98e2765e7da1ce99474fba241b0a6b70e441899271b0cffffca33720646a35ae724713be5ce5a15617d611ebd76c192755e72485d09d446f5ac
diff --git a/dev-python/html5lib/html5lib-0.99999.ebuild b/dev-python/html5lib/html5lib-0.99999.ebuild
index 98674dadad0b..66ca2569cdfd 100644
--- a/dev-python/html5lib/html5lib-0.99999.ebuild
+++ b/dev-python/html5lib/html5lib-0.99999.ebuild
@@ -10,7 +10,7 @@ PYTHON_REQ_USE="xml(+)"
 inherit distutils-r1
 
 DESCRIPTION="HTML parser based on the HTML5 specification"
-HOMEPAGE="https://github.com/html5lib/html5lib-python/"
+HOMEPAGE="https://github.com/html5lib/html5lib-python/ https://html5lib.readthedocs.org"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/html5lib/html5lib-0.999999.ebuild b/dev-python/html5lib/html5lib-0.999999.ebuild
index 642a13c981a9..522b34c77993 100644
--- a/dev-python/html5lib/html5lib-0.999999.ebuild
+++ b/dev-python/html5lib/html5lib-0.999999.ebuild
@@ -10,7 +10,7 @@ PYTHON_REQ_USE="xml(+)"
 inherit distutils-r1
 
 DESCRIPTION="HTML parser based on the HTML5 specification"
-HOMEPAGE="https://github.com/html5lib/html5lib-python/"
+HOMEPAGE="https://github.com/html5lib/html5lib-python/ https://html5lib.readthedocs.org"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/html5lib/html5lib-0.9999999.ebuild b/dev-python/html5lib/html5lib-0.9999999.ebuild
new file mode 100644
index 000000000000..522b34c77993
--- /dev/null
+++ b/dev-python/html5lib/html5lib-0.9999999.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4} pypy pypy3 )
+PYTHON_REQ_USE="xml(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="HTML parser based on the HTML5 specification"
+HOMEPAGE="https://github.com/html5lib/html5lib-python/ https://html5lib.readthedocs.org"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+
+python_test() {
+	nosetests || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/humanfriendly/Manifest b/dev-python/humanfriendly/Manifest
index 5b48d7d4d362..01b049030a09 100644
--- a/dev-python/humanfriendly/Manifest
+++ b/dev-python/humanfriendly/Manifest
@@ -1,6 +1,2 @@
-DIST humanfriendly-1.25.tar.gz 23072 SHA256 a6811938ff17c3df24c5b91569f44bff17f1ccbb60e0d756a5bfd13b554d479c SHA512 e62cfcd4f0119830cb21b10eb7514aebe1283fc4dc9cbc22cfad1cb3c73fcad46ac5e4e3a2aa7ccffc5f5b8389d616e1dcaa622fee420c5fcd7138948c69cd54 WHIRLPOOL ef7161c9893b5b59b5b89fce7aabbd4fd8954d316874e53a2352258cdccfe4dbcacb2fc46711490f90fa0f56f19734b6617e5e844c8f004142faac38a890b8c4
-DIST humanfriendly-1.26.tar.gz 25228 SHA256 0908b90298364e3335a03abcbb88ec571f95c7e4bc6728de0551806f636ef219 SHA512 d4cf81d6c9e39c2d5fb4886dc84c6037c6b189a5e54360b1fcaab5728c74b5ab4fe95c574d4b211888a8cbe6f1bce563106adb65b6a0d9533aa40e6ce434cf7c WHIRLPOOL f8d6a080bcfc8ac9dfacdc2387c4050ea81dd294eb703d4198ac82678e3ef71f4ecce0a2af4dfd85c068548c96a42c904ff2efc8bf4c429137e60aef684ec614
-DIST humanfriendly-1.27.tar.gz 26128 SHA256 b80c391baf5c7d5f634391d62c9869c4d20dd6167c53ba2e3765f9ad2bc54638 SHA512 b2fcf239958e9889c22a99396e78d157adf390e2b5dbcbc3f89eb42ca7a87ec278e2969d05fc3388c07af929b1046cd4a14d3347c7c9287e6a7f4cbbb7322688 WHIRLPOOL a0d277784dd906891bf1217653141379770bbf703645af34fe220b253f9939fdb0ebea90e35a9cb2c17f5e5f6099805c05dbb888fe23af581ac7fab43459ef07
-DIST humanfriendly-1.29.tar.gz 27120 SHA256 9c1983d79a61f77ab6c42973baf2ebb156dbb608516415f3c4066cbe3400e8d7 SHA512 b42e1e7e66c1326cef1134b662f7026c9b3883f0871752cbb6d334de68fc6f6e92ae6524bb9c64b7185bc28f612c6daf0650bd8c9a9121d5fea704b51bd7843f WHIRLPOOL a068a0cbdd7ec3d41ea54d5cf9cc80b8c88bc6089d48f546638c5128cf918720549667464a32bca0b2f6f266f3ff8194ab352b159db3de7a554d2eb2a449854e
-DIST humanfriendly-1.31.tar.gz 33358 SHA256 329b359b5aa8d330841379afea30ab343ec177fed826bfc8e44ebba43700ac5f SHA512 9c3f3a84c9a5c9d530ad8e4c10507369f322cc4c73c8f229f08ebab168b69e41870b22873445c32ddca4975a5d6bbeb586c8c4e6e20e79d1a7d420d6855a5cae WHIRLPOOL 80ac328a5b2bdbfd181dd9b142ee792a8cdfd192c36fcd276b6a4b1eacf64ed27737d9b7796c66caffacbce9177e3cbfcd87e543f54f540b278be574b0ecf335
 DIST humanfriendly-1.33.tar.gz 34362 SHA256 158259d5cb9b762fb094a3cbbade70b5e623568b92c3765d1914fa87f5bf4ecc SHA512 878dc081b15df2f1d682697b9abde45ea20aebd4a33bd7079af7eb3c86b331ad2135b7153b6727ddadbc2146fe042d5a860aaab4889a637622636d4118179bf5 WHIRLPOOL c57a7404341cff1eca80069e35350b99ddf3c26b68894ab283d39ad4dd80fbd2014f04a8dfdb040aae432c4b2ed9bdc51f0085d743575c78eddcc9985cf3cbed
+DIST humanfriendly-1.35.tar.gz 36181 SHA256 de030bb1976b526f514c9a953c38286f50c3ece01180a1efdda56f091eb33164 SHA512 3cec8629423f640b2b6bdcf95aa8346daf88268b3d7e9ce44be395f7e9f3aa1a23d27d422db3bfda32e1e6c2c6a2eaf8dc1393ef6fcea4895ef6b44671353d0d WHIRLPOOL c44a897a81b2044a9d6913fb1d74d6979534d00cce486035b23facbc5595532996cb19c8b34cd7768381e67ff277b6ed02c034341958f4eff63940136cecaf27
diff --git a/dev-python/humanfriendly/humanfriendly-1.25.ebuild b/dev-python/humanfriendly/humanfriendly-1.25.ebuild
deleted file mode 100644
index 34fa7dd29e0a..000000000000
--- a/dev-python/humanfriendly/humanfriendly-1.25.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{3,4} )
-
-inherit distutils-r1
-
-DESCRIPTION="Human friendly output for text interfaces using Python"
-HOMEPAGE="https://pypi.python.org/pypi/humanfriendly https://humanfriendly.readthedocs.org"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_test() {
-	esetup.py test || die
-}
diff --git a/dev-python/humanfriendly/humanfriendly-1.26.ebuild b/dev-python/humanfriendly/humanfriendly-1.26.ebuild
deleted file mode 100644
index 34fa7dd29e0a..000000000000
--- a/dev-python/humanfriendly/humanfriendly-1.26.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{3,4} )
-
-inherit distutils-r1
-
-DESCRIPTION="Human friendly output for text interfaces using Python"
-HOMEPAGE="https://pypi.python.org/pypi/humanfriendly https://humanfriendly.readthedocs.org"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_test() {
-	esetup.py test || die
-}
diff --git a/dev-python/humanfriendly/humanfriendly-1.27.ebuild b/dev-python/humanfriendly/humanfriendly-1.27.ebuild
deleted file mode 100644
index 34fa7dd29e0a..000000000000
--- a/dev-python/humanfriendly/humanfriendly-1.27.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{3,4} )
-
-inherit distutils-r1
-
-DESCRIPTION="Human friendly output for text interfaces using Python"
-HOMEPAGE="https://pypi.python.org/pypi/humanfriendly https://humanfriendly.readthedocs.org"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_test() {
-	esetup.py test || die
-}
diff --git a/dev-python/humanfriendly/humanfriendly-1.29.ebuild b/dev-python/humanfriendly/humanfriendly-1.29.ebuild
deleted file mode 100644
index 34fa7dd29e0a..000000000000
--- a/dev-python/humanfriendly/humanfriendly-1.29.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{3,4} )
-
-inherit distutils-r1
-
-DESCRIPTION="Human friendly output for text interfaces using Python"
-HOMEPAGE="https://pypi.python.org/pypi/humanfriendly https://humanfriendly.readthedocs.org"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_test() {
-	esetup.py test || die
-}
diff --git a/dev-python/humanfriendly/humanfriendly-1.31.ebuild b/dev-python/humanfriendly/humanfriendly-1.31.ebuild
deleted file mode 100644
index 34fa7dd29e0a..000000000000
--- a/dev-python/humanfriendly/humanfriendly-1.31.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{3,4} )
-
-inherit distutils-r1
-
-DESCRIPTION="Human friendly output for text interfaces using Python"
-HOMEPAGE="https://pypi.python.org/pypi/humanfriendly https://humanfriendly.readthedocs.org"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_test() {
-	esetup.py test || die
-}
diff --git a/dev-python/humanfriendly/humanfriendly-1.33.ebuild b/dev-python/humanfriendly/humanfriendly-1.33.ebuild
index 34fa7dd29e0a..70e55d95f77f 100644
--- a/dev-python/humanfriendly/humanfriendly-1.33.ebuild
+++ b/dev-python/humanfriendly/humanfriendly-1.33.ebuild
@@ -22,5 +22,5 @@ DEPEND="${RDEPEND}
 	dev-python/setuptools[${PYTHON_USEDEP}]"
 
 python_test() {
-	esetup.py test || die
+	esetup.py test
 }
diff --git a/dev-python/humanfriendly/humanfriendly-1.35.ebuild b/dev-python/humanfriendly/humanfriendly-1.35.ebuild
new file mode 100644
index 000000000000..70e55d95f77f
--- /dev/null
+++ b/dev-python/humanfriendly/humanfriendly-1.35.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4} )
+
+inherit distutils-r1
+
+DESCRIPTION="Human friendly output for text interfaces using Python"
+HOMEPAGE="https://pypi.python.org/pypi/humanfriendly https://humanfriendly.readthedocs.org"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/ipaddress/ipaddress-1.0.14.ebuild b/dev-python/ipaddress/ipaddress-1.0.14.ebuild
index 31f7e988a307..c30fee84dd08 100644
--- a/dev-python/ipaddress/ipaddress-1.0.14.ebuild
+++ b/dev-python/ipaddress/ipaddress-1.0.14.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="PSF-2"
-KEYWORDS="amd64 ~arm ~hppa ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~hppa ~mips ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND=""
diff --git a/dev-python/ipython/ipython-3.2.1.ebuild b/dev-python/ipython/ipython-3.2.1.ebuild
index fa2217f1716e..cce989acc40d 100644
--- a/dev-python/ipython/ipython-3.2.1.ebuild
+++ b/dev-python/ipython/ipython-3.2.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 ~arm ~mips ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="doc examples matplotlib mongodb notebook nbconvert octave qt4 +smp test wxwidgets"
 
 REQUIRED_USE="
diff --git a/dev-python/json-rpc/json-rpc-1.10.1.ebuild b/dev-python/json-rpc/json-rpc-1.10.1.ebuild
index 1981501d570a..dba072ebce48 100644
--- a/dev-python/json-rpc/json-rpc-1.10.1.ebuild
+++ b/dev-python/json-rpc/json-rpc-1.10.1.ebuild
@@ -24,5 +24,5 @@ DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
 	)"
 
 python_test() {
-	esetup.py test || die
+	esetup.py test
 }
diff --git a/dev-python/json-rpc/json-rpc-1.7.0.ebuild b/dev-python/json-rpc/json-rpc-1.7.0.ebuild
index c23d740d2bc4..840cfd9922aa 100644
--- a/dev-python/json-rpc/json-rpc-1.7.0.ebuild
+++ b/dev-python/json-rpc/json-rpc-1.7.0.ebuild
@@ -23,5 +23,5 @@ DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
 	)"
 
 python_test() {
-	esetup.py test || die
+	esetup.py test
 }
diff --git a/dev-python/json-rpc/json-rpc-1.9.2.ebuild b/dev-python/json-rpc/json-rpc-1.9.2.ebuild
index 45e2d772905d..050502e9eedf 100644
--- a/dev-python/json-rpc/json-rpc-1.9.2.ebuild
+++ b/dev-python/json-rpc/json-rpc-1.9.2.ebuild
@@ -23,5 +23,5 @@ DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
 	)"
 
 python_test() {
-	esetup.py test || die
+	esetup.py test
 }
diff --git a/dev-python/jsonschema/jsonschema-2.5.1-r1.ebuild b/dev-python/jsonschema/jsonschema-2.5.1-r1.ebuild
new file mode 100644
index 000000000000..71090106322c
--- /dev/null
+++ b/dev-python/jsonschema/jsonschema-2.5.1-r1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=(python2_7 python3_{3,4} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="An implementation of JSON-Schema validation for Python"
+HOMEPAGE="https://pypi.python.org/pypi/jsonschema http://github.com/Julian/jsonschema"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~ppc ~ppc64 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND="
+	dev-python/rfc3986[${PYTHON_USEDEP}]
+	dev-python/strict-rfc3339[${PYTHON_USEDEP}]
+	dev-python/webcolors[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep dev-python/functools32[$(python_gen_usedep 'python2*' pypy)] 'python2*' pypy)
+	"
+DEPEND="${RDEPEND}
+	dev-python/vcversioner[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_test() {
+	"${PYTHON}" -m unittest discover || die "Testing failed with ${EPYTHON}"
+}
diff --git a/dev-python/jsonschema/jsonschema-2.5.1.ebuild b/dev-python/jsonschema/jsonschema-2.5.1.ebuild
index a5862d3c6dca..5dfd1b09d3a7 100644
--- a/dev-python/jsonschema/jsonschema-2.5.1.ebuild
+++ b/dev-python/jsonschema/jsonschema-2.5.1.ebuild
@@ -14,7 +14,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 ~ppc ~ppc64 ~amd64-linux ~x86-linux"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-python/jsonschema/metadata.xml b/dev-python/jsonschema/metadata.xml
index 31179ec4c84f..1b7182d5cfb7 100644
--- a/dev-python/jsonschema/metadata.xml
+++ b/dev-python/jsonschema/metadata.xml
@@ -11,5 +11,6 @@ Python (supporting 2.6+ including Python 3).
 </longdescription>
   <upstream>
     <remote-id type="pypi">jsonschema</remote-id>
+    <remote-id type="github">Julian/jsonschema</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-python/ldap3/Manifest b/dev-python/ldap3/Manifest
index 0443601c3c74..908cec28bdf1 100644
--- a/dev-python/ldap3/Manifest
+++ b/dev-python/ldap3/Manifest
@@ -3,3 +3,4 @@ DIST ldap3-0.9.8.4.tar.gz 263317 SHA256 d9efa7f6d4bd4e83201229c6200dcac852e61f23
 DIST ldap3-0.9.8.6.tar.gz 263664 SHA256 aa932ca208cc46c2a3b3ec5dc7cbe681bb9661b823779e9bf27cffa3eba96c16 SHA512 74fa3a16b23442ae56cfe087b014fddaa5e7e697c0812e3a5bfd7960c5d867e096f8d0f089be77408c358b53e153b071fd5f27da6992931f964c3895f402ef98 WHIRLPOOL 886466c8d653a01da84a506d2bc28e9b24bbf5b7147ee9816301bce4a8a59e7e3381063814540bd230c20c71794f1b8c49bcd0b99bedfef397a2aa67884dad4a
 DIST ldap3-0.9.8.7.tar.gz 264738 SHA256 19c6de07d9a6e72c9efb19628612cd474e7ea18b62557539ce88eb9c66ec8ee8 SHA512 8238bf2f9b1d59b5b5eca4b271b856eaee9e91dc4d40cca67ac9022706c21df74bd465d4f0ce47cc98a6e5c54cc42d62ca4743be40f278a1e839e24df7b86940 WHIRLPOOL 6335fd361c77172c87b758a57c9c9c3ddd4fae3f3c01aa0edbea3c72b58c023ac352b8f04ec0ad20504603922ea95ff40a9c904910c1a2bd3b4b4304b2b2da46
 DIST ldap3-0.9.8.8.tar.gz 266052 SHA256 3d17c642760e771475ba2b116d10932f67fec1696085814da5d08837e3004c9a SHA512 c64186e74183f72814a6ec6b3c945ea53d06e13d8ca46e6cc2f27451aee62437f2e6b71bd595dcca17d4eb8578f43fd98a676ee4505e7481bbdd30c6ea59655d WHIRLPOOL 2cf9578cc8c2ae630ed0da1a3ab66a496942681039a6887a074ad6e41853870691fa880549623d455763e8d2ff5a3b6a6413446e0c69518a280dc25b62c06eb5
+DIST ldap3-0.9.9.tar.gz 285775 SHA256 4555b78ecf3ef8ce7fb854c1e863d8f8ffce5f49fa599d04c161749a8fdd16e6 SHA512 ce149629e49add9704fa853c6e7b644e1b4192bee378be757ff6911c5dce89b8532e22d208248475f1531d433d168b806151082179b45c5ea9f57df90203333e WHIRLPOOL 917095ad6f4f477bf2834c4e7da8c6909561c705f36df5598e48269dd2505c66720369a6846e9614feeda5c9b2a6d4317489da2143d6c87584df13ae02ba3fc6
diff --git a/dev-python/ldap3/ldap3-0.9.9.ebuild b/dev-python/ldap3/ldap3-0.9.9.ebuild
new file mode 100644
index 000000000000..700d8ef8deaf
--- /dev/null
+++ b/dev-python/ldap3/ldap3-0.9.9.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="A strictly RFC 4511 conforming LDAP V3 pure Python client"
+HOMEPAGE="https://github.com/cannatag/ldap3 https://pypi.python.org/pypi/ldap3"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+RDEPEND=">=dev-python/pyasn1-0.1.8[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )
+	"
+
+python_test() {
+	cd "${BUILD_DIR}" || die
+	nosetests -v -s test || die
+}
diff --git a/dev-python/libvirt-python/Manifest b/dev-python/libvirt-python/Manifest
index dc949655c8e0..568af82670b3 100644
--- a/dev-python/libvirt-python/Manifest
+++ b/dev-python/libvirt-python/Manifest
@@ -1,3 +1,4 @@
 DIST libvirt-python-1.2.15.tar.gz 166128 SHA256 9a6dfbd487d49f887a41aca4bfb1b4e043fd9fbdfc041252cae84023f5c387ba SHA512 5687308c2f16199ecc4ec935719da1e2d34d0fb3752437a4c662d7c83d972f49ee5e852daf7233fa9aa29f25bbaed1c26d17740faf56c1771bbc2134bcb8958b WHIRLPOOL d2173060d5d3763ba367fbf3140800d6534c27f36b91d7a944ff2f5ce36f9ac54bd86fb6df1399cfa8610ef62c0b0b87427fc68dc1e0be77b0c7b3f94f7d9e30
 DIST libvirt-python-1.2.17.tar.gz 170511 SHA256 f4d3db4012a800a2519e62bbef4ce14a37e030a20ab18f5b66759533a39b36ed SHA512 bd77558bc59f2abedb55582fed56bb73b33089cfa5de4a109c145bb087dfaa258ad4b022ca00b30fbac5c09f53f7a60fc270e658afd1cc57e618568b89adbfcd WHIRLPOOL a6e5c11401ebf66acadf075dbe360d43607b238b29f090cb822e7ae019d0a6a9ed5f80fa0d86b5f0b09cfcc103ee3ba77b49efdf0bbd18037df29450ee7306f6
 DIST libvirt-python-1.2.18.tar.gz 171009 SHA256 204535ef160c9d10600b5fc3417f00f382e74b137a85b33774b97eb36d8a3638 SHA512 bf9f246d8bc2e55dc0cdeb22901b2dd2858b058c0616a2d5db3ca4a700c3430c9cd1f904ec3090cab7c3db1d40195a6365fed3b7b18fbd1d975fdca5fa57ce29 WHIRLPOOL a1e684360341b896bd96d6a313320ddb7ad455c64e4d1577076713e4913c95d2bd6f9222a6ac45b735a33d8e7fff06b40327e298d21e214857db17c859fb4849
+DIST libvirt-python-1.2.19.tar.gz 172149 SHA256 88ab63b0c53e435bd2c6e8551805fe273353708efd4dfab908257dc5f37bec49 SHA512 670cc7af3fc5e67fa8daa8312278ecf81608ceddd34c40fc799e0c2836a5a8c3489186dee5ffcd806bf70840c1aa7b64178eef334f35c4bbe5fe21413b473d3b WHIRLPOOL 74e73e1dcabd0ed67988f34cd12c7ecc3d71e5dbfc4a5f81f22e3aeed37ee3fa343b780bbafa7941a79abffdb4d7a566e65b73c185c695567d6558e18ef58b32
diff --git a/dev-python/libvirt-python/libvirt-python-1.2.18.ebuild b/dev-python/libvirt-python/libvirt-python-1.2.18.ebuild
index cc59d1ba63b0..1f38cff44f52 100644
--- a/dev-python/libvirt-python/libvirt-python-1.2.18.ebuild
+++ b/dev-python/libvirt-python/libvirt-python-1.2.18.ebuild
@@ -20,7 +20,7 @@ if [[ ${PV} = *9999* ]]; then
 	RDEPEND="app-emulation/libvirt:=[-python(-)]"
 else
 	SRC_URI="http://libvirt.org/sources/python/${MY_P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 	RDEPEND="app-emulation/libvirt:0/${PV}"
 fi
 S="${WORKDIR}/${P%_rc*}"
diff --git a/dev-python/libvirt-python/libvirt-python-1.2.19.ebuild b/dev-python/libvirt-python/libvirt-python-1.2.19.ebuild
new file mode 100644
index 000000000000..cc59d1ba63b0
--- /dev/null
+++ b/dev-python/libvirt-python/libvirt-python-1.2.19.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+
+AUTOTOOLIZE=yes
+
+MY_P="${P/_rc/-rc}"
+
+inherit eutils distutils-r1
+
+if [[ ${PV} = *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="git://libvirt.org/libvirt-python.git"
+	SRC_URI=""
+	KEYWORDS=""
+	RDEPEND="app-emulation/libvirt:=[-python(-)]"
+else
+	SRC_URI="http://libvirt.org/sources/python/${MY_P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+	RDEPEND="app-emulation/libvirt:0/${PV}"
+fi
+S="${WORKDIR}/${P%_rc*}"
+
+DESCRIPTION="libvirt Python bindings"
+HOMEPAGE="http://www.libvirt.org"
+LICENSE="LGPL-2"
+SLOT="0"
+IUSE="test"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	test? ( dev-python/lxml[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}] )"
+
+# testsuite is currently not included in upstream tarball
+RESTRICT="test"
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/lockfile/lockfile-0.10.2.ebuild b/dev-python/lockfile/lockfile-0.10.2.ebuild
index 99b7908b272d..cc4bcfab8a09 100644
--- a/dev-python/lockfile/lockfile-0.10.2.ebuild
+++ b/dev-python/lockfile/lockfile-0.10.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86"
+KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~x86"
 IUSE="doc test"
 
 DEPEND="
diff --git a/dev-python/mako/Manifest b/dev-python/mako/Manifest
index 5553b56b85ee..5fb58e0a7352 100644
--- a/dev-python/mako/Manifest
+++ b/dev-python/mako/Manifest
@@ -1,2 +1,2 @@
-DIST Mako-0.7.3.tar.gz 401787 SHA256 5e1d17fbd1aed57ebeea74ee3809015b121e142d73069066a113a125a4ec2ef5 SHA512 3134a05fcacb5d8e41ebab3bedb6c1a31eec94afb56f2c8319fee4b749930fcc7df5ed86e0de26cafbaea966b920921e29788f1c6ba5810eedb4d98f322085f9 WHIRLPOOL 8d3011b472a4bd04c4ef0ddad4767357bd1c570228702e900c956582c2e1e7e668765a34e4e450e18b8a1e0562d9b024ee1ae8b82efc891023154cf442f16d8a
 DIST Mako-1.0.0.tar.gz 470006 SHA256 a3cd72cfef507204b50f74ffcbfcfde7e856437891d3f6cfe780866986d006fe SHA512 81a6b7637e26d561350a591e3490e7140db218ae7f6b43fec8fca5b767fc6e57d0e8cc901d28fecb9863b2170c824a35c578a94579f991359fa0873f62ec578a WHIRLPOOL aa27b63e3832f03120312fbfec939b05606081e67a5cb4c9a056c27259631c2e159cf7506292d44e2c17c5950d7e4255d19f4beba78502bdbb52fbf11e1a872c
+DIST Mako-1.0.2.tar.gz 564592 SHA256 2550c2e4528820db68cbcbe668add5c71ab7fa332b7eada7919044bf8697679e SHA512 d297f9050049ac37612b10d61d3f1bb2cb7f6e238e7afdce092ba95d6117e064b4dfebaa3219093d88f75c6ef691fe3a0aaebd4188a5ba571867d3a3dfe986bc WHIRLPOOL 63f1b0a094dcbd5ab9fb86ba56764ad517b60c24d58b7e51b5220d2df4426e47d0c65d0409f9f7c499c7eaa0747b5bac06326718574038c2276b4b52147274fe
diff --git a/dev-python/mako/mako-0.7.3-r1.ebuild b/dev-python/mako/mako-0.7.3-r1.ebuild
deleted file mode 100644
index eca401ec849b..000000000000
--- a/dev-python/mako/mako-0.7.3-r1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-MY_P="Mako-${PV}"
-
-DESCRIPTION="A Python templating language"
-HOMEPAGE="http://www.makotemplates.org/ https://pypi.python.org/pypi/Mako"
-SRC_URI="http://www.makotemplates.org/downloads/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~hppa ia64 ppc ~ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
-IUSE="doc test"
-
-RDEPEND=">=dev-python/beaker-1.1[${PYTHON_USEDEP}]
-	>=dev-python/markupsafe-0.9.2[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}/test-fix.patch"
-)
-
-python_test() {
-	cp -r -l test "${BUILD_DIR}"/ || die
-
-	if [[ ${EPYTHON} == python3.* ]]; then
-		# Notes:
-		#   -W is not supported by python3.1
-		#   -n causes Python to write into hardlinked files
-		2to3 --no-diffs -w "${BUILD_DIR}"/test || die
-	fi
-
-	cd "${BUILD_DIR}"/test || die
-	nosetests || die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	rm -rf doc/build
-
-	use doc && local HTML_DOCS=( doc/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/mako/mako-0.7.3-r2.ebuild b/dev-python/mako/mako-0.7.3-r2.ebuild
deleted file mode 100644
index b8abc6a9c3bb..000000000000
--- a/dev-python/mako/mako-0.7.3-r2.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
-
-inherit readme.gentoo versionator distutils-r1
-
-MY_P="Mako-${PV}"
-
-DESCRIPTION="A Python templating language"
-HOMEPAGE="http://www.makotemplates.org/ https://pypi.python.org/pypi/Mako"
-SRC_URI="http://www.makotemplates.org/downloads/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ia64 ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
-IUSE="doc test"
-
-RDEPEND="
-	>=dev-python/markupsafe-0.9.2[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/nose[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7) )"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}/test-fix.patch"
-)
-
-DOC_CONTENTS="
-${PN} can be enchanced with caching by dev-python/beaker"
-
-python_test() {
-	cp -r -l test "${BUILD_DIR}"/ || die
-
-	if [[ ${EPYTHON} == python3.* ]]; then
-		# Notes:
-		#   -W is not supported by python3.1
-		#   -n causes Python to write into hardlinked files
-		2to3 --no-diffs -w "${BUILD_DIR}"/test || die
-	fi
-
-	cd "${BUILD_DIR}"/test || die
-	nosetests || die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	rm -rf doc/build
-
-	use doc && local HTML_DOCS=( doc/. )
-	distutils-r1_python_install_all
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-
-	for v in ${REPLACING_VERSIONS}; do
-		if ! version_is_at_least 0.7.3-r2 $v; then
-			ewarn "dev-python/beaker is no longer hard dependency of ${P}"
-			ewarn "If you rely on it, you should add beaker to your world"
-			ewarn "file:"
-			ewarn "# emerge --noreplace beaker"
-			break
-		fi
-	done
-}
diff --git a/dev-python/mako/mako-1.0.2.ebuild b/dev-python/mako/mako-1.0.2.ebuild
new file mode 100644
index 000000000000..ec773ed18ca4
--- /dev/null
+++ b/dev-python/mako/mako-1.0.2.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+
+inherit distutils-r1 eutils versionator
+
+MY_PN="Mako"
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="A Python templating language"
+HOMEPAGE="http://www.makotemplates.org/ https://pypi.python.org/pypi/Mako"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+IUSE="doc test"
+
+RDEPEND="
+	>=dev-python/markupsafe-0.9.2[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7)
+	)"
+
+S="${WORKDIR}/${MY_P}"
+
+python_test() {
+	nosetests "${S}"/test || die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	rm -rf doc/build || die
+
+	use doc && local HTML_DOCS=( doc/. )
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	optfeature dev-python/beaker "Caching support"
+	for v in ${REPLACING_VERSIONS}; do
+		if ! version_is_at_least 0.7.3-r2 $v; then
+			ewarn "dev-python/beaker is no longer hard dependency of ${P}"
+			ewarn "If you rely on it, you should add beaker to your world"
+			ewarn "file:"
+			ewarn "# emerge --noreplace beaker"
+			break
+		fi
+	done
+}
diff --git a/dev-python/mamba/Manifest b/dev-python/mamba/Manifest
index 02d18f667f66..9d2e1a78cf06 100644
--- a/dev-python/mamba/Manifest
+++ b/dev-python/mamba/Manifest
@@ -1,4 +1,3 @@
 DIST mamba-0.6.tar.gz 12548 SHA256 94169b12141ba57bbcbc5a5fac810631102558450057e1b66b0631d521034b67 SHA512 1d29c90cb45d2a6881d3524517151b88c80acabeaecff42efa9c94a8257e726c4b53cc40aba0643e95ef4af7d2895cf49b6619df06e933aab88157105c98a8cb WHIRLPOOL 489769b4f4ae368d0fa9ce918b629ab661765e8e85f4de1fe609e6f85e19304ec2c3c41a278b47d205fbd42d44b625f8b16b09a223282031f0f317d622aa2481
-DIST mamba-0.8.2.tar.gz 13379 SHA256 4ece61321a90b904e8f2859f4966d3fd61b4161137e73d4a3f8015b6f1d944fd SHA512 3b8e824b5c84106462242404716a4b36c678878301a924c4118accedd1b6883e1102c3bc61ac200c78f64c3b6a6890ba0f5529c3cd4d6a2743189174aa2fd907 WHIRLPOOL 6a60c866c84140c82a57eec2341262fe9c8a3be900c4d8fecc3113c776b197ef9df378c73ef9c0e915ecf23f2ba31ec01c6e606cec30d7dcc0f9d7af6bc110a8
 DIST mamba-0.8.4.tar.gz 14781 SHA256 2fc3eb17a1d051438ca844ad9086f6ad8d27d7a262153cb9e740416b01b7d46d SHA512 31a58a6ee43500b6e059598ff45ffb0e89e385a10fc47a41222cce2a2fee3987bd84dc4484151d46a7062244437973afaddc2c74aa7df21c0e175a33ce8a630c WHIRLPOOL dc26692c8e46ab1f2226099b051fd1236fc7006b0f3ce93f70cca4a685c209e71de256ae6ed21695df9ccb299bf2edc1f9975c2f98ee906e8067ab3a9ccb2383
-DIST mamba-0.8.tar.gz 13192 SHA256 7e6488e41acecc08c8d729c18ef881a94119f575b1c7d365cc4ea3c3442aca63 SHA512 ac1c9342829d949bfbe99caa42403734a9965c6070fd95a7e427f7e2592c122d86eacd19b4c1ae566e7c3035a27a6c7e43ce0fb98d1a9b5c126ed75f1de314bc WHIRLPOOL 2d3b2895bbe4a6dd7e51d327e4e22a58874c4654ad52e589467c4f0eeda332855c1968d12fcfc32cdf28c8a9718fe3892b01b079b0efccc7efadd8e4a57d2ab7
+DIST mamba-0.8.5.tar.gz 15265 SHA256 c90428c3cae331caf1887b62af89236bac14c7e8d078ea94e068a4b0d9f2cb85 SHA512 e8b5539f66c77bbec9001be6dd13914a17c1a23e6e1d9219d509b8e27664b65d16f5d5e992c284fb2e21e8e92f82a503bda5905baedb0e695b384f7280885a5a WHIRLPOOL a6a9e332b84b0c3a91d1376bf517eb67ced3f5ade8b294a949f5e951279c9c006b5d7718cadf27df5c073dd1fe7507485e10d1f69f81c62338a9fdbe8da24265
diff --git a/dev-python/mamba/mamba-0.8.2.ebuild b/dev-python/mamba/mamba-0.8.2.ebuild
deleted file mode 100644
index 0721779ad932..000000000000
--- a/dev-python/mamba/mamba-0.8.2.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
-
-inherit distutils-r1
-
-DESCRIPTION="The definitive testing tool for Python. Born under the banner of Behavior Driven Development"
-HOMEPAGE="http://nestorsalceda.github.io/mamba"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/expects-0.4.2[${PYTHON_USEDEP}]
-		<dev-python/expects-0.5[${PYTHON_USEDEP}]
-		>=dev-python/doublex-expects-0.4[${PYTHON_USEDEP}]
-		<dev-python/doublex-expects-0.5[${PYTHON_USEDEP}]
-	)
-"
-RDEPEND="
-	~dev-python/clint-0.3.1[${PYTHON_USEDEP}]
-	>=dev-python/coverage-3.7[${PYTHON_USEDEP}]
-	~dev-python/watchdog-0.8.1[${PYTHON_USEDEP}]
-"
-
-python_prepare_all() {
-	ebegin 'patching requirements.txt'
-	sed \
-		-e '2s/==/>=/' \
-		-i requirements.txt
-	STATUS=$?
-	eend ${STATUS}
-	[[ ${STATUS} -gt 0 ]] && die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	local DISTUTILS_NO_PARALLEL_BUILD=TRUE
-
-	rm -f "${HOME}"/.pydistutils.cfg || die "Couldn't remove pydistutils.cfg"
-
-	distutils_install_for_testing
-
-	"${TEST_DIR}"/scripts/mamba || die "Tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/mamba/mamba-0.8.5.ebuild b/dev-python/mamba/mamba-0.8.5.ebuild
new file mode 100644
index 000000000000..fde264bf71f6
--- /dev/null
+++ b/dev-python/mamba/mamba-0.8.5.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
+
+inherit distutils-r1
+
+DESCRIPTION="The definitive testing tool for Python. Born under the banner of Behavior Driven Development"
+HOMEPAGE="http://nestorsalceda.github.io/mamba"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+CDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+DEPEND="
+	${CDEPEND}
+	test? (
+		~dev-python/doublex-expects-0.7.0_rc1[${PYTHON_USEDEP}]
+		~dev-python/expects-0.8.0_rc2[${PYTHON_USEDEP}]
+		~dev-python/mock-1.0.1[${PYTHON_USEDEP}]
+	)
+"
+RDEPEND="
+	${CDEPEND}
+	~dev-python/clint-0.3.1[${PYTHON_USEDEP}]
+	~dev-python/coverage-3.7.1[${PYTHON_USEDEP}]
+	~dev-python/watchdog-0.8.1[${PYTHON_USEDEP}]
+"
+
+python_test() {
+	"${PYTHON}" -m mamba.cli || die "Tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/mamba/mamba-0.8.ebuild b/dev-python/mamba/mamba-0.8.ebuild
deleted file mode 100644
index 67dee3e6867e..000000000000
--- a/dev-python/mamba/mamba-0.8.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 python3_3 )
-
-inherit distutils-r1
-
-DESCRIPTION="The definitive testing tool for Python. Born under the banner of Behavior Driven Development"
-HOMEPAGE="http://nestorsalceda.github.io/mamba"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		~dev-python/expects-0.2.1[${PYTHON_USEDEP}]
-		~dev-python/doublex-1.8.1[${PYTHON_USEDEP}]
-		>=dev-python/pyhamcrest-1.8.0[${PYTHON_USEDEP}]
-	)
-"
-RDEPEND="
-	~dev-python/clint-0.3.1[${PYTHON_USEDEP}]
-	~dev-python/coverage-3.7[${PYTHON_USEDEP}]
-	>=dev-python/watchdog-0.6.0[${PYTHON_USEDEP}]
-"
-
-python_prepare_all() {
-	ebegin 'patching requirements.txt'
-	sed \
-		-e '3s/==/>=/' \
-		-i requirements.txt
-	STATUS=$?
-	eend ${STATUS}
-	[[ ${STATUS} -gt 0 ]] && die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	local DISTUTILS_NO_PARALLEL_BUILD=TRUE
-
-	rm -f "${HOME}"/.pydistutils.cfg || die "Couldn't remove pydistutils.cfg"
-
-	distutils_install_for_testing
-
-	"${TEST_DIR}"/scripts/mamba || die "Tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/netcdf4-python/metadata.xml b/dev-python/netcdf4-python/metadata.xml
index 5ef07a39e7e1..6ddf36f85ec0 100644
--- a/dev-python/netcdf4-python/metadata.xml
+++ b/dev-python/netcdf4-python/metadata.xml
@@ -5,4 +5,7 @@
   <maintainer>
     <email>jlec@gentoo.org</email>
   </maintainer>
+  <upstream>
+    <remote-id type="github">Unidata/netcdf4-python</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-python/networkx/networkx-1.10-r1.ebuild b/dev-python/networkx/networkx-1.10-r1.ebuild
new file mode 100644
index 000000000000..6726385e26b2
--- /dev/null
+++ b/dev-python/networkx/networkx-1.10-r1.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python tools to manipulate graphs and complex networks"
+HOMEPAGE="http://networkx.github.io/ https://github.com/networkx/networkx"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="doc examples test"
+
+COMMON_DEPEND="
+	dev-python/matplotlib[${PYTHON_USEDEP}]
+		sci-libs/scipy[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? (
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/matplotlib[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep 'dev-python/numpydoc[${PYTHON_USEDEP}]' python2_7)
+		$(python_gen_cond_dep 'dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]' python2_7 python{3_3,3_4})
+	)
+	test? (
+		${COMMON_DEPEND}
+		dev-python/nose[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep 'media-gfx/pydot[${PYTHON_USEDEP}]' python2_7)
+	)"
+RDEPEND="
+	>=dev-python/decorator-3.4.0[${PYTHON_USEDEP}]
+	examples? (
+		${COMMON_DEPEND}
+		dev-python/pygraphviz[${PYTHON_USEDEP}]
+		dev-python/pyparsing[${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+	)"
+
+python_prepare_all() {
+	# Avoid d'loading of file objects.inv from 2 sites of python docs
+	sed -e "s/'sphinx.ext.intersphinx', //" -i doc/source/conf.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	# https://github.com/networkx/networkx/issues/1263
+	if use doc; then
+		sed \
+			-e "s:^\t\./:\t${PYTHON} :g" \
+			-i doc/Makefile || die
+		emake -C doc html
+	fi
+}
+
+python_test() {
+	nosetests -vv || die
+}
+
+python_install_all() {
+	# Oh my.
+	rm -r "${ED}"usr/share/doc/${P} || die
+
+	use doc && local HTML_DOCS=( doc/build/html/. )
+	use examples && local EXAMPLES=( examples/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/numpydoc/numpydoc-0.5.ebuild b/dev-python/numpydoc/numpydoc-0.5.ebuild
index 2859d82c6477..69b9e0e016e5 100644
--- a/dev-python/numpydoc/numpydoc-0.5.ebuild
+++ b/dev-python/numpydoc/numpydoc-0.5.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86 ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="test"
 
 RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/oauth2/oauth2-1.5.211-r1.ebuild b/dev-python/oauth2/oauth2-1.5.211-r1.ebuild
index df5026acce51..37766bc5ff9a 100644
--- a/dev-python/oauth2/oauth2-1.5.211-r1.ebuild
+++ b/dev-python/oauth2/oauth2-1.5.211-r1.ebuild
@@ -3,6 +3,7 @@
 # $Id$
 
 EAPI=5
+
 PYTHON_COMPAT=( python2_7 pypy )
 
 inherit distutils-r1
@@ -17,7 +18,8 @@ KEYWORDS="amd64 x86 ~x64-macos"
 IUSE="test"
 
 RDEPEND="dev-python/httplib2[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
 	test? ( ${RDEPEND}
 		dev-python/coverage[${PYTHON_USEDEP}]
 		dev-python/mock[${PYTHON_USEDEP}]
@@ -26,5 +28,5 @@ DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
 PATCHES=( "${FILESDIR}/${PN}-exclude-tests.patch" )
 
 python_test() {
-	esetup.py test || die "Tests fail with ${EPYTHON}"
+	esetup.py test
 }
diff --git a/dev-python/os-testr/metadata.xml b/dev-python/os-testr/metadata.xml
index d5dfd322223c..94ef384a8c63 100644
--- a/dev-python/os-testr/metadata.xml
+++ b/dev-python/os-testr/metadata.xml
@@ -7,4 +7,8 @@
 	</maintainer>
 	<longdescription lang="en">
 	</longdescription>
+	<upstream>
+		<remote-id type="pypi">oslo.log</remote-id>
+		<remote-id type="github">openstack/oslo.log</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/oslo-service/metadata.xml b/dev-python/oslo-service/metadata.xml
index d5dfd322223c..6e22f39eb97d 100644
--- a/dev-python/oslo-service/metadata.xml
+++ b/dev-python/oslo-service/metadata.xml
@@ -7,4 +7,7 @@
 	</maintainer>
 	<longdescription lang="en">
 	</longdescription>
+	<upstream>
+		<remote-id type="pypi">oslo.service</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/packaging/packaging-15.3-r1.ebuild b/dev-python/packaging/packaging-15.3-r1.ebuild
index aaac708087bd..a16175bffb15 100644
--- a/dev-python/packaging/packaging-15.3-r1.ebuild
+++ b/dev-python/packaging/packaging-15.3-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="Apache-2.0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~hppa ~mips ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 
 RDEPEND=""
diff --git a/dev-python/parsley/Manifest b/dev-python/parsley/Manifest
index 9f86b23eb8a3..e754c19154b9 100644
--- a/dev-python/parsley/Manifest
+++ b/dev-python/parsley/Manifest
@@ -1 +1,2 @@
 DIST parsley-1.2.tar.gz 106385 SHA256 1b5465f8244fd930929fe99c8ef710ab3d65d8a12814f73181eeb1ce22fea416 SHA512 55810ec6c77c6ed60bd84c34bffbeba6f65132907e46ee9b85c8f27215e2be08960edc98ae20cdd431bd74d6cf0ca494ca914e8b1cfd091c549e82bb019490e5 WHIRLPOOL 1a3f59072d642148f18049d31b92f3d2873ac337200e53ab73faf91398fbbb8876909d9e5c37ac90b743ef8a0ab6c629b08a3c3f6668e11f213d7aa9a5f180a8
+DIST parsley-1.3.tar.gz 108574 SHA256 801defb0586af7964b84995999315d75244d3bc4fefda8ee8319c66688f0e48f SHA512 da749592a585be6c7b45e3d0637e30f0cf79caf71f88cd55a9c53466f5adf9c46a955359b3587f37b8237a5005cda94f62ab349889cb649c786f593b3707dd55 WHIRLPOOL a86937a8fc62c574022c9d773130be7983526b558221424f8d1e7f2b9def5c3149d0d174aaccccd33f3a519cf52884c34eb06ca1325cf7405aab59e6aaa53d5a
diff --git a/dev-python/parsley/parsley-1.3.ebuild b/dev-python/parsley/parsley-1.3.ebuild
new file mode 100644
index 000000000000..9ef3287b6713
--- /dev/null
+++ b/dev-python/parsley/parsley-1.3.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_4} )
+
+inherit distutils-r1
+
+DESCRIPTION="A Pattern-Matching Language Based on OMeta and Python"
+HOMEPAGE="https://github.com/python-parsley/parsley"
+SRC_URI="https://github.com/python-${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
diff --git a/dev-python/path-py/Manifest b/dev-python/path-py/Manifest
index 6d270491d538..207cd1aa8b82 100644
--- a/dev-python/path-py/Manifest
+++ b/dev-python/path-py/Manifest
@@ -1,6 +1,3 @@
-DIST path.py-7.3.zip 33549 SHA256 f7d146f40768e3742199a5316fbe3eb6a6091b9feedcb4b969c7348dc03151e1 SHA512 f676b81deda7b42a2a29fef0827d7c8ecbe743d0fa5efdc8221a78f3e744f357a179a9b8451264636ca2626f58d422a02d6ad77cc57eef74dd3b186585863433 WHIRLPOOL 7da96c488aa6bcdea0a65c69b412710dbc85f7bed04dd571389ca190d43fea2e711659ca3546b926efc69d631a1408b5905839c39866d7e98b7dde19803d0c4f
-DIST path.py-7.4.tar.gz 27256 SHA256 69df64c911a4b27194e24b0b81789f449e2b75af46ffbd872e66c9af20009948 SHA512 5a0d34e911315bc447ba9428a7934f77043ec701ecd32e099562290d8c8e092fd780b3ec1f0353c378394e4de2fe444a4141bd91301f40c0fb3086892726205f WHIRLPOOL 41b5025654ea2ae88c829eb10f7fb6341f214e7d9050aca018fcce2349ecae14f08b9398a6743fbae752800742f06dc33a8b3a55a8171eaa8676cf0f72cd9b31
-DIST path.py-7.6.1.tar.gz 32974 SHA256 201c86613327f2f6c2d34c8f28689bdfde74fbb758c5211a1f8652dc71fa9e5a SHA512 f0879018bc5dbc3c5796a0587976f7bd40c44d62c4d81884efef2aca914b0ed14aada3f94c5ad6b8ac6cf8dbc809ff231ca4308d64438c38feafccbba478f796 WHIRLPOOL bb492d8ed4acb0b6c088c36acaba863514f85b46373fe98abd8f6edaf43ea9629340de128cbf2d385a81ccd923325870449553071bf0b967d28a9af1c54c87e1
 DIST path.py-7.7.1.tar.gz 33102 SHA256 692feac9d1fe3b70239b2f0f07dcdbbdad38e3611846924de33ec6175d87638e SHA512 9275fab8340600889e0704d383f009d9aa94f9fa903aade57922b8fc797587734bdacd89ab6e87573dffd4cfa6a167067e03cfab0916cc3416619774134de7cb WHIRLPOOL 7811ccbf811c8d7a307d2cb50ddfdea2e96c49de2e1618c856d97f300560cca3558c2fa2a1cf29717cfbdb4460f05f7fe8d5dbd9efadba3ae76e4f526d3c7b53
-DIST path.py-7.7.tar.gz 33065 SHA256 078e1011f0ee748e8569c9972a6259898c6e8f58d45c4ca06f3fab007c241544 SHA512 d8b1fb41bfd923054a03ef9d750f0921952b508f6be77cc026ba887584a610376d12ec54e1c1027bba02a256996e56b30b8dd6e56e8e1753c05a571985f43dc2 WHIRLPOOL c9bafc6ae2fe293978f086617c08341970dd2f0f2b2ec2e12b2904a7429171a3bcabcb8fb7014c8e8d330487724c7fb39ec10ac64d46524fc689c341ba053171
+DIST path.py-8.1.1.tar.gz 33292 SHA256 2e109f902aed4a7999d465e4ec8456c1112e657840520c5bc7104fb7050d1add SHA512 7a33807017c952d347bb966e1ed6db49e30625c7b2ae795dc11b39a237830d988f2d3033666da9a796cb5048ab8024690c803054f40cc21b0ce1a68fe9969802 WHIRLPOOL a18277816f9fbe3042fa397b63203a3b4696f657414c2c72ee656679e24ec86363f493e8e31ff50721a52a6e2d3afee31f75a730f325e22ca4f071c4ff988681
 DIST path.py-8.1.tar.gz 33221 SHA256 27ea0789c12cbe8e2a29397d2a54581009094a0684ce880844ba9fc4c16ce30c SHA512 f5a2e824bdf7c097fc690ce57237dc476e0c2b748dd6c7b1559d4d769bef2485a5bfddcad6ae89af861a0e072fc16eeefea307a0c3e069fa30b9e4e90b9a742f WHIRLPOOL e8c307bfbdfd0c61e2d09c21689120e4c1986b230daa56c51b56d94329149a32870f37cec3ccd1fdee12d8c40cd2f38ec90de1dfdecfad3d73f233004551368b
diff --git a/dev-python/path-py/path-py-7.3.ebuild b/dev-python/path-py/path-py-7.3.ebuild
deleted file mode 100644
index 8b4f05706610..000000000000
--- a/dev-python/path-py/path-py-7.3.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
-
-inherit distutils-r1
-
-MY_P="path.py-${PV}"
-
-DESCRIPTION="A module wrapper for os.path"
-HOMEPAGE="http://pythonhosted.org/path.py https://pypi.python.org/pypi/path.py https://github.com/jaraco/path.py"
-SRC_URI="mirror://pypi/p/path.py/${MY_P}.zip"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-DEPEND="
-	app-arch/unzip
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
-
-S="${WORKDIR}/${MY_P}"
-
-python_test() {
-	py.test || die "Testing failed with ${EPYTHON}"
-}
diff --git a/dev-python/path-py/path-py-7.4.ebuild b/dev-python/path-py/path-py-7.4.ebuild
deleted file mode 100644
index 87c21d418bd9..000000000000
--- a/dev-python/path-py/path-py-7.4.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
-
-inherit distutils-r1
-
-MY_P="path.py-${PV}"
-
-DESCRIPTION="A module wrapper for os.path"
-HOMEPAGE="http://pythonhosted.org/path.py https://pypi.python.org/pypi/path.py https://github.com/jaraco/path.py"
-SRC_URI="mirror://pypi/p/path.py/${MY_P}.tar.gz"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
-
-S="${WORKDIR}/${MY_P}"
-
-python_test() {
-	py.test || die "Testing failed with ${EPYTHON}"
-}
diff --git a/dev-python/path-py/path-py-7.6.1.ebuild b/dev-python/path-py/path-py-7.6.1.ebuild
deleted file mode 100644
index 7ae500ba7c04..000000000000
--- a/dev-python/path-py/path-py-7.6.1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
-
-inherit distutils-r1
-
-MY_P="path.py-${PV}"
-
-DESCRIPTION="A module wrapper for os.path"
-HOMEPAGE="http://pythonhosted.org/path.py https://pypi.python.org/pypi/path.py https://github.com/jaraco/path.py"
-SRC_URI="mirror://pypi/p/path.py/${MY_P}.tar.gz"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/appdirs[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-S="${WORKDIR}/${MY_P}"
-
-python_prepare_all() {
-	sed '/setuptools_scm/d' -i setup.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	esetup.py test
-}
diff --git a/dev-python/path-py/path-py-7.7.ebuild b/dev-python/path-py/path-py-7.7.ebuild
deleted file mode 100644
index 7ae500ba7c04..000000000000
--- a/dev-python/path-py/path-py-7.7.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
-
-inherit distutils-r1
-
-MY_P="path.py-${PV}"
-
-DESCRIPTION="A module wrapper for os.path"
-HOMEPAGE="http://pythonhosted.org/path.py https://pypi.python.org/pypi/path.py https://github.com/jaraco/path.py"
-SRC_URI="mirror://pypi/p/path.py/${MY_P}.tar.gz"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/appdirs[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-S="${WORKDIR}/${MY_P}"
-
-python_prepare_all() {
-	sed '/setuptools_scm/d' -i setup.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	esetup.py test
-}
diff --git a/dev-python/path-py/path-py-8.1.1.ebuild b/dev-python/path-py/path-py-8.1.1.ebuild
new file mode 100644
index 000000000000..b490b2b7e6e1
--- /dev/null
+++ b/dev-python/path-py/path-py-8.1.1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
+
+inherit distutils-r1
+
+MY_P="path.py-${PV}"
+
+DESCRIPTION="A module wrapper for os.path"
+HOMEPAGE="http://pythonhosted.org/path.py https://pypi.python.org/pypi/path.py https://github.com/jaraco/path.py"
+SRC_URI="mirror://pypi/p/path.py/${MY_P}.tar.gz"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/appdirs[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-runner[${PYTHON_USEDEP}]
+	)"
+
+S="${WORKDIR}/${MY_P}"
+
+python_prepare_all() {
+	sed '/setuptools_scm/d' -i setup.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/pbr/Manifest b/dev-python/pbr/Manifest
index edc7aeb3945b..f7c56fb3d7e4 100644
--- a/dev-python/pbr/Manifest
+++ b/dev-python/pbr/Manifest
@@ -6,3 +6,4 @@ DIST pbr-1.1.1.tar.gz 97607 SHA256 3d63cc8e145e5e20624859d6453d783ae1451704483ae
 DIST pbr-1.2.0.tar.gz 99092 SHA256 1543fc3e00261369c160fc8cf700717aad15fbc1f0ea0e8dc4f372cb91a655d0 SHA512 e5adc396596f4b42a8eb569c970a3cf571b119740b9ca221dc57c6f34c088df1dbfca3c704b7dd3b2d6676d48f9eba17ddb535e28ef6ab0572206620b894c5a2 WHIRLPOOL 6baaeecc6dc7c228d76f7a8f42af19cf179540483267ea863323e09654a3faac0cabbea6dc6d83b36e0c4496cd5872f05e1e9b7f5c5a36272fc746f84e2dd504
 DIST pbr-1.3.0.tar.gz 99701 SHA256 1a6f8d514fc11d2571c75c207d932c106f024f199b5f12d25f8ca022b026c59d SHA512 29f661a1d8bed6df5017bb342209e702f19e72c321952a9131d84222162599208bea67922485a87b6f3505e072d62cb13fdfcdd4fbb7c085b3476f6ff5a07df9 WHIRLPOOL 978d943efd2f582b8067a898f102005c749df8addee4ec3d6f4f4c4078e3190263ceba46409281e7bd38ab59ad12f45d3d208cfd6ba58ece72d973161dfd08e9
 DIST pbr-1.6.0.tar.gz 99945 SHA256 4eaee8ff5544703edd1951ed1dc0b283da99a74f740d9f9055eeefcf329de1d1 SHA512 a0393cc7774ea3e181ba75c976f5961686afeb214d8c16f3fdd3838154323cd856ded759cae1c6a25b0371c72d95e579b04de0902d56c432ef137f820032c0fd WHIRLPOOL f0a4c4744a86ee1285490ec78fa8e9dc910d926b05746ccf1be5342fe4369bf33a6373ff4fc9981f2547fa83dbc743de4b204a79c9eee8bd4396a983c5509686
+DIST pbr-1.7.0.tar.gz 99850 SHA256 d6e696dbd2b311225e3a21fe11d611989434cb366ff7919cef5ef1add859526e SHA512 333c99132008997b988f93488b1c4d42a30e14ee179866ee4624bdaae3c11ea2bd321d15c86ee435d325dd80fe1de64ff75113c2c8f5f7b31248188c9e3719fe WHIRLPOOL 62effaec7fb99c89dbba36af71208472c4cfb7fbbb2549440f995048b1ff0b0b2899b099774574c5501bc2d575253a6c8e5df7afccd449f3052a0ebf07f1269e
diff --git a/dev-python/pbr/pbr-1.6.0.ebuild b/dev-python/pbr/pbr-1.6.0.ebuild
index fec9fa1073bb..c4044251987e 100644
--- a/dev-python/pbr/pbr-1.6.0.ebuild
+++ b/dev-python/pbr/pbr-1.6.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~hppa ~mips ~x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 
 DEPEND="
diff --git a/dev-python/pbr/pbr-1.7.0.ebuild b/dev-python/pbr/pbr-1.7.0.ebuild
new file mode 100644
index 000000000000..c4044251987e
--- /dev/null
+++ b/dev-python/pbr/pbr-1.7.0.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Inject some useful and sensible default behaviors into setuptools"
+HOMEPAGE="https://github.com/openstack-dev/pbr"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~mips ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
+		>=dev-python/fixtures-1.3.1[${PYTHON_USEDEP}]
+		>=dev-python/mock-1.2[${PYTHON_USEDEP}]
+		>=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
+		!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
+		<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
+		>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
+		>=dev-python/testresources-0.2.4[${PYTHON_USEDEP}]
+		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
+		>=dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
+		dev-python/virtualenv[${PYTHON_USEDEP}]
+	)"
+PDEPEND="dev-python/pip[${PYTHON_USEDEP}]"
+
+# Requ'd for testsuite
+DISTUTILS_IN_SOURCE_BUILD=1
+
+# This normally actually belongs here.
+python_prepare_all() {
+	# This test passes when run within the source and doesn't represent a failure, but rather
+	# a gentoo sandbox constraint
+	# Rm tests that rely upon the package being already installed and fail
+	sed -e s':test_console_script_develop:_&:' \
+		-e s':test_console_script_install:_&:' \
+		-e s':test_sdist_extra_files:_&:' \
+		-e s':test_command_hooks:_&:' \
+		-e s':test_sdist_git_extra_files:_&:' \
+		-i pbr/tests/test_core.py || die
+	sed -e s':test_command_hooks:_&:' \
+		-e s':test_global_setup_hooks:_&:' \
+		-i pbr/tests/test_hooks.py || die
+	einfo "rogue tests disabled"
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	# Note; Tests, that have been removed, pass once package is emerged.
+	esetup.py testr
+}
diff --git a/dev-python/pdfrw/metadata.xml b/dev-python/pdfrw/metadata.xml
index 04c2cee1f08b..eae3ef7aec24 100644
--- a/dev-python/pdfrw/metadata.xml
+++ b/dev-python/pdfrw/metadata.xml
@@ -4,5 +4,6 @@
 	<herd>python</herd>
 	<upstream>
 		<remote-id type="pypi">pdfrw</remote-id>
+		<remote-id type="github">pmaupin/pdfrw</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/pdfrw/pdfrw-0.2.ebuild b/dev-python/pdfrw/pdfrw-0.2.ebuild
index 0c3c56a2760d..bb2f08c9eeac 100644
--- a/dev-python/pdfrw/pdfrw-0.2.ebuild
+++ b/dev-python/pdfrw/pdfrw-0.2.ebuild
@@ -13,5 +13,5 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm hppa ~ppc ~ppc64 ~x86"
 IUSE=""
diff --git a/dev-python/pdoc/Manifest b/dev-python/pdoc/Manifest
new file mode 100644
index 000000000000..db0bf58b2081
--- /dev/null
+++ b/dev-python/pdoc/Manifest
@@ -0,0 +1 @@
+DIST pdoc-0.3.1.tar.gz 76065 SHA256 83b23c6dd83d45624d785778d5a3c3cb5541ecebdab4c48c554f98b797c0278f SHA512 1c36fc21198e9b58b6b809e01bd801be8afc2f7d44cbbbfff6d9ecf455111365957a1c72b7acce0458a5c18482c7088ae811371f9362012058ec35c90f10c6e9 WHIRLPOOL c999bb72aa413b2bbd778543ca6b77fe0b0f8e44ca8301b66cc5333eab0587e5a38a5ea32cbbba1e4ec2c34aa7df419adc72d5f109bc834bb723149d116269b4
diff --git a/dev-python/pdoc/metadata.xml b/dev-python/pdoc/metadata.xml
new file mode 100644
index 000000000000..f54c58057228
--- /dev/null
+++ b/dev-python/pdoc/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>python</herd>
+	<maintainer>
+		<email>jlec@gentoo.org</email>
+		<name>Justin Lecher</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">pxml</remote-id>
+		<remote-id type="github">metagriffin/pxml</remote-id>
+		<remote-id type="bitbucket">hpk42/pytest-cache</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/pdoc/pdoc-0.3.1.ebuild b/dev-python/pdoc/pdoc-0.3.1.ebuild
new file mode 100644
index 000000000000..430dfe54605f
--- /dev/null
+++ b/dev-python/pdoc/pdoc-0.3.1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4} )
+
+inherit distutils-r1
+
+DESCRIPTION="A simple program and library to auto generate API documentation for Python modules"
+HOMEPAGE="https://pypi.python.org/pypi/pdoc https://github.com/BurntSushi/pdoc"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="Unlicense"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="
+	dev-python/mako[${PYTHON_USEDEP}]
+	dev-python/markdown[${PYTHON_USEDEP}]
+	dev-python/pygments[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	"
diff --git a/dev-python/pexpect/Manifest b/dev-python/pexpect/Manifest
index 95581b8e9c5c..8e1f71c5537b 100644
--- a/dev-python/pexpect/Manifest
+++ b/dev-python/pexpect/Manifest
@@ -1,5 +1,3 @@
 DIST pexpect-2.4.tar.gz 113251 SHA256 43c788f59dcf4bed677fd0b16891787dbf747e210ffedb6e90156fbbbd4d3b7b SHA512 0d5db34f3dc0e1a5bf7d8d0ab584897e4142592f35765762e4ca60d112106b91485098c91ad95a3cb3ad1f3d600619fa0ad41d930085e75974d78e0f06280a9f WHIRLPOOL 587a94b785645a950a643bff7bf972af285faea9dcf73064eb40e96d7cb29e87543bb14c65cdc2366573236ec56cc03c4076bc952899e567872628ff5c4d9785
 DIST pexpect-3.0.tar.gz 146662 SHA256 1d6cee0fa5ab212f9ddac9852bab0df5fff11a173ed1bfde9346d5c8aa42d14c SHA512 f84cbc843978baf0ab05bae63dd080d4ca14e8fd51de4e53cf33ddb6219c9e460f68861e44104a59ddb2c1b9dc8568bc87ee778ea52b10e18e365b771ca9aa63 WHIRLPOOL e2def4eb61007d5cbb5370daa82672f6063bf87a2a238237720652f85051bb72383b4d808c8a7148063fafe020ce1253a83f97237594b52a75f8a49689e38171
-DIST pexpect-3.1.tar.gz 130404 SHA256 bd0045066718fba98481032303f07565cca6b22b3b7f104efe3e077a55e9ee8d SHA512 8b6edfc6537dcd241446807f0b659c5040ee3a87329df03c76bed0d0328070e3bd144f957661e1ce46f0a6dae89f869ea99d38b22257fc20c2eb3377c4ccafc8 WHIRLPOOL 2472a6b0166c2096cf20056495eb3445c3266edb59c0b2db7dc0a32e8504e2b1755f1bef8245b8c9514325f2d5196d4b6dbed241222b14dd46644fb2e0e60fc9
-DIST pexpect-3.2.tar.gz 131070 SHA256 dbc4c9a01c118e198d1b6ca76f31eb7292f212567f253e6b36a880e5168e961f SHA512 2d25ebb7c19168a083b7af6a84a4ab5162b9fa5ae19b5786ee9592c663dd9ca264c1d1840a219f0ff44bc14853fc801c1d2e73a053f5d2afc2d1eea174b0b505 WHIRLPOOL 70ac0fe69e3410cd74d5b99b4dc654171f5aa763629793f6eed5a6fb607b1bd604b070fd8ee511998c8e40e188877f20c4233bd567579d8f891a32533865804c
 DIST pexpect-3.3.tar.gz 132330 SHA256 dfea618d43e83cfff21504f18f98019ba520f330e4142e5185ef7c73527de5ba SHA512 66cc501f1c7bb8ba0be4cdc0db840629f51416dc54ae44dc770adb38f1a385116b0a8b9bc7f1cc1447f05ede36ef1b519f5c4e710e6cb736c923ecfc87497cfa WHIRLPOOL e708e722d4e2598958f8d724b84148608e9a53041077b1a1a2af84d5281e11f0c6c050ee88489eebc48bd5556c22e0fe9386680d34b1941ddf21539296629513
diff --git a/dev-python/pexpect/pexpect-3.1.ebuild b/dev-python/pexpect/pexpect-3.1.ebuild
deleted file mode 100644
index 08776dbe8ed0..000000000000
--- a/dev-python/pexpect/pexpect-3.1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python module for spawning child applications and responding to expected patterns"
-HOMEPAGE="http://pexpect.sourceforge.net/ https://pypi.python.org/pypi/pexpect"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~amd64-fbsd ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="doc examples"
-
-DEPEND="doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
-
-python_compile_all() {
-	use doc && emake -C doc html
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/_build/html/. )
-	use examples && local EXAMPLES=( examples/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pexpect/pexpect-3.2.ebuild b/dev-python/pexpect/pexpect-3.2.ebuild
deleted file mode 100644
index 8684f16b6bfe..000000000000
--- a/dev-python/pexpect/pexpect-3.2.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python module for spawning child applications and responding to expected patterns"
-HOMEPAGE="http://pexpect.sourceforge.net/ https://pypi.python.org/pypi/pexpect"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~amd64-fbsd ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="doc examples"
-
-DEPEND="doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
-
-python_compile_all() {
-	use doc && emake -C doc html
-}
-
-python_test() {
-	. test.env || die
-	"${PYTHON}" tools/testall.py || die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/_build/html/. )
-	use examples && local EXAMPLES=( examples/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pip/pip-7.1.2.ebuild b/dev-python/pip/pip-7.1.2.ebuild
index 1a0c9d3b032f..7a07e40a51e1 100644
--- a/dev-python/pip/pip-7.1.2.ebuild
+++ b/dev-python/pip/pip-7.1.2.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://pip.pypa.io/ https://pypi.python.org/pypi/pip/ https://github.
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~hppa ~mips ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 SLOT="0"
 
 # Check pip/_vendor/vendor.txt for this
diff --git a/dev-python/platinfo/metadata.xml b/dev-python/platinfo/metadata.xml
index 4db3a662b0f4..7b85f99ef402 100644
--- a/dev-python/platinfo/metadata.xml
+++ b/dev-python/platinfo/metadata.xml
@@ -21,5 +21,7 @@
 		- generally safe for usage in filenames
 		- not ugly (e.g. "MSWin32" is ugly) 
 	</longdescription>
+	<upstream>
+		<remote-id type="github">trentm/platinfo</remote-id>
+	</upstream>
 </pkgmetadata>
-
diff --git a/dev-python/plumbum/metadata.xml b/dev-python/plumbum/metadata.xml
index f43044e1deed..d9daaefd1772 100644
--- a/dev-python/plumbum/metadata.xml
+++ b/dev-python/plumbum/metadata.xml
@@ -11,4 +11,7 @@
     attempting to mimic the shell syntax (shell combinators) where it makes sense,
     while keeping it all Pythonic and cross-platform.
   </longdescription>
+  <upstream>
+    <remote-id type="pypi">plumbum</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-python/ply/ply-3.6-r1.ebuild b/dev-python/ply/ply-3.6-r1.ebuild
index 2ed2e406c96c..1a8061a52603 100644
--- a/dev-python/ply/ply-3.6-r1.ebuild
+++ b/dev-python/ply/ply-3.6-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://www.dabeaz.com/ply/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha ~amd64 arm ~arm64 hppa ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="alpha ~amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
 IUSE="examples"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/process-tests/Manifest b/dev-python/process-tests/Manifest
new file mode 100644
index 000000000000..676667885797
--- /dev/null
+++ b/dev-python/process-tests/Manifest
@@ -0,0 +1 @@
+DIST process-tests-1.1.0.tar.gz 5450 SHA256 38cccf8f9867c78aa18edf9ec40ca87ff0994af2d588ebf482504873557489fe SHA512 0fcb9a0f1e01bd800a72d0c0f946e58e76d01923abc3731c4cb7f589cc8655d6ad4440c339d497f388c009fd569e547c183f024fd0768a2d23afa558e09156ac WHIRLPOOL da4df1eb80a34701df81c355f6e23883e7563417ea428f0d873bdecf3a506bcb3a62b0f17d73020d45bd92eec5c8df33a68e0ffc8b948cfb25ff47222769d36e
diff --git a/dev-python/process-tests/metadata.xml b/dev-python/process-tests/metadata.xml
new file mode 100644
index 000000000000..9ff7a6400d92
--- /dev/null
+++ b/dev-python/process-tests/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>python</herd>
+	<maintainer>
+		<email>jlec@gentoo.org</email>
+		<name>Justin Lecher</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">pxml</remote-id>
+		<remote-id type="github">metagriffin/pxml</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/process-tests/process-tests-1.1.0.ebuild b/dev-python/process-tests/process-tests-1.1.0.ebuild
new file mode 100644
index 000000000000..ed80beb0b9b4
--- /dev/null
+++ b/dev-python/process-tests/process-tests-1.1.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Tools for testing processes"
+HOMEPAGE="https://github.com/ionelmc/python-process-tests https://pypi.python.org/pypi/process-tests"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	"
diff --git a/dev-python/progress/progress-1.2.ebuild b/dev-python/progress/progress-1.2.ebuild
index 7b4ef23953aa..9be70d474115 100644
--- a/dev-python/progress/progress-1.2.ebuild
+++ b/dev-python/progress/progress-1.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="ISC"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~hppa ~mips ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND=""
diff --git a/dev-python/prompt_toolkit/Manifest b/dev-python/prompt_toolkit/Manifest
index f596d59ba981..4d631f9b7c94 100644
--- a/dev-python/prompt_toolkit/Manifest
+++ b/dev-python/prompt_toolkit/Manifest
@@ -2,3 +2,4 @@ DIST prompt_toolkit-0.45.tar.gz 125907 SHA256 553fd2b9169674adacf227ede2e056c2bb
 DIST prompt_toolkit-0.46.tar.gz 127462 SHA256 1aa25cb9772e1e27d12f7920b5a514421ab763231067119bbd2f8b1574b409fb SHA512 43b7617484ba4c072fc8ac86450450ba127b54ccc1b0ac964cced075f63f470c0ba2d1c7a39be3a0911362baaa9e24e47d299fb48fd26b168f8bad60c1547780 WHIRLPOOL 3ee7c579073c577ab91bee80c7ed350905106c314350c389b5193def43d95d2fcabd739f90cc00989279ddfd407dcb357be8d27deb449c8f78ef51a6edd5fc33
 DIST prompt_toolkit-0.47.tar.gz 129902 SHA256 8ab6c63f7de394b50bc56c9c9e62bed39d523db40b2ba44a2eed57d1ce5f79f6 SHA512 7971ffb7252b461c109c95c9fa245d89da6c3ad24d6792ac84f2640556d76034271248ec01bef6e00dba171216bd9db13787bbc4723116ae3d7df2a974b5eb6f WHIRLPOOL c20c5cabdc80819543ea346fa1d6505f8cd9c87ffc00f7c6b996a3ce32ab7e9e99531a6116733017edb5916333283f4eb63278ac346a150b6cd17355c7a68e24
 DIST prompt_toolkit-0.48.tar.gz 131543 SHA256 054a8f710d585ff994cf92f648bcb78abb1cd14295be3016dcf0214bbbc3b991 SHA512 cec2b8fad25722a2f58895ab50ad9ceb168748bf85d94972c3652d1c46589b55a87e9b78246a138633ce9e7d1c45eab39bad8e3576fdce845a2d68a1c7803d89 WHIRLPOOL 67f9482fbb5814826137f4673db40cd843cb24f9f04011379cc2a83aca8a2a56734c156c421578f6ae4c9b8c5f877d018f6fd22ff39188ced3b187a4fa18b9f5
+DIST prompt_toolkit-0.50.tar.gz 149902 SHA256 6acd7c7d158b1dfb5907659abfae0cee2e5354fabc943aed411843d7fb2bd4aa SHA512 afe708baf8a06823e417c3b9444123e315b32526d49e918f9fde20eaa042989134f511f8dfd8e7ed99c0514d714585b3f82fa72cdf39c70ee85a7e1a27305b23 WHIRLPOOL bcdeafbc4a202588f117b3c245399be6d9bfa75277a7e042ba4c0ad2aa7d11ba2fc0fe80edf64fe4762738596b5937df6d192eedc3f9927bb5aac60c55479be5
diff --git a/dev-python/prompt_toolkit/prompt_toolkit-0.50.ebuild b/dev-python/prompt_toolkit/prompt_toolkit-0.50.ebuild
new file mode 100644
index 000000000000..d3cd17779255
--- /dev/null
+++ b/dev-python/prompt_toolkit/prompt_toolkit-0.50.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=(python2_7 python3_{3,4} )
+
+inherit distutils-r1
+
+DESCRIPTION="Building powerful interactive command lines in Python"
+HOMEPAGE="https://pypi.python.org/pypi/prompt_toolkit/ https://github.com/jonathanslenders/python-prompt-toolkit"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="
+	dev-python/pygments[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	dev-python/wcwidth[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
+
+# not contained in tarball
+RESTRICT="test"
+
+python_test() {
+	"${PYTHON}" "${S}"/tests/run_tests.py || die
+}
diff --git a/dev-python/pssi/metadata.xml b/dev-python/pssi/metadata.xml
index d268875292d5..2ed81f2fca34 100644
--- a/dev-python/pssi/metadata.xml
+++ b/dev-python/pssi/metadata.xml
@@ -5,5 +5,6 @@
 	<herd>python</herd>
 	<upstream>
 		<remote-id type="google-code">pssi</remote-id>
+		<remote-id type="github">Eric-Bourry/pssi</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/ptpython/Manifest b/dev-python/ptpython/Manifest
index 561fdfcd8b0a..f4008519e046 100644
--- a/dev-python/ptpython/Manifest
+++ b/dev-python/ptpython/Manifest
@@ -1,2 +1,3 @@
 DIST ptpython-0.20.tar.gz 29618 SHA256 a6ebe6f6e496693c69f460e46296492832b47997a0feea069b386cf9bee5bc4f SHA512 2ff701d65f449676bd51cad6287723497a6ff8dd2dda5daf992125892c9d1131bfce7c648e8d53260e9d9a33d648ed1b97bb32f60253c106e6f96a58dcece848 WHIRLPOOL c5ab855f747f785c5c29f54346eac6285779dfea054073caea4769e6a92593e48fc84fc2ed69cfcc6f44b17e1323f646c8a6070c892bcf1caf66f128ea748ff6
 DIST ptpython-0.21.tar.gz 27410 SHA256 37aad517cf9d55e567697fe001bc2d07e7013753218537f78425c2bac1181a0b SHA512 d85c7167932cfc033324bf62e96b27ee9296eab92fc1f3ce9e4afac5af6f4e5bfaee1950fcdc76121acd7176efe79c61d6cb2b06a59e7a9a5c5c34a1b41a64d1 WHIRLPOOL 5290c0389893c13c8f4a69a4726faea984be62748ce0beff400e7b7eb8ef5fe1a352f0e37a2afc991d869d69c9afeaaee3c76a00c1157037bd35227d1837285f
+DIST ptpython-0.22.tar.gz 40261 SHA256 b5f23bbf59e134f222c3eef0c60163fe0c212628d23f3756b7923ebb57603536 SHA512 76fbd2ce2db41f4918a2583cd1a5b2518b747fd09483e541a80df617f003cd9fc3d1c9d9699f50479b00f43ba651af49fb5cf44ddc0ba863d92949de0f182594 WHIRLPOOL 770f6544c10bad1632e7b58ec9af97baf611a1b15f40df1ab76a4a81ec080730716cf129f86c54767b0da3b4dfc1fb510f3479fd9953f3831bf77e8b78de7748
diff --git a/dev-python/ptpython/ptpython-0.22.ebuild b/dev-python/ptpython/ptpython-0.22.ebuild
new file mode 100644
index 000000000000..975be6b3870b
--- /dev/null
+++ b/dev-python/ptpython/ptpython-0.22.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4} )
+
+inherit distutils-r1 eutils
+
+DESCRIPTION="Python REPL build on top of prompt_toolkit"
+HOMEPAGE="https://pypi.python.org/pypi/ptpython/ https://github.com/jonathanslenders/ptpython"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="
+	>=dev-python/prompt_toolkit-0.50[${PYTHON_USEDEP}]
+	>=dev-python/jedi-0.9.0[${PYTHON_USEDEP}]
+	dev-python/docopt[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
+
+pkg_postinst() {
+	optfeature "ipython enhanced version" dev-python/ipython
+}
diff --git a/dev-python/pyDeComp/metadata.xml b/dev-python/pyDeComp/metadata.xml
deleted file mode 100644
index 5b985b699484..000000000000
--- a/dev-python/pyDeComp/metadata.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<herd>releng</herd>
-	<maintainer>
-		<email>dolsen@gentoo.org</email>
-		<name>Brian Dolbec</name>
-	</maintainer>
-	<longdescription>A python interface library for common compression ,
-		decompression and contents generation.  It aims to create a simple,
-		easily extended and configurable common interface to various compressison
-		routines.  It can easily be extended with with custom compression,
-		decompression, and contents definitions.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">dol-sen/pyDeComp</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/pyatspi/pyatspi-2.16.0.ebuild b/dev-python/pyatspi/pyatspi-2.16.0.ebuild
index c34f3f75dde8..f50e4b4c15aa 100644
--- a/dev-python/pyatspi/pyatspi-2.16.0.ebuild
+++ b/dev-python/pyatspi/pyatspi-2.16.0.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://live.gnome.org/Accessibility"
 # Note: only some of the tests are GPL-licensed, everything else is LGPL
 LICENSE="LGPL-2 GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="" # test
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/dev-python/pybluez/metadata.xml b/dev-python/pybluez/metadata.xml
index 619a2baffac0..04b90bd9fa3c 100644
--- a/dev-python/pybluez/metadata.xml
+++ b/dev-python/pybluez/metadata.xml
@@ -7,5 +7,6 @@ developers to use system bluetooth resources. It works on machines running the
 GNU/Linux operating system and the bluez bluetooth stack.</longdescription>
 	<upstream>
 		<remote-id type="google-code">pybluez</remote-id>
+		<remote-id type="github">karulis/pybluez</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/pycparser/pycparser-2.14.ebuild b/dev-python/pycparser/pycparser-2.14.ebuild
index 0432c15ee1e9..db6f6eb6ef4b 100644
--- a/dev-python/pycparser/pycparser-2.14.ebuild
+++ b/dev-python/pycparser/pycparser-2.14.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha ~amd64 arm ~arm64 hppa ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="alpha ~amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
 IUSE="test"
 
 RDEPEND="dev-python/ply[${PYTHON_USEDEP}]"
diff --git a/dev-python/pydecomp/metadata.xml b/dev-python/pydecomp/metadata.xml
new file mode 100644
index 000000000000..6dc7c317f900
--- /dev/null
+++ b/dev-python/pydecomp/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>tools-portage</herd>
+	<maintainer>
+		<email>dolsen@gentoo.org</email>
+		<name>Brian Dolbec</name>
+	</maintainer>
+	<longdescription>A python interface library for common compression ,
+		decompression and contents generation.  It aims to create a simple,
+		easily extended and configurable common interface to various compressison
+		routines.  It can easily be extended with with custom compression,
+		decompression, and contents definitions.
+	</longdescription>
+	<natural-name>pyDeComp</natural-name>
+	<upstream>
+		<remote-id type="github">dol-sen/pyDeComp</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/pyDeComp/pyDeComp-9999.ebuild b/dev-python/pydecomp/pydecomp-9999.ebuild
index bce39353b202..bce39353b202 100644
--- a/dev-python/pyDeComp/pyDeComp-9999.ebuild
+++ b/dev-python/pydecomp/pydecomp-9999.ebuild
diff --git a/dev-python/pygccxml/pygccxml-1.0.0.ebuild b/dev-python/pygccxml/pygccxml-1.0.0.ebuild
index 2e4cae479cf1..0836d5058f5b 100644
--- a/dev-python/pygccxml/pygccxml-1.0.0.ebuild
+++ b/dev-python/pygccxml/pygccxml-1.0.0.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=5
+
 PYTHON_COMPAT=( python2_7 )
 
 inherit distutils-r1
@@ -16,14 +17,13 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="doc examples"
 
-DEPEND="doc? ( >=dev-python/epydoc-3[${PYTHON_USEDEP}] )
-	app-arch/unzip"
+DEPEND="
+	app-arch/unzip
+	doc? ( >=dev-python/epydoc-3[${PYTHON_USEDEP}] )"
 RDEPEND=">=dev-cpp/gccxml-0.6"
 
 python_compile_all() {
-	if use doc; then
-		esetup.py doc || die
-	fi
+	use doc && esetup.py doc
 }
 
 python_test() {
diff --git a/dev-python/pyglet/Manifest b/dev-python/pyglet/Manifest
index 53188a3257b7..adce6c506fe8 100644
--- a/dev-python/pyglet/Manifest
+++ b/dev-python/pyglet/Manifest
@@ -1,3 +1,4 @@
 DIST pyglet-1.1.4.tar.gz 2946601 SHA256 1d9b2a5e3a37a9068aee70100d19bfa83a6bbf6d4a2af8adb4231a601a101611 SHA512 26e1b652bd0e2666014bd29c4456570eee5fdbcce694f49f424fdab3583d0fb67d835e9f0e09f0459dc65cf3c042fffbfbeb321b286890be03260c9ee30bf187 WHIRLPOOL 89424736a0da9abd62813159ff6367b2c536b9cbfe63aaaf1733c712161453a77b3086ca0f4a840a1f682f2bd5334e0decb28d71b7dc187135a799c711ce6afc
 DIST pyglet-1.2.2.tar.gz 2120758 SHA256 6b54c3881a5eb086f2733c24aada1b65625b45b36172cd7f63fbde2cf43138df SHA512 012dcf6f62a823a391f7ac81b4a6dc89cf2bfd1f3f895dfa115011efdcbd1327821a11c47d455ed4e2a3edbd041f8a5e5b3c5f27b336a6c4d17c028a8999dc69 WHIRLPOOL ab2f402076b2aed110cde901e49b003e336eb634ad8b3f084dd1a980a1079959639ec1773b3106185f443a50ed6db39c833133442b002a64d9254285372bcdb5
 DIST pyglet-1.2.3.tar.gz 2121343 SHA256 06c857039420bd21baad35fac99dca7f97951350c2df5a79bdcf89eb708907cb SHA512 dbc766b382b1fa79205d9777e8dcc0ecfa00d312671f10d4e9580ae648997d4a41db8bffc072893109df6772fa8d72c8fdf128e0421d992d14332fac11d4d4c4 WHIRLPOOL 38d23907825312d1140a294d6ec3152e373ae466a73766a067f8362937d48bc7be14b9f847cc3386a41adb927196fda4cdc62fb8d9f7d0c9ea9ec548f6213afc
+DIST pyglet-1.2.4.tar.gz 2122017 SHA256 9f62ffbbcf2b202d084bf158685e77d28b8f4f5f2738f4c5e63a947a07503445 SHA512 70cd781936db8c8c156499e524ee73520bc90c19461074264abd62a4854307ef090af5faba521686f247fb4cbee552a428892f59a5b382429acfc000f4c2e22d WHIRLPOOL 24aa15be5819d659274a65eb39a3dcc44c74ddab3d48f8755d1a927427ce4bf05e07b6ebc3a92e1b06e8a1de97f599cb52c506732d3ec6a8a76346c9efd241c9
diff --git a/dev-python/pyglet/pyglet-1.2.4.ebuild b/dev-python/pyglet/pyglet-1.2.4.ebuild
new file mode 100644
index 000000000000..e4d237ce7670
--- /dev/null
+++ b/dev-python/pyglet/pyglet-1.2.4.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4} )
+
+inherit distutils-r1 virtualx
+
+DESCRIPTION="Cross-platform windowing and multimedia library for Python"
+HOMEPAGE="http://www.pyglet.org/"
+SRC_URI="
+	mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
+	https://pyglet.googlecode.com/files/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="alsa examples gtk +openal"
+
+RDEPEND="
+	virtual/opengl
+	alsa? ( media-libs/alsa-lib[alisp] )
+	gtk? ( x11-libs/gtk+:2 )
+	openal? ( media-libs/openal )"
+DEPEND="${RDEPEND}"
+#	ffmpeg? ( media-libs/avbin-bin )
+
+# pyglet.gl.glx_info.GLXInfoException: pyglet requires an X server with GLX
+RESTRICT=test
+
+python_test() {
+	python_is_python3 && return
+	VIRTUALX_COMMAND="${PYTHON}"
+	virtualmake tests/test.py
+}
+
+python_install_all() {
+	DOCS=( NOTICE )
+	use examples && EXAMPLES=( examples )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pygobject/pygobject-3.16.2.ebuild b/dev-python/pygobject/pygobject-3.16.2.ebuild
index e5610c23cd41..fb35df5c7190 100644
--- a/dev-python/pygobject/pygobject-3.16.2.ebuild
+++ b/dev-python/pygobject/pygobject-3.16.2.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/PyGObject"
 
 LICENSE="LGPL-2.1+"
 SLOT="3"
-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 ~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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="+cairo examples test +threads"
 
 REQUIRED_USE="
diff --git a/dev-python/pygraphviz/Manifest b/dev-python/pygraphviz/Manifest
index 68e8904f10fa..bece6bf1af78 100644
--- a/dev-python/pygraphviz/Manifest
+++ b/dev-python/pygraphviz/Manifest
@@ -1 +1,2 @@
 DIST pygraphviz-1.2.tar.gz 90913 SHA256 2e8a82a07dcf006b9558d22c5a6357c012193d4cc681776845e515fffeccc6b3 SHA512 e477af635594c3ba1aa6fa499bc5e60df14e76616a1a777f648e2e96d3953dd3d0b3bae4a92275dac2f7466276cf526ecb8b6a63fd3fbad26ee24b67d76ecfa3 WHIRLPOOL 2757d02b130f326ee2638b78761094de1a841293b6de1d5ea2c89c169cbc8525041e06daef9ded32d7c1ac944ef99293ab67fee6c75a2976283f87725635a4d5
+DIST pygraphviz-1.3.1.tar.gz 103336 SHA256 7c294cbc9d88946be671cc0d8602aac176d8c56695c0a7d871eadea75a958408 SHA512 e1957d7daf7ae9e60873cb6f23ac19a3320b4b10579ab24a2307beb558dad11a8e82e1da528799165b761d944efb4860b7296e3218846f7885f715c396a8e3dc WHIRLPOOL dd4ac48c4e4c05a134a6ba076979f9dc1ea7fab03700208aedf9cd6acf3fb5595a26b3a0f1de8d46a61750dea60a6e31f180719cb51b1e916ecc677dde61a618
diff --git a/dev-python/pygraphviz/files/pygraphviz-1.3.1-docs.patch b/dev-python/pygraphviz/files/pygraphviz-1.3.1-docs.patch
new file mode 100644
index 000000000000..aed5c9075b88
--- /dev/null
+++ b/dev-python/pygraphviz/files/pygraphviz-1.3.1-docs.patch
@@ -0,0 +1,29 @@
+ setup.py | 8 --------
+ 1 file changed, 8 deletions(-)
+
+diff --git a/setup.py b/setup.py
+index fc0a96f..98b7f58 100644
+--- a/setup.py
++++ b/setup.py
+@@ -36,13 +36,6 @@ release.write_versionfile()
+ sys.path.pop(0)
+ 
+ packages = ["pygraphviz", "pygraphviz.tests"]
+-docdirbase = 'share/doc/pygraphviz-%s' % release.version
+-data = [
+-    (docdirbase, glob("*.txt")),
+-    (os.path.join(docdirbase, 'examples'), glob("examples/*.py")),
+-    (os.path.join(docdirbase, 'examples'), glob("examples/*.dat")),
+-    (os.path.join(docdirbase, 'examples'), glob("examples/*.dat.gz")),
+-]
+ package_data = {'': ['*.txt'], }
+ 
+ if __name__ == "__main__":
+@@ -75,7 +68,6 @@ if __name__ == "__main__":
+         download_url=release.download_url,
+         classifiers=release.classifiers,
+         packages=packages,
+-        data_files=data,
+         ext_modules=extension,
+         cmdclass={
+             'install': AddExtensionInstallCommand,
diff --git a/dev-python/pygraphviz/files/pygraphviz-1.3.1-swig-3.patch b/dev-python/pygraphviz/files/pygraphviz-1.3.1-swig-3.patch
new file mode 100644
index 000000000000..912667e7f5a7
--- /dev/null
+++ b/dev-python/pygraphviz/files/pygraphviz-1.3.1-swig-3.patch
@@ -0,0 +1,23 @@
+ pygraphviz/graphviz.i | 12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/pygraphviz/graphviz.i b/pygraphviz/graphviz.i
+index 0d9b43b..5f1f6b0 100644
+--- a/pygraphviz/graphviz.i
++++ b/pygraphviz/graphviz.i
+@@ -1,9 +1,9 @@
+-#    Copyright (C) 2004-2006 by 
+-#    Aric Hagberg <hagberg@lanl.gov>
+-#    Dan Schult <dschult@colgate.edu>
+-#    Manos Renieris, http://www.cs.brown.edu/~er/
+-#    Distributed with BSD license.     
+-#    All rights reserved, see LICENSE for details.
++//    Copyright (C) 2004-2006 by 
++//    Aric Hagberg <hagberg@lanl.gov>
++//    Dan Schult <dschult@colgate.edu>
++//    Manos Renieris, http://www.cs.brown.edu/~er/
++//    Distributed with BSD license.     
++//    All rights reserved, see LICENSE for details.
+ 
+ %module graphviz
+ 
diff --git a/dev-python/pygraphviz/pygraphviz-1.3.1.ebuild b/dev-python/pygraphviz/pygraphviz-1.3.1.ebuild
new file mode 100644
index 000000000000..376cf2d9dad7
--- /dev/null
+++ b/dev-python/pygraphviz/pygraphviz-1.3.1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python wrapper for the Graphviz Agraph data structure"
+HOMEPAGE="http://networkx.lanl.gov/pygraphviz/ https://pypi.python.org/pypi/pygraphviz"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="examples test"
+
+# Note: only C API of graphviz is used, PYTHON_USEDEP unnecessary.
+RDEPEND="media-gfx/graphviz"
+DEPEND="${RDEPEND}
+	dev-lang/swig:0
+	test? (
+		dev-python/doctest-ignore-unicode[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-docs.patch
+	"${FILESDIR}"/${P}-swig-3.patch
+)
+
+python_prepare_all() {
+	distutils-r1_python_prepare_all
+	swig -python pygraphviz/graphviz.i || die
+}
+
+python_test() {
+	PYTHONPATH=${PYTHONPATH}:${BUILD_DIR}/lib/pygraphviz \
+		nosetests -c setup.cfg -x -v || die
+}
+
+python_install_all() {
+	use examples && local EXAMPLES=( examples/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pylast/metadata.xml b/dev-python/pylast/metadata.xml
index 4bdf9326e9c3..1ef6ae53cee8 100644
--- a/dev-python/pylast/metadata.xml
+++ b/dev-python/pylast/metadata.xml
@@ -21,5 +21,6 @@ Features:
 	</longdescription>
   <upstream>
     <remote-id type="pypi">pylast</remote-id>
+    <remote-id type="github">pylast/pylast</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-python/pyminuit/metadata.xml b/dev-python/pyminuit/metadata.xml
index 7bc6ee8ea837..4aae24e5aed0 100644
--- a/dev-python/pyminuit/metadata.xml
+++ b/dev-python/pyminuit/metadata.xml
@@ -5,4 +5,7 @@
     <email>jlec@gentoo.org</email>
     <name>Justin Lecher</name>
   </maintainer>
+  <upstream>
+    <remote-id type="github">jpivarski/pyminuit</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-python/pyodbc/metadata.xml b/dev-python/pyodbc/metadata.xml
index cdef949fdd00..89f9d1846231 100644
--- a/dev-python/pyodbc/metadata.xml
+++ b/dev-python/pyodbc/metadata.xml
@@ -8,5 +8,6 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="google-code">pyodbc</remote-id>
+		<remote-id type="github">mkleehammer/pyodbc</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/pyro/Manifest b/dev-python/pyro/Manifest
index 4ce71be4c390..8181f84396a6 100644
--- a/dev-python/pyro/Manifest
+++ b/dev-python/pyro/Manifest
@@ -1,2 +1,3 @@
 DIST Pyro-3.16.tar.gz 298769 SHA256 1bed508453ef7a7556b51424a58101af2349b662baab7e7331c5cb85dbe7e578 SHA512 d0e4ae93120a6566a2b06fa52b66e20daa972324a9d57d639ca68171e1e6e5c412250f7e6af3fc307631d2270be3731ea5898ad35819dc0369e6a2d8341d5965 WHIRLPOOL 0d7efcead6bc7a31a690c012a4213c835d43ca932e461ab25ddb2e12636970de2c3da6feb4915385bdadaf2261558d2041d5e6dad9899f11e450aa0a065460da
 DIST Pyro4-4.25.tar.gz 295993 SHA256 ac2b0123badcb76c63eb716fcd95e0ee4021d345b5db05fda19253c59e39b384 SHA512 9a112e679a304d250549701d9a1baef0df6d3ea6f1eec559e7c433eab7ab09155c9ae440817f844be073f69dc8bf93836d48930b1d91311eaf6ab7e91c0a4faf WHIRLPOOL aa767569948af1cf222b95fa114d4dee08b601296f8be1ed9bce86502f1c9eeedf05930215da192ab9d237d740283f88a5f7efe1f53291acd1b90b51099a1801
+DIST Pyro4-4.39.tar.gz 496566 SHA256 39c6ca7f86b0f0bebfeada687a5a8b99f66470a52b0f815195ae63c683266f24 SHA512 ac303401abe997b7ce0914a804538dcee9195bbe3fe1d07cf18be0592cbb4dbd161413e8d7a696a8dc1e29ff64fe98877ea1fa9811d9961340441cf414f31d98 WHIRLPOOL fc4377552f9e5f5666671d909b7c071095933625baea891535c976f735dab8f3d1b5b3f0132be2fcf9a003024d874a88ddd092b127127c0376807a1d2894d393
diff --git a/dev-python/pyro/metadata.xml b/dev-python/pyro/metadata.xml
index 5699b06419b1..60a3bab67c34 100644
--- a/dev-python/pyro/metadata.xml
+++ b/dev-python/pyro/metadata.xml
@@ -8,5 +8,6 @@
   </maintainer>
   <upstream>
     <remote-id type="pypi">Pyro</remote-id>
+    <remote-id type="github">irmen/Pyro4</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-python/pyro/pyro-4.39.ebuild b/dev-python/pyro/pyro-4.39.ebuild
new file mode 100644
index 000000000000..3ca6320e05e5
--- /dev/null
+++ b/dev-python/pyro/pyro-4.39.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
+
+inherit distutils-r1
+
+MY_PN="Pyro4"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Advanced and powerful Distributed Object Technology system written entirely in Python"
+HOMEPAGE="http://www.xs4all.nl/~irmen/pyro/ https://pypi.python.org/pypi/Pyro4 https://github.com/irmen/Pyro4"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="4"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc examples test"
+
+RDEPEND="!dev-python/pyro:0
+	>=dev-python/serpent-1.11[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/coverage[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+	)"
+
+S="${WORKDIR}/${MY_P}"
+DISTUTILS_IN_SOURCE_BUILD=1
+
+python_prepare_all() {
+	sed \
+		-e '/sys.path.insert/a sys.path.insert(1,"PyroTests")' \
+		-i tests/run_testsuite.py || die
+
+	# Disable tests requiring network connection.
+	sed \
+		-e "s/testBCstart/_&/" \
+		-e "s/testDaemonPyroObj/_&/" \
+		-e "s/testLookupAndRegister/_&/" \
+		-e "s/testMulti/_&/" \
+		-e "s/testRefuseDottedNames/_&/" \
+		-e "s/testResolve/_&/" \
+		-e "s/testBCLookup/_&/" \
+		-i tests/PyroTests/test_naming.py || die
+	sed \
+		-e "s/testOwnloopBasics/_&/" \
+		-e "s/testStartNSfunc/_&/" \
+		-i tests/PyroTests/test_naming2.py || die
+
+	sed \
+		-e "s/testServerConnections/_&/" \
+	    -e "s/testServerParallelism/_&/" \
+		-i tests/PyroTests/test_server.py || die
+
+	sed \
+		-e "s/testBroadcast/_&/" \
+		-e "s/testGetIP/_&/" \
+		-e "s/testGetIpVersion[46]/_&/" \
+		-i tests/PyroTests/test_socket.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	cd "${S}"/tests || die
+	${PYTHON} -E run_testsuite.py || die
+}
+
+python_install_all() {
+	use doc && HTML_DOCS=( docs/. )
+	use examples && local EXAMPLES=( examples/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pysendfile/metadata.xml b/dev-python/pysendfile/metadata.xml
index 6814dded9e08..be8676d8f559 100644
--- a/dev-python/pysendfile/metadata.xml
+++ b/dev-python/pysendfile/metadata.xml
@@ -4,5 +4,6 @@
   <herd>openstack</herd>
   <upstream>
     <remote-id type="pypi">pysendfile</remote-id>
+    <remote-id type="github">giampaolo/pysendfile</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-python/pystdf/metadata.xml b/dev-python/pystdf/metadata.xml
index ff8ea3bb9d22..446f808ecd61 100644
--- a/dev-python/pystdf/metadata.xml
+++ b/dev-python/pystdf/metadata.xml
@@ -6,5 +6,6 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="google-code">pystdf</remote-id>
+		<remote-id type="github">cmars/pystdf</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/pytest-cache/Manifest b/dev-python/pytest-cache/Manifest
new file mode 100644
index 000000000000..a6d0a3dfe025
--- /dev/null
+++ b/dev-python/pytest-cache/Manifest
@@ -0,0 +1 @@
+DIST pytest-cache-1.0.tar.gz 16242 SHA256 be7468edd4d3d83f1e844959fd6e3fd28e77a481440a7118d430130ea31b07a9 SHA512 55eb66718a45fb0ad8931780d96fa4715cf0d9f2568be2a1b08b3399d391b818a7ae8b2afeb74b50aaf8ec8f7f0d8da8e7a7483845a50e884822ca6ddbca03ea WHIRLPOOL f1610e5ae8505abc6f6175d029c5afb9e3fbc7d10ba31379305752ebd941209514a054e34d36c794270d4a9eb0001c71aeea9700431798f54a1b40013a3d77a2
diff --git a/dev-python/pytest-cache/metadata.xml b/dev-python/pytest-cache/metadata.xml
new file mode 100644
index 000000000000..f54c58057228
--- /dev/null
+++ b/dev-python/pytest-cache/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>python</herd>
+	<maintainer>
+		<email>jlec@gentoo.org</email>
+		<name>Justin Lecher</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">pxml</remote-id>
+		<remote-id type="github">metagriffin/pxml</remote-id>
+		<remote-id type="bitbucket">hpk42/pytest-cache</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/pytest-cache/pytest-cache-1.0.ebuild b/dev-python/pytest-cache/pytest-cache-1.0.ebuild
new file mode 100644
index 000000000000..6cf0b751da4b
--- /dev/null
+++ b/dev-python/pytest-cache/pytest-cache-1.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="mechanisms for caching across test runs"
+HOMEPAGE="https://pypi.python.org/pypi/pytest-cache http://bitbucket.org/hpk42/pytest-cache/ http://pythonhosted.org/pytest-cache/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	"
diff --git a/dev-python/pytest-capturelog/pytest-capturelog-0.7.ebuild b/dev-python/pytest-capturelog/pytest-capturelog-0.7.ebuild
index 334222ed0840..925df1f5c417 100644
--- a/dev-python/pytest-capturelog/pytest-capturelog-0.7.ebuild
+++ b/dev-python/pytest-capturelog/pytest-capturelog-0.7.ebuild
@@ -3,7 +3,8 @@
 # $Id$
 
 EAPI=5
-PYTHON_COMPAT=(python{2_7,3_3,3_4})
+
+PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy pypy3 )
 
 inherit distutils-r1
 
@@ -13,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="dev-python/py[${PYTHON_USEDEP}]"
diff --git a/dev-python/pytest-cov/Manifest b/dev-python/pytest-cov/Manifest
index ef90131da9c0..c8d88b6ccf1c 100644
--- a/dev-python/pytest-cov/Manifest
+++ b/dev-python/pytest-cov/Manifest
@@ -1,2 +1,3 @@
 DIST pytest-cov-1.6.tar.gz 8257 SHA256 2e803c89f11e0344111670349f6ef401f831e85cbd287b0c5d61917da5aac454 SHA512 36c18e8e731613f2412e8e377f1911704d4af23a82fe66b822547850c3343204f682d3464c97f2cb4360f5090e7a58e5ac9679e83ae90adc0ccdb5b0e467430f WHIRLPOOL 41543b2e7f61d61d754bfef4c307fc135ab0d69b10d9e057f64bd3f4cacbc6e47316e478dbd797dd7aea0a8360bad5cc183214c742c749991fd5fe73b96503f2
 DIST pytest-cov-1.8.1.tar.gz 8649 SHA256 31e5198c06f290e1e813d30ddd063a0401d9e3a698129ca44267781673a71285 SHA512 dff6c6345bdc2d219800782d7acb3d301c8d67314f0f4af983daa0942a8c97768a2ce6c64f11529a3d8d876c218c62dbf08b7a63cc7345072e70bbc85ad4d112 WHIRLPOOL 90f024e0388323a5d1bd8ffd439c3c6cfb242ac2f539d391f4139a6ab2e251c6ff01831e9a261506d2c1552f1beeacc99db43d3b98a3663828083fec1ae722f8
+DIST pytest-cov-2.1.0.tar.gz 25992 SHA256 6e86c3ae3be9930fa3f1402651819b00169fb5e963d29ed03d390d152a608506 SHA512 f763e611b19f6769183583d275e28467f7cc5cc8a8fe5a4d3eb798ddf8d4e008732ec8c29b757aaf0fba0f5a660d92729499f3d388693f631ba73cc7a570d738 WHIRLPOOL 1ece60dea2fc1ff2da342313a0e67ee63a63cf35ece930f92b59c2283522698df0be4c10fb6951d3afff9fb1acffd37d207dcc4f0400109cb4f8c830d69a5857
diff --git a/dev-python/pytest-cov/pytest-cov-2.1.0.ebuild b/dev-python/pytest-cov/pytest-cov-2.1.0.ebuild
new file mode 100644
index 000000000000..05fe3675c4c9
--- /dev/null
+++ b/dev-python/pytest-cov/pytest-cov-2.1.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+PYTHON_COMPAT=( python{2_7,3_{3,4}} pypy pypy3 )
+inherit distutils-r1
+
+DESCRIPTION="py.test plugin for coverage reporting"
+HOMEPAGE="https://bitbucket.org/memedough/pytest-cov/overview"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND="
+	>=dev-python/py-1.4.22[${PYTHON_USEDEP}]
+	>=dev-python/pytest-2.6.0[${PYTHON_USEDEP}]
+	>=dev-python/cov-core-1.14.0[${PYTHON_USEDEP}]
+	>=dev-python/coverage-3.7.1[${PYTHON_USEDEP}]
+	<dev-python/coverage-4[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/virtualenv[${PYTHON_USEDEP}]
+		dev-python/process-tests[${PYTHON_USEDEP}]
+		dev-python/pytest-cache[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+		dev-python/pytest-capturelog[${PYTHON_USEDEP}]
+		)"
+
+python_test() {
+	PYTHONPATH="${S}/tests:${BUILD_DIR}/lib" \
+		py.test -vv || die
+}
diff --git a/dev-python/pytest-django/metadata.xml b/dev-python/pytest-django/metadata.xml
index cdf82d15f553..76d6d5348b29 100644
--- a/dev-python/pytest-django/metadata.xml
+++ b/dev-python/pytest-django/metadata.xml
@@ -6,4 +6,8 @@
 		<email>jlec@gentoo.org</email>
 		<name>Justin Lecher</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="pypi">pytest-django</remote-id>
+		<remote-id type="github">pytest-dev/pytest-django</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/pytest-pythonpath/metadata.xml b/dev-python/pytest-pythonpath/metadata.xml
index cdf82d15f553..6243a43f393a 100644
--- a/dev-python/pytest-pythonpath/metadata.xml
+++ b/dev-python/pytest-pythonpath/metadata.xml
@@ -6,4 +6,8 @@
 		<email>jlec@gentoo.org</email>
 		<name>Justin Lecher</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="pypi">pytest-pythonpath</remote-id>
+		<remote-id type="github">bigsassy/pytest-pythonpath</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/pytest-xdist/Manifest b/dev-python/pytest-xdist/Manifest
new file mode 100644
index 000000000000..2a22275319ee
--- /dev/null
+++ b/dev-python/pytest-xdist/Manifest
@@ -0,0 +1 @@
+DIST pytest-xdist-1.13.1.tar.gz 110007 SHA256 4382d7a944c1e2b1dc17fee3fd3575495fb10236a3b6e95cc6955db04984bc3c SHA512 3bb295c0afbcb0f238bdd41dfd1a395f0ba16b8151643aecc25aae13ac7c58d36d26ff4bab197673a9679d1f3436acd05b5ff50107b3128e647de892a6d04e3f WHIRLPOOL 643b23c755eb43c7b6965e588b58547c9ef63d3c225cddb97868c659ab3234bc6bc204575bc48c7f18a498cb0e595b8550928ba92ec5945a936e959f773504b3
diff --git a/dev-python/pytest-xdist/metadata.xml b/dev-python/pytest-xdist/metadata.xml
new file mode 100644
index 000000000000..54c737351551
--- /dev/null
+++ b/dev-python/pytest-xdist/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>python</herd>
+	<maintainer>
+		<email>jlec@gentoo.org</email>
+		<name>Justin Lecher</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">pxml</remote-id>
+		<remote-id type="github">metagriffin/pxml</remote-id>
+		<remote-id type="bitbucket">pytest-dev/pytest-xdist</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/pytest-xdist/pytest-xdist-1.13.1.ebuild b/dev-python/pytest-xdist/pytest-xdist-1.13.1.ebuild
new file mode 100644
index 000000000000..d6fc2826fc9e
--- /dev/null
+++ b/dev-python/pytest-xdist/pytest-xdist-1.13.1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Distributed testing and loop-on-failing modes"
+HOMEPAGE="https://pypi.python.org/pypi/pytest-xdist https://bitbucket.org/pytest-dev/pytest-xdist"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="
+	>=dev-python/execnet-1.1[${PYTHON_USEDEP}]
+	>=dev-python/pytest-2.4.2[${PYTHON_USEDEP}]
+	>=dev-python/py-1.4.22[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	"
+
+python_test() {
+	find -name __pycache__ -exec rm -r '{}' + || die
+	py.test -vv || die
+}
diff --git a/dev-python/python-application/Manifest b/dev-python/python-application/Manifest
new file mode 100644
index 000000000000..eda074bffdc6
--- /dev/null
+++ b/dev-python/python-application/Manifest
@@ -0,0 +1 @@
+DIST python-application-1.5.0.tar.gz 43552 SHA256 9bc00c2c639bf633e2c5e08d4bf1bb5d7edaad6ccdd473692f0362df08f8aafc SHA512 9bf683a88bfb11ab5cf86b2d1ef86e22cf6fcb6004f0059b1d3cb2e1cde46827ced57a1cdd313c1d48dbd1ad610e9d36617619f79af748c55c517089720cb2b1 WHIRLPOOL 321411f6f33d29f2847accc805c78bbca3dc255e4768954d75904cea7f3843d2ff15f51bcc62706d8b6101b61d5e9d294968e607ff63f22a75982b00e8850f3a
diff --git a/dev-python/python-application/metadata.xml b/dev-python/python-application/metadata.xml
new file mode 100644
index 000000000000..91adab3be3ef
--- /dev/null
+++ b/dev-python/python-application/metadata.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>python</herd>
+	<maintainer>
+		<email>hasufell@gentoo.org</email>
+		<name>Julian Ospald</name>
+	</maintainer>
+	<longdescription lang="en">
+		This package is a collection of modules that are useful when
+		building python applications. Their purpose is to eliminate the
+		need to divert resources into implementing the small tasks that
+		every application needs to do in order to run successfully and
+		focus instead on the application logic itself.
+
+		The modules that the application package provides are:
+		1. process - UNIX process and signal management.
+		2. python - python utility classes and functions.
+		3. configuration - a simple interface to handle configuration files.
+		4. log - an extensible system logger for console and syslog.
+		5. debug - memory troubleshooting and execution timing.
+		6. system - interaction with the underlying operating system.
+		7. notification - an application wide notification system.
+		8. version - manage version numbers for applications and packages.
+		9. dependency - verify package dependencies at runtime.
+	</longdescription>
+	<upstream>
+		<remote-id type="pypi">python-application</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/python-application/python-application-1.5.0.ebuild b/dev-python/python-application/python-application-1.5.0.ebuild
new file mode 100644
index 000000000000..23a3e8bf5e29
--- /dev/null
+++ b/dev-python/python-application/python-application-1.5.0.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
+
+inherit distutils-r1
+
+DESCRIPTION="Basic building blocks for python applications"
+HOMEPAGE="http://ag-projects.com/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2"
+SLOT="0"
+IUSE=""
+
+KEYWORDS="~amd64 ~x86"
diff --git a/dev-python/python-cjson/Manifest b/dev-python/python-cjson/Manifest
new file mode 100644
index 000000000000..8f27ee03fac4
--- /dev/null
+++ b/dev-python/python-cjson/Manifest
@@ -0,0 +1,2 @@
+DIST python-cjson-1.1.0.tar.gz 12298 SHA256 a01fabb7593728c3d851e1cd9a3efbd18f72650a31a5aa8a74018640da3de8b3 SHA512 039e5f724c3a49d0043f788b0634c4191a6ae5abaa012d8491622e5a9ac22ecc5a342a0243f70b0ac02c8640243aaf8b0cf20a0ab12ee4866d9af966d73c1706 WHIRLPOOL 509817683798ef7e9dd7a22c13bff52ce5eb48cdf4aed996603b89fe8d8270e24e90f240adcd14efd1d5326c45edb4f440269e32b7bcb445409a83d44baf067f
+EBUILD python-cjson-1.1.0.ebuild 580 SHA256 ebf8ea33fffacc8f3993319e4f1e28a51abf951e0d4bf804791ee26597c13fe8 SHA512 191bac2ca1396427f932b554bda9c978c6bdbb2318f992ebe2f2fc355f8e54eb7ec1ebb25d4be773aaede9a357dd1ab9c34a29aad19ca6d729e928078a515690 WHIRLPOOL d10bd60c40525345ac62b8ff20d1e19c1709965d6e0963c5207114edd4e66c831c85cc4349e13cb819539b1bab2a7ccadd2cb77c965acd40e36e79a1848ffe0c
diff --git a/dev-python/python-cjson/metadata.xml b/dev-python/python-cjson/metadata.xml
new file mode 100644
index 000000000000..2018cab26b22
--- /dev/null
+++ b/dev-python/python-cjson/metadata.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>python</herd>
+	<maintainer>
+		<email>hasufell@gentoo.org</email>
+		<name>Julian Ospald</name>
+	</maintainer>
+	<longdescription lang="en">
+		This module implements a very fast JSON encoder/decoder for Python.
+
+		JSON stands for JavaScript Object Notation and is a text based
+		lightweight data exchange format which is easy for humans to
+		read/write and for machines to parse/generate. JSON is completely
+		language independent and has multiple implementations in most of
+		the programming languages, making it ideal for data exchange and
+		storage.
+
+		The module is written in C and it is up to 250 times faster when
+		compared to the other python JSON implementations which are written
+		directly in python. This speed gain varies with the complexity of
+		the data and the operation and is the the range of 10-200 times for
+		encoding operations and in the range of 100-250 times for decoding
+		operations.
+	</longdescription>
+	<upstream>
+		<remote-id type="pypi">python-cjson</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/python-cjson/python-cjson-1.1.0.ebuild b/dev-python/python-cjson/python-cjson-1.1.0.ebuild
new file mode 100644
index 000000000000..cb2dfd70af26
--- /dev/null
+++ b/dev-python/python-cjson/python-cjson-1.1.0.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Fast JSON encoder/decoder for Python"
+HOMEPAGE="http://ag-projects.com/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2+"
+SLOT="0"
+IUSE=""
+
+KEYWORDS="~amd64 ~x86"
diff --git a/dev-python/python-eventlib/Manifest b/dev-python/python-eventlib/Manifest
new file mode 100644
index 000000000000..6ce51e624262
--- /dev/null
+++ b/dev-python/python-eventlib/Manifest
@@ -0,0 +1 @@
+DIST python-eventlib-0.2.1.tar.gz 189314 SHA256 25224794420f430946fe46932718b521a6264903fe8c0ed3563dfdb844c623e7 SHA512 f1ca3c6eb54677068ec209386f09c695c141b08e148475ee3cc69e667dd96af3637a66660e9105a195620f3bde10d4b18087612c501764d52413982c2721e1a6 WHIRLPOOL a95ac7283d1425161d190c17ceb7d58ff81a3ec9aa09066226c177a4d7343c2f99ea19c7866d4a03d281241337efa877020c85956c7c81cfb0444e457fda9f9f
diff --git a/dev-python/python-eventlib/files/python-eventlib-0.2.1-libressl.patch b/dev-python/python-eventlib/files/python-eventlib-0.2.1-libressl.patch
new file mode 100644
index 000000000000..faa410352627
--- /dev/null
+++ b/dev-python/python-eventlib/files/python-eventlib-0.2.1-libressl.patch
@@ -0,0 +1,14 @@
+From: Julian Ospald <hasufell@gentoo.org>
+Date: Tue Sep  8 01:22:40 UTC 2015
+Subject: fix compatibility with libressl
+
+--- a/eventlib/green/socket.py
++++ b/eventlib/green/socket.py
+@@ -89,7 +89,6 @@
+ else:
+     # some constants the SSL module exports but not in __all__
+     from eventlib.green.ssl import (RAND_add,
+-                                    RAND_egd,
+                                     RAND_status,
+                                     SSL_ERROR_ZERO_RETURN,
+                                     SSL_ERROR_WANT_READ,
diff --git a/dev-python/python-eventlib/metadata.xml b/dev-python/python-eventlib/metadata.xml
new file mode 100644
index 000000000000..a841434212dc
--- /dev/null
+++ b/dev-python/python-eventlib/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>python</herd>
+	<maintainer>
+		<email>hasufell@gentoo.org</email>
+		<name>Julian Ospald</name>
+	</maintainer>
+	<longdescription lang="en">
+		Eventlib is a networking library written in Python. It achieves
+		high scalability by using non-blocking io while at the same time
+		retaining high programmer usability by using coroutines to make
+		the non-blocking io operations appear blocking at the source code
+		level.
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-python/python-eventlib/python-eventlib-0.2.1.ebuild b/dev-python/python-eventlib/python-eventlib-0.2.1.ebuild
new file mode 100644
index 000000000000..e5be68ebf75c
--- /dev/null
+++ b/dev-python/python-eventlib/python-eventlib-0.2.1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+PYTHON_REQ_USE="ssl"
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Coroutine-based networking library"
+HOMEPAGE="http://sipsimpleclient.org"
+SRC_URI="http://download.ag-projects.com/SipClient/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+IUSE=""
+
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/greenlet[${PYTHON_USEDEP}]
+	dev-python/twisted-core[${PYTHON_USEDEP}]
+"
+
+PATCHES=( "${FILESDIR}/${P}-libressl.patch" )
diff --git a/dev-python/python-gflags/metadata.xml b/dev-python/python-gflags/metadata.xml
index acab986467bf..e79cd6bb6473 100644
--- a/dev-python/python-gflags/metadata.xml
+++ b/dev-python/python-gflags/metadata.xml
@@ -4,5 +4,6 @@
 	<herd>python</herd>
 	<upstream>
 		<remote-id type="google-code">python-gflags</remote-id>
+		<remote-id type="github">gflags/python-gflags</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/python-gnutls/Manifest b/dev-python/python-gnutls/Manifest
new file mode 100644
index 000000000000..98c57a6ec821
--- /dev/null
+++ b/dev-python/python-gnutls/Manifest
@@ -0,0 +1 @@
+DIST python-gnutls-2.0.1.tar.gz 42560 SHA256 d8fb368c6a4dd58bc6cd5e61d4a12d119c4506fd344a371b3429b3ac2623b9ac SHA512 6dca8ba9e98e76add30502825f5711e3bc6f22b2a1e28416a3c1acacec41eb45e4e2f63c0185fa10f8e518df41f1093ba33ab33a5f69dd25300e17db1022b3df WHIRLPOOL 6094b85c04f3ea75d76c4e51b90a81f056ecd8e495d1670f2e5bb728b4047a6ef1fdedeeb2cf3f3be856d77f8f2306f5e2b257c233029597741028d162bb5a02
diff --git a/dev-python/python-gnutls/metadata.xml b/dev-python/python-gnutls/metadata.xml
new file mode 100644
index 000000000000..a1b5a57c78d6
--- /dev/null
+++ b/dev-python/python-gnutls/metadata.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>python</herd>
+	<maintainer>
+		<email>hasufell@gentoo.org</email>
+		<name>Julian Ospald</name>
+	</maintainer>
+	<longdescription lang="en">
+		This package provides a high level object oriented wrapper around
+		libgnutls, as well as low level bindings to the GNUTLS types and
+		functions via ctypes. The high level wrapper hides the details of
+		accessing the GNUTLS library via ctypes behind a set of classes that
+		encapsulate GNUTLS sessions, certificates and credentials and expose
+		them to python applications using a simple API.
+
+		The package also includes a Twisted interface that has seamless
+		intergration with Twisted, providing connectTLS and listenTLS methods
+		on the Twisted reactor once imported (the methods are automatically
+		attached to the reactor by simply importing the GNUTLS Twisted
+		interface module).
+
+		The high level wrapper is written using the GNUTLS library bindings
+		that are made available via ctypes. This makes the wrapper very
+		powerful and flexible as it has direct access to all the GNUTLS
+		internals and is also very easy to extend without any need to write
+		C code or recompile anything.
+	</longdescription>
+	<upstream>
+		<remote-id type="pypi">python-gnutls</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/python-gnutls/python-gnutls-2.0.1.ebuild b/dev-python/python-gnutls/python-gnutls-2.0.1.ebuild
new file mode 100644
index 000000000000..8179f60a87a0
--- /dev/null
+++ b/dev-python/python-gnutls/python-gnutls-2.0.1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
+
+inherit distutils-r1
+
+DESCRIPTION="High level object oriented wrapper around libgnutls"
+HOMEPAGE="http://ag-projects.com/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2+"
+SLOT="0"
+IUSE=""
+
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="net-libs/gnutls"
diff --git a/dev-python/python-ldap/python-ldap-2.4.19.ebuild b/dev-python/python-ldap/python-ldap-2.4.19.ebuild
index 40b034783984..a5cc7a2de16f 100644
--- a/dev-python/python-ldap/python-ldap-2.4.19.ebuild
+++ b/dev-python/python-ldap/python-ldap-2.4.19.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="PSF-2"
 SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ~ppc ppc64 ~sparc x86 ~x86-fbsd ~x86-solaris"
+KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~x86-solaris"
 IUSE="doc examples sasl ssl"
 
 # If you need support for openldap-2.3.x, please use python-ldap-2.3.9.
diff --git a/dev-python/python-memcached/metadata.xml b/dev-python/python-memcached/metadata.xml
index 9e907d287ba4..a64a331f07f5 100644
--- a/dev-python/python-memcached/metadata.xml
+++ b/dev-python/python-memcached/metadata.xml
@@ -1,14 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>python</herd>
-<maintainer>
-<email>robbat2@gentoo.org</email>
-<name>Robin H. Johnson</name>
-</maintainer>
-<longdescription lang="en">
+	<herd>python</herd>
+	<maintainer>
+		<email>robbat2@gentoo.org</email>
+		<name>Robin H. Johnson</name>
+	</maintainer>
+	<longdescription lang="en">
 This is a Python based API (implemented in 100% python) for communicating with
 the memcached distributed memory object cache daemon.
 </longdescription>
+	<upstream>
+		<remote-id type="pypi">python-memcached</remote-id>
+	</upstream>
 </pkgmetadata>
-
diff --git a/dev-python/python-msrplib/Manifest b/dev-python/python-msrplib/Manifest
new file mode 100644
index 000000000000..bebf1f0e9dbc
--- /dev/null
+++ b/dev-python/python-msrplib/Manifest
@@ -0,0 +1 @@
+DIST python-msrplib-0.18.0.tar.gz 30234 SHA256 72901c42cf05262890e3bb5ae37364f074632d067f139a8f71e395006e79e96e SHA512 ed260b0183aff543e115951f464d0e3934862439a7c049c3d19304c543805ee364129d2a99c0d132561c8ae0af9fc19cde460723f2754e973bf68a602a18db99 WHIRLPOOL b5edc6f87546173c384452ff1636b5d61a6ac893026362fbfd039a5c80b2fdd887f3eac1220db4843b85889be83658ac46ae5535247aaac2cd63385af03afee5
diff --git a/dev-python/python-msrplib/metadata.xml b/dev-python/python-msrplib/metadata.xml
new file mode 100644
index 000000000000..5ea4fe9779f0
--- /dev/null
+++ b/dev-python/python-msrplib/metadata.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>python</herd>
+	<maintainer>
+		<email>hasufell@gentoo.org</email>
+		<name>Julian Ospald</name>
+	</maintainer>
+	<longdescription lang="en">
+		Message Session Relay Protocol (MSRP) is a protocol for transmitting a
+		series of related instant messages in the context of a session. Message
+		sessions are treated like any other media stream when set up via a
+		rendezvous or session creation protocol such as the Session Initiation
+		Protocol (SIP).
+
+		A series of related instant messages between two or more parties can be
+		viewed as part of a "message session", that is, a conversational exchange
+		of messages with a definite beginning and end. This is in contrast to
+		individual messages each sent independently. Messaging schemes that track
+		only individual messages can be described as "page-mode" messaging,
+		whereas messaging that is part of a "session" with a definite start and
+		end is called "session-mode" messaging.
+
+		Page-mode messaging is enabled in SIP via the SIP MESSAGE method, as
+		defined in RFC 3428. Session-mode messaging has a number of benefits
+		over page-mode messaging, however, such as explicit rendezvous, tighter
+		integration with other media-types, direct client-to-client operation,
+		and brokered privacy and security.
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-python/python-msrplib/python-msrplib-0.18.0.ebuild b/dev-python/python-msrplib/python-msrplib-0.18.0.ebuild
new file mode 100644
index 000000000000..6ca282d5f8e2
--- /dev/null
+++ b/dev-python/python-msrplib/python-msrplib-0.18.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Client library for MSRP protocol and its relay extension"
+HOMEPAGE="http://sipsimpleclient.org"
+SRC_URI="http://download.ag-projects.com/MSRP/python-msrplib-${PV}.tar.gz"
+
+LICENSE="LGPL-2+"
+SLOT="0"
+IUSE=""
+
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/python-application[${PYTHON_USEDEP}]
+	dev-python/python-eventlib[${PYTHON_USEDEP}]
+	dev-python/python-gnutls[${PYTHON_USEDEP}]
+	dev-python/twisted-core[${PYTHON_USEDEP}]
+	dev-python/twisted-names[${PYTHON_USEDEP}]
+"
diff --git a/dev-python/python-neutronclient/Manifest b/dev-python/python-neutronclient/Manifest
index 4f7e9f47da3c..e2c61c1ff71c 100644
--- a/dev-python/python-neutronclient/Manifest
+++ b/dev-python/python-neutronclient/Manifest
@@ -1,3 +1,4 @@
 DIST python-neutronclient-2.3.6.tar.gz 123143 SHA256 f2ae938654497e12218ca3105872a1d55c5ce06e19ed0baa8471ee024e494b1f SHA512 0d894ca7cbafe3c4f12a45e27953abdeedfeff009d96bc6852465089f64ee57f065d87067e79665a401e574100115eec8ae7bb7a220005955be4535c7a44bcb7 WHIRLPOOL d2f3aeda0894bb2f262b7761af6f64ecb80a3c15ef68fd4a6eb257446bf647e96eee5d51f692071ac776ee8c3f26ecb7314d825826070e2ddfbfcd84257e466d
 DIST python-neutronclient-2.4.0.tar.gz 137923 SHA256 4c5c3a79216c682926f75ffd8db5f4338525a643ea02de37df7bf82a1e486b28 SHA512 ce3407ec101ca0fe04da5fbb3d68e3e331824190ed6e93308e56a471b9bf1b0d873f6e7b733d205bccaba6567d87a0a829e442efb6a3b0d96ecee5a1abb5a071 WHIRLPOOL 28b798ed7605264ec6d1e69f4a98ba7eb7e825594dc0ca9d5941d5293810c4f7cd32c680d09be44077ee269f8bd0c8644543c477223d5b55f078f81a0993460f
 DIST python-neutronclient-2.6.0.tar.gz 141675 SHA256 ce72506c0720825edcb0e93b643340e044f1de9235d398fe1c45d851971020df SHA512 a14503ec5374f0edd647a4da5e75f5d6820388b73792a9c944537815e980e87890fea227b2d21e34207958350f6e08a002e6f09af5567e1b4d709e698ea040cb WHIRLPOOL 7d3e6b0baded7de81f2c010376e8b528a73715382a230ffc6790eaae58b54e9cb5765002d2a508953b22a498d5a60947decd0d2884254cb2cc12f7ae1550596f
+DIST python-neutronclient-3.0.0.tar.gz 147616 SHA256 f6dc2e514e99df4f7eaf9f983a19344a5f38adf323d71f2908c872f8eba88e2f SHA512 f985c054f614d8ec2102d5323e7320c578dd11685f34d5e3f791c0ea3efea3780731da0f777a1544250029cd6dda8484af623c1f4537b45e49386e1ae1e9820b WHIRLPOOL f3323f28c36461b2b64897bd69d9453cf0f91c6497126e3e0d539652711f653e20ca340dfcce429f5342cb9a9397ccd42783a79d1c4baabf108aed569d50b521
diff --git a/dev-python/python-neutronclient/python-neutronclient-3.0.0.ebuild b/dev-python/python-neutronclient/python-neutronclient-3.0.0.ebuild
new file mode 100644
index 000000000000..2b3731f01470
--- /dev/null
+++ b/dev-python/python-neutronclient/python-neutronclient-3.0.0.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
+
+inherit distutils-r1
+
+DESCRIPTION="A client for the OpenStack Quantum API"
+HOMEPAGE="https://launchpad.net/neutron"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc test"
+REQUIRED_USE="test? ( doc )"
+
+CDEPEND="
+	>=dev-python/pbr-1.6[${PYTHON_USEDEP}]
+	<dev-python/pbr-2.0[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}
+	test? (
+		>=dev-python/cliff-tablib-1.0[${PYTHON_USEDEP}]
+		>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
+		>=dev-python/fixtures-1.3.1[${PYTHON_USEDEP}]
+		>=dev-python/mox3-0.7.0[${PYTHON_USEDEP}]
+		>=dev-python/mock-1.2[${PYTHON_USEDEP}]
+		>=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
+		>=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]
+		>=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
+		>=dev-python/requests-mock-0.6.0[${PYTHON_USEDEP}]
+		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
+		>=dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
+		>=dev-python/tempest-lib-0.6.1[${PYTHON_USEDEP}]
+	)
+	doc? (
+		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
+		!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
+		<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
+	)"
+
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/cliff-1.14.0[${PYTHON_USEDEP}]
+	>=dev-python/iso8601-0.1.9[${PYTHON_USEDEP}]
+	>=dev-python/netaddr-0.7.12[${PYTHON_USEDEP}]
+	!~dev-python/netaddr-0.7.16[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-1.5.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-serialization-1.4.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-2.0.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.5.2[${PYTHON_USEDEP}]
+	>=dev-python/python-keystoneclient-1.6.0[${PYTHON_USEDEP}]
+	>=dev-python/simplejson-2.2.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]"
+
+python_prepare_all() {
+	# built in... 
+	sed -i '/^argparse/d' requirements.txt || die
+	sed -i '/^hacking/d' test-requirements.txt || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && "${PYTHON}" setup.py build_sphinx
+}
+
+python_test() {
+	testr init
+	testr run || die "tests failed under python2.7"
+	flake8 neutronclient/tests || die "run by flake8 over tests folder yielded error"
+}
+
+python_install() {
+	distutils-r1_python_install
+	#stupid stupid
+	local SITEDIR="${D%/}$(python_get_sitedir)" || die
+	cd "${SITEDIR}" || die
+	local egg=( python_neutronclient*.egg-info )
+	#[[ -f ${egg[0]} ]] || die "python_quantumclient*.egg-info not found"
+	ln -s "${egg[0]}" "${egg[0]/neutron/quantum}" || die
+	ln -s neutronclient quantumclient || die
+	ln -s neutron quantumclient/quantum || die
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/python-sipsimple/Manifest b/dev-python/python-sipsimple/Manifest
new file mode 100644
index 000000000000..afb8b46ccdd0
--- /dev/null
+++ b/dev-python/python-sipsimple/Manifest
@@ -0,0 +1 @@
+DIST python-sipsimple-2.5.1.tar.gz 4794640 SHA256 b7706e6a31edbffcac468a8b2df23cb75b34e8f21bcd702760c718a4f516fe6e SHA512 912fe763bfdc440984d08c5a7105db37322f24c3d8ddb1b4ab2bf9c59b21ae510b9b977a819b671369d9eaf0e6118ebc3b78402546a8d7b953ecd9a5b58d26df WHIRLPOOL 8f5c5d76a383a7c52b62fc1c85cf9d07ab2589a3adaf6572565fbaf1bc7fdcad54eab329b40d80696b6092e96ab058b493aca8c3597f9ed958577219c0683394
diff --git a/dev-python/python-sipsimple/metadata.xml b/dev-python/python-sipsimple/metadata.xml
new file mode 100644
index 000000000000..2b568d81a793
--- /dev/null
+++ b/dev-python/python-sipsimple/metadata.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>python</herd>
+	<maintainer>
+		<email>hasufell@gentoo.org</email>
+		<name>Julian Ospald</name>
+	</maintainer>
+	<longdescription lang="en">
+		SIP SIMPLE client SDK is a Software Development Kit for easy
+		development of SIP end-points that support rich media like Audio,
+		Video, Instant Messaging, File Transfers, Desktop Sharing and Presence.
+		Other media types can be easily added by using an extensible high-level
+		API.
+
+		The software has undergone in the past years several interoperability
+		tests at SIPIT (http://www.sipit.net) and today is of industry strength
+		quality.
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-python/python-sipsimple/python-sipsimple-2.5.1.ebuild b/dev-python/python-sipsimple/python-sipsimple-2.5.1.ebuild
new file mode 100644
index 000000000000..10e1c459f788
--- /dev/null
+++ b/dev-python/python-sipsimple/python-sipsimple-2.5.1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="SIP SIMPLE client SDK is a Software Development Kit"
+HOMEPAGE="http://sipsimpleclient.org"
+SRC_URI="http://download.ag-projects.com/SipClient/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE=""
+
+KEYWORDS="~amd64 ~x86"
+
+CDEPEND="
+	dev-db/sqlite:3
+	dev-libs/openssl:0
+	dev-python/python-application[${PYTHON_USEDEP}]
+	media-libs/alsa-lib
+	media-libs/libv4l
+	media-libs/libvpx
+	sys-apps/util-linux
+	virtual/ffmpeg
+"
+RDEPEND="${CDEPEND}
+	dev-python/dnspython[${PYTHON_USEDEP}]
+	dev-python/python-cjson[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	dev-python/python-eventlib[${PYTHON_USEDEP}]
+	dev-python/greenlet[${PYTHON_USEDEP}]
+	dev-python/python-gnutls[${PYTHON_USEDEP}]
+	dev-python/lxml[${PYTHON_USEDEP}]
+	dev-python/python-msrplib[${PYTHON_USEDEP}]
+	dev-python/python-xcaplib[${PYTHON_USEDEP}]
+	dev-python/twisted-core[${PYTHON_USEDEP}]
+	dev-python/zope-interface[${PYTHON_USEDEP}]
+"
+DEPEND="${CDEPEND}
+	dev-python/cython[${PYTHON_USEDEP}]
+	virtual/pkgconfig
+"
diff --git a/dev-python/python-twitter/metadata.xml b/dev-python/python-twitter/metadata.xml
index b862d3a6e7ce..0aeabd36ac00 100644
--- a/dev-python/python-twitter/metadata.xml
+++ b/dev-python/python-twitter/metadata.xml
@@ -4,5 +4,6 @@
 	<herd>python</herd>
 	<upstream>
 		<remote-id type="google-code">python-twitter</remote-id>
+		<remote-id type="github">bear/python-twitter</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/python-xcaplib/Manifest b/dev-python/python-xcaplib/Manifest
new file mode 100644
index 000000000000..d375d1adf13f
--- /dev/null
+++ b/dev-python/python-xcaplib/Manifest
@@ -0,0 +1 @@
+DIST python-xcaplib-1.1.0.tar.gz 22892 SHA256 2f8ea6fe7d005104ef1d854aa87bd8ee85ca242a70cde42f409f8e5557f864b3 SHA512 140a12e39decdd15c06816cf5969baaf82437f010592ee2f4b7309db585aaa6611ab3af50e399bb18d216ae1586b5ebf18490d74c385a99d6673171bcf437395 WHIRLPOOL 711eb094be643613a117044d2c3ea054bf728ff21a1efe668d27bebe912c67463cb15b8e0c052699f01439a6631c2570ba1e79d452cc5250383200fb2f54830b
diff --git a/dev-python/python-xcaplib/metadata.xml b/dev-python/python-xcaplib/metadata.xml
new file mode 100644
index 000000000000..0dd9c1582327
--- /dev/null
+++ b/dev-python/python-xcaplib/metadata.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>python</herd>
+	<maintainer>
+		<email>hasufell@gentoo.org</email>
+		<name>Julian Ospald</name>
+	</maintainer>
+	<longdescription lang="en">
+		XCAP protocol, defined in RFC 4825, allows a client to read, write,
+		and modify application configuration data stored in XML format on a
+		server. XCAP maps XML document sub-trees and element attributes to
+		HTTP URIs, so that these components can be directly accessed by HTTP.
+		An XCAP server used by XCAP clients to store data like presence
+		policy in combination with a SIP Presence server that supports
+		PUBLISH/SUBSCRIBE/NOTIFY SIP methods can provide a complete SIP
+		SIMPLE solution.
+
+		The XCAP client example script provided by this package can be used to
+		manage documents on an XCAP server.
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-python/python-xcaplib/python-xcaplib-1.1.0.ebuild b/dev-python/python-xcaplib/python-xcaplib-1.1.0.ebuild
new file mode 100644
index 000000000000..e68c80ee93f2
--- /dev/null
+++ b/dev-python/python-xcaplib/python-xcaplib-1.1.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+PYTHON_REQ_USE="ssl,xml"
+PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
+
+inherit distutils-r1
+
+DESCRIPTION="Python library for managing XML documents on XCAP server"
+HOMEPAGE="http://sipsimpleclient.org"
+SRC_URI="http://download.ag-projects.com/XCAP/python-xcaplib-${PV}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE=""
+
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/lxml[${PYTHON_USEDEP}]
+	dev-python/python-application[${PYTHON_USEDEP}]
+"
diff --git a/dev-python/pywavelets/pywavelets-0.3.0.ebuild b/dev-python/pywavelets/pywavelets-0.3.0.ebuild
index ba3107b7ffb1..02803b4242b5 100644
--- a/dev-python/pywavelets/pywavelets-0.3.0.ebuild
+++ b/dev-python/pywavelets/pywavelets-0.3.0.ebuild
@@ -35,11 +35,10 @@ python_test() {
 }
 
 python_compile() {
-        python_is_python3 || local -x CFLAGS="${CFLAGS} -fno-strict-aliasing"
-        distutils-r1_python_compile
+	python_is_python3 || local -x CFLAGS="${CFLAGS} -fno-strict-aliasing"
+	distutils-r1_python_compile
 }
 
-
 python_compile_all() {
 	use doc && emake -C doc html
 }
diff --git a/dev-python/pyzmq/pyzmq-14.7.0.ebuild b/dev-python/pyzmq/pyzmq-14.7.0.ebuild
index 1ca4286512d0..ed5f0e591c6c 100644
--- a/dev-python/pyzmq/pyzmq-14.7.0.ebuild
+++ b/dev-python/pyzmq/pyzmq-14.7.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~amd64 ~arm ~mips ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="doc examples green test"
 
 # Ensures installation of gevent for test phase
diff --git a/dev-python/retrying/retrying-1.3.3.ebuild b/dev-python/retrying/retrying-1.3.3.ebuild
index 7830c2ae2925..f00dc872a73d 100644
--- a/dev-python/retrying/retrying-1.3.3.ebuild
+++ b/dev-python/retrying/retrying-1.3.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~hppa ~mips ~ppc64 ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/dev-python/rfc3986/metadata.xml b/dev-python/rfc3986/metadata.xml
index 30fbe982e3bc..80791af85dc5 100644
--- a/dev-python/rfc3986/metadata.xml
+++ b/dev-python/rfc3986/metadata.xml
@@ -11,5 +11,6 @@
 	</longdescription>
   <upstream>
     <remote-id type="pypi">rfc3986</remote-id>
+    <remote-id type="github">sigmavirus24/rfc3986</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-python/rfc3986/rfc3986-0.2.2.ebuild b/dev-python/rfc3986/rfc3986-0.2.2.ebuild
index 3099989634ed..64014eb139ae 100644
--- a/dev-python/rfc3986/rfc3986-0.2.2.ebuild
+++ b/dev-python/rfc3986/rfc3986-0.2.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~x86 ~ppc ~ppc64"
 IUSE="test"
 
 DEPEND="
diff --git a/dev-python/rst2pdf/rst2pdf-0.93-r2.ebuild b/dev-python/rst2pdf/rst2pdf-0.93-r2.ebuild
index 9dc9e86c42c1..3ba057a9d896 100644
--- a/dev-python/rst2pdf/rst2pdf-0.93-r2.ebuild
+++ b/dev-python/rst2pdf/rst2pdf-0.93-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://rst2pdf.googlecode.com/files/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ppc ~ppc64 x86"
+KEYWORDS="~alpha amd64 ~arm hppa ~ppc ~ppc64 x86"
 IUSE="svg"
 
 DEPEND="dev-python/docutils[${PYTHON_USEDEP}]
diff --git a/dev-python/setuptools/Manifest b/dev-python/setuptools/Manifest
index 27ffb4a920dd..b31bddfe17c2 100644
--- a/dev-python/setuptools/Manifest
+++ b/dev-python/setuptools/Manifest
@@ -9,6 +9,7 @@ DIST setuptools-17.1.1.tar.gz 630390 SHA256 5bf42dbf406fd58a41029f53cffff1c90db5
 DIST setuptools-18.0.1.tar.gz 630585 SHA256 4d49c99fd51edf22baa997fb6105b07482feaebcb174b7d348a4307c29264b94 SHA512 9b318ce2ee2cf787929dcb886d76c492b433e71024fda9452d8b4927652a298d6bd1bdb7a4c73883a98e100024f89b46ea8aa14b250f896e549e6dd7e10a6b41 WHIRLPOOL 03a8aba7af5980d4e7680af1d7d2df2a16fb015e994e166f9f380119c4af136bad635a8ac90095a086c35dc90cf6872ea1aba190269425267bd844b37f8e50fe
 DIST setuptools-18.1.tar.gz 630700 SHA256 ad52a9d5b3a6f39c2a1c2deb96cc4f6aff29d6511bdea2994322c40b60c9c36a SHA512 1367f3a10c1fef2f8061e430585f1927f6bd7c416e764d65cea1f4255824d549efa77beef8ff784bbd62c307b4b1123502e7b3fd01a243c0cc5b433a841cc8b5 WHIRLPOOL bbd3c540ff4233052be9b46f6b389900513f06aa1f79ad09495aa2c7fbdfa7bdf0e0766257a13fb9be01ce5288fdc1b3573d6411f71beb614fecc8fa72dd9e94
 DIST setuptools-18.2.tar.gz 630990 SHA256 0994a58df27ea5dc523782a601357a2198b7493dcc99a30d51827a23585b5b1d SHA512 964449faecce8b039343ea4364e73e035b7a99ba425939c07ee86c2db75b3b34ddbfc5d03b468ee11266eed74208b2038b3785332ff90d74087ee1d45620912e WHIRLPOOL d05c8a6f06e33efbe007a9ab1bdc9fa867f9b761510134b3580b1cedde16ae17b01ef43942d5c7e0a86e1deb605fb0f6cb08eafa43f853b0cfcb3482365bae1e
+DIST setuptools-18.3.1.tar.gz 626033 SHA256 2fa230727104b07e522deec17929e84e041c9047e392c055347a02b0d5ca874d SHA512 1a00386cd33267c1787b50a26cb008c975e720e0ef17d5d9c89c1d2f62a6b1d86e4731ab259667d9e2eb1d4c29bc96729221e672e1c3a6e18a181c8f35711f21 WHIRLPOOL 6b4024f4c1e19ef2f68221296a9b18606129269c96dde02bfbda68c36d5299abf0fb437347ddfeeecbf37209e6d7b0b3ca4718beeb3c33079005ff8fede80f83
 DIST setuptools-2.2.tar.gz 786831 SHA256 6fb1f21dea64e323e7ad2531a6795eeb6f5e17a85189dee61a86baca60b18984 SHA512 b5472e20f13c62ddc06513a964d8d85230a6cb8f4b0a6bc05c57d42aa3e682a850418246b5c1d769dba0cea18d7b262817f743b49a73383157a6b76d5637c296 WHIRLPOOL 6377efcf56082fdbea79cba7ae7c7d125d2368ea2309c9d655e4a568d40c8a6c9673dc1db63a2cb1f143436da411e664281ba239a058b5dff91b99cd2b5b332d
 DIST setuptools-7.0.tar.gz 793737 SHA256 dd9c1a2a0fdf37a7b142626700e0a0b7a3a0657b735c50d367fca932803be061 SHA512 0c52bf2d22f7bbd7560e8bb3184406426cf759980add0e60a864f15d9bcf10f01a2bfe0eb598c8c965b2e89df8c4159c2b43028b560f04192bba47e67d9cda18 WHIRLPOOL 70c0076960af3c00d49f79d5a0c3e3ec47a0b5009a20377cb7eca1e0747d6249d433ae14a0b86e5ac1f3bcc1efd99b68e48bd741458389c27ea05406af64e55f
 DIST setuptools-8.0.1.tar.gz 801353 SHA256 ab8eb279ca9062efc7e70f74a35f3dd9315835139ecaf3ae5bfdf4a7dc768e30 SHA512 c86a2c6ae5ed8205b9b37911002a8f551f2607ecab8b74b9eae6a7b92713c0d0a3d6aa54c4428df48765c1a2c9e21f53128bb1f138f7753e1f45188b0e357ff2 WHIRLPOOL 0ee70ee0a00118cb41005f77614bade6d5198a9164718bd7bb595b5cea0456ff829ac48cc8113c91d2f7830c4b4e9f4bd73245393621ae87e581b1e9b497f95d
diff --git a/dev-python/setuptools/setuptools-18.2-r3.ebuild b/dev-python/setuptools/setuptools-18.2-r3.ebuild
index 8843a3f434fb..26910478236f 100644
--- a/dev-python/setuptools/setuptools-18.2-r3.ebuild
+++ b/dev-python/setuptools/setuptools-18.2-r3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="PSF-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~mips ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 RDEPEND=">=dev-python/packaging-15.3-r1[${PYTHON_USEDEP}]"
diff --git a/dev-python/setuptools/setuptools-18.3.1.ebuild b/dev-python/setuptools/setuptools-18.3.1.ebuild
new file mode 100644
index 000000000000..801757b4b91e
--- /dev/null
+++ b/dev-python/setuptools/setuptools-18.3.1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+PYTHON_COMPAT=( python2_7 python3_{3,4} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Collection of extensions to Distutils"
+HOMEPAGE="https://pypi.python.org/pypi/setuptools"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="PSF-2"
+SLOT="0"
+KEYWORDS="~amd64 ~mips ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="test"
+
+RDEPEND=">=dev-python/packaging-15.3-r1[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+"
+PDEPEND=">=dev-python/certifi-2015.04.28[${PYTHON_USEDEP}]"
+
+# Force in-source build because build system modifies sources.
+DISTUTILS_IN_SOURCE_BUILD=1
+
+DOCS=( README.txt docs/{easy_install.txt,pkg_resources.txt,setuptools.txt} )
+
+python_prepare_all() {
+	rm -r ./pkg_resources/_vendor || die
+	# disable tests requiring a network connection
+	rm setuptools/tests/test_packageindex.py || die
+
+	# don't run integration tests
+	rm setuptools/tests/test_integration.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	# test_easy_install raises a SandboxViolation due to ${HOME}/.pydistutils.cfg
+	# It tries to sandbox the test in a tempdir
+	HOME="${PWD}" py.test ${PN} || die "Tests failed under ${EPYTHON}"
+}
+
+python_install() {
+	export DISTRIBUTE_DISABLE_VERSIONED_EASY_INSTALL_SCRIPT=1
+	distutils-r1_python_install
+}
diff --git a/dev-python/simpleeval/simpleeval-0.8.2.ebuild b/dev-python/simpleeval/simpleeval-0.8.2.ebuild
index 12ddb70ac07b..24e4ee1c70b8 100644
--- a/dev-python/simpleeval/simpleeval-0.8.2.ebuild
+++ b/dev-python/simpleeval/simpleeval-0.8.2.ebuild
@@ -3,6 +3,7 @@
 # $Id$
 
 EAPI=5
+
 PYTHON_COMPAT=( python{2_7,3_3,3_4} )
 
 inherit distutils-r1
@@ -16,7 +17,4 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-DEPEND=""
-RDEPEND="${DEPEND}"
-
 DOCS="README.rst"
diff --git a/dev-python/simpleeval/simpleeval-0.8.5.ebuild b/dev-python/simpleeval/simpleeval-0.8.5.ebuild
index 7a8a0953b6f7..daeac387cd27 100644
--- a/dev-python/simpleeval/simpleeval-0.8.5.ebuild
+++ b/dev-python/simpleeval/simpleeval-0.8.5.ebuild
@@ -3,6 +3,7 @@
 # $Id$
 
 EAPI=5
+
 PYTHON_COMPAT=( python{2_7,3_3,3_4} )
 
 inherit distutils-r1
@@ -16,13 +17,12 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-DEPEND=""
-RDEPEND="
-	${DEPEND}
-	dev-python/setuptools"
+RDEPEND=""
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
 
 DOCS="README.rst"
 
 python_test() {
-	esetup.py test || die
+	esetup.py test
 }
diff --git a/dev-python/sip/sip-4.16.9.ebuild b/dev-python/sip/sip-4.16.9.ebuild
index 4fb49dc1a3fa..3a4eed875fe5 100644
--- a/dev-python/sip/sip-4.16.9.ebuild
+++ b/dev-python/sip/sip-4.16.9.ebuild
@@ -28,7 +28,7 @@ fi
 
 # Sub-slot based on SIP_API_MAJOR_NR from siplib/sip.h.in
 SLOT="0/11"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="debug doc"
 
 DEPEND="${PYTHON_DEPS}"
diff --git a/dev-python/snowballstemmer/snowballstemmer-1.2.0.ebuild b/dev-python/snowballstemmer/snowballstemmer-1.2.0.ebuild
index 8ae263b7f3a4..04ebc23044ff 100644
--- a/dev-python/snowballstemmer/snowballstemmer-1.2.0.ebuild
+++ b/dev-python/snowballstemmer/snowballstemmer-1.2.0.ebuild
@@ -13,8 +13,5 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc64 ~x86"
 IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
diff --git a/dev-python/sphinx/sphinx-1.3.1.ebuild b/dev-python/sphinx/sphinx-1.3.1.ebuild
index 12333e8f0f47..3c4d93923c45 100644
--- a/dev-python/sphinx/sphinx-1.3.1.ebuild
+++ b/dev-python/sphinx/sphinx-1.3.1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc64 ~x86"
 IUSE="doc latex test"
 
 RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/sphinx_rtd_theme/sphinx_rtd_theme-0.1.8.ebuild b/dev-python/sphinx_rtd_theme/sphinx_rtd_theme-0.1.8.ebuild
index 9d3a4540250e..f7c5387ba0e6 100644
--- a/dev-python/sphinx_rtd_theme/sphinx_rtd_theme-0.1.8.ebuild
+++ b/dev-python/sphinx_rtd_theme/sphinx_rtd_theme-0.1.8.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/sphinxcontrib-issuetracker/sphinxcontrib-issuetracker-0.11-r1.ebuild b/dev-python/sphinxcontrib-issuetracker/sphinxcontrib-issuetracker-0.11-r1.ebuild
index 61fee2c722fe..ffb0f369b2e9 100644
--- a/dev-python/sphinxcontrib-issuetracker/sphinxcontrib-issuetracker-0.11-r1.ebuild
+++ b/dev-python/sphinxcontrib-issuetracker/sphinxcontrib-issuetracker-0.11-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm x86"
+KEYWORDS="amd64 ~arm ~hppa ~ppc64 x86"
 
 IUSE="doc test"
 
diff --git a/dev-python/sqlalchemy-migrate/sqlalchemy-migrate-0.9.6.ebuild b/dev-python/sqlalchemy-migrate/sqlalchemy-migrate-0.9.6.ebuild
index 2cd4b917eb7e..c8de85aace2f 100644
--- a/dev-python/sqlalchemy-migrate/sqlalchemy-migrate-0.9.6.ebuild
+++ b/dev-python/sqlalchemy-migrate/sqlalchemy-migrate-0.9.6.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~x86"
 IUSE="doc"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/stormpath/Manifest b/dev-python/stormpath/Manifest
index 3c85105c1905..25c04ea78742 100644
--- a/dev-python/stormpath/Manifest
+++ b/dev-python/stormpath/Manifest
@@ -1,2 +1,3 @@
 DIST stormpath-2.0.8.tar.gz 4326469 SHA256 9f6ad7e7b210024915e2139b2ed395a7c0fff6ca49ad3cdf58dc8f214d080c70 SHA512 661714fac02528111bb01e30f8c16b1d8701fe894b21d803958331819ce145a9ec03864111b861286224b33aaf56ca68ddcef2b67cd0003c498cd007ce375a03 WHIRLPOOL 12e6f7ec559a654ab59d34106d85d98ada4c7e3dee6fcec6cad0a2500608e962289d73a50e6ce6d81122c43f0f53b30d861203c8a976ac7bdbdab1cd8f5db6be
 DIST stormpath-2.0.9.tar.gz 4325976 SHA256 ba93f1f9f6b98db2eb2671d2b3285fdd15f8b2e6d3bce899f240576018f216ae SHA512 b50fa11e8fecf4909a8a1014963c80e7e2dde4db37e1f4681c2a116933d59f5b5ea32901cfde97b24398d8074db8b04121b2a7715d86b6b2eb78eb288465114c WHIRLPOOL 6290d5844d35158cc46f1810b6f83e41c443164cff4512caeeb38e562b04f448c1ac1b608b2cda4abd348f91319e4e8fbb3b195ba31a8fb415ba80f0ed7c5937
+DIST stormpath-2.1.1.tar.gz 4326557 SHA256 94600e8368f2fbe06adea5fddc8f4b7a479f7a89a0a35a46f58f7c796286e5f4 SHA512 7548aff63e5f04718d4d4887a1177f6f0cf3cc8cb9588e17f7563bae9c6dc5897a968ee2c4e189b6d9100ef16ec7e34e524c4cd3c5112845c0619876ca6d5505 WHIRLPOOL 33db1d8e52d24581a1fe7220b4329479142772939d1df76d52a46d47db6219890fde3204655dd65851d43b38e2427cd32df894392948482d85554772b9f12bbf
diff --git a/dev-python/stormpath/stormpath-2.0.8.ebuild b/dev-python/stormpath/stormpath-2.0.8.ebuild
index 1a69f9054975..ba2db58621b8 100644
--- a/dev-python/stormpath/stormpath-2.0.8.ebuild
+++ b/dev-python/stormpath/stormpath-2.0.8.ebuild
@@ -3,6 +3,7 @@
 # $Id$
 
 EAPI=5
+
 PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
 
 inherit distutils-r1 vcs-snapshot
@@ -49,7 +50,7 @@ python_compile_all() {
 }
 
 python_test() {
-	esetup.py test || die "tests failed under ${EPYTYHON}"
+	esetup.py test
 }
 
 python_install_all() {
diff --git a/dev-python/stormpath/stormpath-2.0.9.ebuild b/dev-python/stormpath/stormpath-2.0.9.ebuild
index 084b5d1b7b73..ac212dd5c98c 100644
--- a/dev-python/stormpath/stormpath-2.0.9.ebuild
+++ b/dev-python/stormpath/stormpath-2.0.9.ebuild
@@ -39,7 +39,7 @@ python_compile_all() {
 }
 
 python_test() {
-	esetup.py test || die "tests failed under ${EPYTYHON}"
+	esetup.py test
 }
 
 python_install_all() {
diff --git a/dev-python/stormpath/stormpath-2.1.1.ebuild b/dev-python/stormpath/stormpath-2.1.1.ebuild
new file mode 100644
index 000000000000..8b395dae38ab
--- /dev/null
+++ b/dev-python/stormpath/stormpath-2.1.1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
+
+inherit distutils-r1 vcs-snapshot
+
+DESCRIPTION="Official Stormpath SDK, used to interact with the Stormpath REST API."
+HOMEPAGE="https://github.com/stormpath/stormpath-sdk-python"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="doc test"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pytest-cov[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)
+"
+RDEPEND="
+	>=dev-python/isodate-0.5.4[${PYTHON_USEDEP}]
+	>=dev-python/oauthlib-0.6.3[${PYTHON_USEDEP}]
+	>=dev-python/pydispatcher-2.0.5[${PYTHON_USEDEP}]
+	>=dev-python/pyjwt-1.0.0[${PYTHON_USEDEP}]
+	>=dev-python/python-dateutil-2.4.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.4.3[${PYTHON_USEDEP}]
+	>=dev-python/six-1.6.1[${PYTHON_USEDEP}]
+"
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	esetup.py test
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/strict-rfc3339/metadata.xml b/dev-python/strict-rfc3339/metadata.xml
index 301d2207cc29..fde303d0e557 100644
--- a/dev-python/strict-rfc3339/metadata.xml
+++ b/dev-python/strict-rfc3339/metadata.xml
@@ -2,4 +2,8 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>python</herd>
+	<upstream>
+		<remote-id type="pypi">strict-rfc3339</remote-id>
+		<remote-id type="github">danielrichman/strict-rfc3339</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/strict-rfc3339/strict-rfc3339-0.6.ebuild b/dev-python/strict-rfc3339/strict-rfc3339-0.6.ebuild
index 918c3169b008..f082984032e7 100644
--- a/dev-python/strict-rfc3339/strict-rfc3339-0.6.ebuild
+++ b/dev-python/strict-rfc3339/strict-rfc3339-0.6.ebuild
@@ -14,5 +14,5 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-3+"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86 ~ppc ~ppc64 ~amd64-linux ~x86-linux"
 IUSE=""
diff --git a/dev-python/testrepository/testrepository-0.0.17-r1.ebuild b/dev-python/testrepository/testrepository-0.0.17-r1.ebuild
index 54eebcdb8cfe..7f8d670c3816 100644
--- a/dev-python/testrepository/testrepository-0.0.17-r1.ebuild
+++ b/dev-python/testrepository/testrepository-0.0.17-r1.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=5
+
 # Although package supports alt. py impls, only works fully under py2.7
 PYTHON_COMPAT=( python2_7 )
 
@@ -17,18 +18,21 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE="test"
 
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-		test? ( dev-python/subunit[${PYTHON_USEDEP}]
-			>=dev-python/testtools-0.9.30[${PYTHON_USEDEP}]
-			dev-python/fixtures[${PYTHON_USEDEP}]
-			dev-python/testresources[${PYTHON_USEDEP}]
-			dev-python/testscenarios[${PYTHON_USEDEP}]
-			dev-python/pytz[${PYTHON_USEDEP}]
-		)"
-#bzr is listed but presumably req'd for a live repo test run
-RDEPEND="dev-python/subunit[${PYTHON_USEDEP}]
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/subunit[${PYTHON_USEDEP}]
 		>=dev-python/testtools-0.9.30[${PYTHON_USEDEP}]
-		dev-python/fixtures[${PYTHON_USEDEP}]"
+		dev-python/fixtures[${PYTHON_USEDEP}]
+		dev-python/testresources[${PYTHON_USEDEP}]
+		dev-python/testscenarios[${PYTHON_USEDEP}]
+		dev-python/pytz[${PYTHON_USEDEP}]
+	)"
+#bzr is listed but presumably req'd for a live repo test run
+RDEPEND="
+	dev-python/subunit[${PYTHON_USEDEP}]
+	>=dev-python/testtools-0.9.30[${PYTHON_USEDEP}]
+	dev-python/fixtures[${PYTHON_USEDEP}]"
 
 python_test() {
 	"${PYTHON}" ./testr init || die
diff --git a/dev-python/testrepository/testrepository-0.0.17-r2.ebuild b/dev-python/testrepository/testrepository-0.0.17-r2.ebuild
index 78b8870e928c..d66490e91c63 100644
--- a/dev-python/testrepository/testrepository-0.0.17-r2.ebuild
+++ b/dev-python/testrepository/testrepository-0.0.17-r2.ebuild
@@ -3,6 +3,7 @@
 # $Id$
 
 EAPI=5
+
 PYTHON_COMPAT=( python{2_7,3_3} )
 
 inherit distutils-r1
@@ -16,24 +17,26 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE="test"
 
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-		test? ( ${RDEPEND}
-			dev-python/testresources[${PYTHON_USEDEP}]
-			dev-python/testscenarios[${PYTHON_USEDEP}]
-			dev-python/pytz[${PYTHON_USEDEP}]
-		)"
 #>=dev-python/subunit-0.0.10[${PYTHON_USEDEP}]
 #>=dev-python/testtools-0.9.30[${PYTHON_USEDEP}]
 #dev-python/fixtures[${PYTHON_USEDEP}]
 #bzr is listed but presumably req'd for a live repo test run
-RDEPEND=">=dev-python/subunit-0.0.10[${PYTHON_USEDEP}]
-		>=dev-python/testtools-0.9.30[${PYTHON_USEDEP}]
-		dev-python/fixtures[${PYTHON_USEDEP}]"
+RDEPEND="
+	>=dev-python/subunit-0.0.10[${PYTHON_USEDEP}]
+	>=dev-python/testtools-0.9.30[${PYTHON_USEDEP}]
+	dev-python/fixtures[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( ${RDEPEND}
+		dev-python/testresources[${PYTHON_USEDEP}]
+		dev-python/testscenarios[${PYTHON_USEDEP}]
+		dev-python/pytz[${PYTHON_USEDEP}]
+	)"
 
 # Required for test phase
 DISTUTILS_IN_SOURCE_BUILD=1
 
 python_test() {
 	"${PYTHON}" ./testr init || die
-	"${PYTHON}" setup.py testr --coverage || die "tests failed under ${EPYTHON}"
+	esetup.py testr --coverage
 }
diff --git a/dev-python/testrepository/testrepository-0.0.18-r1.ebuild b/dev-python/testrepository/testrepository-0.0.18-r1.ebuild
index f2ea60551810..a5d520941b04 100644
--- a/dev-python/testrepository/testrepository-0.0.18-r1.ebuild
+++ b/dev-python/testrepository/testrepository-0.0.18-r1.ebuild
@@ -38,5 +38,5 @@ python_test() {
 	# some errors appear to have crept in the suite undert py3 since addition.
 	# Python2.7 now passes all.
 
-	esetup.py testr --coverage # || die "tests failed under ${EPYTHON}"
+	esetup.py testr --coverage
 }
diff --git a/dev-python/testtools/testtools-1.5.0.ebuild b/dev-python/testtools/testtools-1.5.0.ebuild
index c18fc3d85cb2..2f61284724d4 100644
--- a/dev-python/testtools/testtools-1.5.0.ebuild
+++ b/dev-python/testtools/testtools-1.5.0.ebuild
@@ -34,7 +34,7 @@ python_compile_all() {
 }
 
 python_test() {
-	esetup.py test || die "tests failed under ${EPYTHON}"
+	esetup.py test
 }
 
 python_install_all() {
diff --git a/dev-python/translationstring/translationstring-1.3.ebuild b/dev-python/translationstring/translationstring-1.3.ebuild
index 7bb22f349f39..8d52a848ccfa 100644
--- a/dev-python/translationstring/translationstring-1.3.ebuild
+++ b/dev-python/translationstring/translationstring-1.3.ebuild
@@ -24,7 +24,7 @@ RDEPEND=""
 DOCS=( COPYRIGHT.txt README.rst )
 
 python_test() {
-	esetup.py test || die
+	esetup.py test
 }
 
 src_install() {
diff --git a/dev-python/unidecode/unidecode-0.04.17.ebuild b/dev-python/unidecode/unidecode-0.04.17.ebuild
index 2b88813f180c..656d14962ae3 100644
--- a/dev-python/unidecode/unidecode-0.04.17.ebuild
+++ b/dev-python/unidecode/unidecode-0.04.17.ebuild
@@ -3,6 +3,7 @@
 # $Id$
 
 EAPI=5
+
 PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
 
 MY_PN=Unidecode
@@ -23,5 +24,5 @@ S=${WORKDIR}/${MY_P}
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 
 python_test() {
-	esetup.py test || die "Tests failed under ${EPYTHON}"
+	esetup.py test
 }
diff --git a/dev-python/unidecode/unidecode-0.04.18.ebuild b/dev-python/unidecode/unidecode-0.04.18.ebuild
index 94c437eb6a04..f93ec9400628 100644
--- a/dev-python/unidecode/unidecode-0.04.18.ebuild
+++ b/dev-python/unidecode/unidecode-0.04.18.ebuild
@@ -3,6 +3,7 @@
 # $Id$
 
 EAPI=5
+
 PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
 
 MY_PN=Unidecode
@@ -23,5 +24,5 @@ S=${WORKDIR}/${MY_P}
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 
 python_test() {
-	esetup.py test || die "Tests failed under ${EPYTHON}"
+	esetup.py test
 }
diff --git a/dev-python/vcversioner/vcversioner-2.14.0.0.ebuild b/dev-python/vcversioner/vcversioner-2.14.0.0.ebuild
index c2c33998e41d..250a7d244434 100644
--- a/dev-python/vcversioner/vcversioner-2.14.0.0.ebuild
+++ b/dev-python/vcversioner/vcversioner-2.14.0.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/v/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~x86 ~ppc ~ppc64"
 IUSE="test"
 
 DEPEND="
diff --git a/dev-python/virtualenv/virtualenv-13.1.2.ebuild b/dev-python/virtualenv/virtualenv-13.1.2.ebuild
index 3413424fbf1e..d60c6d96902c 100644
--- a/dev-python/virtualenv/virtualenv-13.1.2.ebuild
+++ b/dev-python/virtualenv/virtualenv-13.1.2.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="http://www.virtualenv.org/ https://pypi.python.org/pypi/virtualenv htt
 SRC_URI="https://github.com/pypa/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~mips ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 SLOT="0"
 IUSE="doc test"
 
diff --git a/dev-python/webcolors/metadata.xml b/dev-python/webcolors/metadata.xml
index 301d2207cc29..78ff82829f62 100644
--- a/dev-python/webcolors/metadata.xml
+++ b/dev-python/webcolors/metadata.xml
@@ -2,4 +2,8 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>python</herd>
+	<upstream>
+		<remote-id type="pypi">webcolors</remote-id>
+		<remote-id type="github">ubernostrum/webcolors</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/webcolors/webcolors-1.5.ebuild b/dev-python/webcolors/webcolors-1.5.ebuild
index a871da0be8c4..6adc46fd9cc3 100644
--- a/dev-python/webcolors/webcolors-1.5.ebuild
+++ b/dev-python/webcolors/webcolors-1.5.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86 ~ppc ~ppc64 ~amd64-linux ~x86-linux"
 IUSE="test"
 
 DEPEND="
diff --git a/dev-python/websocket-client/websocket-client-0.21.0.ebuild b/dev-python/websocket-client/websocket-client-0.21.0.ebuild
index 889ab1c8bcbf..d87776a5f8dd 100644
--- a/dev-python/websocket-client/websocket-client-0.21.0.ebuild
+++ b/dev-python/websocket-client/websocket-client-0.21.0.ebuild
@@ -3,6 +3,7 @@
 # $Id$
 
 EAPI=5
+
 PYTHON_COMPAT=( python2_7 python3_3 python3_4 pypy )
 
 inherit distutils-r1 vcs-snapshot
@@ -23,7 +24,7 @@ RDEPEND="
 "
 
 python_test() {
-	esetup.py test || die "Tests failed under ${EPYTHON}"
+	esetup.py test
 }
 
 python_install_all() {
diff --git a/dev-python/websocket-client/websocket-client-0.29.0.ebuild b/dev-python/websocket-client/websocket-client-0.29.0.ebuild
index 92d7d679d383..de7e12040324 100644
--- a/dev-python/websocket-client/websocket-client-0.29.0.ebuild
+++ b/dev-python/websocket-client/websocket-client-0.29.0.ebuild
@@ -3,6 +3,7 @@
 # $Id$
 
 EAPI=5
+
 PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
 
 inherit distutils-r1 vcs-snapshot
@@ -25,7 +26,7 @@ RDEPEND="
 "
 
 python_test() {
-	esetup.py test || die "Tests failed under ${EPYTHON}"
+	esetup.py test
 }
 
 python_install_all() {
diff --git a/dev-python/websocket-client/websocket-client-0.31.0.ebuild b/dev-python/websocket-client/websocket-client-0.31.0.ebuild
index 92d7d679d383..de7e12040324 100644
--- a/dev-python/websocket-client/websocket-client-0.31.0.ebuild
+++ b/dev-python/websocket-client/websocket-client-0.31.0.ebuild
@@ -3,6 +3,7 @@
 # $Id$
 
 EAPI=5
+
 PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
 
 inherit distutils-r1 vcs-snapshot
@@ -25,7 +26,7 @@ RDEPEND="
 "
 
 python_test() {
-	esetup.py test || die "Tests failed under ${EPYTHON}"
+	esetup.py test
 }
 
 python_install_all() {
diff --git a/dev-python/websocket-client/websocket-client-0.32.0.ebuild b/dev-python/websocket-client/websocket-client-0.32.0.ebuild
index 92d7d679d383..de7e12040324 100644
--- a/dev-python/websocket-client/websocket-client-0.32.0.ebuild
+++ b/dev-python/websocket-client/websocket-client-0.32.0.ebuild
@@ -3,6 +3,7 @@
 # $Id$
 
 EAPI=5
+
 PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
 
 inherit distutils-r1 vcs-snapshot
@@ -25,7 +26,7 @@ RDEPEND="
 "
 
 python_test() {
-	esetup.py test || die "Tests failed under ${EPYTHON}"
+	esetup.py test
 }
 
 python_install_all() {
diff --git a/dev-python/wtforms/Manifest b/dev-python/wtforms/Manifest
index c99e93c4df45..b49d14eff9b3 100644
--- a/dev-python/wtforms/Manifest
+++ b/dev-python/wtforms/Manifest
@@ -1,3 +1,2 @@
-DIST WTForms-1.0.4.zip 345261 SHA256 15e1c114cd32c8be2d08585f5b158c941e2193d19b0a16194d1fde53e4291eef SHA512 0f0bda1e225a1132784814d6129039ba964aeef8d2ca8509e6d9be9ecf83fbf76f6a71f18fbb43772dbe64802e9a2038c53e2098ec25ec8cd2ebb223206ab880 WHIRLPOOL edf9ad35c44d149fa08e2c47a5a69662545fa22743c004ec36d76593c73ecfb7975bd93ae92018c0e4fa425edf0c7f1cea30f4f452331b3e09c0722e5fa6a91a
 DIST WTForms-2.0.1.zip 444489 SHA256 62859c74be4683601b5265ba83b9babd8a8f1cdd0ba31600fa1e70d295cd4ed2 SHA512 abae7adb1c7ab46abf401a536a248bf3703be2f0be9f5d8d49191f18855a6989e4c7acb232b006d5809fc13428a9e6214f734be5b917648778169c7dd258eaab WHIRLPOOL d6177e7f9ff5e53085081fb4580d728c08ac19230470435a85a0735745f303b010540ce01e4071735a49f32bb3321d17557511f958452457a882705c3139da9b
 DIST WTForms-2.0.2.zip 449167 SHA256 10737758ceae03b53021f3aa7e81bfc8dd6f679c879ffeb5e64ac6570facb6c1 SHA512 35d52b2991588d1aef2ed7df5713f5cdd7d64affb0879ccf6b40b9194c3b9492af8f853353df55f833bec268d4332d49cf4c8e0592c21a11cccddaddb3650c52 WHIRLPOOL 7664b533174b44922e8ce733b6d284a1c8814190bab631cf094e0e7f841152502329f203e34638bb6aea2386b74a1afa7e5de09ada06188a39989f4f860e875e
diff --git a/dev-python/wtforms/wtforms-1.0.4.ebuild b/dev-python/wtforms/wtforms-1.0.4.ebuild
deleted file mode 100644
index 6622012f896e..000000000000
--- a/dev-python/wtforms/wtforms-1.0.4.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-PYTHON_COMPAT=( python2_7 pypy )
-
-inherit distutils-r1
-
-MY_PN="WTForms"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Flexible forms validation and rendering library for python web development"
-HOMEPAGE="http://wtforms.simplecodes.com/ https://pypi.python.org/pypi/WTForms"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.zip"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc"
-
-S="${WORKDIR}/${MY_P}"
-
-DEPEND="app-arch/unzip
-	doc? ( >=dev-python/sphinx-0.6[${PYTHON_USEDEP}] )"
-RDEPEND=""
-
-DOCS="AUTHORS.txt CHANGES.txt README.txt"
-
-python_compile_all() {
-	if use doc; then
-		einfo "Generation of documentation"
-		cd docs
-		PYTHONPATH=".." emake html || die "Building of documentation failed"
-	fi
-}
-
-python_install_all() {
-	if use doc; then
-		dohtml -r docs/_build/html/* || die "Installation of documentation failed"
-	fi
-}
diff --git a/dev-python/wtforms/wtforms-2.0.1.ebuild b/dev-python/wtforms/wtforms-2.0.1.ebuild
index 013260106d44..6b21abea9e56 100644
--- a/dev-python/wtforms/wtforms-2.0.1.ebuild
+++ b/dev-python/wtforms/wtforms-2.0.1.ebuild
@@ -3,6 +3,7 @@
 # $Id$
 
 EAPI="5"
+
 PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
 
 inherit distutils-r1
@@ -21,7 +22,8 @@ IUSE="doc"
 
 S="${WORKDIR}/${MY_P}"
 
-DEPEND="app-arch/unzip
+DEPEND="
+	app-arch/unzip
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	doc? ( >=dev-python/sphinx-0.6[${PYTHON_USEDEP}] )"
 RDEPEND=""
@@ -31,7 +33,7 @@ python_compile_all() {
 }
 
 python_test() {
-	esetup.py test || die "Tests failed for ${EPYTHON}"
+	esetup.py test
 }
 
 python_install_all() {
diff --git a/dev-python/wtforms/wtforms-2.0.2.ebuild b/dev-python/wtforms/wtforms-2.0.2.ebuild
index f8dee3d44c64..d02a186c9b4d 100644
--- a/dev-python/wtforms/wtforms-2.0.2.ebuild
+++ b/dev-python/wtforms/wtforms-2.0.2.ebuild
@@ -3,6 +3,7 @@
 # $Id$
 
 EAPI="5"
+
 PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
 
 inherit distutils-r1
@@ -21,7 +22,8 @@ IUSE="doc"
 
 S="${WORKDIR}/${MY_P}"
 
-DEPEND="app-arch/unzip
+DEPEND="
+	app-arch/unzip
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	doc? ( >=dev-python/sphinx-0.6[${PYTHON_USEDEP}] )"
 RDEPEND=""
@@ -31,7 +33,7 @@ python_compile_all() {
 }
 
 python_test() {
-	esetup.py test || die "Tests failed for ${EPYTHON}"
+	esetup.py test
 }
 
 python_install_all() {
diff --git a/dev-python/yappi/Manifest b/dev-python/yappi/Manifest
new file mode 100644
index 000000000000..fc3a629d165b
--- /dev/null
+++ b/dev-python/yappi/Manifest
@@ -0,0 +1 @@
+DIST yappi-0.93.tar.gz 24367 SHA256 09c028fafb31423a46305d3dc55cf30734b66ec4607541d1b561a2ddb17d2081 SHA512 5e187c3502f44a83d2dd91809ba73d1509c3d9300a038a32ef18a128e8ad5582f888844ec9f3237606d09b447e9fa7b12add132aa723dbb1cea61d628f26331d WHIRLPOOL 4cd9a3f2a8f340a4d86d2aa0c08b56cc2531ac20887da587350b080422110331edb506626b43b902e2a5edc00a816e530920442f97f0c2fc18282d1402a4dfb5
diff --git a/dev-python/yappi/metadata.xml b/dev-python/yappi/metadata.xml
new file mode 100644
index 000000000000..e667d2118da2
--- /dev/null
+++ b/dev-python/yappi/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer>
+    <email>chutzpah@gentoo.org</email>
+    <name>Patrick McLean</name>
+  </maintainer>
+  <herd>python</herd>
+  <upstream>
+    <remote-id type="pypi">yappi</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/yappi/yappi-0.93.ebuild b/dev-python/yappi/yappi-0.93.ebuild
new file mode 100644
index 000000000000..7a18291a8cc8
--- /dev/null
+++ b/dev-python/yappi/yappi-0.93.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=(python{2_7,3_{3,4}})
+inherit distutils-r1
+
+DESCRIPTION="Yet Another Python Profiler"
+HOMEPAGE="https://bitbucket.org/sumerc/yappi/"
+SRC_URI="https://bitbucket.org/sumerc/${PN}/downloads/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+IUSE="test"
+
+RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-ruby/RubyInline/RubyInline-3.12.3.ebuild b/dev-ruby/RubyInline/RubyInline-3.12.3.ebuild
index 4f78fe192a7f..7a33c1bea9f0 100644
--- a/dev-ruby/RubyInline/RubyInline-3.12.3.ebuild
+++ b/dev-ruby/RubyInline/RubyInline-3.12.3.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="http://www.zenspider.com/ZSS/Products/RubyInline/"
 
 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 ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE="doc test"
 
 ruby_add_rdepend "dev-ruby/zentest"
diff --git a/dev-ruby/actionview/actionview-4.1.13-r1.ebuild b/dev-ruby/actionview/actionview-4.1.13-r1.ebuild
new file mode 100644
index 000000000000..0cfc7c991d50
--- /dev/null
+++ b/dev-ruby/actionview/actionview-4.1.13-r1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+USE_RUBY="ruby19 ruby20 ruby21"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_DOCDIR="doc"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem versionator
+
+DESCRIPTION="Simple, battle-tested conventions and helpers for building web pages"
+HOMEPAGE="https://github.com/rails/rails/"
+SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
+
+LICENSE="MIT"
+SLOT="$(get_version_component_range 1-2)"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+IUSE=""
+
+RUBY_S="rails-${PV}/${PN}"
+
+RUBY_PATCHES=( ${P}-url-helper.patch )
+
+ruby_add_rdepend "
+	~dev-ruby/activesupport-${PV}
+	>=dev-ruby/builder-3.1:* =dev-ruby/builder-3*:*
+	>=dev-ruby/erubis-2.7.0
+"
+
+ruby_add_bdepend "
+	test? (
+		dev-ruby/mocha:0.14
+		~dev-ruby/actionpack-${PV}
+		~dev-ruby/activemodel-${PV}
+	)"
+
+all_ruby_prepare() {
+	# Remove items from the common Gemfile that we don't need for this
+	# test run. This also requires handling some gemspecs.
+	sed -i -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|jquery-rails\|'mysql'\|journey\|ruby-prof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|minitest\|sprockets\|stackprof\)/ s:^:#:" \
+		-e '/group :doc/,/^end/ s:^:#:' ../Gemfile || die
+	rm ../Gemfile.lock || die
+}
diff --git a/dev-ruby/actionview/files/actionview-4.1.13-url-helper.patch b/dev-ruby/actionview/files/actionview-4.1.13-url-helper.patch
new file mode 100644
index 000000000000..605955712527
--- /dev/null
+++ b/dev-ruby/actionview/files/actionview-4.1.13-url-helper.patch
@@ -0,0 +1,39 @@
+commit e5ba382ccbfe08a1a4681e1b6ac851379eb41c7c
+Author: Rafael Mendonça França <rafaelmfranca@gmail.com>
+Date:   Fri Aug 28 01:36:00 2015 -0300
+
+    Merge pull request #21402 from k0kubun/ruby20-url-helper
+    
+    Fix mail_to to work well with Ruby 2.0
+
+diff --git a/actionview/lib/action_view/helpers/url_helper.rb b/actionview/lib/action_view/helpers/url_helper.rb
+index b130457..97e299d 100644
+--- a/actionview/lib/action_view/helpers/url_helper.rb
++++ b/actionview/lib/action_view/helpers/url_helper.rb
+@@ -471,7 +471,7 @@ module ActionView
+         }.compact
+         extras = extras.empty? ? '' : '?' + ERB::Util.html_escape(extras.join('&'))
+ 
+-        encoded_email_address = ERB::Util.url_encode(email_address).gsub("%40", "@")
++        encoded_email_address = ERB::Util.url_encode(email_address.to_str).gsub("%40", "@")
+         html_options["href"] = "mailto:#{encoded_email_address}#{extras}".html_safe
+ 
+         content_tag(:a, name || email_address, html_options, &block)
+diff --git a/actionview/test/template/url_helper_test.rb b/actionview/test/template/url_helper_test.rb
+index 10195dd..b044ebd 100644
+--- a/actionview/test/template/url_helper_test.rb
++++ b/actionview/test/template/url_helper_test.rb
+@@ -505,6 +505,13 @@ class UrlHelperTest < ActiveSupport::TestCase
+     )
+   end
+ 
++  def test_mail_to_with_html_safe_string
++    assert_dom_equal(
++      %{<a href="mailto:david@loudthinking.com">david@loudthinking.com</a>},
++      mail_to("david@loudthinking.com".html_safe)
++    )
++  end
++
+   def test_mail_to_with_img
+     assert_dom_equal %{<a href="mailto:feedback@example.com"><img src="/feedback.png" /></a>},
+       mail_to('feedback@example.com', '<img src="/feedback.png" />'.html_safe)
diff --git a/dev-ruby/arel-helpers/Manifest b/dev-ruby/arel-helpers/Manifest
new file mode 100644
index 000000000000..66294b256649
--- /dev/null
+++ b/dev-ruby/arel-helpers/Manifest
@@ -0,0 +1,2 @@
+DIST arel-helpers-2.0.1.gem 9728 SHA256 de627d6d78af542d99bdfd178e7decd8f351e4de66758ac220f92418291b8b82 SHA512 241af61b00822ac091a04673ae0f6421c88ce8b96141cc9f468c62465b2720ca38d1a041faa720db40dd3a4cee407c1126152ac6125b3ed9a759daedd06b6955 WHIRLPOOL 3024a34b8a9720acbfb66e811b97ff1954c3cda83a97bc2544b5dbab0d94f5eb09eec8891c88bd0582dfdffdfe5abbf1e3be47cc9b61b888e52cb8a85121ab3c
+DIST arel-helpers-2.1.0.gem 10752 SHA256 f3c9ae9bef08367f98fe825ac985034c7c0c0e3de4fb65b45c23fc8d3defc241 SHA512 b3f969f41d634de6170042686a7bdb92571e7a27b701aa05628cc9d461d4c1b6db442ff38f4ad431b7b431a78f9340a292cf1288fa353cddd50af237875e090b WHIRLPOOL f40167d2d85150915fa3aba698483e124004bf5a35499712e9b4493ac126bcb380d5a9557a1d9ed62b94e538841401833fe798a4e44fe5d57b4a21a4c49eddf6
diff --git a/dev-ruby/arel-helpers/arel-helpers-2.0.1.ebuild b/dev-ruby/arel-helpers/arel-helpers-2.0.1.ebuild
new file mode 100644
index 000000000000..21b116fd037b
--- /dev/null
+++ b/dev-ruby/arel-helpers/arel-helpers-2.0.1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/metasploit_data_models/metasploit_data_models-0.17.0.ebuild,v 1.3 2014/07/09 21:13:54 zerochaos Exp $
+
+EAPI=5
+USE_RUBY="ruby19 ruby20 ruby21"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Tools to help construct database queries"
+HOMEPAGE="https://github.com/camertron/arel-helpers"
+SRC_URI="mirror://rubygems/${P}.gem"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+ruby_add_rdepend "|| ( dev-ruby/activerecord:3.2
+			dev-ruby/activerecord:4.0
+			dev-ruby/activerecord:4.1
+			dev-ruby/activerecord:4.2 )"
diff --git a/dev-ruby/arel-helpers/arel-helpers-2.1.0.ebuild b/dev-ruby/arel-helpers/arel-helpers-2.1.0.ebuild
new file mode 100644
index 000000000000..77513baa31e2
--- /dev/null
+++ b/dev-ruby/arel-helpers/arel-helpers-2.1.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+USE_RUBY="ruby19 ruby20 ruby21"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Tools to help construct database queries"
+HOMEPAGE="https://github.com/camertron/arel-helpers"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+ruby_add_rdepend "|| ( dev-ruby/activerecord:3.2
+			dev-ruby/activerecord:4.0
+			dev-ruby/activerecord:4.1
+			dev-ruby/activerecord:4.2 )"
+
+ruby_add_bdepend "test? (
+	dev-ruby/rr
+	dev-ruby/activerecord[sqlite]
+)"
+
+all_ruby_prepare() {
+	sed -i -e '/pry-nav/ s:^:#:' spec/spec_helper.rb || die
+}
diff --git a/dev-ruby/arel-helpers/metadata.xml b/dev-ruby/arel-helpers/metadata.xml
new file mode 100644
index 000000000000..0754654cf4e5
--- /dev/null
+++ b/dev-ruby/arel-helpers/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer>
+    <email>zerochaos@gentoo.org</email>
+    <name>Rick Farina</name>
+  </maintainer>
+<longdescription lang="en">
+</longdescription>
+  <upstream>
+    <remote-id type="github">camertron/arel-helpers</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-ruby/bson/Manifest b/dev-ruby/bson/Manifest
index e4ad23c17f63..47cfccabb54f 100644
--- a/dev-ruby/bson/Manifest
+++ b/dev-ruby/bson/Manifest
@@ -1,4 +1,5 @@
 DIST bson-3.0.4.tar.gz 49517 SHA256 10a34e681804abfde9a2c047d9fa4554e40aef28f0a7114b88f7324215041de4 SHA512 8a57ff6706af44ef22841fdd33cd8c9d2ea4fd94dfde9f4fe94fdb08d95d3249b96939866459294c8258d99f37ff3e0ab8ac16b53fad1db6ddb26506135a4008 WHIRLPOOL 07f81925049e23c5f8f75e08b3eb4594e0df4a890bc864674d19a3a291eca8a58f121b3d045d14c44f454753dc3d0be425ff140d3d0eb72bc2cd8a61734d08d8
 DIST bson-3.2.0.tar.gz 50495 SHA256 a452bf4f77548697f36659413fa2c106e592d29b8259c285262a1db5c1ffae06 SHA512 258cd31e390cafb12b93d326686e2a08e55da44b458a68cbf5ce8ebc51a477844934a346a77914a9baf1004ca465b45d7399e7daab74b2b9e7389b7c23cbf777 WHIRLPOOL d8c192343dcabbf162d16dd4f19612ddeb43cdabe8e13559014db2ca2d7dda2c5df759631fba7f0f4ed7b5e2d76e7327dc4a46d695a792afbc84aaaf8f6b4489
 DIST bson-3.2.1.tar.gz 50640 SHA256 8e81a04bd433bd82fd558b1ef58b35a53448eb6dc9c85a808238b0d21dfa71d4 SHA512 c5565965615036608b87895d40d62b42193eb7ba31f168051222595f9095627157606ba8ba7966ed349ec05005645320ce10cc510e1fa47368f907368734fb0a WHIRLPOOL 1e1007132aeb99655f1af49de0696ba104d1ac9d63c09b3136e5e523318acb36c568fe813ecbd663212a109bd94486fda1074f12fd18b3336e600b239252a4e4
+DIST bson-3.2.4.tar.gz 51208 SHA256 adcc339e4618fbd9bc8dc91677971118834adfd19bf6ae783d79308f2fb446b2 SHA512 d7817d5ec068895e4a883921dc8495aa9d44401b7a66c77f29b71434428efaf417f1219ebbb1bd7065a8beebba41c0c461e7b9f5376bc9259ada695f6eb97715 WHIRLPOOL 670239430ec0ccfe01a4a50d843fbc871faea06b0d5cf7db4cf53d32ec7a6dcca7ef06497589d1e0f4ee8e20e451bff33b7d0bcfea298b71dead22716f07eab2
 DIST mongo-ruby-driver-1.12.0.tar.gz 360669 SHA256 84c87d26601c9bd91a6604bcb3630be50d239e471542f9b0a68379705dd03e11 SHA512 725110c527867379def85fde50b6825e94a320356f062e4403d9d55c223f2503676f83ae42916d6ab45afd90d30b2a4272519e070c4af2095c0965297fd72bb6 WHIRLPOOL c152aa579a0535707909560cc73fc878521aac95c034ec71bca6c2397754b5e057c1e7ca32f6b2b3393ce975f122e65926820cdde29aa5f5734fb9717bd980e0
diff --git a/dev-ruby/bson/bson-3.2.4.ebuild b/dev-ruby/bson/bson-3.2.4.ebuild
new file mode 100644
index 000000000000..0627cb8ec76c
--- /dev/null
+++ b/dev-ruby/bson/bson-3.2.4.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+USE_RUBY="ruby19 ruby20 ruby21 ruby22"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+GITHUB_USER="mongodb"
+GITHUB_PROJECT="bson-ruby"
+
+inherit multilib ruby-fakegem
+
+DESCRIPTION="A Ruby BSON implementation for MongoDB. (Includes binary C-based extension.)"
+HOMEPAGE="http://www.mongodb.org/"
+SRC_URI="https://github.com/${GITHUB_USER}/${GITHUB_PROJECT}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+RUBY_S="bson-ruby-${PV}"
+
+LICENSE="APSL-2"
+SLOT="3"
+KEYWORDS="~amd64"
+IUSE="test doc"
+
+all_ruby_prepare() {
+	# Remove bundler support
+	sed -i -e '/bundler/I s:^:#:' Rakefile || die
+
+	# Remove project-specific rspec options
+	rm .rspec || die
+}
+
+each_ruby_configure() {
+	${RUBY} -C ext/bson extconf.rb || die "extconf.rb failed"
+}
+
+each_ruby_compile() {
+	emake -C ext/bson V=1 CFLAGS="${CFLAGS} -fPIC" archflag="${LDFLAGS}"
+	cp ext/bson/*$(get_modname) lib/ || die
+}
diff --git a/dev-ruby/bundler/bundler-1.8.9.ebuild b/dev-ruby/bundler/bundler-1.8.9.ebuild
index 2c499ce6059b..3f3a00e72ef8 100644
--- a/dev-ruby/bundler/bundler-1.8.9.ebuild
+++ b/dev-ruby/bundler/bundler-1.8.9.ebuild
@@ -22,7 +22,7 @@ SRC_URI="https://github.com/carlhuda/bundler/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 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"
+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="doc test"
 
 ruby_add_rdepend virtual/rubygems
diff --git a/dev-ruby/bunny/Manifest b/dev-ruby/bunny/Manifest
index b980c6059f75..22789c9d59dd 100644
--- a/dev-ruby/bunny/Manifest
+++ b/dev-ruby/bunny/Manifest
@@ -1,3 +1,4 @@
 DIST bunny-1.6.3.gem 180224 SHA256 3eb1339993db6ea5b8655be374c0427924c13bdc9cafee8141e513d334e0a52d SHA512 ceeca544cd05c78adb3bd3164ca84851b65270ecd069e923979b432abc92160642f334df088364ae9960b2c3523260a0ffcd06dd20b51bd798178231efa74a95 WHIRLPOOL 7a9a20240e15c3b480aa870c6270f08ba0d95d12d4ea68e71c444e5abe4933a9dfadbe3babf71c1e35c78a04be09a0d8c01159781b749db3be79189ddede9e13
 DIST bunny-1.7.0.gem 181248 SHA256 889b3bb5b173d8ce16ec7d96cd72ccd742a3e31eaaf0f0336b762cec1f0bf806 SHA512 158ea3906c1318458da7551519ff00e30191f91f0cf3ea777b1069f55cd5fce865591495f56177f8d23a4498bdf95b145caa2027136fab2d3108af6a685eca59 WHIRLPOOL 05fa177b554a5d0c4a76f953242b3d715c4dc969b939375ac22e5d054fee4a1a6634c8a851f25f11120037a1992af7202ff5727452415cea5a3e60cea6c24a03
 DIST bunny-2.0.1.gem 183296 SHA256 ceff06015fa1ddc3aeea397f23242a9de13f3bc7f3481ace1a0b194d66a84236 SHA512 53ef3ec503f4ed5cbcec72343a492f102c358f7f2bd6f4833a3306384faf03195e59f9ca5ef9a7e0d7dc21ae1428c9b107bbbc5a4691853920d3410765e576be WHIRLPOOL 465ea17a2c1ed51127ed37f4ad8fc916d9227111debec127bfcd4e539a7c697c8f5395c3f26cc47c4665948f7e67027d1d0b20c1235b93482aa17302bcbf7771
+DIST bunny-2.2.0.gem 183808 SHA256 901b9e4ccac2edc7b1e08ca63083e519410b46a0c8d23438a6be6570be8282f1 SHA512 f7043ddb7d0f7e9cf365d27456b0545110aa9b61cbbf89fdb73cb73cc60b14d7d9d13c4e6292347a43698053ac06468fe7e10f6bcf4a22306040e85e83fd6d36 WHIRLPOOL 35cbee6eaca8b19248e8f3c344838651ecde93b65eee632c468fa45327adf8685f2deba394a6435fe9635aa5f4a1a0df3284f6c48551be2cd62b88b4880ae658
diff --git a/dev-ruby/bunny/bunny-2.2.0.ebuild b/dev-ruby/bunny/bunny-2.2.0.ebuild
new file mode 100644
index 000000000000..d4bedab2f7d6
--- /dev/null
+++ b/dev-ruby/bunny/bunny-2.2.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+USE_RUBY="ruby19 ruby20 ruby21 ruby22"
+
+RUBY_FAKEGEM_TASK_DOC=""
+
+# Tests require a live AMQP server.
+RUBY_FAKEGEM_TASK_TEST=""
+
+RUBY_FAKEGEM_EXTRADOC="ChangeLog.md README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Another synchronous Ruby AMQP client"
+HOMEPAGE="https://github.com/celldee/bunny"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+ruby_add_rdepend "dev-ruby/amq-protocol:2"
+
+all_ruby_install() {
+	all_fakegem_install
+
+	insinto /usr/share/doc/${PF}
+	doins -r examples || die
+}
diff --git a/dev-ruby/hiera-eyaml-gpg/Manifest b/dev-ruby/hiera-eyaml-gpg/Manifest
index 55bb520746d6..5e92c3fe1e8f 100644
--- a/dev-ruby/hiera-eyaml-gpg/Manifest
+++ b/dev-ruby/hiera-eyaml-gpg/Manifest
@@ -1,2 +1,3 @@
 DIST hiera-eyaml-gpg-0.4.gem 8192 SHA256 9d0b3b64a50ed5e5fe07c83a42731cfb3bdf28607112b3893d7d9e88769c9cac SHA512 51670ed7f13c41643efe3ebfbdf0126e2d048bfe16f5cc1b4d9462f7b0070535417191ababe0bd669fe8f82afe0d0a56dff9dd5299c89b2c6fee3901482b230d WHIRLPOOL 11c0d8cc489325dbdb8f57fcbaad6ced49c1e22d2c55b6190d6b9ab5058128d7e46b29f9c095d4083e3470916fa519aff53c6fb30b61a5672c0a4f8fb6ec54b1
 DIST hiera-eyaml-gpg-0.5.gem 9216 SHA256 0e1d5d984f73b44de4c278dcc8870cb09ddcfae4d4e366d609aa09557002df0e SHA512 a7f2b36dd7678aafaa98197f4b639a9bebe81c99de2f687b1ea3464a7370e89f2d48ee9ccb886f0b8f7955f0f66c69ccacf985ffecf389685e7f07061d54eedd WHIRLPOOL 3ad1134d7548b3ae0efa3c9fea0138dcb48bc0cefcaf7cfc2db40e19d6c624f926fddd8f6de207613b235c1c29392946ca51fa79acc011d28c8e9ad886a4793b
+DIST hiera-eyaml-gpg-0.6.gem 9216 SHA256 430c06ed1df9c529d51af1b65f62810493bb8a84b4de22f63c0ea9393613396a SHA512 bc66c5adbbb4e861ceab689f0695bc6d36b8fe5ecc9e42d03f2640c4264b65d93a19e829edae8aed531f101ac2f41dcccd676741323011a83f0e11944c5204cb WHIRLPOOL e98ca11c2d8427eedf809e0d52a9839ee538192f11744e446f728c4ba7c09f8a5a6abefedd891159f5138742d13b62dd920f4a7efc2d2ff2d99b76e99a2e73af
diff --git a/dev-ruby/hiera-eyaml-gpg/hiera-eyaml-gpg-0.6.ebuild b/dev-ruby/hiera-eyaml-gpg/hiera-eyaml-gpg-0.6.ebuild
new file mode 100644
index 000000000000..c2ccc18da749
--- /dev/null
+++ b/dev-ruby/hiera-eyaml-gpg/hiera-eyaml-gpg-0.6.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+USE_RUBY="ruby19 ruby20 ruby21"
+
+RUBY_FAKEGEM_TASK_TEST=""
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A GPG backend for hiera-eyaml"
+HOMEPAGE="https://github.com/sihil/hiera-eyaml-gpg"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+ruby_add_rdepend '>=dev-ruby/hiera-eyaml-1.3.8'
+ruby_add_rdepend '>=dev-ruby/gpgme-2.0.0'
diff --git a/dev-ruby/jsobfu/jsobfu-0.2.1.ebuild b/dev-ruby/jsobfu/jsobfu-0.2.1.ebuild
index e073df168e13..b20332bf5979 100644
--- a/dev-ruby/jsobfu/jsobfu-0.2.1.ebuild
+++ b/dev-ruby/jsobfu/jsobfu-0.2.1.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://github.com/rapid7/jsobfu"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm ~x86"
 IUSE=""
 
 ruby_add_rdepend ">=dev-ruby/rkelly-remix-0.0.6:0"
diff --git a/dev-ruby/jsobfu/jsobfu-0.3.0.ebuild b/dev-ruby/jsobfu/jsobfu-0.3.0.ebuild
index 4f1b408d6a0c..7f7a090d1edb 100644
--- a/dev-ruby/jsobfu/jsobfu-0.3.0.ebuild
+++ b/dev-ruby/jsobfu/jsobfu-0.3.0.ebuild
@@ -16,11 +16,13 @@ HOMEPAGE="https://github.com/rapid7/jsobfu"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm ~x86"
 IUSE=""
 
 ruby_add_rdepend ">=dev-ruby/rkelly-remix-0.0.6:0"
 
+ruby_add_bdepend "test? ( dev-ruby/execjs )"
+
 all_ruby_prepare() {
 	sed -i -e '/simplecov/ s:^:#:' \
 		-e '/config.\(color\|tty\|formatter\)/ s:^:#:' \
diff --git a/dev-ruby/metasploit-concern/Manifest b/dev-ruby/metasploit-concern/Manifest
new file mode 100644
index 000000000000..5108dd2dc476
--- /dev/null
+++ b/dev-ruby/metasploit-concern/Manifest
@@ -0,0 +1 @@
+DIST metasploit-concern-1.0.0.gem 13312 SHA256 0479a6766d4754720d8eb6ac6b9c108c68095b7e3068d4cca62dd5838173ecfe SHA512 2fc2e511503b4efcc10fec9e0027936333a16de14acd53155942bde1d77e5e208510ec2b563e9ffb81d49d320b6f62bf0fd04f40bc2d2703778943d4730d5bc9 WHIRLPOOL 748be7d2f09af22d9767a0b41321182637058ceefbff8dd1a41ba336a5c31c9c59589b80a012402e7fd33e6892f6ca233d7b0d3cc4d863a955a3fc617f3eaeb2
diff --git a/dev-ruby/metasploit-concern/metadata.xml b/dev-ruby/metasploit-concern/metadata.xml
new file mode 100644
index 000000000000..49861c0ca246
--- /dev/null
+++ b/dev-ruby/metasploit-concern/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer>
+    <email>zerochaos@gentoo.org</email>
+    <name>Rick Farina</name>
+  </maintainer>
+<longdescription lang="en">
+</longdescription>
+  <upstream>
+    <remote-id type="github">rapid7/metasploit-concern</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-ruby/metasploit-concern/metasploit-concern-1.0.0.ebuild b/dev-ruby/metasploit-concern/metasploit-concern-1.0.0.ebuild
new file mode 100644
index 000000000000..cb279d9ad75b
--- /dev/null
+++ b/dev-ruby/metasploit-concern/metasploit-concern-1.0.0.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-ruby/metasploit_data_models/metasploit_data_models-0.17.0.ebuild,v 1.3 2014/07/09 21:13:54 zerochaos Exp $
+
+EAPI=5
+USE_RUBY="ruby19 ruby20 ruby21"
+
+RUBY_FAKEGEM_EXTRAINSTALL="app spec"
+
+inherit ruby-fakegem versionator
+
+DESCRIPTION="Metasploit concern allows you to define concerns in app/concerns. "
+HOMEPAGE="https://github.com/rapid7/metasploit-concern"
+SRC_URI="mirror://rubygems/${P}.gem"
+
+LICENSE="BSD"
+SLOT="$(get_version_component_range 1-2)"
+KEYWORDS="~amd64 ~arm ~x86"
+#IUSE="development test"
+RESTRICT=test
+IUSE=""
+
+RDEPEND="${RDEPEND} !dev-ruby/metasploit-concern:0"
+
+ruby_add_rdepend ">=dev-ruby/railties-4.0.9:4.0
+		  >=dev-ruby/activesupport-4.0.9:4.0"
diff --git a/dev-ruby/metasploit-credential/Manifest b/dev-ruby/metasploit-credential/Manifest
new file mode 100644
index 000000000000..948e652c654d
--- /dev/null
+++ b/dev-ruby/metasploit-credential/Manifest
@@ -0,0 +1 @@
+DIST metasploit-credential-1.0.0.gem 101888 SHA256 086cb65295f1294c213138bd2a9f2f727d945b90837a7e877b22bc6a47fe33f6 SHA512 4af09458a83d9425c5bfd744bc3f366c08d9175b4c303fa9ff53dd3f2163ba654748ea883d22f069e3b3be1218b57afe909f7ba31feb54c0b7ff781af8d5e631 WHIRLPOOL 506c707f3e1be0e90fad02397a34c70e44d1f423b5909d9f61152e2a4e929eadccf0736ec607c569fe75fff24c6003243d0a9a288979450b8c52d5f1feba1f6d
diff --git a/dev-ruby/metasploit-credential/metadata.xml b/dev-ruby/metasploit-credential/metadata.xml
new file mode 100644
index 000000000000..7b6d0792a58d
--- /dev/null
+++ b/dev-ruby/metasploit-credential/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer>
+    <email>zerochaos@gentoo.org</email>
+    <name>Rick Farina</name>
+  </maintainer>
+<longdescription lang="en">
+</longdescription>
+  <upstream>
+    <remote-id type="github">rapid7/metasploit-credential</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-ruby/metasploit-credential/metasploit-credential-1.0.0.ebuild b/dev-ruby/metasploit-credential/metasploit-credential-1.0.0.ebuild
new file mode 100644
index 000000000000..58fbec062563
--- /dev/null
+++ b/dev-ruby/metasploit-credential/metasploit-credential-1.0.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: Exp $
+
+EAPI=5
+USE_RUBY="ruby19 ruby20 ruby21"
+
+inherit ruby-fakegem versionator
+
+RUBY_FAKEGEM_EXTRAINSTALL="app config db spec"
+
+DESCRIPTION="Code for modeling and managing credentials in Metasploit"
+HOMEPAGE="https://github.com/rapid7/metasploit-credential"
+SRC_URI="mirror://rubygems/${P}.gem"
+
+LICENSE="BSD"
+SLOT="$(get_version_component_range 1-2)"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+ruby_add_rdepend ">=dev-ruby/metasploit-concern-1.0.0:1.0
+	>=dev-ruby/metasploit_data_models-1.2.0
+	>=dev-ruby/metasploit-model-1.0.0
+	dev-ruby/rubyzip:1
+	dev-ruby/rubyntlm
+	>=dev-ruby/railties-4.0.9:4.0
+	dev-ruby/net-ssh
+	dev-ruby/pg"
diff --git a/dev-ruby/metasploit-model/Manifest b/dev-ruby/metasploit-model/Manifest
new file mode 100644
index 000000000000..9c02535ff507
--- /dev/null
+++ b/dev-ruby/metasploit-model/Manifest
@@ -0,0 +1 @@
+DIST metasploit-model-1.0.0.gem 77312 SHA256 72e523dd4c13c6146a885599eae150b6addcc1b5e19165fd3382c5a783551cfe SHA512 1020b395787c6ad0f5b409c997f672e35e442e2499081dfab812a87c2aa8ff60d2b59ec1420e88b552e28c9ec12b420806475168da757e41e265d0b8df62dc39 WHIRLPOOL 5f211e16e3c383be0db5a66e97c95d7ff67831e1cfe980b325ff01d353094c69c47f245437ad354e4bd2b6293de288e751d39ead8e37f32242dde71a7b2c487e
diff --git a/dev-ruby/metasploit-model/metadata.xml b/dev-ruby/metasploit-model/metadata.xml
new file mode 100644
index 000000000000..a7eb21203ceb
--- /dev/null
+++ b/dev-ruby/metasploit-model/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer>
+    <email>zerochaos@gentoo.org</email>
+    <name>Rick Farina</name>
+  </maintainer>
+<longdescription lang="en">
+Common code, such as validators and mixins, that are shared between ActiveModels in metasploit-framework and ActiveRecords in metasploit_data_models
+</longdescription>
+  <upstream>
+    <remote-id type="github">rapid7/metasploit-model</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-ruby/metasploit-model/metasploit-model-1.0.0.ebuild b/dev-ruby/metasploit-model/metasploit-model-1.0.0.ebuild
new file mode 100644
index 000000000000..ba8c9430b83a
--- /dev/null
+++ b/dev-ruby/metasploit-model/metasploit-model-1.0.0.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/metasploit_data_models/metasploit_data_models-0.17.0.ebuild,v 1.3 2014/07/09 21:13:54 zerochaos Exp $
+
+EAPI=5
+USE_RUBY="ruby19 ruby20 ruby21"
+
+inherit ruby-fakegem versionator
+
+RUBY_FAKEGEM_EXTRAINSTALL="app config script spec"
+
+DESCRIPTION="Common code, such as validators and mixins"
+HOMEPAGE="https://github.com/rapid7/metasploit-model"
+SRC_URI="mirror://rubygems/${P}.gem"
+
+LICENSE="BSD"
+SLOT="$(get_version_component_range 1-2)"
+KEYWORDS="~amd64 ~arm ~x86"
+#IUSE="development test"
+RESTRICT=test
+IUSE=""
+
+RDEPEND="${RDEPEND} !dev-ruby/metasploit-model:0"
+
+ruby_add_rdepend ">=dev-ruby/railties-4.0.9:4.0
+			>=dev-ruby/activesupport-4.0.9:4.0
+			>=dev-ruby/activemodel-4.0.9:4.0"
+#		development? (	dev-ruby/bundler
+#			dev-ruby/rake
+#			dev-ruby/i18n
+#			dev-ruby/multi_json
+#			dev-ruby/builder
+#			dev-ruby/erubis
+#			dev-ruby/journey
+#			dev-ruby/rack
+#			dev-ruby/rack-cache
+#			dev-ruby/rack-test
+#			dev-ruby/hike
+#			dev-ruby/tilt
+#			dev-ruby/sprockets:*
+#			dev-ruby/actionpack:4.0
+#			dev-ruby/json
+#			dev-ruby/rack-ssl:*
+#			dev-ruby/rdoc
+#			dev-ruby/thor
+#			dev-ruby/redcarpet
+#			<dev-ruby/yard-0.8.7.4 )"
+
+ruby_add_bdepend "dev-ruby/bundler"
+
+all_ruby_prepare() {
+	[ -f Gemfile.lock ] && rm Gemfile.lock
+	#For now, we don't support development or testing at all
+	#if ! use development; then
+		sed -i -e "/^group :development do/,/^end$/d" Gemfile || die
+		sed -i -e "/s.add_development_dependency/d" "${PN}".gemspec || die
+		sed -i -e "/spec.add_development_dependency/d" "${PN}".gemspec || die
+	#fi
+	#if ! use test; then
+		sed -i -e "/^group :test do/,/^end$/d" Gemfile || die
+	#fi
+	#if ! use test && ! use development; then
+		sed -i -e "/^group :development, :test do/,/^end$/d" Gemfile || die
+	#fi
+}
+
+each_ruby_prepare() {
+	if [ -f Gemfile ]
+	then
+			BUNDLE_GEMFILE=Gemfile ${RUBY} -S bundle install --local || die
+			BUNDLE_GEMFILE=Gemfile ${RUBY} -S bundle check || die
+	fi
+}
diff --git a/dev-ruby/metasploit-payloads/Manifest b/dev-ruby/metasploit-payloads/Manifest
new file mode 100644
index 000000000000..f16e5c662caa
--- /dev/null
+++ b/dev-ruby/metasploit-payloads/Manifest
@@ -0,0 +1 @@
+DIST metasploit-payloads-1.0.9.gem 5248000 SHA256 bd9eec335158dd25e579c680856f8c48aa9ba081a5d51d87a05dbb1e511087a3 SHA512 4c08284d4b1d667f545d97e879b2581830f34d42560ba6d6ed7adf32312adc841d5fdd8b55ab4e06a196d1e313fb44fbb861ccac7790e50f88260e2def0a76ed WHIRLPOOL a398dcad94b38626d4bd3d9980d05a24ccdbc12bbd2e902dd4f78c9bcd2cf4a26c76645d989a00aec69d041d9203c5ff31e0b0f948028ac6cd06ae724d573950
diff --git a/dev-ruby/metasploit-payloads/metadata.xml b/dev-ruby/metasploit-payloads/metadata.xml
new file mode 100644
index 000000000000..a0583bde7f26
--- /dev/null
+++ b/dev-ruby/metasploit-payloads/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer>
+    <email>zerochaos@gentoo.org</email>
+    <name>Rick Farina</name>
+  </maintainer>
+<longdescription lang="en">
+</longdescription>
+  <upstream>
+    <remote-id type="github">rapid7/metasploit-payloads</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-ruby/metasploit-payloads/metasploit-payloads-1.0.9-r1.ebuild b/dev-ruby/metasploit-payloads/metasploit-payloads-1.0.9-r1.ebuild
new file mode 100644
index 000000000000..87598a153bba
--- /dev/null
+++ b/dev-ruby/metasploit-payloads/metasploit-payloads-1.0.9-r1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/meterpreter_bins/meterpreter_bins-0.0.10.ebuild,v 1.1 2014/10/19 23:24:24 zerochaos Exp $
+
+EAPI=5
+
+USE_RUBY="ruby19 ruby20 ruby21"
+
+RUBY_FAKEGEM_TASK_DOC=""
+
+RUBY_FAKEGEM_EXTRAINSTALL="data"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Compiled binaries for Metasploit's Meterpreter"
+HOMEPAGE="https://rubygems.org/gems/metasploit-payloads"
+
+LICENSE="BSD"
+
+SLOT="${PV}"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+#no tests
+RESTRICT="test strip"
+
+QA_PREBUILT="
+	usr/$(get_libdir)/ruby/gems/*/gems/${PN}-${SLOT}/data/meterpreter/msflinker_linux_x86.bin
+	usr/$(get_libdir)/ruby/gems/*/gems/${PN}-${SLOT}/data/meterpreter/ext_server_sniffer.lso
+	usr/$(get_libdir)/ruby/gems/*/gems/${PN}-${SLOT}/data/meterpreter/ext_server_networkpug.lso
+	usr/$(get_libdir)/ruby/gems/*/gems/${PN}-${SLOT}/data/meterpreter/ext_server_stdapi.lso
+	usr/$(get_libdir)/ruby/gems/*/gems/${PN}-${SLOT}/data/android/libs/armeabi/libndkstager.so
+	usr/$(get_libdir)/ruby/gems/*/gems/${PN}-${SLOT}/data/android/libs/mips/libndkstager.so
+	usr/$(get_libdir)/ruby/gems/*/gems/${PN}-${SLOT}/data/android/libs/x86/libndkstager.so
+	"
+
+src_install() {
+	ruby-ng_src_install
+	#tell revdep-rebuild to ignore binaries meant for the target
+	dodir /etc/revdep-rebuild
+	cat <<-EOF > "${ED}"/etc/revdep-rebuild/99-${PN}-${SLOT}
+		#These dirs contain prebuilt binaries for running on the TARGET not the HOST
+		SEARCH_DIRS_MASK="/usr/lib*/ruby/gems/*/gems/${PN}-${SLOT}/data/android/libs"
+	EOF
+}
diff --git a/dev-ruby/metasploit_data_models/Manifest b/dev-ruby/metasploit_data_models/Manifest
index b6c9b2d9c770..fbf69cf4699f 100644
--- a/dev-ruby/metasploit_data_models/Manifest
+++ b/dev-ruby/metasploit_data_models/Manifest
@@ -1 +1 @@
-DIST metasploit_data_models-0.17.0.tar.gz 93759 SHA256 ce24d5ac6ff4e60dd04ed82c9e7821617c1234d32c7e6708573fc5a36942532f SHA512 0ca1556d6c8b8a83abd4bad2641d795979e5c7df8bd226ea9be6024df7bb71cec0e5434126a33e09842618a6df1e6dbec0d9049bd4997f3042b063c413e50c69 WHIRLPOOL 224e873f2457cbbd6a142fc28b0076cb325382055a3fcbd20107fc3d439e3ce2cf28e3007517fec7b6537a58194322497bc98342b6d11d4b3a051355a10b6965
+DIST metasploit_data_models-1.2.5.gem 170496 SHA256 7aa426e8f0d69c7a2c00f916dfbbbd19817ec0fe5e55e2d1260fb37ff8b32e29 SHA512 b7bb1f12da67b0a052cba68e5f870bc7512baba884573a79095abd4d55539c18956615bd7097f1c1260507222f80644a2d0a65bb9f3ca7cc4c45e275ee5c9500 WHIRLPOOL d6702bdeb59e8dcac3516f2ba8be3a319348e6a08803bcc93a8beba6a76a6e3ca5ce8e46263f9e30c37f01c745ab4badd3665a3984f7ea6ae015bb4b8c3330ec
diff --git a/dev-ruby/metasploit_data_models/metasploit_data_models-0.17.0.ebuild b/dev-ruby/metasploit_data_models/metasploit_data_models-0.17.0.ebuild
deleted file mode 100644
index 69ac28f2ac76..000000000000
--- a/dev-ruby/metasploit_data_models/metasploit_data_models-0.17.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-USE_RUBY="ruby19 ruby20 ruby21"
-
-RUBY_FAKEGEM_TASK_DOC=""
-
-# Tests depend on unpackaged factory_girl_rails
-RUBY_FAKEGEM_RECIPE_TEST=""
-
-RUBY_FAKEGEM_EXTRAINSTALL="app db script spec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="The database layer for Metasploit"
-HOMEPAGE="https://github.com/rapid7/metasploit_data_models"
-SRC_URI="https://github.com/rapid7/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-ruby_add_rdepend "
-		>=dev-ruby/activerecord-3.2.10[postgres]
-		dev-ruby/activesupport"
diff --git a/dev-ruby/metasploit_data_models/metasploit_data_models-1.2.5.ebuild b/dev-ruby/metasploit_data_models/metasploit_data_models-1.2.5.ebuild
new file mode 100644
index 000000000000..ab46acd326a7
--- /dev/null
+++ b/dev-ruby/metasploit_data_models/metasploit_data_models-1.2.5.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/metasploit_data_models/metasploit_data_models-0.17.0.ebuild,v 1.3 2014/07/09 21:13:54 zerochaos Exp $
+
+EAPI=5
+USE_RUBY="ruby19 ruby20 ruby21"
+
+inherit ruby-fakegem versionator
+
+RUBY_FAKEGEM_EXTRAINSTALL="app config db script spec"
+
+DESCRIPTION="The database layer for Metasploit"
+HOMEPAGE="https://github.com/rapid7/metasploit_data_models"
+SRC_URI="mirror://rubygems/${P}.gem"
+
+LICENSE="BSD"
+SLOT="$(get_version_component_range 1-2)"
+KEYWORDS="~amd64 ~arm ~x86"
+RESTRICT=test
+#IUSE="development test"
+IUSE=""
+
+RDEPEND="${RDEPEND} !dev-ruby/metasploit_data_models:0"
+
+ruby_add_rdepend "
+		>=dev-ruby/activerecord-4.0.9:4.0[postgres]
+		>=dev-ruby/activesupport-4.0.9:4.0
+		dev-ruby/pg
+		dev-ruby/postgres_ext
+		>=dev-ruby/railties-4.0.9:4.0
+		dev-ruby/recog
+		dev-ruby/arel-helpers
+		>=dev-ruby/metasploit-concern-1.0.0:1.0
+		>=dev-ruby/metasploit-model-1.0.0:1.0
+		<dev-ruby/thor-2.0"
+
+ruby_add_bdepend "dev-ruby/bundler"
+
+all_ruby_prepare() {
+	[ -f Gemfile.lock ] && rm Gemfile.lock
+	#if ! use development; then
+		sed -i -e "/^group :development do/,/^end$/d" Gemfile || die
+		sed -i -e "/s.add_development_dependency/d" "${PN}".gemspec || die
+	#fi
+	#if ! use test; then
+		sed -i -e "/^group :test do/,/^end$/d" Gemfile || die
+	#fi
+	#if ! use test && ! use development; then
+		sed -i -e "/^group :development, :test do/,/^end$/d" Gemfile || die
+	#fi
+}
+
+each_ruby_prepare() {
+	if [ -f Gemfile ]
+	then
+		BUNDLE_GEMFILE=Gemfile ${RUBY} -S bundle install --local || die
+		BUNDLE_GEMFILE=Gemfile ${RUBY} -S bundle check || die
+	fi
+}
+
+all_ruby_install() {
+	ruby_fakegem_binwrapper mdm_console mdm_console-${SLOT}
+}
diff --git a/dev-ruby/meterpreter_bins/Manifest b/dev-ruby/meterpreter_bins/Manifest
index fec5ea62241c..af2b7a69f7a1 100644
--- a/dev-ruby/meterpreter_bins/Manifest
+++ b/dev-ruby/meterpreter_bins/Manifest
@@ -1,2 +1 @@
-DIST meterpreter_bins-0.0.10.gem 2940928 SHA256 cd169b35596c919606a97bc5ddc5d2d0883e2ff4899a2fcbe2904cf8787dc339 SHA512 0f02d2bd444e97f02a851646435374e4772f6f5128b45b99b43cdcb93c4a6bf91ceae6facacb10a5e643a6785a95749fd0b5d604de5b86f6568e161043e969ef WHIRLPOOL 71647ef0bc6d1b2db4e7b3403dc9aa6145a0e4836e88d84c5f5de18fb2b3e359e99ad62b3954c69939d5d8703103aa2a8737be27f3ed56683c81d9fd35be9809
-DIST meterpreter_bins-0.0.6.gem 2939904 SHA256 75e1f451a80212314661712d9a88b9ddb4b9b51b18d9451fb05d81d8ffef083e SHA512 d9c51bd61643c41d882db9f6a92477af46cbad6f78428861f52f1bcb283ab1c24a41b297cc70993c7573b0e7578631635beaa83c2bad2170ded7064c5a98c739 WHIRLPOOL 722ebcebf8db8f4fb933a1cf8dedd400cec200d754f0fcab832ba0e62b7fd5f59bc378abe839c5b858d0aaf1f79447f08b65db4e1772066ae3254c0d57192dc5
+DIST meterpreter_bins-0.0.22.gem 3565568 SHA256 870c5f87950d61b7ca55d37ffdfff4592e8e9d1769cd7a546403e3163da5396c SHA512 80b7856bdab0ec91f6adae5497f8d119f21e8f36a2c1750e50f2dda9323dbaf7ebccf6f1a8e57f2459d8a2e6ab7b718454d35a653da6ec03e1e01c1d04c9288d WHIRLPOOL 5c20d5ff8e20a865e9eeb0945bcd81c01c386adc625d4920d1b0b6f61435540a815db0fc37480601181a481f8c304b7e8523d58fe308a5e6b1e5aff3be28ba44
diff --git a/dev-ruby/meterpreter_bins/meterpreter_bins-0.0.10.ebuild b/dev-ruby/meterpreter_bins/meterpreter_bins-0.0.10.ebuild
deleted file mode 100644
index 8c89593fbed8..000000000000
--- a/dev-ruby/meterpreter_bins/meterpreter_bins-0.0.10.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-USE_RUBY="ruby19 ruby20 ruby21 ruby22"
-
-RUBY_FAKEGEM_TASK_DOC=""
-
-RUBY_FAKEGEM_EXTRAINSTALL="meterpreter"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Compiled binaries for Metasploit's Meterpreter"
-HOMEPAGE="https://github.com/rapid7/meterpreter_bins"
-
-#https://github.com/rapid7/meterpreter_bins/issues/5
-LICENSE="BSD"
-
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-#no tests
-RESTRICT=test
diff --git a/dev-ruby/meterpreter_bins/meterpreter_bins-0.0.22.ebuild b/dev-ruby/meterpreter_bins/meterpreter_bins-0.0.22.ebuild
new file mode 100644
index 000000000000..8bdf410ec362
--- /dev/null
+++ b/dev-ruby/meterpreter_bins/meterpreter_bins-0.0.22.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-ruby/meterpreter_bins/meterpreter_bins-0.0.10.ebuild,v 1.1 2014/10/19 23:24:24 zerochaos Exp $
+
+EAPI=5
+
+USE_RUBY="ruby19 ruby20 ruby21"
+
+RUBY_FAKEGEM_TASK_DOC=""
+
+RUBY_FAKEGEM_EXTRAINSTALL="meterpreter"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Compiled binaries for Metasploit's Meterpreter"
+HOMEPAGE="https://github.com/rapid7/meterpreter_bins"
+
+#https://github.com/rapid7/meterpreter_bins/issues/5
+LICENSE="BSD"
+
+SLOT="${PV}"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+#no tests
+RESTRICT=test
+
+RDEPEND="${RDEPEND} !dev-ruby/meterpreter_bins:0"
diff --git a/dev-ruby/meterpreter_bins/meterpreter_bins-0.0.6.ebuild b/dev-ruby/meterpreter_bins/meterpreter_bins-0.0.6.ebuild
deleted file mode 100644
index 039dcec27cf7..000000000000
--- a/dev-ruby/meterpreter_bins/meterpreter_bins-0.0.6.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-USE_RUBY="ruby19 ruby20"
-
-RUBY_FAKEGEM_TASK_DOC=""
-
-RUBY_FAKEGEM_EXTRAINSTALL="meterpreter"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Compiled binaries for Metasploit's Meterpreter"
-HOMEPAGE="https://github.com/rapid7/meterpreter_bins"
-
-#https://github.com/rapid7/meterpreter_bins/issues/5
-LICENSE="BSD"
-
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-#no tests
-RESTRICT=test
diff --git a/dev-ruby/method_source/method_source-0.8.2-r3.ebuild b/dev-ruby/method_source/method_source-0.8.2-r3.ebuild
index 21a313d35dec..06aa636c4c64 100644
--- a/dev-ruby/method_source/method_source-0.8.2-r3.ebuild
+++ b/dev-ruby/method_source/method_source-0.8.2-r3.ebuild
@@ -17,7 +17,7 @@ IUSE=""
 SLOT="0"
 
 LICENSE="MIT"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
 
 ruby_add_bdepend "test? ( >=dev-ruby/bacon-1.1.0 )"
 
diff --git a/dev-ruby/naught/Manifest b/dev-ruby/naught/Manifest
index 3a440d05b251..13495b1094b4 100644
--- a/dev-ruby/naught/Manifest
+++ b/dev-ruby/naught/Manifest
@@ -1 +1,2 @@
 DIST naught-1.0.0.gem 18432 SHA256 edc710f133e8455deb413ffc5f0ca9da586f04a2b716cfbf65d324360c84a612 SHA512 2a68358a50548d0d1dcc85a93246fb79e95ca4aef99376f80d7ae46ff6262d4adc764da3e8eb8df2d5410091fabf1e641f47781e7c30fd3dac58acf0e35f4626 WHIRLPOOL 71d40cb2b7748991d29dc162e9173b5c26f28e95da84308677258b4d688e9e8729e46b9e2aa9efa3246841beb8ce48d7a389b4cc4413134c026cde2534592d4d
+DIST naught-1.1.0.gem 19456 SHA256 4f4f6b44e52237ffca56977ccee1cafa93e95434062974e9b580adf7cbe892f3 SHA512 0a25825df0234f15a53dc7a8dff546846c605fde9b1e3ce0b3e88f6e1753117bd48586b450dcd08c45a0d4877a04ac19feb98fd70d929f9da3ccba8478e46a57 WHIRLPOOL 51ae9c413a514877ab028f5b7bc30ab5f108b168c180e09a7d9ae5a815beec1ce5136610f7ef5996e1f11e73e695c714c547065fa7acd75b3994a38c4b6cf1ca
diff --git a/dev-ruby/naught/naught-1.1.0.ebuild b/dev-ruby/naught/naught-1.1.0.ebuild
new file mode 100644
index 000000000000..b99ed79b2274
--- /dev/null
+++ b/dev-ruby/naught/naught-1.1.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+USE_RUBY="ruby19 ruby20 ruby21 ruby22"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_EXTRADOC="Changelog.md README.markdown"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A toolkit for building Null Objects in Ruby"
+HOMEPAGE="https://github.com/avdi/naught"
+
+LICENSE="MIT"
+SLOT="5"
+KEYWORDS="~amd64"
+IUSE=""
+
+all_ruby_prepare() {
+	sed -i -e '/simplecov/,/^end/ s:^:#:' spec/spec_helper.rb || die
+}
diff --git a/dev-ruby/net-ssh/net-ssh-2.10.0.ebuild b/dev-ruby/net-ssh/net-ssh-2.10.0.ebuild
index 61f2c528f1ef..dec8d5a18d52 100644
--- a/dev-ruby/net-ssh/net-ssh-2.10.0.ebuild
+++ b/dev-ruby/net-ssh/net-ssh-2.10.0.ebuild
@@ -20,7 +20,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> net-ssh-git-${P
 
 LICENSE="GPL-2"
 SLOT="2.6"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 ruby_add_rdepend "virtual/ruby-ssl"
diff --git a/dev-ruby/open4/open4-1.3.4.ebuild b/dev-ruby/open4/open4-1.3.4.ebuild
index 5ef01faa37d8..b6890ac0fe7a 100644
--- a/dev-ruby/open4/open4-1.3.4.ebuild
+++ b/dev-ruby/open4/open4-1.3.4.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://github.com/ahoward/open4"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
 IUSE=""
 
 ruby_add_bdepend "test? ( dev-ruby/minitest )"
diff --git a/dev-ruby/packetfu/packetfu-1.1.10-r1.ebuild b/dev-ruby/packetfu/packetfu-1.1.10-r1.ebuild
deleted file mode 100644
index f1d5b3a21e2b..000000000000
--- a/dev-ruby/packetfu/packetfu-1.1.10-r1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-USE_RUBY="ruby19 ruby20 ruby21 ruby22"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec"
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-
-RUBY_FAKEGEM_EXTRADOC="README.rdoc"
-
-inherit multilib ruby-fakegem
-
-DESCRIPTION="A mid-level packet manipulation library"
-HOMEPAGE="https://rubygems.org/gems/packetfu"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-
-ruby_add_rdepend " >=dev-ruby/pcaprub-0.9.2"
-
-RUBY_PATCHES=( "${FILESDIR}"/${P}-ruby2x-encoding.patch )
-
-all_ruby_prepare() {
-	# Broken for version numbers with multiple digits...
-	sed -i -e '/reports a version number/,/end/ s:^:#:' spec/packetfu_spec.rb || die
-}
diff --git a/dev-ruby/packetfu/packetfu-1.1.10-r2.ebuild b/dev-ruby/packetfu/packetfu-1.1.10-r2.ebuild
new file mode 100644
index 000000000000..0306298b4cfe
--- /dev/null
+++ b/dev-ruby/packetfu/packetfu-1.1.10-r2.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+USE_RUBY="ruby19 ruby20 ruby21 ruby22"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec"
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+
+RUBY_FAKEGEM_EXTRADOC="README.rdoc"
+
+inherit multilib ruby-fakegem
+
+DESCRIPTION="A mid-level packet manipulation library"
+HOMEPAGE="https://rubygems.org/gems/packetfu"
+
+LICENSE="BSD"
+SLOT="${PV}"
+KEYWORDS="~amd64 ~arm ~x86"
+
+ruby_add_rdepend " >=dev-ruby/pcaprub-0.9.2:*"
+DEPEND="${DEPEND} !dev-ruby/packetfu:0"
+
+RUBY_PATCHES=( "${FILESDIR}"/${P}-ruby2x-encoding.patch )
+
+all_ruby_prepare() {
+	# Broken for version numbers with multiple digits...
+	sed -i -e '/reports a version number/,/end/ s:^:#:' spec/packetfu_spec.rb || die
+}
diff --git a/dev-ruby/packetfu/packetfu-1.1.11-r1.ebuild b/dev-ruby/packetfu/packetfu-1.1.11-r1.ebuild
new file mode 100644
index 000000000000..b9a1bbca0f1e
--- /dev/null
+++ b/dev-ruby/packetfu/packetfu-1.1.11-r1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+USE_RUBY="ruby19 ruby20 ruby21 ruby22"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+
+RUBY_FAKEGEM_EXTRADOC="README.rdoc"
+
+inherit multilib ruby-fakegem
+
+DESCRIPTION="A mid-level packet manipulation library"
+HOMEPAGE="https://rubygems.org/gems/packetfu"
+
+LICENSE="BSD"
+SLOT="${PV}"
+KEYWORDS="~amd64 ~arm ~x86"
+
+ruby_add_rdepend "
+	dev-ruby/network_interface:0
+	dev-ruby/pcaprub:0.12
+"
+
+ruby_add_bdepend "test? ( >=dev-ruby/rspec-its-1.2.0:1 )
+			dev-ruby/bundler"
+DEPEND="${DEPEND} !dev-ruby/packetfu:0"
+
+all_ruby_prepare() {
+	[ -f Gemfile.lock ] && rm Gemfile.lock
+	#For now, we don't support development or testing at all
+	#if ! use development; then
+		sed -i -e "/^group :development do/,/^end$/d" Gemfile || die
+		sed -i -e "/s.add_development_dependency/d" "${PN}".gemspec || die
+		sed -i -e "/spec.add_development_dependency/d" "${PN}".gemspec || die
+	#fi
+	#if ! use test; then
+		sed -i -e "/^group :test do/,/^end$/d" Gemfile || die
+	#fi
+	#if ! use test && ! use development; then
+		sed -i -e "/^group :development, :test do/,/^end$/d" Gemfile || die
+	#fi
+}
+
+each_ruby_prepare() {
+	if [ -f Gemfile ]
+	then
+		BUNDLE_GEMFILE=Gemfile ${RUBY} -S bundle install --local || die
+		BUNDLE_GEMFILE=Gemfile ${RUBY} -S bundle check || die
+	fi
+}
diff --git a/dev-ruby/packetfu/packetfu-1.1.11.ebuild b/dev-ruby/packetfu/packetfu-1.1.11.ebuild
deleted file mode 100644
index 71525b2e5dee..000000000000
--- a/dev-ruby/packetfu/packetfu-1.1.11.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-USE_RUBY="ruby19 ruby20 ruby21 ruby22"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-
-RUBY_FAKEGEM_EXTRADOC="README.rdoc"
-
-inherit multilib ruby-fakegem
-
-DESCRIPTION="A mid-level packet manipulation library"
-HOMEPAGE="https://rubygems.org/gems/packetfu"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-
-ruby_add_rdepend "
-	dev-ruby/network_interface:0
-	>=dev-ruby/pcaprub-0.9.2
-"
-
-ruby_add_bdepend "test? ( >=dev-ruby/rspec-its-1.2.0:1 )"
diff --git a/dev-ruby/packetfu/packetfu-1.1.9-r1.ebuild b/dev-ruby/packetfu/packetfu-1.1.9-r1.ebuild
new file mode 100644
index 000000000000..2a379302c1b9
--- /dev/null
+++ b/dev-ruby/packetfu/packetfu-1.1.9-r1.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+USE_RUBY="ruby19 ruby21"
+
+inherit multilib ruby-fakegem
+
+DESCRIPTION="A mid-level packet manipulation library"
+HOMEPAGE="https://rubygems.org/gems/packetfu"
+
+LICENSE="BSD"
+SLOT="${PV}"
+KEYWORDS="~amd64 ~arm ~x86"
+
+ruby_add_rdepend " >=dev-ruby/pcaprub-0.9.2:*"
+ruby_add_bdepend "test? ( >=dev-ruby/rspec-2.6.2 )
+	doc? ( >=dev-ruby/sdoc-0.2.0 )"
+DEPEND="${DEPEND} !dev-ruby/packetfu:0"
diff --git a/dev-ruby/packetfu/packetfu-1.1.9.ebuild b/dev-ruby/packetfu/packetfu-1.1.9.ebuild
deleted file mode 100644
index a63e4f3b241b..000000000000
--- a/dev-ruby/packetfu/packetfu-1.1.9.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-USE_RUBY="ruby19 ruby21"
-
-inherit multilib ruby-fakegem
-
-DESCRIPTION="A mid-level packet manipulation library"
-HOMEPAGE="https://rubygems.org/gems/packetfu"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-
-ruby_add_rdepend " >=dev-ruby/pcaprub-0.9.2"
-ruby_add_bdepend "test? ( >=dev-ruby/rspec-2.6.2 )
-	doc? ( >=dev-ruby/sdoc-0.2.0 )"
diff --git a/dev-ruby/patron/Manifest b/dev-ruby/patron/Manifest
index 33226609a1e3..05217b378038 100644
--- a/dev-ruby/patron/Manifest
+++ b/dev-ruby/patron/Manifest
@@ -1,2 +1,3 @@
 DIST patron-0.4.18.gem 35840 SHA256 700ffba09ea854bc26fdde08998d8310ed59b0721098d4a7dc9a85845c71bd81 SHA512 0069f42378b0dfe03e6f86003b7927b099fd15be4d4b5eeba51958774380bf7a9ddbd8a83b30942d02e95b923f9ae0a1c1abf5bcda8ca8490671208e0ae8ecb4 WHIRLPOOL c709bcd65033288fc55d8d5c044c001afa8ac34d098466e017c5adc3a08314897e86f021a09f61abcc5153893152518dc1843ba7dfa79fc271067b708283b75c
 DIST patron-0.4.20.gem 42496 SHA256 eb1782f38f280a9975fc97435920c29fd10a0c2e05b6f7a7549652ffbf92af71 SHA512 78cb97e7d7a35fb97ed7da4c767937a543c1f979c7dd1dff0d3b055024b37aa50238163af4680ba464a28523c0f5879f0d6e372276774dfdac726a5493c202e5 WHIRLPOOL a4158ac99edd2d302e59420be6d75b368e9d9d04ecd9b5051a53eb22639f3f32fa541061f28444cb716deab906c3055ddbc26c4f5289fa0c00c134517ac9ffdd
+DIST patron-0.5.0.gem 44032 SHA256 6abf431b05f560afc8c479685bb3869797522290777a1ae8510ef5c8b3208c63 SHA512 84c4cbb4ebeac3a9320915b35e4afefda5637f1bed96e83b8c2345dfd08ba02e07806b13a87c5067dd842ccddb67928c7f60889687676c0683d4e09373d8c2a7 WHIRLPOOL df34adeb59ea45d5d84a6ad1aef3e0fbf4781720443be2ba37450ddf2e51ac3b2c969bb2798fe78bb476cde79f4ccc3d3c1f6511a20dc2deda5a750ec9d03139
diff --git a/dev-ruby/patron/patron-0.5.0.ebuild b/dev-ruby/patron/patron-0.5.0.ebuild
new file mode 100644
index 000000000000..1731d1a7e70f
--- /dev/null
+++ b/dev-ruby/patron/patron-0.5.0.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+USE_RUBY="ruby19 ruby20 ruby21 ruby22"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+inherit multilib ruby-fakegem
+
+DESCRIPTION="Patron is a Ruby HTTP client library based on libcurl"
+HOMEPAGE="https://toland.github.com/patron/"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND+=" net-misc/curl"
+RDEPEND+=" net-misc/curl"
+
+all_ruby_prepare() {
+	# Fix Rakefile
+	sed -i -e 's:rake/rdoctask:rdoc/task:' \
+		-e 's/README.txt/README.md/' \
+		-e '/bundler/I s:^:#:' \
+		-e '/extensiontask/ s:^:#:' \
+		-e '/ExtensionTask/,/^end/ s:^:#:' \
+		Rakefile || die
+
+	# Avoid specs with failures. We were not running any specs before.
+	rm spec/session_ssl_spec.rb spec/session_spec.rb spec/response_spec.rb || die
+}
+
+each_ruby_configure() {
+	${RUBY} -Cext/patron extconf.rb || die
+}
+
+each_ruby_compile() {
+	emake -Cext/patron V=1
+	cp ext/patron/session_ext$(get_modname) lib/patron/ || die "Unable to cp shared object file"
+}
diff --git a/dev-ruby/pcaprub/pcaprub-0.11.3-r1.ebuild b/dev-ruby/pcaprub/pcaprub-0.11.3-r1.ebuild
deleted file mode 100644
index 3975d2216211..000000000000
--- a/dev-ruby/pcaprub/pcaprub-0.11.3-r1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-USE_RUBY="ruby19 ruby20 ruby21 ruby22"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="FAQ.rdoc README.rdoc USAGE.rdoc"
-
-inherit multilib ruby-fakegem
-
-DESCRIPTION="Libpcap bindings for ruby compat"
-HOMEPAGE="https://rubygems.org/gems/pcaprub"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-
-DEPEND+="net-libs/libpcap"
-RDEPEND+="net-libs/libpcap"
-
-# Tests require live access to a network device as root.
-RESTRICT="test"
-
-each_ruby_configure() {
-	${RUBY} -Cext/${PN} extconf.rb || die
-}
-
-each_ruby_compile() {
-	emake -C ext/${PN} V=1
-	cp ext/${PN}/${PN}$(get_modname) lib || die
-}
diff --git a/dev-ruby/pcaprub/pcaprub-0.11.3-r2.ebuild b/dev-ruby/pcaprub/pcaprub-0.11.3-r2.ebuild
new file mode 100644
index 000000000000..d2505f1859a9
--- /dev/null
+++ b/dev-ruby/pcaprub/pcaprub-0.11.3-r2.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+USE_RUBY="ruby19 ruby20 ruby21 ruby22"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_EXTRADOC="FAQ.rdoc README.rdoc USAGE.rdoc"
+
+inherit multilib ruby-fakegem versionator
+
+DESCRIPTION="Libpcap bindings for ruby compat"
+HOMEPAGE="https://rubygems.org/gems/pcaprub"
+
+LICENSE="LGPL-2.1"
+SLOT="$(get_version_component_range 1-2)"
+KEYWORDS="~amd64 ~arm ~x86"
+
+DEPEND+="net-libs/libpcap"
+RDEPEND+="net-libs/libpcap"
+
+# Tests require live access to a network device as root.
+RESTRICT="test"
+
+each_ruby_configure() {
+	${RUBY} -Cext/${PN} extconf.rb || die
+}
+
+each_ruby_compile() {
+	emake -C ext/${PN} V=1
+	cp ext/${PN}/${PN}$(get_modname) lib || die
+}
diff --git a/dev-ruby/pcaprub/pcaprub-0.12.0-r1.ebuild b/dev-ruby/pcaprub/pcaprub-0.12.0-r1.ebuild
new file mode 100644
index 000000000000..431dffb69a8c
--- /dev/null
+++ b/dev-ruby/pcaprub/pcaprub-0.12.0-r1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+USE_RUBY="ruby19 ruby20 ruby21 ruby22"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_EXTRADOC="FAQ.rdoc README.rdoc USAGE.rdoc"
+
+inherit multilib ruby-fakegem versionator
+
+DESCRIPTION="Libpcap bindings for ruby compat"
+HOMEPAGE="https://rubygems.org/gems/pcaprub"
+
+LICENSE="LGPL-2.1"
+SLOT="$(get_version_component_range 1-2)"
+KEYWORDS="~amd64 ~arm ~x86"
+
+DEPEND+="net-libs/libpcap"
+RDEPEND+="net-libs/libpcap"
+
+# Tests require live access to a network device as root.
+RESTRICT="test"
+
+each_ruby_configure() {
+	${RUBY} -Cext/pcaprub_c extconf.rb || die
+}
+
+each_ruby_compile() {
+	emake -C ext/pcaprub_c V=1
+	cp ext/pcaprub_c/pcaprub_c$(get_modname) lib || die
+}
diff --git a/dev-ruby/pcaprub/pcaprub-0.12.0.ebuild b/dev-ruby/pcaprub/pcaprub-0.12.0.ebuild
deleted file mode 100644
index 991ddc7b999c..000000000000
--- a/dev-ruby/pcaprub/pcaprub-0.12.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-USE_RUBY="ruby19 ruby20 ruby21 ruby22"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="FAQ.rdoc README.rdoc USAGE.rdoc"
-
-inherit multilib ruby-fakegem
-
-DESCRIPTION="Libpcap bindings for ruby compat"
-HOMEPAGE="https://rubygems.org/gems/pcaprub"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-
-DEPEND+="net-libs/libpcap"
-RDEPEND+="net-libs/libpcap"
-
-# Tests require live access to a network device as root.
-RESTRICT="test"
-
-each_ruby_configure() {
-	${RUBY} -Cext/pcaprub_c extconf.rb || die
-}
-
-each_ruby_compile() {
-	emake -C ext/pcaprub_c V=1
-	cp ext/pcaprub_c/pcaprub_c$(get_modname) lib || die
-}
diff --git a/dev-ruby/pg/Manifest b/dev-ruby/pg/Manifest
index 68b728437088..5c9a9cea64d9 100644
--- a/dev-ruby/pg/Manifest
+++ b/dev-ruby/pg/Manifest
@@ -1,3 +1,3 @@
-DIST pg-0.14.1.gem 108544 SHA256 9e7911f2f6ecef295ca2da1afcc0c97f547659e05696c9428538174a9eb9193d SHA512 12f4f69ad2ed7a975acf0f43016f646b137621135ff599bde038dd09e233d3ff53a79fe01f694c60a3ff306f3967a011083b7d34e4b07b831b0de47811dd47ad WHIRLPOOL 56aa83d2bd78f05a7218146ca15e5e082d85c4190432b6eca08a32e53fd89ed89cd36aedc0d7a47c2602ed28d4be3310abaa5bdddb9654174699d7f86fdbf9be
 DIST pg-0.17.1.gem 142848 SHA256 e7933e8f7f184c28e820ed85ddfb3ad8a13933b2b2ab8656aa8f81cb0aa610a6 SHA512 fb637256d084af3b41ba4130f866924df957a63c29d029b99995bf553e545b3d4064e682b00d0604bf495a853a8800b9c8eba34718e96c651c9a697281ae4a62 WHIRLPOOL 81e0a99d023a49b29b8be1b11290cd0f102cec92adc63a8ed10e215dcd3ef43b8ce5e1916d0f155790e9304670bb0c96921346663798acb5fb973e47fdadfe9f
 DIST pg-0.18.2.gem 216576 SHA256 ee4e81f2cdb397d866f15c54f057f1172c8098dc5a8d1ce2883806198d5bbdab SHA512 14707bc4e1c5700cf30b0541c14d31681986c7574281ea878a1d17f89a8986abdd00c7c64c763b56bf675fe0b9be177c4ca9822842cee75a2b57cad49d396a4f WHIRLPOOL 66f2fb4d13ee6da34112cacdd0d4be19a99345b3e17301cd154541e12cb9e799383257584e6cd7bdf60a9f6b888be3ecdefa12d1a7729b7901362ce390d4fad5
+DIST pg-0.18.3.gem 218624 SHA256 0cbddb3e2d36b5db262abc1f12a17e1e972f2778c056729f61d6bf1e1b1ce301 SHA512 dc4152dd7b546f3e182075ecd9086ca88c462b570d948f7879de8084e36f19fc6256ab8e5b3ac2ff267f43998a99f44c159c84af47e6637fa14b2aa16f14b139 WHIRLPOOL 8ca2b8613ce6725c92466d83bec37f577f7c6ecad0acc08eeb6c91325c8f936d17a5fb77b25dd659db1a3ebd21cc246016424c65d483da771e3657b2fe157ea8
diff --git a/dev-ruby/pg/pg-0.14.1.ebuild b/dev-ruby/pg/pg-0.14.1.ebuild
deleted file mode 100644
index e745f1fe8d24..000000000000
--- a/dev-ruby/pg/pg-0.14.1.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-USE_RUBY="ruby19"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="ChangeLog Contributors.rdoc README.rdoc History.rdoc"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Ruby extension library providing an API to PostgreSQL"
-HOMEPAGE="https://bitbucket.org/ged/ruby-pg/"
-
-LICENSE="|| ( GPL-2 Ruby )"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND="${RDEPEND}
-	dev-db/postgresql"
-DEPEND="${DEPEND}
-	dev-db/postgresql
-	test? ( dev-db/postgresql[server,threads] )"
-
-ruby_add_bdepend "
-	doc? (
-		dev-ruby/hoe
-		|| ( >=dev-ruby/yard-0.6.1 dev-ruby/rdoc ) )"
-
-all_ruby_prepare() {
-	# hack the Rakefile to make it sure that it doesn't load
-	# rake-compiler (so that we don't have to depend on it and it
-	# actually works when building with USE=doc).
-	sed -i \
-		-e '/Rakefile.cross/s:^:#:' \
-		-e '/ExtensionTask/,/^end$/ s:^:#:' \
-		Rakefile || die
-
-	sed -i -e '18i require "socket"' spec/pg/connection_spec.rb || die
-}
-
-each_ruby_configure() {
-	${RUBY} -C ext extconf.rb || die "extconf.rb failed"
-}
-
-each_ruby_compile() {
-	emake -C ext CFLAGS="${CFLAGS} -fPIC" archflag="${LDFLAGS}"
-	cp ext/*.so lib || die
-}
-
-each_ruby_test() {
-	if [[ "${EUID}" -ne "0" ]]; then
-		# Make the rspec call explicit, this way we don't have to depend
-		# on rake-compiler (nor rubygems) _and_ we don't have to rebuild
-		# the whole extension from scratch.
-		ruby-ng_rspec
-	else
-		ewarn "The userpriv feature must be enabled to run tests."
-		eerror "Testsuite will not be run."
-	fi
-}
diff --git a/dev-ruby/pg/pg-0.17.1.ebuild b/dev-ruby/pg/pg-0.17.1.ebuild
index 0f2413982fa9..f52045cfb54e 100644
--- a/dev-ruby/pg/pg-0.17.1.ebuild
+++ b/dev-ruby/pg/pg-0.17.1.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="https://bitbucket.org/ged/ruby-pg/"
 
 LICENSE="|| ( GPL-2 Ruby )"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="${RDEPEND}
diff --git a/dev-ruby/pg/pg-0.18.3.ebuild b/dev-ruby/pg/pg-0.18.3.ebuild
new file mode 100644
index 000000000000..f78c19206362
--- /dev/null
+++ b/dev-ruby/pg/pg-0.18.3.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+# ruby19 test fail
+USE_RUBY="ruby20 ruby21 ruby22"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_TASK_DOC="docs"
+RUBY_FAKEGEM_DOCDIR="doc"
+RUBY_FAKEGEM_EXTRADOC="ChangeLog Contributors.rdoc README.rdoc History.rdoc"
+
+inherit multilib ruby-fakegem
+
+DESCRIPTION="Ruby extension library providing an API to PostgreSQL"
+HOMEPAGE="https://bitbucket.org/ged/ruby-pg/"
+
+LICENSE="|| ( GPL-2 Ruby )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND+=" dev-db/postgresql"
+DEPEND+=" dev-db/postgresql
+	test? ( >=dev-db/postgresql-9.4[server,threads] )"
+
+ruby_add_bdepend "
+	doc? (
+		dev-ruby/hoe
+		|| ( >=dev-ruby/yard-0.6.1 dev-ruby/rdoc ) )"
+
+all_ruby_prepare() {
+	# hack the Rakefile to make it sure that it doesn't load
+	# rake-compiler (so that we don't have to depend on it and it
+	# actually works when building with USE=doc).
+	sed -i \
+		-e '/Rakefile.cross/s:^:#:' \
+		-e '/ExtensionTask/,/^end$/ s:^:#:' \
+		Rakefile || die
+}
+
+each_ruby_configure() {
+	${RUBY} -C ext extconf.rb || die "extconf.rb failed"
+}
+
+each_ruby_compile() {
+	emake V=1 -C ext CFLAGS="${CFLAGS} -fPIC" archflag="${LDFLAGS}"
+	cp ext/*$(get_libname) lib || die
+}
+
+each_ruby_test() {
+	if [[ "${EUID}" -ne "0" ]]; then
+		# Make the rspec call explicit, this way we don't have to depend
+		# on rake-compiler (nor rubygems) _and_ we don't have to rebuild
+		# the whole extension from scratch.
+		RSPEC_VERSION=3 ruby-ng_rspec
+	else
+		ewarn "The userpriv feature must be enabled to run tests."
+		eerror "Testsuite will not be run."
+	fi
+}
diff --git a/dev-ruby/pg_array_parser/Manifest b/dev-ruby/pg_array_parser/Manifest
new file mode 100644
index 000000000000..f030d16db8c0
--- /dev/null
+++ b/dev-ruby/pg_array_parser/Manifest
@@ -0,0 +1 @@
+DIST pg_array_parser-0.0.9.gem 8192 SHA256 7ab89c67a48efa2fec87463dd9ecdde44d4d8a96e38cea34227214881e6c6480 SHA512 a1503d9598e1658eb63b6294ce1cf6f8d2e7e5c59382407946ec10d25a46b029b4bb8a8c634b190b42bef4954c4aeea60b6ffa16c596e0c3bea2df4c882896ae WHIRLPOOL a8967ff807bcc18c758cb0cd5333128ed1afa240e9544df81b5f24d47c19525a6d22cf027984997f91126137df7759a3cb5829b68a825274d21c40be2e4f0513
diff --git a/dev-ruby/pg_array_parser/metadata.xml b/dev-ruby/pg_array_parser/metadata.xml
new file mode 100644
index 000000000000..d02888b273c3
--- /dev/null
+++ b/dev-ruby/pg_array_parser/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer>
+    <email>zerochaos@gentoo.org</email>
+    <name>Rick Farina</name>
+  </maintainer>
+<longdescription lang="en">
+</longdescription>
+  <upstream>
+    <remote-id type="github">dockyard/pg_array_parser</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-ruby/pg_array_parser/pg_array_parser-0.0.9-r1.ebuild b/dev-ruby/pg_array_parser/pg_array_parser-0.0.9-r1.ebuild
new file mode 100644
index 000000000000..e70da9808075
--- /dev/null
+++ b/dev-ruby/pg_array_parser/pg_array_parser-0.0.9-r1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+USE_RUBY="ruby19 ruby20 ruby21 ruby22"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+inherit ruby-fakegem versionator
+
+DESCRIPTION="Simple library to parse PostgreSQL arrays into a array of strings"
+HOMEPAGE="https://github.com/dockyard/pg_array_parser"
+
+LICENSE="MIT"
+SLOT="$(get_version_component_range 1-3)"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+ruby_add_bdepend "dev-ruby/bundler"
+
+all_ruby_prepare() {
+	[ -f Gemfile.lock ] && rm Gemfile.lock
+	#if ! use development; then
+		sed -i -e "/^group :development do/,/^end$/d" Gemfile || die
+		sed -i -e "/s.add_development_dependency/d" "${PN}".gemspec || die
+		sed -i -e "/gem.add_development_dependency/d" "${PN}".gemspec || die
+	#fi
+	#if ! use test; then
+		sed -i -e "/^group :test do/,/^end$/d" Gemfile || die
+	#fi
+	#if ! use test && ! use development; then
+		sed -i -e "/^group :development, :test do/,/^end$/d" Gemfile || die
+	#fi
+}
+
+each_ruby_prepare() {
+	if [ -f Gemfile ]; then
+		BUNDLE_GEMFILE=Gemfile ${RUBY} -S bundle install --local || die
+		BUNDLE_GEMFILE=Gemfile ${RUBY} -S bundle check || die
+	fi
+}
+
+each_ruby_configure() {
+	${RUBY} -Cext/pg_array_parser extconf.rb || die
+}
+
+each_ruby_compile() {
+	emake -Cext/pg_array_parser V=1
+	cp ext/pg_array_parser/pg_array_parser.so lib/
+}
diff --git a/dev-ruby/postgres_ext/Manifest b/dev-ruby/postgres_ext/Manifest
new file mode 100644
index 000000000000..a0525a902f8e
--- /dev/null
+++ b/dev-ruby/postgres_ext/Manifest
@@ -0,0 +1 @@
+DIST postgres_ext-2.4.1.gem 20992 SHA256 41d5bd383537e90833005f87fe502843ee7097c5a981e81f7ed8464635d89df3 SHA512 e8a0b2990e2939f600c92bfae70ebfb142875ca3b86d6d6ad95bc8bbaf350df8c2fde5173f51ff71616e5b68d7d852d1f4b201573c05afa39aa4134c9cb4ef75 WHIRLPOOL 8d2126b0717c7f4311bd171542dd76db8d56c6b07cdd05400af7130a9e8f06df324faf4ca5aacbddfb31fdfeedf2e40bb9f960f1cbd515f3687dbe5a31c1a622
diff --git a/dev-ruby/postgres_ext/metadata.xml b/dev-ruby/postgres_ext/metadata.xml
new file mode 100644
index 000000000000..5ff2ea70d7e1
--- /dev/null
+++ b/dev-ruby/postgres_ext/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer>
+    <email>zerochaos@gentoo.org</email>
+    <name>Rick Farina</name>
+  </maintainer>
+<longdescription lang="en">
+</longdescription>
+  <upstream>
+    <remote-id type="github">dockyard/postgres_ext</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-ruby/postgres_ext/postgres_ext-2.4.1.ebuild b/dev-ruby/postgres_ext/postgres_ext-2.4.1.ebuild
new file mode 100644
index 000000000000..3efb76e74998
--- /dev/null
+++ b/dev-ruby/postgres_ext/postgres_ext-2.4.1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: Exp $
+
+EAPI=5
+USE_RUBY="ruby19 ruby20 ruby21"
+
+inherit ruby-fakegem versionator
+
+DESCRIPTION="Adds native PostgreSQL data types to ActiveRecord and querying extensions for ActiveRecord and Arel"
+HOMEPAGE="https://github.com/dockyard/postgres_ext"
+SRC_URI="mirror://rubygems/${P}.gem"
+
+LICENSE="BSD"
+SLOT="$(get_version_component_range 1-2)"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+RESTRICT=test
+
+ruby_add_rdepend "|| ( dev-ruby/activerecord:4.0
+			dev-ruby/activerecord:4.1
+			dev-ruby/activerecord:4.2 )
+		>=dev-ruby/arel-4.0.1:*
+		dev-ruby/pg_array_parser:0.0.9"
+
+ruby_add_bdepend "dev-ruby/bundler"
+
+all_ruby_prepare() {
+	[ -f Gemfile.lock ] && rm Gemfile.lock
+	#if ! use development; then
+		sed -i -e "/^group :development do/,/^end$/d" Gemfile || die
+		sed -i -e "/s.add_development_dependency/d" "${PN}".gemspec || die
+		sed -i -e "/gem.add_development_dependency/d" "${PN}".gemspec || die
+	#fi
+	#if ! use test; then
+		sed -i -e "/^group :test do/,/^end$/d" Gemfile || die
+	#fi
+	#if ! use test && ! use development; then
+		sed -i -e "/^group :development, :test do/,/^end$/d" Gemfile || die
+	#fi
+		#https://github.com/dockyard/postgres_ext/issues/166
+		#ugh, thanks
+		sed -i -e "/byebug/d" Gemfile || die
+		sed -i -e "/fivemat/d" Gemfile || die
+}
+
+each_ruby_prepare() {
+	if [ -f Gemfile ]; then
+		BUNDLE_GEMFILE=Gemfile ${RUBY} -S bundle install --local || die
+		BUNDLE_GEMFILE=Gemfile ${RUBY} -S bundle check || die
+	fi
+}
diff --git a/dev-ruby/pry/pry-0.10.1.ebuild b/dev-ruby/pry/pry-0.10.1.ebuild
index 9fe5aaa10779..e4d280eb4c2e 100644
--- a/dev-ruby/pry/pry-0.10.1.ebuild
+++ b/dev-ruby/pry/pry-0.10.1.ebuild
@@ -21,7 +21,7 @@ IUSE=""
 SLOT="ruby19"
 
 LICENSE="MIT"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
 
 ruby_add_rdepend "
 	>=dev-ruby/coderay-1.1.0
diff --git a/dev-ruby/rb-readline-r7/Manifest b/dev-ruby/rb-readline-r7/Manifest
new file mode 100644
index 000000000000..10f0f5284750
--- /dev/null
+++ b/dev-ruby/rb-readline-r7/Manifest
@@ -0,0 +1 @@
+DIST rb-readline-r7-0.5.2.0.gem 96256 SHA256 ea2f63086533f370020087f6ca198b91699a254e79b2f69ba792a2829dffa339 SHA512 e94b60e368104f5e626a5c98dbe894cea52294b9c2061aa0cf32c34b7575a1ba9b0c514221ce266be89553d7936fc82696fc979710b9e8bb2503fc8b3cc0a938 WHIRLPOOL c9556322f6d3ca36674d46c1d9b49680cb76bf642ebf0369df1931503d83ac4b4a6f242d889d1f6f03a59aca6b8decd9598d25f2c1a97f45b8492b6c498fd17c
diff --git a/dev-ruby/rb-readline-r7/metadata.xml b/dev-ruby/rb-readline-r7/metadata.xml
new file mode 100644
index 000000000000..92f9b7f67593
--- /dev/null
+++ b/dev-ruby/rb-readline-r7/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer>
+    <email>zerochaos@gentoo.org</email>
+    <name>Rick Farina</name>
+  </maintainer>
+  <longdescription lang="en">
+</longdescription>
+  <upstream>
+    <remote-id type="github">rapid7/rb-readline</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-ruby/rb-readline-r7/rb-readline-r7-0.5.2.0.ebuild b/dev-ruby/rb-readline-r7/rb-readline-r7-0.5.2.0.ebuild
new file mode 100644
index 000000000000..4435817e5101
--- /dev/null
+++ b/dev-ruby/rb-readline-r7/rb-readline-r7-0.5.2.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/dev-ruby/rb-readline/rb-readline-0.5.2.ebuild,v 1.1 2015/01/01 07:53:09 graaff Exp $
+
+EAPI=5
+USE_RUBY="ruby19 ruby20 ruby21 ruby22"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+inherit ruby-fakegem
+
+DESCRIPTION="Ruby implementation of the GNU readline C library forked by r7"
+HOMEPAGE="http://rubygems.org/gems/rb-readline-r7"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+DEPEND="test? ( dev-ruby/minitest
+		dev-ruby/rake )"
+
+all_ruby_prepare() {
+	# Skip a test that fails when run in the ebuild environment.
+	sed -i -e '/test_readline_with_default_parameters_does_not_error/,/end/ s:^:#:' test/test_readline.rb || die
+}
diff --git a/dev-ruby/rcairo/Manifest b/dev-ruby/rcairo/Manifest
index 5bfeed543172..83b95f0ecfdb 100644
--- a/dev-ruby/rcairo/Manifest
+++ b/dev-ruby/rcairo/Manifest
@@ -1 +1,2 @@
 DIST cairo-1.14.1.gem 96768 SHA256 e93a7bc97687d2725b77f4651656f77a42a134e39129e05c853c6eac1929ae4d SHA512 08d045f5763ed61ff10fe7d5388532e4fd6be24411a9e5e1ea3cc17de48092cab0723cbf17208eb488fa3322114f4112182983a487516db291173644a0dee355 WHIRLPOOL cc0056366208c6b3f722042758a6a469b0ffe4dcb8a71fc17970773e4fad05208efd46d7b354feb71230ecedd839d719cbde1685f5c113288f7777bda58ff52c
+DIST cairo-1.14.3.gem 97792 SHA256 e3a31ef8097c0b16f2ad71561dca37b4564ae3003838a82805aadeceb69d03b6 SHA512 aba56403ca813bdcc56c01fed76642e4115a683ed3e3d056675195d2d86fc7dfa44f0077ca47407eeea27789824171251222e6300f3f3c395bc186afb616c772 WHIRLPOOL 724d072ad881f54cdcdc631399f99e6bdc563bc78f70c611bdeb3ddc659de78e4ce75c1ec51ac6659542e9ab8ae9c138caa610f97e37a6a1d69440313b69e6a9
diff --git a/dev-ruby/rcairo/rcairo-1.14.3.ebuild b/dev-ruby/rcairo/rcairo-1.14.3.ebuild
new file mode 100644
index 000000000000..364f51e41487
--- /dev/null
+++ b/dev-ruby/rcairo/rcairo-1.14.3.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+USE_RUBY="ruby19 ruby20 ruby21 ruby22"
+
+RUBY_FAKEGEM_NAME="cairo"
+
+# Documentation depends on files that are not distributed.
+RUBY_FAKEGEM_TASK_DOC=""
+
+RUBY_FAKEGEM_TASK_TEST=""
+
+RUBY_FAKEGEM_DOCDIR="doc"
+
+RUBY_FAKEGEM_EXTRADOC="AUTHORS NEWS"
+
+inherit multilib ruby-fakegem
+
+DESCRIPTION="Ruby bindings for cairo"
+HOMEPAGE="http://cairographics.org/rcairo/"
+
+IUSE=""
+
+SLOT="0"
+LICENSE="|| ( Ruby GPL-2 )"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+RDEPEND="${RDEPEND}
+	>=x11-libs/cairo-1.2.0[svg]"
+DEPEND="${DEPEND}
+	>=x11-libs/cairo-1.2.0[svg]"
+
+ruby_add_bdepend "
+	dev-ruby/pkg-config
+	dev-ruby/ruby-glib2
+	test? ( >=dev-ruby/test-unit-2.1.0-r1:2 )"
+
+all_ruby_prepare() {
+	# Avoid development dependency.
+	sed -i -e '/notify/ s:^:#:' test/cairo-test-utils.rb || die
+}
+
+each_ruby_configure() {
+	${RUBY} -Cext/cairo extconf.rb || die "extconf failed"
+}
+
+each_ruby_compile() {
+	emake V=1 -Cext/cairo
+
+	# again, try to make it more standard, to install it more easily.
+	cp ext/cairo/cairo$(get_modname) lib/ || die
+}
+
+each_ruby_test() {
+	# don't rely on the Rakefile because it's a mess to load with
+	# their hierarchy, do it manually.
+	${RUBY} -Ilib -r ./test/cairo-test-utils.rb \
+		-e 'gem "test-unit"; require "test/unit"; Dir.glob("test/**/test_*.rb") {|f| load f}' || die "tests failed"
+}
+
+each_ruby_install() {
+	each_fakegem_install
+
+	insinto $(ruby_get_hdrdir)
+	doins ext/cairo/rb_cairo.h
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	insinto /usr/share/doc/${PF}/samples
+	doins -r samples/*
+}
diff --git a/dev-ruby/recog/Manifest b/dev-ruby/recog/Manifest
new file mode 100644
index 000000000000..497ea59e668c
--- /dev/null
+++ b/dev-ruby/recog/Manifest
@@ -0,0 +1,2 @@
+DIST recog-2.0.12.gem 196608 SHA256 49754e782aff74a1b9f95e48c2baafa5c4ec54d534013616d6dadb2b0d95fdd0 SHA512 d88347313807969ced0106a9134a70aa933d0ad8681067746c0c931a072add2466bf17e2eeb5c090e9be8f45eede66613659b942ca98f58fd0bc15d7ee523058 WHIRLPOOL b035279dbd74e6ddbe12b90a5433c5fe66055f8a71fa3be2c61b13dc364fafbf95deea021d9e6f1d38225d3ffae675abd23892f2b296b463e6348e7b6f98855e
+DIST recog-2.0.6.gem 188928 SHA256 333d867db310b908342f857ee4f3f60b869386ff7b908e06f4dec8b9352ceb97 SHA512 408e83889632127d584ce8d09244c63246807aa5f89d88c082bbfd441a2e708cd67f23aebf23fa08c5db6bfd7ff771071daf64df9a66224aa5f04fcaba3d1387 WHIRLPOOL 2aaef470b15e3b8ac99d99bc3f8975447d5aa3d05220540d61f4972083f8cf6a0b04ba89e88aefc0dfd355f59f6f1bd5e9754bf00b6b5a5a953ef21f42fc3509
diff --git a/dev-ruby/recog/metadata.xml b/dev-ruby/recog/metadata.xml
new file mode 100644
index 000000000000..839af48d6ad5
--- /dev/null
+++ b/dev-ruby/recog/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer>
+    <email>zerochaos@gentoo.org</email>
+    <name>Rick Farina</name>
+  </maintainer>
+  <longdescription lang="en">
+</longdescription>
+  <upstream>
+    <remote-id type="github">rapid7/recog</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-ruby/recog/recog-2.0.12.ebuild b/dev-ruby/recog/recog-2.0.12.ebuild
new file mode 100644
index 000000000000..76db60c62c30
--- /dev/null
+++ b/dev-ruby/recog/recog-2.0.12.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+USE_RUBY="ruby19 ruby20 ruby21"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Pattern recognition for hosts, services, and content"
+HOMEPAGE="https://github.com/rapid7/${PN}"
+
+LICENSE="BSD-2"
+SLOT="2"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+ruby_add_rdepend "dev-ruby/nokogiri"
+
+ruby_add_bdepend "test? (
+	dev-ruby/regexp_parser
+	dev-ruby/rspec:3
+	dev-util/aruba
+	dev-util/cucumber
+)"
+
+all_ruby_prepare() {
+	sed -i -e '/simplecov/I s:^:#:' spec/spec_helper.rb || die
+}
+
+each_ruby_test() {
+	RSPEC_VERSION=3 ruby-ng_rspec
+	ruby-ng_cucumber
+}
diff --git a/dev-ruby/recog/recog-2.0.6.ebuild b/dev-ruby/recog/recog-2.0.6.ebuild
new file mode 100644
index 000000000000..375e37d8cced
--- /dev/null
+++ b/dev-ruby/recog/recog-2.0.6.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+USE_RUBY="ruby19 ruby20 ruby21"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Pattern recognition for hosts, services, and content"
+HOMEPAGE="https://github.com/rapid7/${PN}"
+SRC_URI="mirror://rubygems/${P}.gem"
+
+LICENSE="BSD"
+SLOT="2"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+ruby_add_rdepend "dev-ruby/nokogiri !=dev-ruby/recog-2.0.0"
diff --git a/dev-ruby/regexp_parser/Manifest b/dev-ruby/regexp_parser/Manifest
new file mode 100644
index 000000000000..b4ebd69147dd
--- /dev/null
+++ b/dev-ruby/regexp_parser/Manifest
@@ -0,0 +1 @@
+DIST regexp_parser-0.3.1.gem 94208 SHA256 97cc69fa4174b44889f12f5d1d36fe6147464066231a8ba5a767c4a5f0d081a4 SHA512 afb2a64215d5fd738d9cb5799067f91c43a8377a8dfcb749c915c3ea8ef340c7138561b6bb93116337ae559a4ad797a7dfcd0f8663f3779a3d38d0ebbba40d91 WHIRLPOOL 378f5f4cba7638df84e0dfd45127f5f5981c2840378d48cacc8655877b550221f0d3ff2464d0357fc8e506b3708565d1364b2c04e0bbdf7301424cf1ddd2c624
diff --git a/dev-ruby/regexp_parser/metadata.xml b/dev-ruby/regexp_parser/metadata.xml
new file mode 100644
index 000000000000..b31afff6e67f
--- /dev/null
+++ b/dev-ruby/regexp_parser/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>ruby</herd>
+  <upstream>
+    <remote-id type="github">ammar/regexp_parser</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-ruby/regexp_parser/regexp_parser-0.3.1.ebuild b/dev-ruby/regexp_parser/regexp_parser-0.3.1.ebuild
new file mode 100644
index 000000000000..297f9d07c360
--- /dev/null
+++ b/dev-ruby/regexp_parser/regexp_parser-0.3.1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+USE_RUBY="ruby19 ruby20 ruby21 ruby22"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_EXTRADOC="ChangeLog README.md"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="A library for tokenizing, lexing, and parsing Ruby regular expressions"
+HOMEPAGE="https://github.com/ammar/regexp_parser"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
diff --git a/dev-ruby/rspectacular/Manifest b/dev-ruby/rspectacular/Manifest
index 3130382157aa..cffe851cf931 100644
--- a/dev-ruby/rspectacular/Manifest
+++ b/dev-ruby/rspectacular/Manifest
@@ -1,3 +1,4 @@
 DIST rspectacular-0.61.0.gem 14336 SHA256 fffd8099063f110244314aa87e20058899d8dca15378eb4de21f740c2c0c4f82 SHA512 bdabc855ea9bb0cdcb222de47773be6d9ea2d9208bef416e3ab24195a16fc59b2d1af045b9c59851f87dd3ce7cc0ffe479d9ac5e07f4b5418c530dd3a8f7c922 WHIRLPOOL 0b3d98b3ec2991ce70d0a8d50f769f1715353fb9760ae1a7b23e7f53f7793b6bf702e640eaf95f36b9cb9647570d6c44cac634129dadd21dab6b0954728a19b6
 DIST rspectacular-0.62.1.gem 15360 SHA256 2a5e394b96f56ad5f96dbd491666ea96d3ec542815cf3fc6b206bb14141508ca SHA512 60579982d6551b355648237acb0eeb962bf61afe11049fd25e86dc9305612896453edb139ea73e42af0149aa80b39b04ea8698b016bbafb6e197e6a0315da0ba WHIRLPOOL 7766e6e67fbdd757046640d92faaf862241e0d4e4d66146eb1797a0f134b9db423f92baa8b69d5aa35ac8b000f23e56c6ecb833506182f081ccbc19c31be25b6
 DIST rspectacular-0.63.0.gem 15360 SHA256 2bd2ffda1727f789815fdc8bc3e6833de0b13d050eee09e1e82218fd20cdb51d SHA512 9e41f8b94542f7f82554b6473452ce23c81f15994f0b260dc7def3ada7bbbab2e4e65be57c42db6df04bb8dd98efd4ba40cf9c866814aa6812a6485d8d7c623f WHIRLPOOL 09463a228625d75949ffc909142d35d2d5e95e610e3949828426cb0acd3da981732e5e1c2dfcb7cb12dfc17302cb13cf12473aefac9c41a3f9b6fa367d2d2387
+DIST rspectacular-0.64.0.gem 15360 SHA256 280a50e4dc11198ccd68873ddd365c460ebbd3335e96ed842f331d731bb74412 SHA512 7fdd7d7c339d368a80dc8c1b200d627dc74a1467d540ee5fbd7652b36af15057491f89721387e9138b1c3f48fcc5938204cebb0bcc51e10bf90a8c2ff9094732 WHIRLPOOL 84aecdb41e62a71de39b3f9820b1a4c53a1e56f8dadb6a23b4b193d056ec7f51fe25bf53f2c4d38b622c89721cb0a49cb98da0acd38145968df16c9351b9228e
diff --git a/dev-ruby/rspectacular/rspectacular-0.64.0.ebuild b/dev-ruby/rspectacular/rspectacular-0.64.0.ebuild
new file mode 100644
index 000000000000..70fe33156db1
--- /dev/null
+++ b/dev-ruby/rspectacular/rspectacular-0.64.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+USE_RUBY="ruby19 ruby20 ruby21 ruby22"
+
+RUBY_FAKEGEM_TASK_TEST=""
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="RSpec support and matchers"
+HOMEPAGE="https://github.com/thekompanee/rspectacular"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+ruby_add_rdepend ">=dev-ruby/rspec-3.1:3 dev-ruby/fuubar:2"
diff --git a/dev-ruby/ruby-romkan/ruby-romkan-0.4-r5.ebuild b/dev-ruby/ruby-romkan/ruby-romkan-0.4-r5.ebuild
index db39e5ac49df..209c671e6e98 100644
--- a/dev-ruby/ruby-romkan/ruby-romkan-0.4-r5.ebuild
+++ b/dev-ruby/ruby-romkan/ruby-romkan-0.4-r5.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="http://0xcc.net/ruby-romkan/"
 SRC_URI="http://0xcc.net/ruby-romkan/${P}.tar.gz"
 LICENSE="Ruby"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~hppa ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="alpha amd64 ~arm ~hppa ia64 ~mips ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE=""
 
 DOCS="ChangeLog *.rd"
diff --git a/dev-ruby/rubygems/Manifest b/dev-ruby/rubygems/Manifest
index c6d445896691..6714730b2ea8 100644
--- a/dev-ruby/rubygems/Manifest
+++ b/dev-ruby/rubygems/Manifest
@@ -1,4 +1,2 @@
-DIST rubygems-2.2.2.tgz 414111 SHA256 572dd13baa1dfb9756db9fbfeb629be1634efddb7014c552845c0e9a5a643009 SHA512 574d72436356ae66834ee6991e4a886e37babc98ca5b270086f43b5a85f8fdb50365f5a2109e937163dad5a1b8a4d66f16d2308ed27438c99be036b3e56d3dd1 WHIRLPOOL 442efa9ed4bf4e39802f5c9307e0d4ae55372daf47e7a3d98d55a3d9e79afdb10f8e32e95ea0166d2fa264dc0c8d2bc01b8ec4de31fc022ef950b0cb8794a4bd
 DIST rubygems-2.2.5.tgz 416772 SHA256 0f015d63ee3f48be2cc440332d992a33f6df113ced25b7a0007372d304bfeaa4 SHA512 eac6d7c4801d7bf65ac8e244ff88677929e491db8c5054a31d936eaf1e1fabfc8c4b560040c01c7d9707758cfbad9a8063144bb37b494dd1b6f66a0222871e03 WHIRLPOOL 6e02359ce84352f39b13c3f59d9fd82788a5a2ae88d069df05642d5349cb33c06c3477de56c937a44742fb6aa6cfdb7b32dbadac131fb12e6387f983564879c6
-DIST rubygems-2.4.6.tgz 447588 SHA256 76d3f3b10aa824d23a511f098ab777c6473b98ffa733f7be4222408897b68db9 SHA512 2cf5447e0de8e8f85916e91774eba1f2113397d3ed7147671b74443696574ba0478d8f2aec789d024eabcd5afc1c4910dbe71f389b30045fa50bde14d2bb1cb1 WHIRLPOOL e901f4354c706666b8f85cd0d345c8ad04eecb88914927e9b213bd7a83fd9be42c3d1082da87cafce0cc05deafa70436250a2fee92b62f91e6e113fbfa66c1b0
 DIST rubygems-2.4.8.tgz 447712 SHA256 5a4335fef5904ceb76d912a9d4a2464fbbb172df3b2abcb0c67003e77764845e SHA512 1cc2e9e19d665268f475ce90547377d41a4ea5ce9a9afab4979de0247a0dd82b04529c087c899d9ced5564fa9051e1d2fe23ddb764ba411915bab2ce344ac419 WHIRLPOOL e9fa65b3ff24a05082fd6ded221706c45e8d7c6677ccc31e6971991320800d47fef99651fb338c797e20ab4ab7775c7192e09f4575fc815640c4f2a8d5ea273b
diff --git a/dev-ruby/rubygems/rubygems-2.2.2.ebuild b/dev-ruby/rubygems/rubygems-2.2.2.ebuild
deleted file mode 100644
index 3a42ee5a4757..000000000000
--- a/dev-ruby/rubygems/rubygems-2.2.2.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-USE_RUBY="ruby19 ruby20"
-
-inherit ruby-ng prefix
-
-DESCRIPTION="Centralized Ruby extension management system"
-HOMEPAGE="http://rubyforge.org/projects/rubygems/"
-LICENSE="|| ( Ruby MIT )"
-
-SRC_URI="http://production.cf.rubygems.org/rubygems/${P}.tgz"
-
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-SLOT="0"
-IUSE="server test"
-
-PDEPEND="server? ( >=dev-ruby/builder-2.1 )"
-
-ruby_add_bdepend "
-	test? (
-		>=dev-ruby/minitest-4:0
-		dev-ruby/rdoc
-	)"
-
-all_ruby_prepare() {
-	mkdir -p lib/rubygems/defaults || die
-	cp "${FILESDIR}/gentoo-defaults.rb" lib/rubygems/defaults/operating_system.rb || die
-
-	eprefixify lib/rubygems/defaults/operating_system.rb
-
-	# Disable broken tests when changing default values:
-	sed -i -e '/test_check_executable_overwrite_default_bin_dir/,/^  end/ s:^:#:' test/rubygems/test_gem_installer.rb || die
-
-	# Remove a test that fails when yard is installed.
-	sed -i -e '/test_self_attribute_names/,/^  end/ s:^:#:' test/rubygems/test_gem_specification.rb || die
-
-	# Skip tests for default gems that all fail
-	sed -i -e '/test_default_gems_use_full_paths/,/^  end/ s:^:#:' test/rubygems/test_gem.rb || die
-	sed -i -e '/test_execute_ignore_default_gem_verbose/,/^  end/ s:^:#:' test/rubygems/test_gem_commands_cleanup_command.rb || die
-	sed -i -e '/test_execute_default_gem/,/^  end/ s:^:#:' test/rubygems/test_gem_commands_contents_command.rb test/rubygems/test_gem_commands_pristine_command.rb || die
-	sed -i -e '/test_execute_default_details/,/^  end/ s:^:#:' test/rubygems/test_gem_commands_query_command.rb || die
-	sed -i -e '/test_execute_all/,/^  end/ s:^:#:' test/rubygems/test_gem_commands_uninstall_command.rb || die
-	sed -i -e '/test_load_default_gem/,/^  end/ s:^:#:' test/rubygems/test_gem_specification.rb || die
-	sed -i -e '/test_uninstall_default_gem/,/^  end/ s:^:#:' test/rubygems/test_gem_uninstaller.rb || die
-	sed -i -e '/test_alien_default/,/^  end/ s:^:#:' test/rubygems/test_gem_validator.rb || die
-
-	# Avoid tests playing tricks with ruby engine that don't seem to
-	# work for us.
-	rm test/rubygems/test_gem_request_set_gem_dependency_api.rb || die
-
-	# Avoid test requiring network access
-	sed -i -e '/test_download_to_cache/askip "requires network access"' test/rubygems/test_gem_remote_fetcher.rb || die
-}
-
-each_ruby_compile() {
-	# Not really a build but...
-	sed -i -e 's:#!.*:#!'"${RUBY}"':' bin/gem
-}
-
-each_ruby_test() {
-	# Unset RUBYOPT to avoid interferences, bug #158455 et. al.
-	#unset RUBYOPT
-
-	if [[ "${EUID}" -ne "0" ]]; then
-		RUBYLIB="$(pwd)/lib${RUBYLIB+:${RUBYLIB}}" ${RUBY} -I.:lib:test \
-			-e 'Dir["test/**/test_*.rb"].each { |tu| require tu }' || die "tests failed"
-	else
-		ewarn "The userpriv feature must be enabled to run tests, bug 408951."
-		eerror "Testsuite will not be run."
-	fi
-}
-
-each_ruby_install() {
-	# Unset RUBYOPT to avoid interferences, bug #158455 et. al.
-	unset RUBYOPT
-	export RUBYLIB="$(pwd)/lib${RUBYLIB+:${RUBYLIB}}"
-
-	pushd lib &>/dev/null
-	doruby -r *
-	popd &>/dev/null
-
-	local sld=$(ruby_rbconfig_value 'sitelibdir')
-	insinto "${sld#${EPREFIX}}"  # bug #320813
-	newins "${FILESDIR}/auto_gem.rb.ruby19" auto_gem.rb || die
-
-	newbin bin/gem $(basename ${RUBY} | sed -e 's:ruby:gem:') || die
-}
-
-all_ruby_install() {
-	dodoc History.txt README.rdoc
-
-	if use server; then
-		newinitd "${FILESDIR}/init.d-gem_server2" gem_server || die "newinitd failed"
-		newconfd "${FILESDIR}/conf.d-gem_server" gem_server || die "newconfd failed"
-	fi
-}
-
-pkg_postinst() {
-	if [[ ! -n $(readlink "${ROOT}"usr/bin/gem) ]] ; then
-		eselect ruby set $(eselect --brief --colour=no ruby show | head -n1)
-	fi
-
-	ewarn
-	ewarn "To switch between available Ruby profiles, execute as root:"
-	ewarn "\teselect ruby set ruby(19|20|...)"
-	ewarn
-}
-
-pkg_postrm() {
-	ewarn "If you have uninstalled dev-ruby/rubygems, Ruby applications are unlikely"
-	ewarn "to run in current shells because of missing auto_gem."
-	ewarn "Please run \"unset RUBYOPT\" in your shells before using ruby"
-	ewarn "or start new shells"
-	ewarn
-	ewarn "If you have not uninstalled dev-ruby/rubygems, please do not unset "
-	ewarn "RUBYOPT"
-}
diff --git a/dev-ruby/rubygems/rubygems-2.2.5.ebuild b/dev-ruby/rubygems/rubygems-2.2.5.ebuild
deleted file mode 100644
index 12045b8cc6e4..000000000000
--- a/dev-ruby/rubygems/rubygems-2.2.5.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-USE_RUBY="ruby19 ruby20"
-
-inherit ruby-ng prefix
-
-DESCRIPTION="Centralized Ruby extension management system"
-HOMEPAGE="http://rubyforge.org/projects/rubygems/"
-LICENSE="|| ( Ruby MIT )"
-
-SRC_URI="http://production.cf.rubygems.org/rubygems/${P}.tgz"
-
-KEYWORDS="alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-SLOT="0"
-IUSE="server test"
-
-PDEPEND="server? ( >=dev-ruby/builder-2.1 )"
-
-ruby_add_bdepend "
-	test? (
-		>=dev-ruby/minitest-4:0
-		dev-ruby/rdoc
-	)"
-
-all_ruby_prepare() {
-	mkdir -p lib/rubygems/defaults || die
-	cp "${FILESDIR}/gentoo-defaults.rb" lib/rubygems/defaults/operating_system.rb || die
-
-	eprefixify lib/rubygems/defaults/operating_system.rb
-
-	# Disable broken tests when changing default values:
-	sed -i -e '/test_check_executable_overwrite_default_bin_dir/,/^  end/ s:^:#:' test/rubygems/test_gem_installer.rb || die
-
-	# Remove a test that fails when yard is installed.
-	sed -i -e '/test_self_attribute_names/,/^  end/ s:^:#:' test/rubygems/test_gem_specification.rb || die
-
-	# Skip tests for default gems that all fail
-	sed -i -e '/test_default_gems_use_full_paths/,/^  end/ s:^:#:' test/rubygems/test_gem.rb || die
-	sed -i -e '/test_execute_ignore_default_gem_verbose/,/^  end/ s:^:#:' test/rubygems/test_gem_commands_cleanup_command.rb || die
-	sed -i -e '/test_execute_default_gem/,/^  end/ s:^:#:' test/rubygems/test_gem_commands_contents_command.rb test/rubygems/test_gem_commands_pristine_command.rb || die
-	sed -i -e '/test_execute_default_details/,/^  end/ s:^:#:' test/rubygems/test_gem_commands_query_command.rb || die
-	sed -i -e '/test_execute_all/,/^  end/ s:^:#:' test/rubygems/test_gem_commands_uninstall_command.rb || die
-	sed -i -e '/test_load_default_gem/,/^  end/ s:^:#:' test/rubygems/test_gem_specification.rb || die
-	sed -i -e '/test_uninstall_default_gem/,/^  end/ s:^:#:' test/rubygems/test_gem_uninstaller.rb || die
-	sed -i -e '/test_alien_default/,/^  end/ s:^:#:' test/rubygems/test_gem_validator.rb || die
-
-	# Avoid tests playing tricks with ruby engine that don't seem to
-	# work for us.
-	rm test/rubygems/test_gem_request_set_gem_dependency_api.rb || die
-
-	# Avoid test requiring network access
-	sed -i -e '/test_download_to_cache/askip "requires network access"' test/rubygems/test_gem_remote_fetcher.rb || die
-}
-
-each_ruby_compile() {
-	# Not really a build but...
-	sed -i -e 's:#!.*:#!'"${RUBY}"':' bin/gem
-}
-
-each_ruby_test() {
-	# Unset RUBYOPT to avoid interferences, bug #158455 et. al.
-	#unset RUBYOPT
-
-	if [[ "${EUID}" -ne "0" ]]; then
-		RUBYLIB="$(pwd)/lib${RUBYLIB+:${RUBYLIB}}" ${RUBY} -I.:lib:test \
-			-e 'Dir["test/**/test_*.rb"].each { |tu| require tu }' || die "tests failed"
-	else
-		ewarn "The userpriv feature must be enabled to run tests, bug 408951."
-		eerror "Testsuite will not be run."
-	fi
-}
-
-each_ruby_install() {
-	# Unset RUBYOPT to avoid interferences, bug #158455 et. al.
-	unset RUBYOPT
-	export RUBYLIB="$(pwd)/lib${RUBYLIB+:${RUBYLIB}}"
-
-	pushd lib &>/dev/null
-	doruby -r *
-	popd &>/dev/null
-
-	local sld=$(ruby_rbconfig_value 'sitelibdir')
-	insinto "${sld#${EPREFIX}}"  # bug #320813
-	newins "${FILESDIR}/auto_gem.rb.ruby19" auto_gem.rb || die
-
-	newbin bin/gem $(basename ${RUBY} | sed -e 's:ruby:gem:') || die
-}
-
-all_ruby_install() {
-	dodoc History.txt README.rdoc
-
-	if use server; then
-		newinitd "${FILESDIR}/init.d-gem_server2" gem_server || die "newinitd failed"
-		newconfd "${FILESDIR}/conf.d-gem_server" gem_server || die "newconfd failed"
-	fi
-}
-
-pkg_postinst() {
-	if [[ ! -n $(readlink "${ROOT}"usr/bin/gem) ]] ; then
-		eselect ruby set $(eselect --brief --colour=no ruby show | head -n1)
-	fi
-
-	ewarn
-	ewarn "To switch between available Ruby profiles, execute as root:"
-	ewarn "\teselect ruby set ruby(19|20|...)"
-	ewarn
-}
-
-pkg_postrm() {
-	ewarn "If you have uninstalled dev-ruby/rubygems, Ruby applications are unlikely"
-	ewarn "to run in current shells because of missing auto_gem."
-	ewarn "Please run \"unset RUBYOPT\" in your shells before using ruby"
-	ewarn "or start new shells"
-	ewarn
-	ewarn "If you have not uninstalled dev-ruby/rubygems, please do not unset "
-	ewarn "RUBYOPT"
-}
diff --git a/dev-ruby/rubygems/rubygems-2.4.6.ebuild b/dev-ruby/rubygems/rubygems-2.4.6.ebuild
deleted file mode 100644
index 5b40d83ceca0..000000000000
--- a/dev-ruby/rubygems/rubygems-2.4.6.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-USE_RUBY="ruby19 ruby20 ruby21 ruby22"
-
-inherit ruby-ng prefix
-
-DESCRIPTION="Centralized Ruby extension management system"
-HOMEPAGE="http://rubyforge.org/projects/rubygems/"
-LICENSE="|| ( Ruby MIT )"
-
-SRC_URI="http://production.cf.rubygems.org/rubygems/${P}.tgz"
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-SLOT="0"
-IUSE="server test"
-
-PDEPEND="server? ( >=dev-ruby/builder-2.1 )"
-
-ruby_add_bdepend "
-	test? (
-		>=dev-ruby/minitest-4:0
-		dev-ruby/rdoc
-	)"
-
-all_ruby_prepare() {
-
-	mkdir -p lib/rubygems/defaults || die
-	cp "${FILESDIR}/gentoo-defaults.rb" lib/rubygems/defaults/operating_system.rb || die
-
-	eprefixify lib/rubygems/defaults/operating_system.rb
-
-	# Disable broken tests when changing default values:
-	sed -i -e '/test_check_executable_overwrite_default_bin_dir/,/^  end/ s:^:#:' test/rubygems/test_gem_installer.rb || die
-	sed -i -e '/test_default_path/,/^  end/ s:^:#:' test/rubygems/test_gem.rb || die
-
-	# Remove a test that fails when yard is installed.
-	sed -i -e '/test_self_attribute_names/,/^  end/ s:^:#:' test/rubygems/test_gem_specification.rb || die
-
-	# Skip tests for default gems that all fail
-	sed -i -e '/test_default_gems_use_full_paths/,/^  end/ s:^:#:' test/rubygems/test_gem.rb || die
-	sed -i -e '/test_execute_ignore_default_gem_verbose/,/^  end/ s:^:#:' test/rubygems/test_gem_commands_cleanup_command.rb || die
-	sed -i -e '/test_execute_default_gem/,/^  end/ s:^:#:' test/rubygems/test_gem_commands_contents_command.rb test/rubygems/test_gem_commands_pristine_command.rb || die
-	sed -i -e '/test_execute_default_details/,/^  end/ s:^:#:' test/rubygems/test_gem_commands_query_command.rb || die
-	sed -i -e '/test_execute_all/,/^  end/ s:^:#:' test/rubygems/test_gem_commands_uninstall_command.rb || die
-	sed -i -e '/test_load_default_gem/,/^  end/ s:^:#:' test/rubygems/test_gem_specification.rb || die
-	sed -i -e '/test_uninstall_default_gem/,/^  end/ s:^:#:' test/rubygems/test_gem_uninstaller.rb || die
-	sed -i -e '/test_alien_default/,/^  end/ s:^:#:' test/rubygems/test_gem_validator.rb || die
-
-	# Avoid tests playing tricks with ruby engine that don't seem to
-	# work for us.
-	rm test/rubygems/test_gem_request_set_gem_dependency_api.rb || die
-
-	# Avoid test requiring network access
-	sed -i -e '/test_download_to_cache/askip "requires network access"' test/rubygems/test_gem_remote_fetcher.rb || die
-}
-
-each_ruby_compile() {
-	# Not really a build but...
-	sed -i -e 's:#!.*:#!'"${RUBY}"':' bin/gem
-}
-
-each_ruby_test() {
-	# Unset RUBYOPT to avoid interferences, bug #158455 et. al.
-	#unset RUBYOPT
-
-	if [[ "${EUID}" -ne "0" ]]; then
-		RUBYLIB="$(pwd)/lib${RUBYLIB+:${RUBYLIB}}" ${RUBY} -I.:lib:test \
-			-e 'Dir["test/**/test_*.rb"].each { |tu| require tu }' || die "tests failed"
-	else
-		ewarn "The userpriv feature must be enabled to run tests, bug 408951."
-		eerror "Testsuite will not be run."
-	fi
-}
-
-each_ruby_install() {
-	# Unset RUBYOPT to avoid interferences, bug #158455 et. al.
-	unset RUBYOPT
-	export RUBYLIB="$(pwd)/lib${RUBYLIB+:${RUBYLIB}}"
-
-	pushd lib &>/dev/null
-	doruby -r *
-	popd &>/dev/null
-
-	local sld=$(ruby_rbconfig_value 'sitelibdir')
-	insinto "${sld#${EPREFIX}}"  # bug #320813
-	newins "${FILESDIR}/auto_gem.rb.ruby19" auto_gem.rb || die
-
-	newbin bin/gem $(basename ${RUBY} | sed -e 's:ruby:gem:') || die
-}
-
-all_ruby_install() {
-	dodoc History.txt README.rdoc
-
-	if use server; then
-		newinitd "${FILESDIR}/init.d-gem_server2" gem_server || die "newinitd failed"
-		newconfd "${FILESDIR}/conf.d-gem_server" gem_server || die "newconfd failed"
-	fi
-}
-
-pkg_postinst() {
-	if [[ ! -n $(readlink "${ROOT}"usr/bin/gem) ]] ; then
-		eselect ruby set $(eselect --brief --colour=no ruby show | head -n1)
-	fi
-
-	ewarn
-	ewarn "To switch between available Ruby profiles, execute as root:"
-	ewarn "\teselect ruby set ruby(20|21|...)"
-	ewarn
-}
diff --git a/dev-ruby/rubyntlm/Manifest b/dev-ruby/rubyntlm/Manifest
new file mode 100644
index 000000000000..00956222a34f
--- /dev/null
+++ b/dev-ruby/rubyntlm/Manifest
@@ -0,0 +1,2 @@
+DIST rubyntlm-0.4.0.gem 21504 SHA256 bd10dcab5f1166e10049f0649a28f49bcc56c0592683d094a2852dd62b8ab50f SHA512 33a845b3b898d5e45ef51d4c3ab9a928789d2506c9854dedac2afb71b639abd91054c89357a0f33f975984172b8b7bf58c22a6ec50e4ab423d3269910284151e WHIRLPOOL a67927dde3fc3b539640d5d346e239c4fd0db4c0f3e7af1836c619ee942920a9f5f7c26e7035d0dfe9ef98de610fefb945ab6ed480403437e94af4ac6a64e59f
+DIST rubyntlm-0.5.2.gem 27648 SHA256 a78d87ad0c3642e523fa509f4bd23116391629f8cb6aa6484f02010a0d328812 SHA512 29a29756b6788257f2ed9a3a7ef5cbdcd4b7871922658d922c46ee127a89848232450cb17b23d8f7fda023399d4ec9b1029c51f7a2fb7cdc635028e56e340aa5 WHIRLPOOL 2ca8f47da195826ae1762ffbc5d9ce2f60f5c9ff40a846136eeb61104ab43ebafecb2ecda3500b5a9fbb03ae002df6a219d866fff1c63448351b30901aca72d3
diff --git a/dev-ruby/rubyntlm/metadata.xml b/dev-ruby/rubyntlm/metadata.xml
new file mode 100644
index 000000000000..3c8603ea0821
--- /dev/null
+++ b/dev-ruby/rubyntlm/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer>
+    <email>zerochaos@gentoo.org</email>
+    <name>Rick Farina</name>
+  </maintainer>
+<longdescription lang="en">
+</longdescription>
+  <upstream>
+    <remote-id type="github">winrb/rubyntlm</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-ruby/rubyntlm/rubyntlm-0.4.0.ebuild b/dev-ruby/rubyntlm/rubyntlm-0.4.0.ebuild
new file mode 100644
index 000000000000..ef782486908f
--- /dev/null
+++ b/dev-ruby/rubyntlm/rubyntlm-0.4.0.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/metasploit_data_models/metasploit_data_models-0.17.0.ebuild,v 1.3 2014/07/09 21:13:54 zerochaos Exp $
+
+EAPI=5
+USE_RUBY="ruby19 ruby20 ruby21"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Ruby/NTLM provides message creator and parser for the NTLM authentication."
+HOMEPAGE="http://rubygems.org/gems/rubyntlm"
+SRC_URI="mirror://rubygems/${P}.gem"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
diff --git a/dev-ruby/rubyntlm/rubyntlm-0.5.2.ebuild b/dev-ruby/rubyntlm/rubyntlm-0.5.2.ebuild
new file mode 100644
index 000000000000..73d06f2a7ab7
--- /dev/null
+++ b/dev-ruby/rubyntlm/rubyntlm-0.5.2.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+USE_RUBY="ruby19 ruby20 ruby21 ruby22"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Ruby/NTLM provides message creator and parser for the NTLM authentication."
+HOMEPAGE="https://github.com/winrb/rubyntlm"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+all_ruby_prepare() {
+	sed -i -e '/simplecov/ s:^:#:' spec/spec_helper.rb || die
+}
diff --git a/dev-ruby/rubyzip/rubyzip-1.1.7-r1.ebuild b/dev-ruby/rubyzip/rubyzip-1.1.7-r1.ebuild
index be349b4c1ed8..de94bdeb7b29 100644
--- a/dev-ruby/rubyzip/rubyzip-1.1.7-r1.ebuild
+++ b/dev-ruby/rubyzip/rubyzip-1.1.7-r1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/rubyzip/rubyzip/archive/v${PV}.tar.gz -> ${P}-git.tg
 
 LICENSE="Ruby"
 SLOT="1"
-KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE=""
 
 RDEPEND=""
diff --git a/dev-ruby/slop/slop-3.6.0.ebuild b/dev-ruby/slop/slop-3.6.0.ebuild
index 9112ca4d8824..fa4ea51a8548 100644
--- a/dev-ruby/slop/slop-3.6.0.ebuild
+++ b/dev-ruby/slop/slop-3.6.0.ebuild
@@ -16,11 +16,11 @@ SRC_URI="https://github.com/injekt/${PN}/archive/v${PV}.tar.gz -> ${P}.tgz"
 
 LICENSE="MIT"
 SLOT="3"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
 
 IUSE=""
 
-ruby_add_bdepend "test? ( dev-ruby/minitest )"
+ruby_add_bdepend "test? ( dev-ruby/minitest:5 )"
 
 all_ruby_prepare() {
 	sed -i -e '/git ls-files/d' slop.gemspec || die
diff --git a/dev-ruby/spork/spork-0.9.2.ebuild b/dev-ruby/spork/spork-0.9.2.ebuild
deleted file mode 100644
index 2d84bf3ff8ad..000000000000
--- a/dev-ruby/spork/spork-0.9.2.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-USE_RUBY="ruby19"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec"
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="README.rdoc"
-RUBY_FAKEGEM_EXTRAINSTALL="assets"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Spork is Tim Harper's implementation of test server"
-HOMEPAGE="https://github.com/sporkrb/spork"
-LICENSE="MIT"
-
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-SLOT="0"
-IUSE=""
diff --git a/dev-ruby/sprockets-rails/Manifest b/dev-ruby/sprockets-rails/Manifest
index 1317286c5fe5..c09df3f21c73 100644
--- a/dev-ruby/sprockets-rails/Manifest
+++ b/dev-ruby/sprockets-rails/Manifest
@@ -4,3 +4,4 @@ DIST sprockets-rails-2.2.4.tar.gz 102624 SHA256 3c18ae05545c37ef46a4c69f482964a3
 DIST sprockets-rails-2.3.0.tar.gz 103313 SHA256 ac5c0028df25e7f101a045988a4b292acf70fed40d7f92d4559bcfdf95b476e8 SHA512 bb852403eb6817f6df7dff2190c8ab7a552e55ee05680090d0d70e1f4ff21f7618708a9775572cb6d119bf91673554c06b7ac07985431f64c98873552397c8f1 WHIRLPOOL 6844e8fb988ba4eb0b172da04b6cf860c25fdf6df4fd2f3dc6f34579ab340c8d9a2fd67fcaf5eea7689f2f6489354929f44dcbceee9288e69327f7c86c5a71be
 DIST sprockets-rails-2.3.1.tar.gz 103328 SHA256 5d167e03609f646ac61046cfc8682ce2915746ad40ca6dbd7eec707a28313bfb SHA512 dd029e61183c72f3a5aae27c08dce53babaaefd1d022ef57d7c53b391b0f084b8ba02a8324bd74148533713f7338dfe543aee104e599c91756c68ecbe53fd23e WHIRLPOOL 8873f6dac7511b1d4ce8463cb11bc5e2e303372c7628c14a1c1b99410dfa089ea8e4e6aa10c65b05eff29e76e72574adb5a3ee08ab218797c79dd20f3d60dece
 DIST sprockets-rails-2.3.2.tar.gz 102968 SHA256 19dd7e58cb0c38948768f03fe224c15a6e7af77a44536f33733e393a8759b793 SHA512 8307d931981fd46ffca57d9b4c7fb77fe29ec33bf2b90082c918cb949393103cccb56fc69a37baa9f41750cf27945d3314e4e90c46d5082442418d2d31f8c626 WHIRLPOOL 2f20f1bc5eeb10fa03e245b956b1bf89884f7294af41c50d0b7d071e077dd44cd770f143f59b72605a1c77abb21d0eca1a3100185cdb9b10c64e8a481f4dd72f
+DIST sprockets-rails-2.3.3.tar.gz 103105 SHA256 0150dfd532d55843b97350969e81c259a26387411f879c71ac3096ad78b25dd3 SHA512 42cdc359d523049adce47a490add5a60e034fa8743d60f6ce1ae0036812c236a1151a0cf51137d8f5dc405e274cb318c9c669c2224ac7eaa22c02d8727654e6c WHIRLPOOL 9659cd18bbf93d042ec64f889ab19a58804451be8d35885e451a2cceb17e7c9d65b1530c19158b22563dbb16f43ef696bd20b84f7cdf94a0b4bec25a4997514b
diff --git a/dev-ruby/sprockets-rails/sprockets-rails-2.3.3.ebuild b/dev-ruby/sprockets-rails/sprockets-rails-2.3.3.ebuild
new file mode 100644
index 000000000000..431b2ecac7cd
--- /dev/null
+++ b/dev-ruby/sprockets-rails/sprockets-rails-2.3.3.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+USE_RUBY="ruby19 ruby20 ruby21"
+
+RUBY_FAKEGEM_TASK_DOC=""
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem versionator
+
+DESCRIPTION="Sprockets implementation for Rails 4.x (and beyond) Asset Pipeline"
+HOMEPAGE="https://github.com/rails/sprockets-rails"
+SRC_URI="https://github.com/rails/sprockets-rails/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="$(get_version_component_range 1-2)"
+KEYWORDS="~amd64 ~arm ~x86"
+
+IUSE="test"
+
+ruby_add_rdepend "
+	>=dev-ruby/actionpack-3.0:*
+	>=dev-ruby/activesupport-3.0:*
+	>=dev-ruby/sprockets-2.8:* <dev-ruby/sprockets-4:*"
+
+ruby_add_bdepend "
+	test? (
+		>=dev-ruby/actionpack-4
+		>=dev-ruby/railties-4
+		dev-ruby/test-unit:2
+	)"
diff --git a/dev-ruby/twitter/Manifest b/dev-ruby/twitter/Manifest
index ca93b3880693..e53b5586d911 100644
--- a/dev-ruby/twitter/Manifest
+++ b/dev-ruby/twitter/Manifest
@@ -1,2 +1,3 @@
 DIST twitter-5.13.0.tar.gz 1322622 SHA256 760dede63a96f51d38a61fd172d93c97da17046f01c53c37b430c421738a6906 SHA512 28afafcfbe938fadc571dd19affd69cf1288d86fd3c4c14b743a4d573de068fdc6a6ffe487320b6a039dc2540375450d060e32761196bbbb4cb4b83a0999696a WHIRLPOOL 3a7b20e69c443c644cfe0e2a0bb21d13c6259b8db129a6ae7d32df4a4e166bfa04f97271857feb866c2e7499ed7090efdca3680b4920863cafdbe15fd984788a
 DIST twitter-5.14.0.tar.gz 1355192 SHA256 44936f6e7eb61139c5129c25c207e16065ed5a20cb4d86679edbb8600318c374 SHA512 3fc4971b191efabaafb8918d525ed0279a246f68053c0af25aef355c6f019f40d6977a0f3463679e138dfeb40ff32e13b005c6a8a9667d0c359c659917ea890a WHIRLPOOL 689f319b6c044a87b6febd27425d497789cf73c47febda0cbec0b48a7d45cd160bd5f7c8ae26bb67a7958ccbdff9651f6e94fbb6fdffc1de244bf7657f68e7dd
+DIST twitter-5.15.0.tar.gz 524912 SHA256 9d0d2e234afb35b8555f692bac49fed7186d9f652a978771a7753e5cd79a8ffc SHA512 5beea732763ad072fd099a284d33e6cfcaf62e07ac14d3d938d8bc86f4c84578429631f4edaf0c34bfe1f6555c07c18e935edbb6d5320a33aea089f1f444a5e8 WHIRLPOOL 5576ace9aecc481c683abe2dc76a2f5f24eda1b9680e607ccb7207bf0c2509266145d3f2b41c712eb67bd3df0dd67f436976129e3cd5a5a6880f01f790de06a4
diff --git a/dev-ruby/twitter/twitter-5.15.0.ebuild b/dev-ruby/twitter/twitter-5.15.0.ebuild
new file mode 100644
index 000000000000..07eadaf2a719
--- /dev/null
+++ b/dev-ruby/twitter/twitter-5.15.0.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+USE_RUBY="ruby20 ruby21"
+
+RUBY_FAKEGEM_RECIPE_DOC="yard"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="twitter.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Ruby wrapper around the Twitter API"
+HOMEPAGE="https://sferik.github.com/twitter/"
+SRC_URI="https://github.com/sferik/twitter/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="5"
+KEYWORDS="~amd64"
+IUSE=""
+
+ruby_add_rdepend "
+	>=dev-ruby/addressable-2.3
+	>=dev-ruby/buftok-0.2.0
+	>=dev-ruby/equalizer-0.0.10
+	=dev-ruby/faraday-0*
+	>=dev-ruby/faraday-0.9.0
+	>=dev-ruby/http-0.6.0:* <dev-ruby/http-0.10:*
+	>=dev-ruby/http_parser_rb-0.6.0
+	>=dev-ruby/json-1.8
+	>=dev-ruby/memoizable-0.4.0
+	>=dev-ruby/naught-1.0
+	=dev-ruby/simple_oauth-0.3*
+	>=dev-ruby/simple_oauth-0.3.0"
+
+ruby_add_bdepend "test? (
+	dev-ruby/rspec:2
+	dev-ruby/webmock
+	>=dev-ruby/timecop-0.6.1
+	)
+	doc? ( dev-ruby/yard )"
+
+all_ruby_prepare() {
+	sed -i -e '/equalizer/ s/0.0.10/~>0.0.10/' ${RUBY_FAKEGEM_GEMSPEC} || die
+
+#	rm Gemfile || die
+	sed -i -e '/[Bb]undler/d' Rakefile || die "Unable to remove bundler code."
+
+	sed -i -e '/simplecov/,/^  end/ s:^:#:' spec/helper.rb || die
+
+	# Avoid a spec that fails due to changes in dependencies.
+	sed -i -e '/#reverse_token/,/^  end/ s:^:#:' \
+		spec/twitter/rest/oauth_spec.rb
+}
+
+each_ruby_test() {
+	CI=true ruby-ng_rspec || die
+}
diff --git a/dev-tcltk/blt/blt-2.4z-r13.ebuild b/dev-tcltk/blt/blt-2.4z-r13.ebuild
index 72d8bfd4e006..5d8efc49b185 100644
--- a/dev-tcltk/blt/blt-2.4z-r13.ebuild
+++ b/dev-tcltk/blt/blt-2.4z-r13.ebuild
@@ -19,7 +19,7 @@ SRC_URI="
 IUSE="jpeg static-libs X"
 SLOT="0"
 LICENSE="BSD"
-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 ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 DEPEND="
 	dev-lang/tk:0=
diff --git a/dev-tex/feynmf/feynmf-1.08-r4.ebuild b/dev-tex/feynmf/feynmf-1.08-r4.ebuild
index b6a83e1bc6e7..9851c0f4be9b 100644
--- a/dev-tex/feynmf/feynmf-1.08-r4.ebuild
+++ b/dev-tex/feynmf/feynmf-1.08-r4.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.gz
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~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-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc"
 
 RDEPEND="dev-texlive/texlive-metapost"
diff --git a/dev-texlive/texlive-langcjk/texlive-langcjk-2015.ebuild b/dev-texlive/texlive-langcjk/texlive-langcjk-2015.ebuild
index 1699483314fe..d9253c5e48af 100644
--- a/dev-texlive/texlive-langcjk/texlive-langcjk-2015.ebuild
+++ b/dev-texlive/texlive-langcjk/texlive-langcjk-2015.ebuild
@@ -23,6 +23,5 @@ DEPEND=">=dev-texlive/texlive-basic-2015
 !dev-texlive/texlive-documentation-korean
 !dev-texlive/texlive-documentation-japanese
 "
-RDEPEND="${DEPEND} dev-lang/ruby
-"
+RDEPEND="${DEPEND} "
 TEXLIVE_MODULE_BINSCRIPTS="texmf-dist/scripts/cjk-gs-integrate/cjk-gs-integrate.pl"
diff --git a/dev-texlive/texlive-langjapanese/texlive-langjapanese-2015.ebuild b/dev-texlive/texlive-langjapanese/texlive-langjapanese-2015.ebuild
index 5a6d646789e2..f2d5a1c3bb22 100644
--- a/dev-texlive/texlive-langjapanese/texlive-langjapanese-2015.ebuild
+++ b/dev-texlive/texlive-langjapanese/texlive-langjapanese-2015.ebuild
@@ -18,7 +18,8 @@ IUSE=""
 DEPEND=">=dev-texlive/texlive-langcjk-2015
 !<dev-texlive/texlive-langcjk-2014
 "
-RDEPEND="${DEPEND} "
+RDEPEND="${DEPEND} dev-lang/ruby
+"
 TEXLIVE_MODULE_BINSCRIPTS="
 	texmf-dist/scripts/convbkmk/convbkmk.rb
 	texmf-dist/scripts/ptex2pdf/ptex2pdf.lua
diff --git a/dev-util/android-ndk/android-ndk-10.ebuild b/dev-util/android-ndk/android-ndk-10.ebuild
index 731d890d85b7..79671af4bf58 100644
--- a/dev-util/android-ndk/android-ndk-10.ebuild
+++ b/dev-util/android-ndk/android-ndk-10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -26,6 +26,7 @@ S="${WORKDIR}/${PN}-r${PV}"
 ANDROID_NDK_DIR="opt/${PN}"
 
 QA_PREBUILT="*"
+PYTHON_UPDATER_IGNORE="1"
 
 src_configure() {
 	:
diff --git a/dev-util/android-ndk/android-ndk-10b.ebuild b/dev-util/android-ndk/android-ndk-10b.ebuild
index 731d890d85b7..79671af4bf58 100644
--- a/dev-util/android-ndk/android-ndk-10b.ebuild
+++ b/dev-util/android-ndk/android-ndk-10b.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -26,6 +26,7 @@ S="${WORKDIR}/${PN}-r${PV}"
 ANDROID_NDK_DIR="opt/${PN}"
 
 QA_PREBUILT="*"
+PYTHON_UPDATER_IGNORE="1"
 
 src_configure() {
 	:
diff --git a/dev-util/android-ndk/android-ndk-10d.ebuild b/dev-util/android-ndk/android-ndk-10d.ebuild
index 9430f3ad32ab..3dc807f0cc9c 100644
--- a/dev-util/android-ndk/android-ndk-10d.ebuild
+++ b/dev-util/android-ndk/android-ndk-10d.ebuild
@@ -24,6 +24,7 @@ S="${WORKDIR}/${PN}-r${PV}"
 ANDROID_NDK_DIR="opt/${PN}"
 
 QA_PREBUILT="*"
+PYTHON_UPDATER_IGNORE="1"
 
 src_configure() {
 	:
diff --git a/dev-util/android-ndk/android-ndk-10e.ebuild b/dev-util/android-ndk/android-ndk-10e.ebuild
index 312d41979092..59d6aa8c5f3d 100644
--- a/dev-util/android-ndk/android-ndk-10e.ebuild
+++ b/dev-util/android-ndk/android-ndk-10e.ebuild
@@ -31,6 +31,7 @@ S="${WORKDIR}/${PN}-r${PV}"
 ANDROID_NDK_DIR="opt/${PN}"
 
 QA_PREBUILT="*"
+PYTHON_UPDATER_IGNORE="1"
 
 pkg_pretend() {
 	check-reqs_pkg_pretend
diff --git a/dev-util/android-ndk/android-ndk-8b.ebuild b/dev-util/android-ndk/android-ndk-8b.ebuild
index 04565095ed77..0b0eca2d242b 100644
--- a/dev-util/android-ndk/android-ndk-8b.ebuild
+++ b/dev-util/android-ndk/android-ndk-8b.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -32,6 +32,7 @@ ANDROID_TC_X86_ANDROID_4_4="${ANDROID_NDK_DIR}/toolchains/x86-4.4.3/prebuilt/lin
 ANDROID_TC_X86_ANDROID_4_6="${ANDROID_NDK_DIR}/toolchains/x86-4.6/prebuilt/linux-x86"
 
 QA_PREBUILT="*"
+PYTHON_UPDATER_IGNORE="1"
 
 src_configure() {
 	:
diff --git a/dev-util/android-ndk/android-ndk-8c.ebuild b/dev-util/android-ndk/android-ndk-8c.ebuild
index 04565095ed77..0b0eca2d242b 100644
--- a/dev-util/android-ndk/android-ndk-8c.ebuild
+++ b/dev-util/android-ndk/android-ndk-8c.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -32,6 +32,7 @@ ANDROID_TC_X86_ANDROID_4_4="${ANDROID_NDK_DIR}/toolchains/x86-4.4.3/prebuilt/lin
 ANDROID_TC_X86_ANDROID_4_6="${ANDROID_NDK_DIR}/toolchains/x86-4.6/prebuilt/linux-x86"
 
 QA_PREBUILT="*"
+PYTHON_UPDATER_IGNORE="1"
 
 src_configure() {
 	:
diff --git a/dev-util/android-ndk/android-ndk-8d.ebuild b/dev-util/android-ndk/android-ndk-8d.ebuild
index 0a7cf632d1eb..32372a09adaf 100644
--- a/dev-util/android-ndk/android-ndk-8d.ebuild
+++ b/dev-util/android-ndk/android-ndk-8d.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -35,6 +35,7 @@ ANDROID_TC_X86_ANDROID_4_6="${ANDROID_NDK_DIR}/toolchains/x86-4.6/prebuilt/linux
 ANDROID_TC_X86_ANDROID_4_7="${ANDROID_NDK_DIR}/toolchains/x86-4.7/prebuilt/linux-x86"
 
 QA_PREBUILT="*"
+PYTHON_UPDATER_IGNORE="1"
 
 src_configure() {
 	:
diff --git a/dev-util/android-ndk/android-ndk-8e.ebuild b/dev-util/android-ndk/android-ndk-8e.ebuild
index 89c52707ecbc..32372a09adaf 100644
--- a/dev-util/android-ndk/android-ndk-8e.ebuild
+++ b/dev-util/android-ndk/android-ndk-8e.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -35,6 +35,7 @@ ANDROID_TC_X86_ANDROID_4_6="${ANDROID_NDK_DIR}/toolchains/x86-4.6/prebuilt/linux
 ANDROID_TC_X86_ANDROID_4_7="${ANDROID_NDK_DIR}/toolchains/x86-4.7/prebuilt/linux-x86"
 
 QA_PREBUILT="*"
+PYTHON_UPDATER_IGNORE="1"
 
 src_configure() {
 	:
diff --git a/dev-util/android-ndk/android-ndk-9.ebuild b/dev-util/android-ndk/android-ndk-9.ebuild
index 84ea51819097..ae194f723f34 100644
--- a/dev-util/android-ndk/android-ndk-9.ebuild
+++ b/dev-util/android-ndk/android-ndk-9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -28,6 +28,7 @@ S="${WORKDIR}/${MY_P}"
 ANDROID_NDK_DIR="opt/${PN}"
 
 QA_PREBUILT="*"
+PYTHON_UPDATER_IGNORE="1"
 
 src_configure() {
 	:
diff --git a/dev-util/android-ndk/android-ndk-9b.ebuild b/dev-util/android-ndk/android-ndk-9b.ebuild
index 84ea51819097..ae194f723f34 100644
--- a/dev-util/android-ndk/android-ndk-9b.ebuild
+++ b/dev-util/android-ndk/android-ndk-9b.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -28,6 +28,7 @@ S="${WORKDIR}/${MY_P}"
 ANDROID_NDK_DIR="opt/${PN}"
 
 QA_PREBUILT="*"
+PYTHON_UPDATER_IGNORE="1"
 
 src_configure() {
 	:
diff --git a/dev-util/android-ndk/android-ndk-9c.ebuild b/dev-util/android-ndk/android-ndk-9c.ebuild
index 1cd6c45084e0..21d5a6d6cd52 100644
--- a/dev-util/android-ndk/android-ndk-9c.ebuild
+++ b/dev-util/android-ndk/android-ndk-9c.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -25,6 +25,7 @@ S="${WORKDIR}/${MY_P}"
 ANDROID_NDK_DIR="opt/${PN}"
 
 QA_PREBUILT="*"
+PYTHON_UPDATER_IGNORE="1"
 
 src_configure() {
 	:
diff --git a/dev-util/android-ndk/android-ndk-9d.ebuild b/dev-util/android-ndk/android-ndk-9d.ebuild
index 1cd6c45084e0..21d5a6d6cd52 100644
--- a/dev-util/android-ndk/android-ndk-9d.ebuild
+++ b/dev-util/android-ndk/android-ndk-9d.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -25,6 +25,7 @@ S="${WORKDIR}/${MY_P}"
 ANDROID_NDK_DIR="opt/${PN}"
 
 QA_PREBUILT="*"
+PYTHON_UPDATER_IGNORE="1"
 
 src_configure() {
 	:
diff --git a/dev-util/android-ndk/metadata.xml b/dev-util/android-ndk/metadata.xml
index 905572c5b252..cdb306c98208 100644
--- a/dev-util/android-ndk/metadata.xml
+++ b/dev-util/android-ndk/metadata.xml
@@ -5,13 +5,6 @@
 		<email>perfinion@gentoo.org</email>
 		<name>Jason Zaman</name>
 	</maintainer>
-	<maintainer>
-		<email>cardoe@gentoo.org</email>
-		<name>Doug Goldstein</name>
-		<description>Feel free to update/modify this package, just don't break
-			my limited use case that I use it for.</description>
-	</maintainer>
-
 	<use>
 		<flag name="legacy-toolchains">Install legacy toolchains</flag>
         <flag name="target-32">Support for 32-bit targets</flag>
diff --git a/dev-util/android-studio/Manifest b/dev-util/android-studio/Manifest
index 67c64a88894c..92a450b14b34 100644
--- a/dev-util/android-studio/Manifest
+++ b/dev-util/android-studio/Manifest
@@ -2,3 +2,4 @@ DIST android-studio-ide-141.1890965-linux.zip 259139652 SHA256 f6c083902156ab834
 DIST android-studio-ide-141.1980579-linux.zip 258628239 SHA256 46a1b492360f873f7b99f53b535ce79503f4127a8ee5d06afbe0f53ec5f56a21 SHA512 54a83e6a54cd07ade1bfd3756bdff9c3431594412a01809ac3d2b1b5b2fb1719b8dd4f980516eeba5f7016c7757950c93a1d368ad1034d1300b9fe44577a1bcd WHIRLPOOL 567bcc5ae38015a586224e7c5870d7766f18b4241b46aa53eb7459a7f26d859d9855632cdcf54d3b35bca1b7c39b15cfc1141d11a4d017d9b3e199b72f088b56
 DIST android-studio-ide-141.2117773-linux.zip 351742127 SHA256 061be01b266fea24517dfee24ed98cec1eee2ef840f062a697c6bd07d2db5d27 SHA512 e21291c3e759e1b500eca487ef1e43c2dfd44e051cffd6fe2abbf9445c7577846d8e11aaaf0cb7423b70185bbcbdca8bf4ae2d084fedba7f28adc9063409520c WHIRLPOOL 22e00aae65870af2d9e0c77754f9b0fe9a35b9798c2e0e4535288cbb9803a40c405b2235b078f97e203356e8468fb6e49f270d00704abdc2027448984adf794a
 DIST android-studio-ide-141.2135290-linux.zip 351992670 SHA256 60068d74bfa60f63f7e4920b8b43dff2f34d1956ee222a9bdec1b5590a38d4ac SHA512 799d37869276240854cbe8106146592e0fc9a019d3595d2c73f24f7ceabf76e6b0872d1594ca76cc4c59a9d7b573824e68b2a2c445f8b64334aa356aa415e112 WHIRLPOOL be853ac9ad8c16f633f6281c0ec16a1ce340caeac7d3f3653207cfa6c5d26e5c853980c090c5b18cc348fe0b3dc1eef96f565df3f879a192386746b9225fd90b
+DIST android-studio-ide-141.2178183-linux.zip 352010593 SHA256 22316dc4cd17f82d02c7ca79efaa8d36ce7a6b3b384c6237ea1bcdd55d711762 SHA512 68f45638919d38a8c3c144ec2dc69ccbfe6467eddc570a2fadd7a36a79bdd609861224f06989b7e4ea1422c68914539221a4cf0a33e413da49fc72e1e418e717 WHIRLPOOL 4d0f63d22047e97bbb5b0a6d1382fdad5f4b1ddff59bda6d34b38ed5691c69a0b37e5a68a42ac3a3c0cff6c0b760bb7ec18a6a7d82f533ae97c3a06e94d4deb2
diff --git a/dev-util/android-studio/android-studio-1.3.2.0.141.2178183.ebuild b/dev-util/android-studio/android-studio-1.3.2.0.141.2178183.ebuild
new file mode 100644
index 000000000000..37680afb42fa
--- /dev/null
+++ b/dev-util/android-studio/android-studio-1.3.2.0.141.2178183.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils versionator
+
+RESTRICT="strip"
+QA_PREBUILT="opt/${PN}/bin/libbreakgen.so"
+if [[ $(get_version_component_count) -eq 6 ]]; then
+	STUDIO_V=$(get_version_component_range 1-4)
+	BUILD_V=$(get_version_component_range 5-6)
+else
+	STUDIO_V=$(get_version_component_range 1-3)
+	BUILD_V=$(get_version_component_range 4-5)
+fi
+
+DESCRIPTION="A new Android development environment based on IntelliJ IDEA"
+HOMEPAGE="http://developer.android.com/sdk/installing/studio.html"
+SRC_URI="https://dl.google.com/dl/android/studio/ide-zips/${STUDIO_V}/${PN}-ide-${BUILD_V}-linux.zip"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="selinux"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="app-arch/zip"
+RDEPEND=">=virtual/jdk-1.7
+	selinux? ( sec-policy/selinux-android )
+	>=app-arch/bzip2-1.0.6-r4[abi_x86_32(-)]
+	>=dev-libs/expat-2.1.0-r3[abi_x86_32(-)]
+	>=dev-libs/libffi-3.0.13-r1[abi_x86_32(-)]
+	>=media-libs/fontconfig-2.10.92[abi_x86_32(-)]
+	>=media-libs/freetype-2.5.5[abi_x86_32(-)]
+	>=media-libs/libpng-1.2.51[abi_x86_32(-)]
+	>=media-libs/mesa-10.2.8[abi_x86_32(-)]
+	>=sys-libs/ncurses-5.9-r3[abi_x86_32(-)]
+	>=sys-libs/zlib-1.2.8-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/libXdamage-1.1.4-r1[abi_x86_32(-)]
+	>=x11-libs/libXdmcp-1.1.1-r1[abi_x86_32(-)]
+	>=x11-libs/libXext-1.3.2[abi_x86_32(-)]
+	>=x11-libs/libXfixes-5.0.1[abi_x86_32(-)]
+	>=x11-libs/libXrender-0.9.8[abi_x86_32(-)]
+	>=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)]
+	>=x11-libs/libdrm-2.4.46[abi_x86_32(-)]
+	>=x11-libs/libxcb-1.9.1[abi_x86_32(-)]
+	>=x11-libs/libxshmfence-1.1[abi_x86_32(-)]"
+S=${WORKDIR}/${PN}
+
+src_install() {
+	local dir="/opt/${PN}"
+
+	insinto "${dir}"
+	doins -r *
+	fperms 755 "${dir}/bin/studio.sh" "${dir}/bin/fsnotifier" "${dir}/bin/fsnotifier64"
+
+	newicon "bin/studio.png" "${PN}.png"
+	make_wrapper ${PN} ${dir}/bin/studio.sh
+	make_desktop_entry ${PN} "Android Studio" ${PN} "Development;IDE"
+}
diff --git a/dev-util/anjuta/anjuta-3.16.0.ebuild b/dev-util/anjuta/anjuta-3.16.0.ebuild
index 373de7593988..443485b327bb 100644
--- a/dev-util/anjuta/anjuta-3.16.0.ebuild
+++ b/dev-util/anjuta/anjuta-3.16.0.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Anjuta"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="amd64 ~ppc ~sparc ~x86 ~x86-fbsd"
 
 IUSE="debug devhelp glade +introspection packagekit subversion terminal test vala"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/dev-util/astyle/astyle-2.04-r1.ebuild b/dev-util/astyle/astyle-2.04-r1.ebuild
index b327c6bde41d..b7182c306556 100644
--- a/dev-util/astyle/astyle-2.04-r1.ebuild
+++ b/dev-util/astyle/astyle-2.04-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/astyle/astyle_${PV}_linux.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="amd64 ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 
 IUSE="doc java static-libs"
 
diff --git a/dev-util/catalyst/catalyst-2.9999.ebuild b/dev-util/catalyst/catalyst-2.9999.ebuild
index 605525298320..0c6f8e386c24 100644
--- a/dev-util/catalyst/catalyst-2.9999.ebuild
+++ b/dev-util/catalyst/catalyst-2.9999.ebuild
@@ -35,7 +35,7 @@ DEPEND="
 	>=dev-python/snakeoil-0.5.2
 "
 RDEPEND="
-	=dev-python/pyDeComp-9999
+	=dev-python/pydecomp-9999
 	app-arch/lbzip2
 	app-crypt/shash
 	virtual/cdrtools
diff --git a/dev-util/catalyst/catalyst-9999.ebuild b/dev-util/catalyst/catalyst-9999.ebuild
index 2e19fce35fae..525a3b1cef70 100644
--- a/dev-util/catalyst/catalyst-9999.ebuild
+++ b/dev-util/catalyst/catalyst-9999.ebuild
@@ -34,6 +34,7 @@ DEPEND="
 	>=dev-python/snakeoil-0.5.2
 "
 RDEPEND="
+	=dev-python/pydecomp-9999
 	app-arch/lbzip2
 	app-crypt/shash
 	virtual/cdrtools
diff --git a/dev-util/d-feet/d-feet-0.3.10.ebuild b/dev-util/d-feet/d-feet-0.3.10.ebuild
index 2411fd264582..5a48de8ade1b 100644
--- a/dev-util/d-feet/d-feet-0.3.10.ebuild
+++ b/dev-util/d-feet/d-feet-0.3.10.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/DFeet"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="test"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/dev-util/devhelp/devhelp-3.16.1.ebuild b/dev-util/devhelp/devhelp-3.16.1.ebuild
index 86d7b3addb9e..0e6cb16a3f92 100644
--- a/dev-util/devhelp/devhelp-3.16.1.ebuild
+++ b/dev-util/devhelp/devhelp-3.16.1.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Devhelp"
 
 LICENSE="GPL-2+"
 SLOT="0/3-1" # subslot = 3-(libdevhelp-3 soname version)
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="gedit"
 REQUIRED_USE="gedit? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/dev-util/diffstat/diffstat-1.60.ebuild b/dev-util/diffstat/diffstat-1.60.ebuild
index 870948c7b1a0..ec85a7462588 100644
--- a/dev-util/diffstat/diffstat-1.60.ebuild
+++ b/dev-util/diffstat/diffstat-1.60.ebuild
@@ -10,7 +10,7 @@ SRC_URI="ftp://invisible-island.net/diffstat/${P}.tgz"
 
 LICENSE="HPND"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE=""
 
 src_configure() {
diff --git a/dev-util/dmake/metadata.xml b/dev-util/dmake/metadata.xml
index 8a9b49eec325..75e0c5991789 100644
--- a/dev-util/dmake/metadata.xml
+++ b/dev-util/dmake/metadata.xml
@@ -5,5 +5,7 @@
 		<email>chithanh@gentoo.org</email>
 		<name>Chí-Thanh Christopher Nguyễn</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">mohawk2/dmake</remote-id>
+	</upstream>
 </pkgmetadata>
-
diff --git a/dev-util/dogtail/dogtail-0.9.0-r2.ebuild b/dev-util/dogtail/dogtail-0.9.0-r2.ebuild
index 9eaf0b20d149..f07f902e3085 100644
--- a/dev-util/dogtail/dogtail-0.9.0-r2.ebuild
+++ b/dev-util/dogtail/dogtail-0.9.0-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://fedorahosted.org/released/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-util/gdbus-codegen/gdbus-codegen-2.44.1.ebuild b/dev-util/gdbus-codegen/gdbus-codegen-2.44.1.ebuild
index eb59bd06f1d2..22d3b899244e 100644
--- a/dev-util/gdbus-codegen/gdbus-codegen-2.44.1.ebuild
+++ b/dev-util/gdbus-codegen/gdbus-codegen-2.44.1.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="http://www.gtk.org/"
 
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE=""
 
 RDEPEND="${PYTHON_DEPS}"
diff --git a/dev-util/gnome-devel-docs/gnome-devel-docs-3.16.2.ebuild b/dev-util/gnome-devel-docs/gnome-devel-docs-3.16.2.ebuild
index 969ecda16b93..1f624df677fa 100644
--- a/dev-util/gnome-devel-docs/gnome-devel-docs-3.16.2.ebuild
+++ b/dev-util/gnome-devel-docs/gnome-devel-docs-3.16.2.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://developer.gnome.org/"
 
 LICENSE="FDL-1.1+ CC-BY-SA-3.0 CC-BY-SA-4.0"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc ~x86"
 IUSE=""
 
 RDEPEND=""
diff --git a/dev-util/google-perftools/metadata.xml b/dev-util/google-perftools/metadata.xml
index 450a4d64b8ac..e3c97b0b8830 100644
--- a/dev-util/google-perftools/metadata.xml
+++ b/dev-util/google-perftools/metadata.xml
@@ -4,23 +4,23 @@
   <maintainer>
     <email>flameeyes@gentoo.org</email>
   </maintainer>
-
   <use>
     <flag name="largepages">
       Use (experimental) larger pages for tcmalloc, this increases
       memory usage, but should speed up the allocation/free
       operations.
     </flag>
-
     <flag name="debug">
       Build a set of libraries with debug support (so-called
       debugalloc). These are available by default but are not needed
       unless you're actually developing using tcmalloc.
     </flag>
-
     <flag name="minimal">
       Only build the tcmalloc_minimal library, ignoring the heap
       checker and the profilers.
     </flag>
   </use>
+  <upstream>
+    <remote-id type="github">gperftools/gperftools</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-util/gprof2dot/metadata.xml b/dev-util/gprof2dot/metadata.xml
index 16bcc9f800a2..2022c0142d5b 100644
--- a/dev-util/gprof2dot/metadata.xml
+++ b/dev-util/gprof2dot/metadata.xml
@@ -5,4 +5,7 @@
 		<email>sping@gentoo.org</email>
 		<name>Sebastian Pipping</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">jrfonseca/gprof2dot</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-util/gtk-update-icon-cache/Manifest b/dev-util/gtk-update-icon-cache/Manifest
index 42a507e1cd78..ed0647bc120a 100644
--- a/dev-util/gtk-update-icon-cache/Manifest
+++ b/dev-util/gtk-update-icon-cache/Manifest
@@ -1,4 +1,4 @@
 DIST gtk-update-icon-cache-2.24.27.tar.xz 285228 SHA256 ae01d2c6aaededa1ddd7aac3ff1e6a7619a8854961ecf2297b72ab0bb36736e4 SHA512 71deed19785244a1af08c71bbbff54436762b95eddecd530ded06190127dff7e1e72dcf764377737bfcbc125528b434be76939cae33e79755fe23da8e503297c WHIRLPOOL 4aa6d8a98972bfe5a99cacf82dccb5e1224a74a198b89a3c33c232b6d08bab547c9dc5748a3c308dd0f38ff2cfa7f908b2e906c212a1e82deea32c91cc92a309
 DIST gtk-update-icon-cache-3.14.13.tar.xz 306376 SHA256 1e054574afc7c954c3d0d231007698a2ec6fd1655dc388572343376157f01f35 SHA512 eb6994a6a7a738e9b50a2c812fa0fb88b3c7516662059190ddeb6d61abdec5f00efcc44fc278bd42b8fca2c171c0746e8412b4b7294b65b75d41fa4289dff175 WHIRLPOOL cf10ae3e8abb6db3eb040d04c2d39a9909fa45935084d6d2591a96e1f4dd58c000d4d1b6af766e9d8402f6409d626f4817bda76d36aaf1a620c49f1738b78355
-DIST gtk-update-icon-cache-3.16.3.tar.xz 316384 SHA256 067a918331acf9fcdb6ef3bfc03274aa9d045cc8d4aa9ba6f21aafb7a088fe7f SHA512 b8e6d127403cb3a9a384822dd93aee6191532746632d4364953df7321b5f0900dffea3617ed8e9ea9cfb3ecd27978f88ddc43e5ec3882c602c37a3b0e6fa1b04 WHIRLPOOL 6b0ed55cb28cca15259b1f349cf04eb3736e0a31a5fff538d143a1d76e0380650cecf4aa0b88c270da3c69dfe0523c698874a8d8e4f0b30d5023a6eb5f72d619
 DIST gtk-update-icon-cache-3.16.4.tar.xz 316704 SHA256 583d03906f8138756c47e682cc4afe255f24c0ac673605d48b7c542205000ec8 SHA512 b2071a39b16176f20e84b0ca73b28d46daba2a6428f57e917f58df2b084698ba20570f2fa9fbecd448936e5af1f528b014275b33c0bf86d1a4559a76f0b56082 WHIRLPOOL 91cc77b09c6c363ff0a70b5614f9f43ca0c1a1dab8610b58b1464e92129a9d600231ad8bd93d65ba61447d6af9c6da1499d24915e2811df0b67cd27cb623b3be
+DIST gtk-update-icon-cache-3.16.5.tar.xz 316720 SHA256 05d3182244a935c3e9c288f59dc2ef9470de5cd7186be5d6c694999cc0bfd51a SHA512 b04ef86301c0b7d7c6204d51da2e5282008ab1d70c3296b60a7ebab8e7ae57cc3ea344659705f8fa5942d2e0a7bab9936cc6bc15bed9e0cc4e1856c7aee913e3 WHIRLPOOL 43f92b5e82c38cd021a8107489a99fd3a414c6eb97462be7929b8fb02f69f13a10b164efbed3a71cce19ab2990ea547dd114328d276131791635b48b008fa74c
diff --git a/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.16.3.ebuild b/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.16.3.ebuild
deleted file mode 100644
index d3020a52bb5b..000000000000
--- a/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.16.3.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="no"
-
-inherit gnome2
-
-DESCRIPTION="GTK update icon cache"
-HOMEPAGE="http://www.gtk.org/"
-SRC_URI="https://dev.gentoo.org/~eva/distfiles/${PN}/${P}.tar.xz"
-
-LICENSE="LGPL-2+"
-SLOT="0"
-IUSE=""
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-RDEPEND="
-	>=dev-libs/glib-2.43.4:2
-	>=x11-libs/gdk-pixbuf-2.30:2
-	!<x11-libs/gtk+-2.24.28-r1:2
-"
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.50.1
-	virtual/pkgconfig
-"
diff --git a/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.16.5.ebuild b/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.16.5.ebuild
new file mode 100644
index 000000000000..6570ff453ce0
--- /dev/null
+++ b/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.16.5.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+
+inherit gnome2
+
+DESCRIPTION="GTK update icon cache"
+HOMEPAGE="http://www.gtk.org/"
+SRC_URI="https://dev.gentoo.org/~eva/distfiles/${PN}/${P}.tar.xz"
+
+LICENSE="LGPL-2+"
+SLOT="0"
+IUSE=""
+
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+RDEPEND="
+	>=dev-libs/glib-2.43.4:2
+	>=x11-libs/gdk-pixbuf-2.30:2
+	!<x11-libs/gtk+-2.24.28-r1:2
+"
+DEPEND="${RDEPEND}
+	>=dev-util/intltool-0.50.1
+	sys-devel/gettext
+	virtual/pkgconfig
+"
diff --git a/dev-util/include-what-you-use/metadata.xml b/dev-util/include-what-you-use/metadata.xml
index 49bf44dac71e..c489d7430064 100644
--- a/dev-util/include-what-you-use/metadata.xml
+++ b/dev-util/include-what-you-use/metadata.xml
@@ -5,4 +5,7 @@
 		<email>slyfox@gentoo.org</email>
 		<name>Sergei Trofimovich</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">include-what-you-use/include-what-you-use</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-util/jenkins-bin/Manifest b/dev-util/jenkins-bin/Manifest
index af34a0e265f7..816a885020e1 100644
--- a/dev-util/jenkins-bin/Manifest
+++ b/dev-util/jenkins-bin/Manifest
@@ -1,4 +1,3 @@
-DIST jenkins-bin-1.609.1.war 68908995 SHA256 7e150cc9dd3d9089d82fecbf5b1d0ffa5cc33782637338c418c324715e329bd5 SHA512 909496a0b3757c8187cf9bad6374ea4faf57979eafcd91d9793d57bcc3bfc7e821755fbc321a104b14acc2ddbd319c30e40cc52fb0456eeea4ad2f23d9d6ae1c WHIRLPOOL 951f2307d439c22b202082614b16df201b61ca0478eb2666aaba9a1140a6323eee3193dc38586c222424ea1d63431e8aee228523714837a5889f1703620ca932
-DIST jenkins-bin-1.609.2.war 68976099 SHA256 60e775b1d5df417370a1768496fa3ccc9d17f9a093bf87f543765f9d4e401578 SHA512 f8d58fc5d8bb094932823ec40e53ef71412c44de2a82478fbc53c9f87e724597ab5afcba79fb776e69a42dd66529f0c31e875fafc305d411533dfb33afeb1948 WHIRLPOOL 107f47e16f91d98119564545d4b6c078d343690da558c7080471d4f0e3633b954257c290cc85200500165e2f145e7742509a27aa82cf2c9ea279ef27af3461d6
-DIST jenkins-bin-1.626.war 62885591 SHA256 e6df4d44f1110d1095b4e05c0d574f1120ac4f7bf943fba99c22edff0127c110 SHA512 7ca6c358d520f84380db74606e433db33bf2dad777e4386ca31bb22ae327aec209308d74214a391d9b1466ab01fca4eae1c93243212deefa4a5ca1d6dc3d718d WHIRLPOOL 6b5dfb86e2f62c97d695ec517457fa0d89a31e6f272cf25cf134efdb4654791707973a8944c7f0b52aaa649eaf5b9b098bdb5b0d50637919db23842fe93f9fca
+DIST jenkins-bin-1.609.3.war 69019876 SHA256 d5017fc3db8ac118dcd28c33e8414bd036ed236d8011276f683a074422a4c4d0 SHA512 94518086d10a3edc6b3f2e9969cd21a1bdc98cf1ba4bd9bc5fd972afa0ce6aa77831a825e6fd9d6888dada5775b95c0f8a52c72bde34d4c8369434c0f0fb0e59 WHIRLPOOL 7d4164af81cf9c6707b2482cd08eec309f5e5087eb10b42acc5c83ede38eb15818b99c8997e87272ac76fb97f5497d23ced92f65ca62cf4eda5272dd60dcee4a
 DIST jenkins-bin-1.627.war 63251728 SHA256 9fc74aea24d806fb8810e2573793cc280bdcef8c3ac6f0e76dc242290d7773ad SHA512 bf588377ae8910b5cc9db42bc177aaf4d714c9433b851cb8daef3e592844dd8f17ecfbc9f9e6e989d9033feacaaaf05ead3537bf61163335e25001499acfe6d1 WHIRLPOOL 156c9c713a24c373bd5857e68a275a5bb671844181fb62b389a2a0e787a7bd3a1489f3b4b0328bfb6c2b3c040a35068beed389c964c60dcec0ed958de54858bf
+DIST jenkins-bin-1.628.war 63208813 SHA256 e11227ad247ad3a938219cd2653adfb266ad54618d1839e63fd0e0e54852d6c7 SHA512 573585a085d9b2aab3eb2f2a8333deba31f6706ba1b7a8ba249c7b8eec76881908f8302cf6766d4243b380da8e093c577c9251113424c77251e73bae73bf6e20 WHIRLPOOL 3af13e26624a70714dd75d1d65654d05bc9f8ebba9b21688e955e1375cb38608fe1454d09ceaa138ff5b0298bf245ce9dba043add9e57909baf661cb5cb5ef59
diff --git a/dev-util/jenkins-bin/jenkins-bin-1.609.2.ebuild b/dev-util/jenkins-bin/jenkins-bin-1.609.2.ebuild
deleted file mode 100644
index b3839a98bae8..000000000000
--- a/dev-util/jenkins-bin/jenkins-bin-1.609.2.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit user systemd
-
-DESCRIPTION="Extensible continuous integration server"
-HOMEPAGE="http://jenkins-ci.org/"
-LICENSE="MIT"
-SRC_URI="http://mirrors.jenkins-ci.org/war-stable/${PV}/${PN/-bin/}.war -> ${P}.war"
-RESTRICT="mirror"
-SLOT="lts"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="media-fonts/dejavu
-	media-libs/freetype
-	!dev-util/jenkins-bin:0
-	virtual/jre"
-
-S=${WORKDIR}
-
-JENKINS_DIR=/var/lib/jenkins
-
-pkg_setup() {
-	enewgroup jenkins
-	enewuser jenkins -1 -1 ${JENKINS_DIR} jenkins
-}
-
-src_install() {
-	keepdir /var/log/jenkins ${JENKINS_DIR}/backup ${JENKINS_DIR}/home
-
-	insinto /opt/jenkins
-	newins "${DISTDIR}"/${P}.war ${PN/-bin/}.war
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}-r1.logrotate ${PN/-bin/}
-
-	newinitd "${FILESDIR}"/${PN}.init2 jenkins
-	newconfd "${FILESDIR}"/${PN}.confd jenkins
-
-	systemd_newunit "${FILESDIR}"/${PN}.service jenkins.service
-
-	fowners jenkins:jenkins /var/log/jenkins ${JENKINS_DIR} ${JENKINS_DIR}/home ${JENKINS_DIR}/backup
-}
diff --git a/dev-util/jenkins-bin/jenkins-bin-1.609.1.ebuild b/dev-util/jenkins-bin/jenkins-bin-1.609.3.ebuild
index b3839a98bae8..b3839a98bae8 100644
--- a/dev-util/jenkins-bin/jenkins-bin-1.609.1.ebuild
+++ b/dev-util/jenkins-bin/jenkins-bin-1.609.3.ebuild
diff --git a/dev-util/jenkins-bin/jenkins-bin-1.626.ebuild b/dev-util/jenkins-bin/jenkins-bin-1.628.ebuild
index 37fc08477727..37fc08477727 100644
--- a/dev-util/jenkins-bin/jenkins-bin-1.626.ebuild
+++ b/dev-util/jenkins-bin/jenkins-bin-1.628.ebuild
diff --git a/dev-util/kdevelop-php-docs/Manifest b/dev-util/kdevelop-php-docs/Manifest
index f497ccb895f3..21f4a59e91f8 100644
--- a/dev-util/kdevelop-php-docs/Manifest
+++ b/dev-util/kdevelop-php-docs/Manifest
@@ -1,3 +1 @@
-DIST kdevelop-php-docs-1.5.2.tar.xz 32368 SHA256 1b8dbecbb0ad74910754b839fc29621aaf942792f9f30fd32521598d28711425 SHA512 ab92477a1ab5bad2f769afc11e76cb293e59243c608c7330caed01b94b6bfc2cd89ea152e86652adec18281c755ba0c8691f4ac6f1d15963fcb6a927f2ecc5d4 WHIRLPOOL a408f6505920dd16d10ee961a8da11a02df1aa1babc9ec2310c9520bc72df52cffb23ed145c0c7a22e9412a77f2e4d03b7025c02045891b7a3424b45add0fed1
-DIST kdevelop-php-docs-1.6.0.tar.xz 32580 SHA256 fd3958cbf667f795bb42a6e6ee2e9779b6b3f4cca3dde0781b5d6972f609e2df SHA512 764127595b3094220d6ea87e32328ebadba012846fd029924670ab46f8f870909cead74ea28126f19703e482c4f8d608070ace225d478401de3eea2388d65c4a WHIRLPOOL b374e142cb6d94244bb70ea4e94bc118811a701014479a9a7fea938fd15de017a3ec72e684e8354656a516960fbe993891e20c27e5cc6873cdb54959b16f6644
 DIST kdevelop-php-docs-1.7.1.tar.xz 32840 SHA256 ae8acbffb882cdc20c32a22a8e522e0aea0c69b3d93376afa79e7b3bcad47568 SHA512 9a78b2d3051fe81b0fc91cb7cea586d0d3391959f55fc5cc05c3ff1f9c4d2a9a83957e50a9feac050d6d01a831fdfd7fa8e0f9dcd6f801723f8b638f60663592 WHIRLPOOL 97e77ce5019ba707b3d37c058a16edd1788055a83f24bdcc6058197e723161dcbc484a8557d32dadc02dd98c1acbd2a5dc732f122bca5e10bcd482e92fb43a5a
diff --git a/dev-util/kdevelop-php-docs/kdevelop-php-docs-1.5.2.ebuild b/dev-util/kdevelop-php-docs/kdevelop-php-docs-1.5.2.ebuild
deleted file mode 100644
index a67df6af846c..000000000000
--- a/dev-util/kdevelop-php-docs/kdevelop-php-docs-1.5.2.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-KDE_LINGUAS="bs ca ca@valencia da de en_GB es et fi fr gl hu it nb nds nl pl pt
-pt_BR ru sk sl sv tr uk zh_CN zh_TW"
-KMNAME="kdevelop"
-EGIT_REPONAME="kdev-php-docs"
-inherit kde4-base
-
-DESCRIPTION="PHP documentation plugin for KDevelop 4"
-LICENSE="GPL-2 LGPL-2"
-IUSE="debug"
-SRC_URI="mirror://kde/stable/kdevelop/${KDEVELOP_VERSION}/src/${P}.tar.xz"
-
-if [[ $PV == *9999* ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="amd64 x86"
-fi
-
-RDEPEND="
-	!=dev-util/kdevelop-plugins-1.0.0
-"
diff --git a/dev-util/kdevelop-php-docs/kdevelop-php-docs-1.6.0.ebuild b/dev-util/kdevelop-php-docs/kdevelop-php-docs-1.6.0.ebuild
deleted file mode 100644
index 3b59d3fd18dd..000000000000
--- a/dev-util/kdevelop-php-docs/kdevelop-php-docs-1.6.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-KDE_LINGUAS="bs ca ca@valencia da de el en_GB es et fi fr gl hu it kk nb nds nl
-pl pt pt_BR ru sk sl sv tr uk zh_CN zh_TW"
-KMNAME="kdevelop"
-EGIT_REPONAME="kdev-php-docs"
-inherit kde4-base
-
-DESCRIPTION="PHP documentation plugin for KDevelop 4"
-LICENSE="GPL-2 LGPL-2"
-IUSE="debug"
-SRC_URI="mirror://kde/stable/kdevelop/${KDEVELOP_VERSION}/src/${P}.tar.xz"
-
-if [[ $PV == *9999* ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="~amd64 ~x86"
-fi
-
-RDEPEND="
-	!=dev-util/kdevelop-plugins-1.0.0
-"
diff --git a/dev-util/kdevelop-php/Manifest b/dev-util/kdevelop-php/Manifest
index 8a1a7d56de7e..c411c62d2722 100644
--- a/dev-util/kdevelop-php/Manifest
+++ b/dev-util/kdevelop-php/Manifest
@@ -1,3 +1 @@
-DIST kdevelop-php-1.5.2.tar.xz 649044 SHA256 2ee676dd81af01a36c042248300ef1c5d27dfa1d5e29aa2e03749db8f4808f2d SHA512 7d1648b531cb039f8535739b08deff08429c93d173034e29e61e5eb795c192d59309adfa3403eccb5705c16bc55eb46ddd70375732606c6705bafe0163efff48 WHIRLPOOL 9a73d72ca2d27413220387043b4319a5dcce0b007b1aac5e814c27a73bd0cef6403998ee72f870d97d9b8628e00452d9bd2b12b9673f40d2fad55bf14bb999ec
-DIST kdevelop-php-1.6.0.tar.xz 649816 SHA256 5f128ccffbe210e24b438411e8e068b622791913310e5796f59350af20c2ff23 SHA512 d86a7d286e59119e38a01f5a7c0669ae4b8e781f13ac90fba26b00b740a0d466a9dc2edae325f0aabd739514df27bb6878c3bfdd8125a2dcd90109efe41e5cf6 WHIRLPOOL 1a53ee5347a2148ff5b863669cfef689332db5b2005eef7b5d0cb3e6cab246f08ee75d842dd9b086630f0695af2a6486a2fd727bdee856151681e116c43c3e9c
 DIST kdevelop-php-1.7.1.tar.xz 658088 SHA256 396300d605032ac458489fb760801233e94117825ca6a3251ee02090aa694826 SHA512 7602d905cd33299e071452e98539886110bf1f3fbbee3025a6ec2218aac8fef16665b81d23a1810ee22e9eb3eedbe55c00c8951a56b86fad2955ed4846959866 WHIRLPOOL 7e235c05bb0618365752c6c721fea1fd462eba7098e77ca303885c4bb50faf3d2f695f01fed982bc34827bb04f84490eaf5dfa4a37ed29875c1a8493d797b68e
diff --git a/dev-util/kdevelop-php/kdevelop-php-1.5.2.ebuild b/dev-util/kdevelop-php/kdevelop-php-1.5.2.ebuild
deleted file mode 100644
index 40e80abe47df..000000000000
--- a/dev-util/kdevelop-php/kdevelop-php-1.5.2.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-KDE_LINGUAS="bs ca ca@valencia da de el en_GB es et fi fr gl hu it kk nb nds nl
-pl pt pt_BR ru sl sv th uk zh_CN zh_TW"
-VIRTUALX_REQUIRED=test
-KDEBASE="kdevelop"
-KMNAME="kdev-php"
-EGIT_REPONAME="${KMNAME}"
-inherit kde4-base
-
-DESCRIPTION="PHP plugin for KDevelop 4"
-LICENSE="GPL-2 LGPL-2"
-IUSE="debug doc"
-SRC_URI="mirror://kde/stable/kdevelop/${KDEVELOP_VERSION}/src/${P}.tar.xz"
-
-if [[ $PV != *9999* ]]; then
-	KEYWORDS="amd64 x86"
-else
-	KEYWORDS=""
-fi
-
-DEPEND="
-	>=dev-util/kdevelop-pg-qt-1.0.0:4
-"
-RDEPEND="
-	dev-util/kdevelop:${SLOT}
-	doc? ( >=dev-util/kdevelop-php-docs-${PV}:${SLOT} )
-"
-PATCHES=( "${FILESDIR}/${PN}"-1.2.0-parmake.patch )
-
-RESTRICT="test"
diff --git a/dev-util/kdevelop-php/kdevelop-php-1.6.0.ebuild b/dev-util/kdevelop-php/kdevelop-php-1.6.0.ebuild
deleted file mode 100644
index eb9bbbf50ed8..000000000000
--- a/dev-util/kdevelop-php/kdevelop-php-1.6.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-KDE_LINGUAS="bs ca ca@valencia da de el en_GB es et fi fr gl it kk nb nds nl pl
-pt pt_BR ru sl sv uk zh_CN zh_TW"
-VIRTUALX_REQUIRED=test
-KDEBASE="kdevelop"
-KMNAME="kdev-php"
-EGIT_REPONAME="${KMNAME}"
-inherit kde4-base
-
-DESCRIPTION="PHP plugin for KDevelop 4"
-LICENSE="GPL-2 LGPL-2"
-IUSE="debug doc"
-SRC_URI="mirror://kde/stable/kdevelop/${KDEVELOP_VERSION}/src/${P}.tar.xz"
-
-if [[ $PV != *9999* ]]; then
-	KEYWORDS="~amd64 ~x86"
-else
-	KEYWORDS=""
-fi
-
-DEPEND="
-	>=dev-util/kdevelop-pg-qt-1.0.0:4
-"
-RDEPEND="
-	dev-util/kdevelop:${SLOT}
-	doc? ( >=dev-util/kdevelop-php-docs-${PV}:${SLOT} )
-"
-PATCHES=( "${FILESDIR}/${PN}"-1.2.0-parmake.patch )
-
-RESTRICT="test"
diff --git a/dev-util/kdevelop-python/Manifest b/dev-util/kdevelop-python/Manifest
index 143e34db3343..ebed219c7197 100644
--- a/dev-util/kdevelop-python/Manifest
+++ b/dev-util/kdevelop-python/Manifest
@@ -1,3 +1 @@
-DIST kdev-python-1.6.0.tar.xz 3655648 SHA256 92d383ea821a6b8e09f699b085357048eb30323a9fd58660f963865822f9327c SHA512 e0e477549e107dbd7f4b60771a940c2d1e5ab0316060b1d194495b973330936e547bd9cb827bcc7e42cac2ed08d9eaf49e64ad70da2a73706393fc3510aa6a85 WHIRLPOOL 682aa3059101a6f229b038c409dea5c14cdeb7b316de270f3fbcd8b5fde35b0d02f58a0b5103ee4c721f543b124faa73ccda3205a6acdc8a2a8cd0072566e411
 DIST kdev-python-1.7.1.tar.xz 3666536 SHA256 6d95834ffbdc9c74f0c5cca589344b02189902e01901169615484c5b163dbc06 SHA512 f40fad121d5a8106c25fa5b8827f34074f8add115db9a26282b7bb087df2b57665b4bc6d772cd72784e5989eb6319d2807ac7278012b0be4e29ccb6864e79349 WHIRLPOOL 81feab1b3262aa406f4c59989be59d5a73bd8fbd0fed62e207434c0d65656ef10b7ccdcd54c2d1e4b7bab6e7213ef7e0b2638021823507cdc0750e091a88f09f
-DIST kdev-python-v1.5.2.tar.xz 4004660 SHA256 84ae7015623a3848b1c1ce8e8f958c32778e9ba0afafa3ea3b3dd70687e1fe40 SHA512 c9c1fc13a8a66fa409dc7c336488607318a7fc87b107b987349a0d5279f5c24e1132ecb232111ef84aae8bdd132686a1b9fb6aaceb864b83b5a557fca165fe0b WHIRLPOOL c56a4e18894411e752cfca6fbbe968c1cbb6ed4cd5e8ea9cf99c33640a1e032ec4af11c2bbf133bc85668abdd03ee3a379ed5b924c577a9c37ddd097d964ba0c
diff --git a/dev-util/kdevelop-python/kdevelop-python-1.5.2.ebuild b/dev-util/kdevelop-python/kdevelop-python-1.5.2.ebuild
deleted file mode 100644
index d427132deca1..000000000000
--- a/dev-util/kdevelop-python/kdevelop-python-1.5.2.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-KDEBASE="kdevelop"
-KMNAME="kdev-python"
-KDE_LINGUAS="bs ca ca@valencia cs da de en_GB eo es et fi fr ga gl hu it ja lt
-mai mr nds nl pl pt pt_BR ro ru sk sl sv th tr ug uk zh_CN zh_TW"
-inherit kde4-base
-
-MY_PN="${KMNAME}"
-MY_PV="v${PV}"
-MY_P="${MY_PN}-${MY_PV}"
-
-if [[ $PV != *9999* ]]; then
-	SRC_URI="mirror://kde/stable/kdevelop/${MY_PN}/${PV}/src/${MY_P}.tar.xz"
-	KEYWORDS="amd64 x86"
-	S=${WORKDIR}/${MY_P}
-else
-	EGIT_REPO_URI="git://anongit.kde.org/kdev-python.git"
-	KEYWORDS=""
-fi
-
-DESCRIPTION="Python plugin for KDevelop 4"
-HOMEPAGE="http://www.kdevelop.org"
-
-LICENSE="GPL-2"
-IUSE="debug"
-
-DEPEND="
-	>=dev-util/kdevelop-pg-qt-1.0.0:4
-"
-RDEPEND="
-	dev-util/kdevelop:4
-"
-
-RESTRICT="test"
-
-src_compile() {
-	pushd "${WORKDIR}"/${P}_build > /dev/null
-	emake parser
-	popd > /dev/null
-
-	kde4-base_src_compile
-}
diff --git a/dev-util/kdevelop-python/kdevelop-python-1.6.0.ebuild b/dev-util/kdevelop-python/kdevelop-python-1.6.0.ebuild
deleted file mode 100644
index aa614eae1d01..000000000000
--- a/dev-util/kdevelop-python/kdevelop-python-1.6.0.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-KDEBASE="kdevelop"
-KMNAME="kdev-python"
-KDE_LINGUAS="bs ca ca@valencia da de es fi fr gl it kk nl pt pt_BR sk sl sv uk
-zh_TW"
-inherit kde4-base
-
-MY_PN="${KMNAME}"
-MY_P="${MY_PN}-${PV}"
-
-if [[ $PV != *9999* ]]; then
-	SRC_URI="mirror://kde/stable/kdevelop/${KDEVELOP_VERSION}/src/${MY_P}.tar.xz"
-	KEYWORDS="~amd64 ~x86"
-	S=${WORKDIR}/${MY_P}
-else
-	EGIT_REPO_URI="git://anongit.kde.org/kdev-python.git"
-	KEYWORDS=""
-fi
-
-DESCRIPTION="Python plugin for KDevelop 4"
-HOMEPAGE="http://www.kdevelop.org"
-
-LICENSE="GPL-2"
-IUSE="debug"
-
-DEPEND=""
-RDEPEND="
-	dev-util/kdevelop:4
-"
-
-RESTRICT="test"
-
-src_compile() {
-	pushd "${WORKDIR}"/${P}_build > /dev/null
-	emake parser
-	popd > /dev/null
-
-	kde4-base_src_compile
-}
diff --git a/dev-util/kdevelop-qmake/Manifest b/dev-util/kdevelop-qmake/Manifest
index 1a909e1d20c3..83b6a0c39ff8 100644
--- a/dev-util/kdevelop-qmake/Manifest
+++ b/dev-util/kdevelop-qmake/Manifest
@@ -1,2 +1 @@
-DIST kdevelop-qmake-1.6.0.tar.gz 65997 SHA256 d6e1988014d2dd3ec88835aec557f5c95a307276beb6315cf839ba7330028e96 SHA512 ff96cb0351edbdfea5a7040f663a808fb4bc6cf44bb1e54c4bf1ad2c836f29073734e140196ab5b20e393f6ad795a179e53f92d5e293658d80becf09d0b99852 WHIRLPOOL da3bc56f13ed67d1278d6a106baa5ad99a3c252cea11e86c464fa20985c30c7bd9cb17c5e126463905034aa8ef74d1734183ab32222e67a5b3fd6f5033f578dd
 DIST kdevelop-qmake-1.7.0.tar.gz 65864 SHA256 f0ae7b9ef570b755773c8c53917e1352dddc37fe061611fdebb3b4a1a8c62f1a SHA512 eadeefb3b927710ea5ec365e3d3e99d4f0af2a995cc18ddeeb437c0ee946b61f25b574846c8dff39bf6e0bcafce8adeb9a8ca787a429498b3cc15a7e78225e9f WHIRLPOOL aa551982dfb47b6820eed0f8fd0e7b3d08425406b6b2b6616257ea5ea47e2aed881791de0cc1b5b6b5ffa4bb60e13b7968c3a244e62cef284fe6fc2f7ce70b99
diff --git a/dev-util/kdevelop-qmake/kdevelop-qmake-1.6.0.ebuild b/dev-util/kdevelop-qmake/kdevelop-qmake-1.6.0.ebuild
deleted file mode 100644
index 4ea22fad4cb2..000000000000
--- a/dev-util/kdevelop-qmake/kdevelop-qmake-1.6.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-KDEBASE="kdevelop"
-KMNAME="kdev-qmake"
-inherit kde4-base
-
-MY_PN="${KMNAME}"
-S=${WORKDIR}/${MY_PN}
-DESCRIPTION="Qt's qmake build system plugin for KDevelop"
-HOMEPAGE="http://www.kdevelop.org/"
-SRC_URI="https://quickgit.kde.org/?p=${MY_PN}.git&a=snapshot&h=${PV%%.0} -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="4"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	dev-util/kdevelop:4
-	dev-util/kdevelop-pg-qt:4
-"
-RDEPEND="${DEPEND}"
-
-src_install() {
-	kde4-base_src_install
-	rm "${D}/usr/share/apps/kdevappwizard/templates/qmake_qt4guiapp.tar.bz2"
-}
diff --git a/dev-util/kdevelop/Manifest b/dev-util/kdevelop/Manifest
index 47350368c439..2f6dc573079c 100644
--- a/dev-util/kdevelop/Manifest
+++ b/dev-util/kdevelop/Manifest
@@ -1,3 +1 @@
-DIST kdevelop-4.5.2.tar.xz 4901660 SHA256 d157224a81c886cbe32d25600a29042a6fec1e0c535202dc85748cd15877fe30 SHA512 6bb1103e739f33f07e7c5278b284a5f991c9537acb94b7e103a449a7702ea97a0daf2d4fe7c24aeb45e6dfff3af7fc7accc67815283d28e20bf1c15206dbdc0e WHIRLPOOL 5de50b372b75f29118aef58114d5ac3f7a69b043a95c1233f11886412625ccaca6090bc28426eaf31cb26c30a0177bc4c7753b2fec26ae019120cde7fa9c4217
-DIST kdevelop-4.6.0.tar.xz 4867960 SHA256 1ee9e7b8c46f575dd29d920cfd6284130f2e738a2e1f52dfd97b075fab2e4c73 SHA512 0d2239f4fdf9b78e757161911e44cbf9543347cf291504adde8b5d46390993ba907b55aa0653ba3b0de3d9aad949a7c7135b6626c1e733f9f2b7cc013b09eb77 WHIRLPOOL 8cf4562fbe0a3d87bd5ab0c03b0907fa7777db2909f0511f065cc6ec52deb24a12cd7d234125d000803f4897ffada0b614b1a0eefcc3acec558d05192670ce91
 DIST kdevelop-4.7.1.tar.xz 4441540 SHA256 e3ad5377f53739a67216d37cda3f88c03f8fbb0c96e2a9ef4056df3c124e95c1 SHA512 a5fcdb4b83f6b9512350d73314df3ed8fd4f8a6544f358c480295f1f1f81799f18e30b44c24b73b4db244e63f01c29990854532688bf0a866c7fe83f924a48bd WHIRLPOOL 630802a540db94a6f56b0c15ff8910ea6168401f88aaf3e14476461d169f4e456f83444fbf8f9c927c7c196b0797c40d58972d1b05a912eeb18d8d5b1239e4f9
diff --git a/dev-util/kdevelop/files/kdevelop-4.5.2-kdevplatform-without-qjson.patch b/dev-util/kdevelop/files/kdevelop-4.5.2-kdevplatform-without-qjson.patch
deleted file mode 100644
index b45623623a23..000000000000
--- a/dev-util/kdevelop/files/kdevelop-4.5.2-kdevplatform-without-qjson.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-commit fb4234cd72ceebb200bef13234ea9c36c9a62046
-Author: Kevin Funk <kevin@kfunk.org>
-Date:   Sun Nov 3 22:09:56 2013 +0100
-
-    Check if kdevplatform has JSON support
-    
-    BUG: 327095
-
-diff --git a/languages/cpp/tests/CMakeLists.txt b/languages/cpp/tests/CMakeLists.txt
-index 84ce3ee..fbdd4db 100644
---- a/languages/cpp/tests/CMakeLists.txt
-+++ b/languages/cpp/tests/CMakeLists.txt
-@@ -55,7 +55,9 @@ target_link_libraries(buddiestest
- ########### next target ###############
- 
- find_package(QJSON)
--if(QJSON_FOUND)
-+# Also check that kdevplatform is built with JSON support
-+# see: https://bugs.kde.org/show_bug.cgi?id=327095
-+if(QJSON_FOUND AND KDEVPLATFORM_JSONTESTS_LIBRARIES)
-   set(cppfilestest_SRCS test_cppfiles.cpp)
-   kde4_add_unit_test(cppfilestest ${cppfilestest_SRCS})
-   configure_file("testfilepaths.h.cmake" "testfilepaths.h" ESCAPE_QUOTES)
-@@ -67,7 +69,7 @@ if(QJSON_FOUND)
-       ${KDEVPLATFORM_JSONTESTS_LIBRARIES}
-       kdev4cppduchain
-   )
--endif(QJSON_FOUND)
-+endif()
- 
- ########### next target ###############
- 
diff --git a/dev-util/kdevelop/kdevelop-4.5.2.ebuild b/dev-util/kdevelop/kdevelop-4.5.2.ebuild
deleted file mode 100644
index 58f0d403a8db..000000000000
--- a/dev-util/kdevelop/kdevelop-4.5.2.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-KDE_LINGUAS="bs ca ca@valencia da de el en_GB es et fi fr gl hu it kk nb nds nl
-pl pt pt_BR ru sk sl sv th tr uk zh_CN zh_TW"
-VIRTUALX_REQUIRED=test
-inherit kde4-base
-
-DESCRIPTION="Integrated Development Environment for Unix, supporting KDE/Qt, C/C++ and many other languages"
-LICENSE="GPL-2 LGPL-2"
-IUSE="+cmake +cxx debug okteta qthelp reviewboard"
-SRC_URI="mirror://kde/stable/kdevelop/${KDEVELOP_VERSION}/src/${P}.tar.xz"
-
-if [[ $PV == *9999* ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="amd64 ppc x86"
-fi
-
-DEPEND="
-	>=dev-util/kdevplatform-${KDEVPLATFORM_VERSION}[reviewboard?]
-	$(add_kdebase_dep ksysguard)
-	$(add_kdebase_dep libkworkspace)
-	okteta? ( $(add_kdeapps_dep okteta) )
-	qthelp? ( dev-qt/qthelp:4 )
-	reviewboard? ( dev-libs/qjson )
-"
-RDEPEND="${DEPEND}
-	$(add_kdeapps_dep kapptemplate)
-	$(add_kdeapps_dep kdebase-kioslaves)
-	dev-qt/qtdeclarative:4[webkit]
-	cxx? ( >=sys-devel/gdb-7.0[python] )
-"
-RESTRICT="test"
-# see bug 366471
-
-PATCHES=( "${FILESDIR}/${P}-kdevplatform-without-qjson.patch" )
-
-src_configure() {
-	mycmakeargs=(
-		$(cmake-utils_use_build cmake)
-		$(cmake-utils_use_build cmake cmakebuilder)
-		$(cmake-utils_use_build cxx cpp)
-		$(cmake-utils_use_with okteta LibKasten)
-		$(cmake-utils_use_with okteta LibOkteta)
-		$(cmake-utils_use_with okteta LibOktetaKasten)
-		$(cmake-utils_use_build qthelp)
-		$(cmake-utils_use_find_package reviewboard QJSON)
-	)
-
-	kde4-base_src_configure
-}
diff --git a/dev-util/kdevelop/kdevelop-4.6.0.ebuild b/dev-util/kdevelop/kdevelop-4.6.0.ebuild
deleted file mode 100644
index 9161fabaf991..000000000000
--- a/dev-util/kdevelop/kdevelop-4.6.0.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-KDE_LINGUAS="bs ca ca@valencia da de el en_GB es et fi fr gl hu it kk nb nds nl
-pl pt pt_BR ru sk sl sv th uk zh_CN zh_TW"
-VIRTUALX_REQUIRED=test
-inherit kde4-base
-
-DESCRIPTION="Integrated Development Environment for Unix, supporting KDE/Qt, C/C++ and many other languages"
-LICENSE="GPL-2 LGPL-2"
-IUSE="+cmake +cxx debug okteta qthelp"
-SRC_URI="mirror://kde/stable/kdevelop/${KDEVELOP_VERSION}/src/${P}.tar.xz"
-
-if [[ $PV == *9999* ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="~amd64 ~ppc ~x86"
-fi
-
-DEPEND="
-	dev-libs/qjson
-	>=dev-util/kdevplatform-${KDEVPLATFORM_VERSION}
-	$(add_kdebase_dep ksysguard)
-	$(add_kdebase_dep libkworkspace)
-	okteta? ( $(add_kdeapps_dep okteta) )
-	qthelp? ( dev-qt/qthelp:4 )
-"
-RDEPEND="${DEPEND}
-	$(add_kdeapps_dep kapptemplate)
-	$(add_kdeapps_dep kdebase-kioslaves)
-	dev-qt/qtdeclarative:4[webkit]
-	cxx? ( >=sys-devel/gdb-7.0[python] )
-"
-RESTRICT="test"
-# see bug 366471
-
-src_configure() {
-	mycmakeargs=(
-		$(cmake-utils_use_build cmake)
-		$(cmake-utils_use_build cmake cmakebuilder)
-		$(cmake-utils_use_build cxx cpp)
-		$(cmake-utils_use_with okteta LibKasten)
-		$(cmake-utils_use_with okteta LibOkteta)
-		$(cmake-utils_use_with okteta LibOktetaKasten)
-		$(cmake-utils_use_build qthelp)
-	)
-
-	kde4-base_src_configure
-}
diff --git a/dev-util/kdevelop/kdevelop-4.7.1-r1.ebuild b/dev-util/kdevelop/kdevelop-4.7.1-r1.ebuild
index 40a5657c6c9a..a2324543f780 100644
--- a/dev-util/kdevelop/kdevelop-4.7.1-r1.ebuild
+++ b/dev-util/kdevelop/kdevelop-4.7.1-r1.ebuild
@@ -15,7 +15,7 @@ LICENSE="GPL-2 LGPL-2"
 IUSE="+cmake +cxx debug +gdbui okteta qthelp"
 
 if [[ ${KDE_BUILD_TYPE} = release ]]; then
-	KEYWORDS="amd64 ~ppc x86"
+	KEYWORDS="amd64 ppc x86"
 fi
 
 DEPEND="
diff --git a/dev-util/kdevelop/kdevelop-4.7.1.ebuild b/dev-util/kdevelop/kdevelop-4.7.1.ebuild
deleted file mode 100644
index addf588c8ccd..000000000000
--- a/dev-util/kdevelop/kdevelop-4.7.1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-KDE_LINGUAS="bs ca ca@valencia da de el en_GB es et fi fr gl hu it kk nb nds nl
-pl pt pt_BR ru sk sl sv th tr uk zh_CN zh_TW"
-VIRTUALX_REQUIRED="test"
-EGIT_BRANCH="4.7"
-inherit kde4-base
-
-DESCRIPTION="Integrated Development Environment for Unix, supporting KDE/Qt, C/C++ and many other languages"
-LICENSE="GPL-2 LGPL-2"
-IUSE="+cmake +cxx debug +gdbui okteta qthelp"
-
-if [[ ${KDE_BUILD_TYPE} = release ]]; then
-	KEYWORDS="~amd64 ~ppc ~x86"
-fi
-
-DEPEND="
-	dev-libs/qjson
-	dev-qt/qtdeclarative:4[webkit]
-	gdbui? (
-		$(add_kdebase_dep ksysguard)
-		$(add_kdebase_dep libkworkspace)
-	)
-	okteta? ( $(add_kdeapps_dep okteta) )
-	qthelp? ( dev-qt/qthelp:4 )
-"
-RDEPEND="${DEPEND}
-	$(add_kdeapps_dep kapptemplate)
-	$(add_kdeapps_dep kdebase-kioslaves)
-	cxx? ( >=sys-devel/gdb-7.0[python] )
-"
-RESTRICT="test"
-# see bug 366471
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_build cmake)
-		$(cmake-utils_use_build cmake cmakebuilder)
-		$(cmake-utils_use_build cxx cpp)
-		$(cmake-utils_use_with gdbui KDE4Workspace)
-		$(cmake-utils_use_with okteta LibKasten)
-		$(cmake-utils_use_with okteta LibOkteta)
-		$(cmake-utils_use_with okteta LibOktetaKasten)
-		$(cmake-utils_use_build qthelp)
-	)
-
-	kde4-base_src_configure
-}
diff --git a/dev-util/kdevelop/metadata.xml b/dev-util/kdevelop/metadata.xml
index ced196a367bd..d6717c393ca4 100644
--- a/dev-util/kdevelop/metadata.xml
+++ b/dev-util/kdevelop/metadata.xml
@@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>kde</herd>
-<use>
-	<flag name="cmake">Enable support for CMake build system</flag>
-	<flag name="gdbui">Enable GUI for attaching GDB to a running process</flag>
-	<flag name="okteta">Enable hex editor plugin</flag>
-	<flag name="qthelp">Enable support for QtHelp documentation browsing</flag>
-	<flag name="reviewboard">Enable reviewboard support</flag>
-</use>
+	<herd>kde</herd>
+	<use>
+		<flag name="cmake">Enable support for CMake build system</flag>
+		<flag name="gdbui">Enable GUI for attaching GDB to a running process</flag>
+		<flag name="okteta">Enable hex editor plugin</flag>
+		<flag name="qthelp">Enable support for QtHelp documentation browsing</flag>
+	</use>
 </pkgmetadata>
diff --git a/dev-util/kdevplatform/Manifest b/dev-util/kdevplatform/Manifest
index 5429a3f0190c..4e541010e616 100644
--- a/dev-util/kdevplatform/Manifest
+++ b/dev-util/kdevplatform/Manifest
@@ -1,3 +1 @@
-DIST kdevplatform-1.5.2.tar.xz 1895448 SHA256 a12656cfe137172db5feed9795b4f40b7fb42a93b6caf90838e5f9c205ee186a SHA512 019f7df0ca232d6627517c8677633f44807dddf6efc610df8b96a548f5280cce331e0afc8b4743f7badbe3fd7918def6c6c9b0c5806e9a8be2c9dafed4a95f03 WHIRLPOOL b6ba6103a8146912fe49d84cc21373746804cfaa4b607a63c7db7e92df5b44884b7f3880cc01399ba7eb3618b216e1d2b727cefdc24ee50d8c22c6206b34450b
-DIST kdevplatform-1.6.0.tar.xz 1889840 SHA256 cdf7c88ca8860258f46e41d2107c826a307212fd041345bee54fbd70c9794f80 SHA512 3f9d6aeb5fdb12dc0a719343ac81b8852d1680f2637fea8f3a8b97eaa32af38bd799e215a539792ec2e33dc0c0f53ba5f9347abc3633c4c31a71422bd2a8065f WHIRLPOOL 897cdb1f0893bd22e73c68ed3860cc8953c78ce8406eb0d41442d1402395cf4e00f17bf27a804f67857e160311aa979d178c2700b0370eea66d92759194a7b65
 DIST kdevplatform-1.7.1.tar.xz 1930560 SHA256 dfd8953aec204f04bd949443781aa0f6d9d58c40f73027619a168bb4ffc4b1ac SHA512 b19c925c973ab00b25b03f1bcf1e34a98b8108728f20e7b058bd391a1dde78e33b80705c39632ff594ecf834878e1c54732031b8110400433266c258632468d0 WHIRLPOOL 9e687644b1f31ca317bb3fa0000f388aca80ee305eaa3b43d044181d2b2374ad57613104a400a8a052ed07e5157fbbdc26b7174314cc04ca5b8c788afe4c8f4f
diff --git a/dev-util/kdevplatform/files/kdevplatform-1.6.0-appwizard.patch b/dev-util/kdevplatform/files/kdevplatform-1.6.0-appwizard.patch
deleted file mode 100644
index d4f93f66277f..000000000000
--- a/dev-util/kdevplatform/files/kdevplatform-1.6.0-appwizard.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-commit 33b660dfefe02ecd4391a284f6fd6de9439b2b45
-Author: Milian Wolff <mail@milianw.de>
-Date:   Thu Mar 20 11:50:07 2014 +0100
-
-    Keep backwards compatibility: replace "dest" variable.
-    
-    Its an alias for PROJECTDIR and used in quite some templates
-    apparently.
-    
-    BUG: 329392
-
-diff --git a/plugins/appwizard/appwizardplugin.cpp b/plugins/appwizard/appwizardplugin.cpp
-index 3e22183..7948e47 100644
---- a/plugins/appwizard/appwizardplugin.cpp
-+++ b/plugins/appwizard/appwizardplugin.cpp
-@@ -238,6 +238,8 @@ QString AppWizardPlugin::createProject(const ApplicationInfo& info)
-     m_variables["APPNAMELC"] = info.name.toLower();
-     m_variables["APPNAMEID"] = generateIdentifier(info.name);
-     m_variables["PROJECTDIR"] = dest.toLocalFile();
-+    // backwards compatibility
-+    m_variables["dest"] = m_variables["PROJECTDIR"];
-     m_variables["PROJECTDIRNAME"] = dest.fileName();
-     m_variables["VERSIONCONTROLPLUGIN"] = info.vcsPluginName;
- 
diff --git a/dev-util/kdevplatform/kdevplatform-1.5.2.ebuild b/dev-util/kdevplatform/kdevplatform-1.5.2.ebuild
deleted file mode 100644
index b5a21316cdb9..000000000000
--- a/dev-util/kdevplatform/kdevplatform-1.5.2.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-KMNAME="kdevelop"
-KDE_MINIMAL="4.7"
-KDE_LINGUAS="bs ca ca@valencia da de el en_GB es et fi fr gl it kk nb nds nl pl
-pt pt_BR ru sk sl sv th uk zh_CN zh_TW"
-VIRTUALDBUS_TEST="true"
-VIRTUALX_REQUIRED="test"
-EGIT_REPONAME="${PN}"
-inherit kde4-base
-
-DESCRIPTION="KDE development support libraries and apps"
-LICENSE="GPL-2 LGPL-2"
-IUSE="cvs debug reviewboard subversion"
-SRC_URI="mirror://kde/stable/kdevelop/${KDEVELOP_VERSION}/src/${P}.tar.xz"
-
-if [[ $PV == *9999 ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="amd64 ppc x86"
-fi
-
-DEPEND="
-	dev-libs/boost:=
-	dev-libs/grantlee:0
-	reviewboard? ( dev-libs/qjson )
-	subversion? (
-		dev-libs/apr
-		dev-libs/apr-util
-		dev-vcs/subversion
-	)
-"
-RDEPEND="${DEPEND}
-	!<dev-util/kdevelop-${KDEVELOP_VERSION}:4
-	$(add_kdeapps_dep konsole)
-	cvs? ( dev-vcs/cvs )
-"
-
-src_configure() {
-	mycmakeargs=(
-		$(cmake-utils_use_build cvs)
-		$(cmake-utils_use_find_package reviewboard QJSON)
-		$(cmake-utils_use_build subversion)
-	)
-
-	kde4-base_src_configure
-}
diff --git a/dev-util/kdevplatform/kdevplatform-1.6.0-r1.ebuild b/dev-util/kdevplatform/kdevplatform-1.6.0-r1.ebuild
deleted file mode 100644
index f817a721be32..000000000000
--- a/dev-util/kdevplatform/kdevplatform-1.6.0-r1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-KMNAME="kdevelop"
-KDE_LINGUAS="bs ca ca@valencia da de el es et fi fr gl it kk nb nl pl pt pt_BR
-ru sk sl sv th uk zh_CN zh_TW"
-VIRTUALDBUS_TEST="true"
-VIRTUALX_REQUIRED="test"
-EGIT_REPONAME="${PN}"
-inherit kde4-base
-
-DESCRIPTION="KDE development support libraries and apps"
-LICENSE="GPL-2 LGPL-2"
-IUSE="cvs debug reviewboard subversion"
-SRC_URI="mirror://kde/stable/kdevelop/${KDEVELOP_VERSION}/src/${P}.tar.xz"
-
-if [[ $PV == *9999 ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="~amd64 ~ppc ~x86"
-fi
-
-RESTRICT="test"
-
-DEPEND="
-	dev-libs/boost:=
-	dev-libs/grantlee:0
-	reviewboard? ( dev-libs/qjson )
-	subversion? (
-		dev-libs/apr
-		dev-libs/apr-util
-		dev-vcs/subversion
-	)
-"
-RDEPEND="${DEPEND}
-	!<dev-util/kdevelop-${KDEVELOP_VERSION}:4
-	$(add_kdeapps_dep konsole)
-	cvs? ( dev-vcs/cvs )
-"
-
-PATCHES=( "${FILESDIR}/${P}-appwizard.patch" )
-
-src_configure() {
-	mycmakeargs=(
-		$(cmake-utils_use_build cvs)
-		$(cmake-utils_use_find_package reviewboard QJSON)
-		$(cmake-utils_use_build subversion)
-	)
-
-	kde4-base_src_configure
-}
diff --git a/dev-util/kdevplatform/kdevplatform-1.7.1.ebuild b/dev-util/kdevplatform/kdevplatform-1.7.1.ebuild
index 2b279cfe110b..f15ed0fbffe0 100644
--- a/dev-util/kdevplatform/kdevplatform-1.7.1.ebuild
+++ b/dev-util/kdevplatform/kdevplatform-1.7.1.ebuild
@@ -21,7 +21,7 @@ IUSE="+classbrowser cvs debug +konsole reviewboard subversion"
 if [[ $PV == *9999 ]]; then
 	KEYWORDS=""
 else
-	KEYWORDS="amd64 ~ppc x86"
+	KEYWORDS="amd64 ppc x86"
 fi
 
 RESTRICT="test"
diff --git a/dev-util/meld/meld-3.14.0.ebuild b/dev-util/meld/meld-3.14.0.ebuild
index 3ed56a0e0aff..97b12453e52d 100644
--- a/dev-util/meld/meld-3.14.0.ebuild
+++ b/dev-util/meld/meld-3.14.0.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="http://meldmerge.org/"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="${PYTHON_DEPS}
diff --git a/dev-util/ninja/ninja-1.6.0.ebuild b/dev-util/ninja/ninja-1.6.0.ebuild
index 42be58f2e500..1b7057a686fb 100644
--- a/dev-util/ninja/ninja-1.6.0.ebuild
+++ b/dev-util/ninja/ninja-1.6.0.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/martine/ninja.git"
 else
 	SRC_URI="https://github.com/martine/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 fi
 
 DESCRIPTION="A small build system similar to make"
diff --git a/dev-util/ninja/ninja-9999.ebuild b/dev-util/ninja/ninja-9999.ebuild
index 42be58f2e500..1b7057a686fb 100644
--- a/dev-util/ninja/ninja-9999.ebuild
+++ b/dev-util/ninja/ninja-9999.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/martine/ninja.git"
 else
 	SRC_URI="https://github.com/martine/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 fi
 
 DESCRIPTION="A small build system similar to make"
diff --git a/dev-util/nvidia-cuda-sdk/Manifest b/dev-util/nvidia-cuda-sdk/Manifest
index bac01742e600..dcbfa74bd67e 100644
--- a/dev-util/nvidia-cuda-sdk/Manifest
+++ b/dev-util/nvidia-cuda-sdk/Manifest
@@ -5,3 +5,4 @@ DIST cuda_6.5.14_linux_64.run 972320904 SHA256 f3e527f34f317314fe8fcd8c85f105607
 DIST cuda_6.5.19_linux_32.run 81882112 SHA256 9f767f38b84f52c097bec81669f99e4a6c4c9c09b5da1bc09fe49e0f804bc7a6 SHA512 1ce9bd6b472b7e4f1fb181eb340dfcb757714d59a89aaa02146cfe1a97c8ccb7eb7699b4ec823276f277eb4d82d95050eaba17e7ed5fd2e47b9b5d78531c5d4e WHIRLPOOL ac94b4e7f29811b4240623fb69b3c54214e7f0c60a286d899944dbab9da7fd3c122760199a3357667e33879bd48fbf352d5d39029acca6021e7caf21785557ed
 DIST cuda_6.5.19_linux_64.run 982446238 SHA256 5279bc159b72b7445d8aae5f289d24bb4042c35422ef32da68049d8f666d3ff5 SHA512 06854f020a5f72cf4bd714859e6966248ac2f589284113674e869fdaa1254cae27d4101940758ecda5df4724ad3e448a1f6d0c053b6cbc28107750872b6a5797 WHIRLPOOL 6ae8e53719e12997de60ec3688167f3fe33b1145d01217182e39ac386c25b358c8ba6cee45ad6c80e33ef66fd9a511338dce4589f10a31635b8437b6e528fd7a
 DIST cuda_7.0.28_linux.run 1118797679 SHA256 d1292e9c2bbaddad24c46e0b0d15a7130831bfac0382f7159321f41ae385a5ce SHA512 f002433133e40000cbb78283e08c25f7397612957c0440605311f8921bcebd54a808069ca36b218be66a054e8afab4871b2bf1bd4d419c6f98a0d74b00a9bc78 WHIRLPOOL dcf21d2e356a1797b9e79ac9edfb3924a1d4a2914382dbe21b2172c200dd4f7d93905ac44fbc2e994ce14b7ab28e78163f4c81ddcc6cbb97e4ce085efd2d8475
+DIST cuda_7.5.18_linux.run 1195431560 SHA256 245ffb6c1e2b69d323f8ae3a1b63d3384fec3934222e56e9d801ecc0d6e919c5 SHA512 cb933512fde09376b1d6040c72d24c4f91dc44f73322ca87aa7d1f34156c9c87feea41f9a00f1a403cfb89645b5e7a6a5f2bfe4933703ba81f0cf94968d430fd WHIRLPOOL b1a06acba02043fabf496ba683fb984b1c90df2cd71396457f664beb8cb26b2e3074c8568ec6ce0cfe565721986670c7a40351a29a4856a7e03268c14d545247
diff --git a/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-7.5.18.ebuild b/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-7.5.18.ebuild
new file mode 100644
index 000000000000..3b7b2117d25f
--- /dev/null
+++ b/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-7.5.18.ebuild
@@ -0,0 +1,144 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit cuda eutils flag-o-matic portability toolchain-funcs unpacker versionator
+
+MYD=$(get_version_component_range 1)_$(get_version_component_range 2)
+
+DESCRIPTION="NVIDIA CUDA Software Development Kit"
+HOMEPAGE="https://developer.nvidia.com/cuda-downloads"
+SRC_URI="http://developer.download.nvidia.com/compute/cuda/${MYD}/Prod/local_installers/cuda_${PV}_linux.run"
+
+LICENSE="CUDPP"
+SLOT="0"
+KEYWORDS="~amd64 ~amd64-linux"
+IUSE="debug +doc +examples opencl +cuda"
+
+RDEPEND="
+	~dev-util/nvidia-cuda-toolkit-${PV}
+	media-libs/freeglut
+	examples? (
+		media-libs/freeimage
+		media-libs/glew
+		virtual/mpi
+		>=x11-drivers/nvidia-drivers-352.39[uvm]
+		)"
+DEPEND="${RDEPEND}"
+
+RESTRICT="test"
+
+S=${WORKDIR}/samples
+
+QA_EXECSTACK=(
+	opt/cuda/sdk/0_Simple/cdpSimplePrint/cdpSimplePrint
+	opt/cuda/sdk/0_Simple/cdpSimpleQuicksort/cdpSimpleQuicksort
+	opt/cuda/sdk/bin/x86_64/linux/release/cdpSimplePrint
+	opt/cuda/sdk/bin/x86_64/linux/release/cdpSimpleQuicksort
+	)
+
+src_unpack() {
+	unpacker
+	unpacker run_files/cuda-samples*run
+}
+
+pkg_setup() {
+	if use cuda || use opencl; then
+		cuda_pkg_setup
+	fi
+}
+
+src_prepare() {
+	export RAWLDFLAGS="$(raw-ldflags)"
+#	epatch "${FILESDIR}"/${P}-asneeded.patch
+
+	sed \
+		-e 's:-O2::g' \
+		-e 's:-O3::g' \
+		-e "/LINK/s:gcc:$(tc-getCC) ${LDFLAGS}:g" \
+		-e "/LINK/s:g++:$(tc-getCXX) ${LDFLAGS}:g" \
+		-e "/CC/s:gcc:$(tc-getCC):g" \
+		-e "/GCC/s:g++:$(tc-getCXX):g" \
+		-e "/NVCC /s|\(:=\).*|:= ${EPREFIX}/opt/cuda/bin/nvcc|g" \
+		-e "/ CFLAGS/s|\(:=\)|\1 ${CFLAGS}|g" \
+		-e "/ CXXFLAGS/s|\(:=\)|\1 ${CXXFLAGS}|g" \
+		-e "/NVCCFLAGS/s|\(:=\)|\1 ${NVCCFLAGS} |g" \
+		-e 's:-Wimplicit::g' \
+		-e "s|../../common/lib/linux/\$(OS_ARCH)/libGLEW.a|$($(tc-getPKG_CONFIG) --libs glew)|g" \
+		-e "s|../../common/lib/\$(OSLOWER)/libGLEW.a|$($(tc-getPKG_CONFIG) --libs glew)|g" \
+		-e "s|../../common/lib/\$(OSLOWER)/\$(OS_ARCH)/libGLEW.a|$($(tc-getPKG_CONFIG) --libs glew)|g" \
+		-i $(find . -type f -name "Makefile") || die
+
+#		-e "/ALL_LDFLAGS/s|:=|:= ${RAWLDFLAGS} |g" \
+	find common/inc/GL -delete || die
+	find . -type f -name "*\.a" -delete || die
+}
+
+src_compile() {
+	use examples || return
+	local myopts verbose="verbose=1"
+	use debug && myopts+=" dbg=1"
+	export FAKEROOTKEY=1 # Workaround sandbox issue in #462602
+	emake \
+		cuda-install="${EPREFIX}/opt/cuda" \
+		CUDA_PATH="${EPREFIX}/opt/cuda/" \
+		MPI_GCC=10 \
+		${myopts} ${verbose}
+}
+
+src_test() {
+	local _dir _subdir
+
+	addwrite /dev/nvidiactl
+	addwrite /dev/nvidia0
+
+	for _dir in {0..9}*; do
+		pushd ${_dir} > /dev/null
+		for _subdir in *; do
+			emake -C ${_subdir} run
+		done
+		popd > /dev/null
+	done
+}
+
+src_install() {
+	local i j f t crap=""
+
+	if use doc; then
+		ebegin "Installing docs ..."
+			treecopy $(find -type f \( -name readme.txt -o -name "*.pdf" \)) "${ED}"/usr/share/doc/${PF}/
+			docompress -x $(find "${ED}"/usr/share/doc/${PF}/ -type f -name readme.txt | sed -e "s:${ED}::")
+		eend
+	fi
+
+	crap+=" *.txt Samples.htm*"
+
+	ebegin "Cleaning before installation..."
+		for i in ${crap}; do
+			if [[ -e ${i} ]]; then
+				find ${i} -delete || die
+			fi
+		done
+		find -type f \( -name "*.o" -o -name "*.pdf" -o -name "readme.txt" \) -delete || die
+	eend
+
+	ebegin "Moving files..."
+		for f in $(find .); do
+			local t="$(dirname ${f})"
+			if [[ ${t/obj\/} != ${t} || ${t##*.} == a ]]; then
+				continue
+			fi
+			if [[ ! -d ${f} ]]; then
+				if [[ -x ${f} ]]; then
+					exeinto /opt/cuda/sdk/${t}
+					doexe ${f}
+				else
+					insinto /opt/cuda/sdk/${t}
+					doins ${f}
+				fi
+			fi
+	done
+	eend
+}
diff --git a/dev-util/nvidia-cuda-toolkit/Manifest b/dev-util/nvidia-cuda-toolkit/Manifest
index bac01742e600..dcbfa74bd67e 100644
--- a/dev-util/nvidia-cuda-toolkit/Manifest
+++ b/dev-util/nvidia-cuda-toolkit/Manifest
@@ -5,3 +5,4 @@ DIST cuda_6.5.14_linux_64.run 972320904 SHA256 f3e527f34f317314fe8fcd8c85f105607
 DIST cuda_6.5.19_linux_32.run 81882112 SHA256 9f767f38b84f52c097bec81669f99e4a6c4c9c09b5da1bc09fe49e0f804bc7a6 SHA512 1ce9bd6b472b7e4f1fb181eb340dfcb757714d59a89aaa02146cfe1a97c8ccb7eb7699b4ec823276f277eb4d82d95050eaba17e7ed5fd2e47b9b5d78531c5d4e WHIRLPOOL ac94b4e7f29811b4240623fb69b3c54214e7f0c60a286d899944dbab9da7fd3c122760199a3357667e33879bd48fbf352d5d39029acca6021e7caf21785557ed
 DIST cuda_6.5.19_linux_64.run 982446238 SHA256 5279bc159b72b7445d8aae5f289d24bb4042c35422ef32da68049d8f666d3ff5 SHA512 06854f020a5f72cf4bd714859e6966248ac2f589284113674e869fdaa1254cae27d4101940758ecda5df4724ad3e448a1f6d0c053b6cbc28107750872b6a5797 WHIRLPOOL 6ae8e53719e12997de60ec3688167f3fe33b1145d01217182e39ac386c25b358c8ba6cee45ad6c80e33ef66fd9a511338dce4589f10a31635b8437b6e528fd7a
 DIST cuda_7.0.28_linux.run 1118797679 SHA256 d1292e9c2bbaddad24c46e0b0d15a7130831bfac0382f7159321f41ae385a5ce SHA512 f002433133e40000cbb78283e08c25f7397612957c0440605311f8921bcebd54a808069ca36b218be66a054e8afab4871b2bf1bd4d419c6f98a0d74b00a9bc78 WHIRLPOOL dcf21d2e356a1797b9e79ac9edfb3924a1d4a2914382dbe21b2172c200dd4f7d93905ac44fbc2e994ce14b7ab28e78163f4c81ddcc6cbb97e4ce085efd2d8475
+DIST cuda_7.5.18_linux.run 1195431560 SHA256 245ffb6c1e2b69d323f8ae3a1b63d3384fec3934222e56e9d801ecc0d6e919c5 SHA512 cb933512fde09376b1d6040c72d24c4f91dc44f73322ca87aa7d1f34156c9c87feea41f9a00f1a403cfb89645b5e7a6a5f2bfe4933703ba81f0cf94968d430fd WHIRLPOOL b1a06acba02043fabf496ba683fb984b1c90df2cd71396457f664beb8cb26b2e3074c8568ec6ce0cfe565721986670c7a40351a29a4856a7e03268c14d545247
diff --git a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-7.5.18.ebuild b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-7.5.18.ebuild
new file mode 100644
index 000000000000..0ffc597380da
--- /dev/null
+++ b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-7.5.18.ebuild
@@ -0,0 +1,143 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit check-reqs cuda unpacker versionator
+
+MYD=$(get_version_component_range 1-2)
+
+DESCRIPTION="NVIDIA CUDA Toolkit (compiler and friends)"
+HOMEPAGE="http://developer.nvidia.com/cuda"
+SRC_URI="http://developer.download.nvidia.com/compute/cuda/${MYD}/Prod/local_installers/cuda_${PV}_linux.run"
+
+SLOT="0/${PV}"
+LICENSE="NVIDIA-CUDA"
+KEYWORDS="-* ~amd64 ~amd64-linux"
+IUSE="debugger doc eclipse profiler"
+
+DEPEND=""
+RDEPEND="${DEPEND}
+	>=sys-devel/gcc-4.7[cxx]
+	>=x11-drivers/nvidia-drivers-352.39[uvm]
+	debugger? (
+		sys-libs/libtermcap-compat
+		sys-libs/ncurses[tinfo]
+		)
+	eclipse? ( >=virtual/jre-1.6 )
+	profiler? ( >=virtual/jre-1.6 )"
+
+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
+}
+
+src_unpack() {
+	unpacker
+	unpacker run_files/cuda-linux*.run
+}
+
+src_prepare() {
+	local cuda_supported_gcc
+
+	cuda_supported_gcc="4.7 4.8 4.9"
+
+	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
+
+	mv doc/man/man3/{,cuda-}deprecated.3 || die
+	doman doc/man/man*/*
+
+	use debugger || remove+=" bin/cuda-gdb extras/Debugger"
+	( use profiler || use eclipse ) || remove+=" libnsight"
+	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}/lib64:${ecudadir}/lib
+	EOF
+	doenvd "${T}"/99cuda
+
+	use profiler && \
+		make_wrapper nvprof "${EPREFIX}"${cudadir}/bin/nvprof "." ${ecudadir}/lib64:${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/dev-util/open-vcdiff/metadata.xml b/dev-util/open-vcdiff/metadata.xml
index af2678460755..5ee3b9c53307 100644
--- a/dev-util/open-vcdiff/metadata.xml
+++ b/dev-util/open-vcdiff/metadata.xml
@@ -7,5 +7,6 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="google-code">open-vcdiff</remote-id>
+		<remote-id type="github">google/open-vcdiff</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-util/re2c/re2c-0.14.3.ebuild b/dev-util/re2c/re2c-0.14.3.ebuild
index 70387c5700fc..ff02851903a4 100644
--- a/dev-util/re2c/re2c-0.14.3.ebuild
+++ b/dev-util/re2c/re2c-0.14.3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
 
 src_prepare() {
 	epatch_user
diff --git a/dev-util/shellcheck/Manifest b/dev-util/shellcheck/Manifest
index 20410cfba156..8444267ad6ba 100644
--- a/dev-util/shellcheck/Manifest
+++ b/dev-util/shellcheck/Manifest
@@ -2,4 +2,5 @@ DIST ShellCheck-0.3.5.tar.gz 77173 SHA256 9289fda0b3683f4e7c2c003f875a9e30889736
 DIST ShellCheck-0.3.6.tar.gz 82760 SHA256 f19f950b39eba78334cfd044077ce3686fb6defe2c6e593c0def949aa089230c SHA512 53e36770eabb49f2e0e84a508b69805799451ecc3bc6b2013e68b5f701d021d552706dcc027089c92355e833059ce856ae193f320f9dad0d3c60c4c5d9516219 WHIRLPOOL 5e8e50c6fd2a0036c24994029ad2e3f5d08afee888606c5205b10bc93c6882308dbe14c3b050c3edeab6e6554f8f20d312b147f9a52575f0491a36e0e7a7411b
 DIST ShellCheck-0.3.7.tar.gz 84069 SHA256 417c90eb4e84da67b66f444ae56eab6c6674f80964a9172e4c494e7ad17b97d7 SHA512 a6835c96bbd81e5dbd84347a264b1492fbd8e4c18ca1c97a7f5d94f18d305abc45c8f994e431672d852db20054ac231511d76c0be451613629420bdc4fb9e286 WHIRLPOOL 75a67c8e388920717fa3567f65261c2242bb415e735181f16ad7068a71713fbef246ef2355887a4ef6f57b68326b269f724b97a874b26e018acd2ac3b52d5401
 DIST ShellCheck-0.3.8.tar.gz 86202 SHA256 c185b77166724c06531b3e07b7a8353c0451809a1f60e9f6756d29247853651a SHA512 d131225a9854e7a7d8de030a7267cd21c15a048c75c5fb14edca2aae957d019eb3cf0bbee0ed27ea2449928c0ee64b39e61924501a0243cfac3b20239b62d148 WHIRLPOOL 808718f336be4c16dad9112bba37fb658bb46f06a9af24bfe9e0b1888a24a2936684d7ebba8d0469cc14d8a64ae267bb7380e4ebae6fee0db2f784364a6c8acd
+DIST ShellCheck-0.4.1.tar.gz 94751 SHA256 531af7608dea3f84b14a0d795fb9322c89850235992584d4b7a7b73dc47a3905 SHA512 ebf0b6bc4900a4881de9394a51367eb5639e909e68801885cfa545a26ebdb4c2d6b86d826b9d81306894315a148a0552769b4fb157feae24af9b7040f0e07a57 WHIRLPOOL 66f6b57b277552e7707d891275f61a40015c8abb501187788b8406bf20e51b1ace134c7fbcd6a7d40935651ba8b4969813cac367db7aba2272c8acd1a6452cd7
 DIST shellcheck-man-0.3.5.tar.xz 1876 SHA256 5b3f940fd8760676c40787b25b7c950a5ae7fa25e882dea6b11dfeabb1b712ee SHA512 974b7bae0a927151819a14eef2be40d76c2eb50fadfd966bef79908b7faab958ecd42a1584cbe1fb25e2e59f1593d89b8632684d655490c83e246502d9680d26 WHIRLPOOL 622968777ce5387abe6e5f068bff5eb9879d8a990d7680fe2acba1ee89114ec5aca3cf402e579222af2941b0d99b1df95415ad17e9ef973a7b7e74fcd6acbee5
diff --git a/dev-util/shellcheck/shellcheck-0.4.1.ebuild b/dev-util/shellcheck/shellcheck-0.4.1.ebuild
new file mode 100644
index 000000000000..c5c0098b12b6
--- /dev/null
+++ b/dev-util/shellcheck/shellcheck-0.4.1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+CABAL_FEATURES="bin lib profile haddock hoogle hscolour test-suite"
+
+inherit haskell-cabal
+
+MY_PN="ShellCheck"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Shell script analysis tool"
+HOMEPAGE="http://www.shellcheck.net/"
+SRC_URI="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	dev-haskell/json:=[profile?]
+	>=dev-haskell/mtl-2.2.1:=[profile?]
+	dev-haskell/parsec:=[profile?]
+	>=dev-haskell/quickcheck-2.7.4:2=[profile?]
+	dev-haskell/regex-tdfa:=[profile?]
+	dev-haskell/transformers:=[profile?]
+	>=dev-lang/ghc-7.8.4:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.8
+	test? ( >=dev-haskell/cabal-1.20 )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+src_test() {
+	# See bug #537500 for this beauty.
+	runghc Setup.hs test || die 'test suite failed'
+}
+
+src_install() {
+	cabal_src_install
+	doman "${PN}.1"
+}
diff --git a/dev-util/shunit2/metadata.xml b/dev-util/shunit2/metadata.xml
index 800122e2b704..4276624f29ef 100644
--- a/dev-util/shunit2/metadata.xml
+++ b/dev-util/shunit2/metadata.xml
@@ -11,5 +11,6 @@
   	can do the job.</longdescription>
 	<upstream>
 		<remote-id type="google-code">shunit2</remote-id>
+		<remote-id type="github">kward/shunit2</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-util/ticpp/metadata.xml b/dev-util/ticpp/metadata.xml
index 6c08151bd39f..a0cb902846cd 100644
--- a/dev-util/ticpp/metadata.xml
+++ b/dev-util/ticpp/metadata.xml
@@ -5,5 +5,7 @@
 		<email>ago@gentoo.org</email>
 		<name>Agostino Sarubbo</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">rjpcomputing/ticpp</remote-id>
+	</upstream>
 </pkgmetadata>
-
diff --git a/dev-util/webstorm/Manifest b/dev-util/webstorm/Manifest
new file mode 100644
index 000000000000..d01f2daa6a24
--- /dev/null
+++ b/dev-util/webstorm/Manifest
@@ -0,0 +1 @@
+DIST WebStorm-10.0.4.tar.gz 130242508 SHA256 f2c6b6fde74513858f204a6fc5d4f39a6b3424edcc1abc435e566ead0929319c SHA512 2523795dc3cc4395549313584e8e597b2782eb2c6ad577d0aae81b72656f00a2cc2f9bbac77f83f9e1f74350aaa762d8b7ba873558a37af316839784e506c6ec WHIRLPOOL a76ad8b92e454e12ce2948c98041a1cbc671848519a3fe329b3f6524b3bc9cb52922755668048b72011f856fadf28386ebd048830558197516029a8594a83d87
diff --git a/dev-util/webstorm/metadata.xml b/dev-util/webstorm/metadata.xml
new file mode 100644
index 000000000000..3e44b6f956f2
--- /dev/null
+++ b/dev-util/webstorm/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>proxy-maintainers</herd>
+<maintainer>
+	<email>gert@gepe-biljarts.be</email>
+	<name>Gert Pellin</name>
+	<description>Proxy maintainer. Assign bugs to him.</description>
+</maintainer>
+<longdescription lang="en">
+WebStorm is a lightweight yet powerful IDE, perfectly equipped for complex client-side development and server-side development with Node.js
+</longdescription>
+</pkgmetadata>
diff --git a/dev-util/webstorm/webstorm-10.0.4.141.1550.ebuild b/dev-util/webstorm/webstorm-10.0.4.141.1550.ebuild
new file mode 100644
index 000000000000..338dbea7b82f
--- /dev/null
+++ b/dev-util/webstorm/webstorm-10.0.4.141.1550.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils versionator
+
+SLOT="$(get_major_version)"
+MY_PV="$(get_version_component_range 4-5)"
+MY_PN="WebStorm"
+
+DESCRIPTION="JavaScript IDE for complex client-side development and server-side development with Node.js"
+HOMEPAGE="http://www.jetbrains.com/webstorm"
+SRC_URI="http://download.jetbrains.com/${PN}/${MY_PN}-$(get_version_component_range 1-3).tar.gz"
+
+LICENSE="WebStorm WebStorm_Academic WebStorm_Classroom WebStorm_OpenSource WebStorm_personal"
+IUSE=""
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND=">=virtual/jdk-1.7"
+S="${WORKDIR}/${MY_PN}-${MY_PV}"
+
+src_install() {
+	local dir="/opt/${PN}"
+
+	insinto "${dir}"
+	doins -r .
+	fperms 755 ${dir}/bin/{${PN}.sh,fsnotifier{,64}}
+
+	make_wrapper "${PN}" "${dir}/bin/${PN}.sh"
+}
diff --git a/dev-util/wiggle/wiggle-0.9-r1.ebuild b/dev-util/wiggle/wiggle-0.9-r1.ebuild
index 17806ef61227..ff6e24aaabf0 100644
--- a/dev-util/wiggle/wiggle-0.9-r1.ebuild
+++ b/dev-util/wiggle/wiggle-0.9-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://neil.brown.name/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ppc ~x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 
 # The 'p' tool does support bitkeeper, but I'm against just dumping it in here
diff --git a/dev-vcs/blogc-git-receiver/Manifest b/dev-vcs/blogc-git-receiver/Manifest
index f0eebf5a5605..3e4aba7a6024 100644
--- a/dev-vcs/blogc-git-receiver/Manifest
+++ b/dev-vcs/blogc-git-receiver/Manifest
@@ -1 +1 @@
-DIST blogc-git-receiver-0.1-beta.4.tar.xz 68456 SHA256 a7e17c539d66092c6200cb4e3f9253176dc354c6d913a2415577547e6570d4ef SHA512 04ef046c2df120c803014781ef04ddea752131f2b0c17d81d1891141e62aa5962aacc1f5be005ab102229a1e0cc4a5577eea00773622f448323ce1169578b7ea WHIRLPOOL 1a5032f4d0a45e9f3de897363721a927db40916b31a9712289968c8404b7d6ab3d79ffad8ce272219f361407650a59a37615b31f05945449a9e39b084908b52f
+DIST blogc-git-receiver-0.1-beta.5.tar.xz 68584 SHA256 761bdece93d5b9eacc76c8b561cede01d2acd29e1f52b91bab649246f1fb957a SHA512 7d319bcd011f7444f0003934c9ad8538690b00c28c48cefb039746c70690b1811e583f282a935c93c37fe07d0dccf6a7c82846ab241d6807604c17e636d1dd53 WHIRLPOOL df6e60062d13c90f91c658da6bfc9e5aaeaf23b0c37947f7c1d5f67ba32ad176f64847ced20385b841445bd1f5b9b81b9eb4f50502f1465dfe7ef069cb0aa4fe
diff --git a/dev-vcs/blogc-git-receiver/blogc-git-receiver-0.1_beta4.ebuild b/dev-vcs/blogc-git-receiver/blogc-git-receiver-0.1_beta5.ebuild
index 7b071ab9713c..7b071ab9713c 100644
--- a/dev-vcs/blogc-git-receiver/blogc-git-receiver-0.1_beta4.ebuild
+++ b/dev-vcs/blogc-git-receiver/blogc-git-receiver-0.1_beta5.ebuild
diff --git a/dev-vcs/git/Manifest b/dev-vcs/git/Manifest
index 440a09aec6a5..66250e44808a 100644
--- a/dev-vcs/git/Manifest
+++ b/dev-vcs/git/Manifest
@@ -3,31 +3,37 @@ DIST git-1.9.5.tar.gz 4851532 SHA256 44efbc76edb50103e0d1b549dac006ee6f275fbd624
 DIST git-2.0.5.tar.xz 3437996 SHA256 f5a63f5073c7f10d0676d0dabb46df48f2af77624fe24e1c6047b0e047af8ca1 SHA512 a2de101462cb7cf79ae596a5c7a77746fca430d6ae819731eb025a784b38b48b98964aca3db251e1a598ff17ff26b3711b044bd9c579d01346a8e1e77f7aa6de WHIRLPOOL b317f7b57a8a568b8a63ddbb44d6734dce01034c1b50491e3aedbb8a4ad2dc0f781b9edfad07e73ff050684f05734ee5f8b5483646967cbcd0a3cf7c600394eb
 DIST git-2.1.4.tar.xz 3544804 SHA256 a04968b9b10cbcb31a7054aa3a0d11ac47c83556ecd270ddef1987df5d3d053e SHA512 17333eda9600287be1f366271f314619354f6bc9b7f867d59a9493441e71a963340cedf728b5954ac6311f5426a928a2beacfa7775e1a4d439b58e0dcf310a0b WHIRLPOOL fc20c64e0d494a13834c71ffa5c727018fc3940f4dc65ae4eda6ba14af2faf2864d779e706b503c69a16858ca051878e27bcfe1883c3c206dda6129a1bc5aceb
 DIST git-2.2.2.tar.xz 3592264 SHA256 aa6d2efcc0c7bb9b9edc6d56d90921706b833972f1d2abe70f71be7838f22d05 SHA512 e3ca6f40de04ed940f521fff4c7e92446e40ad1627acc5b4c090ebf114dcf279d4b1f3efe1189ffa43192fce412165621fc12ea90e2f7d02a6a9ccda655dc69b WHIRLPOOL 9e20def83bbb9b11cb5982fc5f19b09767657ff80f02a237dff6ddaddd3209b4cfb9288bec1b6dc80c6a6db1869cfcaa90e2374279012fc8215771c1a58a1fc2
-DIST git-2.3.6.tar.xz 3621716 SHA256 3ce01c54e92b47366756f57742280e052412efde65344e31f51ad8a48a7c60fc SHA512 53ad21db0fa6bb48ee24302c35ee929b1bd1fae3b646845523e7105b8539700cef23e2425170dec0311c7e746c41b743cfd78f192613b586291e44b49c3c284d WHIRLPOOL 12cf33fc19efea4f885a9b5c6d7099893b92742ffaad8e407016abfc5232ddd4763db95fc657a185830e2f904cdb2b04e8ad1c4305f09d77ff8f7db07c139799
+DIST git-2.2.3.tar.xz 3592292 SHA256 d56ba6a2b9ef51ec165b98b1894a36fbb635c6abb22674fd61ffc80603b967d9 SHA512 772466ccbbe06d83a03b244dd157c30f51e0fb06995a55070b262f8dd67ced454013fdc86690210c54db914252439be0bfccabbbfffddebb6bc047db946e9b92 WHIRLPOOL 2b60036db65cbcb1c2c2db68ec1747f6c309f9368c4f879c8b91964e16708c641e5a8b7d7b79431193b8d78d1c73e8e694ffe5f407701d7d7719f2d568bff180
 DIST git-2.3.8.tar.xz 3622512 SHA256 cb4d9228f63b7a9500d55383878bb4bbb60b80deb7ae1a5858c7103ba14de5a6 SHA512 bf693fbe7fc16a240470501af2a7736ebfdbf027c0cc8adbd601d2b1c98ec7d968959e06dd8a3d0e206dc351e83a161475191d59d76f9e2da3e13b4de8716fb4 WHIRLPOOL 93aa2d832e57181de25035952a566c9d3330105e277930f088eb10e2073120c296b6dd87375437c9e9b7880c9b56e2c0de0fda5f77f0da9d2f96840c2fe8eda8
+DIST git-2.3.9.tar.xz 3622952 SHA256 90c2b4bc8cb081115d34269b2d061fb8c7961cf08406c345b278c43d7dcd25f7 SHA512 e02565b9b0176158418358a811735dde0e630adae1cc8401a3a578fdce69efb6d8893815ee749820ade8b8aa0f3b8b42ff85322bf98dad55de77298eeca50510 WHIRLPOOL 451717d03304ba38f964801be909f0265b03adef8cacd62dd1bb1af34e1c6cc4caef064f784e34984cdb9f1f8f7e3f9b93ab67c116f63a1c9486b96a5bde3e91
 DIST git-2.4.6.tar.xz 3690432 SHA256 bdd944571c03474517b6c9941d6f1fd735eccbb164e59fd133d38644b69453b6 SHA512 2c95a00af81d6fbd8f4984e89d7cb23396caacadd684466aeb5a11f1b3acfbc625f832060cbef5aee0748e36c1fddcd88b3b9c26c4d7aec1d185e5f7311346ef WHIRLPOOL 1ae191666bf27a7e18686b910cbe610f85b5b7a43266232359615fa2a22b80bc659277b71b21394eab53df0c912d9ad911c7793c2a041cd6c7d768a5f0416f5b
 DIST git-2.4.8.tar.xz 3692460 SHA256 c7d2019d3c3b742862b252dcabb3d870b649e1af3fc8a132a0c0149f9e91dfcb SHA512 b1af6bf03dec006ed99601e66dda5b70e576c47d755d8fe5ca3cd974acc33cf2a6b76901549b56f6b4d3d3697f43c84dca35fc21c2cf5e8daad026f1bcc5b263 WHIRLPOOL e00d8e04c86ba611457547c71fb22ebef04b3a7e4316145b29cf073e4e58849bb62963b41660176f6d4e78b492c3b2ac513e80e8db42a91a4dcc31207718f012
-DIST git-2.5.0.tar.xz 3740620 SHA256 cc59b1bac6c1c67a9159872863f6c5bbe0d9404cac2a85c3e9d9fa49923ce45c SHA512 ef7538c9f5ba5b2ac08962401c30e5fd51323b54b9fb5315d259adccec346e8fae9362815832dc2b5ce63a259b315c40e419bb2385dde04d84b992e62f6789b6 WHIRLPOOL 653e7aeb966dec44631bbd257a41935b2e957be9324311a4fd91f3a0ba6f1f674e2e59b4c564d70c4eeaea3788f0af9273a1d0a753b3bc820e687f0d63bddf5d
+DIST git-2.4.9.tar.xz 3692824 SHA256 0f5fba41639d3224fee02f40393e2053ee9468fa7b88d64c5b97f7e65667bd2b SHA512 d5df1f725d5af8449e091ee50f6c4371c2b1699d80d499321a751ecf6c61d75c6c3a286ea60661ae1608bf92c94e2c8977ad08731e153830bd5c5b4587d8ba82 WHIRLPOOL a670eeb5abbcf844324b2444d87ecc9eb8c2899d6f37da6aef9f27edbe53d90086907642aac14536396b61d4520cd4e7b77124f4d54cc7f9f9e5a769741e4d03
 DIST git-2.5.1.tar.xz 3741764 SHA256 b3ceb7b118221b8c74d0abdc62ab035a58360dbbd28ca17c53e301e517d4220f SHA512 95e12103fa1f3da06c7c8485417de7168a0aa7f3a60119808fbdb352f73b180368a9ee19ac455ece10ba29957d070c39c2313100562716ff7f9ea7e4f0de32f1 WHIRLPOOL 11cea9a28cbdb1eb707d73c6c07db0c7fb89754e5af3e91f713f9c31f7f515689070fe472a21bee4b7344bce7ae6790dc741e35cb20deac1ceb563a09b85ad39
+DIST git-2.5.2.tar.xz 3744080 SHA256 4b4760a90ede51accee703bd6815f1f79afef68670acdcf3ea31dcc846a40c9b SHA512 b553aa521ac43c33323fc9ceed084a411fb5924ee48f6f30808152dd1185f36d339678788d05d8e62099d496be22a4b6b0242529505cff702884c394e13c58aa WHIRLPOOL 4049a000ccbdeeb1b2882b34484cfabac9ba7ef672644c3eb708075b5fbe63e17599fc908e056ddf25f3bb5c34e42d0354c3d951e4ba1978a51caeb20a285ae7
 DIST git-htmldocs-1.8.5.6.tar.gz 2242475 SHA256 7c8e955d0798686fa030ba7b7b384a2eab2b74d5bd695d82faecac2e247bd211 SHA512 c9b2752bcdd7f8f817b14e99ab2743d153e3e7549bffb2aa98999e46d1e965d045850ec6a3e9f6bc83e6e4820ce20f281c33f946ebd2be16d275b85a5ddaee36 WHIRLPOOL 7db3fb74e6b51618890acfef8fb89ab09adf653d3196e82624671194bdb2b564b903429ffecf68b28faf96ce3ebb83b534459738d48ace048d873c158621d31c
 DIST git-htmldocs-1.9.5.tar.gz 2262251 SHA256 4fa289e259d6b922a51d11a687203612aa1aad5696eb83b4e67c0de8a785700f SHA512 2df975c33d3411a97ab5a684b03998b7cd188d05bae6813c753fe2092b0acf463dec49a7a546d315f520fd9c71281da41998d0f36f64f48d4f95507a034a083b WHIRLPOOL edc252ce58b31f001c0d225f0b40b3689028bd34b1cbbdd889d645d37a2931e9039f76f12e5a0f918579a0b9c5dd1f3171af2bb58ee42972411ca33ec0ebe8f2
 DIST git-htmldocs-2.0.5.tar.xz 944792 SHA256 90eaf745d6ee197718fdde9c98919918ad1e4e3576608e4522b84c612cd9ef2a SHA512 e9b3d92d466762c9c7e164e9c30ff0046b262bf4707ea057e3a682f7b15a4f8149a9aaf2630f117dc3b508744cd688c6c0087cc94ff3477e7f3b85513160d7f3 WHIRLPOOL 35970d099304a5ab174fc93f8496a0c651a259dcaa3d23a2dd0233f8db214ae94a26e28044a87460d4654e61440427d331ceeac290335d6ae3fcf0423175bba9
 DIST git-htmldocs-2.1.4.tar.xz 959144 SHA256 7665daecd77c2f9be8b316eb69a1fda3f383f759e71d346a137c8cf39501d886 SHA512 7734d671ab6ca8374f54546b0987821d0c66d136d50f9cbb1ff7c06da25330e46a10ede41d10a60c80847afa68999298c2f90dfe99d51bd862590f02344e1cbd WHIRLPOOL 97326a00a1f613cf95dbeaf8938842855299d21e6963e2040b3bf9ee02a745c8156ea552e2b87248a98d5f0ecd6560a546a4a49b6635ca034ff2e92504bbb00a
 DIST git-htmldocs-2.2.2.tar.xz 976312 SHA256 41179ff0816189d583f290a227a73788002a319c7ff8c5cada970878c50b901d SHA512 b51b7d619e82d83b4f0b90d31bfccc30291a5beb48b2f5e5e59e75e91e5d772e89b560534a683648cd5480f4bf241f733efc87b30062ef5bb003bf0b5dbeed7f WHIRLPOOL c9dc7ac1a40559e4306d7d97a1619a272faf83d8b05c5a11f5f7b010566cd02fe853fee7eb550c6ccf744db446966a9696f9eb6feeee7ce4f976c6aa88b097d2
-DIST git-htmldocs-2.3.6.tar.xz 987292 SHA256 b37439087ae465534588a65380e3acb66d3e6949904ede720febeed1dc5d8b49 SHA512 ccb836c3df4bfb96174500295c630aa1ac3bea475460434e4d097c3e178bec5a0b5037ff17281fe6a6bc7bb3ae6bcac03ee4009611bb222eccaebc3ae6aac81f WHIRLPOOL 8c58f108d1ea95bf552604b956e727dcf7a8f0eed8979239b0b6ab931aceffc76434137b5f76054563a09985bcaad0a03359da8791469adae71a3a8821084d58
+DIST git-htmldocs-2.2.3.tar.xz 976124 SHA256 1e979c86d5447a4a4965de6a1a532e30ae6337e886a2d8fc61749806b2bf024d SHA512 3fe7f70b1ea4bbd60d64928802de1ea4eb35a305cbd243933876d89dfe05901cea71e3811bedb28e8ac0f0f1409afbf31884a78a8be0648b3666a0c7fcee8212 WHIRLPOOL b5348b121b9e3a11fe120ed8a379b99bba42711ea185aaf956c58d92fe3cb96969e0b60cb7c483cc5e39711a965b6a7eaa0b931477229faffff8e3326d5bf0aa
 DIST git-htmldocs-2.3.8.tar.xz 987840 SHA256 54b8d98e34bceeac906ffa8b7c93e8a2cd2cf3c7f4d0c0334e9d5e0c704ca23f SHA512 7aa72d55a6a2687a3ecb26f9db76f69e4003c87864b8239068b029a9d63f99a023bf76ec3ea60952ecf11608d2d684f4ad1b2ac76942cd44ec67bdf8f497330f WHIRLPOOL 60145b5a48a6780b0edb3a7ef50b3649193818e3aa8199de94dd9bf1cca110d7411902c8e7e3df881eec77aa59208780b60b946aeb5f13960de954af6fd88fbe
+DIST git-htmldocs-2.3.9.tar.xz 987824 SHA256 bd2921280fafca0ef051baf407aa561f80c2bf51c69115aa3cfd48d4b50ef9f9 SHA512 c239cfbd1601ec38bc37a95834d5840fdb83362ea6ca2f8c0f48a5b3f0beed73aef47736e1b5e65a77a4fe1aec3e1b48807437a600fb36c7b2553194f4824daa WHIRLPOOL fef5ce4447d10d6f116bb425d678af53f9e8c8a3238153d241afd6109647f04045c0bc4782afda63e3d43df89cc864dc3d7d01cddbf9a71de566d7cbc1508e7e
 DIST git-htmldocs-2.4.6.tar.xz 994712 SHA256 5213e8b882293ec3cda247dabbc75c6ee5243b9d330a8fafec004952fae91a88 SHA512 782fbc38a611380c0af2631bd6123d568b02159fb46159c763d97d75bd84debe43105d83ac3f321cd8383e1334806857bce1a48563fd0c19b43f527fe18615a8 WHIRLPOOL 170e4ecc8255e6d5d562274e6e3fb75c2fc62e415586d61498b680a076c74248664fca35bb7c532009f7f22be4ad14d1fe047e14791991fa32373bd7053e0396
 DIST git-htmldocs-2.4.8.tar.xz 996004 SHA256 73c9ac3b42da1d3427bfa91c3266c6b7df332137d6ce92217c43db8f479a74ea SHA512 fcd93a76b19bd559ccb28829fa78ae0a2840a70e0c59a2709b2f089f1127b8452ee2f4e8e74128766f50eeeb560d924248d73336f2b5746305823834a9311db2 WHIRLPOOL 249390556106b13e4c02112085bd527720edcb67c85c61e429bea67bc252e7be3b6f4f641534bc342e534d154a9531379e3717d32e5109e48f886174022dce02
-DIST git-htmldocs-2.5.0.tar.xz 1008428 SHA256 0924b290834e2a361a489cbc845a9bf04e56117597dc9c1a40e879cce655e4e2 SHA512 921ae8dd482719912f79f5affb6fa239290a954fb40625ac9fae2edf902989e5126ae7ca5c367b2b55c5387fb3cc3035ddf4e8b360743dbdee0f1b55ec33653c WHIRLPOOL e355781b06fba48d9ada859fe6fb515ddbfbac5a1d5c0918e8570e4566f68d644456606b5b0eb8e3e4cdc7c8b27a96b72cc1907008dff567cae71f0953968843
+DIST git-htmldocs-2.4.9.tar.xz 995724 SHA256 6000eb00fee2adc4d5a8fd8ace857049e6fb623aa7ec9087d983c29953319cd6 SHA512 42905ae5383e5f0444ec868a1d742bada31cf25eac582b95ab6e6334a3dfefd05d2e08a1c2f7c0354a841703cbac2c6dc25437ca9f681a5bb0a121dc94d2d938 WHIRLPOOL 9791ab122cf680f060d274c6a7bcdd1aaf0660f83ed4e91073fed1dd2f2b16e96e938fcbf04e03373768b8036e3f8dd0be54639f8d24bce59501c970e4225d73
 DIST git-htmldocs-2.5.1.tar.xz 1008284 SHA256 2ebf4761a793d4c8bdf49ff04937c08408c8903160d910eba5714786535d0c83 SHA512 2aeb811a3fe49d53c5c714a5c88e9ce562116b1cea52293e3908f440f56d3b78f9073ed22b163d2d385e76595b9e395f4e21af5a937c37fd5588db005dcc9309 WHIRLPOOL d2907376b9370d9c8c0c84fcb9234bab1c11ea73565be04736109c24bbad1776c8f26df4d8f52209f6b5b9e7b2e2aaa72eaddf846e5bf7ed758e6a31f3fef119
+DIST git-htmldocs-2.5.2.tar.xz 1008940 SHA256 87e416455a293552c2bab46fb3ec75424e2143e6f98f5ce7bcb6d4e50c4020eb SHA512 5276e5aa82845d7a661a2f79d54d1b3e7a95f95220bd4b855cf8c6c13ed456d8c80682c3ccae280317172c515733968a0a61758e3a634a8f1b1a08a6e43f04fb WHIRLPOOL 9d431116146cbcf5adb5e05848f31712a64dfb45301bc85bb2ff3f3c04587349bfdea85c8f6be67c43af09b8ffe4b1458f128db85438ff7913b2b2bb049f8374
 DIST git-manpages-1.8.5.6.tar.gz 569061 SHA256 58ef7cb3121639b8d78e2e4c4f7f886bab57af9e9e137b10f372dfad573872c1 SHA512 a524a1c7e8bdc73ffe04bebb5c7050a18c8649b98714bf255c8e3c32a2443d8d5abf33e3ca2eb108d601f01e0bda50fed1e134ffdae87bcf6f551cbbd250c4ba WHIRLPOOL 2db62b96e972dbcbec1ac59d7244bf2c2ff7140c941d1d3c6b9062bd79b80541d7fa3982c5a3bc55a18fc9112ab3fa648966be5c3e1135ab7b5c89080bee82b6
 DIST git-manpages-1.9.5.tar.gz 571625 SHA256 37cc735c4ced6574e8e93349d52d30372fc6f9fe3de3d6b9934a14857d6aade8 SHA512 e3df3e933fed6ff2845989a0146b28789452e9583bc19dd4a9ad335f64b15feffbdc4dd7cdb9d6b5216f7f85837318cf9b10df033f8022777f91c2b0894fb231 WHIRLPOOL e25d77fd8d9cacb92d45fd50640bc65189d02d7e23b276ccaf3b35ba1fe64ab0c49045d1fb8983b7b2b5bd996e767508446ac76506b074ded10feef1f9256918
 DIST git-manpages-2.0.5.tar.xz 359000 SHA256 3cf1581da2a19c0651df445ee5f801e108619befe8965e01d61faa46ca57b642 SHA512 b3981565a34a203283801b86717386971ef53c2f5c47bdde290aa0df4d62045ecbcab1ff1b4d1d8ddf7d489e74d65b0208d87ace7ca8c8be9525be548e445425 WHIRLPOOL e8c78eb38cb3192455ccb991a4ce5cd3988d06f1f06cdf0722e4ce6fb1d4e57f618058cf07d312bcab4f5821a1b1dfc016c03626d4f3429d3e5ef089607a2801
 DIST git-manpages-2.1.4.tar.xz 361252 SHA256 01070bc96e88231f6f279b031fed2919efea8b442fe724f37349ad951d010b04 SHA512 35fe0dd9e0fe9547362abc0e9c5b066abc13a4137b4ea62569fa5b1ae93831da0686e8783be946a9b87274fbc2322ef93425b9d3fc1257023176c772b21b79b2 WHIRLPOOL 9f199eb94657149b51cb20fb55878cb1cf83fa3741906ce37a66b0157df9ca4dae66754fe264019e6bd8e7d286040fec718b89ca4b40b803c059c46521a5cc61
 DIST git-manpages-2.2.2.tar.xz 369876 SHA256 d30688bb62763bf1b87f5eaf4c0a66c68999e479ccd2963108a5f6f82138147c SHA512 5c2220bb09f199ad4fe5c1bc20a813a6c62daab5e6e7fa87bf24861d25b7f7e0fdde215c4f59d8895badd7c361ed202e7837de48d2d54a155d24759db39dd4e1 WHIRLPOOL 45acc45663f13faf5b8197516bb934723bf84cd6db929443e2bd9fc3a915baf258ee93e782741e088a5f799115ea4ee6043225fc9ea9ec954feed21ba54c9be4
-DIST git-manpages-2.3.6.tar.xz 371620 SHA256 b1356f5cb3e7bf53445b08f24ea6950ef1f80031aedd6cd90e3ec60ff1f06b02 SHA512 c7ff2e6aea8c0c12009f29724c899e606b6620e7d408ee3c536fb5239ebcaa0b790a6ee1287dccd88df8776fbc2e72e799124426dbacd82e12f05e3f9f3c909a WHIRLPOOL 7117ba84d888ea448807f3bf51f958b86de011afed1bbad78abf4390c1a77f799f77781f4d9bf1e9287ab903b912b7ca270433c1f4a1f112a4cb4840dde3d400
+DIST git-manpages-2.2.3.tar.xz 369884 SHA256 bf6a4b5ae1267a252b93079e9b7fec2dc6f0a179ac05b9d7f351d183d354164c SHA512 499493956b2a0634e3d5b4f3904a37b6dda1985ceb388eead4701365081605df6cc0c3db79e0aa0bf32d2fa201fd94201d66d5ee487fceaaa0fa4409a17eb6ad WHIRLPOOL 0abf61527dcf71ed0e6dfbccf67d77ecc674122765adca584e38aa70ba7103b8d6ac6173c0383c4c964acbd603391e687809457320640461bc29a336c4fe7932
 DIST git-manpages-2.3.8.tar.xz 371528 SHA256 4d38de9decf80864480fcd5cc58783e3bff4e22383b281193acd82ffa3751fe2 SHA512 8c6aaf60e4b6505ae6789fa658ff15534cf5dfa51c03fdf47a624723b75a8448d71faa9f4ee61c5c243b775c4047dd2ffffc664b37e7f38b60c90fc56252ed93 WHIRLPOOL c6068de21f53e20ec17cd724059d91781e81abf617c2169c1099997afdeac371a59927d9db0b98c1f64c66b3de016b351b08a2f37a43038a924137f6f139a72e
+DIST git-manpages-2.3.9.tar.xz 371580 SHA256 132cd914bf57ab66d75a72001b6defa514181fab3f4555f8d6933a7efe987530 SHA512 76100ba16f2fb5dc2e85a49d46ba420c52920f38f7f1feb2589c2bdc76100929badd147324a0f563d0280724f06a95929caa8e85336987783493d3a02db0ed28 WHIRLPOOL 24f5279122b74da69f366e5aec35029b6322891b5c670067b2cfc76696257d1c9bc2e6d674f2b2d740d4a27a439b89c3186e8bc41cdc8912e29635c4b3575929
 DIST git-manpages-2.4.6.tar.xz 373408 SHA256 f32d267bdaab75812dbd116d2b329d6dc7287a974e929e380e8cbf96e3822b8e SHA512 fa0562b8cc3e0421f7b45940f8cd4b58a5e58a1eb8571e2de85babf8ffd932fd210baa82aefe3c6090cb7dc51f64f299143be51beaacb37be97832b4a8e2a869 WHIRLPOOL 595beed93c621ffd9b7e0b507fc2941156975190eca8b638826ac32b6ea761bbb08f05e152dc88a7a3dbd168ab083a0128d61e72fae51cd0e94a8c91a1adb3ee
 DIST git-manpages-2.4.8.tar.xz 373596 SHA256 47558ec88776e66e6f3e3625b7efdaf2e8ad447cb7af199d60d0788d7f4438c4 SHA512 bb5dc6d7a9af05f2f5a3665f0bac29e5a08919412d69cc756981c88eaa6cf5b8cbe93e04e1aa10d2a48706178eb33a547f416ee191bdb8d25483212aa7e30e5e WHIRLPOOL 0b4ab3099b6604f17a6ff741a9d752c76772ca4f7a02e55db4cbff1e14878c3bdcb25d5e4a71dd2f7a81525475aea35d9ef09d203d949984d95ef02f9865f33c
-DIST git-manpages-2.5.0.tar.xz 377856 SHA256 1a6ea7220b1693eb384af0978a990ea8c0c634a7869d1ef63a2c8e427fc7f6ea SHA512 b3a5f2e8107c529ce81c1570a82472195e205ff1a8ddc75f4f0cbbf25f37a916700156df4418888c8a8a153ab58d5507a31027fb31faadeb5d4ba242847ab28d WHIRLPOOL 09f13622fff6a2b04a8ad584dab54c0b17cbfc6e803ca9e2deadab18071e50b50b37e395bb4746aff2e013f5b0025f8cdb1d439d8e6f3a659fad32646b30f4c7
+DIST git-manpages-2.4.9.tar.xz 373644 SHA256 0adc425adb13d669fcc90fa28d5fff3e64d8c9feb49d0565ec031b7bddcc4e02 SHA512 0df6359b8119b023b2d375bba08539cad4c0718184c5027b99827490fc17bbcff5da227a9b13bbdb5a82a45567cb83984dab050faafea1b7939532397f6688a0 WHIRLPOOL 20b8e34bfa4c5c20cf92368676f3a98949ed8c12a9c5b90f7cd052387492afb0e1521bf328e4bff43c4e8aeff8784d88b79498e47bffd093bc751e49046034e9
 DIST git-manpages-2.5.1.tar.xz 378028 SHA256 6e403070ee71678acad0b7f53bc5327e13b42cebccc6769177fe0b4a11f042e3 SHA512 bfb421a1a7e50483b3d9c0fe6d1ec9047c4aef48b0a59b854e8adfc8a19054d14ae524fcd0ced9edfb797ea3e01fcf3f6a02b8a2f1cc0e947efd444654063b7d WHIRLPOOL d2342a9945d31741397a0be7e1a89cf4b0ce3165555dfabca33cbadba9f1e33ba6f8004a8b539ccc1462aeb27d865bf9c194884741639615d24148966eb59d47
+DIST git-manpages-2.5.2.tar.xz 378032 SHA256 76512caa7044710f9954079828218cd94ab17da34effd3bdd9db2434d18720c2 SHA512 f9a9d9f4d96c19550702ac7eaa94a9308e1c7b39e1290baf81ab74709398db97261a884d8e9e1c71c899dd17cc485fede276c25c601cf7dfa6384b18170915a1 WHIRLPOOL 35f89e546f949499a2efcb4c47c361f3f89f5c952e18748703999d9186b40977b09abfadc63c1e10c06c183f1338109b80ddb0c9501a3baa0f82cac40bc8218a
diff --git a/dev-vcs/git/files/git-2.5.1-freebsd-10.x-no-iconv.patch b/dev-vcs/git/files/git-2.5.1-freebsd-10.x-no-iconv.patch
new file mode 100644
index 000000000000..a874236dc65c
--- /dev/null
+++ b/dev-vcs/git/files/git-2.5.1-freebsd-10.x-no-iconv.patch
@@ -0,0 +1,14 @@
+diff -Naurp git-2.5.1.orig/config.mak.uname git-2.5.1/config.mak.uname
+--- git-2.5.1.orig/config.mak.uname	2015-08-28 15:37:13.000000000 -0400
++++ git-2.5.1/config.mak.uname	2015-09-06 18:54:28.538437000 -0400
+@@ -189,7 +189,9 @@ ifeq ($(uname_O),Cygwin)
+ 	SPARSE_FLAGS = -isystem /usr/include/w32api -Wno-one-bit-signed-bitfield
+ endif
+ ifeq ($(uname_S),FreeBSD)
+-	NEEDS_LIBICONV = YesPlease
++	ifeq ($(shell expr "$(uname_R)" : '[1-9]\.'),2)
++		NEEDS_LIBICONV = YesPlease
++	endif
+ 	OLD_ICONV = YesPlease
+ 	NO_MEMMEM = YesPlease
+ 	BASIC_CFLAGS += -I/usr/local/include
diff --git a/dev-vcs/git/git-2.2.3.ebuild b/dev-vcs/git/git-2.2.3.ebuild
new file mode 100644
index 000000000000..a4c740a284b3
--- /dev/null
+++ b/dev-vcs/git/git-2.2.3.ebuild
@@ -0,0 +1,637 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+GENTOO_DEPEND_ON_PERL=no
+
+# bug #329479: git-remote-testgit is not multiple-version aware
+PYTHON_COMPAT=( python2_7 )
+[[ ${PV} == *9999 ]] && SCM="git-2"
+EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git"
+EGIT_MASTER=pu
+
+inherit toolchain-funcs eutils elisp-common perl-module bash-completion-r1 python-single-r1 systemd ${SCM}
+
+MY_PV="${PV/_rc/.rc}"
+MY_P="${PN}-${MY_PV}"
+
+DOC_VER=${MY_PV}
+
+DESCRIPTION="GIT - the stupid content tracker, the revision control system heavily used by the Linux kernel team"
+HOMEPAGE="http://www.git-scm.com/"
+if [[ ${PV} != *9999 ]]; then
+	SRC_URI_SUFFIX="xz"
+	SRC_URI_GOOG="https://git-core.googlecode.com/files"
+	SRC_URI_KORG="mirror://kernel/software/scm/git"
+	SRC_URI="${SRC_URI_GOOG}/${MY_P}.tar.${SRC_URI_SUFFIX}
+			${SRC_URI_KORG}/${MY_P}.tar.${SRC_URI_SUFFIX}
+			${SRC_URI_GOOG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
+			${SRC_URI_KORG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
+			doc? (
+			${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
+			${SRC_URI_GOOG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
+			)"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg gtk highlight +iconv mediawiki +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test"
+
+# Common to both DEPEND and RDEPEND
+CDEPEND="
+	dev-libs/openssl:0
+	sys-libs/zlib
+	pcre? ( dev-libs/libpcre )
+	perl? ( dev-lang/perl:=[-build(-)] )
+	tk? ( dev-lang/tk:0 )
+	curl? (
+		net-misc/curl
+		webdav? ( dev-libs/expat )
+	)
+	emacs? ( virtual/emacs )
+	gnome-keyring? ( gnome-base/libgnome-keyring )"
+
+RDEPEND="${CDEPEND}
+	gpg? ( app-crypt/gnupg )
+	mediawiki? (
+		dev-perl/HTML-Tree
+		dev-perl/MediaWiki-API
+	)
+	perl? ( dev-perl/Error
+			dev-perl/Net-SMTP-SSL
+			dev-perl/Authen-SASL
+			cgi? ( dev-perl/CGI highlight? ( app-text/highlight ) )
+			cvs? ( >=dev-vcs/cvsps-2.1:0 dev-perl/DBI dev-perl/DBD-SQLite )
+			subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey )
+			)
+	python? ( gtk?
+	(
+		>=dev-python/pygtk-2.8[${PYTHON_USEDEP}]
+		>=dev-python/pygtksourceview-2.10.1-r1:2[${PYTHON_USEDEP}]
+	)
+		${PYTHON_DEPS} )"
+
+# This is how info docs are created with Git:
+#   .txt/asciidoc --(asciidoc)---------> .xml/docbook
+#   .xml/docbook  --(docbook2texi.pl)--> .texi
+#   .texi         --(makeinfo)---------> .info
+DEPEND="${CDEPEND}
+	app-arch/cpio
+	doc? (
+		app-text/asciidoc
+		app-text/docbook2X
+		sys-apps/texinfo
+		app-text/xmlto
+	)
+	nls? ( sys-devel/gettext )
+	test? (	app-crypt/gnupg	)"
+
+# Live ebuild builds man pages and HTML docs, additionally
+if [[ ${PV} == *9999 ]]; then
+	DEPEND="${DEPEND}
+		app-text/asciidoc"
+fi
+
+SITEFILE=50${PN}-gentoo.el
+S="${WORKDIR}/${MY_P}"
+
+REQUIRED_USE="
+	cgi? ( perl )
+	cvs? ( perl )
+	mediawiki? ( perl )
+	subversion? ( perl )
+	webdav? ( curl )
+	gtk? ( python )
+	python? ( ${PYTHON_REQUIRED_USE} )
+"
+
+pkg_setup() {
+	if use subversion && has_version "dev-vcs/subversion[dso]"; then
+		ewarn "Per Gentoo bugs #223747, #238586, when subversion is built"
+		ewarn "with USE=dso, there may be weird crashes in git-svn. You"
+		ewarn "have been warned."
+	fi
+	if use python ; then
+		python-single-r1_pkg_setup
+	fi
+}
+
+# This is needed because for some obscure reasons future calls to make don't
+# pick up these exports if we export them in src_unpack()
+exportmakeopts() {
+	local myopts
+
+	if use blksha1 ; then
+		myopts+=" BLK_SHA1=YesPlease"
+	elif use ppcsha1 ; then
+		myopts+=" PPC_SHA1=YesPlease"
+	fi
+
+	if use curl ; then
+		use webdav || myopts+=" NO_EXPAT=YesPlease"
+	else
+		myopts+=" NO_CURL=YesPlease"
+	fi
+
+	# broken assumptions, because of broken build system ...
+	myopts+=" NO_FINK=YesPlease NO_DARWIN_PORTS=YesPlease"
+	myopts+=" INSTALL=install TAR=tar"
+	myopts+=" SHELL_PATH=${EPREFIX}/bin/sh"
+	myopts+=" SANE_TOOL_PATH="
+	myopts+=" OLD_ICONV="
+	myopts+=" NO_EXTERNAL_GREP="
+
+	# For svn-fe
+	extlibs="-lz -lssl ${S}/xdiff/lib.a $(usex threads -lpthread '')"
+
+	# can't define this to null, since the entire makefile depends on it
+	sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile
+
+	use iconv \
+		|| myopts+=" NO_ICONV=YesPlease"
+	use nls \
+		|| myopts+=" NO_GETTEXT=YesPlease"
+	use tk \
+		|| myopts+=" NO_TCLTK=YesPlease"
+	use pcre \
+		&& myopts+=" USE_LIBPCRE=yes" \
+		&& extlibs+=" -lpcre"
+	use perl \
+		&& myopts+=" INSTALLDIRS=vendor" \
+		|| myopts+=" NO_PERL=YesPlease"
+	use python \
+		|| myopts+=" NO_PYTHON=YesPlease"
+	use subversion \
+		|| myopts+=" NO_SVN_TESTS=YesPlease"
+	use threads \
+		&& myopts+=" THREADED_DELTA_SEARCH=YesPlease" \
+		|| myopts+=" NO_PTHREADS=YesPlease"
+	use cvs \
+		|| myopts+=" NO_CVS=YesPlease"
+# Disabled until ~m68k-mint can be keyworded again
+#	if [[ ${CHOST} == *-mint* ]] ; then
+#		myopts+=" NO_MMAP=YesPlease"
+#		myopts+=" NO_IPV6=YesPlease"
+#		myopts+=" NO_STRLCPY=YesPlease"
+#		myopts+=" NO_MEMMEM=YesPlease"
+#		myopts+=" NO_MKDTEMP=YesPlease"
+#		myopts+=" NO_MKSTEMPS=YesPlease"
+#	fi
+	if [[ ${CHOST} == ia64-*-hpux* ]]; then
+		myopts+=" NO_NSEC=YesPlease"
+	fi
+	if [[ ${CHOST} == *-*-aix* ]]; then
+		myopts+=" NO_FNMATCH_CASEFOLD=YesPlease"
+	fi
+	if [[ ${CHOST} == *-solaris* ]]; then
+		myopts+=" NEEDS_LIBICONV=YesPlease"
+	fi
+
+	has_version '>=app-text/asciidoc-8.0' \
+		&& myopts+=" ASCIIDOC8=YesPlease"
+	myopts+=" ASCIIDOC_NO_ROFF=YesPlease"
+
+	# Bug 290465:
+	# builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim'
+	[[ "${CHOST}" == *-uclibc* ]] && \
+		myopts+=" NO_NSEC=YesPlease"
+
+	export MY_MAKEOPTS="${myopts}"
+	export EXTLIBS="${extlibs}"
+}
+
+src_unpack() {
+	if [[ ${PV} != *9999 ]]; then
+		unpack ${MY_P}.tar.${SRC_URI_SUFFIX}
+		cd "${S}"
+		unpack ${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
+		use doc && \
+			cd "${S}"/Documentation && \
+			unpack ${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
+		cd "${S}"
+	else
+		git-2_src_unpack
+		cd "${S}"
+		#cp "${FILESDIR}"/GIT-VERSION-GEN .
+	fi
+
+}
+
+src_prepare() {
+	# bug #350330 - automagic CVS when we don't want it is bad.
+	epatch "${FILESDIR}"/git-2.2.2-optional-cvs.patch
+
+	# install mediawiki perl modules also in vendor_dir
+	# hack, needs better upstream solution
+	epatch "${FILESDIR}"/git-1.8.5-mw-vendor.patch
+
+	epatch "${FILESDIR}"/git-2.2.0-svn-fe-linking.patch
+
+	epatch_user
+
+	sed -i \
+		-e 's:^\(CFLAGS[[:space:]]*=\).*$:\1 $(OPTCFLAGS) -Wall:' \
+		-e 's:^\(LDFLAGS[[:space:]]*=\).*$:\1 $(OPTLDFLAGS):' \
+		-e 's:^\(CC[[:space:]]* =\).*$:\1$(OPTCC):' \
+		-e 's:^\(AR[[:space:]]* =\).*$:\1$(OPTAR):' \
+		-e "s:\(PYTHON_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \
+		-e "s:\(PERL_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \
+		Makefile contrib/svn-fe/Makefile || die "sed failed"
+
+	# Never install the private copy of Error.pm (bug #296310)
+	sed -i \
+		-e '/private-Error.pm/s,^,#,' \
+		perl/Makefile.PL
+
+	# Fix docbook2texi command
+	sed -r -i 's/DOCBOOK2X_TEXI[[:space:]]*=[[:space:]]*docbook2x-texi/DOCBOOK2X_TEXI = docbook2texi.pl/' \
+		Documentation/Makefile || die "sed failed"
+
+	# Fix git-subtree missing DESTDIR
+	sed -i \
+		-e '/$(INSTALL)/s/ $(libexecdir)/ $(DESTDIR)$(libexecdir)/g' \
+		-e '/$(INSTALL)/s/ $(man1dir)/ $(DESTDIR)$(man1dir)/g'  \
+		contrib/subtree/Makefile
+}
+
+git_emake() {
+	# bug #326625: PERL_PATH, PERL_MM_OPT
+	# bug #320647: PYTHON_PATH
+	PYTHON_PATH=""
+	use python && PYTHON_PATH="${PYTHON}"
+	emake ${MY_MAKEOPTS} \
+		DESTDIR="${D}" \
+		OPTCFLAGS="${CFLAGS}" \
+		OPTLDFLAGS="${LDFLAGS}" \
+		OPTCC="$(tc-getCC)" \
+		OPTAR="$(tc-getAR)" \
+		prefix="${EPREFIX}"/usr \
+		htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
+		sysconfdir="${EPREFIX}"/etc \
+		PYTHON_PATH="${PYTHON_PATH}" \
+		PERL_MM_OPT="" \
+		GIT_TEST_OPTS="--no-color" \
+		V=1 \
+		"$@"
+	# This is the fix for bug #326625, but it also causes breakage, see bug
+	# #352693.
+	# PERL_PATH="${EPREFIX}/usr/bin/env perl" \
+}
+
+src_configure() {
+	exportmakeopts
+}
+
+src_compile() {
+	if use perl ; then
+	git_emake perl/PM.stamp || die "emake perl/PM.stamp failed"
+	git_emake perl/perl.mak || die "emake perl/perl.mak failed"
+	fi
+	git_emake || die "emake failed"
+
+	if use emacs ; then
+		elisp-compile contrib/emacs/git{,-blame}.el
+	fi
+
+	if use perl && use cgi ; then
+		git_emake \
+			gitweb/gitweb.cgi \
+			|| die "emake gitweb/gitweb.cgi failed"
+	fi
+
+	if [[ ${CHOST} == *-darwin* ]]; then
+		cd "${S}"/contrib/credential/osxkeychain || die "cd credential/osxkeychain"
+		git_emake || die "emake credential-osxkeychain"
+	fi
+
+	cd "${S}"/Documentation
+	if [[ ${PV} == *9999 ]] ; then
+		git_emake man \
+			|| die "emake man failed"
+		if use doc ; then
+			git_emake info html \
+				|| die "emake info html failed"
+		fi
+	else
+		if use doc ; then
+			git_emake info \
+				|| die "emake info html failed"
+		fi
+	fi
+
+	if use subversion ; then
+		cd "${S}"/contrib/svn-fe
+		# by defining EXTLIBS we override the detection for libintl and
+		# libiconv, bug #516168
+		local nlsiconv=
+		use nls && use !elibc_glibc && nlsiconv+=" -lintl"
+		use iconv && use !elibc_glibc && nlsiconv+=" -liconv"
+		git_emake EXTLIBS="${EXTLIBS} ${nlsiconv}" || die "emake svn-fe failed"
+		if use doc ; then
+			git_emake svn-fe.{1,html} || die "emake svn-fe.1 svn-fe.html failed"
+		fi
+		cd "${S}"
+	fi
+
+	if use gnome-keyring ; then
+		cd "${S}"/contrib/credential/gnome-keyring
+		git_emake || die "emake git-credential-gnome-keyring failed"
+	fi
+
+	cd "${S}"/contrib/subtree
+	git_emake
+	use doc && git_emake doc
+
+	if use mediawiki ; then
+		cd "${S}"/contrib/mw-to-git
+		git_emake
+	fi
+}
+
+src_install() {
+	git_emake \
+		install || \
+		die "make install failed"
+
+	if [[ ${CHOST} == *-darwin* ]]; then
+		dobin contrib/credential/osxkeychain/git-credential-osxkeychain
+	fi
+
+	# Depending on the tarball and manual rebuild of the documentation, the
+	# manpages may exist in either OR both of these directories.
+	find man?/*.[157] >/dev/null 2>&1 && doman man?/*.[157]
+	find Documentation/*.[157] >/dev/null 2>&1 && doman Documentation/*.[157]
+
+	dodoc README Documentation/{SubmittingPatches,CodingGuidelines}
+	use doc && dodir /usr/share/doc/${PF}/html
+	for d in / /howto/ /technical/ ; do
+		docinto ${d}
+		dodoc Documentation${d}*.txt
+		use doc && dohtml -p ${d} Documentation${d}*.html
+	done
+	docinto /
+	# Upstream does not ship this pre-built :-(
+	use doc && doinfo Documentation/{git,gitman}.info
+
+	newbashcomp contrib/completion/git-completion.bash ${PN}
+	bashcomp_alias git gitk
+	# Not really a bash-completion file (bug #477920)
+	# but still needed uncompressed (bug #507480)
+	insinto /usr/share/${PN}
+	doins contrib/completion/git-prompt.sh
+
+	if use emacs ; then
+		elisp-install ${PN} contrib/emacs/git.{el,elc}
+		elisp-install ${PN} contrib/emacs/git-blame.{el,elc}
+		#elisp-install ${PN}/compat contrib/emacs/vc-git.{el,elc}
+		# don't add automatically to the load-path, so the sitefile
+		# can do a conditional loading
+		touch "${ED}${SITELISP}/${PN}/compat/.nosearch"
+		elisp-site-file-install "${FILESDIR}"/${SITEFILE}
+	fi
+
+	if use python && use gtk ; then
+		python_doscript "${S}"/contrib/gitview/gitview
+		dodoc "${S}"/contrib/gitview/gitview.txt
+	fi
+
+	#dobin contrib/fast-import/git-p4 # Moved upstream
+	#dodoc contrib/fast-import/git-p4.txt # Moved upstream
+	newbin contrib/fast-import/import-tars.perl import-tars
+	exeinto /usr/libexec/git-core/
+	newexe contrib/git-resurrect.sh git-resurrect
+
+	# git-subtree
+	cd "${S}"/contrib/subtree
+	git_emake install || die "Failed to emake install git-subtree"
+	if use doc ; then
+		git_emake install-man install-doc || die "Failed to emake install-doc install-mangit-subtree"
+	fi
+	newdoc README README.git-subtree
+	dodoc git-subtree.txt
+	cd "${S}"
+
+	if use mediawiki ; then
+		cd "${S}"/contrib/mw-to-git
+		git_emake install
+		cd "${S}"
+	fi
+
+	# diff-highlight
+	dobin contrib/diff-highlight/diff-highlight
+	newdoc contrib/diff-highlight/README README.diff-highlight
+
+	# git-jump
+	exeinto /usr/libexec/git-core/
+	doexe contrib/git-jump/git-jump
+	newdoc contrib/git-jump/README git-jump.txt
+
+	# git-contacts
+	exeinto /usr/libexec/git-core/
+	doexe contrib/contacts/git-contacts
+	dodoc contrib/contacts/git-contacts.txt
+
+	if use gnome-keyring ; then
+		cd "${S}"/contrib/credential/gnome-keyring
+		dobin git-credential-gnome-keyring
+	fi
+
+	if use subversion ; then
+		cd "${S}"/contrib/svn-fe
+		dobin svn-fe
+		dodoc svn-fe.txt
+		use doc && doman svn-fe.1 && dohtml svn-fe.html
+		cd "${S}"
+	fi
+
+	dodir /usr/share/${PN}/contrib
+	# The following are excluded:
+	# completion - installed above
+	# credential/gnome-keyring TODO
+	# diff-highlight - done above
+	# emacs - installed above
+	# examples - these are stuff that is not used in Git anymore actually
+	# git-jump - done above
+	# gitview - installed above
+	# p4import - excluded because fast-import has a better one
+	# patches - stuff the Git guys made to go upstream to other places
+	# persistent-https - TODO
+	# mw-to-git - TODO
+	# subtree - build  seperately
+	# svnimport - use git-svn
+	# thunderbird-patch-inline - fixes thunderbird
+	for i in \
+		buildsystems convert-objects fast-import \
+		hg-to-git hooks remotes2config.sh rerere-train.sh \
+		stats workdir \
+		; do
+		cp -rf \
+			"${S}"/contrib/${i} \
+			"${ED}"/usr/share/${PN}/contrib \
+			|| die "Failed contrib ${i}"
+	done
+
+	if use perl && use cgi ; then
+		# We used to install in /usr/share/${PN}/gitweb
+		# but upstream installs in /usr/share/gitweb
+		# so we will install a symlink and use their location for compat with other
+		# distros
+		dosym /usr/share/gitweb /usr/share/${PN}/gitweb
+
+		# INSTALL discusses configuration issues, not just installation
+		docinto /
+		newdoc  "${S}"/gitweb/INSTALL INSTALL.gitweb
+		newdoc  "${S}"/gitweb/README README.gitweb
+
+		find "${ED}"/usr/lib64/perl5/ \
+			-name .packlist \
+			-exec rm \{\} \;
+	else
+		rm -rf "${ED}"/usr/share/gitweb
+	fi
+
+	if ! use subversion ; then
+		rm -f "${ED}"/usr/libexec/git-core/git-svn \
+			"${ED}"/usr/share/man/man1/git-svn.1*
+	fi
+
+	if use xinetd ; then
+		insinto /etc/xinetd.d
+		newins "${FILESDIR}"/git-daemon.xinetd git-daemon
+	fi
+
+	if use !prefix ; then
+		newinitd "${FILESDIR}"/git-daemon-r1.initd git-daemon
+		newconfd "${FILESDIR}"/git-daemon.confd git-daemon
+		systemd_newunit "${FILESDIR}/git-daemon_at.service" "git-daemon@.service"
+		systemd_dounit "${FILESDIR}/git-daemon.socket"
+	fi
+
+	perl_delete_localpod
+}
+
+src_test() {
+	local disabled="" #t7004-tag.sh" #520270
+	local tests_cvs="t9200-git-cvsexportcommit.sh \
+					t9400-git-cvsserver-server.sh \
+					t9401-git-cvsserver-crlf.sh \
+					t9402-git-cvsserver-refs.sh \
+					t9600-cvsimport.sh \
+					t9601-cvsimport-vendor-branch.sh \
+					t9602-cvsimport-branches-tags.sh \
+					t9603-cvsimport-patchsets.sh \
+					t9604-cvsimport-timestamps.sh"
+	local tests_perl="t3701-add-interactive.sh \
+					t5502-quickfetch.sh \
+					t5512-ls-remote.sh \
+					t5520-pull.sh \
+					t7106-reset-unborn-branch.sh \
+					t7501-commit.sh"
+	# Bug #225601 - t0004 is not suitable for root perm
+	# Bug #219839 - t1004 is not suitable for root perm
+	# t0001-init.sh - check for init notices EPERM*  fails
+	local tests_nonroot="t0001-init.sh \
+		t0004-unwritable.sh \
+		t0070-fundamental.sh \
+		t1004-read-tree-m-u-wf.sh \
+		t3700-add.sh \
+		t7300-clean.sh"
+	# t9100 still fails with symlinks in SVN 1.7
+	local test_svn="t9100-git-svn-basic.sh"
+
+	# Unzip is used only for the testcase code, not by any normal parts of Git.
+	if ! has_version app-arch/unzip ; then
+		einfo "Disabling tar-tree tests"
+		disabled="${disabled} t5000-tar-tree.sh"
+	fi
+
+	cvs=0
+	use cvs && let cvs=$cvs+1
+	if [[ ${EUID} -eq 0 ]]; then
+		if [[ $cvs -eq 1 ]]; then
+			ewarn "Skipping CVS tests because CVS does not work as root!"
+			ewarn "You should retest with FEATURES=userpriv!"
+			disabled="${disabled} ${tests_cvs}"
+		fi
+		einfo "Skipping other tests that require being non-root"
+		disabled="${disabled} ${tests_nonroot}"
+	else
+		[[ $cvs -gt 0 ]] && \
+			has_version dev-vcs/cvs && \
+			let cvs=$cvs+1
+		[[ $cvs -gt 1 ]] && \
+			has_version "dev-vcs/cvs[server]" && \
+			let cvs=$cvs+1
+		if [[ $cvs -lt 3 ]]; then
+			einfo "Disabling CVS tests (needs dev-vcs/cvs[USE=server])"
+			disabled="${disabled} ${tests_cvs}"
+		fi
+	fi
+
+	if ! use perl ; then
+		einfo "Disabling tests that need Perl"
+		disabled="${disabled} ${tests_perl}"
+	fi
+
+	einfo "Disabling tests that fail with SVN 1.7"
+	disabled="${disabled} ${test_svn}"
+
+	# Reset all previously disabled tests
+	cd "${S}/t"
+	for i in *.sh.DISABLED ; do
+		[[ -f "${i}" ]] && mv -f "${i}" "${i%.DISABLED}"
+	done
+	einfo "Disabled tests:"
+	for i in ${disabled} ; do
+		[[ -f "${i}" ]] && mv -f "${i}" "${i}.DISABLED" && einfo "Disabled $i"
+	done
+
+	# Avoid the test system removing the results because we want them ourselves
+	sed -e '/^[[:space:]]*$(MAKE) clean/s,^,#,g' \
+		-i "${S}"/t/Makefile
+
+	# Clean old results first, must always run
+	cd "${S}/t"
+	nonfatal git_emake clean
+
+	# Now run the tests, keep going if we hit an error, and don't terminate on
+	# failure
+	cd "${S}"
+	einfo "Start test run"
+	#MAKEOPTS=-j1
+	nonfatal git_emake --keep-going test
+	rc=$?
+
+	# Display nice results, now print the results
+	cd "${S}/t"
+	nonfatal git_emake aggregate-results
+
+	# And bail if there was a problem
+	[ $rc -eq 0 ] || die "tests failed. Please file a bug."
+}
+
+showpkgdeps() {
+	local pkg=$1
+	shift
+	elog "  $(printf "%-17s:" ${pkg}) ${@}"
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+	einfo "Please read /usr/share/bash-completion/git for Git bash command completion"
+	einfo "Please read /usr/share/git/git-prompt.sh for Git bash prompt"
+	einfo "Note that the prompt bash code is now in that separate script"
+	elog "These additional scripts need some dependencies:"
+	echo
+	showpkgdeps git-quiltimport "dev-util/quilt"
+	showpkgdeps git-instaweb \
+		"|| ( www-servers/lighttpd www-servers/apache www-servers/nginx )"
+	echo
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/dev-vcs/git/git-2.3.6.ebuild b/dev-vcs/git/git-2.3.6.ebuild
deleted file mode 100644
index 739ff76f632b..000000000000
--- a/dev-vcs/git/git-2.3.6.ebuild
+++ /dev/null
@@ -1,636 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-GENTOO_DEPEND_ON_PERL=no
-
-# bug #329479: git-remote-testgit is not multiple-version aware
-PYTHON_COMPAT=( python2_7 )
-[[ ${PV} == *9999 ]] && SCM="git-2"
-EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git"
-EGIT_MASTER=pu
-
-inherit toolchain-funcs eutils elisp-common perl-module bash-completion-r1 python-single-r1 systemd ${SCM}
-
-MY_PV="${PV/_rc/.rc}"
-MY_P="${PN}-${MY_PV}"
-
-DOC_VER=${MY_PV}
-
-DESCRIPTION="GIT - the stupid content tracker, the revision control system heavily used by the Linux kernel team"
-HOMEPAGE="http://www.git-scm.com/"
-if [[ ${PV} != *9999 ]]; then
-	SRC_URI_SUFFIX="xz"
-	SRC_URI_GOOG="https://git-core.googlecode.com/files"
-	SRC_URI_KORG="mirror://kernel/software/scm/git"
-	SRC_URI="${SRC_URI_GOOG}/${MY_P}.tar.${SRC_URI_SUFFIX}
-			${SRC_URI_KORG}/${MY_P}.tar.${SRC_URI_SUFFIX}
-			${SRC_URI_GOOG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
-			${SRC_URI_KORG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
-			doc? (
-			${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
-			${SRC_URI_GOOG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
-			)"
-	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg gtk highlight +iconv mediawiki +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test"
-
-# Common to both DEPEND and RDEPEND
-CDEPEND="
-	dev-libs/openssl:0=
-	sys-libs/zlib
-	pcre? ( dev-libs/libpcre )
-	perl? ( dev-lang/perl:=[-build(-)] )
-	tk? ( dev-lang/tk:0= )
-	curl? (
-		net-misc/curl
-		webdav? ( dev-libs/expat )
-	)
-	emacs? ( virtual/emacs )
-	gnome-keyring? ( gnome-base/libgnome-keyring )"
-
-RDEPEND="${CDEPEND}
-	gpg? ( app-crypt/gnupg )
-	mediawiki? (
-		dev-perl/HTML-Tree
-		dev-perl/MediaWiki-API
-	)
-	perl? ( dev-perl/Error
-			dev-perl/Net-SMTP-SSL
-			dev-perl/Authen-SASL
-			cgi? ( dev-perl/CGI highlight? ( app-text/highlight ) )
-			cvs? ( >=dev-vcs/cvsps-2.1:0 dev-perl/DBI dev-perl/DBD-SQLite )
-			subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey )
-			)
-	python? ( gtk?
-	(
-		>=dev-python/pygtk-2.8[${PYTHON_USEDEP}]
-		>=dev-python/pygtksourceview-2.10.1-r1:2[${PYTHON_USEDEP}]
-	)
-		${PYTHON_DEPS} )"
-
-# This is how info docs are created with Git:
-#   .txt/asciidoc --(asciidoc)---------> .xml/docbook
-#   .xml/docbook  --(docbook2texi.pl)--> .texi
-#   .texi         --(makeinfo)---------> .info
-DEPEND="${CDEPEND}
-	doc? (
-		app-text/asciidoc
-		app-text/docbook2X
-		sys-apps/texinfo
-		app-text/xmlto
-	)
-	nls? ( sys-devel/gettext )
-	test? (	app-crypt/gnupg	)"
-
-# Live ebuild builds man pages and HTML docs, additionally
-if [[ ${PV} == *9999 ]]; then
-	DEPEND="${DEPEND}
-		app-text/asciidoc"
-fi
-
-SITEFILE=50${PN}-gentoo.el
-S="${WORKDIR}/${MY_P}"
-
-REQUIRED_USE="
-	cgi? ( perl )
-	cvs? ( perl )
-	mediawiki? ( perl )
-	subversion? ( perl )
-	webdav? ( curl )
-	gtk? ( python )
-	python? ( ${PYTHON_REQUIRED_USE} )
-"
-
-pkg_setup() {
-	if use subversion && has_version "dev-vcs/subversion[dso]"; then
-		ewarn "Per Gentoo bugs #223747, #238586, when subversion is built"
-		ewarn "with USE=dso, there may be weird crashes in git-svn. You"
-		ewarn "have been warned."
-	fi
-	if use python ; then
-		python-single-r1_pkg_setup
-	fi
-}
-
-# This is needed because for some obscure reasons future calls to make don't
-# pick up these exports if we export them in src_unpack()
-exportmakeopts() {
-	local myopts
-
-	if use blksha1 ; then
-		myopts+=" BLK_SHA1=YesPlease"
-	elif use ppcsha1 ; then
-		myopts+=" PPC_SHA1=YesPlease"
-	fi
-
-	if use curl ; then
-		use webdav || myopts+=" NO_EXPAT=YesPlease"
-	else
-		myopts+=" NO_CURL=YesPlease"
-	fi
-
-	# broken assumptions, because of broken build system ...
-	myopts+=" NO_FINK=YesPlease NO_DARWIN_PORTS=YesPlease"
-	myopts+=" INSTALL=install TAR=tar"
-	myopts+=" SHELL_PATH=${EPREFIX}/bin/sh"
-	myopts+=" SANE_TOOL_PATH="
-	myopts+=" OLD_ICONV="
-	myopts+=" NO_EXTERNAL_GREP="
-
-	# For svn-fe
-	extlibs="-lz -lssl ${S}/xdiff/lib.a $(usex threads -lpthread '')"
-
-	# can't define this to null, since the entire makefile depends on it
-	sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile
-
-	use iconv \
-		|| myopts+=" NO_ICONV=YesPlease"
-	use nls \
-		|| myopts+=" NO_GETTEXT=YesPlease"
-	use tk \
-		|| myopts+=" NO_TCLTK=YesPlease"
-	use pcre \
-		&& myopts+=" USE_LIBPCRE=yes" \
-		&& extlibs+=" -lpcre"
-	use perl \
-		&& myopts+=" INSTALLDIRS=vendor" \
-		|| myopts+=" NO_PERL=YesPlease"
-	use python \
-		|| myopts+=" NO_PYTHON=YesPlease"
-	use subversion \
-		|| myopts+=" NO_SVN_TESTS=YesPlease"
-	use threads \
-		&& myopts+=" THREADED_DELTA_SEARCH=YesPlease" \
-		|| myopts+=" NO_PTHREADS=YesPlease"
-	use cvs \
-		|| myopts+=" NO_CVS=YesPlease"
-# Disabled until ~m68k-mint can be keyworded again
-#	if [[ ${CHOST} == *-mint* ]] ; then
-#		myopts+=" NO_MMAP=YesPlease"
-#		myopts+=" NO_IPV6=YesPlease"
-#		myopts+=" NO_STRLCPY=YesPlease"
-#		myopts+=" NO_MEMMEM=YesPlease"
-#		myopts+=" NO_MKDTEMP=YesPlease"
-#		myopts+=" NO_MKSTEMPS=YesPlease"
-#	fi
-	if [[ ${CHOST} == ia64-*-hpux* ]]; then
-		myopts+=" NO_NSEC=YesPlease"
-	fi
-	if [[ ${CHOST} == *-*-aix* ]]; then
-		myopts+=" NO_FNMATCH_CASEFOLD=YesPlease"
-	fi
-	if [[ ${CHOST} == *-solaris* ]]; then
-		myopts+=" NEEDS_LIBICONV=YesPlease"
-	fi
-
-	has_version '>=app-text/asciidoc-8.0' \
-		&& myopts+=" ASCIIDOC8=YesPlease"
-	myopts+=" ASCIIDOC_NO_ROFF=YesPlease"
-
-	# Bug 290465:
-	# builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim'
-	[[ "${CHOST}" == *-uclibc* ]] && \
-		myopts+=" NO_NSEC=YesPlease"
-
-	export MY_MAKEOPTS="${myopts}"
-	export EXTLIBS="${extlibs}"
-}
-
-src_unpack() {
-	if [[ ${PV} != *9999 ]]; then
-		unpack ${MY_P}.tar.${SRC_URI_SUFFIX}
-		cd "${S}"
-		unpack ${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
-		use doc && \
-			cd "${S}"/Documentation && \
-			unpack ${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
-		cd "${S}"
-	else
-		git-2_src_unpack
-		cd "${S}"
-		#cp "${FILESDIR}"/GIT-VERSION-GEN .
-	fi
-
-}
-
-src_prepare() {
-	# bug #350330 - automagic CVS when we don't want it is bad.
-	epatch "${FILESDIR}"/git-2.2.2-optional-cvs.patch
-
-	# install mediawiki perl modules also in vendor_dir
-	# hack, needs better upstream solution
-	epatch "${FILESDIR}"/git-1.8.5-mw-vendor.patch
-
-	epatch "${FILESDIR}"/git-2.2.0-svn-fe-linking.patch
-
-	epatch_user
-
-	sed -i \
-		-e 's:^\(CFLAGS[[:space:]]*=\).*$:\1 $(OPTCFLAGS) -Wall:' \
-		-e 's:^\(LDFLAGS[[:space:]]*=\).*$:\1 $(OPTLDFLAGS):' \
-		-e 's:^\(CC[[:space:]]* =\).*$:\1$(OPTCC):' \
-		-e 's:^\(AR[[:space:]]* =\).*$:\1$(OPTAR):' \
-		-e "s:\(PYTHON_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \
-		-e "s:\(PERL_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \
-		Makefile contrib/svn-fe/Makefile || die "sed failed"
-
-	# Never install the private copy of Error.pm (bug #296310)
-	sed -i \
-		-e '/private-Error.pm/s,^,#,' \
-		perl/Makefile.PL
-
-	# Fix docbook2texi command
-	sed -r -i 's/DOCBOOK2X_TEXI[[:space:]]*=[[:space:]]*docbook2x-texi/DOCBOOK2X_TEXI = docbook2texi.pl/' \
-		Documentation/Makefile || die "sed failed"
-
-	# Fix git-subtree missing DESTDIR
-	sed -i \
-		-e '/$(INSTALL)/s/ $(libexecdir)/ $(DESTDIR)$(libexecdir)/g' \
-		-e '/$(INSTALL)/s/ $(man1dir)/ $(DESTDIR)$(man1dir)/g'  \
-		contrib/subtree/Makefile
-}
-
-git_emake() {
-	# bug #326625: PERL_PATH, PERL_MM_OPT
-	# bug #320647: PYTHON_PATH
-	PYTHON_PATH=""
-	use python && PYTHON_PATH="${PYTHON}"
-	emake ${MY_MAKEOPTS} \
-		DESTDIR="${D}" \
-		OPTCFLAGS="${CFLAGS}" \
-		OPTLDFLAGS="${LDFLAGS}" \
-		OPTCC="$(tc-getCC)" \
-		OPTAR="$(tc-getAR)" \
-		prefix="${EPREFIX}"/usr \
-		htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
-		sysconfdir="${EPREFIX}"/etc \
-		PYTHON_PATH="${PYTHON_PATH}" \
-		PERL_MM_OPT="" \
-		GIT_TEST_OPTS="--no-color" \
-		V=1 \
-		"$@"
-	# This is the fix for bug #326625, but it also causes breakage, see bug
-	# #352693.
-	# PERL_PATH="${EPREFIX}/usr/bin/env perl" \
-}
-
-src_configure() {
-	exportmakeopts
-}
-
-src_compile() {
-	if use perl ; then
-	git_emake perl/PM.stamp || die "emake perl/PM.stamp failed"
-	git_emake perl/perl.mak || die "emake perl/perl.mak failed"
-	fi
-	git_emake || die "emake failed"
-
-	if use emacs ; then
-		elisp-compile contrib/emacs/git{,-blame}.el
-	fi
-
-	if use perl && use cgi ; then
-		git_emake \
-			gitweb/gitweb.cgi \
-			|| die "emake gitweb/gitweb.cgi failed"
-	fi
-
-	if [[ ${CHOST} == *-darwin* ]]; then
-		cd "${S}"/contrib/credential/osxkeychain || die "cd credential/osxkeychain"
-		git_emake || die "emake credential-osxkeychain"
-	fi
-
-	cd "${S}"/Documentation
-	if [[ ${PV} == *9999 ]] ; then
-		git_emake man \
-			|| die "emake man failed"
-		if use doc ; then
-			git_emake info html \
-				|| die "emake info html failed"
-		fi
-	else
-		if use doc ; then
-			git_emake info \
-				|| die "emake info html failed"
-		fi
-	fi
-
-	if use subversion ; then
-		cd "${S}"/contrib/svn-fe
-		# by defining EXTLIBS we override the detection for libintl and
-		# libiconv, bug #516168
-		local nlsiconv=
-		use nls && use !elibc_glibc && nlsiconv+=" -lintl"
-		use iconv && use !elibc_glibc && nlsiconv+=" -liconv"
-		git_emake EXTLIBS="${EXTLIBS} ${nlsiconv}" || die "emake svn-fe failed"
-		if use doc ; then
-			git_emake svn-fe.{1,html} || die "emake svn-fe.1 svn-fe.html failed"
-		fi
-		cd "${S}"
-	fi
-
-	if use gnome-keyring ; then
-		cd "${S}"/contrib/credential/gnome-keyring
-		git_emake || die "emake git-credential-gnome-keyring failed"
-	fi
-
-	cd "${S}"/contrib/subtree
-	git_emake
-	use doc && git_emake doc
-
-	if use mediawiki ; then
-		cd "${S}"/contrib/mw-to-git
-		git_emake
-	fi
-}
-
-src_install() {
-	git_emake \
-		install || \
-		die "make install failed"
-
-	if [[ ${CHOST} == *-darwin* ]]; then
-		dobin contrib/credential/osxkeychain/git-credential-osxkeychain
-	fi
-
-	# Depending on the tarball and manual rebuild of the documentation, the
-	# manpages may exist in either OR both of these directories.
-	find man?/*.[157] >/dev/null 2>&1 && doman man?/*.[157]
-	find Documentation/*.[157] >/dev/null 2>&1 && doman Documentation/*.[157]
-
-	dodoc README Documentation/{SubmittingPatches,CodingGuidelines}
-	use doc && dodir /usr/share/doc/${PF}/html
-	for d in / /howto/ /technical/ ; do
-		docinto ${d}
-		dodoc Documentation${d}*.txt
-		use doc && dohtml -p ${d} Documentation${d}*.html
-	done
-	docinto /
-	# Upstream does not ship this pre-built :-(
-	use doc && doinfo Documentation/{git,gitman}.info
-
-	newbashcomp contrib/completion/git-completion.bash ${PN}
-	bashcomp_alias git gitk
-	# Not really a bash-completion file (bug #477920)
-	# but still needed uncompressed (bug #507480)
-	insinto /usr/share/${PN}
-	doins contrib/completion/git-prompt.sh
-
-	if use emacs ; then
-		elisp-install ${PN} contrib/emacs/git.{el,elc}
-		elisp-install ${PN} contrib/emacs/git-blame.{el,elc}
-		#elisp-install ${PN}/compat contrib/emacs/vc-git.{el,elc}
-		# don't add automatically to the load-path, so the sitefile
-		# can do a conditional loading
-		touch "${ED}${SITELISP}/${PN}/compat/.nosearch"
-		elisp-site-file-install "${FILESDIR}"/${SITEFILE}
-	fi
-
-	if use python && use gtk ; then
-		python_doscript "${S}"/contrib/gitview/gitview
-		dodoc "${S}"/contrib/gitview/gitview.txt
-	fi
-
-	#dobin contrib/fast-import/git-p4 # Moved upstream
-	#dodoc contrib/fast-import/git-p4.txt # Moved upstream
-	newbin contrib/fast-import/import-tars.perl import-tars
-	exeinto /usr/libexec/git-core/
-	newexe contrib/git-resurrect.sh git-resurrect
-
-	# git-subtree
-	cd "${S}"/contrib/subtree
-	git_emake install || die "Failed to emake install git-subtree"
-	if use doc ; then
-		git_emake install-man install-doc || die "Failed to emake install-doc install-mangit-subtree"
-	fi
-	newdoc README README.git-subtree
-	dodoc git-subtree.txt
-	cd "${S}"
-
-	if use mediawiki ; then
-		cd "${S}"/contrib/mw-to-git
-		git_emake install
-		cd "${S}"
-	fi
-
-	# diff-highlight
-	dobin contrib/diff-highlight/diff-highlight
-	newdoc contrib/diff-highlight/README README.diff-highlight
-
-	# git-jump
-	exeinto /usr/libexec/git-core/
-	doexe contrib/git-jump/git-jump
-	newdoc contrib/git-jump/README git-jump.txt
-
-	# git-contacts
-	exeinto /usr/libexec/git-core/
-	doexe contrib/contacts/git-contacts
-	dodoc contrib/contacts/git-contacts.txt
-
-	if use gnome-keyring ; then
-		cd "${S}"/contrib/credential/gnome-keyring
-		dobin git-credential-gnome-keyring
-	fi
-
-	if use subversion ; then
-		cd "${S}"/contrib/svn-fe
-		dobin svn-fe
-		dodoc svn-fe.txt
-		use doc && doman svn-fe.1 && dohtml svn-fe.html
-		cd "${S}"
-	fi
-
-	dodir /usr/share/${PN}/contrib
-	# The following are excluded:
-	# completion - installed above
-	# credential/gnome-keyring TODO
-	# diff-highlight - done above
-	# emacs - installed above
-	# examples - these are stuff that is not used in Git anymore actually
-	# git-jump - done above
-	# gitview - installed above
-	# p4import - excluded because fast-import has a better one
-	# patches - stuff the Git guys made to go upstream to other places
-	# persistent-https - TODO
-	# mw-to-git - TODO
-	# subtree - build  seperately
-	# svnimport - use git-svn
-	# thunderbird-patch-inline - fixes thunderbird
-	for i in \
-		buildsystems convert-objects fast-import \
-		hg-to-git hooks remotes2config.sh rerere-train.sh \
-		stats workdir \
-		; do
-		cp -rf \
-			"${S}"/contrib/${i} \
-			"${ED}"/usr/share/${PN}/contrib \
-			|| die "Failed contrib ${i}"
-	done
-
-	if use perl && use cgi ; then
-		# We used to install in /usr/share/${PN}/gitweb
-		# but upstream installs in /usr/share/gitweb
-		# so we will install a symlink and use their location for compat with other
-		# distros
-		dosym /usr/share/gitweb /usr/share/${PN}/gitweb
-
-		# INSTALL discusses configuration issues, not just installation
-		docinto /
-		newdoc  "${S}"/gitweb/INSTALL INSTALL.gitweb
-		newdoc  "${S}"/gitweb/README README.gitweb
-
-		find "${ED}"/usr/lib64/perl5/ \
-			-name .packlist \
-			-exec rm \{\} \;
-	else
-		rm -rf "${ED}"/usr/share/gitweb
-	fi
-
-	if ! use subversion ; then
-		rm -f "${ED}"/usr/libexec/git-core/git-svn \
-			"${ED}"/usr/share/man/man1/git-svn.1*
-	fi
-
-	if use xinetd ; then
-		insinto /etc/xinetd.d
-		newins "${FILESDIR}"/git-daemon.xinetd git-daemon
-	fi
-
-	if use !prefix ; then
-		newinitd "${FILESDIR}"/git-daemon-r1.initd git-daemon
-		newconfd "${FILESDIR}"/git-daemon.confd git-daemon
-		systemd_newunit "${FILESDIR}/git-daemon_at.service" "git-daemon@.service"
-		systemd_dounit "${FILESDIR}/git-daemon.socket"
-	fi
-
-	perl_delete_localpod
-}
-
-src_test() {
-	local disabled="" #t7004-tag.sh" #520270
-	local tests_cvs="t9200-git-cvsexportcommit.sh \
-					t9400-git-cvsserver-server.sh \
-					t9401-git-cvsserver-crlf.sh \
-					t9402-git-cvsserver-refs.sh \
-					t9600-cvsimport.sh \
-					t9601-cvsimport-vendor-branch.sh \
-					t9602-cvsimport-branches-tags.sh \
-					t9603-cvsimport-patchsets.sh \
-					t9604-cvsimport-timestamps.sh"
-	local tests_perl="t3701-add-interactive.sh \
-					t5502-quickfetch.sh \
-					t5512-ls-remote.sh \
-					t5520-pull.sh \
-					t7106-reset-unborn-branch.sh \
-					t7501-commit.sh"
-	# Bug #225601 - t0004 is not suitable for root perm
-	# Bug #219839 - t1004 is not suitable for root perm
-	# t0001-init.sh - check for init notices EPERM*  fails
-	local tests_nonroot="t0001-init.sh \
-		t0004-unwritable.sh \
-		t0070-fundamental.sh \
-		t1004-read-tree-m-u-wf.sh \
-		t3700-add.sh \
-		t7300-clean.sh"
-	# t9100 still fails with symlinks in SVN 1.7
-	local test_svn="t9100-git-svn-basic.sh"
-
-	# Unzip is used only for the testcase code, not by any normal parts of Git.
-	if ! has_version app-arch/unzip ; then
-		einfo "Disabling tar-tree tests"
-		disabled="${disabled} t5000-tar-tree.sh"
-	fi
-
-	cvs=0
-	use cvs && let cvs=$cvs+1
-	if [[ ${EUID} -eq 0 ]]; then
-		if [[ $cvs -eq 1 ]]; then
-			ewarn "Skipping CVS tests because CVS does not work as root!"
-			ewarn "You should retest with FEATURES=userpriv!"
-			disabled="${disabled} ${tests_cvs}"
-		fi
-		einfo "Skipping other tests that require being non-root"
-		disabled="${disabled} ${tests_nonroot}"
-	else
-		[[ $cvs -gt 0 ]] && \
-			has_version dev-vcs/cvs && \
-			let cvs=$cvs+1
-		[[ $cvs -gt 1 ]] && \
-			has_version "dev-vcs/cvs[server]" && \
-			let cvs=$cvs+1
-		if [[ $cvs -lt 3 ]]; then
-			einfo "Disabling CVS tests (needs dev-vcs/cvs[USE=server])"
-			disabled="${disabled} ${tests_cvs}"
-		fi
-	fi
-
-	if ! use perl ; then
-		einfo "Disabling tests that need Perl"
-		disabled="${disabled} ${tests_perl}"
-	fi
-
-	einfo "Disabling tests that fail with SVN 1.7"
-	disabled="${disabled} ${test_svn}"
-
-	# Reset all previously disabled tests
-	cd "${S}/t"
-	for i in *.sh.DISABLED ; do
-		[[ -f "${i}" ]] && mv -f "${i}" "${i%.DISABLED}"
-	done
-	einfo "Disabled tests:"
-	for i in ${disabled} ; do
-		[[ -f "${i}" ]] && mv -f "${i}" "${i}.DISABLED" && einfo "Disabled $i"
-	done
-
-	# Avoid the test system removing the results because we want them ourselves
-	sed -e '/^[[:space:]]*$(MAKE) clean/s,^,#,g' \
-		-i "${S}"/t/Makefile
-
-	# Clean old results first, must always run
-	cd "${S}/t"
-	nonfatal git_emake clean
-
-	# Now run the tests, keep going if we hit an error, and don't terminate on
-	# failure
-	cd "${S}"
-	einfo "Start test run"
-	#MAKEOPTS=-j1
-	nonfatal git_emake --keep-going test
-	rc=$?
-
-	# Display nice results, now print the results
-	cd "${S}/t"
-	nonfatal git_emake aggregate-results
-
-	# And bail if there was a problem
-	[ $rc -eq 0 ] || die "tests failed. Please file a bug."
-}
-
-showpkgdeps() {
-	local pkg=$1
-	shift
-	elog "  $(printf "%-17s:" ${pkg}) ${@}"
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-	einfo "Please read /usr/share/bash-completion/git for Git bash command completion"
-	einfo "Please read /usr/share/git/git-prompt.sh for Git bash prompt"
-	einfo "Note that the prompt bash code is now in that separate script"
-	elog "These additional scripts need some dependencies:"
-	echo
-	showpkgdeps git-quiltimport "dev-util/quilt"
-	showpkgdeps git-instaweb \
-		"|| ( www-servers/lighttpd www-servers/apache www-servers/nginx )"
-	echo
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/dev-vcs/git/git-2.3.8.ebuild b/dev-vcs/git/git-2.3.8.ebuild
index 2ef250e8e135..739ff76f632b 100644
--- a/dev-vcs/git/git-2.3.8.ebuild
+++ b/dev-vcs/git/git-2.3.8.ebuild
@@ -33,7 +33,7 @@ if [[ ${PV} != *9999 ]]; then
 			${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
 			${SRC_URI_GOOG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
 			)"
-	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ~ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-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 ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 LICENSE="GPL-2"
diff --git a/dev-vcs/git/git-2.3.9.ebuild b/dev-vcs/git/git-2.3.9.ebuild
new file mode 100644
index 000000000000..552e9597982c
--- /dev/null
+++ b/dev-vcs/git/git-2.3.9.ebuild
@@ -0,0 +1,636 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+GENTOO_DEPEND_ON_PERL=no
+
+# bug #329479: git-remote-testgit is not multiple-version aware
+PYTHON_COMPAT=( python2_7 )
+[[ ${PV} == *9999 ]] && SCM="git-2"
+EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git"
+EGIT_MASTER=pu
+
+inherit toolchain-funcs eutils elisp-common perl-module bash-completion-r1 python-single-r1 systemd ${SCM}
+
+MY_PV="${PV/_rc/.rc}"
+MY_P="${PN}-${MY_PV}"
+
+DOC_VER=${MY_PV}
+
+DESCRIPTION="GIT - the stupid content tracker, the revision control system heavily used by the Linux kernel team"
+HOMEPAGE="http://www.git-scm.com/"
+if [[ ${PV} != *9999 ]]; then
+	SRC_URI_SUFFIX="xz"
+	SRC_URI_GOOG="https://git-core.googlecode.com/files"
+	SRC_URI_KORG="mirror://kernel/software/scm/git"
+	SRC_URI="${SRC_URI_GOOG}/${MY_P}.tar.${SRC_URI_SUFFIX}
+			${SRC_URI_KORG}/${MY_P}.tar.${SRC_URI_SUFFIX}
+			${SRC_URI_GOOG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
+			${SRC_URI_KORG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
+			doc? (
+			${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
+			${SRC_URI_GOOG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
+			)"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg gtk highlight +iconv mediawiki +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test"
+
+# Common to both DEPEND and RDEPEND
+CDEPEND="
+	dev-libs/openssl:0=
+	sys-libs/zlib
+	pcre? ( dev-libs/libpcre )
+	perl? ( dev-lang/perl:=[-build(-)] )
+	tk? ( dev-lang/tk:0= )
+	curl? (
+		net-misc/curl
+		webdav? ( dev-libs/expat )
+	)
+	emacs? ( virtual/emacs )
+	gnome-keyring? ( gnome-base/libgnome-keyring )"
+
+RDEPEND="${CDEPEND}
+	gpg? ( app-crypt/gnupg )
+	mediawiki? (
+		dev-perl/HTML-Tree
+		dev-perl/MediaWiki-API
+	)
+	perl? ( dev-perl/Error
+			dev-perl/Net-SMTP-SSL
+			dev-perl/Authen-SASL
+			cgi? ( dev-perl/CGI highlight? ( app-text/highlight ) )
+			cvs? ( >=dev-vcs/cvsps-2.1:0 dev-perl/DBI dev-perl/DBD-SQLite )
+			subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey )
+			)
+	python? ( gtk?
+	(
+		>=dev-python/pygtk-2.8[${PYTHON_USEDEP}]
+		>=dev-python/pygtksourceview-2.10.1-r1:2[${PYTHON_USEDEP}]
+	)
+		${PYTHON_DEPS} )"
+
+# This is how info docs are created with Git:
+#   .txt/asciidoc --(asciidoc)---------> .xml/docbook
+#   .xml/docbook  --(docbook2texi.pl)--> .texi
+#   .texi         --(makeinfo)---------> .info
+DEPEND="${CDEPEND}
+	doc? (
+		app-text/asciidoc
+		app-text/docbook2X
+		sys-apps/texinfo
+		app-text/xmlto
+	)
+	nls? ( sys-devel/gettext )
+	test? (	app-crypt/gnupg	)"
+
+# Live ebuild builds man pages and HTML docs, additionally
+if [[ ${PV} == *9999 ]]; then
+	DEPEND="${DEPEND}
+		app-text/asciidoc"
+fi
+
+SITEFILE=50${PN}-gentoo.el
+S="${WORKDIR}/${MY_P}"
+
+REQUIRED_USE="
+	cgi? ( perl )
+	cvs? ( perl )
+	mediawiki? ( perl )
+	subversion? ( perl )
+	webdav? ( curl )
+	gtk? ( python )
+	python? ( ${PYTHON_REQUIRED_USE} )
+"
+
+pkg_setup() {
+	if use subversion && has_version "dev-vcs/subversion[dso]"; then
+		ewarn "Per Gentoo bugs #223747, #238586, when subversion is built"
+		ewarn "with USE=dso, there may be weird crashes in git-svn. You"
+		ewarn "have been warned."
+	fi
+	if use python ; then
+		python-single-r1_pkg_setup
+	fi
+}
+
+# This is needed because for some obscure reasons future calls to make don't
+# pick up these exports if we export them in src_unpack()
+exportmakeopts() {
+	local myopts
+
+	if use blksha1 ; then
+		myopts+=" BLK_SHA1=YesPlease"
+	elif use ppcsha1 ; then
+		myopts+=" PPC_SHA1=YesPlease"
+	fi
+
+	if use curl ; then
+		use webdav || myopts+=" NO_EXPAT=YesPlease"
+	else
+		myopts+=" NO_CURL=YesPlease"
+	fi
+
+	# broken assumptions, because of broken build system ...
+	myopts+=" NO_FINK=YesPlease NO_DARWIN_PORTS=YesPlease"
+	myopts+=" INSTALL=install TAR=tar"
+	myopts+=" SHELL_PATH=${EPREFIX}/bin/sh"
+	myopts+=" SANE_TOOL_PATH="
+	myopts+=" OLD_ICONV="
+	myopts+=" NO_EXTERNAL_GREP="
+
+	# For svn-fe
+	extlibs="-lz -lssl ${S}/xdiff/lib.a $(usex threads -lpthread '')"
+
+	# can't define this to null, since the entire makefile depends on it
+	sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile
+
+	use iconv \
+		|| myopts+=" NO_ICONV=YesPlease"
+	use nls \
+		|| myopts+=" NO_GETTEXT=YesPlease"
+	use tk \
+		|| myopts+=" NO_TCLTK=YesPlease"
+	use pcre \
+		&& myopts+=" USE_LIBPCRE=yes" \
+		&& extlibs+=" -lpcre"
+	use perl \
+		&& myopts+=" INSTALLDIRS=vendor" \
+		|| myopts+=" NO_PERL=YesPlease"
+	use python \
+		|| myopts+=" NO_PYTHON=YesPlease"
+	use subversion \
+		|| myopts+=" NO_SVN_TESTS=YesPlease"
+	use threads \
+		&& myopts+=" THREADED_DELTA_SEARCH=YesPlease" \
+		|| myopts+=" NO_PTHREADS=YesPlease"
+	use cvs \
+		|| myopts+=" NO_CVS=YesPlease"
+# Disabled until ~m68k-mint can be keyworded again
+#	if [[ ${CHOST} == *-mint* ]] ; then
+#		myopts+=" NO_MMAP=YesPlease"
+#		myopts+=" NO_IPV6=YesPlease"
+#		myopts+=" NO_STRLCPY=YesPlease"
+#		myopts+=" NO_MEMMEM=YesPlease"
+#		myopts+=" NO_MKDTEMP=YesPlease"
+#		myopts+=" NO_MKSTEMPS=YesPlease"
+#	fi
+	if [[ ${CHOST} == ia64-*-hpux* ]]; then
+		myopts+=" NO_NSEC=YesPlease"
+	fi
+	if [[ ${CHOST} == *-*-aix* ]]; then
+		myopts+=" NO_FNMATCH_CASEFOLD=YesPlease"
+	fi
+	if [[ ${CHOST} == *-solaris* ]]; then
+		myopts+=" NEEDS_LIBICONV=YesPlease"
+	fi
+
+	has_version '>=app-text/asciidoc-8.0' \
+		&& myopts+=" ASCIIDOC8=YesPlease"
+	myopts+=" ASCIIDOC_NO_ROFF=YesPlease"
+
+	# Bug 290465:
+	# builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim'
+	[[ "${CHOST}" == *-uclibc* ]] && \
+		myopts+=" NO_NSEC=YesPlease"
+
+	export MY_MAKEOPTS="${myopts}"
+	export EXTLIBS="${extlibs}"
+}
+
+src_unpack() {
+	if [[ ${PV} != *9999 ]]; then
+		unpack ${MY_P}.tar.${SRC_URI_SUFFIX}
+		cd "${S}"
+		unpack ${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
+		use doc && \
+			cd "${S}"/Documentation && \
+			unpack ${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
+		cd "${S}"
+	else
+		git-2_src_unpack
+		cd "${S}"
+		#cp "${FILESDIR}"/GIT-VERSION-GEN .
+	fi
+
+}
+
+src_prepare() {
+	# bug #350330 - automagic CVS when we don't want it is bad.
+	epatch "${FILESDIR}"/git-2.2.2-optional-cvs.patch
+
+	# install mediawiki perl modules also in vendor_dir
+	# hack, needs better upstream solution
+	epatch "${FILESDIR}"/git-1.8.5-mw-vendor.patch
+
+	epatch "${FILESDIR}"/git-2.2.0-svn-fe-linking.patch
+
+	epatch_user
+
+	sed -i \
+		-e 's:^\(CFLAGS[[:space:]]*=\).*$:\1 $(OPTCFLAGS) -Wall:' \
+		-e 's:^\(LDFLAGS[[:space:]]*=\).*$:\1 $(OPTLDFLAGS):' \
+		-e 's:^\(CC[[:space:]]* =\).*$:\1$(OPTCC):' \
+		-e 's:^\(AR[[:space:]]* =\).*$:\1$(OPTAR):' \
+		-e "s:\(PYTHON_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \
+		-e "s:\(PERL_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \
+		Makefile contrib/svn-fe/Makefile || die "sed failed"
+
+	# Never install the private copy of Error.pm (bug #296310)
+	sed -i \
+		-e '/private-Error.pm/s,^,#,' \
+		perl/Makefile.PL
+
+	# Fix docbook2texi command
+	sed -r -i 's/DOCBOOK2X_TEXI[[:space:]]*=[[:space:]]*docbook2x-texi/DOCBOOK2X_TEXI = docbook2texi.pl/' \
+		Documentation/Makefile || die "sed failed"
+
+	# Fix git-subtree missing DESTDIR
+	sed -i \
+		-e '/$(INSTALL)/s/ $(libexecdir)/ $(DESTDIR)$(libexecdir)/g' \
+		-e '/$(INSTALL)/s/ $(man1dir)/ $(DESTDIR)$(man1dir)/g'  \
+		contrib/subtree/Makefile
+}
+
+git_emake() {
+	# bug #326625: PERL_PATH, PERL_MM_OPT
+	# bug #320647: PYTHON_PATH
+	PYTHON_PATH=""
+	use python && PYTHON_PATH="${PYTHON}"
+	emake ${MY_MAKEOPTS} \
+		DESTDIR="${D}" \
+		OPTCFLAGS="${CFLAGS}" \
+		OPTLDFLAGS="${LDFLAGS}" \
+		OPTCC="$(tc-getCC)" \
+		OPTAR="$(tc-getAR)" \
+		prefix="${EPREFIX}"/usr \
+		htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
+		sysconfdir="${EPREFIX}"/etc \
+		PYTHON_PATH="${PYTHON_PATH}" \
+		PERL_MM_OPT="" \
+		GIT_TEST_OPTS="--no-color" \
+		V=1 \
+		"$@"
+	# This is the fix for bug #326625, but it also causes breakage, see bug
+	# #352693.
+	# PERL_PATH="${EPREFIX}/usr/bin/env perl" \
+}
+
+src_configure() {
+	exportmakeopts
+}
+
+src_compile() {
+	if use perl ; then
+	git_emake perl/PM.stamp || die "emake perl/PM.stamp failed"
+	git_emake perl/perl.mak || die "emake perl/perl.mak failed"
+	fi
+	git_emake || die "emake failed"
+
+	if use emacs ; then
+		elisp-compile contrib/emacs/git{,-blame}.el
+	fi
+
+	if use perl && use cgi ; then
+		git_emake \
+			gitweb/gitweb.cgi \
+			|| die "emake gitweb/gitweb.cgi failed"
+	fi
+
+	if [[ ${CHOST} == *-darwin* ]]; then
+		cd "${S}"/contrib/credential/osxkeychain || die "cd credential/osxkeychain"
+		git_emake || die "emake credential-osxkeychain"
+	fi
+
+	cd "${S}"/Documentation
+	if [[ ${PV} == *9999 ]] ; then
+		git_emake man \
+			|| die "emake man failed"
+		if use doc ; then
+			git_emake info html \
+				|| die "emake info html failed"
+		fi
+	else
+		if use doc ; then
+			git_emake info \
+				|| die "emake info html failed"
+		fi
+	fi
+
+	if use subversion ; then
+		cd "${S}"/contrib/svn-fe
+		# by defining EXTLIBS we override the detection for libintl and
+		# libiconv, bug #516168
+		local nlsiconv=
+		use nls && use !elibc_glibc && nlsiconv+=" -lintl"
+		use iconv && use !elibc_glibc && nlsiconv+=" -liconv"
+		git_emake EXTLIBS="${EXTLIBS} ${nlsiconv}" || die "emake svn-fe failed"
+		if use doc ; then
+			git_emake svn-fe.{1,html} || die "emake svn-fe.1 svn-fe.html failed"
+		fi
+		cd "${S}"
+	fi
+
+	if use gnome-keyring ; then
+		cd "${S}"/contrib/credential/gnome-keyring
+		git_emake || die "emake git-credential-gnome-keyring failed"
+	fi
+
+	cd "${S}"/contrib/subtree
+	git_emake
+	use doc && git_emake doc
+
+	if use mediawiki ; then
+		cd "${S}"/contrib/mw-to-git
+		git_emake
+	fi
+}
+
+src_install() {
+	git_emake \
+		install || \
+		die "make install failed"
+
+	if [[ ${CHOST} == *-darwin* ]]; then
+		dobin contrib/credential/osxkeychain/git-credential-osxkeychain
+	fi
+
+	# Depending on the tarball and manual rebuild of the documentation, the
+	# manpages may exist in either OR both of these directories.
+	find man?/*.[157] >/dev/null 2>&1 && doman man?/*.[157]
+	find Documentation/*.[157] >/dev/null 2>&1 && doman Documentation/*.[157]
+
+	dodoc README Documentation/{SubmittingPatches,CodingGuidelines}
+	use doc && dodir /usr/share/doc/${PF}/html
+	for d in / /howto/ /technical/ ; do
+		docinto ${d}
+		dodoc Documentation${d}*.txt
+		use doc && dohtml -p ${d} Documentation${d}*.html
+	done
+	docinto /
+	# Upstream does not ship this pre-built :-(
+	use doc && doinfo Documentation/{git,gitman}.info
+
+	newbashcomp contrib/completion/git-completion.bash ${PN}
+	bashcomp_alias git gitk
+	# Not really a bash-completion file (bug #477920)
+	# but still needed uncompressed (bug #507480)
+	insinto /usr/share/${PN}
+	doins contrib/completion/git-prompt.sh
+
+	if use emacs ; then
+		elisp-install ${PN} contrib/emacs/git.{el,elc}
+		elisp-install ${PN} contrib/emacs/git-blame.{el,elc}
+		#elisp-install ${PN}/compat contrib/emacs/vc-git.{el,elc}
+		# don't add automatically to the load-path, so the sitefile
+		# can do a conditional loading
+		touch "${ED}${SITELISP}/${PN}/compat/.nosearch"
+		elisp-site-file-install "${FILESDIR}"/${SITEFILE}
+	fi
+
+	if use python && use gtk ; then
+		python_doscript "${S}"/contrib/gitview/gitview
+		dodoc "${S}"/contrib/gitview/gitview.txt
+	fi
+
+	#dobin contrib/fast-import/git-p4 # Moved upstream
+	#dodoc contrib/fast-import/git-p4.txt # Moved upstream
+	newbin contrib/fast-import/import-tars.perl import-tars
+	exeinto /usr/libexec/git-core/
+	newexe contrib/git-resurrect.sh git-resurrect
+
+	# git-subtree
+	cd "${S}"/contrib/subtree
+	git_emake install || die "Failed to emake install git-subtree"
+	if use doc ; then
+		git_emake install-man install-doc || die "Failed to emake install-doc install-mangit-subtree"
+	fi
+	newdoc README README.git-subtree
+	dodoc git-subtree.txt
+	cd "${S}"
+
+	if use mediawiki ; then
+		cd "${S}"/contrib/mw-to-git
+		git_emake install
+		cd "${S}"
+	fi
+
+	# diff-highlight
+	dobin contrib/diff-highlight/diff-highlight
+	newdoc contrib/diff-highlight/README README.diff-highlight
+
+	# git-jump
+	exeinto /usr/libexec/git-core/
+	doexe contrib/git-jump/git-jump
+	newdoc contrib/git-jump/README git-jump.txt
+
+	# git-contacts
+	exeinto /usr/libexec/git-core/
+	doexe contrib/contacts/git-contacts
+	dodoc contrib/contacts/git-contacts.txt
+
+	if use gnome-keyring ; then
+		cd "${S}"/contrib/credential/gnome-keyring
+		dobin git-credential-gnome-keyring
+	fi
+
+	if use subversion ; then
+		cd "${S}"/contrib/svn-fe
+		dobin svn-fe
+		dodoc svn-fe.txt
+		use doc && doman svn-fe.1 && dohtml svn-fe.html
+		cd "${S}"
+	fi
+
+	dodir /usr/share/${PN}/contrib
+	# The following are excluded:
+	# completion - installed above
+	# credential/gnome-keyring TODO
+	# diff-highlight - done above
+	# emacs - installed above
+	# examples - these are stuff that is not used in Git anymore actually
+	# git-jump - done above
+	# gitview - installed above
+	# p4import - excluded because fast-import has a better one
+	# patches - stuff the Git guys made to go upstream to other places
+	# persistent-https - TODO
+	# mw-to-git - TODO
+	# subtree - build  seperately
+	# svnimport - use git-svn
+	# thunderbird-patch-inline - fixes thunderbird
+	for i in \
+		buildsystems convert-objects fast-import \
+		hg-to-git hooks remotes2config.sh rerere-train.sh \
+		stats workdir \
+		; do
+		cp -rf \
+			"${S}"/contrib/${i} \
+			"${ED}"/usr/share/${PN}/contrib \
+			|| die "Failed contrib ${i}"
+	done
+
+	if use perl && use cgi ; then
+		# We used to install in /usr/share/${PN}/gitweb
+		# but upstream installs in /usr/share/gitweb
+		# so we will install a symlink and use their location for compat with other
+		# distros
+		dosym /usr/share/gitweb /usr/share/${PN}/gitweb
+
+		# INSTALL discusses configuration issues, not just installation
+		docinto /
+		newdoc  "${S}"/gitweb/INSTALL INSTALL.gitweb
+		newdoc  "${S}"/gitweb/README README.gitweb
+
+		find "${ED}"/usr/lib64/perl5/ \
+			-name .packlist \
+			-exec rm \{\} \;
+	else
+		rm -rf "${ED}"/usr/share/gitweb
+	fi
+
+	if ! use subversion ; then
+		rm -f "${ED}"/usr/libexec/git-core/git-svn \
+			"${ED}"/usr/share/man/man1/git-svn.1*
+	fi
+
+	if use xinetd ; then
+		insinto /etc/xinetd.d
+		newins "${FILESDIR}"/git-daemon.xinetd git-daemon
+	fi
+
+	if use !prefix ; then
+		newinitd "${FILESDIR}"/git-daemon-r1.initd git-daemon
+		newconfd "${FILESDIR}"/git-daemon.confd git-daemon
+		systemd_newunit "${FILESDIR}/git-daemon_at.service" "git-daemon@.service"
+		systemd_dounit "${FILESDIR}/git-daemon.socket"
+	fi
+
+	perl_delete_localpod
+}
+
+src_test() {
+	local disabled="" #t7004-tag.sh" #520270
+	local tests_cvs="t9200-git-cvsexportcommit.sh \
+					t9400-git-cvsserver-server.sh \
+					t9401-git-cvsserver-crlf.sh \
+					t9402-git-cvsserver-refs.sh \
+					t9600-cvsimport.sh \
+					t9601-cvsimport-vendor-branch.sh \
+					t9602-cvsimport-branches-tags.sh \
+					t9603-cvsimport-patchsets.sh \
+					t9604-cvsimport-timestamps.sh"
+	local tests_perl="t3701-add-interactive.sh \
+					t5502-quickfetch.sh \
+					t5512-ls-remote.sh \
+					t5520-pull.sh \
+					t7106-reset-unborn-branch.sh \
+					t7501-commit.sh"
+	# Bug #225601 - t0004 is not suitable for root perm
+	# Bug #219839 - t1004 is not suitable for root perm
+	# t0001-init.sh - check for init notices EPERM*  fails
+	local tests_nonroot="t0001-init.sh \
+		t0004-unwritable.sh \
+		t0070-fundamental.sh \
+		t1004-read-tree-m-u-wf.sh \
+		t3700-add.sh \
+		t7300-clean.sh"
+	# t9100 still fails with symlinks in SVN 1.7
+	local test_svn="t9100-git-svn-basic.sh"
+
+	# Unzip is used only for the testcase code, not by any normal parts of Git.
+	if ! has_version app-arch/unzip ; then
+		einfo "Disabling tar-tree tests"
+		disabled="${disabled} t5000-tar-tree.sh"
+	fi
+
+	cvs=0
+	use cvs && let cvs=$cvs+1
+	if [[ ${EUID} -eq 0 ]]; then
+		if [[ $cvs -eq 1 ]]; then
+			ewarn "Skipping CVS tests because CVS does not work as root!"
+			ewarn "You should retest with FEATURES=userpriv!"
+			disabled="${disabled} ${tests_cvs}"
+		fi
+		einfo "Skipping other tests that require being non-root"
+		disabled="${disabled} ${tests_nonroot}"
+	else
+		[[ $cvs -gt 0 ]] && \
+			has_version dev-vcs/cvs && \
+			let cvs=$cvs+1
+		[[ $cvs -gt 1 ]] && \
+			has_version "dev-vcs/cvs[server]" && \
+			let cvs=$cvs+1
+		if [[ $cvs -lt 3 ]]; then
+			einfo "Disabling CVS tests (needs dev-vcs/cvs[USE=server])"
+			disabled="${disabled} ${tests_cvs}"
+		fi
+	fi
+
+	if ! use perl ; then
+		einfo "Disabling tests that need Perl"
+		disabled="${disabled} ${tests_perl}"
+	fi
+
+	einfo "Disabling tests that fail with SVN 1.7"
+	disabled="${disabled} ${test_svn}"
+
+	# Reset all previously disabled tests
+	cd "${S}/t"
+	for i in *.sh.DISABLED ; do
+		[[ -f "${i}" ]] && mv -f "${i}" "${i%.DISABLED}"
+	done
+	einfo "Disabled tests:"
+	for i in ${disabled} ; do
+		[[ -f "${i}" ]] && mv -f "${i}" "${i}.DISABLED" && einfo "Disabled $i"
+	done
+
+	# Avoid the test system removing the results because we want them ourselves
+	sed -e '/^[[:space:]]*$(MAKE) clean/s,^,#,g' \
+		-i "${S}"/t/Makefile
+
+	# Clean old results first, must always run
+	cd "${S}/t"
+	nonfatal git_emake clean
+
+	# Now run the tests, keep going if we hit an error, and don't terminate on
+	# failure
+	cd "${S}"
+	einfo "Start test run"
+	#MAKEOPTS=-j1
+	nonfatal git_emake --keep-going test
+	rc=$?
+
+	# Display nice results, now print the results
+	cd "${S}/t"
+	nonfatal git_emake aggregate-results
+
+	# And bail if there was a problem
+	[ $rc -eq 0 ] || die "tests failed. Please file a bug."
+}
+
+showpkgdeps() {
+	local pkg=$1
+	shift
+	elog "  $(printf "%-17s:" ${pkg}) ${@}"
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+	einfo "Please read /usr/share/bash-completion/git for Git bash command completion"
+	einfo "Please read /usr/share/git/git-prompt.sh for Git bash prompt"
+	einfo "Note that the prompt bash code is now in that separate script"
+	elog "These additional scripts need some dependencies:"
+	echo
+	showpkgdeps git-quiltimport "dev-util/quilt"
+	showpkgdeps git-instaweb \
+		"|| ( www-servers/lighttpd www-servers/apache www-servers/nginx )"
+	echo
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/dev-vcs/git/git-2.4.6.ebuild b/dev-vcs/git/git-2.4.6.ebuild
index 09391e67022e..0c71a90ce1bc 100644
--- a/dev-vcs/git/git-2.4.6.ebuild
+++ b/dev-vcs/git/git-2.4.6.ebuild
@@ -33,7 +33,7 @@ if [[ ${PV} != *9999 ]]; then
 			${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
 			${SRC_URI_GOOG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
 			)"
-	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ~ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-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 ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 LICENSE="GPL-2"
diff --git a/dev-vcs/git/git-2.4.9.ebuild b/dev-vcs/git/git-2.4.9.ebuild
new file mode 100644
index 000000000000..352b93a6807b
--- /dev/null
+++ b/dev-vcs/git/git-2.4.9.ebuild
@@ -0,0 +1,636 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+GENTOO_DEPEND_ON_PERL=no
+
+# bug #329479: git-remote-testgit is not multiple-version aware
+PYTHON_COMPAT=( python2_7 )
+[[ ${PV} == *9999 ]] && SCM="git-2"
+EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git"
+EGIT_MASTER=pu
+
+inherit toolchain-funcs eutils elisp-common perl-module bash-completion-r1 python-single-r1 systemd ${SCM}
+
+MY_PV="${PV/_rc/.rc}"
+MY_P="${PN}-${MY_PV}"
+
+DOC_VER=${MY_PV}
+
+DESCRIPTION="GIT - the stupid content tracker, the revision control system heavily used by the Linux kernel team"
+HOMEPAGE="http://www.git-scm.com/"
+if [[ ${PV} != *9999 ]]; then
+	SRC_URI_SUFFIX="xz"
+	SRC_URI_GOOG="https://git-core.googlecode.com/files"
+	SRC_URI_KORG="mirror://kernel/software/scm/git"
+	SRC_URI="${SRC_URI_GOOG}/${MY_P}.tar.${SRC_URI_SUFFIX}
+			${SRC_URI_KORG}/${MY_P}.tar.${SRC_URI_SUFFIX}
+			${SRC_URI_GOOG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
+			${SRC_URI_KORG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
+			doc? (
+			${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
+			${SRC_URI_GOOG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
+			)"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg gtk highlight +iconv mediawiki +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test"
+
+# Common to both DEPEND and RDEPEND
+CDEPEND="
+	dev-libs/openssl:0=
+	sys-libs/zlib
+	pcre? ( dev-libs/libpcre )
+	perl? ( dev-lang/perl:=[-build(-)] )
+	tk? ( dev-lang/tk:0= )
+	curl? (
+		net-misc/curl
+		webdav? ( dev-libs/expat )
+	)
+	emacs? ( virtual/emacs )
+	gnome-keyring? ( gnome-base/libgnome-keyring )"
+
+RDEPEND="${CDEPEND}
+	gpg? ( app-crypt/gnupg )
+	mediawiki? (
+		dev-perl/HTML-Tree
+		dev-perl/MediaWiki-API
+	)
+	perl? ( dev-perl/Error
+			dev-perl/Net-SMTP-SSL
+			dev-perl/Authen-SASL
+			cgi? ( dev-perl/CGI highlight? ( app-text/highlight ) )
+			cvs? ( >=dev-vcs/cvsps-2.1:0 dev-perl/DBI dev-perl/DBD-SQLite )
+			subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey )
+			)
+	python? ( gtk?
+	(
+		>=dev-python/pygtk-2.8[${PYTHON_USEDEP}]
+		>=dev-python/pygtksourceview-2.10.1-r1:2[${PYTHON_USEDEP}]
+	)
+		${PYTHON_DEPS} )"
+
+# This is how info docs are created with Git:
+#   .txt/asciidoc --(asciidoc)---------> .xml/docbook
+#   .xml/docbook  --(docbook2texi.pl)--> .texi
+#   .texi         --(makeinfo)---------> .info
+DEPEND="${CDEPEND}
+	doc? (
+		app-text/asciidoc
+		app-text/docbook2X
+		sys-apps/texinfo
+		app-text/xmlto
+	)
+	nls? ( sys-devel/gettext )
+	test? (	app-crypt/gnupg	)"
+
+# Live ebuild builds man pages and HTML docs, additionally
+if [[ ${PV} == *9999 ]]; then
+	DEPEND="${DEPEND}
+		app-text/asciidoc"
+fi
+
+SITEFILE=50${PN}-gentoo.el
+S="${WORKDIR}/${MY_P}"
+
+REQUIRED_USE="
+	cgi? ( perl )
+	cvs? ( perl )
+	mediawiki? ( perl )
+	subversion? ( perl )
+	webdav? ( curl )
+	gtk? ( python )
+	python? ( ${PYTHON_REQUIRED_USE} )
+"
+
+pkg_setup() {
+	if use subversion && has_version "dev-vcs/subversion[dso]"; then
+		ewarn "Per Gentoo bugs #223747, #238586, when subversion is built"
+		ewarn "with USE=dso, there may be weird crashes in git-svn. You"
+		ewarn "have been warned."
+	fi
+	if use python ; then
+		python-single-r1_pkg_setup
+	fi
+}
+
+# This is needed because for some obscure reasons future calls to make don't
+# pick up these exports if we export them in src_unpack()
+exportmakeopts() {
+	local myopts
+
+	if use blksha1 ; then
+		myopts+=" BLK_SHA1=YesPlease"
+	elif use ppcsha1 ; then
+		myopts+=" PPC_SHA1=YesPlease"
+	fi
+
+	if use curl ; then
+		use webdav || myopts+=" NO_EXPAT=YesPlease"
+	else
+		myopts+=" NO_CURL=YesPlease"
+	fi
+
+	# broken assumptions, because of broken build system ...
+	myopts+=" NO_FINK=YesPlease NO_DARWIN_PORTS=YesPlease"
+	myopts+=" INSTALL=install TAR=tar"
+	myopts+=" SHELL_PATH=${EPREFIX}/bin/sh"
+	myopts+=" SANE_TOOL_PATH="
+	myopts+=" OLD_ICONV="
+	myopts+=" NO_EXTERNAL_GREP="
+
+	# For svn-fe
+	extlibs="-lz -lssl ${S}/xdiff/lib.a $(usex threads -lpthread '')"
+
+	# can't define this to null, since the entire makefile depends on it
+	sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile
+
+	use iconv \
+		|| myopts+=" NO_ICONV=YesPlease"
+	use nls \
+		|| myopts+=" NO_GETTEXT=YesPlease"
+	use tk \
+		|| myopts+=" NO_TCLTK=YesPlease"
+	use pcre \
+		&& myopts+=" USE_LIBPCRE=yes" \
+		&& extlibs+=" -lpcre"
+	use perl \
+		&& myopts+=" INSTALLDIRS=vendor" \
+		|| myopts+=" NO_PERL=YesPlease"
+	use python \
+		|| myopts+=" NO_PYTHON=YesPlease"
+	use subversion \
+		|| myopts+=" NO_SVN_TESTS=YesPlease"
+	use threads \
+		&& myopts+=" THREADED_DELTA_SEARCH=YesPlease" \
+		|| myopts+=" NO_PTHREADS=YesPlease"
+	use cvs \
+		|| myopts+=" NO_CVS=YesPlease"
+# Disabled until ~m68k-mint can be keyworded again
+#	if [[ ${CHOST} == *-mint* ]] ; then
+#		myopts+=" NO_MMAP=YesPlease"
+#		myopts+=" NO_IPV6=YesPlease"
+#		myopts+=" NO_STRLCPY=YesPlease"
+#		myopts+=" NO_MEMMEM=YesPlease"
+#		myopts+=" NO_MKDTEMP=YesPlease"
+#		myopts+=" NO_MKSTEMPS=YesPlease"
+#	fi
+	if [[ ${CHOST} == ia64-*-hpux* ]]; then
+		myopts+=" NO_NSEC=YesPlease"
+	fi
+	if [[ ${CHOST} == *-*-aix* ]]; then
+		myopts+=" NO_FNMATCH_CASEFOLD=YesPlease"
+	fi
+	if [[ ${CHOST} == *-solaris* ]]; then
+		myopts+=" NEEDS_LIBICONV=YesPlease"
+	fi
+
+	has_version '>=app-text/asciidoc-8.0' \
+		&& myopts+=" ASCIIDOC8=YesPlease"
+	myopts+=" ASCIIDOC_NO_ROFF=YesPlease"
+
+	# Bug 290465:
+	# builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim'
+	[[ "${CHOST}" == *-uclibc* ]] && \
+		myopts+=" NO_NSEC=YesPlease"
+
+	export MY_MAKEOPTS="${myopts}"
+	export EXTLIBS="${extlibs}"
+}
+
+src_unpack() {
+	if [[ ${PV} != *9999 ]]; then
+		unpack ${MY_P}.tar.${SRC_URI_SUFFIX}
+		cd "${S}"
+		unpack ${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
+		use doc && \
+			cd "${S}"/Documentation && \
+			unpack ${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
+		cd "${S}"
+	else
+		git-2_src_unpack
+		cd "${S}"
+		#cp "${FILESDIR}"/GIT-VERSION-GEN .
+	fi
+
+}
+
+src_prepare() {
+	# bug #350330 - automagic CVS when we don't want it is bad.
+	epatch "${FILESDIR}"/git-2.2.2-optional-cvs.patch
+
+	# install mediawiki perl modules also in vendor_dir
+	# hack, needs better upstream solution
+	epatch "${FILESDIR}"/git-1.8.5-mw-vendor.patch
+
+	epatch "${FILESDIR}"/git-2.2.0-svn-fe-linking.patch
+
+	epatch_user
+
+	sed -i \
+		-e 's:^\(CFLAGS[[:space:]]*=\).*$:\1 $(OPTCFLAGS) -Wall:' \
+		-e 's:^\(LDFLAGS[[:space:]]*=\).*$:\1 $(OPTLDFLAGS):' \
+		-e 's:^\(CC[[:space:]]* =\).*$:\1$(OPTCC):' \
+		-e 's:^\(AR[[:space:]]* =\).*$:\1$(OPTAR):' \
+		-e "s:\(PYTHON_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \
+		-e "s:\(PERL_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \
+		Makefile contrib/svn-fe/Makefile || die "sed failed"
+
+	# Never install the private copy of Error.pm (bug #296310)
+	sed -i \
+		-e '/private-Error.pm/s,^,#,' \
+		perl/Makefile.PL
+
+	# Fix docbook2texi command
+	sed -r -i 's/DOCBOOK2X_TEXI[[:space:]]*=[[:space:]]*docbook2x-texi/DOCBOOK2X_TEXI = docbook2texi.pl/' \
+		Documentation/Makefile || die "sed failed"
+
+	# Fix git-subtree missing DESTDIR
+	sed -i \
+		-e '/$(INSTALL)/s/ $(libexecdir)/ $(DESTDIR)$(libexecdir)/g' \
+		-e '/$(INSTALL)/s/ $(man1dir)/ $(DESTDIR)$(man1dir)/g'  \
+		contrib/subtree/Makefile
+}
+
+git_emake() {
+	# bug #326625: PERL_PATH, PERL_MM_OPT
+	# bug #320647: PYTHON_PATH
+	PYTHON_PATH=""
+	use python && PYTHON_PATH="${PYTHON}"
+	emake ${MY_MAKEOPTS} \
+		DESTDIR="${D}" \
+		OPTCFLAGS="${CFLAGS}" \
+		OPTLDFLAGS="${LDFLAGS}" \
+		OPTCC="$(tc-getCC)" \
+		OPTAR="$(tc-getAR)" \
+		prefix="${EPREFIX}"/usr \
+		htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
+		sysconfdir="${EPREFIX}"/etc \
+		PYTHON_PATH="${PYTHON_PATH}" \
+		PERL_MM_OPT="" \
+		GIT_TEST_OPTS="--no-color" \
+		V=1 \
+		"$@"
+	# This is the fix for bug #326625, but it also causes breakage, see bug
+	# #352693.
+	# PERL_PATH="${EPREFIX}/usr/bin/env perl" \
+}
+
+src_configure() {
+	exportmakeopts
+}
+
+src_compile() {
+	if use perl ; then
+	git_emake perl/PM.stamp || die "emake perl/PM.stamp failed"
+	git_emake perl/perl.mak || die "emake perl/perl.mak failed"
+	fi
+	git_emake || die "emake failed"
+
+	if use emacs ; then
+		elisp-compile contrib/emacs/git{,-blame}.el
+	fi
+
+	if use perl && use cgi ; then
+		git_emake \
+			gitweb \
+			|| die "emake gitweb (cgi) failed"
+	fi
+
+	if [[ ${CHOST} == *-darwin* ]]; then
+		cd "${S}"/contrib/credential/osxkeychain || die "cd credential/osxkeychain"
+		git_emake || die "emake credential-osxkeychain"
+	fi
+
+	cd "${S}"/Documentation
+	if [[ ${PV} == *9999 ]] ; then
+		git_emake man \
+			|| die "emake man failed"
+		if use doc ; then
+			git_emake info html \
+				|| die "emake info html failed"
+		fi
+	else
+		if use doc ; then
+			git_emake info \
+				|| die "emake info html failed"
+		fi
+	fi
+
+	if use subversion ; then
+		cd "${S}"/contrib/svn-fe
+		# by defining EXTLIBS we override the detection for libintl and
+		# libiconv, bug #516168
+		local nlsiconv=
+		use nls && use !elibc_glibc && nlsiconv+=" -lintl"
+		use iconv && use !elibc_glibc && nlsiconv+=" -liconv"
+		git_emake EXTLIBS="${EXTLIBS} ${nlsiconv}" || die "emake svn-fe failed"
+		if use doc ; then
+			git_emake svn-fe.{1,html} || die "emake svn-fe.1 svn-fe.html failed"
+		fi
+		cd "${S}"
+	fi
+
+	if use gnome-keyring ; then
+		cd "${S}"/contrib/credential/gnome-keyring
+		git_emake || die "emake git-credential-gnome-keyring failed"
+	fi
+
+	cd "${S}"/contrib/subtree
+	git_emake
+	use doc && git_emake doc
+
+	if use mediawiki ; then
+		cd "${S}"/contrib/mw-to-git
+		git_emake
+	fi
+}
+
+src_install() {
+	git_emake \
+		install || \
+		die "make install failed"
+
+	if [[ ${CHOST} == *-darwin* ]]; then
+		dobin contrib/credential/osxkeychain/git-credential-osxkeychain
+	fi
+
+	# Depending on the tarball and manual rebuild of the documentation, the
+	# manpages may exist in either OR both of these directories.
+	find man?/*.[157] >/dev/null 2>&1 && doman man?/*.[157]
+	find Documentation/*.[157] >/dev/null 2>&1 && doman Documentation/*.[157]
+
+	dodoc README Documentation/{SubmittingPatches,CodingGuidelines}
+	use doc && dodir /usr/share/doc/${PF}/html
+	for d in / /howto/ /technical/ ; do
+		docinto ${d}
+		dodoc Documentation${d}*.txt
+		use doc && dohtml -p ${d} Documentation${d}*.html
+	done
+	docinto /
+	# Upstream does not ship this pre-built :-(
+	use doc && doinfo Documentation/{git,gitman}.info
+
+	newbashcomp contrib/completion/git-completion.bash ${PN}
+	bashcomp_alias git gitk
+	# Not really a bash-completion file (bug #477920)
+	# but still needed uncompressed (bug #507480)
+	insinto /usr/share/${PN}
+	doins contrib/completion/git-prompt.sh
+
+	if use emacs ; then
+		elisp-install ${PN} contrib/emacs/git.{el,elc}
+		elisp-install ${PN} contrib/emacs/git-blame.{el,elc}
+		#elisp-install ${PN}/compat contrib/emacs/vc-git.{el,elc}
+		# don't add automatically to the load-path, so the sitefile
+		# can do a conditional loading
+		touch "${ED}${SITELISP}/${PN}/compat/.nosearch"
+		elisp-site-file-install "${FILESDIR}"/${SITEFILE}
+	fi
+
+	if use python && use gtk ; then
+		python_doscript "${S}"/contrib/gitview/gitview
+		dodoc "${S}"/contrib/gitview/gitview.txt
+	fi
+
+	#dobin contrib/fast-import/git-p4 # Moved upstream
+	#dodoc contrib/fast-import/git-p4.txt # Moved upstream
+	newbin contrib/fast-import/import-tars.perl import-tars
+	exeinto /usr/libexec/git-core/
+	newexe contrib/git-resurrect.sh git-resurrect
+
+	# git-subtree
+	cd "${S}"/contrib/subtree
+	git_emake install || die "Failed to emake install git-subtree"
+	if use doc ; then
+		git_emake install-man install-doc || die "Failed to emake install-doc install-mangit-subtree"
+	fi
+	newdoc README README.git-subtree
+	dodoc git-subtree.txt
+	cd "${S}"
+
+	if use mediawiki ; then
+		cd "${S}"/contrib/mw-to-git
+		git_emake install
+		cd "${S}"
+	fi
+
+	# diff-highlight
+	dobin contrib/diff-highlight/diff-highlight
+	newdoc contrib/diff-highlight/README README.diff-highlight
+
+	# git-jump
+	exeinto /usr/libexec/git-core/
+	doexe contrib/git-jump/git-jump
+	newdoc contrib/git-jump/README git-jump.txt
+
+	# git-contacts
+	exeinto /usr/libexec/git-core/
+	doexe contrib/contacts/git-contacts
+	dodoc contrib/contacts/git-contacts.txt
+
+	if use gnome-keyring ; then
+		cd "${S}"/contrib/credential/gnome-keyring
+		dobin git-credential-gnome-keyring
+	fi
+
+	if use subversion ; then
+		cd "${S}"/contrib/svn-fe
+		dobin svn-fe
+		dodoc svn-fe.txt
+		use doc && doman svn-fe.1 && dohtml svn-fe.html
+		cd "${S}"
+	fi
+
+	dodir /usr/share/${PN}/contrib
+	# The following are excluded:
+	# completion - installed above
+	# credential/gnome-keyring TODO
+	# diff-highlight - done above
+	# emacs - installed above
+	# examples - these are stuff that is not used in Git anymore actually
+	# git-jump - done above
+	# gitview - installed above
+	# p4import - excluded because fast-import has a better one
+	# patches - stuff the Git guys made to go upstream to other places
+	# persistent-https - TODO
+	# mw-to-git - TODO
+	# subtree - build  seperately
+	# svnimport - use git-svn
+	# thunderbird-patch-inline - fixes thunderbird
+	for i in \
+		buildsystems convert-objects fast-import \
+		hg-to-git hooks remotes2config.sh rerere-train.sh \
+		stats workdir \
+		; do
+		cp -rf \
+			"${S}"/contrib/${i} \
+			"${ED}"/usr/share/${PN}/contrib \
+			|| die "Failed contrib ${i}"
+	done
+
+	if use perl && use cgi ; then
+		# We used to install in /usr/share/${PN}/gitweb
+		# but upstream installs in /usr/share/gitweb
+		# so we will install a symlink and use their location for compat with other
+		# distros
+		dosym /usr/share/gitweb /usr/share/${PN}/gitweb
+
+		# INSTALL discusses configuration issues, not just installation
+		docinto /
+		newdoc  "${S}"/gitweb/INSTALL INSTALL.gitweb
+		newdoc  "${S}"/gitweb/README README.gitweb
+
+		find "${ED}"/usr/lib64/perl5/ \
+			-name .packlist \
+			-exec rm \{\} \;
+	else
+		rm -rf "${ED}"/usr/share/gitweb
+	fi
+
+	if ! use subversion ; then
+		rm -f "${ED}"/usr/libexec/git-core/git-svn \
+			"${ED}"/usr/share/man/man1/git-svn.1*
+	fi
+
+	if use xinetd ; then
+		insinto /etc/xinetd.d
+		newins "${FILESDIR}"/git-daemon.xinetd git-daemon
+	fi
+
+	if use !prefix ; then
+		newinitd "${FILESDIR}"/git-daemon-r1.initd git-daemon
+		newconfd "${FILESDIR}"/git-daemon.confd git-daemon
+		systemd_newunit "${FILESDIR}/git-daemon_at.service" "git-daemon@.service"
+		systemd_dounit "${FILESDIR}/git-daemon.socket"
+	fi
+
+	perl_delete_localpod
+}
+
+src_test() {
+	local disabled="" #t7004-tag.sh" #520270
+	local tests_cvs="t9200-git-cvsexportcommit.sh \
+					t9400-git-cvsserver-server.sh \
+					t9401-git-cvsserver-crlf.sh \
+					t9402-git-cvsserver-refs.sh \
+					t9600-cvsimport.sh \
+					t9601-cvsimport-vendor-branch.sh \
+					t9602-cvsimport-branches-tags.sh \
+					t9603-cvsimport-patchsets.sh \
+					t9604-cvsimport-timestamps.sh"
+	local tests_perl="t3701-add-interactive.sh \
+					t5502-quickfetch.sh \
+					t5512-ls-remote.sh \
+					t5520-pull.sh \
+					t7106-reset-unborn-branch.sh \
+					t7501-commit.sh"
+	# Bug #225601 - t0004 is not suitable for root perm
+	# Bug #219839 - t1004 is not suitable for root perm
+	# t0001-init.sh - check for init notices EPERM*  fails
+	local tests_nonroot="t0001-init.sh \
+		t0004-unwritable.sh \
+		t0070-fundamental.sh \
+		t1004-read-tree-m-u-wf.sh \
+		t3700-add.sh \
+		t7300-clean.sh"
+	# t9100 still fails with symlinks in SVN 1.7
+	local test_svn="t9100-git-svn-basic.sh"
+
+	# Unzip is used only for the testcase code, not by any normal parts of Git.
+	if ! has_version app-arch/unzip ; then
+		einfo "Disabling tar-tree tests"
+		disabled="${disabled} t5000-tar-tree.sh"
+	fi
+
+	cvs=0
+	use cvs && let cvs=$cvs+1
+	if [[ ${EUID} -eq 0 ]]; then
+		if [[ $cvs -eq 1 ]]; then
+			ewarn "Skipping CVS tests because CVS does not work as root!"
+			ewarn "You should retest with FEATURES=userpriv!"
+			disabled="${disabled} ${tests_cvs}"
+		fi
+		einfo "Skipping other tests that require being non-root"
+		disabled="${disabled} ${tests_nonroot}"
+	else
+		[[ $cvs -gt 0 ]] && \
+			has_version dev-vcs/cvs && \
+			let cvs=$cvs+1
+		[[ $cvs -gt 1 ]] && \
+			has_version "dev-vcs/cvs[server]" && \
+			let cvs=$cvs+1
+		if [[ $cvs -lt 3 ]]; then
+			einfo "Disabling CVS tests (needs dev-vcs/cvs[USE=server])"
+			disabled="${disabled} ${tests_cvs}"
+		fi
+	fi
+
+	if ! use perl ; then
+		einfo "Disabling tests that need Perl"
+		disabled="${disabled} ${tests_perl}"
+	fi
+
+	einfo "Disabling tests that fail with SVN 1.7"
+	disabled="${disabled} ${test_svn}"
+
+	# Reset all previously disabled tests
+	cd "${S}/t"
+	for i in *.sh.DISABLED ; do
+		[[ -f "${i}" ]] && mv -f "${i}" "${i%.DISABLED}"
+	done
+	einfo "Disabled tests:"
+	for i in ${disabled} ; do
+		[[ -f "${i}" ]] && mv -f "${i}" "${i}.DISABLED" && einfo "Disabled $i"
+	done
+
+	# Avoid the test system removing the results because we want them ourselves
+	sed -e '/^[[:space:]]*$(MAKE) clean/s,^,#,g' \
+		-i "${S}"/t/Makefile
+
+	# Clean old results first, must always run
+	cd "${S}/t"
+	nonfatal git_emake clean
+
+	# Now run the tests, keep going if we hit an error, and don't terminate on
+	# failure
+	cd "${S}"
+	einfo "Start test run"
+	#MAKEOPTS=-j1
+	nonfatal git_emake --keep-going test
+	rc=$?
+
+	# Display nice results, now print the results
+	cd "${S}/t"
+	nonfatal git_emake aggregate-results
+
+	# And bail if there was a problem
+	[ $rc -eq 0 ] || die "tests failed. Please file a bug."
+}
+
+showpkgdeps() {
+	local pkg=$1
+	shift
+	elog "  $(printf "%-17s:" ${pkg}) ${@}"
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+	einfo "Please read /usr/share/bash-completion/git for Git bash command completion"
+	einfo "Please read /usr/share/git/git-prompt.sh for Git bash prompt"
+	einfo "Note that the prompt bash code is now in that separate script"
+	elog "These additional scripts need some dependencies:"
+	echo
+	showpkgdeps git-quiltimport "dev-util/quilt"
+	showpkgdeps git-instaweb \
+		"|| ( www-servers/lighttpd www-servers/apache www-servers/nginx )"
+	echo
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/dev-vcs/git/git-2.5.0.ebuild b/dev-vcs/git/git-2.5.0.ebuild
deleted file mode 100644
index e78ef89dd985..000000000000
--- a/dev-vcs/git/git-2.5.0.ebuild
+++ /dev/null
@@ -1,638 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-GENTOO_DEPEND_ON_PERL=no
-
-# bug #329479: git-remote-testgit is not multiple-version aware
-PYTHON_COMPAT=( python2_7 )
-[[ ${PV} == *9999 ]] && SCM="git-2"
-EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git"
-EGIT_MASTER=pu
-
-inherit toolchain-funcs eutils elisp-common perl-module bash-completion-r1 python-single-r1 systemd ${SCM}
-
-MY_PV="${PV/_rc/.rc}"
-MY_P="${PN}-${MY_PV}"
-
-DOC_VER=${MY_PV}
-
-DESCRIPTION="GIT - the stupid content tracker, the revision control system heavily used by the Linux kernel team"
-HOMEPAGE="http://www.git-scm.com/"
-if [[ ${PV} != *9999 ]]; then
-	SRC_URI_SUFFIX="xz"
-	SRC_URI_GOOG="https://git-core.googlecode.com/files"
-	SRC_URI_KORG="mirror://kernel/software/scm/git"
-	SRC_URI="${SRC_URI_GOOG}/${MY_P}.tar.${SRC_URI_SUFFIX}
-			${SRC_URI_KORG}/${MY_P}.tar.${SRC_URI_SUFFIX}
-			${SRC_URI_GOOG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
-			${SRC_URI_KORG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
-			doc? (
-			${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
-			${SRC_URI_GOOG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
-			)"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg gtk highlight +iconv mediawiki +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test"
-
-# Common to both DEPEND and RDEPEND
-CDEPEND="
-	dev-libs/openssl:0=
-	sys-libs/zlib
-	pcre? ( dev-libs/libpcre )
-	perl? ( dev-lang/perl:=[-build(-)] )
-	tk? ( dev-lang/tk:0= )
-	curl? (
-		net-misc/curl
-		webdav? ( dev-libs/expat )
-	)
-	emacs? ( virtual/emacs )
-	gnome-keyring? ( gnome-base/libgnome-keyring )"
-
-RDEPEND="${CDEPEND}
-	gpg? ( app-crypt/gnupg )
-	mediawiki? (
-		dev-perl/HTML-Tree
-		dev-perl/MediaWiki-API
-	)
-	perl? ( dev-perl/Error
-			dev-perl/Net-SMTP-SSL
-			dev-perl/Authen-SASL
-			cgi? ( dev-perl/CGI highlight? ( app-text/highlight ) )
-			cvs? ( >=dev-vcs/cvsps-2.1:0 dev-perl/DBI dev-perl/DBD-SQLite )
-			subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey )
-			)
-	python? ( gtk?
-	(
-		>=dev-python/pygtk-2.8[${PYTHON_USEDEP}]
-		>=dev-python/pygtksourceview-2.10.1-r1:2[${PYTHON_USEDEP}]
-	)
-		${PYTHON_DEPS} )"
-
-# This is how info docs are created with Git:
-#   .txt/asciidoc --(asciidoc)---------> .xml/docbook
-#   .xml/docbook  --(docbook2texi.pl)--> .texi
-#   .texi         --(makeinfo)---------> .info
-DEPEND="${CDEPEND}
-	doc? (
-		app-text/asciidoc
-		app-text/docbook2X
-		sys-apps/texinfo
-		app-text/xmlto
-	)
-	nls? ( sys-devel/gettext )
-	test? (	app-crypt/gnupg	)"
-
-# Live ebuild builds man pages and HTML docs, additionally
-if [[ ${PV} == *9999 ]]; then
-	DEPEND="${DEPEND}
-		app-text/asciidoc"
-fi
-
-SITEFILE=50${PN}-gentoo.el
-S="${WORKDIR}/${MY_P}"
-
-REQUIRED_USE="
-	cgi? ( perl )
-	cvs? ( perl )
-	mediawiki? ( perl )
-	subversion? ( perl )
-	webdav? ( curl )
-	gtk? ( python )
-	python? ( ${PYTHON_REQUIRED_USE} )
-"
-
-pkg_setup() {
-	if use subversion && has_version "dev-vcs/subversion[dso]"; then
-		ewarn "Per Gentoo bugs #223747, #238586, when subversion is built"
-		ewarn "with USE=dso, there may be weird crashes in git-svn. You"
-		ewarn "have been warned."
-	fi
-	if use python ; then
-		python-single-r1_pkg_setup
-	fi
-}
-
-# This is needed because for some obscure reasons future calls to make don't
-# pick up these exports if we export them in src_unpack()
-exportmakeopts() {
-	local myopts
-
-	if use blksha1 ; then
-		myopts+=" BLK_SHA1=YesPlease"
-	elif use ppcsha1 ; then
-		myopts+=" PPC_SHA1=YesPlease"
-	fi
-
-	if use curl ; then
-		use webdav || myopts+=" NO_EXPAT=YesPlease"
-	else
-		myopts+=" NO_CURL=YesPlease"
-	fi
-
-	# broken assumptions, because of broken build system ...
-	myopts+=" NO_FINK=YesPlease NO_DARWIN_PORTS=YesPlease"
-	myopts+=" INSTALL=install TAR=tar"
-	myopts+=" SHELL_PATH=${EPREFIX}/bin/sh"
-	myopts+=" SANE_TOOL_PATH="
-	myopts+=" OLD_ICONV="
-	myopts+=" NO_EXTERNAL_GREP="
-
-	# For svn-fe
-	extlibs="-lz -lssl ${S}/xdiff/lib.a $(usex threads -lpthread '')"
-
-	# can't define this to null, since the entire makefile depends on it
-	sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile
-
-	use iconv \
-		|| myopts+=" NO_ICONV=YesPlease"
-	use nls \
-		|| myopts+=" NO_GETTEXT=YesPlease"
-	use tk \
-		|| myopts+=" NO_TCLTK=YesPlease"
-	use pcre \
-		&& myopts+=" USE_LIBPCRE=yes" \
-		&& extlibs+=" -lpcre"
-	use perl \
-		&& myopts+=" INSTALLDIRS=vendor" \
-		|| myopts+=" NO_PERL=YesPlease"
-	use python \
-		|| myopts+=" NO_PYTHON=YesPlease"
-	use subversion \
-		|| myopts+=" NO_SVN_TESTS=YesPlease"
-	use threads \
-		&& myopts+=" THREADED_DELTA_SEARCH=YesPlease" \
-		|| myopts+=" NO_PTHREADS=YesPlease"
-	use cvs \
-		|| myopts+=" NO_CVS=YesPlease"
-# Disabled until ~m68k-mint can be keyworded again
-#	if [[ ${CHOST} == *-mint* ]] ; then
-#		myopts+=" NO_MMAP=YesPlease"
-#		myopts+=" NO_IPV6=YesPlease"
-#		myopts+=" NO_STRLCPY=YesPlease"
-#		myopts+=" NO_MEMMEM=YesPlease"
-#		myopts+=" NO_MKDTEMP=YesPlease"
-#		myopts+=" NO_MKSTEMPS=YesPlease"
-#	fi
-	if [[ ${CHOST} == ia64-*-hpux* ]]; then
-		myopts+=" NO_NSEC=YesPlease"
-	fi
-	if [[ ${CHOST} == *-*-aix* ]]; then
-		myopts+=" NO_FNMATCH_CASEFOLD=YesPlease"
-	fi
-	if [[ ${CHOST} == *-solaris* ]]; then
-		myopts+=" NEEDS_LIBICONV=YesPlease"
-		myopts+=" HAVE_CLOCK_MONOTONIC=1"
-		myopts+=" HAVE_GETDELIM=1"
-	fi
-
-	has_version '>=app-text/asciidoc-8.0' \
-		&& myopts+=" ASCIIDOC8=YesPlease"
-	myopts+=" ASCIIDOC_NO_ROFF=YesPlease"
-
-	# Bug 290465:
-	# builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim'
-	[[ "${CHOST}" == *-uclibc* ]] && \
-		myopts+=" NO_NSEC=YesPlease"
-
-	export MY_MAKEOPTS="${myopts}"
-	export EXTLIBS="${extlibs}"
-}
-
-src_unpack() {
-	if [[ ${PV} != *9999 ]]; then
-		unpack ${MY_P}.tar.${SRC_URI_SUFFIX}
-		cd "${S}"
-		unpack ${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
-		use doc && \
-			cd "${S}"/Documentation && \
-			unpack ${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
-		cd "${S}"
-	else
-		git-2_src_unpack
-		cd "${S}"
-		#cp "${FILESDIR}"/GIT-VERSION-GEN .
-	fi
-
-}
-
-src_prepare() {
-	# bug #350330 - automagic CVS when we don't want it is bad.
-	epatch "${FILESDIR}"/git-2.2.2-optional-cvs.patch
-
-	# install mediawiki perl modules also in vendor_dir
-	# hack, needs better upstream solution
-	epatch "${FILESDIR}"/git-1.8.5-mw-vendor.patch
-
-	epatch "${FILESDIR}"/git-2.2.0-svn-fe-linking.patch
-
-	epatch_user
-
-	sed -i \
-		-e 's:^\(CFLAGS[[:space:]]*=\).*$:\1 $(OPTCFLAGS) -Wall:' \
-		-e 's:^\(LDFLAGS[[:space:]]*=\).*$:\1 $(OPTLDFLAGS):' \
-		-e 's:^\(CC[[:space:]]* =\).*$:\1$(OPTCC):' \
-		-e 's:^\(AR[[:space:]]* =\).*$:\1$(OPTAR):' \
-		-e "s:\(PYTHON_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \
-		-e "s:\(PERL_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \
-		Makefile contrib/svn-fe/Makefile || die "sed failed"
-
-	# Never install the private copy of Error.pm (bug #296310)
-	sed -i \
-		-e '/private-Error.pm/s,^,#,' \
-		perl/Makefile.PL
-
-	# Fix docbook2texi command
-	sed -r -i 's/DOCBOOK2X_TEXI[[:space:]]*=[[:space:]]*docbook2x-texi/DOCBOOK2X_TEXI = docbook2texi.pl/' \
-		Documentation/Makefile || die "sed failed"
-
-	# Fix git-subtree missing DESTDIR
-	sed -i \
-		-e '/$(INSTALL)/s/ $(libexecdir)/ $(DESTDIR)$(libexecdir)/g' \
-		-e '/$(INSTALL)/s/ $(man1dir)/ $(DESTDIR)$(man1dir)/g'  \
-		contrib/subtree/Makefile
-}
-
-git_emake() {
-	# bug #326625: PERL_PATH, PERL_MM_OPT
-	# bug #320647: PYTHON_PATH
-	PYTHON_PATH=""
-	use python && PYTHON_PATH="${PYTHON}"
-	emake ${MY_MAKEOPTS} \
-		DESTDIR="${D}" \
-		OPTCFLAGS="${CFLAGS}" \
-		OPTLDFLAGS="${LDFLAGS}" \
-		OPTCC="$(tc-getCC)" \
-		OPTAR="$(tc-getAR)" \
-		prefix="${EPREFIX}"/usr \
-		htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
-		sysconfdir="${EPREFIX}"/etc \
-		PYTHON_PATH="${PYTHON_PATH}" \
-		PERL_MM_OPT="" \
-		GIT_TEST_OPTS="--no-color" \
-		V=1 \
-		"$@"
-	# This is the fix for bug #326625, but it also causes breakage, see bug
-	# #352693.
-	# PERL_PATH="${EPREFIX}/usr/bin/env perl" \
-}
-
-src_configure() {
-	exportmakeopts
-}
-
-src_compile() {
-	if use perl ; then
-	git_emake perl/PM.stamp || die "emake perl/PM.stamp failed"
-	git_emake perl/perl.mak || die "emake perl/perl.mak failed"
-	fi
-	git_emake || die "emake failed"
-
-	if use emacs ; then
-		elisp-compile contrib/emacs/git{,-blame}.el
-	fi
-
-	if use perl && use cgi ; then
-		git_emake \
-			gitweb \
-			|| die "emake gitweb (cgi) failed"
-	fi
-
-	if [[ ${CHOST} == *-darwin* ]]; then
-		cd "${S}"/contrib/credential/osxkeychain || die "cd credential/osxkeychain"
-		git_emake || die "emake credential-osxkeychain"
-	fi
-
-	cd "${S}"/Documentation
-	if [[ ${PV} == *9999 ]] ; then
-		git_emake man \
-			|| die "emake man failed"
-		if use doc ; then
-			git_emake info html \
-				|| die "emake info html failed"
-		fi
-	else
-		if use doc ; then
-			git_emake info \
-				|| die "emake info html failed"
-		fi
-	fi
-
-	if use subversion ; then
-		cd "${S}"/contrib/svn-fe
-		# by defining EXTLIBS we override the detection for libintl and
-		# libiconv, bug #516168
-		local nlsiconv=
-		use nls && use !elibc_glibc && nlsiconv+=" -lintl"
-		use iconv && use !elibc_glibc && nlsiconv+=" -liconv"
-		git_emake EXTLIBS="${EXTLIBS} ${nlsiconv}" || die "emake svn-fe failed"
-		if use doc ; then
-			git_emake svn-fe.{1,html} || die "emake svn-fe.1 svn-fe.html failed"
-		fi
-		cd "${S}"
-	fi
-
-	if use gnome-keyring ; then
-		cd "${S}"/contrib/credential/gnome-keyring
-		git_emake || die "emake git-credential-gnome-keyring failed"
-	fi
-
-	cd "${S}"/contrib/subtree
-	git_emake
-	use doc && git_emake doc
-
-	if use mediawiki ; then
-		cd "${S}"/contrib/mw-to-git
-		git_emake
-	fi
-}
-
-src_install() {
-	git_emake \
-		install || \
-		die "make install failed"
-
-	if [[ ${CHOST} == *-darwin* ]]; then
-		dobin contrib/credential/osxkeychain/git-credential-osxkeychain
-	fi
-
-	# Depending on the tarball and manual rebuild of the documentation, the
-	# manpages may exist in either OR both of these directories.
-	find man?/*.[157] >/dev/null 2>&1 && doman man?/*.[157]
-	find Documentation/*.[157] >/dev/null 2>&1 && doman Documentation/*.[157]
-
-	dodoc README Documentation/{SubmittingPatches,CodingGuidelines}
-	use doc && dodir /usr/share/doc/${PF}/html
-	for d in / /howto/ /technical/ ; do
-		docinto ${d}
-		dodoc Documentation${d}*.txt
-		use doc && dohtml -p ${d} Documentation${d}*.html
-	done
-	docinto /
-	# Upstream does not ship this pre-built :-(
-	use doc && doinfo Documentation/{git,gitman}.info
-
-	newbashcomp contrib/completion/git-completion.bash ${PN}
-	bashcomp_alias git gitk
-	# Not really a bash-completion file (bug #477920)
-	# but still needed uncompressed (bug #507480)
-	insinto /usr/share/${PN}
-	doins contrib/completion/git-prompt.sh
-
-	if use emacs ; then
-		elisp-install ${PN} contrib/emacs/git.{el,elc}
-		elisp-install ${PN} contrib/emacs/git-blame.{el,elc}
-		#elisp-install ${PN}/compat contrib/emacs/vc-git.{el,elc}
-		# don't add automatically to the load-path, so the sitefile
-		# can do a conditional loading
-		touch "${ED}${SITELISP}/${PN}/compat/.nosearch"
-		elisp-site-file-install "${FILESDIR}"/${SITEFILE}
-	fi
-
-	if use python && use gtk ; then
-		python_doscript "${S}"/contrib/gitview/gitview
-		dodoc "${S}"/contrib/gitview/gitview.txt
-	fi
-
-	#dobin contrib/fast-import/git-p4 # Moved upstream
-	#dodoc contrib/fast-import/git-p4.txt # Moved upstream
-	newbin contrib/fast-import/import-tars.perl import-tars
-	exeinto /usr/libexec/git-core/
-	newexe contrib/git-resurrect.sh git-resurrect
-
-	# git-subtree
-	cd "${S}"/contrib/subtree
-	git_emake install || die "Failed to emake install git-subtree"
-	if use doc ; then
-		git_emake install-man install-doc || die "Failed to emake install-doc install-mangit-subtree"
-	fi
-	newdoc README README.git-subtree
-	dodoc git-subtree.txt
-	cd "${S}"
-
-	if use mediawiki ; then
-		cd "${S}"/contrib/mw-to-git
-		git_emake install
-		cd "${S}"
-	fi
-
-	# diff-highlight
-	dobin contrib/diff-highlight/diff-highlight
-	newdoc contrib/diff-highlight/README README.diff-highlight
-
-	# git-jump
-	exeinto /usr/libexec/git-core/
-	doexe contrib/git-jump/git-jump
-	newdoc contrib/git-jump/README git-jump.txt
-
-	# git-contacts
-	exeinto /usr/libexec/git-core/
-	doexe contrib/contacts/git-contacts
-	dodoc contrib/contacts/git-contacts.txt
-
-	if use gnome-keyring ; then
-		cd "${S}"/contrib/credential/gnome-keyring
-		dobin git-credential-gnome-keyring
-	fi
-
-	if use subversion ; then
-		cd "${S}"/contrib/svn-fe
-		dobin svn-fe
-		dodoc svn-fe.txt
-		use doc && doman svn-fe.1 && dohtml svn-fe.html
-		cd "${S}"
-	fi
-
-	dodir /usr/share/${PN}/contrib
-	# The following are excluded:
-	# completion - installed above
-	# credential/gnome-keyring TODO
-	# diff-highlight - done above
-	# emacs - installed above
-	# examples - these are stuff that is not used in Git anymore actually
-	# git-jump - done above
-	# gitview - installed above
-	# p4import - excluded because fast-import has a better one
-	# patches - stuff the Git guys made to go upstream to other places
-	# persistent-https - TODO
-	# mw-to-git - TODO
-	# subtree - build  seperately
-	# svnimport - use git-svn
-	# thunderbird-patch-inline - fixes thunderbird
-	for i in \
-		buildsystems convert-objects fast-import \
-		hg-to-git hooks remotes2config.sh rerere-train.sh \
-		stats workdir \
-		; do
-		cp -rf \
-			"${S}"/contrib/${i} \
-			"${ED}"/usr/share/${PN}/contrib \
-			|| die "Failed contrib ${i}"
-	done
-
-	if use perl && use cgi ; then
-		# We used to install in /usr/share/${PN}/gitweb
-		# but upstream installs in /usr/share/gitweb
-		# so we will install a symlink and use their location for compat with other
-		# distros
-		dosym /usr/share/gitweb /usr/share/${PN}/gitweb
-
-		# INSTALL discusses configuration issues, not just installation
-		docinto /
-		newdoc  "${S}"/gitweb/INSTALL INSTALL.gitweb
-		newdoc  "${S}"/gitweb/README README.gitweb
-
-		find "${ED}"/usr/lib64/perl5/ \
-			-name .packlist \
-			-exec rm \{\} \;
-	else
-		rm -rf "${ED}"/usr/share/gitweb
-	fi
-
-	if ! use subversion ; then
-		rm -f "${ED}"/usr/libexec/git-core/git-svn \
-			"${ED}"/usr/share/man/man1/git-svn.1*
-	fi
-
-	if use xinetd ; then
-		insinto /etc/xinetd.d
-		newins "${FILESDIR}"/git-daemon.xinetd git-daemon
-	fi
-
-	if use !prefix ; then
-		newinitd "${FILESDIR}"/git-daemon-r1.initd git-daemon
-		newconfd "${FILESDIR}"/git-daemon.confd git-daemon
-		systemd_newunit "${FILESDIR}/git-daemon_at.service" "git-daemon@.service"
-		systemd_dounit "${FILESDIR}/git-daemon.socket"
-	fi
-
-	perl_delete_localpod
-}
-
-src_test() {
-	local disabled="" #t7004-tag.sh" #520270
-	local tests_cvs="t9200-git-cvsexportcommit.sh \
-					t9400-git-cvsserver-server.sh \
-					t9401-git-cvsserver-crlf.sh \
-					t9402-git-cvsserver-refs.sh \
-					t9600-cvsimport.sh \
-					t9601-cvsimport-vendor-branch.sh \
-					t9602-cvsimport-branches-tags.sh \
-					t9603-cvsimport-patchsets.sh \
-					t9604-cvsimport-timestamps.sh"
-	local tests_perl="t3701-add-interactive.sh \
-					t5502-quickfetch.sh \
-					t5512-ls-remote.sh \
-					t5520-pull.sh \
-					t7106-reset-unborn-branch.sh \
-					t7501-commit.sh"
-	# Bug #225601 - t0004 is not suitable for root perm
-	# Bug #219839 - t1004 is not suitable for root perm
-	# t0001-init.sh - check for init notices EPERM*  fails
-	local tests_nonroot="t0001-init.sh \
-		t0004-unwritable.sh \
-		t0070-fundamental.sh \
-		t1004-read-tree-m-u-wf.sh \
-		t3700-add.sh \
-		t7300-clean.sh"
-	# t9100 still fails with symlinks in SVN 1.7
-	local test_svn="t9100-git-svn-basic.sh"
-
-	# Unzip is used only for the testcase code, not by any normal parts of Git.
-	if ! has_version app-arch/unzip ; then
-		einfo "Disabling tar-tree tests"
-		disabled="${disabled} t5000-tar-tree.sh"
-	fi
-
-	cvs=0
-	use cvs && let cvs=$cvs+1
-	if [[ ${EUID} -eq 0 ]]; then
-		if [[ $cvs -eq 1 ]]; then
-			ewarn "Skipping CVS tests because CVS does not work as root!"
-			ewarn "You should retest with FEATURES=userpriv!"
-			disabled="${disabled} ${tests_cvs}"
-		fi
-		einfo "Skipping other tests that require being non-root"
-		disabled="${disabled} ${tests_nonroot}"
-	else
-		[[ $cvs -gt 0 ]] && \
-			has_version dev-vcs/cvs && \
-			let cvs=$cvs+1
-		[[ $cvs -gt 1 ]] && \
-			has_version "dev-vcs/cvs[server]" && \
-			let cvs=$cvs+1
-		if [[ $cvs -lt 3 ]]; then
-			einfo "Disabling CVS tests (needs dev-vcs/cvs[USE=server])"
-			disabled="${disabled} ${tests_cvs}"
-		fi
-	fi
-
-	if ! use perl ; then
-		einfo "Disabling tests that need Perl"
-		disabled="${disabled} ${tests_perl}"
-	fi
-
-	einfo "Disabling tests that fail with SVN 1.7"
-	disabled="${disabled} ${test_svn}"
-
-	# Reset all previously disabled tests
-	cd "${S}/t"
-	for i in *.sh.DISABLED ; do
-		[[ -f "${i}" ]] && mv -f "${i}" "${i%.DISABLED}"
-	done
-	einfo "Disabled tests:"
-	for i in ${disabled} ; do
-		[[ -f "${i}" ]] && mv -f "${i}" "${i}.DISABLED" && einfo "Disabled $i"
-	done
-
-	# Avoid the test system removing the results because we want them ourselves
-	sed -e '/^[[:space:]]*$(MAKE) clean/s,^,#,g' \
-		-i "${S}"/t/Makefile
-
-	# Clean old results first, must always run
-	cd "${S}/t"
-	nonfatal git_emake clean
-
-	# Now run the tests, keep going if we hit an error, and don't terminate on
-	# failure
-	cd "${S}"
-	einfo "Start test run"
-	#MAKEOPTS=-j1
-	nonfatal git_emake --keep-going test
-	rc=$?
-
-	# Display nice results, now print the results
-	cd "${S}/t"
-	nonfatal git_emake aggregate-results
-
-	# And bail if there was a problem
-	[ $rc -eq 0 ] || die "tests failed. Please file a bug."
-}
-
-showpkgdeps() {
-	local pkg=$1
-	shift
-	elog "  $(printf "%-17s:" ${pkg}) ${@}"
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-	einfo "Please read /usr/share/bash-completion/git for Git bash command completion"
-	einfo "Please read /usr/share/git/git-prompt.sh for Git bash prompt"
-	einfo "Note that the prompt bash code is now in that separate script"
-	elog "These additional scripts need some dependencies:"
-	echo
-	showpkgdeps git-quiltimport "dev-util/quilt"
-	showpkgdeps git-instaweb \
-		"|| ( www-servers/lighttpd www-servers/apache www-servers/nginx )"
-	echo
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/dev-vcs/git/git-2.5.1.ebuild b/dev-vcs/git/git-2.5.1.ebuild
index 352b93a6807b..cf3686050a61 100644
--- a/dev-vcs/git/git-2.5.1.ebuild
+++ b/dev-vcs/git/git-2.5.1.ebuild
@@ -229,6 +229,9 @@ src_prepare() {
 
 	epatch "${FILESDIR}"/git-2.2.0-svn-fe-linking.patch
 
+	# Bug #493306, where FreeBSD 10.x merged libiconv into its libc.
+	epatch "${FILESDIR}"/git-2.5.1-freebsd-10.x-no-iconv.patch
+
 	epatch_user
 
 	sed -i \
diff --git a/dev-vcs/git/git-2.5.2.ebuild b/dev-vcs/git/git-2.5.2.ebuild
new file mode 100644
index 000000000000..cf3686050a61
--- /dev/null
+++ b/dev-vcs/git/git-2.5.2.ebuild
@@ -0,0 +1,639 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+GENTOO_DEPEND_ON_PERL=no
+
+# bug #329479: git-remote-testgit is not multiple-version aware
+PYTHON_COMPAT=( python2_7 )
+[[ ${PV} == *9999 ]] && SCM="git-2"
+EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git"
+EGIT_MASTER=pu
+
+inherit toolchain-funcs eutils elisp-common perl-module bash-completion-r1 python-single-r1 systemd ${SCM}
+
+MY_PV="${PV/_rc/.rc}"
+MY_P="${PN}-${MY_PV}"
+
+DOC_VER=${MY_PV}
+
+DESCRIPTION="GIT - the stupid content tracker, the revision control system heavily used by the Linux kernel team"
+HOMEPAGE="http://www.git-scm.com/"
+if [[ ${PV} != *9999 ]]; then
+	SRC_URI_SUFFIX="xz"
+	SRC_URI_GOOG="https://git-core.googlecode.com/files"
+	SRC_URI_KORG="mirror://kernel/software/scm/git"
+	SRC_URI="${SRC_URI_GOOG}/${MY_P}.tar.${SRC_URI_SUFFIX}
+			${SRC_URI_KORG}/${MY_P}.tar.${SRC_URI_SUFFIX}
+			${SRC_URI_GOOG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
+			${SRC_URI_KORG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
+			doc? (
+			${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
+			${SRC_URI_GOOG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
+			)"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg gtk highlight +iconv mediawiki +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test"
+
+# Common to both DEPEND and RDEPEND
+CDEPEND="
+	dev-libs/openssl:0=
+	sys-libs/zlib
+	pcre? ( dev-libs/libpcre )
+	perl? ( dev-lang/perl:=[-build(-)] )
+	tk? ( dev-lang/tk:0= )
+	curl? (
+		net-misc/curl
+		webdav? ( dev-libs/expat )
+	)
+	emacs? ( virtual/emacs )
+	gnome-keyring? ( gnome-base/libgnome-keyring )"
+
+RDEPEND="${CDEPEND}
+	gpg? ( app-crypt/gnupg )
+	mediawiki? (
+		dev-perl/HTML-Tree
+		dev-perl/MediaWiki-API
+	)
+	perl? ( dev-perl/Error
+			dev-perl/Net-SMTP-SSL
+			dev-perl/Authen-SASL
+			cgi? ( dev-perl/CGI highlight? ( app-text/highlight ) )
+			cvs? ( >=dev-vcs/cvsps-2.1:0 dev-perl/DBI dev-perl/DBD-SQLite )
+			subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey )
+			)
+	python? ( gtk?
+	(
+		>=dev-python/pygtk-2.8[${PYTHON_USEDEP}]
+		>=dev-python/pygtksourceview-2.10.1-r1:2[${PYTHON_USEDEP}]
+	)
+		${PYTHON_DEPS} )"
+
+# This is how info docs are created with Git:
+#   .txt/asciidoc --(asciidoc)---------> .xml/docbook
+#   .xml/docbook  --(docbook2texi.pl)--> .texi
+#   .texi         --(makeinfo)---------> .info
+DEPEND="${CDEPEND}
+	doc? (
+		app-text/asciidoc
+		app-text/docbook2X
+		sys-apps/texinfo
+		app-text/xmlto
+	)
+	nls? ( sys-devel/gettext )
+	test? (	app-crypt/gnupg	)"
+
+# Live ebuild builds man pages and HTML docs, additionally
+if [[ ${PV} == *9999 ]]; then
+	DEPEND="${DEPEND}
+		app-text/asciidoc"
+fi
+
+SITEFILE=50${PN}-gentoo.el
+S="${WORKDIR}/${MY_P}"
+
+REQUIRED_USE="
+	cgi? ( perl )
+	cvs? ( perl )
+	mediawiki? ( perl )
+	subversion? ( perl )
+	webdav? ( curl )
+	gtk? ( python )
+	python? ( ${PYTHON_REQUIRED_USE} )
+"
+
+pkg_setup() {
+	if use subversion && has_version "dev-vcs/subversion[dso]"; then
+		ewarn "Per Gentoo bugs #223747, #238586, when subversion is built"
+		ewarn "with USE=dso, there may be weird crashes in git-svn. You"
+		ewarn "have been warned."
+	fi
+	if use python ; then
+		python-single-r1_pkg_setup
+	fi
+}
+
+# This is needed because for some obscure reasons future calls to make don't
+# pick up these exports if we export them in src_unpack()
+exportmakeopts() {
+	local myopts
+
+	if use blksha1 ; then
+		myopts+=" BLK_SHA1=YesPlease"
+	elif use ppcsha1 ; then
+		myopts+=" PPC_SHA1=YesPlease"
+	fi
+
+	if use curl ; then
+		use webdav || myopts+=" NO_EXPAT=YesPlease"
+	else
+		myopts+=" NO_CURL=YesPlease"
+	fi
+
+	# broken assumptions, because of broken build system ...
+	myopts+=" NO_FINK=YesPlease NO_DARWIN_PORTS=YesPlease"
+	myopts+=" INSTALL=install TAR=tar"
+	myopts+=" SHELL_PATH=${EPREFIX}/bin/sh"
+	myopts+=" SANE_TOOL_PATH="
+	myopts+=" OLD_ICONV="
+	myopts+=" NO_EXTERNAL_GREP="
+
+	# For svn-fe
+	extlibs="-lz -lssl ${S}/xdiff/lib.a $(usex threads -lpthread '')"
+
+	# can't define this to null, since the entire makefile depends on it
+	sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile
+
+	use iconv \
+		|| myopts+=" NO_ICONV=YesPlease"
+	use nls \
+		|| myopts+=" NO_GETTEXT=YesPlease"
+	use tk \
+		|| myopts+=" NO_TCLTK=YesPlease"
+	use pcre \
+		&& myopts+=" USE_LIBPCRE=yes" \
+		&& extlibs+=" -lpcre"
+	use perl \
+		&& myopts+=" INSTALLDIRS=vendor" \
+		|| myopts+=" NO_PERL=YesPlease"
+	use python \
+		|| myopts+=" NO_PYTHON=YesPlease"
+	use subversion \
+		|| myopts+=" NO_SVN_TESTS=YesPlease"
+	use threads \
+		&& myopts+=" THREADED_DELTA_SEARCH=YesPlease" \
+		|| myopts+=" NO_PTHREADS=YesPlease"
+	use cvs \
+		|| myopts+=" NO_CVS=YesPlease"
+# Disabled until ~m68k-mint can be keyworded again
+#	if [[ ${CHOST} == *-mint* ]] ; then
+#		myopts+=" NO_MMAP=YesPlease"
+#		myopts+=" NO_IPV6=YesPlease"
+#		myopts+=" NO_STRLCPY=YesPlease"
+#		myopts+=" NO_MEMMEM=YesPlease"
+#		myopts+=" NO_MKDTEMP=YesPlease"
+#		myopts+=" NO_MKSTEMPS=YesPlease"
+#	fi
+	if [[ ${CHOST} == ia64-*-hpux* ]]; then
+		myopts+=" NO_NSEC=YesPlease"
+	fi
+	if [[ ${CHOST} == *-*-aix* ]]; then
+		myopts+=" NO_FNMATCH_CASEFOLD=YesPlease"
+	fi
+	if [[ ${CHOST} == *-solaris* ]]; then
+		myopts+=" NEEDS_LIBICONV=YesPlease"
+	fi
+
+	has_version '>=app-text/asciidoc-8.0' \
+		&& myopts+=" ASCIIDOC8=YesPlease"
+	myopts+=" ASCIIDOC_NO_ROFF=YesPlease"
+
+	# Bug 290465:
+	# builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim'
+	[[ "${CHOST}" == *-uclibc* ]] && \
+		myopts+=" NO_NSEC=YesPlease"
+
+	export MY_MAKEOPTS="${myopts}"
+	export EXTLIBS="${extlibs}"
+}
+
+src_unpack() {
+	if [[ ${PV} != *9999 ]]; then
+		unpack ${MY_P}.tar.${SRC_URI_SUFFIX}
+		cd "${S}"
+		unpack ${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
+		use doc && \
+			cd "${S}"/Documentation && \
+			unpack ${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
+		cd "${S}"
+	else
+		git-2_src_unpack
+		cd "${S}"
+		#cp "${FILESDIR}"/GIT-VERSION-GEN .
+	fi
+
+}
+
+src_prepare() {
+	# bug #350330 - automagic CVS when we don't want it is bad.
+	epatch "${FILESDIR}"/git-2.2.2-optional-cvs.patch
+
+	# install mediawiki perl modules also in vendor_dir
+	# hack, needs better upstream solution
+	epatch "${FILESDIR}"/git-1.8.5-mw-vendor.patch
+
+	epatch "${FILESDIR}"/git-2.2.0-svn-fe-linking.patch
+
+	# Bug #493306, where FreeBSD 10.x merged libiconv into its libc.
+	epatch "${FILESDIR}"/git-2.5.1-freebsd-10.x-no-iconv.patch
+
+	epatch_user
+
+	sed -i \
+		-e 's:^\(CFLAGS[[:space:]]*=\).*$:\1 $(OPTCFLAGS) -Wall:' \
+		-e 's:^\(LDFLAGS[[:space:]]*=\).*$:\1 $(OPTLDFLAGS):' \
+		-e 's:^\(CC[[:space:]]* =\).*$:\1$(OPTCC):' \
+		-e 's:^\(AR[[:space:]]* =\).*$:\1$(OPTAR):' \
+		-e "s:\(PYTHON_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \
+		-e "s:\(PERL_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \
+		Makefile contrib/svn-fe/Makefile || die "sed failed"
+
+	# Never install the private copy of Error.pm (bug #296310)
+	sed -i \
+		-e '/private-Error.pm/s,^,#,' \
+		perl/Makefile.PL
+
+	# Fix docbook2texi command
+	sed -r -i 's/DOCBOOK2X_TEXI[[:space:]]*=[[:space:]]*docbook2x-texi/DOCBOOK2X_TEXI = docbook2texi.pl/' \
+		Documentation/Makefile || die "sed failed"
+
+	# Fix git-subtree missing DESTDIR
+	sed -i \
+		-e '/$(INSTALL)/s/ $(libexecdir)/ $(DESTDIR)$(libexecdir)/g' \
+		-e '/$(INSTALL)/s/ $(man1dir)/ $(DESTDIR)$(man1dir)/g'  \
+		contrib/subtree/Makefile
+}
+
+git_emake() {
+	# bug #326625: PERL_PATH, PERL_MM_OPT
+	# bug #320647: PYTHON_PATH
+	PYTHON_PATH=""
+	use python && PYTHON_PATH="${PYTHON}"
+	emake ${MY_MAKEOPTS} \
+		DESTDIR="${D}" \
+		OPTCFLAGS="${CFLAGS}" \
+		OPTLDFLAGS="${LDFLAGS}" \
+		OPTCC="$(tc-getCC)" \
+		OPTAR="$(tc-getAR)" \
+		prefix="${EPREFIX}"/usr \
+		htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
+		sysconfdir="${EPREFIX}"/etc \
+		PYTHON_PATH="${PYTHON_PATH}" \
+		PERL_MM_OPT="" \
+		GIT_TEST_OPTS="--no-color" \
+		V=1 \
+		"$@"
+	# This is the fix for bug #326625, but it also causes breakage, see bug
+	# #352693.
+	# PERL_PATH="${EPREFIX}/usr/bin/env perl" \
+}
+
+src_configure() {
+	exportmakeopts
+}
+
+src_compile() {
+	if use perl ; then
+	git_emake perl/PM.stamp || die "emake perl/PM.stamp failed"
+	git_emake perl/perl.mak || die "emake perl/perl.mak failed"
+	fi
+	git_emake || die "emake failed"
+
+	if use emacs ; then
+		elisp-compile contrib/emacs/git{,-blame}.el
+	fi
+
+	if use perl && use cgi ; then
+		git_emake \
+			gitweb \
+			|| die "emake gitweb (cgi) failed"
+	fi
+
+	if [[ ${CHOST} == *-darwin* ]]; then
+		cd "${S}"/contrib/credential/osxkeychain || die "cd credential/osxkeychain"
+		git_emake || die "emake credential-osxkeychain"
+	fi
+
+	cd "${S}"/Documentation
+	if [[ ${PV} == *9999 ]] ; then
+		git_emake man \
+			|| die "emake man failed"
+		if use doc ; then
+			git_emake info html \
+				|| die "emake info html failed"
+		fi
+	else
+		if use doc ; then
+			git_emake info \
+				|| die "emake info html failed"
+		fi
+	fi
+
+	if use subversion ; then
+		cd "${S}"/contrib/svn-fe
+		# by defining EXTLIBS we override the detection for libintl and
+		# libiconv, bug #516168
+		local nlsiconv=
+		use nls && use !elibc_glibc && nlsiconv+=" -lintl"
+		use iconv && use !elibc_glibc && nlsiconv+=" -liconv"
+		git_emake EXTLIBS="${EXTLIBS} ${nlsiconv}" || die "emake svn-fe failed"
+		if use doc ; then
+			git_emake svn-fe.{1,html} || die "emake svn-fe.1 svn-fe.html failed"
+		fi
+		cd "${S}"
+	fi
+
+	if use gnome-keyring ; then
+		cd "${S}"/contrib/credential/gnome-keyring
+		git_emake || die "emake git-credential-gnome-keyring failed"
+	fi
+
+	cd "${S}"/contrib/subtree
+	git_emake
+	use doc && git_emake doc
+
+	if use mediawiki ; then
+		cd "${S}"/contrib/mw-to-git
+		git_emake
+	fi
+}
+
+src_install() {
+	git_emake \
+		install || \
+		die "make install failed"
+
+	if [[ ${CHOST} == *-darwin* ]]; then
+		dobin contrib/credential/osxkeychain/git-credential-osxkeychain
+	fi
+
+	# Depending on the tarball and manual rebuild of the documentation, the
+	# manpages may exist in either OR both of these directories.
+	find man?/*.[157] >/dev/null 2>&1 && doman man?/*.[157]
+	find Documentation/*.[157] >/dev/null 2>&1 && doman Documentation/*.[157]
+
+	dodoc README Documentation/{SubmittingPatches,CodingGuidelines}
+	use doc && dodir /usr/share/doc/${PF}/html
+	for d in / /howto/ /technical/ ; do
+		docinto ${d}
+		dodoc Documentation${d}*.txt
+		use doc && dohtml -p ${d} Documentation${d}*.html
+	done
+	docinto /
+	# Upstream does not ship this pre-built :-(
+	use doc && doinfo Documentation/{git,gitman}.info
+
+	newbashcomp contrib/completion/git-completion.bash ${PN}
+	bashcomp_alias git gitk
+	# Not really a bash-completion file (bug #477920)
+	# but still needed uncompressed (bug #507480)
+	insinto /usr/share/${PN}
+	doins contrib/completion/git-prompt.sh
+
+	if use emacs ; then
+		elisp-install ${PN} contrib/emacs/git.{el,elc}
+		elisp-install ${PN} contrib/emacs/git-blame.{el,elc}
+		#elisp-install ${PN}/compat contrib/emacs/vc-git.{el,elc}
+		# don't add automatically to the load-path, so the sitefile
+		# can do a conditional loading
+		touch "${ED}${SITELISP}/${PN}/compat/.nosearch"
+		elisp-site-file-install "${FILESDIR}"/${SITEFILE}
+	fi
+
+	if use python && use gtk ; then
+		python_doscript "${S}"/contrib/gitview/gitview
+		dodoc "${S}"/contrib/gitview/gitview.txt
+	fi
+
+	#dobin contrib/fast-import/git-p4 # Moved upstream
+	#dodoc contrib/fast-import/git-p4.txt # Moved upstream
+	newbin contrib/fast-import/import-tars.perl import-tars
+	exeinto /usr/libexec/git-core/
+	newexe contrib/git-resurrect.sh git-resurrect
+
+	# git-subtree
+	cd "${S}"/contrib/subtree
+	git_emake install || die "Failed to emake install git-subtree"
+	if use doc ; then
+		git_emake install-man install-doc || die "Failed to emake install-doc install-mangit-subtree"
+	fi
+	newdoc README README.git-subtree
+	dodoc git-subtree.txt
+	cd "${S}"
+
+	if use mediawiki ; then
+		cd "${S}"/contrib/mw-to-git
+		git_emake install
+		cd "${S}"
+	fi
+
+	# diff-highlight
+	dobin contrib/diff-highlight/diff-highlight
+	newdoc contrib/diff-highlight/README README.diff-highlight
+
+	# git-jump
+	exeinto /usr/libexec/git-core/
+	doexe contrib/git-jump/git-jump
+	newdoc contrib/git-jump/README git-jump.txt
+
+	# git-contacts
+	exeinto /usr/libexec/git-core/
+	doexe contrib/contacts/git-contacts
+	dodoc contrib/contacts/git-contacts.txt
+
+	if use gnome-keyring ; then
+		cd "${S}"/contrib/credential/gnome-keyring
+		dobin git-credential-gnome-keyring
+	fi
+
+	if use subversion ; then
+		cd "${S}"/contrib/svn-fe
+		dobin svn-fe
+		dodoc svn-fe.txt
+		use doc && doman svn-fe.1 && dohtml svn-fe.html
+		cd "${S}"
+	fi
+
+	dodir /usr/share/${PN}/contrib
+	# The following are excluded:
+	# completion - installed above
+	# credential/gnome-keyring TODO
+	# diff-highlight - done above
+	# emacs - installed above
+	# examples - these are stuff that is not used in Git anymore actually
+	# git-jump - done above
+	# gitview - installed above
+	# p4import - excluded because fast-import has a better one
+	# patches - stuff the Git guys made to go upstream to other places
+	# persistent-https - TODO
+	# mw-to-git - TODO
+	# subtree - build  seperately
+	# svnimport - use git-svn
+	# thunderbird-patch-inline - fixes thunderbird
+	for i in \
+		buildsystems convert-objects fast-import \
+		hg-to-git hooks remotes2config.sh rerere-train.sh \
+		stats workdir \
+		; do
+		cp -rf \
+			"${S}"/contrib/${i} \
+			"${ED}"/usr/share/${PN}/contrib \
+			|| die "Failed contrib ${i}"
+	done
+
+	if use perl && use cgi ; then
+		# We used to install in /usr/share/${PN}/gitweb
+		# but upstream installs in /usr/share/gitweb
+		# so we will install a symlink and use their location for compat with other
+		# distros
+		dosym /usr/share/gitweb /usr/share/${PN}/gitweb
+
+		# INSTALL discusses configuration issues, not just installation
+		docinto /
+		newdoc  "${S}"/gitweb/INSTALL INSTALL.gitweb
+		newdoc  "${S}"/gitweb/README README.gitweb
+
+		find "${ED}"/usr/lib64/perl5/ \
+			-name .packlist \
+			-exec rm \{\} \;
+	else
+		rm -rf "${ED}"/usr/share/gitweb
+	fi
+
+	if ! use subversion ; then
+		rm -f "${ED}"/usr/libexec/git-core/git-svn \
+			"${ED}"/usr/share/man/man1/git-svn.1*
+	fi
+
+	if use xinetd ; then
+		insinto /etc/xinetd.d
+		newins "${FILESDIR}"/git-daemon.xinetd git-daemon
+	fi
+
+	if use !prefix ; then
+		newinitd "${FILESDIR}"/git-daemon-r1.initd git-daemon
+		newconfd "${FILESDIR}"/git-daemon.confd git-daemon
+		systemd_newunit "${FILESDIR}/git-daemon_at.service" "git-daemon@.service"
+		systemd_dounit "${FILESDIR}/git-daemon.socket"
+	fi
+
+	perl_delete_localpod
+}
+
+src_test() {
+	local disabled="" #t7004-tag.sh" #520270
+	local tests_cvs="t9200-git-cvsexportcommit.sh \
+					t9400-git-cvsserver-server.sh \
+					t9401-git-cvsserver-crlf.sh \
+					t9402-git-cvsserver-refs.sh \
+					t9600-cvsimport.sh \
+					t9601-cvsimport-vendor-branch.sh \
+					t9602-cvsimport-branches-tags.sh \
+					t9603-cvsimport-patchsets.sh \
+					t9604-cvsimport-timestamps.sh"
+	local tests_perl="t3701-add-interactive.sh \
+					t5502-quickfetch.sh \
+					t5512-ls-remote.sh \
+					t5520-pull.sh \
+					t7106-reset-unborn-branch.sh \
+					t7501-commit.sh"
+	# Bug #225601 - t0004 is not suitable for root perm
+	# Bug #219839 - t1004 is not suitable for root perm
+	# t0001-init.sh - check for init notices EPERM*  fails
+	local tests_nonroot="t0001-init.sh \
+		t0004-unwritable.sh \
+		t0070-fundamental.sh \
+		t1004-read-tree-m-u-wf.sh \
+		t3700-add.sh \
+		t7300-clean.sh"
+	# t9100 still fails with symlinks in SVN 1.7
+	local test_svn="t9100-git-svn-basic.sh"
+
+	# Unzip is used only for the testcase code, not by any normal parts of Git.
+	if ! has_version app-arch/unzip ; then
+		einfo "Disabling tar-tree tests"
+		disabled="${disabled} t5000-tar-tree.sh"
+	fi
+
+	cvs=0
+	use cvs && let cvs=$cvs+1
+	if [[ ${EUID} -eq 0 ]]; then
+		if [[ $cvs -eq 1 ]]; then
+			ewarn "Skipping CVS tests because CVS does not work as root!"
+			ewarn "You should retest with FEATURES=userpriv!"
+			disabled="${disabled} ${tests_cvs}"
+		fi
+		einfo "Skipping other tests that require being non-root"
+		disabled="${disabled} ${tests_nonroot}"
+	else
+		[[ $cvs -gt 0 ]] && \
+			has_version dev-vcs/cvs && \
+			let cvs=$cvs+1
+		[[ $cvs -gt 1 ]] && \
+			has_version "dev-vcs/cvs[server]" && \
+			let cvs=$cvs+1
+		if [[ $cvs -lt 3 ]]; then
+			einfo "Disabling CVS tests (needs dev-vcs/cvs[USE=server])"
+			disabled="${disabled} ${tests_cvs}"
+		fi
+	fi
+
+	if ! use perl ; then
+		einfo "Disabling tests that need Perl"
+		disabled="${disabled} ${tests_perl}"
+	fi
+
+	einfo "Disabling tests that fail with SVN 1.7"
+	disabled="${disabled} ${test_svn}"
+
+	# Reset all previously disabled tests
+	cd "${S}/t"
+	for i in *.sh.DISABLED ; do
+		[[ -f "${i}" ]] && mv -f "${i}" "${i%.DISABLED}"
+	done
+	einfo "Disabled tests:"
+	for i in ${disabled} ; do
+		[[ -f "${i}" ]] && mv -f "${i}" "${i}.DISABLED" && einfo "Disabled $i"
+	done
+
+	# Avoid the test system removing the results because we want them ourselves
+	sed -e '/^[[:space:]]*$(MAKE) clean/s,^,#,g' \
+		-i "${S}"/t/Makefile
+
+	# Clean old results first, must always run
+	cd "${S}/t"
+	nonfatal git_emake clean
+
+	# Now run the tests, keep going if we hit an error, and don't terminate on
+	# failure
+	cd "${S}"
+	einfo "Start test run"
+	#MAKEOPTS=-j1
+	nonfatal git_emake --keep-going test
+	rc=$?
+
+	# Display nice results, now print the results
+	cd "${S}/t"
+	nonfatal git_emake aggregate-results
+
+	# And bail if there was a problem
+	[ $rc -eq 0 ] || die "tests failed. Please file a bug."
+}
+
+showpkgdeps() {
+	local pkg=$1
+	shift
+	elog "  $(printf "%-17s:" ${pkg}) ${@}"
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+	einfo "Please read /usr/share/bash-completion/git for Git bash command completion"
+	einfo "Please read /usr/share/git/git-prompt.sh for Git bash prompt"
+	einfo "Note that the prompt bash code is now in that separate script"
+	elog "These additional scripts need some dependencies:"
+	echo
+	showpkgdeps git-quiltimport "dev-util/quilt"
+	showpkgdeps git-instaweb \
+		"|| ( www-servers/lighttpd www-servers/apache www-servers/nginx )"
+	echo
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/dev-vcs/gitg/gitg-3.16.1.ebuild b/dev-vcs/gitg/gitg-3.16.1.ebuild
index e677b579ba55..7331b4fcbcd8 100644
--- a/dev-vcs/gitg/gitg-3.16.1.ebuild
+++ b/dev-vcs/gitg/gitg-3.16.1.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Gitg"
 
 LICENSE="|| ( GPL-2 GPL-3 )"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug glade +python"
 
 REQUIRED_USE="python? ( ^^ ( $(python_gen_useflags '*') ) )"
diff --git a/dev-vcs/gitinspector/metadata.xml b/dev-vcs/gitinspector/metadata.xml
index 4a00a64b40ae..d2c36602f3e1 100644
--- a/dev-vcs/gitinspector/metadata.xml
+++ b/dev-vcs/gitinspector/metadata.xml
@@ -4,4 +4,7 @@
   <maintainer>
     <email>jlec@gentoo.org</email>
   </maintainer>
+  <upstream>
+    <remote-id type="github">ejwa/gitinspector</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-vcs/rcs/rcs-5.9.3.ebuild b/dev-vcs/rcs/rcs-5.9.3.ebuild
index 3b9c89749b14..f4bde4f5bc4a 100644
--- a/dev-vcs/rcs/rcs-5.9.3.ebuild
+++ b/dev-vcs/rcs/rcs-5.9.3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/rcs/${P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
 IUSE="doc"
 
 RDEPEND="
diff --git a/dev-vcs/subversion/subversion-1.7.21.ebuild b/dev-vcs/subversion/subversion-1.7.21.ebuild
index a8c674410f28..ba2ec73f2b12 100644
--- a/dev-vcs/subversion/subversion-1.7.21.ebuild
+++ b/dev-vcs/subversion/subversion-1.7.21.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="Subversion GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="apache2 berkdb ctypes-python debug doc +dso extras gnome-keyring java kde nls perl python ruby sasl test vim-syntax +webdav-neon webdav-serf"
 
 COMMON_DEPEND=">=dev-db/sqlite-3.6.18[threadsafe(+)]
diff --git a/dev-vcs/subversion/subversion-1.8.14.ebuild b/dev-vcs/subversion/subversion-1.8.14.ebuild
index c266a3567830..c3fb52a4c946 100644
--- a/dev-vcs/subversion/subversion-1.8.14.ebuild
+++ b/dev-vcs/subversion/subversion-1.8.14.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="Subversion GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="apache2 berkdb ctypes-python debug doc +dso extras gnome-keyring +http java kde nls perl python ruby sasl test vim-syntax"
 
 COMMON_DEPEND=">=dev-db/sqlite-3.7.12
diff --git a/eclass/fcaps.eclass b/eclass/fcaps.eclass
index 046043c031e7..b203a913ffb3 100644
--- a/eclass/fcaps.eclass
+++ b/eclass/fcaps.eclass
@@ -162,6 +162,9 @@ fcaps() {
 						: $(( ++notfound ))
 						continue
 						;;
+					# ENOTSUP and EOPNOTSUPP might be the same value which means
+					# strerror() on them is unstable -- we can get both. #559608
+					*"Not supported"*|\
 					*"Operation not supported"*)
 						local fstype=$(stat -f -c %T "${file}")
 						ewarn "Could not set caps on '${file}' due to missing filesystem support:"
diff --git a/eclass/java-utils-2.eclass b/eclass/java-utils-2.eclass
index 0a1a8a38b470..6e333118f5bb 100644
--- a/eclass/java-utils-2.eclass
+++ b/eclass/java-utils-2.eclass
@@ -2203,7 +2203,7 @@ java-pkg_init-compiler_() {
 
 		if has ${compiler} ${JAVA_PKG_FILTER_COMPILER}; then
 			if [[ -z ${JAVA_PKG_FORCE_COMPILER} ]]; then
-				einfo "Filtering ${compiler}"
+				einfo "Filtering ${compiler}" >&2
 				continue
 			fi
 		fi
@@ -2243,10 +2243,10 @@ java-pkg_init-compiler_() {
 	# If it hasn't been defined already, default to javac
 	if [[ -z ${GENTOO_COMPILER} ]]; then
 		if [[ -n ${compilers} ]]; then
-			einfo "No suitable compiler found: defaulting to JDK default for compilation"
+			einfo "No suitable compiler found: defaulting to JDK default for compilation" >&2
 		else
 			# probably don't need to notify users about the default.
-			:;#einfo "Defaulting to javac for compilation"
+			:;#einfo "Defaulting to javac for compilation" >&2
 		fi
 		if java-config -g GENTOO_COMPILER 2> /dev/null; then
 			export GENTOO_COMPILER=$(java-config -g GENTOO_COMPILER)
@@ -2254,7 +2254,7 @@ java-pkg_init-compiler_() {
 			export GENTOO_COMPILER=javac
 		fi
 	else
-		einfo "Using ${GENTOO_COMPILER} for compilation"
+		einfo "Using ${GENTOO_COMPILER} for compilation" >&2
 	fi
 
 }
diff --git a/eclass/kde4-base.eclass b/eclass/kde4-base.eclass
index e9dfef81ac50..1e0ff2e854e5 100644
--- a/eclass/kde4-base.eclass
+++ b/eclass/kde4-base.eclass
@@ -168,7 +168,7 @@ fi
 # Setup packages inheriting this eclass
 case ${KDEBASE} in
 	kde-base)
-		HOMEPAGE="http://www.kde.org/"
+		HOMEPAGE="https://www.kde.org/"
 		LICENSE="GPL-2"
 		if [[ ${KDE_BUILD_TYPE} = live && -z ${I_KNOW_WHAT_I_AM_DOING} ]]; then
 			# Disable tests for live ebuilds by default
@@ -185,7 +185,7 @@ case ${KDEBASE} in
 		esac
 		;;
 	kdevelop)
-		HOMEPAGE="http://www.kdevelop.org/"
+		HOMEPAGE="https://www.kdevelop.org/"
 		LICENSE="GPL-2"
 		;;
 esac
diff --git a/eclass/kde4-meta-pkg.eclass b/eclass/kde4-meta-pkg.eclass
index 7b735c905e9e..d9c0b2d733d3 100644
--- a/eclass/kde4-meta-pkg.eclass
+++ b/eclass/kde4-meta-pkg.eclass
@@ -14,7 +14,7 @@ _KDE4_META_PKG_ECLASS=1
 
 inherit kde4-functions
 
-HOMEPAGE="http://www.kde.org/"
+HOMEPAGE="https://www.kde.org/"
 
 LICENSE="metapackage"
 IUSE="aqua"
diff --git a/eclass/kde5-meta-pkg.eclass b/eclass/kde5-meta-pkg.eclass
index 8134db3e41ae..e1abba588d3a 100644
--- a/eclass/kde5-meta-pkg.eclass
+++ b/eclass/kde5-meta-pkg.eclass
@@ -14,8 +14,10 @@ _KDE5_META_PKG_ECLASS=1
 
 inherit kde5-functions
 
-HOMEPAGE="http://www.kde.org/"
+HOMEPAGE="https://www.kde.org/"
 LICENSE="metapackage"
 SLOT="5"
 
+RDEPEND+=" !kde-apps/${PN}:4"
+
 fi
diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 2e8f5c46c21b..23e31275b150 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -107,9 +107,9 @@ fi
 : ${KDE_SELINUX_MODULE:=none}
 
 if [[ ${KDEBASE} = kdevelop ]]; then
-	HOMEPAGE="http://www.kdevelop.org/"
+	HOMEPAGE="https://www.kdevelop.org/"
 else
-	HOMEPAGE="http://www.kde.org/"
+	HOMEPAGE="https://www.kde.org/"
 fi
 
 LICENSE="GPL-2"
@@ -139,9 +139,10 @@ case ${KDE_AUTODEPS} in
 		RDEPEND+=" >=kde-frameworks/kf-env-3"
 		COMMONDEPEND+="	>=dev-qt/qtcore-${QT_MINIMAL}:5"
 
-		if [[ ${CATEGORY} = kde-plasma && ${PN} != polkit-kde-agent ]]; then
+		if [[ ${CATEGORY} = kde-frameworks || ${CATEGORY} = kde-plasma && ${PN} != polkit-kde-agent ]]; then
 			RDEPEND+="
 				!kde-apps/kde4-l10n[-minimal(-)]
+				!<kde-apps/kde4-l10n-15.08.0-r1
 			"
 		fi
 
diff --git a/games-action/minetest/Manifest b/games-action/minetest/Manifest
index e05f300fa627..0b610c59d590 100644
--- a/games-action/minetest/Manifest
+++ b/games-action/minetest/Manifest
@@ -1 +1,2 @@
 DIST minetest-0.4.10.tar.gz 5291236 SHA256 05d15c8e2c8e53ee9d3006e79c2b59200311a7b879220d8b6f6a6fd2acf806b6 SHA512 0d2f2590df530df9bed11a08a3e67dfa39dae1987b8c1f6a4f4f2ace2c40dea3b5afce445e3b2e17b2bd8a426bdd53d717989018f5da531b1eb10965d953c3bf WHIRLPOOL 016c2bc6f9aed44943f238491c445f48013f76a74f9c09e56c1e70e03fa3ded72b042b9dffa0bed81a9dcdc84358a9be88bbf32119dd45a1e2a9873031be1009
+DIST minetest-0.4.13.tar.gz 8366306 SHA256 40bafab13e20e7a550ceaa25ef82dd7b4b8188ee8e8080e1ae9295b82603d5e1 SHA512 e2228f540d3b982515de85635a84e5f157894b5eb1c654da76e1f69e398c69ff0d4d569a5035146b5c80130e9353e020c86c6acc20813075cfd7c9e5c2df2652 WHIRLPOOL 4048db2da06cfb161b794359e4a24573c51553ec98a022295d8de4623c64ac9d235d4cf8ec7a842bdafc91aa147d244ed4aed3991064b5dcb42932fafa42da7b
diff --git a/games-action/minetest/metadata.xml b/games-action/minetest/metadata.xml
index e8a8611674de..2d7fb9c4eb1b 100644
--- a/games-action/minetest/metadata.xml
+++ b/games-action/minetest/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
 	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>maddin081591@gmail.com</email>
@@ -45,6 +44,8 @@
 		<flag name="redis">Enable redis backend via
 			<pkg>dev-libs/hiredis</pkg>
 		</flag>
+		<flag name="spatial">Enable SpatialIndex AreaStore backend
+		</flag>
 		<flag name="server">Build minetest server</flag>
 	</use>
 	<upstream>
diff --git a/games-action/minetest/minetest-0.4.13.ebuild b/games-action/minetest/minetest-0.4.13.ebuild
new file mode 100644
index 000000000000..469a61ab9a76
--- /dev/null
+++ b/games-action/minetest/minetest-0.4.13.ebuild
@@ -0,0 +1,136 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit cmake-utils eutils gnome2-utils user vcs-snapshot
+
+DESCRIPTION="An InfiniMiner/Minecraft inspired game"
+HOMEPAGE="http://minetest.net/"
+SRC_URI="http://github.com/minetest/minetest/tarball/${PV} -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1+ CC-BY-SA-3.0 OFL-1.1 Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+curl dedicated doc leveldb luajit nls redis +server +sound spatial +truetype"
+
+RDEPEND="dev-db/sqlite:3
+	sys-libs/zlib
+	curl? ( net-misc/curl )
+	!dedicated? (
+		app-arch/bzip2
+		>=dev-games/irrlicht-1.8-r2
+		dev-libs/gmp:0
+		media-libs/libpng:0
+		virtual/jpeg:0
+		virtual/opengl
+		x11-libs/libX11
+		x11-libs/libXxf86vm
+		sound? (
+			media-libs/libogg
+			media-libs/libvorbis
+			media-libs/openal
+		)
+		truetype? ( media-libs/freetype:2 )
+	)
+	leveldb? ( dev-libs/leveldb )
+	luajit? ( dev-lang/luajit:2 )
+	nls? ( virtual/libintl )
+	redis? ( dev-libs/hiredis )
+	spatial? ( sci-libs/libspatialindex )"
+DEPEND="${RDEPEND}
+	>=dev-games/irrlicht-1.8-r2
+	doc? ( app-doc/doxygen media-gfx/graphviz )
+	nls? ( sys-devel/gettext )"
+
+pkg_setup() {
+	if use server || use dedicated ; then
+		enewgroup ${PN}
+		enewuser ${PN} -1 -1 /var/lib/${PN} ${PN}
+	fi
+}
+
+src_prepare() {
+	# set paths
+	sed \
+		-e "s#@BINDIR@#/usr/bin#g" \
+		-e "s#@GROUP@#${PN}#g" \
+		"${FILESDIR}"/minetestserver.confd > "${T}"/minetestserver.confd || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		$(usex dedicated "-DBUILD_SERVER=ON -DBUILD_CLIENT=OFF" "$(cmake-utils_use_build server SERVER) -DBUILD_CLIENT=ON")
+		-DCUSTOM_BINDIR="/usr/bin"
+		-DCUSTOM_DOCDIR="/usr/share/doc/${PF}"
+		-DCUSTOM_LOCALEDIR="/usr/share/${PN}/locale"
+		-DCUSTOM_SHAREDIR="/usr/share/${PN}"
+		-DCUSTOM_EXAMPLE_CONF_DIR="/usr/share/doc/${PF}"
+		-DENABLE_CURL=$(usex curl)
+		$(cmake-utils_use_enable truetype FREETYPE)
+		$(cmake-utils_use_enable nls GETTEXT)
+		-DENABLE_GLES=0
+		$(cmake-utils_use_enable leveldb LEVELDB)
+		$(cmake-utils_use_enable redis REDIS)
+		-DENABLE_SPATIAL=$(usex spatial)
+		$(cmake-utils_use_enable sound SOUND)
+		$(cmake-utils_use luajit ENABLE_LUAJIT)
+		-DRUN_IN_PLACE=0
+	)
+
+	use dedicated && mycmakeargs+=(
+		-DIRRLICHT_SOURCE_DIR=/the/irrlicht/source
+		-DIRRLICHT_INCLUDE_DIR=/usr/include/irrlicht
+	)
+
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+
+	if use doc ; then
+		cmake-utils_src_compile doc
+	fi
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	if use server || use dedicated ; then
+		newinitd "${FILESDIR}"/minetestserver.initd minetest-server
+		newconfd "${T}"/minetestserver.confd minetest-server
+	fi
+
+	if use doc ; then
+		cd "${CMAKE_BUILD_DIR}"/doc || die
+		dodoc -r html
+	fi
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+
+	if ! use dedicated ; then
+		elog
+		elog "optional dependencies:"
+		elog "	games-action/minetest_game (official mod)"
+		elog
+	fi
+
+	if use server || use dedicated ; then
+		elog
+		elog "Configure your server via /etc/conf.d/minetest-server"
+		elog "The user \"minetest\" is created with /var/lib/${PN} homedir."
+		elog "Default logfile is ~/minetest-server.log"
+		elog
+	fi
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/games-action/minetest_game/Manifest b/games-action/minetest_game/Manifest
index b3c4045cc260..9c1990da44b7 100644
--- a/games-action/minetest_game/Manifest
+++ b/games-action/minetest_game/Manifest
@@ -1 +1,2 @@
 DIST minetest_game-0.4.10.tar.gz 901448 SHA256 7624a1e64124c4438256719ccecfc44fe5139733a076394aedad1f785e50019f SHA512 eaff1fbee4e46811649293534ed2e496f40451bd1cc6527feb66da6d916ad31233b561ddae9bf631b41730ae04a17fe67c3f74ca95e527ca8eb6f45fe5dc0c86 WHIRLPOOL c9cc5b321eb6bbf7f60894f28f84d5ace5b17db34b696f0afe978bd19ee4e9b5b7202775d00b597661ec038fcc6160c0f27aa03ff1a38c559e6d3f9968c82aa7
+DIST minetest_game-0.4.13.tar.gz 1371339 SHA256 13a8b474b439da326f627290b06065f7f5adff12d8462f29114ba818653ec604 SHA512 41f48e0abda47fb45750ff21128fb8249b5f2da9bd63dfa52ce438fe482725190a1161faf76c43664e38916f61615be4b9b8914efd88cd02d6ba498b2f69dd62 WHIRLPOOL 02836d6d9a2fe9b66f49983ac2caf88825808b340033cdecfcf84b2ebaee76e772604fd9537403059208fb7bf0ced6f3533356b87e0868a73a64f6d5436cacd8
diff --git a/games-action/minetest_game/metadata.xml b/games-action/minetest_game/metadata.xml
index 8c9af45126bf..6659e0aafe4b 100644
--- a/games-action/minetest_game/metadata.xml
+++ b/games-action/minetest_game/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>games</herd>
 	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>maddin081591@gmail.com</email>
diff --git a/games-action/minetest_game/minetest_game-0.4.13.ebuild b/games-action/minetest_game/minetest_game-0.4.13.ebuild
new file mode 100644
index 000000000000..b8f5fe015947
--- /dev/null
+++ b/games-action/minetest_game/minetest_game-0.4.13.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit vcs-snapshot
+
+DESCRIPTION="The main game for the Minetest game engine"
+HOMEPAGE="http://github.com/minetest/minetest_game"
+SRC_URI="http://github.com/minetest/minetest_game/tarball/${PV} -> ${P}.tar.gz"
+
+LICENSE="GPL-2 CC-BY-SA-3.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=games-action/minetest-${PV}"
+
+src_install() {
+	insinto /usr/share/minetest/games/${PN}
+	doins -r mods menu
+	doins game.conf minetest.conf
+
+	dodoc README.txt game_api.txt
+}
diff --git a/games-arcade/gnome-nibbles/gnome-nibbles-3.16.1.ebuild b/games-arcade/gnome-nibbles/gnome-nibbles-3.16.1.ebuild
index c1e031fadedf..92f0904f1611 100644
--- a/games-arcade/gnome-nibbles/gnome-nibbles-3.16.1.ebuild
+++ b/games-arcade/gnome-nibbles/gnome-nibbles-3.16.1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Nibbles"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/games-arcade/gnome-robots/gnome-robots-3.16.1.ebuild b/games-arcade/gnome-robots/gnome-robots-3.16.1.ebuild
index 4531af901fe9..ce5433864266 100644
--- a/games-arcade/gnome-robots/gnome-robots-3.16.1.ebuild
+++ b/games-arcade/gnome-robots/gnome-robots-3.16.1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Robots"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/games-arcade/opentyrian/metadata.xml b/games-arcade/opentyrian/metadata.xml
index 1dceee43bf7c..b71c7c96095b 100644
--- a/games-arcade/opentyrian/metadata.xml
+++ b/games-arcade/opentyrian/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-  <email>chainsaw@gentoo.org</email>
-  <name>Tony Vroon</name>
-</maintainer>
-<herd>games</herd>
+  <maintainer>
+    <email>chainsaw@gentoo.org</email>
+    <name>Tony Vroon</name>
+  </maintainer>
+  <herd>games</herd>
+  <upstream>
+    <remote-id type="bitbucket">opentyrian/opentyrian</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/games-board/four-in-a-row/four-in-a-row-3.16.2.ebuild b/games-board/four-in-a-row/four-in-a-row-3.16.2.ebuild
index 115c3c7ee445..6ca9645387b9 100644
--- a/games-board/four-in-a-row/four-in-a-row-3.16.2.ebuild
+++ b/games-board/four-in-a-row/four-in-a-row-3.16.2.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Four-in-a-row"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/games-board/gnome-chess/gnome-chess-3.16.2.ebuild b/games-board/gnome-chess/gnome-chess-3.16.2.ebuild
index 3a207474dbc0..23e686927558 100644
--- a/games-board/gnome-chess/gnome-chess-3.16.2.ebuild
+++ b/games-board/gnome-chess/gnome-chess-3.16.2.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Chess"
 
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/games-board/gnome-mahjongg/gnome-mahjongg-3.16.1.ebuild b/games-board/gnome-mahjongg/gnome-mahjongg-3.16.1.ebuild
index 83764b827d69..f297072c2ddc 100644
--- a/games-board/gnome-mahjongg/gnome-mahjongg-3.16.1.ebuild
+++ b/games-board/gnome-mahjongg/gnome-mahjongg-3.16.1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Mahjongg"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/games-board/gnome-mines/gnome-mines-3.16.1.ebuild b/games-board/gnome-mines/gnome-mines-3.16.1.ebuild
index adab7c3da0a2..147a54be19fc 100644
--- a/games-board/gnome-mines/gnome-mines-3.16.1.ebuild
+++ b/games-board/gnome-mines/gnome-mines-3.16.1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Mines"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm ~x86"
 IUSE=""
 
 COMMON_DEPEND="
diff --git a/games-board/iagno/iagno-3.16.1.ebuild b/games-board/iagno/iagno-3.16.1.ebuild
index df514b4bedf6..bc814400a87c 100644
--- a/games-board/iagno/iagno-3.16.1.ebuild
+++ b/games-board/iagno/iagno-3.16.1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Iagno"
 
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm ~x86"
 IUSE=""
 
 COMMON_DEPEND="
diff --git a/games-board/tali/tali-3.16.1.ebuild b/games-board/tali/tali-3.16.1.ebuild
index a506ced19196..8b9394f02f67 100644
--- a/games-board/tali/tali-3.16.1.ebuild
+++ b/games-board/tali/tali-3.16.1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Tali"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/games-emulation/zsnes/files/zsnes-1.51-arch.patch b/games-emulation/zsnes/files/zsnes-1.51-arch.patch
new file mode 100644
index 000000000000..2c8b690587be
--- /dev/null
+++ b/games-emulation/zsnes/files/zsnes-1.51-arch.patch
@@ -0,0 +1,77 @@
+--- configure.in.orig
++++ configure.in
+@@ -233,72 +233,8 @@
+   debug=no)
+ AC_MSG_CHECKING(if you want gdb friendly executable)
+ AC_MSG_RESULT($debug)
+-if test x$debug = xyes; then
+-dnl - It is easier to debug zsnes with no optimization enabled.
+-  ZSNESEXE="zsnesd"
+-  PSR_TEMP=""
+-  CFLAGS="$CFLAGS -Wall -W -DDEBUG -O0 -fno-omit-frame-pointer -gstabs3"
+-  NFLAGS="$NFLAGS -DDEBUG -g -F stabs -s -O0"
+-else
+-  ZSNESEXE="zsnes"
+-  PSR_TEMP="	rm -f t_\$*.c"
+-
+-  CFLAGSBAK="$CFLAGS"
+-  AC_ARG_VAR(force_arch, [Force architecture to optimize GCC/G++ for])
+-  AC_MSG_CHECKING(which cpu architecture to optimize for)
+-  if test x$force_arch != x; then
+-    CFLAGS="$CFLAGS -march=$force_arch"
+-    AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]])],
+-    [AC_MSG_RESULT(forcing $force_arch)],
+-    [AC_MSG_RESULT($force_arch ??)
+-    AC_MSG_WARN(incorrect force_arch parameter)
+-    force_arch=""
+-    CFLAGS="$CFLAGSBAK"
+-    AC_MSG_CHECKING(for autodetected architecture)])
+-  else
+-    if test x$ARCH_INFO = x; then
+-      case x$target in
+-        i686-*-*)
+-          AC_MSG_RESULT(guessing i686)
+-          CFLAGS="$CFLAGS -march=i686"
+-          ;;
+-        i586-*-*)
+-          AC_MSG_RESULT(guessing i586)
+-          CFLAGS="$CFLAGS -march=i586"
+-          ;;
+-        i486-*-*)
+-          AC_MSG_RESULT(guessing i486)
+-          CFLAGS="$CFLAGS -march=i486"
+-          ;;
+-        *)
+-          AC_MSG_RESULT(guessing i386)
+-          CFLAGS="$CFLAGS -march=i386"
+-          AC_MSG_WARN([This is not what you want, use --target or force-arch])
+-          ;;
+-      esac
+-    else
+-      AC_MSG_RESULT($ARCH_INFO)
+-      CFLAGS="$CFLAGS -march=$ARCH_INFO"
+-    fi
+-  fi
+-
+-  AC_ARG_ENABLE(release,
+-    [  --enable-release        Build ultra-optimized release binary (zsnes)],
+-    release=$enableval,
+-    release=no)
+-  AC_MSG_CHECKING(if you want crazy optimizations)
+-  AC_MSG_RESULT($release)
+-  if test x$release = xyes; then
+-    if test x$force_arch = x; then
+-      AC_MSG_WARN([If you intend to distribute this binary, make sure you use force_arch and set to i586 (or whichever CPU Arch you intend for)])
+-    fi
+-    CFLAGS="$CFLAGS -O3 -fomit-frame-pointer -fprefetch-loop-arrays -fforce-addr $STRIP -D__RELEASE__"
+-    NFLAGS="$NFLAGS -O99999999 -D__RELEASE__"
+-  else
+-    CFLAGS="$CFLAGS -O3 -fomit-frame-pointer $STRIP"
+-    NFLAGS="$NFLAGS -O1"
+-  fi
+-fi
++ZSNESEXE="zsnes"
++PSR_TEMP="	rm -f t_\$*.c"
+ CXXFLAGS="$CFLAGS -fno-rtti"
+ 
+ if test x$enable_jma != xno; then
diff --git a/games-emulation/zsnes/files/zsnes-1.51-stack-align.patch b/games-emulation/zsnes/files/zsnes-1.51-stack-align.patch
index e509e0107763..32136643caec 100644
--- a/games-emulation/zsnes/files/zsnes-1.51-stack-align.patch
+++ b/games-emulation/zsnes/files/zsnes-1.51-stack-align.patch
@@ -1,5 +1,5 @@
---- zsnes_1_51/src/linux/sdllink.c.old	2014-03-01 04:01:30.351323580 -0500
-+++ zsnes_1_51/src/linux/sdllink.c	2014-03-01 04:02:12.249702898 -0500
+--- zsnes_1_51/src/linux/sdllink.c.old
++++ zsnes_1_51/src/linux/sdllink.c
 @@ -773,11 +773,11 @@ BOOL InitInput()
  {
    InitJoystickInput();
diff --git a/games-emulation/zsnes/zsnes-1.51-r4.ebuild b/games-emulation/zsnes/zsnes-1.51-r4.ebuild
index 0fedbe9ca3ab..4d26e639d474 100644
--- a/games-emulation/zsnes/zsnes-1.51-r4.ebuild
+++ b/games-emulation/zsnes/zsnes-1.51-r4.ebuild
@@ -18,7 +18,7 @@ RDEPEND="
 	media-libs/libsdl[sound,video,abi_x86_32(-)]
 	>=sys-libs/zlib-1.2.3-r1[abi_x86_32(-)]
 	ao? ( media-libs/libao[abi_x86_32(-)] )
-	debug? ( sys-libs/ncurses[abi_x86_32(-)] )
+	debug? ( sys-libs/ncurses:0[abi_x86_32(-)] )
 	opengl? ( virtual/opengl[abi_x86_32(-)] )
 	png? ( media-libs/libpng:0[abi_x86_32(-)] )"
 DEPEND="${RDEPEND}
@@ -49,7 +49,8 @@ src_prepare() {
 		"${FILESDIR}"/${P}-buffer.patch \
 		"${FILESDIR}"/${P}-gcc47.patch \
 		"${FILESDIR}"/${P}-stack-align.patch \
-		"${FILESDIR}"/${P}-cross-compile.patch
+		"${FILESDIR}"/${P}-cross-compile.patch \
+		"${FILESDIR}"/${P}-arch.patch
 
 	# The sdl detection logic uses AC_PROG_PATH instead of
 	# AC_PROG_TOOL, so force the var to get set the way we
@@ -76,6 +77,7 @@ src_prepare() {
 src_configure() {
 	tc-export CC
 	export BUILD_CXX=$(tc-getBUILD_CXX)
+	export NFLAGS=-O1
 	use amd64 && multilib_toolchain_setup x86
 	use custom-cflags || strip-flags
 
@@ -87,9 +89,7 @@ src_configure() {
 		$(use_enable png libpng) \
 		$(use_enable opengl) \
 		--disable-debug \
-		--disable-cpucheck \
-		--enable-release \
-		force_arch=no
+		--disable-cpucheck
 }
 
 src_compile() {
diff --git a/games-engines/openmw/openmw-0.36.1.ebuild b/games-engines/openmw/openmw-0.36.1.ebuild
index 9e5fbd7dc4c5..986db819390a 100644
--- a/games-engines/openmw/openmw-0.36.1.ebuild
+++ b/games-engines/openmw/openmw-0.36.1.ebuild
@@ -20,6 +20,7 @@ RDEPEND="
 	app-arch/unshield
 	>=dev-games/mygui-3.2.1[ogre]
 	>=dev-games/ogre-1.9.0[-double-precision,freeimage,ois,opengl,zip]
+	media-libs/freeimage[jpeg,png]
 	>=dev-libs/boost-1.46.0
 	dev-libs/tinyxml
 	>=dev-qt/qtcore-4.7.0:4
diff --git a/games-puzzle/five-or-more/five-or-more-3.16.1.ebuild b/games-puzzle/five-or-more/five-or-more-3.16.1.ebuild
index bdfb686236d8..ae3f99e4a745 100644
--- a/games-puzzle/five-or-more/five-or-more-3.16.1.ebuild
+++ b/games-puzzle/five-or-more/five-or-more-3.16.1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Five%20or%20more"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm ~x86"
 IUSE=""
 
 COMMON_DEPEND="
diff --git a/games-puzzle/gnome-klotski/gnome-klotski-3.16.1.ebuild b/games-puzzle/gnome-klotski/gnome-klotski-3.16.1.ebuild
index 59a0b5b46285..dbf478873464 100644
--- a/games-puzzle/gnome-klotski/gnome-klotski-3.16.1.ebuild
+++ b/games-puzzle/gnome-klotski/gnome-klotski-3.16.1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Klotski"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/games-puzzle/gnome-sudoku/gnome-sudoku-3.16.0.ebuild b/games-puzzle/gnome-sudoku/gnome-sudoku-3.16.0.ebuild
index 9e2f5c1c059b..5e1b5c1ad2f1 100644
--- a/games-puzzle/gnome-sudoku/gnome-sudoku-3.16.0.ebuild
+++ b/games-puzzle/gnome-sudoku/gnome-sudoku-3.16.0.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Sudoku"
 
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm ~x86"
 IUSE=""
 
 # fixed vala & gtk+ from gnome-3.16 branch
diff --git a/games-puzzle/gnome-taquin/gnome-taquin-3.16.1.ebuild b/games-puzzle/gnome-taquin/gnome-taquin-3.16.1.ebuild
index f3a7d62124c4..1119c5955504 100644
--- a/games-puzzle/gnome-taquin/gnome-taquin-3.16.1.ebuild
+++ b/games-puzzle/gnome-taquin/gnome-taquin-3.16.1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Taquin"
 
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/games-puzzle/gnome-tetravex/gnome-tetravex-3.16.0.ebuild b/games-puzzle/gnome-tetravex/gnome-tetravex-3.16.0.ebuild
index 1a8a1270852a..5b65ff7a0063 100644
--- a/games-puzzle/gnome-tetravex/gnome-tetravex-3.16.0.ebuild
+++ b/games-puzzle/gnome-tetravex/gnome-tetravex-3.16.0.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Tetravex"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/games-puzzle/hitori/hitori-3.16.1.ebuild b/games-puzzle/hitori/hitori-3.16.1.ebuild
index 585280676c3d..c49dee8548a5 100644
--- a/games-puzzle/hitori/hitori-3.16.1.ebuild
+++ b/games-puzzle/hitori/hitori-3.16.1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Hitori"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/games-puzzle/lightsoff/lightsoff-3.16.1.1.ebuild b/games-puzzle/lightsoff/lightsoff-3.16.1.1.ebuild
index ccda7c7158cb..51fa927df1b0 100644
--- a/games-puzzle/lightsoff/lightsoff-3.16.1.1.ebuild
+++ b/games-puzzle/lightsoff/lightsoff-3.16.1.1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Lightsoff"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/games-puzzle/quadrapassel/quadrapassel-3.16.1.ebuild b/games-puzzle/quadrapassel/quadrapassel-3.16.1.ebuild
index 788092c5d3c8..be61444993d7 100644
--- a/games-puzzle/quadrapassel/quadrapassel-3.16.1.ebuild
+++ b/games-puzzle/quadrapassel/quadrapassel-3.16.1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Quadrapassel"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/games-puzzle/swell-foop/Manifest b/games-puzzle/swell-foop/Manifest
index 80a317f56435..474c8cf12701 100644
--- a/games-puzzle/swell-foop/Manifest
+++ b/games-puzzle/swell-foop/Manifest
@@ -1,2 +1,3 @@
 DIST swell-foop-3.14.0.tar.xz 2336392 SHA256 c52e5c03da5136e47eb04ed58982e93659c7c88411c282b143fc347350ec6dca SHA512 80b9546dfe10d637ca087f912c86c82100099505f7b216c710208bdd91d4a41744147548bb92f90cade103e182cb0da86ef9edd0eef624184024550ac5024d53 WHIRLPOOL fb082bb6233d22812244bd8099fb5c7f66d91b03e11a22e3ca39debac71f9001cdab371a2294cdda9a8c8a048f7c4ec219688279981c1d8e3666a50294e1ae4d
 DIST swell-foop-3.16.1.tar.xz 2372956 SHA256 8e7f09f8c28e3232a5b6726568d1a463c1a2af89cf030d7542ab612d99ac122e SHA512 3e2e024ca302273ba8d6aac7aa1bef0679388b3c67712ed34f0b120ad8bee7670c164098ec2f2ee88a248abfb95957a4a04bb9731be0fcb628da65ebf71a3b59 WHIRLPOOL 3dc1c1c334377881729f0532bf452f0ce538c279230ba2699a42ab6d0a20b80a914766b66fd2644f7439cab3dddac953eefdcd65fe3b935fd994479c3ba412c2
+DIST swell-foop-3.16.2.tar.xz 2394508 SHA256 0f37a55c29e15678ba0fb04bebca9ddf02ad85fdf8e87a169ba2eb5d073bb790 SHA512 62036032ab938088656d14f40a8e80e3881e17ea25c93ee2dd5cb744865b7cc7e88f191226a71dd4f65b2971d25b125b948cb1b4128cce15c66ec47f764aad3d WHIRLPOOL af961982db3396b91b564bd40385c3ff6b667c3b2072c74106dd94710bce3d3ec04cee1599de3c1824a4cd6dfe454a611c8a082620e209ec8b225cb945d154c6
diff --git a/games-puzzle/swell-foop/swell-foop-3.16.2.ebuild b/games-puzzle/swell-foop/swell-foop-3.16.2.ebuild
new file mode 100644
index 000000000000..33ebd862168f
--- /dev/null
+++ b/games-puzzle/swell-foop/swell-foop-3.16.2.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+VALA_MIN_API_VERSION="0.22"
+
+inherit gnome-games vala
+
+DESCRIPTION="Clear the screen by removing groups of colored and shaped tiles"
+HOMEPAGE="https://wiki.gnome.org/Apps/Swell%20Foop"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~x86"
+IUSE=""
+
+RDEPEND="
+	>=dev-libs/glib-2.36:2
+	>=media-libs/clutter-1.14:1.0
+	>=media-libs/clutter-gtk-1.5:1.0
+	>=x11-libs/gtk+-3.12:3
+"
+DEPEND="${RDEPEND}
+	$(vala_depend)
+	app-text/yelp-tools
+	dev-libs/appstream-glib
+	>=dev-util/intltool-0.50
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	gnome-games_src_prepare
+	vala_src_prepare
+}
diff --git a/gnome-base/dconf-editor/dconf-editor-3.16.1.ebuild b/gnome-base/dconf-editor/dconf-editor-3.16.1.ebuild
index aa195b1282b6..b1898521ee1f 100644
--- a/gnome-base/dconf-editor/dconf-editor-3.16.1.ebuild
+++ b/gnome-base/dconf-editor/dconf-editor-3.16.1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/dconf"
 LICENSE="LGPL-2.1+"
 SLOT="0"
 
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~arm-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~arm-linux ~x86-linux"
 
 COMMON_DEPEND="
 	>=dev-libs/glib-2.39.3:2
diff --git a/gnome-base/dconf/dconf-0.24.0.ebuild b/gnome-base/dconf/dconf-0.24.0.ebuild
index ace839397a04..fe4fa3bf3a55 100644
--- a/gnome-base/dconf/dconf-0.24.0.ebuild
+++ b/gnome-base/dconf/dconf-0.24.0.ebuild
@@ -16,7 +16,7 @@ SLOT="0"
 # TODO: coverage ?
 IUSE="test"
 
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~arm-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~arm-linux ~x86-linux"
 
 RDEPEND="
 	>=dev-libs/glib-2.39.1:2
diff --git a/gnome-base/gdm/gdm-3.16.2.ebuild b/gnome-base/gdm/gdm-3.16.2.ebuild
index 63bc860fa8c6..c4f19462bd4a 100644
--- a/gnome-base/gdm/gdm-3.16.2.ebuild
+++ b/gnome-base/gdm/gdm-3.16.2.ebuild
@@ -25,7 +25,7 @@ SLOT="0"
 IUSE="accessibility audit branding fprint +introspection ipv6 plymouth selinux smartcard +systemd tcpd test wayland xinerama"
 REQUIRED_USE="wayland? ( systemd )"
 
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
 
 # NOTE: x11-base/xorg-server dep is for X_SERVER_PATH etc, bug #295686
 # nspr used by smartcard extension
diff --git a/gnome-base/gnome-control-center/gnome-control-center-3.16.3.ebuild b/gnome-base/gnome-control-center/gnome-control-center-3.16.3.ebuild
index 901a4c5ad85d..688a25c54e1f 100644
--- a/gnome-base/gnome-control-center/gnome-control-center-3.16.3.ebuild
+++ b/gnome-base/gnome-control-center/gnome-control-center-3.16.3.ebuild
@@ -16,7 +16,7 @@ SRC_URI="${SRC_URI} https://dev.gentoo.org/~tetromino/distfiles/${PN}/${PN}-3.16
 LICENSE="GPL-2+"
 SLOT="2"
 IUSE="+bluetooth +colord +cups +gnome-online-accounts +i18n input_devices_wacom kerberos networkmanager v4l wayland"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
 
 # False positives caused by nested configure scripts
 QA_CONFIGURE_OPTIONS=".*"
diff --git a/gnome-base/gnome-core-apps/gnome-core-apps-3.16.0.ebuild b/gnome-base/gnome-core-apps/gnome-core-apps-3.16.0.ebuild
index 1843269ee0e0..d0d0d9717caa 100644
--- a/gnome-base/gnome-core-apps/gnome-core-apps-3.16.0.ebuild
+++ b/gnome-base/gnome-core-apps/gnome-core-apps-3.16.0.ebuild
@@ -12,7 +12,7 @@ IUSE="+bluetooth +cdr cups"
 
 # when unmasking for an arch
 # double check none of the deps are still masked !
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86"
 
 # Note to developers:
 # This is a wrapper for the core apps tightly integrated with GNOME 3
diff --git a/gnome-base/gnome-core-libs/gnome-core-libs-3.16.0.ebuild b/gnome-base/gnome-core-libs/gnome-core-libs-3.16.0.ebuild
index 979cfdbdcf4a..3e9fd3dd204d 100644
--- a/gnome-base/gnome-core-libs/gnome-core-libs-3.16.0.ebuild
+++ b/gnome-base/gnome-core-libs/gnome-core-libs-3.16.0.ebuild
@@ -12,7 +12,7 @@ IUSE="cups python"
 
 # when unmasking for an arch
 # double check none of the deps are still masked !
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 
 # Note to developers:
 # This is a wrapper for the core libraries used by GNOME 3
diff --git a/gnome-base/gnome-desktop/gnome-desktop-3.16.2.ebuild b/gnome-base/gnome-desktop/gnome-desktop-3.16.2.ebuild
index 1ce011cb4a5b..45c5584c1621 100644
--- a/gnome-base/gnome-desktop/gnome-desktop-3.16.2.ebuild
+++ b/gnome-base/gnome-desktop/gnome-desktop-3.16.2.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://git.gnome.org/browse/gnome-desktop"
 LICENSE="GPL-2+ FDL-1.1+ LGPL-2+"
 SLOT="3/10" # subslot = libgnome-desktop-3 soname version
 IUSE="+introspection"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~x86-solaris"
 
 # cairo[X] needed for gnome-bg
 COMMON_DEPEND="
diff --git a/gnome-base/gnome-extra-apps/gnome-extra-apps-3.16.0.ebuild b/gnome-base/gnome-extra-apps/gnome-extra-apps-3.16.0.ebuild
index 6726e3518377..b86a27af3bfd 100644
--- a/gnome-base/gnome-extra-apps/gnome-extra-apps-3.16.0.ebuild
+++ b/gnome-base/gnome-extra-apps/gnome-extra-apps-3.16.0.ebuild
@@ -12,7 +12,7 @@ IUSE="+games +share +shotwell +tracker"
 
 # when unmasking for an arch
 # double check none of the deps are still masked !
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 # Note to developers:
 # This is a wrapper for the extra apps integrated with GNOME 3
diff --git a/gnome-base/gnome-keyring/gnome-keyring-3.16.0-r1.ebuild b/gnome-base/gnome-keyring/gnome-keyring-3.16.0-r1.ebuild
index 856f9f2838b8..678b58c0cd4d 100644
--- a/gnome-base/gnome-keyring/gnome-keyring-3.16.0-r1.ebuild
+++ b/gnome-base/gnome-keyring/gnome-keyring-3.16.0-r1.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/GnomeKeyring"
 LICENSE="GPL-2+ LGPL-2+"
 SLOT="0"
 IUSE="+caps debug pam selinux +ssh-agent test"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x86-solaris"
 
 # Replace gkd gpg-agent with pinentry[gnome-keyring] one, bug #547456
 COMMON_DEPEND="
diff --git a/gnome-base/gnome-light/gnome-light-3.16.0.ebuild b/gnome-base/gnome-light/gnome-light-3.16.0.ebuild
index bea2bafc4db6..ab12fc949470 100644
--- a/gnome-base/gnome-light/gnome-light-3.16.0.ebuild
+++ b/gnome-base/gnome-light/gnome-light-3.16.0.ebuild
@@ -12,7 +12,7 @@ IUSE="cups +gnome-shell"
 
 # when unmasking for an arch
 # double check none of the deps are still masked !
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 
 # XXX: Note to developers:
 # This is a wrapper for the 'light' GNOME 3 desktop, and should only consist of
diff --git a/gnome-base/gnome-session/gnome-session-3.16.0.ebuild b/gnome-base/gnome-session/gnome-session-3.16.0.ebuild
index 4de1d8aa8e32..727b586df965 100644
--- a/gnome-base/gnome-session/gnome-session-3.16.0.ebuild
+++ b/gnome-base/gnome-session/gnome-session-3.16.0.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://git.gnome.org/browse/gnome-session"
 
 LICENSE="GPL-2 LGPL-2 FDL-1.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="doc elibc_FreeBSD gconf ipv6 systemd"
 
 # x11-misc/xdg-user-dirs{,-gtk} are needed to create the various XDG_*_DIRs, and
diff --git a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.16.3.ebuild b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.16.3.ebuild
index 934e8d731e92..a2f60834a894 100644
--- a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.16.3.ebuild
+++ b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.16.3.ebuild
@@ -20,7 +20,7 @@ REQUIRED_USE="
 	smartcard? ( udev )
 	test? ( ${PYTHON_REQUIRED_USE} )
 "
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
 
 COMMON_DEPEND="
 	>=dev-libs/glib-2.37.7:2[dbus]
diff --git a/gnome-base/gnome-shell/gnome-shell-3.16.3.ebuild b/gnome-base/gnome-shell/gnome-shell-3.16.3.ebuild
index 0926956448bf..3744c777a9a8 100644
--- a/gnome-base/gnome-shell/gnome-shell-3.16.3.ebuild
+++ b/gnome-base/gnome-shell/gnome-shell-3.16.3.ebuild
@@ -16,7 +16,7 @@ LICENSE="GPL-2+ LGPL-2+"
 SLOT="0"
 IUSE="+bluetooth +i18n +networkmanager -openrc-force"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 
 # libXfixes-5.0 needed for pointer barriers
 # FIXME:
diff --git a/gnome-base/gnome-vfs/gnome-vfs-2.24.4-r3.ebuild b/gnome-base/gnome-vfs/gnome-vfs-2.24.4-r3.ebuild
new file mode 100644
index 000000000000..32fddc096004
--- /dev/null
+++ b/gnome-base/gnome-vfs/gnome-vfs-2.24.4-r3.ebuild
@@ -0,0 +1,146 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+GCONF_DEBUG="no"
+GNOME_TARBALL_SUFFIX="bz2"
+GNOME2_LA_PUNT="yes"
+
+inherit autotools eutils gnome2 multilib-minimal virtualx
+
+DESCRIPTION="Gnome Virtual Filesystem"
+HOMEPAGE="https://www.gnome.org/"
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE="acl gnutls ipv6 kerberos samba ssl zeroconf"
+
+RDEPEND="
+	>=gnome-base/gconf-2.32.4-r1[${MULTILIB_USEDEP}]
+	>=dev-libs/glib-2.34.3[${MULTILIB_USEDEP}]
+	>=dev-libs/libxml2-2.9.1-r4[${MULTILIB_USEDEP}]
+	>=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}]
+	gnome-base/gnome-mime-data
+	>=x11-misc/shared-mime-info-0.14
+	>=dev-libs/dbus-glib-0.100.2[${MULTILIB_USEDEP}]
+	acl? (
+		>=sys-apps/acl-2.2.52-r1[${MULTILIB_USEDEP}]
+		>=sys-apps/attr-2.4.47-r1[${MULTILIB_USEDEP}] )
+	kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
+	samba? ( >=net-fs/samba-3.6.23-r1[${MULTILIB_USEDEP}] )
+	ssl? (
+		gnutls?	(
+			>=net-libs/gnutls-2.12.23-r6[${MULTILIB_USEDEP}]
+			!gnome-extra/gnome-vfs-sftp )
+		!gnutls? (
+			>=dev-libs/openssl-1.0.1h-r2[${MULTILIB_USEDEP}]
+			!gnome-extra/gnome-vfs-sftp ) )
+	zeroconf? ( >=net-dns/avahi-0.6.31-r2[${MULTILIB_USEDEP}] )
+	abi_x86_32? (
+		!<=app-emulation/emul-linux-x86-gtklibs-20140508-r1
+		!app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)]
+	)
+"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	gnome-base/gnome-common
+	>=dev-util/intltool-0.40
+	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
+	>=dev-util/gtk-doc-am-1.13
+"
+
+src_prepare() {
+	# Allow the Trash on afs filesystems (#106118)
+	epatch "${FILESDIR}"/${PN}-2.12.0-afs.patch
+
+	# Fix compiling with headers missing
+	epatch "${FILESDIR}"/${PN}-2.15.2-headers-define.patch
+
+	# Fix for crashes running programs via sudo
+	epatch "${FILESDIR}"/${PN}-2.16.0-no-dbus-crash.patch
+
+	# Fix automagic dependencies, upstream bug #493475
+	epatch "${FILESDIR}"/${PN}-2.20.0-automagic-deps.patch
+	epatch "${FILESDIR}"/${PN}-2.20.1-automagic-deps.patch
+
+	# Fix to identify ${HOME} (#200897)
+	# thanks to debian folks
+	epatch "${FILESDIR}"/${PN}-2.24.4-home_dir_fakeroot.patch
+
+	# Configure with gnutls-2.7, bug #253729
+	# Fix building with gnutls-2.12, bug #388895
+	epatch "${FILESDIR}"/${PN}-2.24.4-gnutls27.patch
+
+	# Prevent duplicated volumes, bug #193083
+	epatch "${FILESDIR}"/${PN}-2.24.0-uuid-mount.patch
+
+	# Do not build tests with FEATURES="-test", bug #226221
+	epatch "${FILESDIR}"/${PN}-2.24.4-build-tests-asneeded.patch
+
+	# Disable broken test, bug #285706
+	epatch "${FILESDIR}"/${PN}-2.24.4-disable-test-async-cancel.patch
+
+	# Fix for automake-1.13 compatibility, #466944
+	epatch "${FILESDIR}"/${P}-automake-1.13.patch
+
+	sed -e "s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/" -i configure.in || die
+
+	eautoreconf
+	gnome2_src_prepare
+}
+
+multilib_src_configure() {
+	local myconf=(
+		--disable-schemas-install
+		--disable-static
+		--disable-cdda
+		--disable-fam
+		--disable-hal
+		--disable-howl
+		$(use_enable acl)
+		$(use_enable gnutls)
+		$(use_enable ipv6)
+		$(use_enable kerberos krb5)
+		$(use_enable samba)
+		$(use_enable ssl openssl)
+		$(use_enable zeroconf avahi)
+		# Useless ? --enable-http-neon
+
+		# fix path to krb5-config
+		KRB5_CONFIG=/usr/bin/${CHOST}-krb5-config
+	)
+
+	# this works because of the order of configure parsing
+	# so should always be behind the use_enable options
+	# foser <foser@gentoo.org 19 Apr 2004
+	use gnutls && use ssl && myconf+=( --disable-openssl )
+
+	#bug #519060
+	#configure script is so messed up on res_init on Darwin
+	[[ ${CHOST} == *-darwin* ]] && export LIBS="${LIBS} -lresolv"
+
+	ECONF_SOURCE=${S} \
+	gnome2_src_configure "${myconf[@]}"
+
+	if multilib_is_native_abi; then
+		ln -s "${S}"/doc/html doc/html || die
+	fi
+}
+
+multilib_src_test() {
+	unset DISPLAY
+	# Fix bug #285706
+	unset XAUTHORITY
+	Xemake check
+}
+
+multilib_src_install() {
+	gnome2_src_install
+}
+
+multilib_src_install_all() {
+	DOCS="AUTHORS ChangeLog HACKING NEWS README TODO"
+	einstalldocs
+}
diff --git a/gnome-base/gnome/gnome-3.16.0.ebuild b/gnome-base/gnome/gnome-3.16.0.ebuild
index 5719a62b72f6..bceed98e8c2c 100644
--- a/gnome-base/gnome/gnome-3.16.0.ebuild
+++ b/gnome-base/gnome/gnome-3.16.0.ebuild
@@ -12,7 +12,7 @@ SLOT="2.0" # Cannot be installed at the same time as gnome-2
 
 # when unmasking for an arch
 # double check none of the deps are still masked !
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86"
 
 IUSE="accessibility +bluetooth +classic +cdr cups +extras"
 
diff --git a/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-3.16.1.ebuild b/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-3.16.1.ebuild
index 6dbfc02cbc65..610538116a11 100644
--- a/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-3.16.1.ebuild
+++ b/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-3.16.1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://git.gnome.org/browse/gsettings-desktop-schemas"
 LICENSE="LGPL-2.1+"
 SLOT="0"
 IUSE="+introspection"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~sparc-solaris ~x86-solaris"
 
 RDEPEND="
 	>=dev-libs/glib-2.31:2
diff --git a/gnome-base/gvfs/gvfs-1.24.2.ebuild b/gnome-base/gvfs/gvfs-1.24.2.ebuild
index ec36f94d94fe..e55d7335c698 100644
--- a/gnome-base/gvfs/gvfs-1.24.2.ebuild
+++ b/gnome-base/gvfs/gvfs-1.24.2.ebuild
@@ -21,7 +21,7 @@ REQUIRED_USE="
 	udisks? ( udev )
 	systemd? ( udisks )
 "
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x86-solaris"
 
 # Can use libgphoto-2.5.0 as well. Automagic detection.
 RDEPEND="
diff --git a/gnome-base/librsvg/Manifest b/gnome-base/librsvg/Manifest
index 08fcf6f4362c..e107a5b29062 100644
--- a/gnome-base/librsvg/Manifest
+++ b/gnome-base/librsvg/Manifest
@@ -1,3 +1,2 @@
-DIST librsvg-2.40.6.tar.xz 512500 SHA256 8af349f241677b04b7a1ea6b9b33a6343e781bcccc8a09d00208a47342584f06 SHA512 8d901d5d6dde2721db9cb05740ce42fa2520f2f6cc8136a8cb0306b5e6e630166d25da917d169c8d4e11fcfb7834ccb1fe93188f5e9c02c4cddff989d0cf3c51 WHIRLPOOL 99a335a76f31f7474780958d30eb4fe9a950b725d9559c8825e9a268248a56ce9c5048cac2914a99cb3ea9a5787b3de63e32e4b97c09880c994e19845a7f3768
-DIST librsvg-2.40.8.tar.xz 515512 SHA256 0af42ec79ebfc70f980a9adf63f1b63d8150457dc7140dd041484e8c60d5387a SHA512 7d94ad5b03c6f597dcaff3523e32d171a823d340c73505f5b839c0c0fb6c1bae866569062981fa9c712982003d340e9b04ef25cbb2f4c049c4d81488d3813b39 WHIRLPOOL 590ba0b62314d217bc1faa99b28bebcc99d24243819005cbc96cee0303c1ab65f8295b35c750e6cd5d1a248b406a88354497da3f084cd76d7f7a7af480762b9f
+DIST librsvg-2.40.10.tar.xz 522668 SHA256 965c807438ce90b204e930ff80c92eba1606a2f6fd5ccfd09335c99896dd3479 SHA512 e6b630e8332587df414ac5e4e597a4c93ed6f805f378228b7f882f42d03cba68c952e9c1627b3c57dc105cd5ac739a0f6bbe61595c211de0f9e3bd7867904c96 WHIRLPOOL 96b37494e8fd37242371e1e7f10bcf616993f172fd75ab86b65a0743a432dad9e201975281625fcb70baad697c615c5624fc97a2783e2356c9fbd0365f5072ad
 DIST librsvg-2.40.9.tar.xz 519172 SHA256 13964c5d35357552b47d365c34215eee0a63bf0e6059b689f048648c6bf5f43a SHA512 17b72b509b0d38b1291a2a0594739fd650622ab2a913a5e0c864e5060b15093fc49e436c9e2494d57b475572183d1059ae50b7a1d44a1d4d071ac5ef3bcbeaf6 WHIRLPOOL 59bc56631a212893566fb8ed90e45b3e954f7522c21ee1d7b56987a2cc527c6ea8c43238786b159ab0df43e661108b3b089b4b43845f7d9effb4f064cfde7d12
diff --git a/gnome-base/librsvg/files/librsvg-2.40.1-gtk-optional.patch b/gnome-base/librsvg/files/librsvg-2.40.1-gtk-optional.patch
deleted file mode 100644
index 86b8feca50f5..000000000000
--- a/gnome-base/librsvg/files/librsvg-2.40.1-gtk-optional.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From 18917f7fd3160afe06019f4b6234aeb78a3fdb4e Mon Sep 17 00:00:00 2001
-From: Ross Burton <ross.burton@intel.com>
-Date: Tue, 19 Nov 2013 16:00:29 +0000
-Subject: [PATCH] configure: add option to enable/disable use of GTK+
-
-Distro packagers like predictability and automatically detected optional
-dependencies are not predicable.  Add a --with-gtk3 option (default to "auto")
-for forcibly controlling whether GTK+ will be used or not.
-
-Signed-off-by: Ross Burton <ross.burton@intel.com>
-
-https://bugzilla.gnome.org/show_bug.cgi?id=712693
----
- configure.in |   17 +++++++++++------
- 1 file changed, 11 insertions(+), 6 deletions(-)
-
-diff --git a/configure.in b/configure.in
-index f7a89dc..1498f72 100644
---- a/configure.in
-+++ b/configure.in
-@@ -119,17 +119,22 @@ AC_CHECK_FUNCS(strtok_r)
- # GTK
- # ===========================================================================
- 
--PKG_CHECK_MODULES([GTK3],[gtk+-3.0 >= $GTK3_REQUIRED],[have_gtk_3=yes],[have_gtk_3=no])
--
- GTK3_BINARY_VERSION=
- 
--if test "$have_gtk_3" = "yes"; then
--    GTK3_BINARY_VERSION="`$PKG_CONFIG --variable=gtk_binary_version gtk+-3.0`"
-+AC_MSG_CHECKING([whether to use GTK+ 3])
-+AC_ARG_WITH([gtk3],
-+  [AS_HELP_STRING([--without-gtk3],[Don't build GTK+3 tools (default=auto)])],
-+  [],[PKG_CHECK_EXISTS([gtk+-3.0 >= $GTK3_REQUIRED],[with_gtk3=yes],[with_gtk3=no])])
-+AC_MSG_RESULT([$with_gtk3])
-+
-+if test "$with_gtk3" = "yes"; then
-+  PKG_CHECK_MODULES(GTK3, [gtk+-3.0 >= $GTK3_REQUIRED])
-+  GTK3_BINARY_VERSION="`$PKG_CONFIG --variable=gtk_binary_version gtk+-3.0`"
- fi
- 
- AC_SUBST([GTK3_BINARY_VERSION])
- 
--AM_CONDITIONAL([HAVE_GTK_3],[test "$have_gtk_3" = "yes"])
-+AM_CONDITIONAL([HAVE_GTK_3],[test "$with_gtk3" = "yes"])
- 
- dnl ===========================================================================
- dnl GDK-Pixbuf SVG loader
-@@ -305,6 +310,6 @@ librsvg-$VERSION
- 	Build introspectable bindings:  ${found_introspection}
- 	Build Vala bindings:            ${enable_vala}
- 	Build GdkPixbuf loader:         ${enable_pixbuf_loader}
--        GTK 3.0:                        ${have_gtk_3}
-+        GTK 3.0:                        ${with_gtk3}
- 	Build miscellaenous tools:      ${build_misc_tools}
- "
--- 
-1.7.10.4
\ No newline at end of file
diff --git a/gnome-base/librsvg/files/librsvg-2.40.10-gtk-optional.patch b/gnome-base/librsvg/files/librsvg-2.40.10-gtk-optional.patch
new file mode 100644
index 000000000000..852a830f6d27
--- /dev/null
+++ b/gnome-base/librsvg/files/librsvg-2.40.10-gtk-optional.patch
@@ -0,0 +1,58 @@
+From 18917f7fd3160afe06019f4b6234aeb78a3fdb4e Mon Sep 17 00:00:00 2001
+From: Ross Burton <ross.burton@intel.com>
+Date: Tue, 19 Nov 2013 16:00:29 +0000
+Subject: [PATCH] configure: add option to enable/disable use of GTK+
+
+Distro packagers like predictability and automatically detected optional
+dependencies are not predicable.  Add a --with-gtk3 option (default to "auto")
+for forcibly controlling whether GTK+ will be used or not.
+
+Signed-off-by: Ross Burton <ross.burton@intel.com>
+
+https://bugzilla.gnome.org/show_bug.cgi?id=712693
+---
+ configure.in |   17 +++++++++++------
+ 1 file changed, 11 insertions(+), 6 deletions(-)
+
+diff --git a/configure.in b/configure.in
+index f7a89dc..1498f72 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -119,17 +119,22 @@ AC_CHECK_FUNCS(strtok_r)
+ # GTK
+ # ===========================================================================
+ 
+-PKG_CHECK_MODULES([GTK3],[gtk+-3.0 >= $GTK3_REQUIRED],[have_gtk_3=yes],[have_gtk_3=no])
+-
+ GTK3_BINARY_VERSION=
+ 
+-if test "$have_gtk_3" = "yes"; then
+-    GTK3_BINARY_VERSION="`$PKG_CONFIG --variable=gtk_binary_version gtk+-3.0`"
++AC_MSG_CHECKING([whether to use GTK+ 3])
++AC_ARG_WITH([gtk3],
++  [AS_HELP_STRING([--without-gtk3],[Don't build GTK+3 tools (default=auto)])],
++  [],[PKG_CHECK_EXISTS([gtk+-3.0 >= $GTK3_REQUIRED],[with_gtk3=yes],[with_gtk3=no])])
++AC_MSG_RESULT([$with_gtk3])
++
++if test "$with_gtk3" = "yes"; then
++  PKG_CHECK_MODULES(GTK3, [gtk+-3.0 >= $GTK3_REQUIRED])
++  GTK3_BINARY_VERSION="`$PKG_CONFIG --variable=gtk_binary_version gtk+-3.0`"
+ fi
+ 
+ AC_SUBST([GTK3_BINARY_VERSION])
+ 
+-AM_CONDITIONAL([HAVE_GTK_3],[test "$have_gtk_3" = "yes"])
++AM_CONDITIONAL([HAVE_GTK_3],[test "$with_gtk3" = "yes"])
+ 
+ dnl ===========================================================================
+ dnl GDK-Pixbuf SVG loader
+@@ -305,6 +310,6 @@ librsvg-$VERSION
+ 	Build introspectable bindings:  ${found_introspection}
+ 	Build Vala bindings:            ${enable_vala}
+ 	Build GdkPixbuf loader:         ${enable_pixbuf_loader}
+-        GTK+ $GTK3_REQUIRED or later:           ${have_gtk_3}
++        GTK 3.0:                        ${with_gtk3}
+ 	Build miscellaenous tools:      ${build_misc_tools}
+ "
+-- 
+1.7.10.4
\ No newline at end of file
diff --git a/gnome-base/librsvg/librsvg-2.40.10.ebuild b/gnome-base/librsvg/librsvg-2.40.10.ebuild
new file mode 100644
index 000000000000..d03f58952f3c
--- /dev/null
+++ b/gnome-base/librsvg/librsvg-2.40.10.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+VALA_USE_DEPEND="vapigen"
+
+inherit autotools gnome2 multilib-minimal vala
+
+DESCRIPTION="Scalable Vector Graphics (SVG) rendering library"
+HOMEPAGE="https://wiki.gnome.org/Projects/LibRsvg"
+
+LICENSE="LGPL-2"
+SLOT="2"
+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 ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+
+IUSE="+introspection vala tools"
+REQUIRED_USE="
+	vala? ( introspection )
+"
+
+RDEPEND="
+	>=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]
+	>=x11-libs/cairo-1.12.14-r4[${MULTILIB_USEDEP}]
+	>=x11-libs/pango-1.36.3[${MULTILIB_USEDEP}]
+	>=dev-libs/libxml2-2.9.1-r4:2[${MULTILIB_USEDEP}]
+	>=dev-libs/libcroco-0.6.8-r1[${MULTILIB_USEDEP}]
+	>=x11-libs/gdk-pixbuf-2.30.7:2[introspection?,${MULTILIB_USEDEP}]
+	introspection? ( >=dev-libs/gobject-introspection-0.10.8:= )
+	tools? ( >=x11-libs/gtk+-3.10.0:3 )
+"
+DEPEND="${RDEPEND}
+	dev-libs/gobject-introspection-common
+	dev-libs/vala-common
+	>=dev-util/gtk-doc-am-1.13
+	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
+	vala? ( $(vala_depend) )
+"
+# >=gtk-doc-am-1.13, gobject-introspection-common, vala-common needed by eautoreconf
+
+src_prepare() {
+	# https://bugzilla.gnome.org/show_bug.cgi?id=653323
+	epatch "${FILESDIR}/${PN}-2.40.10-gtk-optional.patch"
+
+	# https://bugzilla.gnome.org/show_bug.cgi?id=731826
+	epatch "${FILESDIR}/${PN}-2.40.2-vala-out-of-source.patch"
+
+	eautoreconf
+
+	use vala && vala_src_prepare
+	gnome2_src_prepare
+}
+
+multilib_src_configure() {
+	local myconf=()
+
+	# -Bsymbolic is not supported by the Darwin toolchain
+	if [[ ${CHOST} == *-darwin* ]]; then
+		myconf+=( --disable-Bsymbolic )
+	fi
+
+	# --disable-tools even when USE=tools; the tools/ subdirectory is useful
+	# only for librsvg developers
+	ECONF_SOURCE=${S} \
+	gnome2_src_configure \
+		--disable-static \
+		--disable-tools \
+		$(multilib_native_use_enable introspection) \
+		$(multilib_native_use_with tools gtk3) \
+		$(multilib_native_use_enable vala) \
+		--enable-pixbuf-loader \
+		"${myconf[@]}"
+
+	if multilib_is_native_abi; then
+		ln -s "${S}"/doc/html doc/html || die
+	fi
+}
+
+multilib_src_compile() {
+	# causes segfault if set, see bug #411765
+	unset __GL_NO_DSO_FINALIZER
+	gnome2_src_compile
+}
+
+multilib_src_install() {
+	gnome2_src_install
+}
+
+pkg_postinst() {
+	# causes segfault if set, see bug 375615
+	unset __GL_NO_DSO_FINALIZER
+	multilib_foreach_abi gnome2_pkg_postinst
+}
+
+pkg_postrm() {
+	# causes segfault if set, see bug 375615
+	unset __GL_NO_DSO_FINALIZER
+	multilib_foreach_abi gnome2_pkg_postrm
+}
diff --git a/gnome-base/librsvg/librsvg-2.40.6.ebuild b/gnome-base/librsvg/librsvg-2.40.6.ebuild
deleted file mode 100644
index 76a8c24e0c84..000000000000
--- a/gnome-base/librsvg/librsvg-2.40.6.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-VALA_MIN_API_VERSION="0.18"
-VALA_USE_DEPEND="vapigen"
-
-inherit autotools gnome2 multilib-minimal vala
-
-DESCRIPTION="Scalable Vector Graphics (SVG) rendering library"
-HOMEPAGE="https://wiki.gnome.org/Projects/LibRsvg"
-
-LICENSE="LGPL-2"
-SLOT="2"
-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 ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="+introspection vala tools"
-REQUIRED_USE="
-	vala? ( introspection )
-"
-
-RDEPEND="
-	>=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]
-	>=x11-libs/cairo-1.12.14-r4[${MULTILIB_USEDEP}]
-	>=x11-libs/pango-1.36.3[${MULTILIB_USEDEP}]
-	>=dev-libs/libxml2-2.9.1-r4:2[${MULTILIB_USEDEP}]
-	>=dev-libs/libcroco-0.6.8-r1[${MULTILIB_USEDEP}]
-	>=x11-libs/gdk-pixbuf-2.30.7:2[introspection?,${MULTILIB_USEDEP}]
-	introspection? ( >=dev-libs/gobject-introspection-0.10.8 )
-	tools? ( >=x11-libs/gtk+-3.2.0:3 )
-"
-DEPEND="${RDEPEND}
-	dev-libs/gobject-introspection-common
-	dev-libs/vala-common
-	>=dev-util/gtk-doc-am-1.13
-	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
-	vala? ( $(vala_depend) )
-"
-# >=gtk-doc-am-1.13, gobject-introspection-common, vala-common needed by eautoreconf
-
-src_prepare() {
-	# https://bugzilla.gnome.org/show_bug.cgi?id=712693
-	epatch "${FILESDIR}/${PN}-2.40.1-gtk-optional.patch"
-
-	# https://bugzilla.gnome.org/show_bug.cgi?id=731826
-	epatch "${FILESDIR}/${PN}-2.40.2-vala-out-of-source.patch"
-
-	eautoreconf
-
-	use vala && vala_src_prepare
-	gnome2_src_prepare
-}
-
-multilib_src_configure() {
-	local myconf=()
-
-	# -Bsymbolic is not supported by the Darwin toolchain
-	if [[ ${CHOST} == *-darwin* ]]; then
-		myconf+=( --disable-Bsymbolic )
-	fi
-
-	# --disable-tools even when USE=tools; the tools/ subdirectory is useful
-	# only for librsvg developers
-	ECONF_SOURCE=${S} \
-	gnome2_src_configure \
-		--disable-static \
-		--disable-tools \
-		$(multilib_native_use_enable introspection) \
-		$(multilib_native_use_with tools gtk3) \
-		$(multilib_native_use_enable vala) \
-		--enable-pixbuf-loader \
-		"${myconf[@]}"
-
-	if multilib_is_native_abi; then
-		ln -s "${S}"/doc/html doc/html || die
-	fi
-}
-
-multilib_src_compile() {
-	# causes segfault if set, see bug #411765
-	unset __GL_NO_DSO_FINALIZER
-	gnome2_src_compile
-}
-
-multilib_src_install() {
-	gnome2_src_install
-}
-
-pkg_postinst() {
-	# causes segfault if set, see bug 375615
-	unset __GL_NO_DSO_FINALIZER
-	multilib_foreach_abi gnome2_pkg_postinst
-}
-
-pkg_postrm() {
-	# causes segfault if set, see bug 375615
-	unset __GL_NO_DSO_FINALIZER
-	multilib_foreach_abi gnome2_pkg_postrm
-}
diff --git a/gnome-base/librsvg/librsvg-2.40.8.ebuild b/gnome-base/librsvg/librsvg-2.40.8.ebuild
deleted file mode 100644
index e000c9215b6e..000000000000
--- a/gnome-base/librsvg/librsvg-2.40.8.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-VALA_MIN_API_VERSION="0.18"
-VALA_USE_DEPEND="vapigen"
-
-inherit autotools gnome2 multilib-minimal vala
-
-DESCRIPTION="Scalable Vector Graphics (SVG) rendering library"
-HOMEPAGE="https://wiki.gnome.org/Projects/LibRsvg"
-
-LICENSE="LGPL-2"
-SLOT="2"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="+introspection vala tools"
-REQUIRED_USE="
-	vala? ( introspection )
-"
-
-RDEPEND="
-	>=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]
-	>=x11-libs/cairo-1.12.14-r4[${MULTILIB_USEDEP}]
-	>=x11-libs/pango-1.36.3[${MULTILIB_USEDEP}]
-	>=dev-libs/libxml2-2.9.1-r4:2[${MULTILIB_USEDEP}]
-	>=dev-libs/libcroco-0.6.8-r1[${MULTILIB_USEDEP}]
-	>=x11-libs/gdk-pixbuf-2.30.7:2[introspection?,${MULTILIB_USEDEP}]
-	introspection? ( >=dev-libs/gobject-introspection-0.10.8 )
-	tools? ( >=x11-libs/gtk+-3.2.0:3 )
-"
-DEPEND="${RDEPEND}
-	dev-libs/gobject-introspection-common
-	dev-libs/vala-common
-	>=dev-util/gtk-doc-am-1.13
-	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
-	vala? ( $(vala_depend) )
-"
-# >=gtk-doc-am-1.13, gobject-introspection-common, vala-common needed by eautoreconf
-
-src_prepare() {
-	# https://bugzilla.gnome.org/show_bug.cgi?id=653323
-	epatch "${FILESDIR}/${PN}-2.40.7-gtk-optional.patch"
-
-	# https://bugzilla.gnome.org/show_bug.cgi?id=731826
-	epatch "${FILESDIR}/${PN}-2.40.2-vala-out-of-source.patch"
-
-	eautoreconf
-
-	use vala && vala_src_prepare
-	gnome2_src_prepare
-}
-
-multilib_src_configure() {
-	local myconf=()
-
-	# -Bsymbolic is not supported by the Darwin toolchain
-	if [[ ${CHOST} == *-darwin* ]]; then
-		myconf+=( --disable-Bsymbolic )
-	fi
-
-	# --disable-tools even when USE=tools; the tools/ subdirectory is useful
-	# only for librsvg developers
-	ECONF_SOURCE=${S} \
-	gnome2_src_configure \
-		--disable-static \
-		--disable-tools \
-		$(multilib_native_use_enable introspection) \
-		$(multilib_native_use_with tools gtk3) \
-		$(multilib_native_use_enable vala) \
-		--enable-pixbuf-loader \
-		"${myconf[@]}"
-
-	if multilib_is_native_abi; then
-		ln -s "${S}"/doc/html doc/html || die
-	fi
-}
-
-multilib_src_compile() {
-	# causes segfault if set, see bug #411765
-	unset __GL_NO_DSO_FINALIZER
-	gnome2_src_compile
-}
-
-multilib_src_install() {
-	gnome2_src_install
-}
-
-pkg_postinst() {
-	# causes segfault if set, see bug 375615
-	unset __GL_NO_DSO_FINALIZER
-	multilib_foreach_abi gnome2_pkg_postinst
-}
-
-pkg_postrm() {
-	# causes segfault if set, see bug 375615
-	unset __GL_NO_DSO_FINALIZER
-	multilib_foreach_abi gnome2_pkg_postrm
-}
diff --git a/gnome-base/nautilus/nautilus-3.16.2.ebuild b/gnome-base/nautilus/nautilus-3.16.2.ebuild
index c90e45821343..64a02cd92f07 100644
--- a/gnome-base/nautilus/nautilus-3.16.2.ebuild
+++ b/gnome-base/nautilus/nautilus-3.16.2.ebuild
@@ -16,7 +16,7 @@ SLOT="0"
 
 # profiling?
 IUSE="exif gnome +introspection packagekit +previewer sendto tracker xmp"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux"
 
 # FIXME: tests fails under Xvfb, but pass when building manually
 # "FAIL: check failed in nautilus-file.c, line 8307"
diff --git a/gnome-extra/activity-log-manager/activity-log-manager-0.9.7-r1.ebuild b/gnome-extra/activity-log-manager/activity-log-manager-0.9.7-r1.ebuild
index 096a43932b06..2e808d6a0ef8 100644
--- a/gnome-extra/activity-log-manager/activity-log-manager-0.9.7-r1.ebuild
+++ b/gnome-extra/activity-log-manager/activity-log-manager-0.9.7-r1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://launchpad.net/history-manager/$(get_version_component_range 1-2
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/gnome-extra/cinnamon-control-center/cinnamon-control-center-2.6.0-r1.ebuild b/gnome-extra/cinnamon-control-center/cinnamon-control-center-2.6.0-r1.ebuild
index 617cb7485a15..580126e8f4e2 100644
--- a/gnome-extra/cinnamon-control-center/cinnamon-control-center-2.6.0-r1.ebuild
+++ b/gnome-extra/cinnamon-control-center/cinnamon-control-center-2.6.0-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/linuxmint/cinnamon-control-center/archive/${PV}.tar.
 LICENSE="GPL-2+"
 SLOT="0"
 IUSE="+colord +cups input_devices_wacom"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 # False positives caused by nested configure scripts
 QA_CONFIGURE_OPTIONS=".*"
diff --git a/gnome-extra/cinnamon-desktop/cinnamon-desktop-2.6.5.ebuild b/gnome-extra/cinnamon-desktop/cinnamon-desktop-2.6.5.ebuild
index babfe557f86e..abb090e8f9df 100644
--- a/gnome-extra/cinnamon-desktop/cinnamon-desktop-2.6.5.ebuild
+++ b/gnome-extra/cinnamon-desktop/cinnamon-desktop-2.6.5.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/linuxmint/cinnamon-desktop/archive/${PV}.tar.gz -> $
 
 LICENSE="GPL-2+ FDL-1.1+ LGPL-2+"
 SLOT="0/4" # subslot = libcinnamon-desktop soname version
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="+introspection systemd"
 
 COMMON_DEPEND="
diff --git a/gnome-extra/cinnamon-menus/cinnamon-menus-2.6.0.ebuild b/gnome-extra/cinnamon-menus/cinnamon-menus-2.6.0.ebuild
index 1da114d46786..e53cb629f89d 100644
--- a/gnome-extra/cinnamon-menus/cinnamon-menus-2.6.0.ebuild
+++ b/gnome-extra/cinnamon-menus/cinnamon-menus-2.6.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/linuxmint/cinnamon-menus/archive/${PV}.tar.gz -> ${P
 
 LICENSE="GPL-2+ LGPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 IUSE="+introspection"
 
diff --git a/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-2.6.4.ebuild b/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-2.6.4.ebuild
index 9adc0c9dfb84..9714f5bf8995 100644
--- a/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-2.6.4.ebuild
+++ b/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-2.6.4.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/linuxmint/cinnamon-screensaver/archive/${PV}.tar.gz
 LICENSE="GPL-2+"
 SLOT="0"
 IUSE="doc pam systemd"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 COMMON_DEPEND="
 	>=dev-libs/glib-2.37.3:2[dbus]
diff --git a/gnome-extra/cinnamon-session/cinnamon-session-2.6.3.ebuild b/gnome-extra/cinnamon-session/cinnamon-session-2.6.3.ebuild
index 13d43b64feef..f9d700a6bca9 100644
--- a/gnome-extra/cinnamon-session/cinnamon-session-2.6.3.ebuild
+++ b/gnome-extra/cinnamon-session/cinnamon-session-2.6.3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/linuxmint/cinnamon-session/archive/${PV}.tar.gz -> $
 
 LICENSE="GPL-2+ FDL-1.1+ LGPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="doc ipv6 systemd"
 
 COMMON_DEPEND="
diff --git a/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-2.6.3.ebuild b/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-2.6.3.ebuild
index b32337369467..5ccf3f7f4330 100644
--- a/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-2.6.3.ebuild
+++ b/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-2.6.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/linuxmint/cinnamon-settings-daemon/archive/${PV}.tar
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="+colord cups input_devices_wacom smartcard systemd"
 
 # udev is non-optional since lots of plugins, not just gudev, pull it in
diff --git a/gnome-extra/cinnamon-translations/Manifest b/gnome-extra/cinnamon-translations/Manifest
index 896b7c6360db..a30d7f8de2c7 100644
--- a/gnome-extra/cinnamon-translations/Manifest
+++ b/gnome-extra/cinnamon-translations/Manifest
@@ -1,3 +1,3 @@
 DIST cinnamon-translations-2.4.4.tar.gz 6971880 SHA256 7e6f14dc98be622874ac5a50b45191a2147dda145bcd0f6f52ef56df0762c202 SHA512 43ed9877b41dcc224055bf04c66e87ffea6d7d841aaf46a5f6f2ec232b7e5d249b67c3bee4af3a8918fedf66a1be645d23d2b45a2160cbdefb777c8e3d64cc2c WHIRLPOOL f250b7016193fc9e5fe6f0d045adae3e007c3d5405a04f7a9a968a7a2d7452a88b5c08ac8780e3f7061549909a83505fb2c271e3256f1c02d5cd7efa770274c4
-DIST cinnamon-translations-2.6.1.tar.gz 7227837 SHA256 ed2c4a63a0193f770b0340a3281219a19e5e7102e287d533309f2f6de0dbf3c0 SHA512 949a49588dd3d6616c1ed9afa6dcfd0e3d941fbccde9cfa5065cc3d9df004a1670432854ad591dcffaf70cddaaf29218dd5a6861c1effa783dcfc081fcbbcd51 WHIRLPOOL 080dd6a18df9539ec865bf5461aebed2c3938c498d18ffe7c0a897ef128141805269a38880613725343592a28d72b31da527f3c970afd7feb12d7a1e67ea658f
 DIST cinnamon-translations-2.6.2.tar.gz 7309836 SHA256 8cbf6114a8b0b19ea0755f4527414661712b5d58fefa057593b4a05a2d1c1f03 SHA512 a9c1e109d1bc0e851f3424375acc4941ff866305b89fd66ea185cc8ba33acdecad056dd7160e9e8c80dddab0a4932927f5f12d9b13f060d5b74786886a46384d WHIRLPOOL 32166efe6522594768f212ec5a6caf1fc539113895c361e0b5b94d26b647fcbec9b2a284c4357d2806ac82561a20a817ffa1dd7af83b7a5a588025bcb1bca9de
+DIST cinnamon-translations-2.6.3.tar.gz 7371754 SHA256 3b86b3f16e3afb9dff31506b431c95251d87b9390c5d2290c5896331b2ec91fe SHA512 097960f2e4aaba2e6cbf09488799c987ca4939cad3fe2c0af7b659b05826e03ecc490ad885de1f296f3ff2cd6d95a5908e8223c29fc7b7b7ffee8e34003824dd WHIRLPOOL 6264607dc2c937086494c784c5df74de5534d77ba5ce005998c267c6146bbeea21b283e601d77c6ebc1642f4e38f5ac0099e0739d9a3cd61f1fa71dc00490696
diff --git a/gnome-extra/cinnamon-translations/cinnamon-translations-2.6.1.ebuild b/gnome-extra/cinnamon-translations/cinnamon-translations-2.6.1.ebuild
deleted file mode 100644
index ac03d3fd5b28..000000000000
--- a/gnome-extra/cinnamon-translations/cinnamon-translations-2.6.1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PLOCALES="af am an ar as ast az be be@latin bg bn bn_IN br bs ca ca@valencia crh cs csb cy da de dz el en_AU en_CA en_GB en@shaw eo es es_AR et eu fa fi fil fo fr fr_CA fy ga gd gl gu he hi hr hu hy ia id is it ja jv ka kk km kn ko ksw ku ky la li lo lt lv mai mg mk ml mn mr ms my nb nds ne nl nn nso oc om or pa pl ps pt pt_BR ro ru rue rw shn si sk sl so sq sr sr@ijekavianlatin sr@latin sv ta te tg th tl tlh tpi tr ts ug uk ur uz uz@cyrillic vi wa xh yi zh_CN zh_HK zh_TW zu"
-
-inherit eutils l10n
-
-DESCRIPTION="Translation data for Cinnamon"
-HOMEPAGE="http://cinnamon.linuxmint.com/"
-SRC_URI="https://github.com/linuxmint/cinnamon-translations/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-RESTRICT="test" # tests are for upstream translators and need network access
-
-src_prepare() {
-	epatch_user
-}
-
-src_configure() { :; }
-
-src_install() {
-	# Cannot run before since locales are not in the expected place for this to work
-	l10n_find_plocales_changes "${S}"/usr/share/locale "" ""
-
-	install_locale() {
-		dodir /usr/share/locale
-		insinto /usr/share/locale
-		doins -r usr/share/locale/${1}
-	}
-	l10n_for_each_locale_do install_locale
-}
diff --git a/gnome-extra/cinnamon-translations/cinnamon-translations-2.6.3.ebuild b/gnome-extra/cinnamon-translations/cinnamon-translations-2.6.3.ebuild
new file mode 100644
index 000000000000..70ffde726fd0
--- /dev/null
+++ b/gnome-extra/cinnamon-translations/cinnamon-translations-2.6.3.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PLOCALES="af am an ar as ast az be be@latin bg bn bn_IN br bs ca ca@valencia crh cs csb cy da de dz el en@shaw en_AU en_CA en_GB eo es es_AR et eu fa fi fil fo fr fr_CA fy ga gd gl gu he hi hr hu hy ia id is it ja jv ka kk km kn ko ksw ku ky la li lo lt lv mai mg mk ml mn mr ms my nb nds ne nl nn nso oc om or pa pl ps pt pt_BR ro ru rue rw shn si sk sl so sq sr sr@ijekavianlatin sr@latin sv sw ta te tg th tl tlh tpi tr ts ug uk ur uz uz@cyrillic vi wa xh yi zh_CN zh_HK zh_TW zu"
+
+inherit eutils l10n
+
+DESCRIPTION="Translation data for Cinnamon"
+HOMEPAGE="http://cinnamon.linuxmint.com/"
+SRC_URI="https://github.com/linuxmint/cinnamon-translations/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
+RESTRICT="test" # tests are for upstream translators and need network access
+
+src_prepare() {
+	epatch_user
+}
+
+src_configure() { :; }
+
+src_install() {
+	# Cannot run before since locales are not in the expected place for this to work
+	l10n_find_plocales_changes "${S}"/usr/share/locale "" ""
+
+	install_locale() {
+		dodir /usr/share/locale
+		insinto /usr/share/locale
+		doins -r usr/share/locale/${1}
+	}
+	l10n_for_each_locale_do install_locale
+}
diff --git a/gnome-extra/cinnamon/cinnamon-2.6.13.ebuild b/gnome-extra/cinnamon/cinnamon-2.6.13.ebuild
index 76f706b0a8ea..afdebd13233f 100644
--- a/gnome-extra/cinnamon/cinnamon-2.6.13.ebuild
+++ b/gnome-extra/cinnamon/cinnamon-2.6.13.ebuild
@@ -30,7 +30,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}
 	|| ( python_targets_python3_3 python_targets_python3_4 )
 	"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 COMMON_DEPEND="
 	app-accessibility/at-spi2-atk:2
@@ -160,6 +160,10 @@ src_prepare() {
 	# https://github.com/linuxmint/Cinnamon/issues/3577
 	epatch "${FILESDIR}"/${PN}-2.4.5-gnome-3.14.patch
 
+	# Fix build with clutter[-gtk]
+	# https://github.com/linuxmint/Cinnamon/pull/4600
+	epatch "${FILESDIR}"/${PN}-2.6.13-test-recorder-includes.patch
+
 	# Use pkexec instead of gksu (from Arch)
 	# https://github.com/linuxmint/Cinnamon/issues/3565
 	sed -i 's/gksu/pkexec/' files/usr/bin/cinnamon-settings-users || die
diff --git a/gnome-extra/cinnamon/files/cinnamon-2.6.13-test-recorder-includes.patch b/gnome-extra/cinnamon/files/cinnamon-2.6.13-test-recorder-includes.patch
new file mode 100644
index 000000000000..3ed2c3a93f0c
--- /dev/null
+++ b/gnome-extra/cinnamon/files/cinnamon-2.6.13-test-recorder-includes.patch
@@ -0,0 +1,36 @@
+From cf960f096e426521fc898733580d47c725e52953 Mon Sep 17 00:00:00 2001
+From: Alexandre Rostovtsev <tetromino@gentoo.org>
+Date: Sun, 6 Sep 2015 14:53:48 -0400
+Subject: [PATCH] build: append ST_CFLAGS when building test-recorder
+
+test-recorder #includes st.h, which pulls in lots of headers, some of which
+might not be in TEST_CINNAMON_RECORDER_CFLAGS, depending on how clutter and
+gstreamer were configured.
+
+Fixes build failure reported at https://bugs.gentoo.org/559794 :
+
+In file included from ./st/st-bin.h:27:0,
+                 from st.h:4,
+                 from cinnamon-recorder.c:19:
+./st/st-types.h:26:21: fatal error: gtk/gtk.h: No such file or directory
+---
+ src/Makefile.am | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 3d8fdd3..e6e54a9 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -199,7 +199,8 @@ libcinnamon_la_SOURCES += $(cinnamon_recorder_sources) $(cinnamon_recorder_non_g
+ 
+ noinst_PROGRAMS += test-recorder
+ 
+-test_recorder_CPPFLAGS = $(TEST_CINNAMON_RECORDER_CFLAGS)
++test_recorder_CPPFLAGS = $(TEST_CINNAMON_RECORDER_CFLAGS) \
++                       $(ST_CFLAGS)
+ test_recorder_LDADD = $(TEST_CINNAMON_RECORDER_LIBS) \
+                        libst-1.0.la
+ 
+-- 
+2.5.1
+
diff --git a/gnome-extra/cjs/Manifest b/gnome-extra/cjs/Manifest
index 2dab1c2c39df..de7ea36c3d21 100644
--- a/gnome-extra/cjs/Manifest
+++ b/gnome-extra/cjs/Manifest
@@ -1,3 +1,3 @@
 DIST cjs-2.4.2.tar.gz 324509 SHA256 1310a2bfdebd6a50a09718abf3627daab097233781757509121257445e0423e3 SHA512 95c46808120392f4c9d74d5d94ee030be1b3a8a36ddabbd12560ea0ed16ac6bdeb78016a09eec315536ee094109c6f6fe07ee624300bd1eae88fdbdefbed0565 WHIRLPOOL e0dca618e2d166ee29ebc303d162dd7cd37c8d5381d68fd1c5824aba173cd651ab9825437f2096aede2be667bcd9633a21acd3bdee9002fee1d2f350cc454730
-DIST cjs-2.6.0.tar.gz 324623 SHA256 bb65b7238eabb265de256d6de0a183018a4ec28b7d161d439a809875ca6e2927 SHA512 49d920a81965575aa1ea9777dd1b41911cd61bc3b29ecb87d1c1923cf3a5d43520a9b036bfca006539be27ea7c83c1c9ddea7beafaf470d255322dad0bd170ec WHIRLPOOL 197199f4c5d53c0a6c77d411b0c3fce93cef81a4dd91b84387e0402b2b7d7e51e273c449a05cf39c1491c20b911847682e3d8dbe2c2549c4bf738e477d10b51b
 DIST cjs-2.6.1.tar.gz 324886 SHA256 1b431ccacfc6dac5f393ff6807dac69751eb943488422b7e26554f164a0e4309 SHA512 1c382a590def70f2d0ed554c5a345f3094d06ae4999aeb6b836d2867f947aeb5f60b222e4c139d89bdba0e855e6e844f80f4d0b08e3921e84c2e214e9d371a61 WHIRLPOOL 1cded0ba6da3baba6484785080cff9e08db5529e3f2a5c0a740e5f1a06b0c1e89b299f686c931724412ebdb0eb9dee509e517da5fad403eab5c4c043afabec84
+DIST cjs-2.6.2.tar.gz 324978 SHA256 742e5a98281c3aff3127113352e920151468fd3c55214aa9c9ed09704efa70a0 SHA512 cd8954027ffa538e6bbf8e48e574ab9721c514a9d975e24e9915a3f23dc61b4faacc5e1a3302d8a08ea9a515189b40299c80c43a065c14560d206256a1984d29 WHIRLPOOL 0d566df0c80c4548b9521ca430f8a2a35892383b922faade4f77510ed9f1811fcac7b9dd8c166a4bff8148280c5b5b448bb584be9576edd005fd9b4a0b4085c2
diff --git a/gnome-extra/cjs/cjs-2.6.0.ebuild b/gnome-extra/cjs/cjs-2.6.0.ebuild
deleted file mode 100644
index 7f766c8bd95c..000000000000
--- a/gnome-extra/cjs/cjs-2.6.0.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="no"
-
-inherit autotools eutils gnome2 pax-utils virtualx
-
-DESCRIPTION="Linux Mint's fork of gjs for Cinnamon"
-HOMEPAGE="http://cinnamon.linuxmint.com/"
-SRC_URI="https://github.com/linuxmint/cjs/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT || ( MPL-1.1 LGPL-2+ GPL-2+ )"
-SLOT="0"
-IUSE="+cairo examples gtk test"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-lang/spidermonkey:24
-	>=dev-libs/glib-2.37.3:2
-	>=dev-libs/gobject-introspection-1.38:=
-	sys-libs/readline:0
-	virtual/libffi
-	cairo? ( x11-libs/cairo[X,glib] )
-	gtk? ( x11-libs/gtk+:3 )
-"
-DEPEND="${RDEPEND}
-	gnome-base/gnome-common
-	sys-devel/gettext
-	virtual/pkgconfig
-	test? ( sys-apps/dbus )
-"
-# Cinnamon 2.2 does not work with this release.
-RDEPEND="${RDEPEND}
-	!<gnome-extra/cinnamon-2.4
-"
-
-src_prepare() {
-	# Disable broken unittests
-	epatch "${FILESDIR}"/${PN}-2.4.0-disable-unittest-*.patch
-
-	epatch_user
-	eautoreconf
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# FIXME: add systemtap/dtrace support, like in glib:2
-	# FIXME: --enable-systemtap installs files in ${D}/${D} for some reason
-	# XXX: Do NOT enable coverage, completely useless for portage installs
-	gnome2_src_configure \
-		--disable-systemtap \
-		--disable-dtrace \
-		--disable-coverage \
-		$(use_with cairo) \
-		$(use_with gtk)
-}
-
-src_test() {
-	Xemake check
-}
-
-src_install() {
-	# installation sometimes fails in parallel
-	gnome2_src_install -j1
-
-	if use examples; then
-		insinto /usr/share/doc/"${PF}"/examples
-		doins "${S}"/examples/*
-	fi
-
-	# Required for cjs-console to run correctly on PaX systems
-	pax-mark mr "${ED}/usr/bin/cjs-console"
-}
diff --git a/gnome-extra/cjs/cjs-2.6.2.ebuild b/gnome-extra/cjs/cjs-2.6.2.ebuild
new file mode 100644
index 000000000000..9cafa4a2b102
--- /dev/null
+++ b/gnome-extra/cjs/cjs-2.6.2.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+
+inherit autotools eutils gnome2 pax-utils virtualx
+
+DESCRIPTION="Linux Mint's fork of gjs for Cinnamon"
+HOMEPAGE="http://cinnamon.linuxmint.com/"
+SRC_URI="https://github.com/linuxmint/cjs/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT || ( MPL-1.1 LGPL-2+ GPL-2+ )"
+SLOT="0"
+IUSE="+cairo examples gtk test"
+KEYWORDS="alpha ~amd64 ~x86"
+
+RDEPEND="
+	dev-lang/spidermonkey:24
+	>=dev-libs/glib-2.37.3:2
+	>=dev-libs/gobject-introspection-1.38:=
+	sys-libs/readline:0
+	virtual/libffi
+	cairo? ( x11-libs/cairo[X,glib] )
+	gtk? ( x11-libs/gtk+:3 )
+"
+DEPEND="${RDEPEND}
+	gnome-base/gnome-common
+	sys-devel/gettext
+	virtual/pkgconfig
+	test? ( sys-apps/dbus )
+"
+# Cinnamon 2.2 does not work with this release.
+RDEPEND="${RDEPEND}
+	!<gnome-extra/cinnamon-2.4
+"
+
+src_prepare() {
+	# Disable broken unittests
+	epatch "${FILESDIR}"/${PN}-2.4.0-disable-unittest-*.patch
+
+	epatch_user
+	eautoreconf
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# FIXME: add systemtap/dtrace support, like in glib:2
+	# FIXME: --enable-systemtap installs files in ${D}/${D} for some reason
+	# XXX: Do NOT enable coverage, completely useless for portage installs
+	gnome2_src_configure \
+		--disable-systemtap \
+		--disable-dtrace \
+		--disable-coverage \
+		$(use_with cairo) \
+		$(use_with gtk)
+}
+
+src_test() {
+	Xemake check
+}
+
+src_install() {
+	# installation sometimes fails in parallel
+	gnome2_src_install -j1
+
+	if use examples; then
+		insinto /usr/share/doc/"${PF}"/examples
+		doins "${S}"/examples/*
+	fi
+
+	# Required for cjs-console to run correctly on PaX systems
+	pax-mark mr "${ED}/usr/bin/cjs-console"
+}
diff --git a/gnome-extra/eiciel/Manifest b/gnome-extra/eiciel/Manifest
index 35091e6e9204..4c6496b686cd 100644
--- a/gnome-extra/eiciel/Manifest
+++ b/gnome-extra/eiciel/Manifest
@@ -1,2 +1,3 @@
+DIST eiciel-0.9.10.tar.bz2 647578 SHA256 27adf2b0c777836401d8a5e6195c30e4cadef893fdc2a2bd64356bde309ed688 SHA512 7801753edfb07b566f4979067c91031dcb8f3010a7cc96e12b05847706d81e10eb6c5e6df224c98cf9d2ad8cb5d9b7848dd610e1c6c3c8a2331c1d4ca3cc61fe WHIRLPOOL 2bd1935268b3a42fbfc788387263812d73ad06e4fd291f79117821c3b5fb9a5b24b7aa405e4df6e0d6fb5bfebfcaf12713a27924bbdc94bd6e72a78b0e9bc66e
 DIST eiciel-0.9.8.2.tar.bz2 648067 SHA256 fd99837a57adf83767765a4f096ae81c0af7e33f81df24c55c304b3b649c2079 SHA512 b50479f10d7516ecee2880a03d49ba0d5b13914b3c417f34f960fe7e28aefd0779650915326473180ec19d4c7b6a5998da603c9ccd90a05558521465f99aa9cb WHIRLPOOL 3cd792ca0fed6799a811a92205f32f2b208d684c4a8840cdc5baa8f4825ff55e29885999c0206fbb05ff4e02941f2b71ed2ccce959e1a9a81f7de810b928c229
 DIST eiciel-0.9.9.tar.bz2 647313 SHA256 c87635f15b381ae912d8d015badf9c0d1428c9a766383399c1351eb02e5b479b SHA512 d2031cdc479851ce207000251dcef9121501f8447b60d37fad9f0fe940bfde0e775443f6988f058e565920089cfacf007461f3c8b5a4146f779f9a22396ac7e9 WHIRLPOOL 4eebbab5a5847fd9f3ec6f937dae7a09a000b1b7d232cd366cf9dba6a7f479b16265bf0ba5ce8f5c5d6f36636007f33e3a5bef4a459523b737e83151a33a4fed
diff --git a/gnome-extra/eiciel/eiciel-0.9.10.ebuild b/gnome-extra/eiciel/eiciel-0.9.10.ebuild
new file mode 100644
index 000000000000..c823ba30bde7
--- /dev/null
+++ b/gnome-extra/eiciel/eiciel-0.9.10.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+
+inherit gnome2
+
+DESCRIPTION="ACL editor for GNOME, with Nautilus extension"
+HOMEPAGE="http://rofi.roger-ferrer.org/eiciel/"
+SRC_URI="http://rofi.roger-ferrer.org/eiciel/download/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~x86"
+IUSE="xattr"
+
+RDEPEND="
+	>=sys-apps/acl-2.2.32
+	>=dev-cpp/gtkmm-3:3.0
+	>=gnome-base/nautilus-3
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	>=sys-devel/gettext-0.18.1
+"
+
+src_configure() {
+	gnome2_src_configure \
+		--disable-static \
+		--with-gnome-version=3 \
+		$(use_enable xattr user-attributes)
+}
diff --git a/gnome-extra/evolution-data-server/Manifest b/gnome-extra/evolution-data-server/Manifest
index 6e05d4fa391a..2153b90a2065 100644
--- a/gnome-extra/evolution-data-server/Manifest
+++ b/gnome-extra/evolution-data-server/Manifest
@@ -1,3 +1,3 @@
 DIST evolution-data-server-3.12.11.tar.xz 5288904 SHA256 59023d2cf92e36b69c1f83b2e56a0ba037754982a23cb06f35f6cc5de7a12201 SHA512 851b5ba6384e918593043088ac093c02f31b0b3bcb6852f2ee24159cc0c99e28713db84d76339a40073da8cbe4857222031e7150f0f99dca61eaf910d76b139f WHIRLPOOL c90345f2273ff66156fd266521521fd381e1c8d9e05311067835e729c24d5544a1bf29f0d988c6585e9caf3b7f0107645c781a15fd7b4ca3d9367f45441ce4a4
 DIST evolution-data-server-3.16.4.tar.xz 5364536 SHA256 62af92dd5563d58a2f13eceeee99cbb7201c15a60eb9e6f4f2bf69688aa07a06 SHA512 7dfb5abc663c09f3bf43b8f34dc4eaab0d16107221ae862d6e4c7b2adc8fa16983a9c619020ce4c032866bd846491db693bcf231c8bdd7fdf6bdd75c3cc327cc WHIRLPOOL 41024ce5039189e5261df9f8ed74b860d712ff55ea0d4cc42d804ae052410fd502dc55d4cfffa70640c2a8747695687840905db145630cf7e1b858554d7761de
-DIST evolution-data-server-3.16.4_pre20150704.tar.xz 4139492 SHA256 2b52f062ab20edfbb99541e87ae1936ff80c5e4ca9a0d5d7ce8459e182aa8ae7 SHA512 9a0fba7588b2700810a2d7efbe6d50b1762ac4754d43d17bd55272ae3b51362c120462dbc6cd596fbb2691a75d14896d012963a3146483ccfbf0a712f34eb59e WHIRLPOOL 12beb7ddd0bc00452bc2070521c53ffc8cf07b9b08e73f5edf8df4fbd5dfb4b37c0f7b1d6da713b370b05b84a3fd901afe70b85e1dc21c153013ed8ce93ea3e1
+DIST evolution-data-server-3.16.5.tar.xz 5364120 SHA256 e44ad4143402957cab8cab1a6b3d7057d8b111d268c6b9ad4e4008850f5b244c SHA512 7f4fd758175d3d48d249cebd855fe684b808574421f1d09ee90aad16c76da89980f17bb2fa9741187adb44327166ebcb78c5330f28f01b20f3810c36653f78d1 WHIRLPOOL 559b4e2f1de4f26bf5806c1f5cabc3afe6aea910fa0dcf657947d085ea2344250b8b149a7d6760d342abb1893872b937c7d7626648cff2fe12fe531fb52cd3c2
diff --git a/gnome-extra/evolution-data-server/evolution-data-server-3.16.4_pre20150704.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-3.16.4_pre20150704.ebuild
deleted file mode 100644
index 97b374e5160a..000000000000
--- a/gnome-extra/evolution-data-server/evolution-data-server-3.16.4_pre20150704.ebuild
+++ /dev/null
@@ -1,147 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python2_7 python3_4 pypy pypy2_0 )
-VALA_MIN_API_VERSION="0.22"
-VALA_USE_DEPEND="vapigen"
-
-inherit autotools db-use flag-o-matic gnome2 python-any-r1 vala virtualx
-
-DESCRIPTION="Evolution groupware backend"
-HOMEPAGE="https://wiki.gnome.org/Apps/Evolution"
-
-COMMIT="d3587d1e064ff46406a3bd137ebdd3625c339001"
-SRC_URI="https://git.gnome.org/browse/${PN}/snapshot/${PN}-${COMMIT}.tar.xz -> ${P}.tar.xz"
-
-# Note: explicitly "|| ( LGPL-2 LGPL-3 )", not "LGPL-2+".
-LICENSE="|| ( LGPL-2 LGPL-3 ) BSD Sleepycat"
-SLOT="0/52" # subslot = libcamel-1.2 soname version
-IUSE="api-doc-extras +gnome-online-accounts +gtk +introspection ipv6 ldap kerberos vala +weather"
-REQUIRED_USE="vala? ( introspection )"
-
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-solaris"
-
-# sys-libs/db is only required for migrating from <3.13 versions
-# gdata-0.15.1 is required for google tasks
-RDEPEND="
-	>=app-crypt/gcr-3.4
-	>=app-crypt/libsecret-0.5[crypt]
-	>=dev-db/sqlite-3.5:=
-	>=dev-libs/glib-2.40:2
-	>=dev-libs/libgdata-0.10:=
-	>=dev-libs/libical-0.43:=
-	>=net-libs/libsoup-2.42:2.4
-	>=dev-libs/libxml2-2
-	>=dev-libs/nspr-4.4:=
-	>=dev-libs/nss-3.9:=
-	>=sys-libs/db-4:=
-
-	dev-libs/icu:=
-	sys-libs/zlib:=
-	virtual/libiconv
-
-	gtk? (
-		>=app-crypt/gcr-3.4[gtk]
-		>=x11-libs/gtk+-3.6:3
-	)
-	gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.8 )
-	introspection? ( >=dev-libs/gobject-introspection-0.9.12:= )
-	kerberos? ( virtual/krb5:= )
-	ldap? ( >=net-nds/openldap-2:= )
-	weather? ( >=dev-libs/libgweather-3.8:2= )
-"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	dev-util/gdbus-codegen
-	dev-util/gperf
-	>=dev-util/gtk-doc-am-1.14
-	>=dev-util/intltool-0.35.5
-	>=gnome-base/gnome-common-3.5.5
-	>=sys-devel/gettext-0.17
-	virtual/pkgconfig
-	vala? ( $(vala_depend) )
-
-	dev-util/gtk-doc
-"
-
-# FIXME: This version needs dev-util/gtk-doc to provide gtk-doc.make
-# Next one should be a proper tarball created after distcheck run and, then
-# shouldn't require that DEPEND.
-
-# eautoreconf needs:
-#	>=gnome-base/gnome-common-2
-
-# Some tests fail due to missings locales.
-# Also, dbus tests are flacky, bugs #397975 #501834
-# It looks like a nightmare to disable those for now.
-RESTRICT="test"
-
-S="${WORKDIR}/${PN}-${COMMIT}"
-
-pkg_setup() {
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	use vala && vala_src_prepare
-
-	# Fix relink issues in src_install
-	ELTCONF="--reverse-deps"
-
-	eautoreconf
-
-	gnome2_src_prepare
-
-	# Fix compilation flags crazyness, upstream bug #653157
-	sed 's/^\(AM_CFLAGS="\)$WARNING_FLAGS/\1/' \
-		-i configure || die "sed failed"
-}
-
-src_configure() {
-	# /usr/include/db.h is always db-1 on FreeBSD
-	# so include the right dir in CPPFLAGS
-	append-cppflags "-I$(db_includedir)"
-
-	# phonenumber does not exist in tree
-	gnome2_src_configure \
-		$(use_enable api-doc-extras gtk-doc) \
-		$(use_with api-doc-extras private-docs) \
-		$(use_enable gnome-online-accounts goa) \
-		$(use_enable gtk) \
-		$(use_enable introspection) \
-		$(use_enable ipv6) \
-		$(use_with kerberos krb5 "${EPREFIX}"/usr) \
-		$(use_with kerberos krb5-libs "${EPREFIX}"/usr/$(get_libdir)) \
-		$(use_with ldap openldap) \
-		$(use_enable vala vala-bindings) \
-		$(use_enable weather) \
-		--enable-google \
-		--enable-largefile \
-		--enable-smime \
-		--with-libdb="${EPREFIX}"/usr \
-		--without-phonenumber \
-		--disable-examples \
-		--disable-uoa
-}
-
-src_install() {
-	gnome2_src_install
-
-	if use ldap; then
-		insinto /etc/openldap/schema
-		doins "${FILESDIR}"/calentry.schema
-		dosym /usr/share/${PN}/evolutionperson.schema /etc/openldap/schema/evolutionperson.schema
-	fi
-}
-
-src_test() {
-	unset DBUS_SESSION_BUS_ADDRESS
-	unset ORBIT_SOCKETDIR
-	unset SESSION_MANAGER
-	unset DISPLAY
-	Xemake check
-}
diff --git a/gnome-extra/evolution-data-server/evolution-data-server-3.16.5.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-3.16.5.ebuild
new file mode 100644
index 000000000000..a7790cbb0246
--- /dev/null
+++ b/gnome-extra/evolution-data-server/evolution-data-server-3.16.5.ebuild
@@ -0,0 +1,134 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+PYTHON_COMPAT=( python2_7 python3_4 pypy pypy2_0 )
+VALA_MIN_API_VERSION="0.22"
+VALA_USE_DEPEND="vapigen"
+
+inherit db-use flag-o-matic gnome2 python-any-r1 vala virtualx
+
+DESCRIPTION="Evolution groupware backend"
+HOMEPAGE="https://wiki.gnome.org/Apps/Evolution"
+
+# Note: explicitly "|| ( LGPL-2 LGPL-3 )", not "LGPL-2+".
+LICENSE="|| ( LGPL-2 LGPL-3 ) BSD Sleepycat"
+SLOT="0/52" # subslot = libcamel-1.2 soname version
+IUSE="api-doc-extras +gnome-online-accounts +gtk +introspection ipv6 ldap kerberos vala +weather"
+REQUIRED_USE="vala? ( introspection )"
+
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-solaris"
+
+# sys-libs/db is only required for migrating from <3.13 versions
+# gdata-0.15.1 is required for google tasks
+RDEPEND="
+	>=app-crypt/gcr-3.4
+	>=app-crypt/libsecret-0.5[crypt]
+	>=dev-db/sqlite-3.7.17:=
+	>=dev-libs/glib-2.40:2
+	>=dev-libs/libgdata-0.10:=
+	>=dev-libs/libical-0.43:=
+	>=net-libs/libsoup-2.42:2.4
+	>=dev-libs/libxml2-2
+	>=dev-libs/nspr-4.4:=
+	>=dev-libs/nss-3.9:=
+	>=sys-libs/db-4:=
+
+	dev-libs/icu:=
+	sys-libs/zlib:=
+	virtual/libiconv
+
+	gtk? (
+		>=app-crypt/gcr-3.4[gtk]
+		>=x11-libs/gtk+-3.6:3
+	)
+	gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.8 )
+	introspection? ( >=dev-libs/gobject-introspection-0.9.12:= )
+	kerberos? ( virtual/krb5:= )
+	ldap? ( >=net-nds/openldap-2:= )
+	weather? ( >=dev-libs/libgweather-3.8:2= )
+"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	dev-util/gdbus-codegen
+	dev-util/gperf
+	>=dev-util/gtk-doc-am-1.14
+	>=dev-util/intltool-0.35.5
+	>=gnome-base/gnome-common-3.5.5
+	>=sys-devel/gettext-0.17
+	virtual/pkgconfig
+	vala? ( $(vala_depend) )
+"
+
+# eautoreconf needs:
+#	>=gnome-base/gnome-common-2
+
+# Some tests fail due to missings locales.
+# Also, dbus tests are flacky, bugs #397975 #501834
+# It looks like a nightmare to disable those for now.
+RESTRICT="test"
+
+pkg_setup() {
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	use vala && vala_src_prepare
+
+	# Fix relink issues in src_install
+	ELTCONF="--reverse-deps"
+
+	gnome2_src_prepare
+
+	# Fix compilation flags crazyness, upstream bug #653157
+	sed 's/^\(AM_CFLAGS="\)$WARNING_FLAGS/\1/' \
+		-i configure || die "sed failed"
+}
+
+src_configure() {
+	# /usr/include/db.h is always db-1 on FreeBSD
+	# so include the right dir in CPPFLAGS
+	append-cppflags "-I$(db_includedir)"
+
+	# phonenumber does not exist in tree
+	gnome2_src_configure \
+		$(use_enable api-doc-extras gtk-doc) \
+		$(use_with api-doc-extras private-docs) \
+		$(use_enable gnome-online-accounts goa) \
+		$(use_enable gtk) \
+		$(use_enable introspection) \
+		$(use_enable ipv6) \
+		$(use_with kerberos krb5 "${EPREFIX}"/usr) \
+		$(use_with kerberos krb5-libs "${EPREFIX}"/usr/$(get_libdir)) \
+		$(use_with ldap openldap) \
+		$(use_enable vala vala-bindings) \
+		$(use_enable weather) \
+		--enable-google \
+		--enable-largefile \
+		--enable-smime \
+		--with-libdb="${EPREFIX}"/usr \
+		--without-phonenumber \
+		--disable-examples \
+		--disable-uoa
+}
+
+src_install() {
+	gnome2_src_install
+
+	if use ldap; then
+		insinto /etc/openldap/schema
+		doins "${FILESDIR}"/calentry.schema
+		dosym /usr/share/${PN}/evolutionperson.schema /etc/openldap/schema/evolutionperson.schema
+	fi
+}
+
+src_test() {
+	unset DBUS_SESSION_BUS_ADDRESS
+	unset ORBIT_SOCKETDIR
+	unset SESSION_MANAGER
+	unset DISPLAY
+	Xemake check
+}
diff --git a/gnome-extra/evolution-ews/Manifest b/gnome-extra/evolution-ews/Manifest
index f29df5a0653b..68f3950246d0 100644
--- a/gnome-extra/evolution-ews/Manifest
+++ b/gnome-extra/evolution-ews/Manifest
@@ -1,3 +1,4 @@
 DIST evolution-ews-3.12.11.tar.xz 663288 SHA256 adbf4efd25e9c2df823a20d14f45027bacbaf14d57ffb5978ae4d33184315e83 SHA512 4756a185c55118622cff175c3fa8d4a2ae3e82ff926542dfd88d299a7f82e23dc90f66de0ce7e97db8a79dbd2a07d635ab9bdc8fac8f0be3bf10d5efb77a067e WHIRLPOOL 5802f9df6bf3d79c23238672da643cc781c048b1a2b0d4ee20dc6348c998a656567ccca8299ad8aa00e537c82e11fb9e26770d78adb70cf7a6030e802521ac22
 DIST evolution-ews-3.16.3.tar.xz 683876 SHA256 529d3aa62a6d6d129871d005d95f27b433ad7aeb99f48f395347e18fb0586ad0 SHA512 462b2c77033b351ddcd72ef4b4f7d8d5e4f7782d1ff4d25760d31fb7c0c1ed303fdc47063932961810b103204a59eccd91d4c888554010cd64c46be5eaeb53d9 WHIRLPOOL 56ff69cc1341ab9a7b38cdc8091dc15c3bba72226105f9fd907d800cffbeefe83555732c3e70d7edd76bdf6f9132e9621fd00252bf4a794198c7608c347af1a4
 DIST evolution-ews-3.16.4.tar.xz 684676 SHA256 fabacc8a3acb5998fa0aa750927defe3cd8198e3a8300190cb613dd779803bd4 SHA512 62b03cd7f6ddd648d781dafe4a40b0d128edfe21d6a28e15e8c1e70069c694bf1b66dbf9ede0613ca8ca08b234bae2f83280152f80afcdacd01decffdf07808f WHIRLPOOL cbcb1723779563680e3006c5149c83189d8cde0558a42d716389641be9d52147bd71b0e1259f36a3467fa8d83123c78f8bb01cfd6393bd7e4c4953794c7df716
+DIST evolution-ews-3.16.5.tar.xz 684684 SHA256 d67e0cbf94800fb7035205bf8fd61ae1413ae7ba79265f8750fde1e7fb25eb58 SHA512 f046f3e0581cd21441b3737ff2fdd7cc3fa1333c3de8c3cf0be48f39239985cb68cbbd04089a84fa5f31ef84cc4100cf8a9ac0d1e6e261522f6e5305e505c0c7 WHIRLPOOL 960c84417c0b6a4374e5f063619c5495afc3b8eb0902b452021513c3a25fa1af148a71b3adbc19b915c857a4337f97de4eb0dac098db97a14e4ec362e36b0f28
diff --git a/gnome-extra/evolution-ews/evolution-ews-3.16.5.ebuild b/gnome-extra/evolution-ews/evolution-ews-3.16.5.ebuild
new file mode 100644
index 000000000000..f8320ee5200d
--- /dev/null
+++ b/gnome-extra/evolution-ews/evolution-ews-3.16.5.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+
+inherit gnome2
+
+DESCRIPTION="Evolution module for connecting to Microsoft Exchange Web Services"
+HOMEPAGE="https://wiki.gnome.org/Apps/Evolution"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="amd64 ~x86"
+IUSE="test"
+
+RDEPEND="
+	dev-db/sqlite:3=
+	>=dev-libs/glib-2.40:2
+	dev-libs/libical:0=
+	>=dev-libs/libxml2-2
+	>=gnome-extra/evolution-data-server-${PV}:0=
+	>=mail-client/evolution-${PV}:2.0
+	>=net-libs/libsoup-2.42:2.4
+	>=x11-libs/gtk+-3:3
+"
+DEPEND="${RDEPEND}
+	>=dev-util/gtk-doc-am-1.9
+	>=dev-util/intltool-0.35.5
+	virtual/pkgconfig
+	test? ( net-libs/uhttpmock )
+"
+
+src_configure() {
+	# We don't have libmspack, needing internal lzx
+	gnome2_src_configure \
+		--with-internal-lzx \
+		$(use_enable test tests)
+}
diff --git a/gnome-extra/gnome-boxes/gnome-boxes-3.16.2.ebuild b/gnome-extra/gnome-boxes/gnome-boxes-3.16.2.ebuild
index 065d9cbebce8..cd4b607eded8 100644
--- a/gnome-extra/gnome-boxes/gnome-boxes-3.16.2.ebuild
+++ b/gnome-extra/gnome-boxes/gnome-boxes-3.16.2.ebuild
@@ -17,7 +17,7 @@ SLOT="0"
 
 # We force 'bindist' due to licenses from gnome-boxes-nonfree
 IUSE="smartcard usbredir" #bindist
-KEYWORDS="~amd64" # qemu-kvm[spice] is 64bit-only
+KEYWORDS="amd64" # qemu-kvm[spice] is 64bit-only
 
 # NOTE: sys-fs/* stuff is called via exec()
 # FIXME: ovirt is not available in tree
diff --git a/gnome-extra/gnome-builder/gnome-builder-3.16.3.ebuild b/gnome-extra/gnome-builder/gnome-builder-3.16.3.ebuild
index 6ddc3f450381..2712acd22372 100644
--- a/gnome-extra/gnome-builder/gnome-builder-3.16.3.ebuild
+++ b/gnome-extra/gnome-builder/gnome-builder-3.16.3.ebuild
@@ -13,8 +13,9 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Builder"
 
 LICENSE="GPL-3+ GPL-2+ LGPL-3+ LGPL-2+ MIT CC-BY-SA-3.0 CC0-1.0"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64 ~x86"
 IUSE="+introspection"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 # FIXME: some unittests seem to hang forever
 RDEPEND="
diff --git a/gnome-extra/gnome-calculator/gnome-calculator-3.16.2.ebuild b/gnome-extra/gnome-calculator/gnome-calculator-3.16.2.ebuild
index 8a1e9f864c5d..3686aede8e57 100644
--- a/gnome-extra/gnome-calculator/gnome-calculator-3.16.2.ebuild
+++ b/gnome-extra/gnome-calculator/gnome-calculator-3.16.2.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Calculator"
 LICENSE="GPL-2"
 SLOT="0"
 IUSE=""
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux"
 
 COMMON_DEPEND="
 	>=dev-libs/glib-2.40:2
diff --git a/gnome-extra/gnome-calendar/gnome-calendar-3.16.2.ebuild b/gnome-extra/gnome-calendar/gnome-calendar-3.16.2.ebuild
index 82dd2e0cb34c..1b78c3e2aab7 100644
--- a/gnome-extra/gnome-calendar/gnome-calendar-3.16.2.ebuild
+++ b/gnome-extra/gnome-calendar/gnome-calendar-3.16.2.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Calendar"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64 ~x86"
 IUSE=""
 
 # >=libical-1.0.1 for https://bugzilla.gnome.org/show_bug.cgi?id=751244
diff --git a/gnome-extra/gnome-characters/gnome-characters-3.16.2.ebuild b/gnome-extra/gnome-characters/gnome-characters-3.16.2.ebuild
index ad8857766798..232eb4019188 100644
--- a/gnome-extra/gnome-characters/gnome-characters-3.16.2.ebuild
+++ b/gnome-extra/gnome-characters/gnome-characters-3.16.2.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://live.gnome.org/Gucharmap"
 
 LICENSE="GPL-2 BSD"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64 ~x86"
 IUSE="test"
 
 RDEPEND="${COMMON_DEPEND}
diff --git a/gnome-extra/gnome-clocks/gnome-clocks-3.16.1.ebuild b/gnome-extra/gnome-clocks/gnome-clocks-3.16.1.ebuild
index 0cd7941cfc0f..c43992c82920 100644
--- a/gnome-extra/gnome-clocks/gnome-clocks-3.16.1.ebuild
+++ b/gnome-extra/gnome-clocks/gnome-clocks-3.16.1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://live.gnome.org/GnomeClocks"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/gnome-extra/gnome-color-manager/gnome-color-manager-3.16.0.ebuild b/gnome-extra/gnome-color-manager/gnome-color-manager-3.16.0.ebuild
index f42e905bb583..41f236c5c244 100644
--- a/gnome-extra/gnome-color-manager/gnome-color-manager-3.16.0.ebuild
+++ b/gnome-extra/gnome-color-manager/gnome-color-manager-3.16.0.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://git.gnome.org/browse/gnome-color-manager"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="packagekit raw"
 
 # Need gtk+-3.3.8 for https://bugzilla.gnome.org/show_bug.cgi?id=673331
diff --git a/gnome-extra/gnome-contacts/gnome-contacts-3.16.2.ebuild b/gnome-extra/gnome-contacts/gnome-contacts-3.16.2.ebuild
index 3da430dca241..61ff5a61deb0 100644
--- a/gnome-extra/gnome-contacts/gnome-contacts-3.16.2.ebuild
+++ b/gnome-extra/gnome-contacts/gnome-contacts-3.16.2.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://wiki.gnome.org/Design/Apps/Contacts"
 LICENSE="GPL-2+"
 SLOT="0"
 IUSE="v4l"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 
 VALA_DEPEND="
 	$(vala_depend)
diff --git a/gnome-extra/gnome-documents/gnome-documents-3.16.3.ebuild b/gnome-extra/gnome-documents/gnome-documents-3.16.3.ebuild
index 0b56416f0387..1c429c4b92b4 100644
--- a/gnome-extra/gnome-documents/gnome-documents-3.16.3.ebuild
+++ b/gnome-extra/gnome-documents/gnome-documents-3.16.3.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Documents"
 LICENSE="GPL-2+"
 SLOT="0"
 IUSE=""
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 # Need gdk-pixbuf-2.25 for gdk_pixbuf_get_pixels_with_length
 COMMON_DEPEND="
diff --git a/gnome-extra/gnome-getting-started-docs/gnome-getting-started-docs-3.16.2.ebuild b/gnome-extra/gnome-getting-started-docs/gnome-getting-started-docs-3.16.2.ebuild
index dd1f78fee3cc..91424da1359b 100644
--- a/gnome-extra/gnome-getting-started-docs/gnome-getting-started-docs-3.16.2.ebuild
+++ b/gnome-extra/gnome-getting-started-docs/gnome-getting-started-docs-3.16.2.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://help.gnome.org/"
 
 LICENSE="CC-BY-SA-3.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm ~x86"
 IUSE=""
 
 RDEPEND="gnome-extra/gnome-user-docs"
diff --git a/gnome-extra/gnome-logs/gnome-logs-3.16.2.ebuild b/gnome-extra/gnome-logs/gnome-logs-3.16.2.ebuild
index 5d6f3d250138..e0cead85107e 100644
--- a/gnome-extra/gnome-logs/gnome-logs-3.16.2.ebuild
+++ b/gnome-extra/gnome-logs/gnome-logs-3.16.2.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Logs"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64 ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/gnome-extra/gnome-power-manager/gnome-power-manager-3.16.1.ebuild b/gnome-extra/gnome-power-manager/gnome-power-manager-3.16.1.ebuild
index 513a72b078d0..95b87e187302 100644
--- a/gnome-extra/gnome-power-manager/gnome-power-manager-3.16.1.ebuild
+++ b/gnome-extra/gnome-power-manager/gnome-power-manager-3.16.1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://projects.gnome.org/gnome-power-manager/"
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="test"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 
 COMMON_DEPEND="
 	>=dev-libs/glib-2.36:2
diff --git a/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-3.16.2.ebuild b/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-3.16.2.ebuild
index abbf7b8e122b..5c5287c3be6d 100644
--- a/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-3.16.2.ebuild
+++ b/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-3.16.2.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/GnomeShell/Extensions"
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="examples"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 COMMON_DEPEND="
 	>=dev-libs/glib-2.26:2
diff --git a/gnome-extra/gnome-shell-frippery/Manifest b/gnome-extra/gnome-shell-frippery/Manifest
index 18b28b069115..fcf0f28dc5b4 100644
--- a/gnome-extra/gnome-shell-frippery/Manifest
+++ b/gnome-extra/gnome-shell-frippery/Manifest
@@ -1,2 +1,3 @@
 DIST gnome-shell-frippery-0.10.2.tgz 85044 SHA256 26f9f89a1ee02204918280a5d12a955c5b26bdd9f3ea8d3ac081cd4882d61ec6 SHA512 815faea507d1bdb416427a91cee10e5ac9b853616e0fad0e54492545e2d05d1ff605da2991480e9beaf8348281d321c31df5700d044c80e7fd6b232a417c460b WHIRLPOOL bbecbae05f5c958371f3d0d190ca2b783f3e2ae3cdb2b7e5a43659520d94d8a8b0e78f84aaeb1ace1e3634db0ff00fa0908aa4a904aade6d695ff179a9cc804f
+DIST gnome-shell-frippery-0.10.3.tgz 72731 SHA256 1d8a88bcffcea1069c4e251fb718174bea93e1626191f2c41494877820a73a54 SHA512 4766109a6154558d4d16814fb2c0a9baed3b63f23d50b721c05b60e3be76c5e75570e5c21e8e652a88e91932423cbfd0908bacf1d56d946da7ee241da98b1eb2 WHIRLPOOL 99569b9d57814a34004d8215331546a4b073a6a7add69c776c49090fcd1fd1846ab585fca708980c1fc8d7e0b070be6ed5f78c4e8771c0804b8fb0b16bdb0af7
 DIST gnome-shell-frippery-0.9.0.tgz 82883 SHA256 ec48536cd3a543f27b1b07d2b36a220bbd66f2f4b9f71fb6ad712ff457e66343 SHA512 97fa737b2003453f0aba911618b363c138ee43761f351e0a03f968b31c1eae2ab883cb097568ff0f79770c90a598246d891177093fac4bd95ee43434b83fddac WHIRLPOOL 975c721e51a6505a974ee2ad92905665054cadedaf18c37d7773aa51ba0a9f321151f8348ff3ed14a83d7fe4cf3e7b0600a77b062d8f21850a5db0d573793963
diff --git a/gnome-extra/gnome-shell-frippery/gnome-shell-frippery-0.10.3.ebuild b/gnome-extra/gnome-shell-frippery/gnome-shell-frippery-0.10.3.ebuild
new file mode 100644
index 000000000000..c2d62bfe506e
--- /dev/null
+++ b/gnome-extra/gnome-shell-frippery/gnome-shell-frippery-0.10.3.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+DESCRIPTION="Unofficial extension pack providing GNOME 2-like features for GNOME 3"
+HOMEPAGE="http://frippery.org/extensions/index.html"
+SRC_URI="http://frippery.org/extensions/${P}.tgz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	app-eselect/eselect-gnome-shell-extensions
+	>=dev-libs/gjs-1.29
+	dev-libs/gobject-introspection:=
+	gnome-base/gnome-menus:3[introspection]
+	>=gnome-base/gnome-shell-3.16
+	media-libs/clutter:1.0[introspection]
+	x11-libs/pango[introspection]
+"
+DEPEND=""
+
+S="${WORKDIR}/.local/share/gnome-shell"
+
+src_install() {
+	insinto /usr/share/gnome-shell/extensions
+	doins -r extensions/*@*
+	dodoc gnome-shell-frippery/{CHANGELOG,README}
+}
+
+pkg_postinst() {
+	ebegin "Updating list of installed extensions"
+	eselect gnome-shell-extensions update
+	eend $?
+}
diff --git a/gnome-extra/gnome-system-monitor/gnome-system-monitor-3.16.0.ebuild b/gnome-extra/gnome-system-monitor/gnome-system-monitor-3.16.0.ebuild
index 943cc960ed73..3851f8b9a59d 100644
--- a/gnome-extra/gnome-system-monitor/gnome-system-monitor-3.16.0.ebuild
+++ b/gnome-extra/gnome-system-monitor/gnome-system-monitor-3.16.0.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://help.gnome.org/users/gnome-system-monitor/"
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="systemd +X"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 
 RDEPEND="
 	>=dev-libs/glib-2.37.3:2
diff --git a/gnome-extra/gnome-tweak-tool/gnome-tweak-tool-3.16.2.ebuild b/gnome-extra/gnome-tweak-tool/gnome-tweak-tool-3.16.2.ebuild
index 5314e0a6ad07..82c25676f859 100644
--- a/gnome-extra/gnome-tweak-tool/gnome-tweak-tool-3.16.2.ebuild
+++ b/gnome-extra/gnome-tweak-tool/gnome-tweak-tool-3.16.2.ebuild
@@ -17,7 +17,7 @@ SLOT="0"
 IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 
 # Newer pygobject needed due upstream bug #723951
 COMMON_DEPEND="
diff --git a/gnome-extra/gnome-user-docs/gnome-user-docs-3.16.1.ebuild b/gnome-extra/gnome-user-docs/gnome-user-docs-3.16.1.ebuild
index 34dc73c7b5b3..949c77c6e549 100644
--- a/gnome-extra/gnome-user-docs/gnome-user-docs-3.16.1.ebuild
+++ b/gnome-extra/gnome-user-docs/gnome-user-docs-3.16.1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://git.gnome.org/browse/gnome-user-docs"
 
 LICENSE="CC-BY-3.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE="test"
 
 RDEPEND=""
diff --git a/gnome-extra/gnome-weather/gnome-weather-3.16.2.1.ebuild b/gnome-extra/gnome-weather/gnome-weather-3.16.2.1.ebuild
index 2d218e40f132..6e75ea2b3b7d 100644
--- a/gnome-extra/gnome-weather/gnome-weather-3.16.2.1.ebuild
+++ b/gnome-extra/gnome-weather/gnome-weather-3.16.2.1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Design/Apps/Weather"
 
 LICENSE="GPL-2+ LGPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="test"
 
 RDEPEND="
@@ -23,7 +23,7 @@ RDEPEND="
 	>=x11-libs/gtk+-3.11.4:3
 "
 DEPEND="${RDEPEND}
-	dev-util/appdata-tools
+	dev-libs/appstream-glib
 	>=dev-util/intltool-0.26
 	virtual/pkgconfig
 	test? ( dev-util/dogtail )
diff --git a/gnome-extra/gucharmap/gucharmap-3.16.2.ebuild b/gnome-extra/gucharmap/gucharmap-3.16.2.ebuild
index 58e34e9d9a6b..e5d763a61dd4 100644
--- a/gnome-extra/gucharmap/gucharmap-3.16.2.ebuild
+++ b/gnome-extra/gucharmap/gucharmap-3.16.2.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://live.gnome.org/Gucharmap"
 
 LICENSE="GPL-3"
 SLOT="2.90"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
 IUSE="cjk +introspection test vala"
 REQUIRED_USE="vala? ( introspection )"
 
diff --git a/gnome-extra/libgda/libgda-5.2.4.ebuild b/gnome-extra/libgda/libgda-5.2.4.ebuild
index 1d46a0d325ca..ab0450c1167c 100644
--- a/gnome-extra/libgda/libgda-5.2.4.ebuild
+++ b/gnome-extra/libgda/libgda-5.2.4.ebuild
@@ -26,7 +26,7 @@ REQUIRED_USE="
 # firebird license is not GPL compatible
 
 SLOT="5/4" # subslot = libgda-5.0 soname version
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 
 RDEPEND="
 	app-text/iso-codes
diff --git a/gnome-extra/libgsf/libgsf-1.14.34.ebuild b/gnome-extra/libgsf/libgsf-1.14.34.ebuild
index b7d2640df410..18f86ee7023d 100644
--- a/gnome-extra/libgsf/libgsf-1.14.34.ebuild
+++ b/gnome-extra/libgsf/libgsf-1.14.34.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://developer.gnome.org/gsf/"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0/114" # libgsf-1.so version
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="bzip2 gtk +introspection"
 
 RDEPEND="
diff --git a/gnome-extra/nautilus-tracker-tags/nautilus-tracker-tags-1.4.1.ebuild b/gnome-extra/nautilus-tracker-tags/nautilus-tracker-tags-1.4.1.ebuild
index 5bd4bccae48f..9f96299b4dc1 100644
--- a/gnome-extra/nautilus-tracker-tags/nautilus-tracker-tags-1.4.1.ebuild
+++ b/gnome-extra/nautilus-tracker-tags/nautilus-tracker-tags-1.4.1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Tracker"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
 COMMON_DEPEND="
diff --git a/gnome-extra/nemo/Manifest b/gnome-extra/nemo/Manifest
index 4a5c8508fc5b..ad92639189f7 100644
--- a/gnome-extra/nemo/Manifest
+++ b/gnome-extra/nemo/Manifest
@@ -1,3 +1,3 @@
 DIST nemo-2.4.5.tar.gz 1356445 SHA256 a4eae743f25d1a66cbb5b28675d78aee1d57224c825d6baebdf88068dc1d8d04 SHA512 1f6120569198f54e3fbc7f57ca9d4f644e617e029d28dc08669ae33774e474b838a5d430b0bf5ef3e0e253596a02666bbc1cbab32d1ef134971871567bf49bdb WHIRLPOOL 804c169fd6b22558718223bab44cafe183214bdd0325e1c1dcf67a41a28fddca35cf5890b42248c6b0ef485d6010cc9151c75a3994e792092b366fc98e11bd75
-DIST nemo-2.6.5.tar.gz 1380526 SHA256 bf7365cde5a7348376dda3e8c43ee33b9d592f04ddbeb767faf0d5ecbe26e89a SHA512 2d0fd351b13375322c4a74fb796356dfc1485c67f6f3cc15d7e044e08bc35dec3969ebba783cd3d140103e3db9ad097ce2a4c1dfff89a0768551d9331ee1f25d WHIRLPOOL e727661685521b429f096711b18e6aa7b9cdc184f50a7a3c763a26c21ae07168d5195cb02fd5e2eeb22117284de0288f2fe24e30b2f8533595e5d627bfa93e6c
 DIST nemo-2.6.6.tar.gz 1404568 SHA256 03e0345dad1e98b95e30b804acc5ec3613d4a258efce592db6e1296569a55a3f SHA512 2f234fa123202357f978603efa2ef20a7cf38a61d49205201c00f5e6d69add8e9ff1cbf1584a149b6ad333d974b406183d57511143d6cf20b186a68fd80e23a0 WHIRLPOOL a805a6a0698015d175fc79f8443192aed28f9dcc1b8064e98b450004b749cd88c52d4322314295e89fb77659dc8b8bed76eb79101b53a387427c6fa456dfe8ca
+DIST nemo-2.6.7.tar.gz 1404410 SHA256 fcb7c596d4aa2325df0c9a0af6d26bcc8c1c85f299ae511f8a1ea3a23619f8ed SHA512 2a7f52b830eab7967f3ca779de076739371f51071f705d134de469b7642e3b592428f14e4c4e45c623445c36c990e90ad5c6698864cb920d0140aa3ad76a9f0b WHIRLPOOL 62fe0313d51b9b312960fb9f2ab059d9a6ca74ec32c88eb0eb860444bbc5c3b975cd7e9a09739c27b511f9d965621e8a4cff686d33f34fe3de0a09e8f34f0870
diff --git a/gnome-extra/nemo/nemo-2.6.5.ebuild b/gnome-extra/nemo/nemo-2.6.5.ebuild
deleted file mode 100644
index 85829811dcb7..000000000000
--- a/gnome-extra/nemo/nemo-2.6.5.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools eutils gnome2 python-any-r1 virtualx
-
-DESCRIPTION="A file manager for Cinnamon, forked from Nautilus"
-HOMEPAGE="http://cinnamon.linuxmint.com/"
-SRC_URI="https://github.com/linuxmint/nemo/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+ LGPL-2+ FDL-1.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="exif +introspection +l10n packagekit tracker xmp"
-
-COMMON_DEPEND="
-	>=dev-libs/glib-2.34:2
-	>=gnome-extra/cinnamon-desktop-2.6.1:0=
-	>=x11-libs/pango-1.28.3
-	>=x11-libs/gtk+-3.3.17:3[introspection?]
-	>=dev-libs/libxml2-2.7.8:2
-
-	gnome-base/dconf:0=
-	gnome-base/gsettings-desktop-schemas
-	>=x11-libs/libnotify-0.7:=
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXrender
-
-	exif? ( >=media-libs/libexif-0.6.20:= )
-	introspection? ( >=dev-libs/gobject-introspection-0.6.4 )
-	tracker? ( >=app-misc/tracker-0.12:= )
-	xmp? ( >=media-libs/exempi-2.1.0:= )
-"
-RDEPEND="${COMMON_DEPEND}
-	x11-themes/gnome-icon-theme-symbolic
-	l10n? ( >=gnome-extra/cinnamon-translations-2.2 )
-"
-DEPEND="${COMMON_DEPEND}
-	${PYTHON_DEPS}
-	$(python_gen_any_dep '
-		dev-python/polib[${PYTHON_USEDEP}]
-		dev-python/pygobject:3[${PYTHON_USEDEP}]
-	')
-	>=dev-lang/perl-5
-	>=dev-util/gdbus-codegen-2.31.0
-	dev-util/gtk-doc-am
-	>=dev-util/intltool-0.40.1
-	sys-devel/gettext
-	virtual/pkgconfig
-	x11-proto/xproto
-
-	dev-util/gtk-doc
-	gnome-base/gnome-common
-"
-# For eautoreconf
-#	gnome-base/gnome-common, dev-util/gtk-doc (not only -am!)
-PDEPEND=">=gnome-base/gvfs-0.1.2"
-
-src_prepare() {
-	epatch_user
-	eautoreconf
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-		--disable-update-mimedb \
-		--disable-more-warnings \
-		$(use_enable exif libexif) \
-		$(use_enable introspection) \
-		$(use_enable tracker) \
-		$(use_enable xmp)
-}
-
-src_test() {
-	# FIXME: this should be handled at eclass level
-	"${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/libnemo-private" || die
-
-	gnome2_environment_reset
-	unset DBUS_SESSION_BUS_ADDRESS
-	cd src # we don't care about translation tests
-	GSETTINGS_SCHEMA_DIR="${S}/libnemo-private" GSETTINGS_BACKEND="memory" Xemake check
-}
diff --git a/gnome-extra/nemo/nemo-2.6.7.ebuild b/gnome-extra/nemo/nemo-2.6.7.ebuild
new file mode 100644
index 000000000000..cd1274063cd7
--- /dev/null
+++ b/gnome-extra/nemo/nemo-2.6.7.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+PYTHON_COMPAT=( python2_7 )
+
+inherit autotools eutils gnome2 python-any-r1 virtualx
+
+DESCRIPTION="A file manager for Cinnamon, forked from Nautilus"
+HOMEPAGE="http://cinnamon.linuxmint.com/"
+SRC_URI="https://github.com/linuxmint/nemo/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+ LGPL-2+ FDL-1.1"
+SLOT="0"
+KEYWORDS="amd64 ~x86"
+IUSE="exif +introspection +nls packagekit tracker xmp"
+
+COMMON_DEPEND="
+	>=dev-libs/glib-2.34:2[dbus]
+	>=gnome-extra/cinnamon-desktop-2.6.1:0=
+	>=x11-libs/pango-1.28.3
+	>=x11-libs/gtk+-3.3.17:3[introspection?]
+	>=dev-libs/libxml2-2.7.8:2
+
+	gnome-base/dconf:0=
+	gnome-base/gsettings-desktop-schemas
+	>=x11-libs/libnotify-0.7:=
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXrender
+
+	exif? ( >=media-libs/libexif-0.6.20:= )
+	introspection? ( >=dev-libs/gobject-introspection-0.6.4:= )
+	tracker? ( >=app-misc/tracker-0.12:= )
+	xmp? ( >=media-libs/exempi-2.1.0:= )
+"
+RDEPEND="${COMMON_DEPEND}
+	x11-themes/gnome-icon-theme-symbolic
+	nls? ( >=gnome-extra/cinnamon-translations-2.2 )
+"
+DEPEND="${COMMON_DEPEND}
+	${PYTHON_DEPS}
+	$(python_gen_any_dep '
+		dev-python/polib[${PYTHON_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
+	')
+	>=dev-lang/perl-5
+	>=dev-util/gdbus-codegen-2.31.0
+	dev-util/gtk-doc-am
+	>=dev-util/intltool-0.40.1
+	sys-devel/gettext
+	virtual/pkgconfig
+	x11-proto/xproto
+
+	dev-util/gtk-doc
+	gnome-base/gnome-common
+"
+# For eautoreconf
+#	gnome-base/gnome-common, dev-util/gtk-doc (not only -am!)
+PDEPEND=">=gnome-base/gvfs-0.1.2"
+
+src_prepare() {
+	epatch_user
+	eautoreconf
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure \
+		--disable-update-mimedb \
+		--disable-more-warnings \
+		$(use_enable exif libexif) \
+		$(use_enable introspection) \
+		$(use_enable tracker) \
+		$(use_enable xmp)
+}
+
+src_test() {
+	# FIXME: this should be handled at eclass level
+	"${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/libnemo-private" || die
+
+	gnome2_environment_reset
+	unset DBUS_SESSION_BUS_ADDRESS
+	cd src # we don't care about translation tests
+	GSETTINGS_SCHEMA_DIR="${S}/libnemo-private" GSETTINGS_BACKEND="memory" Xemake check
+}
diff --git a/gnome-extra/nm-applet/Manifest b/gnome-extra/nm-applet/Manifest
index 7ba3620d13df..373df83e96ec 100644
--- a/gnome-extra/nm-applet/Manifest
+++ b/gnome-extra/nm-applet/Manifest
@@ -1,5 +1,4 @@
-DIST network-manager-applet-0.9.10.0.tar.xz 1274656 SHA256 f5c26c692f538dc0145dc7d46d3d390754fad73d0ff06861c074c61f3dc54eca SHA512 d9472bb6613fa8feb7bbde15932542adcfdb99897d6f1376ea4d511a6ff785debb0b4dd630deb7dc6ba2c244ca2487a00cd8c758274a914d61864370226e2b1d WHIRLPOOL 8f03dabe55a29d24cb0959b4a36c63ca31a4866e6af04dbc8e0eed575c148d674d583d5e039721e9a6eed7a0115943d130dea9b0bce39ec167a3376a92b00365
 DIST network-manager-applet-0.9.8.10.tar.xz 1234720 SHA256 46fee9a1e667d1826e6a94bb6bd2e6bdbde535fc995e534542f5f7e8b8dae0cb SHA512 c943eff9eaba1f28ad9101c659d4e3da72d6190dd7fd58f3c3d54bcc53c21ec33247aee6dc7a3d7348efd905876f699c39fb3f64cf46f5f627a3976deaa06fa2 WHIRLPOOL 070e4fc914f5db60fc5e66884c7a1868a49cc011556685c9f64505e55d7c59ac749f9828c8fdf31c1e5e727b640943ea9663c6ef0139adb634f64097c4b4f243
-DIST network-manager-applet-1.0.0.tar.xz 1312480 SHA256 5fede8d2060002c695fbba07e59cbc7db90a39a3378bb9690274c205d2503152 SHA512 d1d4ea0f93dacf4068b46df5823c8d53cc792e4796ee592f538f00d3fb1f2c06e5624fafc45e1fd63f3301e5fe44fa2793bf33b428577bb662ac511e641ae970 WHIRLPOOL b53ee8aef1943d390cf05fbb75f78fbd87094fc5876b76bac3dfc37d7d3826dbbf10d76f414a68b190ee05ec7fd27f67a7be4ff794820b34e967aca7b0d86b71
 DIST network-manager-applet-1.0.2.tar.xz 1310236 SHA256 760af85b43fa5bcf74b96f899a6d4c1d5e9445e5eb63088c49e5164bbf88d9a9 SHA512 8b9da7bb12bb6bb4ee7717e041160d1541b4183a766828e28fcdc387c82ad7b5c299535575842058cf72c13b29967c16e78bee741a61c368996e9f560dc85fd7 WHIRLPOOL 72deb07c2d27e624fa05b023818e4326cb5483513b27ebc8aeef3faf30cf7458aee3dbe6bc7df09b7b682a5d2d0f4b1589734ac2bb8959ae9ab5254f16c16fbf
 DIST network-manager-applet-1.0.4.tar.xz 1336632 SHA256 2cc26f03d0011d2a067bd5205dc0c17d5aa0470020a8c36d319ae10e5728af72 SHA512 2a71f5416a668f26d9ce24f00b71ee5cf4d6af05fa4e5d13523c96dfe73528491d7ac2e45dc464d557d257f50ad14f11c9c2a767cb69ac0844ebd1753de1a8f5 WHIRLPOOL 093e092a1dc5289090aebb1b9dc788c058ac6eb87920a3762c94be1bf2d016946f158fc4dec388f96723c237a4be078e43d31bf03551dc7c215fde0d21ae1ea8
+DIST network-manager-applet-1.0.6.tar.xz 1339672 SHA256 5d4d53e0d2221d97cd214c3817a77cbeeed0e198d565101b6822ecb49ca940fa SHA512 4f34cbfc0158090f9b3f32f3b29a2c771cbf35b6334c9444c222a7b87f958b59bd1179f4241e82dd7ec354f6ef3067dde58d461fe38464b7593fad9f710f8a60 WHIRLPOOL f8c93545123d7c24b0270337cf0c09b89d9604947ad101e8493e7772db4931fc33be13163d42ca7dd8270b8d0504e1208a8e7c93a0dbc23d38146cb633506a6f
diff --git a/gnome-extra/nm-applet/nm-applet-0.9.10.0.ebuild b/gnome-extra/nm-applet/nm-applet-0.9.10.0.ebuild
deleted file mode 100644
index 3adf7a02d588..000000000000
--- a/gnome-extra/nm-applet/nm-applet-0.9.10.0.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-GNOME_ORG_MODULE="network-manager-applet"
-
-inherit gnome2
-
-DESCRIPTION="GNOME applet for NetworkManager"
-HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE="bluetooth gconf +introspection modemmanager"
-KEYWORDS="amd64 x86"
-
-RDEPEND="
-	app-crypt/libsecret
-	>=dev-libs/glib-2.32:2
-	>=dev-libs/dbus-glib-0.88
-	>=sys-apps/dbus-1.4.1
-	>=sys-auth/polkit-0.96-r1
-	>=x11-libs/gtk+-3.4:3[introspection?]
-	>=x11-libs/libnotify-0.7.0
-
-	app-text/iso-codes
-	>=net-misc/networkmanager-0.9.9.95[introspection?]
-	net-misc/mobile-broadband-provider-info
-
-	bluetooth? ( >=net-wireless/gnome-bluetooth-2.27.6:= )
-	gconf? (
-		>=gnome-base/gconf-2.20:2
-		gnome-base/libgnome-keyring )
-	introspection? ( >=dev-libs/gobject-introspection-0.9.6 )
-	modemmanager? ( >=net-misc/modemmanager-0.7.990 )
-	virtual/freedesktop-icon-theme
-	virtual/notification-daemon
-	virtual/libgudev:=
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	>=dev-util/intltool-0.40
-"
-
-src_configure() {
-	gnome2_src_configure \
-		--disable-more-warnings \
-		--disable-static \
-		--localstatedir=/var \
-		$(use_with bluetooth) \
-		$(use_enable gconf migration) \
-		$(use_enable introspection) \
-		$(use_with modemmanager modem-manager-1)
-}
diff --git a/gnome-extra/nm-applet/nm-applet-1.0.0.ebuild b/gnome-extra/nm-applet/nm-applet-1.0.0.ebuild
deleted file mode 100644
index ecd73eda08dc..000000000000
--- a/gnome-extra/nm-applet/nm-applet-1.0.0.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-GNOME_ORG_MODULE="network-manager-applet"
-
-inherit gnome2
-
-DESCRIPTION="GNOME applet for NetworkManager"
-HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE="bluetooth +introspection modemmanager"
-KEYWORDS="~alpha amd64 ~arm ~sparc x86"
-
-RDEPEND="
-	app-crypt/libsecret
-	>=dev-libs/glib-2.32:2
-	>=dev-libs/dbus-glib-0.88
-	>=sys-apps/dbus-1.4.1
-	>=sys-auth/polkit-0.96-r1
-	>=x11-libs/gtk+-3.4:3[introspection?]
-	>=x11-libs/libnotify-0.7.0
-
-	app-text/iso-codes
-	>=net-misc/networkmanager-1.0.0[introspection?]
-	net-misc/mobile-broadband-provider-info
-
-	bluetooth? ( >=net-wireless/gnome-bluetooth-2.27.6:= )
-	introspection? ( >=dev-libs/gobject-introspection-0.9.6 )
-	modemmanager? ( >=net-misc/modemmanager-0.7.990 )
-	virtual/freedesktop-icon-theme
-	virtual/notification-daemon
-	virtual/libgudev:=
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	>=dev-util/intltool-0.40
-"
-
-src_configure() {
-	gnome2_src_configure \
-		--disable-more-warnings \
-		--disable-static \
-		--disable-migration \
-		--localstatedir=/var \
-		$(use_with bluetooth) \
-		$(use_enable introspection) \
-		$(use_with modemmanager modem-manager-1)
-}
diff --git a/gnome-extra/nm-applet/nm-applet-1.0.6.ebuild b/gnome-extra/nm-applet/nm-applet-1.0.6.ebuild
new file mode 100644
index 000000000000..1eb3f3c92fbb
--- /dev/null
+++ b/gnome-extra/nm-applet/nm-applet-1.0.6.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+GNOME_ORG_MODULE="network-manager-applet"
+
+inherit gnome2
+
+DESCRIPTION="GNOME applet for NetworkManager"
+HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE="bluetooth +introspection modemmanager"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND="
+	app-crypt/libsecret
+	>=dev-libs/glib-2.32:2[dbus]
+	>=dev-libs/dbus-glib-0.88
+	>=sys-apps/dbus-1.4.1
+	>=sys-auth/polkit-0.96-r1
+	>=x11-libs/gtk+-3.4:3[introspection?]
+	>=x11-libs/libnotify-0.7.0
+
+	app-text/iso-codes
+	>=net-misc/networkmanager-1.0.0[introspection?]
+	net-misc/mobile-broadband-provider-info
+
+	bluetooth? ( >=net-wireless/gnome-bluetooth-2.27.6:= )
+	introspection? ( >=dev-libs/gobject-introspection-0.9.6:= )
+	modemmanager? ( >=net-misc/modemmanager-0.7.990 )
+	virtual/freedesktop-icon-theme
+	virtual/libgudev:=
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	>=dev-util/intltool-0.50.1
+"
+
+PDEPEND="virtual/notification-daemon" #546134
+
+src_configure() {
+	gnome2_src_configure \
+		--disable-more-warnings \
+		--disable-static \
+		--disable-migration \
+		--localstatedir=/var \
+		$(use_with bluetooth) \
+		$(use_enable introspection) \
+		$(use_with modemmanager modem-manager-1)
+}
diff --git a/gnome-extra/sushi/sushi-3.16.0.ebuild b/gnome-extra/sushi/sushi-3.16.0.ebuild
index c03f0d299301..b50566d03b85 100644
--- a/gnome-extra/sushi/sushi-3.16.0.ebuild
+++ b/gnome-extra/sushi/sushi-3.16.0.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://git.gnome.org/browse/sushi"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="office"
 
 # Optional app-office/unoconv support (OOo to pdf)
diff --git a/gnome-extra/yelp-xsl/yelp-xsl-3.16.1.ebuild b/gnome-extra/yelp-xsl/yelp-xsl-3.16.1.ebuild
index 072ac1ad2c32..faf8fdf3c86c 100644
--- a/gnome-extra/yelp-xsl/yelp-xsl-3.16.1.ebuild
+++ b/gnome-extra/yelp-xsl/yelp-xsl-3.16.1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://www.gnome.org/"
 LICENSE="GPL-2+ LGPL-2.1+ MIT FDL-1.1+"
 SLOT="0"
 IUSE=""
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~arm-linux ~x86-linux"
 
 RDEPEND="
 	>=dev-libs/libxml2-2.6.12:=
diff --git a/gnome-extra/yelp/yelp-3.16.1.ebuild b/gnome-extra/yelp/yelp-3.16.1.ebuild
index 6ebc64be434f..e680bbc0e99e 100644
--- a/gnome-extra/yelp/yelp-3.16.1.ebuild
+++ b/gnome-extra/yelp/yelp-3.16.1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Yelp"
 LICENSE="GPL-2+"
 SLOT="0"
 IUSE=""
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
 
 RDEPEND="
 	app-arch/bzip2:=
diff --git a/gnome-extra/zenity/zenity-3.16.3.ebuild b/gnome-extra/zenity/zenity-3.16.3.ebuild
index 5f20fec241da..9a05ac002652 100644
--- a/gnome-extra/zenity/zenity-3.16.3.ebuild
+++ b/gnome-extra/zenity/zenity-3.16.3.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Zenity"
 
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux"
 IUSE="libnotify test +webkit"
 
 RDEPEND="
diff --git a/gnustep-base/gnustep-make/metadata.xml b/gnustep-base/gnustep-make/metadata.xml
index 3a2f3184686c..10f57cdec6a4 100644
--- a/gnustep-base/gnustep-make/metadata.xml
+++ b/gnustep-base/gnustep-make/metadata.xml
@@ -2,7 +2,6 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>gnustep</herd>
-<herd>proxy-maintainers</herd>
 <longdescription>
 The makefile package is a simple, powerful and extensible way to write
 makefiles for a GNUstep-based project.  It allows the user to write a
diff --git a/gnustep-libs/smbkit/Manifest b/gnustep-libs/smbkit/Manifest
index ddef2a627fde..fa8fb7cd4cb5 100644
--- a/gnustep-libs/smbkit/Manifest
+++ b/gnustep-libs/smbkit/Manifest
@@ -1 +1 @@
-DIST smbkit-0.0.1.20061010.tar.bz2 22614 SHA256 471966efed4de00357207978180c44bcf6fc42c7c3159dbfe37656bf2f3fdbf7
+DIST smbkit-0.0.1.20061010.tar.bz2 22614 SHA256 471966efed4de00357207978180c44bcf6fc42c7c3159dbfe37656bf2f3fdbf7 SHA512 7d7f31aa31364a8f8ff8a165025c68a8cb4b330e1cae27106137e0d8170dd9072b6bd2be687352a8139d35d59a53068977dc973eab3875de5431d48cd50128bb WHIRLPOOL bd0d61efaa2299cb25c9736470c2db2d6ec8026178d0c93f94ec079062fd7d2afcf39b64272d34f580aaf8021c04fa7b7685895edd9d42be64f3301a0649d822
diff --git a/gnustep-libs/smbkit/smbkit-0.0.1.20061010-r1.ebuild b/gnustep-libs/smbkit/smbkit-0.0.1.20061010-r1.ebuild
new file mode 100644
index 000000000000..f19da6becdbd
--- /dev/null
+++ b/gnustep-libs/smbkit/smbkit-0.0.1.20061010-r1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit gnustep-2
+
+DESCRIPTION="SMBKit offers a samba library and headers for GNUstep"
+HOMEPAGE="http://www.gnustep.org"
+SRC_URI="mirror://gentoo/${P}.tar.bz2"
+
+KEYWORDS="~amd64 ~ppc ~x86"
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+
+RDEPEND="net-fs/samba"
+DEPEND="${DEPEND}
+	virtual/pkgconfig"
+
+S="${WORKDIR}/${PN}"
+
+src_compile() {
+	egnustep_env
+	egnustep_make AUXILIARY_CPPFLAGS="$(pkg-config --cflags smbclient)"
+}
diff --git a/java-virtuals/jdk-with-com-sun/jdk-with-com-sun-20111111-r3.ebuild b/java-virtuals/jdk-with-com-sun/jdk-with-com-sun-20111111-r3.ebuild
new file mode 100644
index 000000000000..04fecaa3fe74
--- /dev/null
+++ b/java-virtuals/jdk-with-com-sun/jdk-with-com-sun-20111111-r3.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit java-virtuals-2
+
+DESCRIPTION="Virtual ebuilds that require internal com.sun classes from a JDK"
+HOMEPAGE="https://www.gentoo.org"
+SRC_URI=""
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~ppc ~ppc64 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos"
+IUSE=""
+
+DEPEND=""
+RDEPEND="|| (
+			dev-java/icedtea-bin:6
+			dev-java/icedtea:6
+			dev-java/icedtea-bin:7
+			dev-java/icedtea:7
+			dev-java/oracle-jdk-bin:1.7
+			dev-java/oracle-jdk-bin:1.8
+			dev-java/apple-jdk-bin:1.6
+			dev-java/ibm-jdk-bin:1.6
+		)"
+
+JAVA_VIRTUAL_VM="icedtea-bin-6 icedtea6-bin icedtea-6 icedtea6 icedtea-bin-6 icedtea-bin-7 icedtea-7 oracle-jdk-bin-1.7 oracle-jdk-bin-1.8 apple-jdk-bin-1.6 ibm-jdk-bin-1.6"
diff --git a/java-virtuals/xmlrpc-api/xmlrpc-api-0.ebuild b/java-virtuals/xmlrpc-api/xmlrpc-api-0.ebuild
index a49307d989e5..07d7b60e27a3 100644
--- a/java-virtuals/xmlrpc-api/xmlrpc-api-0.ebuild
+++ b/java-virtuals/xmlrpc-api/xmlrpc-api-0.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://www.gentoo.org"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 DEPEND=""
 RDEPEND="dev-java/glassfish-xmlrpc-api:0"
diff --git a/kde-apps/kde-l10n/kde-l10n-15.08.0-r1.ebuild b/kde-apps/kde-l10n/kde-l10n-15.08.0-r1.ebuild
new file mode 100644
index 000000000000..4c2dbb923393
--- /dev/null
+++ b/kde-apps/kde-l10n/kde-l10n-15.08.0-r1.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_HANDBOOK="true"
+inherit kde5
+
+DESCRIPTION="KDE internationalization package"
+HOMEPAGE="http://l10n.kde.org"
+
+DEPEND="
+	sys-devel/gettext
+"
+RDEPEND="
+	!<kde-apps/kde4-l10n-${PV}
+	!kde-apps/kde4-l10n[-minimal]
+	!<kde-apps/kdepim-l10n-${PV}
+	!<kde-apps/ktp-l10n-${PV}
+"
+
+KEYWORDS=" ~amd64 ~x86"
+IUSE=""
+
+# /usr/portage/distfiles $ ls -1 kde-l10n-*-${PV}.* |sed -e 's:-${PV}.tar.xz::' -e 's:kde-l10n-::' |tr '\n' ' '
+MY_LANGS="ar bg bs ca ca@valencia cs da de el en_GB eo es et eu fa fi fr ga gl
+he hi hr hu ia id is it ja kk km ko lt lv mr nb nds nl nn pa pl pt pt_BR ro ru
+sk sl sr sv tr ug uk wa zh_CN zh_TW"
+
+URI_BASE="${SRC_URI/-${PV}.tar.xz/}"
+SRC_URI=""
+
+for MY_LANG in ${MY_LANGS} ; do
+	IUSE="${IUSE} linguas_${MY_LANG}"
+	SRC_URI="${SRC_URI} linguas_${MY_LANG}? ( ${URI_BASE}/${PN}-${MY_LANG}-${PV}.tar.xz )"
+done
+
+S="${WORKDIR}"
+
+src_unpack() {
+	if [[ -z ${A} ]]; then
+		elog
+		elog "You either have the LINGUAS variable unset, or it only"
+		elog "contains languages not supported by ${P}."
+		elog "You won't have any additional language support."
+		elog
+		elog "${P} supports these language codes:"
+		elog "${MY_LANGS}"
+		elog
+	fi
+
+	[[ -n ${A} ]] && unpack ${A}
+}
+
+src_prepare() {
+	local LNG DIR
+	# add all linguas to cmake
+	if [[ -n ${A} ]]; then
+		for LNG in ${LINGUAS}; do
+			DIR="${PN}-${LNG}-${PV}"
+			if [[ -d "${DIR}" ]] ; then
+				echo "add_subdirectory( ${DIR} )" >> "${S}"/CMakeLists.txt
+
+				# Drop KDE4-based part
+				sed -e '/add_subdirectory(4)/ s/^/#/'\
+					-i "${S}"/${DIR}/CMakeLists.txt || die
+
+				# Remove kdepim translations (part of kde-apps/kdepim-l10n)
+				for subdir in kdepim kdepimlibs kdepim-runtime pim; do
+					find "${S}/${DIR}" -name CMakeLists.txt -type f \
+						-exec sed -i -e "/add_subdirectory( *${subdir} *)/ s/^/#/" {} +
+				done
+
+				# Remove ktp translations (part of kde-apps/ktp-l10n)
+				# Drop that hack (and kde-apps/ktp-l10n) after ktp:4 removal
+				find "${S}"/${DIR}/5/${LNG}/messages/kdenetwork -type f \
+					\( -name kaccounts*po -o -name kcm_ktp*po -o -name kcmtelepathy*po \
+					-o -name kded_ktp*po -o -name ktp*po -o -name plasma*ktp*po \) \
+					-delete
+
+				# Handbook optional
+				sed -e '/KF5DocTools/ s/ REQUIRED//'\
+					-i "${S}"/${DIR}/5/${LNG}/CMakeLists.txt || die
+				if ! use handbook ; then
+					sed -e '/add_subdirectory(docs)/ s/^/#/'\
+						-i "${S}"/${DIR}/5/${LNG}/CMakeLists.txt || die
+				fi
+
+				# Fix broken LINGUAS=sr (KDE4 leftover)
+				if [[ ${LNG} = "sr" ]] ; then
+					sed -e '/add_subdirectory(lokalize)/ s/^/#/'\
+						-i "${S}"/${DIR}/5/${LNG}/data/kdesdk/CMakeLists.txt || die
+				fi
+			fi
+		done
+	fi
+}
+
+src_configure() {
+	mycmakeargs=(
+		$(cmake-utils_use_find_package handbook KF5DocTools)
+	)
+	[[ -n ${A} ]] && kde5_src_configure
+}
+
+src_compile() {
+	[[ -n ${A} ]] && kde5_src_compile
+}
+
+src_test() {
+	[[ -n ${A} ]] && kde5_src_test
+}
+
+src_install() {
+	[[ -n ${A} ]] && kde5_src_install
+}
diff --git a/kde-apps/kde-l10n/kde-l10n-15.08.0.ebuild b/kde-apps/kde-l10n/kde-l10n-15.08.0.ebuild
deleted file mode 100644
index 4e5275129ed9..000000000000
--- a/kde-apps/kde-l10n/kde-l10n-15.08.0.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-KDE_HANDBOOK="true"
-inherit kde5
-
-DESCRIPTION="KDE internationalization package"
-HOMEPAGE="http://l10n.kde.org"
-
-DEPEND="
-	sys-devel/gettext
-"
-RDEPEND="
-	!<kde-apps/kde4-l10n-${PV}
-"
-
-KEYWORDS=" ~amd64 ~x86"
-IUSE=""
-
-# /usr/portage/distfiles $ ls -1 kde-l10n-*-${PV}.* |sed -e 's:-${PV}.tar.xz::' -e 's:kde-l10n-::' |tr '\n' ' '
-MY_LANGS="ar bg bs ca ca@valencia cs da de el en_GB eo es et eu fa fi fr ga gl
-he hi hr hu ia id is it ja kk km ko lt lv mr nb nds nl nn pa pl pt pt_BR ro ru
-sk sl sr sv tr ug uk wa zh_CN zh_TW"
-
-URI_BASE="${SRC_URI/-${PV}.tar.xz/}"
-SRC_URI=""
-
-for MY_LANG in ${MY_LANGS} ; do
-	IUSE="${IUSE} linguas_${MY_LANG}"
-	SRC_URI="${SRC_URI} linguas_${MY_LANG}? ( ${URI_BASE}/${PN}-${MY_LANG}-${PV}.tar.xz )"
-done
-
-S="${WORKDIR}"
-
-src_unpack() {
-	if [[ -z ${A} ]]; then
-		elog
-		elog "You either have the LINGUAS variable unset, or it only"
-		elog "contains languages not supported by ${P}."
-		elog "You won't have any additional language support."
-		elog
-		elog "${P} supports these language codes:"
-		elog "${MY_LANGS}"
-		elog
-	fi
-
-	[[ -n ${A} ]] && unpack ${A}
-}
-
-src_prepare() {
-	local LNG DIR
-	# add all linguas to cmake
-	if [[ -n ${A} ]]; then
-		for LNG in ${LINGUAS}; do
-			DIR="${PN}-${LNG}-${PV}"
-			if [[ -d "${DIR}" ]] ; then
-				echo "add_subdirectory( ${DIR} )" >> "${S}"/CMakeLists.txt
-
-				# Drop KDE4-based part
-				sed -e '/add_subdirectory(4)/ s/^/#/'\
-					-i "${S}"/${DIR}/CMakeLists.txt || die
-
-				# Handbook optional
-				sed -e '/KF5DocTools/ s/ REQUIRED//'\
-					-i "${S}"/${DIR}/5/${LNG}/CMakeLists.txt || die
-				if ! use handbook ; then
-					sed -e '/add_subdirectory(docs)/ s/^/#/'\
-						-i "${S}"/${DIR}/5/${LNG}/CMakeLists.txt || die
-				fi
-
-				# Fix broken LINGUAS=sr (KDE4 leftover)
-				if [[ ${LNG} = "sr" ]] ; then
-					sed -e '/add_subdirectory(lokalize)/ s/^/#/'\
-						-i "${S}"/${DIR}/5/${LNG}/data/kdesdk/CMakeLists.txt || die
-				fi
-			fi
-		done
-	fi
-}
-
-src_configure() {
-	mycmakeargs=(
-		$(cmake-utils_use_find_package handbook KF5DocTools)
-	)
-	[[ -n ${A} ]] && kde5_src_configure
-}
-
-src_compile() {
-	[[ -n ${A} ]] && kde5_src_compile
-}
-
-src_test() {
-	[[ -n ${A} ]] && kde5_src_test
-}
-
-src_install() {
-	[[ -n ${A} ]] && kde5_src_install
-}
diff --git a/kde-apps/kde4-l10n/files/kde4-l10n-15.07.90-remove-dirs b/kde-apps/kde4-l10n/files/kde4-l10n-15.07.90-remove-dirs
index 4c4ea64b4ae8..005cab196344 100644
--- a/kde-apps/kde4-l10n/files/kde4-l10n-15.07.90-remove-dirs
+++ b/kde-apps/kde4-l10n/files/kde4-l10n-15.07.90-remove-dirs
@@ -47,4 +47,3 @@ docs/kde-workspace/kcontrol kcmaccess
 docs/kde-workspace/kcontrol kcmstyle
 docs/kde-workspace/kcontrol solid-actions
 docs/kde-workspace/kcontrol splashscreen
-
diff --git a/kde-apps/kde4-l10n/kde4-l10n-15.08.0-r1.ebuild b/kde-apps/kde4-l10n/kde4-l10n-15.08.0-r1.ebuild
new file mode 100644
index 000000000000..ef8076384291
--- /dev/null
+++ b/kde-apps/kde4-l10n/kde4-l10n-15.08.0-r1.ebuild
@@ -0,0 +1,141 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_HANDBOOK="optional"
+KMNAME="kde-l10n"
+inherit kde4-base
+
+DESCRIPTION="KDE internationalization package"
+HOMEPAGE="http://l10n.kde.org"
+
+DEPEND="
+	sys-devel/gettext
+"
+RDEPEND="
+	!<kde-apps/kde-l10n-${PV}
+"
+
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="minimal"
+
+REMOVE_DIRS="${FILESDIR}/${PN}-15.07.90-remove-dirs"
+REMOVE_MSGS="${FILESDIR}/${PN}-15.08.0-remove-messages"
+
+LV="4.14.3"
+LEGACY_LANGS="ar bg bs ca ca@valencia cs da de el en_GB es et eu fa fi fr ga gl
+he hi hr hu ia id is it ja kk km ko lt lv mr nb nds nl nn pa pl pt pt_BR ro ru
+sk sl sr sv tr ug uk wa zh_CN zh_TW"
+
+# /usr/portage/distfiles $ ls -1 kde-l10n-*-${PV}.* |sed -e 's:-${PV}.tar.xz::' -e 's:kde-l10n-::' |tr '\n' ' '
+MY_LANGS="ar bg bs ca ca@valencia cs da de el en_GB eo es et eu fa fi fr ga gl
+he hi hr hu ia id is it ja kk km ko lt lv mr nb nds nl nn pa pl pt pt_BR ro ru
+sk sl sr sv tr ug uk wa zh_CN zh_TW"
+
+URI_BASE="${SRC_URI/-${PV}.tar.xz/}"
+LURI_BASE="mirror://kde/stable/${LV}/src/${KMNAME}"
+SRC_URI=""
+
+for MY_LANG in ${LEGACY_LANGS} ; do
+	IUSE="${IUSE} linguas_${MY_LANG}"
+	SRC_URI="${SRC_URI} linguas_${MY_LANG}? ( ${LURI_BASE}/${KMNAME}-${MY_LANG}-${LV}.tar.xz )"
+done
+
+for MY_LANG in ${MY_LANGS} ; do
+	IUSE="${IUSE} linguas_${MY_LANG}"
+	SRC_URI="${SRC_URI} linguas_${MY_LANG}? ( ${URI_BASE}/${KMNAME}-${MY_LANG}-${PV}.tar.xz )"
+done
+
+S="${WORKDIR}"
+
+src_unpack() {
+	if [[ -z ${A} ]]; then
+		elog
+		elog "You either have the LINGUAS variable unset, or it only"
+		elog "contains languages not supported by ${P}."
+		elog "You won't have any additional language support."
+		elog
+		elog "${P} supports these language codes:"
+		elog "${MY_LANGS}"
+		elog
+	fi
+
+	[[ -n ${A} ]] && unpack ${A}
+}
+
+src_prepare() {
+	local LNG DIR SDIR
+	# add all linguas to cmake
+	if [[ -n ${A} ]]; then
+		for LNG in ${LINGUAS}; do
+			DIR="${KMNAME}-${LNG}-${PV}"
+			SDIR="${S}/${DIR}/4/${LNG}"
+			if [[ -d "${DIR}" ]] ; then
+				echo "add_subdirectory( ${DIR} )" >> "${S}"/CMakeLists.txt
+
+				# Drop KF5-based part
+				sed -e '/add_subdirectory(5)/ s/^/#/' -i "${S}"/${DIR}/CMakeLists.txt
+
+				# Drop translations installed with plasma 5 and kde-apps 5 packages
+				if use minimal; then
+					einfo "Removing paths from ${LNG}"
+					if [[ -d "${KMNAME}-${LNG}-${LV}" ]] ; then
+						rm -rf "${KMNAME}-${LNG}-${LV}"
+					fi
+
+					# Remove dirs
+					while read path; do
+						if [[ -n ${path} && -e "${SDIR}"/${path%\ *}/CMakeLists.txt ]] ; then
+							sed -e ":${path#*\ }: s:^:#:"\
+								-i "${SDIR}"/${path%\ *}/CMakeLists.txt
+						fi
+					done < <(grep -v "^#" "${REMOVE_DIRS}")
+
+					# Remove messages
+					for path in $(grep -v "^#" "${REMOVE_MSGS}") ; do
+						rm -f "${SDIR}"/messages/${path}
+						# Quirk for LINGUAS=sr variants
+						if [[ ${LNG} = "sr" ]] ; then
+							rm -f "${SDIR}"/${LNG}\@*/messages/${path} || die
+						fi
+					done
+				else
+					if [[ -d "${KMNAME}-${LNG}-${LV}" ]] ; then
+						# Do not try to copy kdepim localisation
+						for path in kdepim kdepimlibs kdepim-runtime; do
+							rm -rf "${KMNAME}-${LNG}-${LV}/messages/${path}" || die
+						done
+						# Merge legacy localisation
+						for path in $(find "${KMNAME}-${LNG}-${LV}" -name "*.po"); do
+							cp -rn "${path}" "${path/${LV}/${PV}/4/${LNG}}" || die
+						done
+						rm -rf "${KMNAME}-${LNG}-${LV}"
+					fi
+				fi
+			fi
+		done
+	fi
+
+	kde4-base_src_prepare
+}
+
+src_configure() {
+	mycmakeargs=(
+		$(cmake-utils_use_build handbook docs)
+	)
+	[[ -n ${A} ]] && kde4-base_src_configure
+}
+
+src_compile() {
+	[[ -n ${A} ]] && kde4-base_src_compile
+}
+
+src_test() {
+	[[ -n ${A} ]] && kde4-base_src_test
+}
+
+src_install() {
+	[[ -n ${A} ]] && kde4-base_src_install
+}
diff --git a/kde-apps/kde4-l10n/kde4-l10n-15.08.0.ebuild b/kde-apps/kde4-l10n/kde4-l10n-15.08.0.ebuild
deleted file mode 100644
index 65c2b29d0f66..000000000000
--- a/kde-apps/kde4-l10n/kde4-l10n-15.08.0.ebuild
+++ /dev/null
@@ -1,144 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-KDE_HANDBOOK="optional"
-KMNAME="kde-l10n"
-inherit kde4-base
-
-DESCRIPTION="KDE internationalization package"
-HOMEPAGE="http://l10n.kde.org"
-
-DEPEND="
-	sys-devel/gettext
-"
-RDEPEND="
-	!<kde-apps/kde-l10n-${PV}
-	!kde-base/kdepim-l10n
-"
-
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="minimal"
-
-REMOVE_DIRS="${FILESDIR}/${PN}-15.07.90-remove-dirs"
-REMOVE_MSGS="${FILESDIR}/${PN}-15.08.0-remove-messages"
-
-LV="4.14.3"
-LEGACY_LANGS="ar bg bs ca ca@valencia cs da de el en_GB es et eu fa fi fr ga gl
-he hi hr hu ia id is it ja kk km ko lt lv mr nb nds nl nn pa pl pt pt_BR ro ru
-sk sl sr sv tr ug uk wa zh_CN zh_TW"
-
-# /usr/portage/distfiles $ ls -1 kde-l10n-*-${PV}.* |sed -e 's:-${PV}.tar.xz::' -e 's:kde-l10n-::' |tr '\n' ' '
-MY_LANGS="ar bg bs ca ca@valencia cs da de el en_GB eo es et eu fa fi fr ga gl
-he hi hr hu ia id is it ja kk km ko lt lv mr nb nds nl nn pa pl pt pt_BR ro ru
-sk sl sr sv tr ug uk wa zh_CN zh_TW"
-
-URI_BASE="${SRC_URI/-${PV}.tar.xz/}"
-LURI_BASE="mirror://kde/stable/${LV}/src/${KMNAME}"
-SRC_URI=""
-
-for MY_LANG in ${LEGACY_LANGS} ; do
-	IUSE="${IUSE} linguas_${MY_LANG}"
-	SRC_URI="${SRC_URI} linguas_${MY_LANG}? ( ${LURI_BASE}/${KMNAME}-${MY_LANG}-${LV}.tar.xz )"
-done
-
-for MY_LANG in ${MY_LANGS} ; do
-	IUSE="${IUSE} linguas_${MY_LANG}"
-	SRC_URI="${SRC_URI} linguas_${MY_LANG}? ( ${URI_BASE}/${KMNAME}-${MY_LANG}-${PV}.tar.xz )"
-done
-
-S="${WORKDIR}"
-
-src_unpack() {
-	if [[ -z ${A} ]]; then
-		elog
-		elog "You either have the LINGUAS variable unset, or it only"
-		elog "contains languages not supported by ${P}."
-		elog "You won't have any additional language support."
-		elog
-		elog "${P} supports these language codes:"
-		elog "${MY_LANGS}"
-		elog
-	fi
-
-	[[ -n ${A} ]] && unpack ${A}
-}
-
-src_prepare() {
-	local LNG DIR SDIR
-	# add all linguas to cmake
-	if [[ -n ${A} ]]; then
-		for LNG in ${LINGUAS}; do
-			DIR="${KMNAME}-${LNG}-${PV}"
-			SDIR="${S}/${DIR}/4/${LNG}"
-			if [[ -d "${DIR}" ]] ; then
-				echo "add_subdirectory( ${DIR} )" >> "${S}"/CMakeLists.txt
-
-				# Drop KF5-based part
-				sed -e '/add_subdirectory(5)/ s/^/#/' -i "${S}"/${DIR}/CMakeLists.txt
-
-				# Drop translations installed with plasma 5 and kde-apps 5 packages
-				if use minimal; then
-					einfo "Removing paths from ${LNG}"
-					if [[ -d "${KMNAME}-${LNG}-${LV}" ]] ; then
-						rm -rf "${KMNAME}-${LNG}-${LV}"
-					fi
-
-					# Remove dirs
-					while read path; do
-						if [[ -e "${SDIR}"/${path%\ *}/CMakeLists.txt ]] ; then
-							sed -e "/${path#*\ }/ s/^/#/"\
-								-i "${SDIR}"/${path%\ *}/CMakeLists.txt
-						fi
-					done < <(grep -v "^#" "${REMOVE_DIRS}")
-
-					# Remove messages
-					for path in $(grep -v "^#" "${REMOVE_MSGS}") ; do
-						rm -f "${SDIR}"/messages/${path}
-						# Quirk for LINGUAS=sr variants
-						if [[ ${LNG} = "sr" ]] ; then
-							rm -f "${SDIR}"/${LNG}\@*/messages/${path} || die
-						fi
-					done
-				else
-					if [[ -d "${KMNAME}-${LNG}-${LV}" ]] ; then
-						# Create missing kdepim directories
-						local subdirs="kdepim kdepimlibs kdepim-runtime"
-						for path in ${subdirs}; do
-							mkdir -p "${SDIR}"/messages/${path} || die
-							echo "add_subdirectory(${path})" >> \
-								"${SDIR}"/messages/CMakeLists.txt
-						done
-						unset subdirs
-						# Merge legacy localisation
-						for path in $(find "${KMNAME}-${LNG}-${LV}" -name "*.po"); do
-							cp -rn "${path}" "${path/${LV}/${PV}/4/${LNG}}" || die
-						done
-						rm -rf "${KMNAME}-${LNG}-${LV}"
-					fi
-				fi
-			fi
-		done
-	fi
-}
-
-src_configure() {
-	mycmakeargs=(
-		$(cmake-utils_use_build handbook docs)
-	)
-	[[ -n ${A} ]] && kde4-base_src_configure
-}
-
-src_compile() {
-	[[ -n ${A} ]] && kde4-base_src_compile
-}
-
-src_test() {
-	[[ -n ${A} ]] && kde4-base_src_test
-}
-
-src_install() {
-	[[ -n ${A} ]] && kde4-base_src_install
-}
diff --git a/kde-apps/kde4-l10n/kde4-l10n-4.14.3-r1.ebuild b/kde-apps/kde4-l10n/kde4-l10n-4.14.3-r1.ebuild
new file mode 100644
index 000000000000..e13d5bf0e140
--- /dev/null
+++ b/kde-apps/kde4-l10n/kde4-l10n-4.14.3-r1.ebuild
@@ -0,0 +1,159 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_HANDBOOK="optional"
+inherit kde4-base
+
+DESCRIPTION="KDE internationalization package"
+HOMEPAGE="http://l10n.kde.org"
+
+DEPEND="
+	sys-devel/gettext
+"
+RDEPEND=""
+
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="minimal"
+
+# /usr/portage/distfiles $ ls -1 kde-l10n-*-${PV}.* |sed -e 's:-${PV}.tar.xz::' -e 's:kde-l10n-::' |tr '\n' ' '
+MY_LANGS="ar bg bs ca ca@valencia cs da de el en_GB es et eu fa fi fr ga gl he
+hi hr hu ia id is it ja kk km ko lt lv mr nb nds nl nn pa pl pt pt_BR ro ru sk
+sl sr sv tr ug uk wa zh_CN zh_TW"
+
+URI_BASE="${SRC_URI/-${PV}.tar.xz/}"
+SRC_URI=""
+
+for MY_LANG in ${MY_LANGS} ; do
+	IUSE="${IUSE} linguas_${MY_LANG}"
+	SRC_URI="${SRC_URI} linguas_${MY_LANG}? ( ${URI_BASE}/kde-l10n-${MY_LANG}-${PV}.tar.xz )"
+done
+
+S="${WORKDIR}"
+
+src_unpack() {
+	if [[ -z ${A} ]]; then
+		elog
+		elog "You either have the LINGUAS variable unset, or it only"
+		elog "contains languages not supported by ${P}."
+		elog "You won't have any additional language support."
+		elog
+		elog "${P} supports these language codes:"
+		elog "${MY_LANGS}"
+		elog
+	fi
+
+	[[ -n ${A} ]] && unpack ${A}
+}
+
+src_prepare() {
+	local LNG DIR
+	# add all linguas to cmake
+	if [[ -n ${A} ]]; then
+		for LNG in ${LINGUAS}; do
+			DIR="kde-l10n-${LNG}-${PV}"
+			if [[ -d "${DIR}" ]] ; then
+				echo "add_subdirectory( ${DIR} )" >> "${S}"/CMakeLists.txt
+			fi
+		done
+	fi
+	find "${S}" -name CMakeLists.txt -type f \
+		-exec sed -i -e 's:^ *add_subdirectory( *kdepim-runtime *):# no kdepim-runtime:g' {} +
+	find "${S}" -name CMakeLists.txt -type f \
+		-exec sed -i -e 's:^ *add_subdirectory( *kdepim *):# no kdepim:g' {} +
+	find "${S}" -name CMakeLists.txt -type f \
+		-exec sed -i -e 's:^ *add_subdirectory( *kdepimlibs *):# no kdepimlibs:g' {} +
+
+	# Drop translations that get installed with plasma 5 and kde apps 5 packages
+	if use minimal; then
+
+		# KDE Workspace 4
+		rm -f "${S}"/*/messages/kde-workspace/{freespacenotifier,\
+joystick,kaccess,kcmaccess,kcm_autostart,kcmbell,kcmcolors,kcm_desktoppaths,\
+kcm_desktopthemedetails,kcmdevinfo,kcmfonts,kcm_infobase,kcminfo,\
+kcm_infosummary,kcminit,kcminput,kcmkclock,kcmkeyboard,kcmkeys,\
+kcmkwincompositing,kcmkwindecoration,kcm_kwindesktop,kcmkwinrules,\
+kcmkwinscreenedges,kcm-kwin-scripts,kcm_kwintabbox,kcmkwm,kcmlaunch,kcm_memory,\
+kcmnic,kcmopengl,kcm_pci,kcmsamba,kcmsmserver,kcm_solid_actions,\
+kcm_standard_actions,kcmstyle,kcmusb,kcmview1394,kcmworkspaceoptions,kfontinst,\
+khotkeys,kinfocenter,klipper,kmenuedit,krdb,krunner,kscreenlocker_greet,\
+kscreenlocker,ksgrd,ksmserver,ksplashthemes,ksysguardlsofwidgets,ksysguard,\
+ktouchpadenabler,kwin_clients,kwin_effects,kwin,kwin_scripting,libkdecorations,\
+libkworkspace,liboxygenstyleconfig,libpowerdevilcommonconfig,libtaskmanager,\
+plasma_applet_quicklaunch,plasma_applet_system-monitor,\
+plasma_applet_webbrowser,plasma_containmentactions_contextmenu,\
+plasma_containmentactions_switchwindow,plasma_engine_keystate,\
+plasma_engine_mpris2,plasma_engine_network,plasma_engine_notifications,\
+plasma_engine_rss,plasma_engine_share,plasma_engine_soliddevice,\
+plasma_engine_weather,plasma_runner_activities,plasma_runner_bookmarksrunner,\
+plasma_runner_calculatorrunner,plasma_runner_kill,plasma_runner_locations,\
+plasma_runner_placesrunner,plasma_runner_plasma-desktop,\
+plasma_runner_powerdevil,plasma_runner_recentdocuments,plasma_runner_services,\
+plasma_runner_sessions,plasma_runner_shell,plasma_runner_solid,\
+plasma_runner_webshortcuts,plasma_runner_windowedwidgets,plasma_runner_windows,\
+powerdevilactivitiesconfig,powerdevilglobalconfig,powerdevil,\
+powerdevilprofilesconfig,processcore,processui,systemsettings}.po
+
+		# KDE Runtime 4
+		rm -f "${S}"/*/messages/kde-runtime/{attica_kde,drkonqi,\
+filetypes,htmlsearch,kcmcomponentchooser,kcm_emoticons,kcmhtmlsearch,\
+kcmicons,kcmkded,kcmnotify,kcm_phonon,kcmshell,kdesu,kglobalaccel,\
+khelpcenter,kio_applications,kio_archive,kio_bookmarks,kioclient,\
+kio_fish,kio_info,kio_man,kio_nfs,kio_recentdocuments,kio_remote,\
+kio_sftp,kio_smb,kio_thumbnail,kmimetypefinder,knetattach,kstart,\
+ktraderclient,phonon_kde,soliduiserver}.po
+
+		# KDE Plasma Addons 4
+		rm -f "${S}"/*/messages/kdeplasma-addons/{konqprofiles,\
+konsoleprofiles,lancelot,liblancelot-datamodels,libplasma_groupingcontainment,\
+libplasmaweather,plasma_applet_binaryclock,plasma_applet_bookmarks,\
+plasma_applet_bubblemon,plasma_applet_CharSelectApplet,plasma_applet_comic,\
+plasma_applet_fifteenPuzzle,plasma_applet_fileWatcher,plasma_applet_frame,\
+plasma_applet_groupingpanel,plasma_applet_incomingmsg,\
+plasma_applet_knowledgebase,plasma_applet_kolourpicker,plasma_applet_leavenote,\
+plasma_applet_life,plasma_applet_luna,plasma_applet_magnifique,\
+plasma_applet_microblog,plasma_applet_news,plasma_applet_plasmaboard,\
+plasma_applet_previewer,plasma_applet_qalculate,plasma_applet_qstardict,\
+plasma_applet_rssnow,plasma_applet_showdashboard,plasma_applet_showdesktop,\
+plasma_applet_spellcheck,plasma_applet_unitconverter,plasma_applet_weather,\
+plasma_applet_weatherstation,plasma_applet_webslice,\
+plasma_packagestructure_comic,plasma_runner_audioplayercontrol,\
+plasma_runner_browserhistory,plasma_runner_CharacterRunner,\
+plasma_runner_contacts,plasma_runner_converterrunner,plasma_runner_datetime,\
+plasma_runner_events,plasma_runner_katesessions,\
+plasma_runner_konquerorsessions,plasma_runner_konsolesessions,\
+plasma_runner_kopete,plasma_runner_krunner_dictionary,plasma_runner_mediawiki,\
+plasma_runner_spellcheckrunner,plasma_runner_translator,plasma_runner_youtube}.po
+
+		# KDELIBS 4
+		rm -f "${S}"/*/messages/kdelibs/{akonadi_baloo_indexer,\
+baloo_file,baloo_file_extractor,baloosearch,balooshow,kcm_baloofile,kfilemetadata,\
+kio_baloosearch,kio_tags,kio_timeline,plasma_runner_baloosearchrunner}.po
+
+		# KDE Applications 4
+		rm -f "${S}"/*/messages/applications/useraccount.po
+	fi
+
+	kde4-base_src_prepare
+}
+
+src_configure() {
+	mycmakeargs=(
+		$(cmake-utils_use_build handbook docs)
+	)
+	[[ -n ${A} ]] && kde4-base_src_configure
+}
+
+src_compile() {
+	[[ -n ${A} ]] && kde4-base_src_compile
+}
+
+src_test() {
+	[[ -n ${A} ]] && kde4-base_src_test
+}
+
+src_install() {
+	[[ -n ${A} ]] && kde4-base_src_install
+}
diff --git a/kde-apps/kde4-l10n/kde4-l10n-4.14.3.ebuild b/kde-apps/kde4-l10n/kde4-l10n-4.14.3.ebuild
index 1492e3174c0c..f57328928bcc 100644
--- a/kde-apps/kde4-l10n/kde4-l10n-4.14.3.ebuild
+++ b/kde-apps/kde4-l10n/kde4-l10n-4.14.3.ebuild
@@ -8,7 +8,7 @@ KDE_HANDBOOK="optional"
 inherit kde4-base
 
 DESCRIPTION="KDE internationalization package"
-HOMEPAGE="https://l10n.kde.org"
+HOMEPAGE="http://l10n.kde.org"
 
 DEPEND="
 	sys-devel/gettext
diff --git a/kde-apps/kdepim-l10n/Manifest b/kde-apps/kdepim-l10n/Manifest
new file mode 100644
index 000000000000..28b6a49c5138
--- /dev/null
+++ b/kde-apps/kdepim-l10n/Manifest
@@ -0,0 +1,54 @@
+DIST kde-l10n-ar-15.08.0.tar.xz 3408712 SHA256 f52f05ae4863bbf8272402c667c19f2fbb73ad0529959b04b2030788aff0ca5d SHA512 480bd82c6ce7c9085e6caec40f3dff5613d7f4c919da8ceda920668cbd938e4e8bd97d1bc624c843ea30458bd0a8a8ef5a59ad0166e51e775245f4588d36c130 WHIRLPOOL 078013eaf18b01b2dca682a7964f169caa2132f0972de09059d6f1a25704067b6d254dc62ecf8f5da8fe0d244cefd8c85212c4175f7ba87bd098078cc8ffec4a
+DIST kde-l10n-bg-15.08.0.tar.xz 2063936 SHA256 185d2aaa898cfe357d19ac8394e37a09ff3bdc431f1d8b84caf6e4b78e0aa6f2 SHA512 f9a96ab54d59b99d1774b626eeef129722f244bd3ffafdddee449edc8eba8fee63a1757a77f773fda3a5939cddcfea822423e409e46ed3378fa5fac6c2c138c1 WHIRLPOOL e1cdbc0575157465b6048f2bf7a7a8bf36c6a9639ed3a643e629e3986c6b25212d9dea242d942d9c24c4fadd3076bddc83ea23c5d0a1299f02862b90f56928aa
+DIST kde-l10n-bs-15.08.0.tar.xz 2462140 SHA256 dbbf60c9c409e1a4886e0bdc75c3147659f9f3cdb069b40d74743fb5a92c8f8b SHA512 c58c89e6966efc1c760f193bb025a9473aa3c86af0f3698bdfc07f491181d0c4581818c3323bd7a30927233547ebd1c75205b40f929264cd74a1c165772c1427 WHIRLPOOL 85edaa0af9095979e00a6f7aea6b87a67de423e4799e108a300b49175ac6a7853b6df8fef684f4dd0de39f0360d53140b4f3fcc5d3849fda1fe238ffb39435cb
+DIST kde-l10n-ca-15.08.0.tar.xz 11854488 SHA256 c2c5afb1fde8868b1ed5b34c28c79bbdfa7a45e39205f8d16337a5ad3fbf27da SHA512 d25d8c880f0daa716a6de28e7806117c76f7f0aceee46882a33c2e9bf5bd8248d24e13080a6e308931a73e76875bd2f286ccd5e68d06066a799546844373401d WHIRLPOOL 0d104389a528675e3bd1d8f631f390e6e129c23e3c90454636c5fae46facfbaeac1ef749c73b0ccf7a8daac22c34fcd502ce9f79f1591bf409b9c6f2fa610388
+DIST kde-l10n-ca@valencia-15.08.0.tar.xz 2414748 SHA256 14a790ebad94251acab23a01846a7be58c38ba5890efd79571cb06d8c31d7ecb SHA512 a8438c9ae4b516411f73ab49edb7ad6246fe3a7b97af1564fa0547798c437b474b9cfa45556ded39e887d157b6fca4b31718d5001b39ac0072d76bcaae613d35 WHIRLPOOL 3b286ce5956abb9f7f3a63390cbf97bc113287d434ecd4f656bdcc7bf57e08044fba8ff5dff086e4be4ff125cfefd378bb5e92da6b5aafe389863698499e5366
+DIST kde-l10n-cs-15.08.0.tar.xz 3019328 SHA256 7e6576aad7b2ab84b4a30f30841c58a0db9570c263f1403334c5935f2a9d3775 SHA512 d76ca04fc89026bda58a46d8d98b7fb2a59824e2f0488e54b4b7ba8ca19fadb389511ba1dd8f130b596d60b8cba3af6f14b568c80133ec4413959dced580a6d0 WHIRLPOOL ddfcf6a8d785fe9e0290b98a4152d926ee30f2256e9e5add5db10857991a8db1b7dc1ed1e3d32b2c25277ac9605a74d8b0d47f4489e9a1c69a108db237f4ab79
+DIST kde-l10n-da-15.08.0.tar.xz 12800576 SHA256 8289c0c85ee0a32240da7736ff863dcfa95bdd7aff30efb74bd331b59f79bdc3 SHA512 f6f73defc2b9ed4bdb9a047db091eecb723d28cf383fabfa90b79e5dcb73eb4db66b19219c578c4eca821412e528a48234da52342de0da419a019a2da4dc93f8 WHIRLPOOL 2b88194197bce40b88c644b5779813b54949fc997329ecadd0d95b45b2d605bfc47bc6048c781a26dea6ff4c08c30db092f658f245934e34f6013a114ec2ed47
+DIST kde-l10n-de-15.08.0.tar.xz 33880720 SHA256 34ec754fef9a34e6a18c59b36b616500a5259e3e10b3c3febcfbf9a9487ac9ef SHA512 3fe7ecba8a40d9ee017a080530a185398797a917ccbe16d5111ffb7762ce972f9f85259b9a52b21077ff874ff7eb8b157ee996f47f4a443d5d07063aa589210c WHIRLPOOL 5669820a63c574cb7a0e53210fdfcfd7b37b29334b47aa1b1642023c729c9882ac37dc9e4a2721f41654565a3f7310b2d4b1bf637ca734b8a5fbdae69efabb06
+DIST kde-l10n-el-15.08.0.tar.xz 4930496 SHA256 1bf2e3974fba5f9337ae6ad3af92a2f0bb839d9231797dff710a841ae6f7dadc SHA512 b50d3d6433bc1c86ec589e559ac7d73c2fcb4bfd895f1ee2c8a29206e9997677700e4395c246253c95a9ff662325984764db4b25374948f177e92de69af3cfc3 WHIRLPOOL 3d72386791a23019c307291f66dc3f95754d39a02d63199acfac6371758ad741c4d8ce6bfd22352026429b416f45e4737e787c456df4fafca2b06d2ce8ea6f36
+DIST kde-l10n-en_GB-15.08.0.tar.xz 2925292 SHA256 e8e0fa06f0552571de5a1517081c576adb210fc4123fee6b5c1ce0a9df1e3091 SHA512 8ab59e178c8f0bd5a0220c92173fc362df2563cfd020509531e7a74bdee406918ba9513469e5b20ef8f7f6b61655952f1a95c91f841e7be7dfa5b040e442d21e WHIRLPOOL e237f40ecf8e68e4729ec7ee2faf95214da03845d6126672ba131c453cd3703dadcc892830bb98232d8dd56dc7a742c5bca761e0983fdf3433db58968183ccd4
+DIST kde-l10n-eo-15.08.0.tar.xz 1904640 SHA256 3e9c4a932d9bb256a82867e502f4b8a8316374c0a8170122fe17c61c0e6e8c2b SHA512 92fdd019ada67fcd7abd80a60bb9dd1539e8e7b57c96322a6a819c858778fd325c70688305cd7661ea7077afb96aa74a2c0efdbad6ea278d192d18fb5a3cc481 WHIRLPOOL 018bf782a035101e1ae8a3f2b1f8af60ec6a9e2a95e5ceb68bb81f8a69623fb9ddda9eb52f33d1b22b33b7bca8d5907537a601ec920cff936f5fe7edbc6f4e32
+DIST kde-l10n-es-15.08.0.tar.xz 18725232 SHA256 355631e27d1353666ee56e6d1437c4b719f469d1b6c51143e92e12d065fd72f4 SHA512 5e68d9226850dc1af5756cc1816228ee745fb3a4aabf7224d79587a2fb13b432418e1574d61ebfe8c38757bbe13d57e0c29f3d0dd2237d72e46dc0ebc480a752 WHIRLPOOL e710243310a151805b5fa1167fc11e57a2c5cd66e5c7e151b2e70d085371a1f26ffcc330fbb38c64e5bf4a61b0981e9ad20ac84de68e83342e4e717bdd33791e
+DIST kde-l10n-et-15.08.0.tar.xz 3264820 SHA256 6e5fdd67296ee5a687528d71e3dc4015f040915ebf7eaecf92479dcef4c781ef SHA512 db7a1943017c92e4e5d67331318727b6fb2efb04207eff20a9601a636bd864fc011bed585f20d8bf6161b9451578258f50f7854bd898b051afb8f45cbe794c8f WHIRLPOOL 33f662b321e60e0a413c43e5bd971c7e6408b389c0cfcb45bb2eeea18748aa3e940cd1602f8ce642c330f12bc74794b3701984bd4ca28d7dea436e9f83e97b01
+DIST kde-l10n-eu-15.08.0.tar.xz 2125996 SHA256 170edc4188661b0ca82acc72b73c810bdeeda3ca8496db8ab9d0daf7dd92458e SHA512 ea541ead4696ad934f4270350fce239d8fb529a71d94efdf14a94bf13ced0ef64e95b3b3c69969b959c58df34c98d1a50a1aab51030a08dd813c697eb2845bc9 WHIRLPOOL 0b7194e6dddf59793f2633c08c20daa751f1aaefbe35a52332e3c1524cf408327db60c9a292d816eced4f88274cb5ca6cf13546b4627bdd78766bdc01fb67ede
+DIST kde-l10n-fa-15.08.0.tar.xz 1948980 SHA256 d48db9572e61d434940951038f501654eaf8a74fe00cfde4933c348750b9e967 SHA512 1708a46ad6c24be76fe147b8f87de81f95faf73b313a0e16d7387ca58b943caae4b7fe382fb07b5a2aa2efb169446f4cd3b3340c16ff624acf794dde4f5dbb8b WHIRLPOOL df645f25ac991b78c83783b8db0ec23110c34bfd585fad7b49790aa0bbe7e0cdc6a8dc6da953b70f552c51a4da351b221a45640746b063a0e0c1ea15f770a7ad
+DIST kde-l10n-fi-15.08.0.tar.xz 2831000 SHA256 0c03e56d7cbe8d255bf814e049ef338030bffec7983349ba524468d7f3959114 SHA512 3f5a6fa3b457e5acd1781e2ad4564efaca700cbf2f31274af5209e907449869352158afc9c6267d94b3c734cddda063a59b2c8695eab8b91e48bd34ddb921055 WHIRLPOOL 0949543c249a2fa064b85a953d7b6d4d0cd319579afdc0fdadf299821c523961b007e05a389b11b187951c49e9ec66849823e6f7b0e41da7b289f2e769d1b3e8
+DIST kde-l10n-fr-15.08.0.tar.xz 44520744 SHA256 80b27e80bd5c6d8e2e2d5cea58769b47df1b54fe2789d895f5791c0c4e6cd42b SHA512 17f46c2dbacdb7b2369b65ecec4275e3b3855b790048d7fdfb532169a07c108ecc276406e7256c379b2424ac3672ff2ae0ca9a95175259a613b2a211a0c7fb29 WHIRLPOOL 49f29cd69be736f69f73c4e4047325c0ef52eef6e66695abd8d340451f9883a5ebb93edcae0b587236f14421b9af1c93359aead0acb7b8dc902629dea6162839
+DIST kde-l10n-ga-15.08.0.tar.xz 2951776 SHA256 576c8a2a93b63f3f29a5ead101a32df84c0726de0cca60d60399a6e3a3bbca9b SHA512 6a6002996990e4ad05530de31d9436bc77a87652f52b40bc05fee8da7e05f46e3dee59cf7a6ff2bdf0b012e1df5a38d3becf7272d8c97ed74f784b54fc39cb8a WHIRLPOOL 323b12f27374999c0b0f0381ec6a7697d8b1de6db85cc2db4f4139bafc3234d490f76ae38db34c19f9793651f8ae9b9b30f2f4a9b960a096ec3dc8faacaf8c18
+DIST kde-l10n-gl-15.08.0.tar.xz 3539372 SHA256 b6aafbc6a979647958bbed3a6651f91c5c6d8a8417593f9ef005af84933ddf0a SHA512 628ee7980b4e74d1af1ad4502b245491e96dfa4f9664402601bc9ad2e9e484c11b0ef11067b48229a4c1987de93fd497686fdb41d610df65f98f6a6291488f42 WHIRLPOOL 27c8cd890cd040db8199d14ea4e062df2360a78b519e4af896db6bd3cb2046de05b1506221a54f98e997ccbbf96c645d919f17d0e511e4e85e72831b16f62062
+DIST kde-l10n-he-15.08.0.tar.xz 2195200 SHA256 ba2dbe67f2d7bde15ae1abe49041f325f143f2a31ea137ab507ce276bc410579 SHA512 c116acefbdd3ae19e2fafe668614553e93e4164a967baa777108856225b6b4f518492b64599fc283ed43fbec7837f1346744e8851b49932ca5df5c21986b9881 WHIRLPOOL 21bd918d9bb6bad1e825b049431995983ec54e34efeb41827dd9ce16b2a79e2b24f13e363dc30905513b877860de6d106a2813b4ecbcbb58cf82df38f2d4a10f
+DIST kde-l10n-hi-15.08.0.tar.xz 1860160 SHA256 5e73569d67aa6d53466ca01a50aac54c1d1c6cfc1c8b1e8abd6ae56948e41237 SHA512 91b7b3ee07471066812209289fbd77841d2762da19f464b1ad33d0ee2f1ea22ed6e0c342f8961e3fad37bc5ba404de606aad9b1980ca361843024a6f313059b4 WHIRLPOOL 6688eb30b03618dba7250e7d7fde86aa3c8236b7ca8b4a6284c83a4eae61cfac06c2d41807e790c30c5f33776f3ced929fe511f691f0a528727904ae20b0a414
+DIST kde-l10n-hr-15.08.0.tar.xz 2079472 SHA256 7bb0a7a5b855042d0f0f11b6509c11672a129ebcd9b36a47e191ddca434a8c20 SHA512 b6196c69dc65955e0e33a7102550368f0cd19236e6a616f7fa69109689d9a6b1a6815c4436c4e8bc20e4d1f2b1adcbee549cddbd4e97633bd08e56aab731333f WHIRLPOOL e3b5ef72f39a02d5111b9b1fd701f6224c15f371709dc208a5ca69be147e6e8baa05e475e18a821e253b5b727de47c81ebb767fa91475aef72cf0d389052ed39
+DIST kde-l10n-hu-15.08.0.tar.xz 4378820 SHA256 ea47513506432487cb2561871bfe4c6b95c3bb4fea2f4d1ddf4078d2e6082160 SHA512 9ef76954f16aa3cd18efaf1dbd65e60575ccf0b4b007f687d58e511d224d9d4c5c2d1b2d8c3c0e73d4e3f9a80a79a0ab5386e13e55e32315b491c5c3f95d543d WHIRLPOOL cab26e8f5a781054446e71f7148b53106d289b8f382ba82ad46d54359c66a44ff7f02a489a840dd6f0aa54e0ed772e8660e1d76d729931c7c093a9d03e7c1cda
+DIST kde-l10n-ia-15.08.0.tar.xz 1406260 SHA256 ca2c36997b863cebdde54f8729f8daefc740ad32e16e1c34ada43bb7691a9eac SHA512 7a5d25351e80eadb243459d3369af214326fc60d8a77f16f7f87a96cae7879205ad754f4f6e8c980d887f171ce7191ee9c70c219ef42986743236ae804616b00 WHIRLPOOL c71cd44f2cf19031675a5a40a491017a1c290ed977cf487a35eb825488ba4fd666ca742d5cfc5e0ea3457fbdbeaa4236078dcadfc2d0c79e67aad04a422739a5
+DIST kde-l10n-id-15.08.0.tar.xz 573208 SHA256 071255354073ec9751fe9fa48440d97aa0feac87d760c4aa258a7784fde49dbc SHA512 bf95dba10c0e0c8d95a3f59a3ab8b55d35476d3867e23bedab4d7a0786ea4fbd5b8214060a0ccd1e900de86a6e32b878a0da6b4ae9a3d86aca36d0657bf6be8f WHIRLPOOL 2c1891d5826911af0c989a724b3e4437b7a595524e495e4d1a4f694bf1bf5be571da131ff6c02385aad8c7b897c16dde634f158d413a0d4045671dadda84278f
+DIST kde-l10n-is-15.08.0.tar.xz 1863912 SHA256 973c239cb273efb507fdf1fde230faa7f112d91439d4852a1d3ceeffb934357a SHA512 94fb64002c851250bf4d06d23d83fdfa046f0a8388377f444735671201431990fe66e6622403834d57058001a61bd49f0c4956a2fdcc1db0d5eb289acb2930df WHIRLPOOL 7e210303deaf55fc42231251395cb8c60e88163d5461394d21ad6fb68e786419fcb6b9833f222d1ec9cd89e106b59c5179a006bc4426a5178504364b65a8db22
+DIST kde-l10n-it-15.08.0.tar.xz 8820884 SHA256 2f66b34c6c311087869a37afdc396a0debc647559b6a940275e6d092ad0fa00f SHA512 05d7d726eec654969f5fabc24324093a4e8e79e5b34a8e79a8d96fb03a6d0593c4412d78ac2eb71dbcb57a9b476dec5641363ecab666467d9c028f57b00dd24c WHIRLPOOL b5090d857e5a2e9283f980a49cbe7a6a8f248f0ac3c8ffa5983d210703f4a0aa41bd2f9eada8ba5f05e00f5ded459a20b26529d77840b04b5cb15b28010bb23a
+DIST kde-l10n-ja-15.08.0.tar.xz 2338448 SHA256 9ef32b849e42a2dd66068b342047843a3500d783bb728d19cac66e8a3487869f SHA512 1159c56cef200b533dacbf1e6eafde73224e64de762d98c2f4b831172fd266ad2458233a400c2ca278a04c291fbc938d44472154cc4df91716b27f2221a406a5 WHIRLPOOL ad84dfd9e123bcf4c210b50a37147b99530c9707399f93209a5159df059f5f57985ab88fc6b0ba2483a409a88cbe9da3471266693da9314f1b51d5d7cdac6fe9
+DIST kde-l10n-kk-15.08.0.tar.xz 2679080 SHA256 6c94cc8bfcd60e6139510836e4a3ca0e4985688813d36935304284fee7ddf0cc SHA512 50fedab1feab01fa764ea107e12b881e8d2ccd45c8f28525e00ea2a2efaf928a2fab831947a632dcedb7c7ab908153a312a703f5223c6ae951711706da05b793 WHIRLPOOL 408f4e71c16782d0d77a65192954fbba5ac07956b7a7b47a5814c9756eafe042523c3805123363b5954d31d7e1ba943aa939393bbaaa925285eb743ed84fd964
+DIST kde-l10n-km-15.08.0.tar.xz 2213948 SHA256 700e6e39afc1f81c526fd8566a7c9ceb71f7af1a791ca20fa7e8b59015530ce0 SHA512 b456798408902a4ba3a757be1cab42bdfc89db0bc5163b6e01fd4ede9073cc09c5940410d7f4ff9b6801703e84391375917ae9748959bc30d0cfc9a5b71dd90c WHIRLPOOL e4682e60f7fa83be01eba5091acd3355efb4cdf0ab2731fc1c0f9a2c5d069bd43af2ead01c5f9ca0cdb3a62d03c42b6dd92eb257145275942baa273457d977cd
+DIST kde-l10n-ko-15.08.0.tar.xz 1974592 SHA256 adaedca1b05c3dd623c1a8c343a8937abee582f10f4490630f15915f907ce195 SHA512 596f1fd29ba7dab3805f0bffa011ce64084360deca3fdb719f9c6e6c42aba25877ab2d02c0f2d2a44c75d5e551d5015718e2aaad17f0c40886d776bf5cc0d140 WHIRLPOOL 9d81d20f9f065f87b7cce9fc7fbaf0487d942eb43384a22d774772c8ebc4ae51e857c8494db56c7e8714f5e0619c41230e3cd0d0e79c2f8076de87deeed54664
+DIST kde-l10n-lt-15.08.0.tar.xz 12873464 SHA256 8b2bf246b06756ad6b98affbd3d70990f2cdd1a43cb90202a753d38c42eb2095 SHA512 489041e7adcd04f4f18197fd4b47139a9f18c793023a0dae54af2316471feda6339b6e96587f17e6b12c5e23a1fad56a2cfce920c6af3d47164e812ccf4e3d09 WHIRLPOOL 2e1a3869b7b02ba8e23056ccc5ac7179d5a2ab26c44b18946817f7289563dea1c7648179ec39a1ed02769b7d038b02e0a6fbb7a083d2ad8cf6823056ca51dea7
+DIST kde-l10n-lv-15.08.0.tar.xz 2222296 SHA256 5eae25395b77d214e6a479f7b62b8321efd259d5f1d6ff291948359bed981f57 SHA512 431479b8cdd654245b96f1c12b902b72ac7daaebd6504fa99333fd4e34ede2001818276ffcceaac84e35b1fc0e8ed28799e337c646e67172c1ad99a1d44498ee WHIRLPOOL 00eb412296304006dad6e4c1b1bebc519df2f3032b341127b2165f037e2f656d61d91d96c57e0dae98cce9d6e2793c248f7ad94f6cb76e0dcdde33a09ca6467a
+DIST kde-l10n-mr-15.08.0.tar.xz 1871564 SHA256 8cd7f34a0a51287e9c3ca7556d701c9e96c567cb42970f7d00a794a460ae9445 SHA512 569cc85ecf2bbdfb4575e5f1424ae4de1f2dc2c2433ff6ef52b6f75eae4e259efd00fb1df20726b74b1fd148a182d34eff04d3aa3e06b7504db5b3c050b57b68 WHIRLPOOL 5c0aa1b783735099ae3a712ba4a9c19c159778205303e38b29b1fc8f73b1937afe3f7cb1aad8e827e4194dec52f4187e59ec6a21a9eba41e83ca2089d561f872
+DIST kde-l10n-nb-15.08.0.tar.xz 2526556 SHA256 e806bd713804840152ee4e06d47d2515352c02dd76b7b1e30a9e4d26b9812632 SHA512 66d5355e1f4ed2764277faa648656216d56c92fc38a3ec41b5d29b1129d99d9857a2d0edcd21a24354c817fb212ccdc10eb25308d6c042664925970736ecd7fe WHIRLPOOL aa68b82bdbff459006d6c8e2b97b225b327f41015a5d7b1f8b129edf80ab958b2f1b65cebda21fabd0aaa81c2d8f574872618a9fe8e04fc4ec55fd6d259a16a9
+DIST kde-l10n-nds-15.08.0.tar.xz 3337368 SHA256 d4bf0dcd533da998c1913cc8606d246f7087428f2a59536f63362f2dfd1e8233 SHA512 b8db39540d4fbdce5ed8b4e1df2deddd9589fce74c1a50c4e043464e2490f0d6a6c32817ff3aca388ded0fd1aa3bceb69ee7001fd4d33ccee9070bed4ed11544 WHIRLPOOL f6cf4dcb2285b18550ac0bcea8dee94bfcebdd31979822b795da23290a60dcacc6cb7d4a1434f111b15799d37f547afa69089680f0f8f4766cdb74dec04a9479
+DIST kde-l10n-nl-15.08.0.tar.xz 13955804 SHA256 1432ee414462fc2bc1f9285ee0942bdb6bf631efc3c70ed4d730b097a683eabe SHA512 74c0e44c455c164023b3db91ebda49095d33d525a2d9ac8b4d6e4da49a133d1672f6421e7c3ca54790d31853d0db8d355ff5ff0e0760892da7b4fb8e618c533b WHIRLPOOL 031a696972238b137d443ff1a1ba139bb1a66a003b409ce2e31a700f9843e8938f8f54e53acfd54b75f3a67f98857804ffc409e91c9bf494a18fa875f0a042d4
+DIST kde-l10n-nn-15.08.0.tar.xz 1893928 SHA256 ee4800c7e0c123b8314f183200b1a999d09f4afc313380fa5e72ad984886e5dd SHA512 f8ff0af743d644b44b8886f55b38ac577dab134ea198d8254702a912f49d8dfdc5213fadbb684392b480dba68524b625c82f5af7730ab4d560555f14d61d5e31 WHIRLPOOL e96fd07441956228ed3dba8187b55b15e685ba49b5eb3a808d4ee0e1394e132cc4156926fbb7324116566cb5fe1c578810ca0e5cde1b548cf152e681f4712e11
+DIST kde-l10n-pa-15.08.0.tar.xz 1942128 SHA256 670e6d201d5fc0d494939949baec84cccc5757e3af96f766bfb03b30b0d47bd4 SHA512 ab65a7bfc544bf59616a16a653709f9d866eee07c51a42a85a1810596df637e27e74c77152815a46d66fa864f0f4a92112b73c4e6d9db6b07eafce58d69fc552 WHIRLPOOL 1be51e8ca524a9fb14aa081449a5680e58777879548b170ca8d4196f84c6f053a6ed0e1e8774751a8e88c775488cead4f58d5ec6f849e3413cb21cadfea0daa0
+DIST kde-l10n-pl-15.08.0.tar.xz 19099600 SHA256 bff7acbc9a3e2790cb23bedbd2d4bd45c1f693994f8cd2f57c48f559f1c29161 SHA512 544b6af9a55d6ec606266f710e0eecab56582d9688c93fae77a0a42f9572223494c8def961f14f27b6d2026c452274d62f67af3d9da69823e63abd9365e7fdd7 WHIRLPOOL 89d66e05324f998dd1448db1bc553947a5a93a56bd76cf18c6c49a2a0fe353bf37078f3b94e54c9e5f66a1b79ceb4dbd8a7da79cdaf42adffd028ce104904d33
+DIST kde-l10n-pt-15.08.0.tar.xz 3545244 SHA256 344dbcb27bdc4b93944672f09339ee6f46f4898ec8baa32add10a3a193d7036a SHA512 04666ea2a621d1d86f30e3d115f53707ecce6e06ebbe17369e144f9b9058acb2dbf093cf3e2c88445f4c1ccd93226f416e3dc23a499f6da4c6f80710598ef1d8 WHIRLPOOL 1271150645fc69337991b46035cf1256d67100a6228f0d2856be369c7b0f22fe154e7a2cdb90b9d2a140293e29986e115fd1089e256ae9afb7dddcd13e076aac
+DIST kde-l10n-pt_BR-15.08.0.tar.xz 21686420 SHA256 cfdf66365ea1a1ad4e531a4f84e54124c1155f4370e63f36c1c5111fda19cc53 SHA512 5f85ab487490519378ee81a53e13bdfc25c9577e9a7939fd1e172ad8294ebff4a062bf8a5c5fac523270b1d9fa7316f73fa641f7b5f6cf2c5fc666167c35abe7 WHIRLPOOL d8a782df74af3a8dc89bb88cf2dd2ffe29037732b647835f7a95fb7b42b686b7b4be915c41e4680186ecd0cf0bf8620b52918a211192902fc0b35d1510aa948d
+DIST kde-l10n-ro-15.08.0.tar.xz 3109304 SHA256 4495168bcc06746d6e91ae6fb3e562d167b10f5825a75cdc00acac61dd0e3c59 SHA512 81b1163ae1f9db6c7686efa80e1f1aeb1aa729a8b70ced76e4596fbaf4f4a8170cf9ef7861faab2e4167dd19be2765f43aa2da85d173e5972d85d3751c320698 WHIRLPOOL 6dedc9b7c35b4680fa1105e6e2ba9be08c3f16a28faff166a7054b40572f5973e2573cfed896e90423b86c9fc67cf37fd58237f91880bb1589d6b95fbf984092
+DIST kde-l10n-ru-15.08.0.tar.xz 22285476 SHA256 655e62a1c248bc6e2b5d0140991dce626970a4ed3d0ef114e70c907340787386 SHA512 3ab1cd22255b4be29be66c49d6c2c932b786b4cdefe8bf2c0b98ba0443685698cf38475b4cb4bb5942cc109061409a4818570eff37465acdc5daf01ab241ed22 WHIRLPOOL 351052222197e2064fe341963575926f0db34934797ceb0aca4e066ebf0ff908053793f696865378b2c1c6c7453d43345356171130512349731e79da24a2603c
+DIST kde-l10n-sk-15.08.0.tar.xz 4612052 SHA256 06e0499bd45413da00c206fbc7c5e5a1f124bff0fb97d30dd5187a54bff5e82d SHA512 cd1b6c18ed7b90426ced2c2d13667d4b27f8b446a99b8c2b0be2f7af95dc8474c9426cc6c7de2f7b00faf853983c00cb563b645bcd55563362191b7fa8f11a50 WHIRLPOOL 3023c86b4eb7df356bf51365f57ea9e0b3426235df74068eacb176d56cdc74a362512552bf4ee4e8e20ed106e77feffd3c07c16ddd0c3b8960d87472852d6960
+DIST kde-l10n-sl-15.08.0.tar.xz 3251952 SHA256 3e52b43110e0e74e24fa137eb82b2dde659653807bc12daad7f5270dbfc8a2ee SHA512 5b225ac3375a39d047c4f85d1a101f83eba458f37ef609cafb61952a82d54919cc34135f87ca49dae2a30b19ef7161af68e95de1e595a58d5a625b418bab193a WHIRLPOOL 61f6d3f8edaf55f7dae108f2673e8ca6cdbf5be5a3e795f5fe0fc866049d638909225b106a2ba6fcc1ba872a5e057263324bbe857e5eac747e37638f59e0f562
+DIST kde-l10n-sr-15.08.0.tar.xz 4802156 SHA256 7f744a49bf8ad835b8ad10257d23d43878761e889c865814ceeb3ce6d608e59a SHA512 34e5a921890eae7881bbaf6223e2c0772bab1d52a16498efddb6dd65cab16e6d14e53b20c60fb08135b577f51f5b0212536c01d885f2566394fe4e63264042ba WHIRLPOOL a1c7a96664114420373223ac1131ac716c9311c4b6fab5b57032737c4aa8ed843d398965f92e80885facef35236728228ab099f9836a72174e76755ca58d4a24
+DIST kde-l10n-sv-15.08.0.tar.xz 12694592 SHA256 2a68e82a38f6ddaebc9060b97933293be3e464a084ab332fd9cddad59b87910d SHA512 77614ea37e4dc991adc4f9090b3376afffd579f4751f956be086fc80b88bfea485960ef5737ad24b8dc7a5bba013505502f47b1aed8aece1f26c6f8d0352c2e0 WHIRLPOOL 01bbf1bc5fca73867922449258b80bd2493b8d49d9dcdbaf441926bfec2f7c7f6f84650a44f2e574d904fa6331b2488a99e3b4b85c909d91c51abc5ed6ac9bd5
+DIST kde-l10n-tr-15.08.0.tar.xz 3974616 SHA256 e48ab92dcfcd31ba32922cc9b4cecff826818bb69782bcea07a768d9f6d27d16 SHA512 3396df18422eb06cc86e00c8edd92a757712c0f8266ba9db6af7e3b78ebd0fb5184e727bf02c21fc6c58d75cfe128c6c5a33e59dcf239f9d4f00236c1a9ccefa WHIRLPOOL e7b4a14e20e5f0d9437cdf19ca7cd7fbf89deef5cd92ec4433fe321fd59cdccb0181d1f760e535d8d26da5f47a039f591387c384909e61cde40d1491cabd9200
+DIST kde-l10n-ug-15.08.0.tar.xz 1834464 SHA256 b9933b90d6a4a59bfddab85a318ef007406408d84d2f8f6bbac7e2fa3938db8e SHA512 5854943d0165b3d2c60cda22559e8bacecd1965ee2853eb13ecb92b93370a39ef953383f50138867bd1ba2013447362153628a566091398d6dbccf7632c4fb80 WHIRLPOOL 6d88ec4c73b9e20fa29fda592285fd8c9a8f282ec86be3c5cbb6c17c28ab1f242d439a875341b542726ad95744caf11ef81ce3aceaeae391f384053d5c244be2
+DIST kde-l10n-uk-15.08.0.tar.xz 26028268 SHA256 1b137277e954f9c24b56aeaae2b54abd6760fe634c25c911632a56619b20d390 SHA512 6bd252ae86bdf118a695ee761b3081b9a0a2db02fb56b42e660f216863697df573e425c149f658fcfaa36a506d28cec2bc96523141bbb30d566dfee94fab921f WHIRLPOOL f6faab373ad878f6b7ad0682dc54e0f7e1f874a687e1255afb0ecd7b8ce6fe2eed22e9eb38d93403a220068b95fa4b94d7e3e90b3638b11a52951d48b778da99
+DIST kde-l10n-wa-15.08.0.tar.xz 1746876 SHA256 416cc8ab61b427f485fe5ea95b37f1580446e850d6270a05a61557f3683539be SHA512 876fa8f57a9a277389a8ae8bf2ba27a732fdf830545901093dde368a4cdfe953764f54c303576a0afaaabea4fd76f7d5d856a764016a676abc0b21cf95d46cdd WHIRLPOOL 7469d5a9c9a347e19c179e5743b8146d58e9b2dedbee875c57c9d1e627d7c1e14f2a4e441691359af5b4dacb626a24eb25c1f68d04e958f55c258fc8bf68712d
+DIST kde-l10n-zh_CN-15.08.0.tar.xz 3667120 SHA256 7b620204f539c09f939d94b132d61242d4e5c1503c4c3e5030f574f834f44d44 SHA512 e1d83369c25daaf26345be2a9e5c5181f575b4993f19a7d1e772db2ae648afd7767f8060506c0bf91b756cc6033abad879d5d8128fd5d0b4d948901ccaed8021 WHIRLPOOL 189c8bf51eb238361a342483d662cf56d8b1e7c100173e59d1ddf256a21671e872ca3635ec3d6f66b9f73403cd1263af0e827ca9589f841a7d55e7e83dc6a5fd
+DIST kde-l10n-zh_TW-15.08.0.tar.xz 2728692 SHA256 541594902f06f19a5d90624fd86a42ed77dc9a8ad6e68993169fad978f80bd2d SHA512 fa3957f0ace8167d308cdf295e0f8d5862a300b05a6068047d0fd67604cd072b502158634616d10b198490bb16a1e5cce763e0a6825f030fcf6aaf36579c540f WHIRLPOOL 08ae8883ede16fbc193175721a993bb2163b759d7dbadadce67e037ded528f726bdb9c771c982e9aec038c635559ad528cccf966f627415da1798137dfe2a09a
diff --git a/kde-apps/kdepim-l10n/kdepim-l10n-15.08.0.ebuild b/kde-apps/kdepim-l10n/kdepim-l10n-15.08.0.ebuild
new file mode 100644
index 000000000000..ecc3695bb2af
--- /dev/null
+++ b/kde-apps/kdepim-l10n/kdepim-l10n-15.08.0.ebuild
@@ -0,0 +1,137 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_HANDBOOK="true"
+inherit kde5
+
+DESCRIPTION="KDE PIM internationalization package"
+HOMEPAGE="http://l10n.kde.org"
+
+DEPEND="
+	sys-devel/gettext
+"
+RDEPEND="
+	!<kde-apps/kde-l10n-15.08.0-r1
+	!<kde-apps/kde4-l10n-4.14.3-r1
+	!kde-base/kdepim-l10n
+"
+
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+# /usr/portage/distfiles $ ls -1 kde-l10n-*-${PV}.* |sed -e 's:-${PV}.tar.xz::' -e 's:kde-l10n-::' |tr '\n' ' '
+MY_LANGS="ar bg bs ca ca@valencia cs da de el en_GB eo es et eu fa fi fr ga gl
+he hi hr hu ia id is it ja kk km ko lt lv mr nb nds nl nn pa pl pt pt_BR ro ru
+sk sl sr sv tr ug uk wa zh_CN zh_TW"
+
+PIM_L10N="kdepim kdepimlibs kdepim-runtime pim"
+
+URI_BASE="${SRC_URI/-${PV}.tar.xz/}"
+SRC_URI=""
+
+for MY_LANG in ${MY_LANGS} ; do
+	IUSE="${IUSE} linguas_${MY_LANG}"
+	SRC_URI="${SRC_URI} linguas_${MY_LANG}? ( ${URI_BASE/kdepim/kde}/kde-l10n-${MY_LANG}-${PV}.tar.xz )"
+done
+
+S="${WORKDIR}"
+
+src_unpack() {
+	if [[ -z ${A} ]]; then
+		elog
+		elog "You either have the LINGUAS variable unset, or it only"
+		elog "contains languages not supported by ${P}."
+		elog "You won't have any additional language support."
+		elog
+		elog "${P} supports these language codes:"
+		elog "${MY_LANGS}"
+		elog
+	fi
+
+	[[ -n ${A} ]] && unpack ${A}
+}
+
+src_prepare() {
+	local LNG DIR
+	# add all linguas to cmake
+	if [[ -n ${A} ]]; then
+		for LNG in ${LINGUAS}; do
+			DIR="kde-l10n-${LNG}-${PV}"
+			SDIR="${S}/${DIR}/5/${LNG}"
+			if [[ -d "${DIR}" ]] ; then
+				echo "add_subdirectory( ${DIR} )" >> "${S}"/CMakeLists.txt
+
+				# Drop KDE4-based part
+				sed -e '/add_subdirectory(4)/ s/^/#/'\
+					-i "${S}"/${DIR}/CMakeLists.txt || die
+
+				# Remove everything except kdepim, kdepimlibs, kdepim-runtime and pim
+				for SUBDIR in data docs messages scripts ; do
+					if [[ -d "${SDIR}/${SUBDIR}" ]] ; then
+						einfo "   ${SUBDIR} subdirectory"
+						echo > "${SDIR}/${SUBDIR}/CMakeLists.txt"
+						for pim in ${PIM_L10N}; do
+							[[ -d "${SDIR}/${SUBDIR}/${pim}" ]] && \
+								( echo "add_subdirectory(${pim})" >> "${SDIR}/${SUBDIR}/CMakeLists.txt" )
+						done
+					fi
+				done
+
+				# In some cases we may have sub-lingua subdirs, e.g. sr :(
+				for XSUBDIR in "${SDIR}/${LNG}"@* ; do
+					XLNG=$(echo ${XSUBDIR}|sed -e 's:^.*/::')
+					if [[ -d "${XSUBDIR}" ]] ; then
+						einfo "   ${XLNG} variant"
+						# remove everything except kdepim and kdepim-runtime
+						for SUBDIR in data docs messages scripts ; do
+							if [[ -d "${XSUBDIR}/${SUBDIR}" ]] ; then
+								einfo "      ${SUBDIR} subdirectory"
+								echo > "${XSUBDIR}/${SUBDIR}/CMakeLists.txt"
+								for pim in ${PIM_L10N}; do
+									[[ -d "${XSUBDIR}/${SUBDIR}/${pim}" ]] && \
+										( echo "add_subdirectory(${pim})" >> "${XSUBDIR}/${SUBDIR}/CMakeLists.txt" )
+								done
+							fi
+						done
+					fi
+				done
+
+				# Handbook optional
+				sed -e '/KF5DocTools/ s/ REQUIRED//'\
+					-i "${SDIR}"/CMakeLists.txt || die
+				if ! use handbook ; then
+					sed -e '/add_subdirectory(docs)/ s/^/#/'\
+						-i "${SDIR}"/CMakeLists.txt || die
+				fi
+
+				# Fix broken LINGUAS=sr (KDE4 leftover)
+				if [[ ${LNG} = "sr" ]] ; then
+					sed -e '/add_subdirectory(lokalize)/ s/^/#/'\
+						-i "${SDIR}"/data/kdesdk/CMakeLists.txt || die
+				fi
+			fi
+		done
+	fi
+}
+
+src_configure() {
+	mycmakeargs=(
+		$(cmake-utils_use_find_package handbook KF5DocTools)
+	)
+	[[ -n ${A} ]] && kde5_src_configure
+}
+
+src_compile() {
+	[[ -n ${A} ]] && kde5_src_compile
+}
+
+src_test() {
+	[[ -n ${A} ]] && kde5_src_test
+}
+
+src_install() {
+	[[ -n ${A} ]] && kde5_src_install
+}
diff --git a/kde-apps/kdepim-l10n/metadata.xml b/kde-apps/kdepim-l10n/metadata.xml
new file mode 100644
index 000000000000..a23f444b67d6
--- /dev/null
+++ b/kde-apps/kdepim-l10n/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>kde</herd>
+</pkgmetadata>
diff --git a/kde-apps/konsole/konsole-15.08.0.ebuild b/kde-apps/konsole/konsole-15.08.0.ebuild
index ab75c484d9b4..5f90ede20aca 100644
--- a/kde-apps/konsole/konsole-15.08.0.ebuild
+++ b/kde-apps/konsole/konsole-15.08.0.ebuild
@@ -49,7 +49,7 @@ DEPEND="
 	X? ( x11-libs/libX11 )
 "
 RDEPEND="${DEPEND}
-	!kde-apps/konsole:4[-minimal(+),handbook]
+	!kde-apps/konsole:4[-minimal(-),handbook]
 "
 
 src_configure() {
diff --git a/kde-apps/ktp-l10n/Manifest b/kde-apps/ktp-l10n/Manifest
new file mode 100644
index 000000000000..28b6a49c5138
--- /dev/null
+++ b/kde-apps/ktp-l10n/Manifest
@@ -0,0 +1,54 @@
+DIST kde-l10n-ar-15.08.0.tar.xz 3408712 SHA256 f52f05ae4863bbf8272402c667c19f2fbb73ad0529959b04b2030788aff0ca5d SHA512 480bd82c6ce7c9085e6caec40f3dff5613d7f4c919da8ceda920668cbd938e4e8bd97d1bc624c843ea30458bd0a8a8ef5a59ad0166e51e775245f4588d36c130 WHIRLPOOL 078013eaf18b01b2dca682a7964f169caa2132f0972de09059d6f1a25704067b6d254dc62ecf8f5da8fe0d244cefd8c85212c4175f7ba87bd098078cc8ffec4a
+DIST kde-l10n-bg-15.08.0.tar.xz 2063936 SHA256 185d2aaa898cfe357d19ac8394e37a09ff3bdc431f1d8b84caf6e4b78e0aa6f2 SHA512 f9a96ab54d59b99d1774b626eeef129722f244bd3ffafdddee449edc8eba8fee63a1757a77f773fda3a5939cddcfea822423e409e46ed3378fa5fac6c2c138c1 WHIRLPOOL e1cdbc0575157465b6048f2bf7a7a8bf36c6a9639ed3a643e629e3986c6b25212d9dea242d942d9c24c4fadd3076bddc83ea23c5d0a1299f02862b90f56928aa
+DIST kde-l10n-bs-15.08.0.tar.xz 2462140 SHA256 dbbf60c9c409e1a4886e0bdc75c3147659f9f3cdb069b40d74743fb5a92c8f8b SHA512 c58c89e6966efc1c760f193bb025a9473aa3c86af0f3698bdfc07f491181d0c4581818c3323bd7a30927233547ebd1c75205b40f929264cd74a1c165772c1427 WHIRLPOOL 85edaa0af9095979e00a6f7aea6b87a67de423e4799e108a300b49175ac6a7853b6df8fef684f4dd0de39f0360d53140b4f3fcc5d3849fda1fe238ffb39435cb
+DIST kde-l10n-ca-15.08.0.tar.xz 11854488 SHA256 c2c5afb1fde8868b1ed5b34c28c79bbdfa7a45e39205f8d16337a5ad3fbf27da SHA512 d25d8c880f0daa716a6de28e7806117c76f7f0aceee46882a33c2e9bf5bd8248d24e13080a6e308931a73e76875bd2f286ccd5e68d06066a799546844373401d WHIRLPOOL 0d104389a528675e3bd1d8f631f390e6e129c23e3c90454636c5fae46facfbaeac1ef749c73b0ccf7a8daac22c34fcd502ce9f79f1591bf409b9c6f2fa610388
+DIST kde-l10n-ca@valencia-15.08.0.tar.xz 2414748 SHA256 14a790ebad94251acab23a01846a7be58c38ba5890efd79571cb06d8c31d7ecb SHA512 a8438c9ae4b516411f73ab49edb7ad6246fe3a7b97af1564fa0547798c437b474b9cfa45556ded39e887d157b6fca4b31718d5001b39ac0072d76bcaae613d35 WHIRLPOOL 3b286ce5956abb9f7f3a63390cbf97bc113287d434ecd4f656bdcc7bf57e08044fba8ff5dff086e4be4ff125cfefd378bb5e92da6b5aafe389863698499e5366
+DIST kde-l10n-cs-15.08.0.tar.xz 3019328 SHA256 7e6576aad7b2ab84b4a30f30841c58a0db9570c263f1403334c5935f2a9d3775 SHA512 d76ca04fc89026bda58a46d8d98b7fb2a59824e2f0488e54b4b7ba8ca19fadb389511ba1dd8f130b596d60b8cba3af6f14b568c80133ec4413959dced580a6d0 WHIRLPOOL ddfcf6a8d785fe9e0290b98a4152d926ee30f2256e9e5add5db10857991a8db1b7dc1ed1e3d32b2c25277ac9605a74d8b0d47f4489e9a1c69a108db237f4ab79
+DIST kde-l10n-da-15.08.0.tar.xz 12800576 SHA256 8289c0c85ee0a32240da7736ff863dcfa95bdd7aff30efb74bd331b59f79bdc3 SHA512 f6f73defc2b9ed4bdb9a047db091eecb723d28cf383fabfa90b79e5dcb73eb4db66b19219c578c4eca821412e528a48234da52342de0da419a019a2da4dc93f8 WHIRLPOOL 2b88194197bce40b88c644b5779813b54949fc997329ecadd0d95b45b2d605bfc47bc6048c781a26dea6ff4c08c30db092f658f245934e34f6013a114ec2ed47
+DIST kde-l10n-de-15.08.0.tar.xz 33880720 SHA256 34ec754fef9a34e6a18c59b36b616500a5259e3e10b3c3febcfbf9a9487ac9ef SHA512 3fe7ecba8a40d9ee017a080530a185398797a917ccbe16d5111ffb7762ce972f9f85259b9a52b21077ff874ff7eb8b157ee996f47f4a443d5d07063aa589210c WHIRLPOOL 5669820a63c574cb7a0e53210fdfcfd7b37b29334b47aa1b1642023c729c9882ac37dc9e4a2721f41654565a3f7310b2d4b1bf637ca734b8a5fbdae69efabb06
+DIST kde-l10n-el-15.08.0.tar.xz 4930496 SHA256 1bf2e3974fba5f9337ae6ad3af92a2f0bb839d9231797dff710a841ae6f7dadc SHA512 b50d3d6433bc1c86ec589e559ac7d73c2fcb4bfd895f1ee2c8a29206e9997677700e4395c246253c95a9ff662325984764db4b25374948f177e92de69af3cfc3 WHIRLPOOL 3d72386791a23019c307291f66dc3f95754d39a02d63199acfac6371758ad741c4d8ce6bfd22352026429b416f45e4737e787c456df4fafca2b06d2ce8ea6f36
+DIST kde-l10n-en_GB-15.08.0.tar.xz 2925292 SHA256 e8e0fa06f0552571de5a1517081c576adb210fc4123fee6b5c1ce0a9df1e3091 SHA512 8ab59e178c8f0bd5a0220c92173fc362df2563cfd020509531e7a74bdee406918ba9513469e5b20ef8f7f6b61655952f1a95c91f841e7be7dfa5b040e442d21e WHIRLPOOL e237f40ecf8e68e4729ec7ee2faf95214da03845d6126672ba131c453cd3703dadcc892830bb98232d8dd56dc7a742c5bca761e0983fdf3433db58968183ccd4
+DIST kde-l10n-eo-15.08.0.tar.xz 1904640 SHA256 3e9c4a932d9bb256a82867e502f4b8a8316374c0a8170122fe17c61c0e6e8c2b SHA512 92fdd019ada67fcd7abd80a60bb9dd1539e8e7b57c96322a6a819c858778fd325c70688305cd7661ea7077afb96aa74a2c0efdbad6ea278d192d18fb5a3cc481 WHIRLPOOL 018bf782a035101e1ae8a3f2b1f8af60ec6a9e2a95e5ceb68bb81f8a69623fb9ddda9eb52f33d1b22b33b7bca8d5907537a601ec920cff936f5fe7edbc6f4e32
+DIST kde-l10n-es-15.08.0.tar.xz 18725232 SHA256 355631e27d1353666ee56e6d1437c4b719f469d1b6c51143e92e12d065fd72f4 SHA512 5e68d9226850dc1af5756cc1816228ee745fb3a4aabf7224d79587a2fb13b432418e1574d61ebfe8c38757bbe13d57e0c29f3d0dd2237d72e46dc0ebc480a752 WHIRLPOOL e710243310a151805b5fa1167fc11e57a2c5cd66e5c7e151b2e70d085371a1f26ffcc330fbb38c64e5bf4a61b0981e9ad20ac84de68e83342e4e717bdd33791e
+DIST kde-l10n-et-15.08.0.tar.xz 3264820 SHA256 6e5fdd67296ee5a687528d71e3dc4015f040915ebf7eaecf92479dcef4c781ef SHA512 db7a1943017c92e4e5d67331318727b6fb2efb04207eff20a9601a636bd864fc011bed585f20d8bf6161b9451578258f50f7854bd898b051afb8f45cbe794c8f WHIRLPOOL 33f662b321e60e0a413c43e5bd971c7e6408b389c0cfcb45bb2eeea18748aa3e940cd1602f8ce642c330f12bc74794b3701984bd4ca28d7dea436e9f83e97b01
+DIST kde-l10n-eu-15.08.0.tar.xz 2125996 SHA256 170edc4188661b0ca82acc72b73c810bdeeda3ca8496db8ab9d0daf7dd92458e SHA512 ea541ead4696ad934f4270350fce239d8fb529a71d94efdf14a94bf13ced0ef64e95b3b3c69969b959c58df34c98d1a50a1aab51030a08dd813c697eb2845bc9 WHIRLPOOL 0b7194e6dddf59793f2633c08c20daa751f1aaefbe35a52332e3c1524cf408327db60c9a292d816eced4f88274cb5ca6cf13546b4627bdd78766bdc01fb67ede
+DIST kde-l10n-fa-15.08.0.tar.xz 1948980 SHA256 d48db9572e61d434940951038f501654eaf8a74fe00cfde4933c348750b9e967 SHA512 1708a46ad6c24be76fe147b8f87de81f95faf73b313a0e16d7387ca58b943caae4b7fe382fb07b5a2aa2efb169446f4cd3b3340c16ff624acf794dde4f5dbb8b WHIRLPOOL df645f25ac991b78c83783b8db0ec23110c34bfd585fad7b49790aa0bbe7e0cdc6a8dc6da953b70f552c51a4da351b221a45640746b063a0e0c1ea15f770a7ad
+DIST kde-l10n-fi-15.08.0.tar.xz 2831000 SHA256 0c03e56d7cbe8d255bf814e049ef338030bffec7983349ba524468d7f3959114 SHA512 3f5a6fa3b457e5acd1781e2ad4564efaca700cbf2f31274af5209e907449869352158afc9c6267d94b3c734cddda063a59b2c8695eab8b91e48bd34ddb921055 WHIRLPOOL 0949543c249a2fa064b85a953d7b6d4d0cd319579afdc0fdadf299821c523961b007e05a389b11b187951c49e9ec66849823e6f7b0e41da7b289f2e769d1b3e8
+DIST kde-l10n-fr-15.08.0.tar.xz 44520744 SHA256 80b27e80bd5c6d8e2e2d5cea58769b47df1b54fe2789d895f5791c0c4e6cd42b SHA512 17f46c2dbacdb7b2369b65ecec4275e3b3855b790048d7fdfb532169a07c108ecc276406e7256c379b2424ac3672ff2ae0ca9a95175259a613b2a211a0c7fb29 WHIRLPOOL 49f29cd69be736f69f73c4e4047325c0ef52eef6e66695abd8d340451f9883a5ebb93edcae0b587236f14421b9af1c93359aead0acb7b8dc902629dea6162839
+DIST kde-l10n-ga-15.08.0.tar.xz 2951776 SHA256 576c8a2a93b63f3f29a5ead101a32df84c0726de0cca60d60399a6e3a3bbca9b SHA512 6a6002996990e4ad05530de31d9436bc77a87652f52b40bc05fee8da7e05f46e3dee59cf7a6ff2bdf0b012e1df5a38d3becf7272d8c97ed74f784b54fc39cb8a WHIRLPOOL 323b12f27374999c0b0f0381ec6a7697d8b1de6db85cc2db4f4139bafc3234d490f76ae38db34c19f9793651f8ae9b9b30f2f4a9b960a096ec3dc8faacaf8c18
+DIST kde-l10n-gl-15.08.0.tar.xz 3539372 SHA256 b6aafbc6a979647958bbed3a6651f91c5c6d8a8417593f9ef005af84933ddf0a SHA512 628ee7980b4e74d1af1ad4502b245491e96dfa4f9664402601bc9ad2e9e484c11b0ef11067b48229a4c1987de93fd497686fdb41d610df65f98f6a6291488f42 WHIRLPOOL 27c8cd890cd040db8199d14ea4e062df2360a78b519e4af896db6bd3cb2046de05b1506221a54f98e997ccbbf96c645d919f17d0e511e4e85e72831b16f62062
+DIST kde-l10n-he-15.08.0.tar.xz 2195200 SHA256 ba2dbe67f2d7bde15ae1abe49041f325f143f2a31ea137ab507ce276bc410579 SHA512 c116acefbdd3ae19e2fafe668614553e93e4164a967baa777108856225b6b4f518492b64599fc283ed43fbec7837f1346744e8851b49932ca5df5c21986b9881 WHIRLPOOL 21bd918d9bb6bad1e825b049431995983ec54e34efeb41827dd9ce16b2a79e2b24f13e363dc30905513b877860de6d106a2813b4ecbcbb58cf82df38f2d4a10f
+DIST kde-l10n-hi-15.08.0.tar.xz 1860160 SHA256 5e73569d67aa6d53466ca01a50aac54c1d1c6cfc1c8b1e8abd6ae56948e41237 SHA512 91b7b3ee07471066812209289fbd77841d2762da19f464b1ad33d0ee2f1ea22ed6e0c342f8961e3fad37bc5ba404de606aad9b1980ca361843024a6f313059b4 WHIRLPOOL 6688eb30b03618dba7250e7d7fde86aa3c8236b7ca8b4a6284c83a4eae61cfac06c2d41807e790c30c5f33776f3ced929fe511f691f0a528727904ae20b0a414
+DIST kde-l10n-hr-15.08.0.tar.xz 2079472 SHA256 7bb0a7a5b855042d0f0f11b6509c11672a129ebcd9b36a47e191ddca434a8c20 SHA512 b6196c69dc65955e0e33a7102550368f0cd19236e6a616f7fa69109689d9a6b1a6815c4436c4e8bc20e4d1f2b1adcbee549cddbd4e97633bd08e56aab731333f WHIRLPOOL e3b5ef72f39a02d5111b9b1fd701f6224c15f371709dc208a5ca69be147e6e8baa05e475e18a821e253b5b727de47c81ebb767fa91475aef72cf0d389052ed39
+DIST kde-l10n-hu-15.08.0.tar.xz 4378820 SHA256 ea47513506432487cb2561871bfe4c6b95c3bb4fea2f4d1ddf4078d2e6082160 SHA512 9ef76954f16aa3cd18efaf1dbd65e60575ccf0b4b007f687d58e511d224d9d4c5c2d1b2d8c3c0e73d4e3f9a80a79a0ab5386e13e55e32315b491c5c3f95d543d WHIRLPOOL cab26e8f5a781054446e71f7148b53106d289b8f382ba82ad46d54359c66a44ff7f02a489a840dd6f0aa54e0ed772e8660e1d76d729931c7c093a9d03e7c1cda
+DIST kde-l10n-ia-15.08.0.tar.xz 1406260 SHA256 ca2c36997b863cebdde54f8729f8daefc740ad32e16e1c34ada43bb7691a9eac SHA512 7a5d25351e80eadb243459d3369af214326fc60d8a77f16f7f87a96cae7879205ad754f4f6e8c980d887f171ce7191ee9c70c219ef42986743236ae804616b00 WHIRLPOOL c71cd44f2cf19031675a5a40a491017a1c290ed977cf487a35eb825488ba4fd666ca742d5cfc5e0ea3457fbdbeaa4236078dcadfc2d0c79e67aad04a422739a5
+DIST kde-l10n-id-15.08.0.tar.xz 573208 SHA256 071255354073ec9751fe9fa48440d97aa0feac87d760c4aa258a7784fde49dbc SHA512 bf95dba10c0e0c8d95a3f59a3ab8b55d35476d3867e23bedab4d7a0786ea4fbd5b8214060a0ccd1e900de86a6e32b878a0da6b4ae9a3d86aca36d0657bf6be8f WHIRLPOOL 2c1891d5826911af0c989a724b3e4437b7a595524e495e4d1a4f694bf1bf5be571da131ff6c02385aad8c7b897c16dde634f158d413a0d4045671dadda84278f
+DIST kde-l10n-is-15.08.0.tar.xz 1863912 SHA256 973c239cb273efb507fdf1fde230faa7f112d91439d4852a1d3ceeffb934357a SHA512 94fb64002c851250bf4d06d23d83fdfa046f0a8388377f444735671201431990fe66e6622403834d57058001a61bd49f0c4956a2fdcc1db0d5eb289acb2930df WHIRLPOOL 7e210303deaf55fc42231251395cb8c60e88163d5461394d21ad6fb68e786419fcb6b9833f222d1ec9cd89e106b59c5179a006bc4426a5178504364b65a8db22
+DIST kde-l10n-it-15.08.0.tar.xz 8820884 SHA256 2f66b34c6c311087869a37afdc396a0debc647559b6a940275e6d092ad0fa00f SHA512 05d7d726eec654969f5fabc24324093a4e8e79e5b34a8e79a8d96fb03a6d0593c4412d78ac2eb71dbcb57a9b476dec5641363ecab666467d9c028f57b00dd24c WHIRLPOOL b5090d857e5a2e9283f980a49cbe7a6a8f248f0ac3c8ffa5983d210703f4a0aa41bd2f9eada8ba5f05e00f5ded459a20b26529d77840b04b5cb15b28010bb23a
+DIST kde-l10n-ja-15.08.0.tar.xz 2338448 SHA256 9ef32b849e42a2dd66068b342047843a3500d783bb728d19cac66e8a3487869f SHA512 1159c56cef200b533dacbf1e6eafde73224e64de762d98c2f4b831172fd266ad2458233a400c2ca278a04c291fbc938d44472154cc4df91716b27f2221a406a5 WHIRLPOOL ad84dfd9e123bcf4c210b50a37147b99530c9707399f93209a5159df059f5f57985ab88fc6b0ba2483a409a88cbe9da3471266693da9314f1b51d5d7cdac6fe9
+DIST kde-l10n-kk-15.08.0.tar.xz 2679080 SHA256 6c94cc8bfcd60e6139510836e4a3ca0e4985688813d36935304284fee7ddf0cc SHA512 50fedab1feab01fa764ea107e12b881e8d2ccd45c8f28525e00ea2a2efaf928a2fab831947a632dcedb7c7ab908153a312a703f5223c6ae951711706da05b793 WHIRLPOOL 408f4e71c16782d0d77a65192954fbba5ac07956b7a7b47a5814c9756eafe042523c3805123363b5954d31d7e1ba943aa939393bbaaa925285eb743ed84fd964
+DIST kde-l10n-km-15.08.0.tar.xz 2213948 SHA256 700e6e39afc1f81c526fd8566a7c9ceb71f7af1a791ca20fa7e8b59015530ce0 SHA512 b456798408902a4ba3a757be1cab42bdfc89db0bc5163b6e01fd4ede9073cc09c5940410d7f4ff9b6801703e84391375917ae9748959bc30d0cfc9a5b71dd90c WHIRLPOOL e4682e60f7fa83be01eba5091acd3355efb4cdf0ab2731fc1c0f9a2c5d069bd43af2ead01c5f9ca0cdb3a62d03c42b6dd92eb257145275942baa273457d977cd
+DIST kde-l10n-ko-15.08.0.tar.xz 1974592 SHA256 adaedca1b05c3dd623c1a8c343a8937abee582f10f4490630f15915f907ce195 SHA512 596f1fd29ba7dab3805f0bffa011ce64084360deca3fdb719f9c6e6c42aba25877ab2d02c0f2d2a44c75d5e551d5015718e2aaad17f0c40886d776bf5cc0d140 WHIRLPOOL 9d81d20f9f065f87b7cce9fc7fbaf0487d942eb43384a22d774772c8ebc4ae51e857c8494db56c7e8714f5e0619c41230e3cd0d0e79c2f8076de87deeed54664
+DIST kde-l10n-lt-15.08.0.tar.xz 12873464 SHA256 8b2bf246b06756ad6b98affbd3d70990f2cdd1a43cb90202a753d38c42eb2095 SHA512 489041e7adcd04f4f18197fd4b47139a9f18c793023a0dae54af2316471feda6339b6e96587f17e6b12c5e23a1fad56a2cfce920c6af3d47164e812ccf4e3d09 WHIRLPOOL 2e1a3869b7b02ba8e23056ccc5ac7179d5a2ab26c44b18946817f7289563dea1c7648179ec39a1ed02769b7d038b02e0a6fbb7a083d2ad8cf6823056ca51dea7
+DIST kde-l10n-lv-15.08.0.tar.xz 2222296 SHA256 5eae25395b77d214e6a479f7b62b8321efd259d5f1d6ff291948359bed981f57 SHA512 431479b8cdd654245b96f1c12b902b72ac7daaebd6504fa99333fd4e34ede2001818276ffcceaac84e35b1fc0e8ed28799e337c646e67172c1ad99a1d44498ee WHIRLPOOL 00eb412296304006dad6e4c1b1bebc519df2f3032b341127b2165f037e2f656d61d91d96c57e0dae98cce9d6e2793c248f7ad94f6cb76e0dcdde33a09ca6467a
+DIST kde-l10n-mr-15.08.0.tar.xz 1871564 SHA256 8cd7f34a0a51287e9c3ca7556d701c9e96c567cb42970f7d00a794a460ae9445 SHA512 569cc85ecf2bbdfb4575e5f1424ae4de1f2dc2c2433ff6ef52b6f75eae4e259efd00fb1df20726b74b1fd148a182d34eff04d3aa3e06b7504db5b3c050b57b68 WHIRLPOOL 5c0aa1b783735099ae3a712ba4a9c19c159778205303e38b29b1fc8f73b1937afe3f7cb1aad8e827e4194dec52f4187e59ec6a21a9eba41e83ca2089d561f872
+DIST kde-l10n-nb-15.08.0.tar.xz 2526556 SHA256 e806bd713804840152ee4e06d47d2515352c02dd76b7b1e30a9e4d26b9812632 SHA512 66d5355e1f4ed2764277faa648656216d56c92fc38a3ec41b5d29b1129d99d9857a2d0edcd21a24354c817fb212ccdc10eb25308d6c042664925970736ecd7fe WHIRLPOOL aa68b82bdbff459006d6c8e2b97b225b327f41015a5d7b1f8b129edf80ab958b2f1b65cebda21fabd0aaa81c2d8f574872618a9fe8e04fc4ec55fd6d259a16a9
+DIST kde-l10n-nds-15.08.0.tar.xz 3337368 SHA256 d4bf0dcd533da998c1913cc8606d246f7087428f2a59536f63362f2dfd1e8233 SHA512 b8db39540d4fbdce5ed8b4e1df2deddd9589fce74c1a50c4e043464e2490f0d6a6c32817ff3aca388ded0fd1aa3bceb69ee7001fd4d33ccee9070bed4ed11544 WHIRLPOOL f6cf4dcb2285b18550ac0bcea8dee94bfcebdd31979822b795da23290a60dcacc6cb7d4a1434f111b15799d37f547afa69089680f0f8f4766cdb74dec04a9479
+DIST kde-l10n-nl-15.08.0.tar.xz 13955804 SHA256 1432ee414462fc2bc1f9285ee0942bdb6bf631efc3c70ed4d730b097a683eabe SHA512 74c0e44c455c164023b3db91ebda49095d33d525a2d9ac8b4d6e4da49a133d1672f6421e7c3ca54790d31853d0db8d355ff5ff0e0760892da7b4fb8e618c533b WHIRLPOOL 031a696972238b137d443ff1a1ba139bb1a66a003b409ce2e31a700f9843e8938f8f54e53acfd54b75f3a67f98857804ffc409e91c9bf494a18fa875f0a042d4
+DIST kde-l10n-nn-15.08.0.tar.xz 1893928 SHA256 ee4800c7e0c123b8314f183200b1a999d09f4afc313380fa5e72ad984886e5dd SHA512 f8ff0af743d644b44b8886f55b38ac577dab134ea198d8254702a912f49d8dfdc5213fadbb684392b480dba68524b625c82f5af7730ab4d560555f14d61d5e31 WHIRLPOOL e96fd07441956228ed3dba8187b55b15e685ba49b5eb3a808d4ee0e1394e132cc4156926fbb7324116566cb5fe1c578810ca0e5cde1b548cf152e681f4712e11
+DIST kde-l10n-pa-15.08.0.tar.xz 1942128 SHA256 670e6d201d5fc0d494939949baec84cccc5757e3af96f766bfb03b30b0d47bd4 SHA512 ab65a7bfc544bf59616a16a653709f9d866eee07c51a42a85a1810596df637e27e74c77152815a46d66fa864f0f4a92112b73c4e6d9db6b07eafce58d69fc552 WHIRLPOOL 1be51e8ca524a9fb14aa081449a5680e58777879548b170ca8d4196f84c6f053a6ed0e1e8774751a8e88c775488cead4f58d5ec6f849e3413cb21cadfea0daa0
+DIST kde-l10n-pl-15.08.0.tar.xz 19099600 SHA256 bff7acbc9a3e2790cb23bedbd2d4bd45c1f693994f8cd2f57c48f559f1c29161 SHA512 544b6af9a55d6ec606266f710e0eecab56582d9688c93fae77a0a42f9572223494c8def961f14f27b6d2026c452274d62f67af3d9da69823e63abd9365e7fdd7 WHIRLPOOL 89d66e05324f998dd1448db1bc553947a5a93a56bd76cf18c6c49a2a0fe353bf37078f3b94e54c9e5f66a1b79ceb4dbd8a7da79cdaf42adffd028ce104904d33
+DIST kde-l10n-pt-15.08.0.tar.xz 3545244 SHA256 344dbcb27bdc4b93944672f09339ee6f46f4898ec8baa32add10a3a193d7036a SHA512 04666ea2a621d1d86f30e3d115f53707ecce6e06ebbe17369e144f9b9058acb2dbf093cf3e2c88445f4c1ccd93226f416e3dc23a499f6da4c6f80710598ef1d8 WHIRLPOOL 1271150645fc69337991b46035cf1256d67100a6228f0d2856be369c7b0f22fe154e7a2cdb90b9d2a140293e29986e115fd1089e256ae9afb7dddcd13e076aac
+DIST kde-l10n-pt_BR-15.08.0.tar.xz 21686420 SHA256 cfdf66365ea1a1ad4e531a4f84e54124c1155f4370e63f36c1c5111fda19cc53 SHA512 5f85ab487490519378ee81a53e13bdfc25c9577e9a7939fd1e172ad8294ebff4a062bf8a5c5fac523270b1d9fa7316f73fa641f7b5f6cf2c5fc666167c35abe7 WHIRLPOOL d8a782df74af3a8dc89bb88cf2dd2ffe29037732b647835f7a95fb7b42b686b7b4be915c41e4680186ecd0cf0bf8620b52918a211192902fc0b35d1510aa948d
+DIST kde-l10n-ro-15.08.0.tar.xz 3109304 SHA256 4495168bcc06746d6e91ae6fb3e562d167b10f5825a75cdc00acac61dd0e3c59 SHA512 81b1163ae1f9db6c7686efa80e1f1aeb1aa729a8b70ced76e4596fbaf4f4a8170cf9ef7861faab2e4167dd19be2765f43aa2da85d173e5972d85d3751c320698 WHIRLPOOL 6dedc9b7c35b4680fa1105e6e2ba9be08c3f16a28faff166a7054b40572f5973e2573cfed896e90423b86c9fc67cf37fd58237f91880bb1589d6b95fbf984092
+DIST kde-l10n-ru-15.08.0.tar.xz 22285476 SHA256 655e62a1c248bc6e2b5d0140991dce626970a4ed3d0ef114e70c907340787386 SHA512 3ab1cd22255b4be29be66c49d6c2c932b786b4cdefe8bf2c0b98ba0443685698cf38475b4cb4bb5942cc109061409a4818570eff37465acdc5daf01ab241ed22 WHIRLPOOL 351052222197e2064fe341963575926f0db34934797ceb0aca4e066ebf0ff908053793f696865378b2c1c6c7453d43345356171130512349731e79da24a2603c
+DIST kde-l10n-sk-15.08.0.tar.xz 4612052 SHA256 06e0499bd45413da00c206fbc7c5e5a1f124bff0fb97d30dd5187a54bff5e82d SHA512 cd1b6c18ed7b90426ced2c2d13667d4b27f8b446a99b8c2b0be2f7af95dc8474c9426cc6c7de2f7b00faf853983c00cb563b645bcd55563362191b7fa8f11a50 WHIRLPOOL 3023c86b4eb7df356bf51365f57ea9e0b3426235df74068eacb176d56cdc74a362512552bf4ee4e8e20ed106e77feffd3c07c16ddd0c3b8960d87472852d6960
+DIST kde-l10n-sl-15.08.0.tar.xz 3251952 SHA256 3e52b43110e0e74e24fa137eb82b2dde659653807bc12daad7f5270dbfc8a2ee SHA512 5b225ac3375a39d047c4f85d1a101f83eba458f37ef609cafb61952a82d54919cc34135f87ca49dae2a30b19ef7161af68e95de1e595a58d5a625b418bab193a WHIRLPOOL 61f6d3f8edaf55f7dae108f2673e8ca6cdbf5be5a3e795f5fe0fc866049d638909225b106a2ba6fcc1ba872a5e057263324bbe857e5eac747e37638f59e0f562
+DIST kde-l10n-sr-15.08.0.tar.xz 4802156 SHA256 7f744a49bf8ad835b8ad10257d23d43878761e889c865814ceeb3ce6d608e59a SHA512 34e5a921890eae7881bbaf6223e2c0772bab1d52a16498efddb6dd65cab16e6d14e53b20c60fb08135b577f51f5b0212536c01d885f2566394fe4e63264042ba WHIRLPOOL a1c7a96664114420373223ac1131ac716c9311c4b6fab5b57032737c4aa8ed843d398965f92e80885facef35236728228ab099f9836a72174e76755ca58d4a24
+DIST kde-l10n-sv-15.08.0.tar.xz 12694592 SHA256 2a68e82a38f6ddaebc9060b97933293be3e464a084ab332fd9cddad59b87910d SHA512 77614ea37e4dc991adc4f9090b3376afffd579f4751f956be086fc80b88bfea485960ef5737ad24b8dc7a5bba013505502f47b1aed8aece1f26c6f8d0352c2e0 WHIRLPOOL 01bbf1bc5fca73867922449258b80bd2493b8d49d9dcdbaf441926bfec2f7c7f6f84650a44f2e574d904fa6331b2488a99e3b4b85c909d91c51abc5ed6ac9bd5
+DIST kde-l10n-tr-15.08.0.tar.xz 3974616 SHA256 e48ab92dcfcd31ba32922cc9b4cecff826818bb69782bcea07a768d9f6d27d16 SHA512 3396df18422eb06cc86e00c8edd92a757712c0f8266ba9db6af7e3b78ebd0fb5184e727bf02c21fc6c58d75cfe128c6c5a33e59dcf239f9d4f00236c1a9ccefa WHIRLPOOL e7b4a14e20e5f0d9437cdf19ca7cd7fbf89deef5cd92ec4433fe321fd59cdccb0181d1f760e535d8d26da5f47a039f591387c384909e61cde40d1491cabd9200
+DIST kde-l10n-ug-15.08.0.tar.xz 1834464 SHA256 b9933b90d6a4a59bfddab85a318ef007406408d84d2f8f6bbac7e2fa3938db8e SHA512 5854943d0165b3d2c60cda22559e8bacecd1965ee2853eb13ecb92b93370a39ef953383f50138867bd1ba2013447362153628a566091398d6dbccf7632c4fb80 WHIRLPOOL 6d88ec4c73b9e20fa29fda592285fd8c9a8f282ec86be3c5cbb6c17c28ab1f242d439a875341b542726ad95744caf11ef81ce3aceaeae391f384053d5c244be2
+DIST kde-l10n-uk-15.08.0.tar.xz 26028268 SHA256 1b137277e954f9c24b56aeaae2b54abd6760fe634c25c911632a56619b20d390 SHA512 6bd252ae86bdf118a695ee761b3081b9a0a2db02fb56b42e660f216863697df573e425c149f658fcfaa36a506d28cec2bc96523141bbb30d566dfee94fab921f WHIRLPOOL f6faab373ad878f6b7ad0682dc54e0f7e1f874a687e1255afb0ecd7b8ce6fe2eed22e9eb38d93403a220068b95fa4b94d7e3e90b3638b11a52951d48b778da99
+DIST kde-l10n-wa-15.08.0.tar.xz 1746876 SHA256 416cc8ab61b427f485fe5ea95b37f1580446e850d6270a05a61557f3683539be SHA512 876fa8f57a9a277389a8ae8bf2ba27a732fdf830545901093dde368a4cdfe953764f54c303576a0afaaabea4fd76f7d5d856a764016a676abc0b21cf95d46cdd WHIRLPOOL 7469d5a9c9a347e19c179e5743b8146d58e9b2dedbee875c57c9d1e627d7c1e14f2a4e441691359af5b4dacb626a24eb25c1f68d04e958f55c258fc8bf68712d
+DIST kde-l10n-zh_CN-15.08.0.tar.xz 3667120 SHA256 7b620204f539c09f939d94b132d61242d4e5c1503c4c3e5030f574f834f44d44 SHA512 e1d83369c25daaf26345be2a9e5c5181f575b4993f19a7d1e772db2ae648afd7767f8060506c0bf91b756cc6033abad879d5d8128fd5d0b4d948901ccaed8021 WHIRLPOOL 189c8bf51eb238361a342483d662cf56d8b1e7c100173e59d1ddf256a21671e872ca3635ec3d6f66b9f73403cd1263af0e827ca9589f841a7d55e7e83dc6a5fd
+DIST kde-l10n-zh_TW-15.08.0.tar.xz 2728692 SHA256 541594902f06f19a5d90624fd86a42ed77dc9a8ad6e68993169fad978f80bd2d SHA512 fa3957f0ace8167d308cdf295e0f8d5862a300b05a6068047d0fd67604cd072b502158634616d10b198490bb16a1e5cce763e0a6825f030fcf6aaf36579c540f WHIRLPOOL 08ae8883ede16fbc193175721a993bb2163b759d7dbadadce67e037ded528f726bdb9c771c982e9aec038c635559ad528cccf966f627415da1798137dfe2a09a
diff --git a/kde-apps/ktp-l10n/ktp-l10n-15.08.0.ebuild b/kde-apps/ktp-l10n/ktp-l10n-15.08.0.ebuild
new file mode 100644
index 000000000000..c2eb335ec7aa
--- /dev/null
+++ b/kde-apps/ktp-l10n/ktp-l10n-15.08.0.ebuild
@@ -0,0 +1,131 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_HANDBOOK="false"
+inherit kde5
+
+DESCRIPTION="KDE PIM internationalization package"
+HOMEPAGE="http://l10n.kde.org"
+
+DEPEND="
+	sys-devel/gettext
+"
+RDEPEND="
+	!<kde-apps/kde-l10n-15.08.0-r1
+	!net-im/ktp-accounts-kcm
+	!net-im/ktp-approver
+	!net-im/ktp-auth-handler
+	!net-im/ktp-common-internals
+	!net-im/ktp-contact-list
+	!net-im/ktp-filetransfer-handler
+	!net-im/ktp-kded-module
+	!net-im/ktp-send-file
+	!net-im/ktp-text-ui
+"
+
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+# /usr/portage/distfiles $ ls -1 kde-l10n-*-${PV}.* |sed -e 's:-${PV}.tar.xz::' -e 's:kde-l10n-::' |tr '\n' ' '
+MY_LANGS="ar bg bs ca ca@valencia cs da de el en_GB eo es et eu fa fi fr ga gl
+he hi hr hu ia id is it ja kk km ko lt lv mr nb nds nl nn pa pl pt pt_BR ro ru
+sk sl sr sv tr ug uk wa zh_CN zh_TW"
+
+PIM_L10N="kdepim kdepimlibs kdepim-runtime pim"
+
+URI_BASE="${SRC_URI/-${PV}.tar.xz/}"
+SRC_URI=""
+
+for MY_LANG in ${MY_LANGS} ; do
+	IUSE="${IUSE} linguas_${MY_LANG}"
+	SRC_URI="${SRC_URI} linguas_${MY_LANG}? ( ${URI_BASE/ktp/kde}/kde-l10n-${MY_LANG}-${PV}.tar.xz )"
+done
+
+S="${WORKDIR}"
+
+src_unpack() {
+	if [[ -z ${A} ]]; then
+		elog
+		elog "You either have the LINGUAS variable unset, or it only"
+		elog "contains languages not supported by ${P}."
+		elog "You won't have any additional language support."
+		elog
+		elog "${P} supports these language codes:"
+		elog "${MY_LANGS}"
+		elog
+	fi
+
+	[[ -n ${A} ]] && unpack ${A}
+}
+
+src_prepare() {
+	local LNG DIR
+	# add all linguas to cmake
+	if [[ -n ${A} ]]; then
+		for LNG in ${LINGUAS}; do
+			DIR="kde-l10n-${LNG}-${PV}"
+			SDIR="${S}/${DIR}/5/${LNG}"
+			if [[ -d "${DIR}" ]] ; then
+				echo "add_subdirectory( ${DIR} )" >> "${S}"/CMakeLists.txt
+
+				# Drop KDE4-based part
+				sed -e '/add_subdirectory(4)/ s/^/#/'\
+					-i "${S}"/${DIR}/CMakeLists.txt || die
+
+				# We only want messages
+				sed -e '/messages/!s/^add_subdirectory/# DONT/'\
+					-i "${SDIR}"/CMakeLists.txt || die
+
+				# Remove everything except kdenetwork
+				if [[ -d "${SDIR}/messages" ]] ; then
+					echo > "${SDIR}/messages/CMakeLists.txt"
+					[[ -d "${SDIR}/messages/kdenetwork" ]] && \
+						( echo "add_subdirectory(kdenetwork)" >> "${SDIR}/messages/CMakeLists.txt" )
+					# Remove everything but ktp translations
+					find "${SDIR}"/messages/kdenetwork -type f ! \( -name CMakeLists.txt \
+						-o -name kaccounts*po -o -name kcm_ktp*po -o -name kcmtelepathy*po \
+						-o -name kded_ktp*po -o -name ktp*po -o -name plasma*ktp*po \) \
+						-delete
+				fi
+
+				# In some cases we may have sub-lingua subdirs, e.g. sr :(
+				for XSUBDIR in "${SDIR}/${LNG}"@* ; do
+					XLNG=$(echo ${XSUBDIR}|sed -e 's:^.*/::')
+					if [[ -d "${XSUBDIR}" ]] ; then
+						einfo "   ${XLNG} variant"
+						# remove everything except kdenetwork
+						if [[ -d "${XSUBDIR}/messages" ]] ; then
+							echo > "${XSUBDIR}/messages/CMakeLists.txt"
+							[[ -d "${XSUBDIR}/messages/kdenetwork" ]] && \
+								( echo "add_subdirectory(kdenetwork)" >> "${XSUBDIR}/messages/CMakeLists.txt" )
+							# Remove everything but ktp translations
+							find "${XSUBDIR}"/messages/kdenetwork -type f ! \( -name CMakeLists.txt \
+								-o -name kaccounts*po -o -name kcm_ktp*po -o -name kcmtelepathy*po \
+								-o -name kded_ktp*po -o -name ktp*po -o -name plasma*ktp*po \) \
+								-delete
+						fi
+					fi
+				done
+			fi
+		done
+	fi
+}
+
+src_configure() {
+	[[ -n ${A} ]] && kde5_src_configure
+}
+
+src_compile() {
+	[[ -n ${A} ]] && kde5_src_compile
+}
+
+src_test() {
+	[[ -n ${A} ]] && kde5_src_test
+}
+
+src_install() {
+	[[ -n ${A} ]] && kde5_src_install
+}
diff --git a/kde-apps/ktp-l10n/metadata.xml b/kde-apps/ktp-l10n/metadata.xml
new file mode 100644
index 000000000000..a23f444b67d6
--- /dev/null
+++ b/kde-apps/ktp-l10n/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>kde</herd>
+</pkgmetadata>
diff --git a/kde-apps/libkdcraw/libkdcraw-4.14.3-r1.ebuild b/kde-apps/libkdcraw/libkdcraw-4.14.3-r1.ebuild
index cb403fbb27a6..7b781a86c301 100644
--- a/kde-apps/libkdcraw/libkdcraw-4.14.3-r1.ebuild
+++ b/kde-apps/libkdcraw/libkdcraw-4.14.3-r1.ebuild
@@ -7,7 +7,7 @@ EAPI=5
 inherit kde4-base
 
 DESCRIPTION="KDE digital camera raw image library wrapper"
-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-apps/solid-runtime/files/solid-runtime-4.14.3-networkmanager-1.0.6.patch b/kde-apps/solid-runtime/files/solid-runtime-4.14.3-networkmanager-1.0.6.patch
new file mode 100644
index 000000000000..d559b04f543e
--- /dev/null
+++ b/kde-apps/solid-runtime/files/solid-runtime-4.14.3-networkmanager-1.0.6.patch
@@ -0,0 +1,19 @@
+Fixes build with networkmanager-1.0.6.
+
+Triggered by http://cgit.freedesktop.org/NetworkManager/NetworkManager/commit/?h=nm-1-0&id=6f616d4c4b04d5478f60d0311317bc84c5459ea4.
+
+https://bugs.gentoo.org/show_bug.cgi?id=559892
+
+diff --git a/solid-networkstatus/kded/CMakeLists.txt b/solid-networkstatus/kded/CMakeLists.txt
+index 633c7f1..341a1ed 100644
+--- a/solid-networkstatus/kded/CMakeLists.txt
++++ b/solid-networkstatus/kded/CMakeLists.txt
+@@ -20,7 +20,7 @@ if(NETWORKMANAGER_FOUND)
+     if(NM_0_7)
+         MESSAGE(STATUS "Adding in-process NetworkManager service-wart to kded module")
+         set(kded_networkstatus_PART_SRCS ${kded_networkstatus_PART_SRCS} networkmanagerstatus.cpp)
+-        include_directories(${NETWORKMANAGER_INCLUDE_DIRS})
++        include_directories(${NETWORKMANAGER_INCLUDE_DIRS} ${NM-UTIL_INCLUDE_DIRS})
+         add_definitions(-DNM_BACKEND_ENABLED)
+     endif(NM_0_7)
+ endif(NETWORKMANAGER_FOUND)
diff --git a/kde-apps/solid-runtime/solid-runtime-15.08.0.ebuild b/kde-apps/solid-runtime/solid-runtime-15.08.0.ebuild
index d06ffe46786b..3e47bc9f44e2 100644
--- a/kde-apps/solid-runtime/solid-runtime-15.08.0.ebuild
+++ b/kde-apps/solid-runtime/solid-runtime-15.08.0.ebuild
@@ -26,3 +26,5 @@ RDEPEND="${DEPEND}
 	bluetooth? ( || ( net-wireless/bluedevil kde-plasma/bluedevil ) )
 	networkmanager? ( || ( kde-misc/plasma-nm kde-misc/networkmanagement kde-plasma/plasma-nm ) )
 "
+
+PATCHES=( "${FILESDIR}/${PN}-4.14.3-networkmanager-1.0.6.patch" )
diff --git a/kde-apps/solid-runtime/solid-runtime-4.14.3.ebuild b/kde-apps/solid-runtime/solid-runtime-4.14.3.ebuild
index cd6e52118630..62c70d33e336 100644
--- a/kde-apps/solid-runtime/solid-runtime-4.14.3.ebuild
+++ b/kde-apps/solid-runtime/solid-runtime-4.14.3.ebuild
@@ -26,3 +26,5 @@ RDEPEND="${DEPEND}
 	bluetooth? ( net-wireless/bluedevil:4 )
 	networkmanager? ( || ( kde-misc/plasma-nm kde-misc/networkmanagement kde-plasma/plasma-nm ) )
 "
+
+PATCHES=( "${FILESDIR}/${PN}-4.14.3-networkmanager-1.0.6.patch" )
diff --git a/kde-base/kdepim-l10n/kdepim-l10n-4.14.3-r1.ebuild b/kde-base/kdepim-l10n/kdepim-l10n-4.14.3-r1.ebuild
new file mode 100644
index 000000000000..7fe98fc18f81
--- /dev/null
+++ b/kde-base/kdepim-l10n/kdepim-l10n-4.14.3-r1.ebuild
@@ -0,0 +1,120 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_HANDBOOK=optional
+inherit kde4-base
+
+DESCRIPTION="KDE PIM internationalization package"
+HOMEPAGE="http://l10n.kde.org"
+
+DEPEND="
+	sys-devel/gettext
+"
+RDEPEND="
+	!<kde-apps/kde-l10n-15.08.0-r1
+	!<kde-apps/kde4-l10n-4.14.3-r1
+"
+
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+MY_LANGS="ar bg bs ca ca@valencia cs da de el en_GB es et eu fa fi fr ga gl he
+hi hr hu ia id is it ja kk km ko lt lv mr nb nds nl nn pa pl pt pt_BR ro ru sk
+sl sr sv tr ug uk wa zh_CN zh_TW"
+
+PIM_L10N="kdepim kdepimlibs kdepim-runtime"
+
+URI_BASE="${SRC_URI/-${PV}.tar.xz/}"
+SRC_URI=""
+
+for MY_LANG in ${MY_LANGS} ; do
+	IUSE="${IUSE} linguas_${MY_LANG}"
+	SRC_URI="${SRC_URI} linguas_${MY_LANG}? ( ${URI_BASE/kdepim/kde}/kde-l10n-${MY_LANG}-${PV}.tar.xz )"
+done
+
+S="${WORKDIR}"
+
+src_unpack() {
+	if [[ -z ${A} ]]; then
+		elog
+		elog "You either have the LINGUAS variable unset, or it only"
+		elog "contains languages not supported by ${P}."
+		elog "You won't have any additional language support."
+		elog
+		elog "${P} supports these language codes:"
+		elog "${MY_LANGS}"
+		elog
+	fi
+
+	# For EAPI >= 3, or if not using .tar.xz archives:
+	[[ -n ${A} ]] && unpack ${A}
+}
+
+src_prepare() {
+	local LNG DIR
+	# add all linguas to cmake
+	if [[ -n ${A} ]]; then
+		for LNG in ${LINGUAS}; do
+			DIR="kde-l10n-${LNG}-${PV}"
+			if [[ -d "${DIR}" ]] ; then
+				echo "add_subdirectory( ${DIR} )" >> "${S}"/CMakeLists.txt
+			fi
+
+			# Remove everything except subdirs defined in PIM_L10N
+			for SUBDIR in data docs messages scripts ; do
+				if [[ -d "${S}/${DIR}/${SUBDIR}" ]] ; then
+					einfo "   ${SUBDIR} subdirectory"
+					echo > "${S}/${DIR}/${SUBDIR}/CMakeLists.txt"
+					for pim in ${PIM_L10N}; do
+						[[ -d "${S}/${DIR}/${SUBDIR}/${pim}" ]] && \
+							( echo "add_subdirectory(${pim})" >> "${S}/${DIR}/${SUBDIR}/CMakeLists.txt" )
+					done
+				fi
+			done
+
+			# In some cases we may have sub-lingua subdirs, e.g. sr :(
+			for XSUBDIR in "${S}/${DIR}/${LNG}"@* ; do
+				XLNG=$(echo ${XSUBDIR}|sed -e 's:^.*/::')
+				if [[ -d "${XSUBDIR}" ]] ; then
+					einfo "   ${XLNG} variant"
+					# Remove everything except subdirs defined in PIM_L10N
+					for SUBDIR in data docs messages scripts ; do
+						if [[ -d "${XSUBDIR}/${SUBDIR}" ]] ; then
+							einfo "      ${SUBDIR} subdirectory"
+							echo > "${XSUBDIR}/${SUBDIR}/CMakeLists.txt"
+							for pim in ${PIM_L10N}; do
+								[[ -d "${XSUBDIR}/${SUBDIR}/${pim}" ]] && \
+									( echo "add_subdirectory(${pim})" >> "${XSUBDIR}/${SUBDIR}/CMakeLists.txt" )
+							done
+						fi
+					done
+				fi
+			done
+		done
+	fi
+
+	# quick workaround for bug 493278
+	find "${S}" -name "akonadi_knut_resource*" -delete
+}
+
+src_configure() {
+	mycmakeargs=(
+		$(cmake-utils_use_build handbook docs)
+	)
+	[[ -n ${A} ]] && kde4-base_src_configure
+}
+
+src_compile() {
+	[[ -n ${A} ]] && kde4-base_src_compile
+}
+
+src_test() {
+	[[ -n ${A} ]] && kde4-base_src_test
+}
+
+src_install() {
+	[[ -n ${A} ]] && kde4-base_src_install
+}
diff --git a/kde-base/kdepim-l10n/kdepim-l10n-4.14.3.ebuild b/kde-base/kdepim-l10n/kdepim-l10n-4.14.3.ebuild
index 8d07afb64677..22b1570a840b 100644
--- a/kde-base/kdepim-l10n/kdepim-l10n-4.14.3.ebuild
+++ b/kde-base/kdepim-l10n/kdepim-l10n-4.14.3.ebuild
@@ -8,7 +8,7 @@ KDE_HANDBOOK=optional
 inherit kde4-base
 
 DESCRIPTION="KDE PIM internationalization package"
-HOMEPAGE="https://l10n.kde.org"
+HOMEPAGE="http://l10n.kde.org"
 
 DEPEND="
 	sys-devel/gettext
diff --git a/kde-base/kdepim-l10n/kdepim-l10n-4.4.11.1-r1.ebuild b/kde-base/kdepim-l10n/kdepim-l10n-4.4.11.1-r1.ebuild
index f7d4b8296d83..95bccc751006 100644
--- a/kde-base/kdepim-l10n/kdepim-l10n-4.4.11.1-r1.ebuild
+++ b/kde-base/kdepim-l10n/kdepim-l10n-4.4.11.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -8,7 +8,7 @@ KDE_MINIMAL="4.6"
 inherit kde4-base
 
 DESCRIPTION="KDE PIM internationalization package"
-HOMEPAGE="https://l10n.kde.org"
+HOMEPAGE="http://l10n.kde.org"
 
 DEPEND="
 	sys-devel/gettext
diff --git a/kde-base/kdepim-l10n/kdepim-l10n-4.4.11.1-r2.ebuild b/kde-base/kdepim-l10n/kdepim-l10n-4.4.11.1-r2.ebuild
new file mode 100644
index 000000000000..2cdcd78977ec
--- /dev/null
+++ b/kde-base/kdepim-l10n/kdepim-l10n-4.4.11.1-r2.ebuild
@@ -0,0 +1,123 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+KDE_MINIMAL="4.6"
+
+inherit kde4-base
+
+DESCRIPTION="KDE PIM internationalization package"
+HOMEPAGE="http://l10n.kde.org"
+
+DEPEND="
+	sys-devel/gettext
+"
+RDEPEND="
+	!<kde-apps/kde-l10n-15.08.0-r1
+	!<kde-apps/kde4-l10n-4.14.3-r1
+"
+
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+MY_LANGS="ar bg ca ca@valencia cs csb da de el en_GB eo es et eu
+		fi fr fy ga gl gu he hi hr hu id is it ja kk km kn ko lt lv
+		mai mk ml nb nds nl nn pa pl pt pt_BR ro ru si sk sl sr sv tg
+		tr uk wa zh_CN zh_TW"
+
+PIM_L10N="kdepim kdepimlibs"
+
+URI_BASE="${SRC_URI/-${PV}.tar.bz2/}"
+SRC_URI=""
+
+for MY_LANG in ${MY_LANGS} ; do
+	IUSE="${IUSE} linguas_${MY_LANG}"
+	SRC_URI="${SRC_URI} linguas_${MY_LANG}? ( ${URI_BASE}/kde-l10n-${MY_LANG}-4.4.5.tar.bz2 )"
+done
+
+S="${WORKDIR}"
+
+src_unpack() {
+	local LNG DIR
+	if [[ -z ${A} ]]; then
+		elog
+		elog "You either have the LINGUAS variable unset, or it only"
+		elog "contains languages not supported by ${P}."
+		elog "You won't have any additional language support."
+		elog
+		elog "${P} supports these language codes:"
+		elog "${MY_LANGS}"
+		elog
+	fi
+
+	# For EAPI >= 3, or if not using .tar.xz archives:
+	[[ -n ${A} ]] && unpack ${A}
+	cd "${S}"
+
+	# for all linguas do:
+	if [[ -n ${A} ]]; then
+		for LNG in ${LINGUAS}; do
+			einfo "Processing ${LNG} localization"
+			DIR="kde-l10n-${LNG}-4.4.5"
+
+			# add subdir to toplevel cmake file
+			if [[ -d "${DIR}" ]] ; then
+				echo "add_subdirectory( ${DIR} )" >> "${S}"/CMakeLists.txt
+			fi
+
+			# Remove everything except subdirs defined in PIM_L10N
+			for SUBDIR in data docs messages scripts ; do
+				if [[ -d "${S}/${DIR}/${SUBDIR}" ]] ; then
+					einfo "   ${SUBDIR} subdirectory"
+					echo > "${S}/${DIR}/${SUBDIR}/CMakeLists.txt"
+					for pim in ${PIM_L10N}; do
+						[[ -d "${S}/${DIR}/${SUBDIR}/${pim}" ]] && \
+							( echo "add_subdirectory(${pim})" >> "${S}/${DIR}/${SUBDIR}/CMakeLists.txt" )
+					done
+				fi
+			done
+
+			# In some cases we may have sub-lingua subdirs, e.g. sr :(
+			for XSUBDIR in "${S}/${DIR}/${LNG}"@* ; do
+				XLNG=$(echo ${XSUBDIR}|sed -e 's:^.*/::')
+				if [[ -d "${XSUBDIR}" ]] ; then
+					einfo "   ${XLNG} variant"
+					# Remove everything except subdirs defined in PIM_L10N
+					for SUBDIR in data docs messages scripts ; do
+						if [[ -d "${XSUBDIR}/${SUBDIR}" ]] ; then
+							einfo "      ${SUBDIR} subdirectory"
+							echo > "${XSUBDIR}/${SUBDIR}/CMakeLists.txt"
+							for pim in ${PIM_L10N}; do
+								[[ -d "${XSUBDIR}/${SUBDIR}/${pim}" ]] && \
+									( echo "add_subdirectory(${pim})" >> "${XSUBDIR}/${SUBDIR}/CMakeLists.txt" )
+							done
+						fi
+					done
+				fi
+			done
+		done
+	fi
+}
+
+src_prepare() {
+	[[ -n ${A} ]] && kde4-base_src_prepare
+}
+
+src_configure() {
+	mycmakeargs="${mycmakeargs}
+		-DBUILD_docs=OFF"
+	[[ -n ${A} ]] && kde4-base_src_configure
+}
+
+src_compile() {
+	[[ -n ${A} ]] && kde4-base_src_compile
+}
+
+src_test() {
+	[[ -n ${A} ]] && kde4-base_src_test
+}
+
+src_install() {
+	[[ -n ${A} ]] && kde4-base_src_install
+}
diff --git a/kde-base/kdepim-meta/kdepim-meta-4.14.10.ebuild b/kde-base/kdepim-meta/kdepim-meta-4.14.10.ebuild
index 8bfa769f1c60..afdb69dd2331 100644
--- a/kde-base/kdepim-meta/kdepim-meta-4.14.10.ebuild
+++ b/kde-base/kdepim-meta/kdepim-meta-4.14.10.ebuild
@@ -31,13 +31,8 @@ RDEPEND="
 	$(add_kdebase_dep korganizer)
 	$(add_kdebase_dep ktimetracker)
 	$(add_kdebase_dep ktnef)
-	nls? ( || (
-		(
-			$(add_kdeapps_dep kde4-l10n '' 15.04.0)
-		)
-		(
-			$(add_kdeapps_dep kde4-l10n '' 4.14.3)
-			$(add_kdebase_dep kdepim-l10n '' 4.14.3)
-		)
-	) )
+	nls? (
+		$(add_kdeapps_dep kde4-l10n '' 4.14.3)
+		$(add_kdebase_dep kdepim-l10n '' 4.14.3)
+	)
 "
diff --git a/kde-base/kdepim-meta/kdepim-meta-4.14.3.ebuild b/kde-base/kdepim-meta/kdepim-meta-4.14.3.ebuild
index 8fdf964bf43b..e2f4ca1a43d9 100644
--- a/kde-base/kdepim-meta/kdepim-meta-4.14.3.ebuild
+++ b/kde-base/kdepim-meta/kdepim-meta-4.14.3.ebuild
@@ -31,13 +31,8 @@ RDEPEND="
 	$(add_kdebase_dep korganizer)
 	$(add_kdebase_dep ktimetracker)
 	$(add_kdebase_dep ktnef)
-	nls? ( || (
-		(
-			$(add_kdeapps_dep kde4-l10n '' 15.04.0)
-		)
-		(
-			$(add_kdeapps_dep kde4-l10n '' 4.14.3)
-			$(add_kdebase_dep kdepim-l10n '' 4.14.3)
-		)
-	) )
+	nls? (
+		$(add_kdeapps_dep kde4-l10n '' 4.14.3)
+		$(add_kdebase_dep kdepim-l10n '' 4.14.3)
+	)
 "
diff --git a/kde-base/kdepim-meta/kdepim-meta-4.14.8.ebuild b/kde-base/kdepim-meta/kdepim-meta-4.14.8.ebuild
index f6135c7b4932..4943a96e8c84 100644
--- a/kde-base/kdepim-meta/kdepim-meta-4.14.8.ebuild
+++ b/kde-base/kdepim-meta/kdepim-meta-4.14.8.ebuild
@@ -31,13 +31,8 @@ RDEPEND="
 	$(add_kdebase_dep korganizer)
 	$(add_kdebase_dep ktimetracker)
 	$(add_kdebase_dep ktnef)
-	nls? ( || (
-		(
-			$(add_kdeapps_dep kde4-l10n '' 15.04.0)
-		)
-		(
-			$(add_kdeapps_dep kde4-l10n '' 4.14.3)
-			$(add_kdebase_dep kdepim-l10n '' 4.14.3)
-		)
-	) )
+	nls? (
+		$(add_kdeapps_dep kde4-l10n '' 4.14.3)
+		$(add_kdebase_dep kdepim-l10n '' 4.14.3)
+	)
 "
diff --git a/kde-base/kdepim-meta/kdepim-meta-4.4.2015.06.ebuild b/kde-base/kdepim-meta/kdepim-meta-4.4.2015.06.ebuild
index 2c31d240ee51..bf84ae4f27b8 100644
--- a/kde-base/kdepim-meta/kdepim-meta-4.4.2015.06.ebuild
+++ b/kde-base/kdepim-meta/kdepim-meta-4.4.2015.06.ebuild
@@ -30,14 +30,9 @@ RDEPEND="
 	$(add_kdebase_dep libkdepim)
 	$(add_kdebase_dep libkleo)
 	$(add_kdebase_dep libkpgp)
-	nls? ( || (
-		(
-			$(add_kdeapps_dep kde4-l10n '' 15.04.0)
-		)
-		(
-			$(add_kdeapps_dep kde4-l10n '' 4.14.3)
-			$(add_kdebase_dep kdepim-l10n '' 4.4.11.1-r1)
-		)
-	) )
+	nls? (
+		$(add_kdeapps_dep kde4-l10n '' 4.14.3)
+		$(add_kdebase_dep kdepim-l10n '' 4.4.11.1-r1)
+	)
 	!kde-base/kdepim-runtime
 "
diff --git a/kde-misc/kdeconnect/Manifest b/kde-misc/kdeconnect/Manifest
index 7a0e58038311..e6b042e24d60 100644
--- a/kde-misc/kdeconnect/Manifest
+++ b/kde-misc/kdeconnect/Manifest
@@ -1,2 +1 @@
-DIST kdeconnect-kde-0.7.3.tar.xz 133580 SHA256 e44d943b8d302dbfbe3c0164557f0100f696204beb96bde2ee5317bc0e0139ef SHA512 ea42d970afe6ee871560406f11375a2ee0b06c032a06fb3521eed30e4d6466f48f7c2ac8f5d35669f07f292b11f675537a1ae3054fa5031df8c57e51e2c78a88 WHIRLPOOL a75fd33e38c957bd1c1303292c2b2d1d7f850231aaad96c921ffd1054d6e9dee17345595263f7f4348abcee2a9bc43a60fc93c4f427a9491ab6d4009d9266c24
 DIST kdeconnect-kde-0.8.tar.xz 141916 SHA256 c33611c076a327a67f9974ffa5662f2c093dda6ad14024e434027f9f19d9a0ab SHA512 7c7c460648960dde501596c85282eddd4d9add3b1be291b6d22a75f316cce6cdee0015d81b275eaa7c66758dcf16fa21da1be9b79f12b68c76bad343eef7250e WHIRLPOOL 0d302b4c6005100db9bc44ca590ee330bc6f432af02bfd1d2f27b367f38b6d4993828a3726c2bf3acaafcaa00c1724a9592ee8a652152f6b811923c351d3f499
diff --git a/kde-misc/kdeconnect/files/kdeconnect-0.8-ninja.patch b/kde-misc/kdeconnect/files/kdeconnect-0.8-ninja.patch
new file mode 100644
index 000000000000..d482549dab52
--- /dev/null
+++ b/kde-misc/kdeconnect/files/kdeconnect-0.8-ninja.patch
@@ -0,0 +1,36 @@
+From d9e0c61185a5ecbd9b013740fe73d21ba5adaa44 Mon Sep 17 00:00:00 2001
+From: Michael Palimaka <kensington@gentoo.org>
+Date: Thu, 10 Sep 2015 21:56:39 +1000
+Subject: [PATCH] Fix make with ninja.
+
+The custom command name must differ from the name of the generated file.
+
+REVIEW: 125137
+---
+ cmake/DbusInterfaceMacros.cmake | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/cmake/DbusInterfaceMacros.cmake b/cmake/DbusInterfaceMacros.cmake
+index 9d4810d..801452a 100644
+--- a/cmake/DbusInterfaceMacros.cmake
++++ b/cmake/DbusInterfaceMacros.cmake
+@@ -12,7 +12,7 @@ macro (generate_and_install_dbus_interface main_project_target header_file outpu
+         OPTIONS ${qdbus_options}
+     )
+     add_custom_target(
+-        ${output_xml_file}
++        ${output_xml_file}_target
+         SOURCES ${CMAKE_CURRENT_BINARY_DIR}/${output_xml_file}
+     )
+     install(
+@@ -21,6 +21,6 @@ macro (generate_and_install_dbus_interface main_project_target header_file outpu
+     )
+     add_dependencies(
+         ${main_project_target}
+-        ${output_xml_file}
++        ${output_xml_file}_target
+     )
+ endmacro (generate_and_install_dbus_interface)
+-- 
+2.4.6
+
diff --git a/kde-misc/kdeconnect/kdeconnect-0.7.3.ebuild b/kde-misc/kdeconnect/kdeconnect-0.7.3.ebuild
deleted file mode 100644
index 763ee434eeb4..000000000000
--- a/kde-misc/kdeconnect/kdeconnect-0.7.3.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MY_PN=${PN}-kde
-DECLARATIVE_REQUIRED="always"
-KDE_LINGUAS="bg bs ca cs da de es fi fr gl hu it ja ko lt nl pl pt pt_BR ro ru sk sv tr uk"
-
-inherit kde4-base
-
-if [[ ${KDE_BUILD_TYPE} != live ]]; then
-	MY_P=${MY_PN}-${PV}
-	SRC_URI="mirror://kde/unstable/${PN}/${PV}/src/${MY_P}.tar.xz"
-	KEYWORDS="~amd64 ~x86"
-else
-	EGIT_REPO_URI="git://anongit.kde.org/${MY_PN}"
-	KEYWORDS=""
-fi
-
-DESCRIPTION="Adds communication between KDE and your smartphone"
-HOMEPAGE="https://www.kde.org/"
-
-LICENSE="GPL-2+"
-SLOT="4"
-IUSE="debug"
-
-DEPEND="
-	app-crypt/qca:2[qt4(+)]
-	dev-libs/qjson
-	x11-libs/libfakekey
-"
-RDEPEND="${DEPEND}
-	$(add_kdebase_dep plasma-workspace)
-	app-crypt/qca:2[openssl]
-"
-
-[[ ${KDE_BUILD_TYPE} != live ]] && S=${WORKDIR}/${MY_P}
-
-src_prepare(){
-	sed -i -e "s:QtCrypto/QtCrypto:QtCrypto:" core/networkpackage.cpp || die
-	kde4-base_src_prepare
-}
-
-pkg_postinst(){
-	elog
-	elog "Optional dependency:"
-	elog "sys-fs/sshfs-fuse (for 'remote filesystem browser' plugin)"
-	elog
-	elog "The Android .apk file is available via"
-	elog "https://play.google.com/store/apps/details?id=org.kde.kdeconnect_tp"
-	elog
-}
diff --git a/kde-misc/kdeconnect/kdeconnect-0.8.ebuild b/kde-misc/kdeconnect/kdeconnect-0.8.ebuild
index 07e7568b6a7f..e27ce0c50a16 100644
--- a/kde-misc/kdeconnect/kdeconnect-0.8.ebuild
+++ b/kde-misc/kdeconnect/kdeconnect-0.8.ebuild
@@ -42,6 +42,8 @@ DEPEND="${COMMON_DEPEND}
 
 [[ ${KDE_BUILD_TYPE} != live ]] && S=${WORKDIR}/${MY_P}
 
+PATCHES=( "${FILESDIR}/${P}-ninja.patch" )
+
 pkg_postinst(){
 	elog
 	elog "Optional dependency:"
diff --git a/kde-misc/plasma-nm/files/plasma-nm-0.9.3.6-networkmanager-1.0.6.patch b/kde-misc/plasma-nm/files/plasma-nm-0.9.3.6-networkmanager-1.0.6.patch
new file mode 100644
index 000000000000..1151763886c3
--- /dev/null
+++ b/kde-misc/plasma-nm/files/plasma-nm-0.9.3.6-networkmanager-1.0.6.patch
@@ -0,0 +1,14 @@
+Fixes build with networkmanager-1.0.6.
+
+Triggered by http://cgit.freedesktop.org/NetworkManager/NetworkManager/commit/?h=nm-1-0&id=6f616d4c4b04d5478f60d0311317bc84c5459ea4.
+
+--- CMakeLists.txt
++++ CMakeLists.txt
+@@ -49,6 +49,7 @@
+                     ${CMAKE_CURRENT_SOURCE_DIR}/libs
+                     ${CMAKE_CURRENT_SOURCE_DIR}/libs/editor/
+                     ${NETWORKMANAGER_INCLUDE_DIRS}
++                    ${NM-UTIL_INCLUDE_DIRS}
+                     ${NETWORKMANAGERQT_INCLUDE_DIRS}
+                     ${KDE4_INCLUDES})
+ 
diff --git a/kde-misc/plasma-nm/plasma-nm-0.9.3.6.ebuild b/kde-misc/plasma-nm/plasma-nm-0.9.3.6.ebuild
index e143557c7bc1..6bdcc223fa08 100644
--- a/kde-misc/plasma-nm/plasma-nm-0.9.3.6.ebuild
+++ b/kde-misc/plasma-nm/plasma-nm-0.9.3.6.ebuild
@@ -39,6 +39,8 @@ DEPEND="${RDEPEND}
 	sys-devel/gettext
 "
 
+PATCHES=( "${FILESDIR}/${P}-networkmanager-1.0.6.patch" )
+
 src_configure() {
 	local mycmakeargs=(
 		$(cmake-utils_use !modemmanager DISABLE_MODEMMANAGER_SUPPORT)
diff --git a/kde-misc/zanshin/Manifest b/kde-misc/zanshin/Manifest
index 9674a5e1329e..c1dd8cfb2917 100644
--- a/kde-misc/zanshin/Manifest
+++ b/kde-misc/zanshin/Manifest
@@ -1 +1,2 @@
 DIST zanshin-0.2.1.tar.bz2 142281 SHA256 dd9592750b793118dc6de46ebed8b76a9e00b0f193c2963ab880cf33b738b394 SHA512 109620a0c1ab27360c213a440b3a3a123b466d1be6c5b745ab9d076fc768dec5f1b7cbeecfd1190c287cd35d8cf96d3ff32b380d29ddf6255f1f3c4ce2fdd7ae WHIRLPOOL 440d6d84b1e3934a4861a07f965c95531590f96ee4d6603716906f908efdc6d4f0696bbc405fb228f79a1b73528cafa8be38b4dc4746c4c413d9225cac631cd2
+DIST zanshin-0.2.2.tar.bz2 142237 SHA256 5c0250c4614a82b4282c209818d11ba31c1326bb0ad434b452a22797f045370b SHA512 637b7e8a74a12700d35e678ac6e676070cc03e3576e6c82fb63b95f6cce3cd8b02639c3ef10a7738b47bbde62348f5cf8d7ba499fa281cd4ac22ef2951559be3 WHIRLPOOL 3f20f1a742a109f5c2e2955d4262802b36692d6430972ef995685d5ed59488ce301a565a451c33cf31ee529083301bd63f23efadc6790b01ffc256b1a4eec2bb
diff --git a/kde-misc/zanshin/zanshin-0.2.2.ebuild b/kde-misc/zanshin/zanshin-0.2.2.ebuild
new file mode 100644
index 000000000000..dde1c6e616b5
--- /dev/null
+++ b/kde-misc/zanshin/zanshin-0.2.2.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+VIRTUALX_REQUIRED="test"
+inherit kde4-base
+
+DESCRIPTION="Todo management application for KDE"
+HOMEPAGE="https://zanshin.kde.org/"
+SRC_URI="https://files.kde.org/${PN}/${P}.tar.bz2"
+
+LICENSE="|| ( GPL-2 GPL-3 )"
+SLOT="4"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug"
+
+RDEPEND="
+	$(add_kdebase_dep kdepim-runtime '' 4.6.0)
+	dev-libs/boost
+"
+DEPEND=${RDEPEND}
+
+RESTRICT="test"
diff --git a/licenses/WebStorm b/licenses/WebStorm
new file mode 100644
index 000000000000..ca2d39708c1b
--- /dev/null
+++ b/licenses/WebStorm
@@ -0,0 +1,110 @@
+License Agreement for WebStorm
+Commercial License
+
+
+IMPORTANT! READ CAREFULLY: THIS IS A LEGAL AGREEMENT. BY DOWNLOADING, INSTALLING, COPYING, SAVING ON YOUR COMPUTER, OR OTHERWISE USING THIS SOFTWARE, YOU (LICENSEE, AS DEFINED BELOW) ARE BECOMING A PARTY TO THIS AGREEMENT AND YOU ARE CONSENTING TO BE BOUND BY ALL THE TERMS AND CONDITIONS OF THIS AGREEMENT.
+IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT, YOU SHOULD NOT DOWNLOAD, INSTALL AND USE THE SOFTWARE.
+
+1. PARTIES
+
+(a) "Licensor" means JetBrains s.r.o., having its principal place of business at Na hrebenech II 1718/10, Prague, 14700, Czech Republic, registered with Commercial Register kept by the Municipal Court of Prague, Section C, file 86211, ID.Nr.: 265 02 275.
+
+(b) "Licensee" means the individual or legal entity specified in the License Certificate. For legal entities, "Licensee" includes any entity which controls, is controlled by, or is under common control with Licensee. For purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares or beneficial ownership of such entity.
+
+2. DEFINITIONS
+
+(a) "Authorized User" means (i) if Licensee is an individual, solely Licensee; (ii) if Licensee is a legal entity, any employee, independent contractor and other temporary worker authorized by Licensee to use Software while performing duties within the scope of their employment or assignment.
+
+(b) "Software" means software program known as WebStorm in binary form, including its documentation, upgrades provided pursuant to Section 8 of this Agreement, and any third party software programs that are owned and licensed pursuant to Section 5 of this Agreement by parties other than Licensor and that are either integrated with or made part of WebStorm (collectively, "Third Party Software").
+
+(c) "License Certificate" means evidence of a license provided by Licensor to Licensee in electronic or printed form.
+
+(d) "License Key" means a unique key-code that enables a single Authorized User to use Software at a time. Only Licensor and/or its representatives are permitted to produce License Keys for Software.
+
+3. OWNERSHIP
+
+(a) Software is the property of Licensor or its suppliers. Software is licensed, not sold. Title and copyrights to Software, in whole and in part and all copies thereof, and all modifications, enhancements, derivatives and other alterations of Software regardless of who made any modifications, if any, are, and will remain, the sole and exclusive property of Licensor and its suppliers.
+
+(b) Software is protected by United States Copyright Law and International Treaty provisions. Further, the structure, organization, and code embodied in Software are the valuable and confidential trade secrets of Licensor and its suppliers and are protected by intellectual property laws and treaties. Licensee agrees to abide by the copyright law and all other applicable laws of the United States including, but not limited to, export control laws.
+
+4. GRANT OF LICENSE
+
+Subject to the terms, conditions, and limitations set forth in this Agreement, including any amendments thereto, Licensor hereby grants to Licensee a limited, non-exclusive, non-transferable license to use Software as follows:
+
+(a) Licensee may:
+(i) install and use the version of Software specified in License Certificate(s) on multiple computers and operating systems, provided that a number of concurrent users never exceeds the number of Authorized Users specified in the appropriate License Certificate(s) and that the same License Key is not used by multiple Authorized Users, on multiple computers, or on different operating systems at a time, and
+(ii) make one back-up copy of Software solely for archival purposes.
+
+(b) Licensee may not:
+(i) sell, redistribute (except as set forth in Paragraph 5 herein), encumber, give, lend, rent, lease, sublicense, or otherwise transfer Software, or any portions of Software, to anyone without the prior written consent of Licensor;
+(ii) reverse engineer, decompile, disassemble, modify, translate, make any attempt to discover the source code of Software, or create derivative works from Software, or
+(iii) allow the use of the same License Key by multiple Authorized Users, on multiple computers, or on different operating systems at a time.
+
+5. THIRD PARTY SOFTWARE LICENSE
+
+(a) Licensee agrees to comply with the terms and conditions contained in Third-Party Software license agreements with respect to the applicable Third-Party Software.
+ 
+(b) Licensee agrees and acknowledges that Sections 9 and 10 of this Agreement shall also govern Licensee's use of the Third-Party Software. Licensor will have no responsibility with respect to any Third Party Software, and Licensee will look solely to the licensor(s) of the Third Party Software for any remedy. Licensor claims no right in the Third Party Software, and the same is owned exclusively by the licensor(s) of the Third Party Software.
+
+(c) LICENSOR PROVIDES NO WARRANTY, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, TITLE, AND NON-INFRINGEMENT, WITH RESPECT TO ANY THIRD PARTY SOFTWARE.
+
+6. RESTRICTED USE DURING EVALUATION PERIOD
+
+(a) Subject to the terms of this Agreement, Licensee is granted a right to use Software for evaluation purposes without charge for a period of thirty (30) days from the date of installation of Software unless otherwise specified (Evaluation Period).
+
+(b) Licensees use of Software during Evaluation Period shall be limited to the internal evaluation of Software for the sole purpose of determining whether Software meets Licensees requirements and whether Licensee desires to continue using Software.
+
+(c) Upon expiration of Evaluation Period, Licensee must obtain License Key for perpetual use of Software or cease using Software. Software contains a feature that will automatically disable Software upon expiration of Evaluation Period. Licensee may not disable, destroy, or remove this feature of Software, and any attempt to do so will be in violation of this Agreement and will terminate Licensee's rights to use Software.
+
+7. LICENSE FEES AND PAYMENTS
+
+Licensee will pay to Licensor the license fee and other charges and expenses as set forth in an appropriate invoice or other purchase documentation. Licensor may charge Licensee interest for any payment that is more than thirty (30) days past due at the rate of one and one-half percent (1.5%) per month or the highest amount allowed by law, whichever is lower.
+
+8. UPGRADES
+
+(a) All generally available Upgrades to Software will be free of charge to Licensee during the initial one (1) year period after purchase of Software. Upon installing any Upgrade, Licensee must cease using a previous version of Software and destroy License Key provided by Licensor for a previous version of Software.
+
+(b) If not agreed otherwise in writing between Licensor and Licensee, upon upgrading to new version of Software the relationship between parties shall be governed and amended (if applicable) by the terms and conditions of License agreement related to Software available at www.jetbrains.com on the day of upgrade download or purchase.
+
+9. LIMITED WARRANTY
+
+SOFTWARE IS PROVIDED TO LICENSEE "AS IS" AND WITHOUT WARRANTIES. LICENSOR MAKES NO WARRANTY AS TO ITS USE OR PERFORMANCE. TO THE MAXIMUM EXTENT PERMITTED BY APPLICABLE LAW, LICENSOR, AND ITS AFFILIATES, SUPPLIERS AND RESELLERS, DISCLAIM ALL OTHER WARRANTIES AND CONDITIONS, EITHER EXPRESS OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, TITLE, AND NON-INFRINGEMENT, WITH REGARD TO SOFTWARE, AND THE PROVISION OF OR FAILURE TO PROVIDE SUPPORT SERVICES. 
+
+10. DISCLAIMER OF DAMAGES
+
+(a)	TO THE MAXIMUM EXTENT PERMITTED BY APPLICABLE LAW, IN NO EVENT WILL LICENSOR OR ITS AFFILIATES, LICENSORS, SUPPLIERS OR RESELLERS BE LIABLE TO LICENSEE UNDER ANY THEORY FOR ANY DAMAGES SUFFERED BY LICENSEE OR ANY USER OF SOFTWARE, OR FOR ANY SPECIAL, INCIDENTAL, INDIRECT, CONSEQUENTIAL, OR SIMILAR DAMAGES (INCLUDING, BUT NOT LIMITED TO, DAMAGES FOR LOSS OF PROFITS OR CONFIDENTIAL OR OTHER INFORMATION, FOR BUSINESS INTERRUPTION, FOR PERSONAL INJURY, FOR LOSS OF PRIVACY, FOR FAILURE TO MEET ANY DUTY INCLUDING OF GOOD FAITH OR OF REASONABLE CARE, FOR NEGLIGENCE, AND FOR ANY OTHER PECUNIARY OR OTHER LOSS WHATSOEVER) ARISING OUT OF THE USE OR INABILITY TO USE SOFTWARE, OR THE PROVISION OF OR FAILURE TO PROVIDE SUPPORT SERVICES, EVEN IF LICENSOR HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES, AND REGARDLESS OF THE LEGAL OR EQUITABLE THEORY (CONTRACT, TORT OR OTHERWISE) UPON WHICH THE CLAIM IS BASED.
+
+(b)	IN ANY CASE, LICENSOR'S ENTIRE LIABILITY UNDER ANY PROVISION OF THIS AGREEMENT WILL BE LIMITED TO THE AMOUNT ACTUALLY PAID BY LICENSEE FOR SOFTWARE UNDER THIS AGREEMENT. 
+
+11. EXPORT REGULATIONS
+
+Licensee agrees and accepts that Software may be subject to import and export laws of any country, including those of the European Union and United States (specifically the Export Administration Regulations (EAR)). Licensee acknowledges that it is not a citizen, national, or resident of, and is not under control of the governments of Cuba, Iran, North Korea, Sudan or Syria and is not otherwise a restricted end-user as defined by applicable export control laws. Further, Licensee acknowledges that it will not download or otherwise export or re-export Software or any related technical data directly or indirectly to the above-mentioned countries or to citizens, nationals, or residents of those countries, or to any other restricted end user or for any restricted end-use.
+
+12. TERM AND TERMINATION
+
+(a) Except as otherwise provided in License Certificate, the license granted herein shall be perpetual.
+
+(b) If Licensee fails to comply with the terms and conditions of this Agreement, this Agreement and Licensee's right and license to use Software will terminate immediately. Licensee may terminate this Agreement at any time by notifying Licensor. Upon the termination of this Agreement, Licensee must cease using Software and delete Software from its computers and archives.
+
+(c) LICENSEE AGREES THAT UPON TERMINATION OF THIS AGREEMENT FOR ANY REASON, LICENSOR MAY TAKE ACTIONS SO THAT SOFTWARE NO LONGER OPERATES.
+
+13. MARKETING
+
+Licensee agree to be identified as a customer of Licensor and that Licensor may refer to Licensee by name, trade name and trademark, if applicable, and may briefly describe Licensee's business in Licensor's marketing materials, on Licensor's web site, in public or legal documents. Licensee hereby grants Licensor a license to use Licensee's name and any of Licensee's trade names and trademarks solely pursuant to this marketing section.
+
+14. GENERAL
+
+(a) Licensor reserves the right at any time to cease the support of Software and to alter prices, features, specifications, capabilities, functions, licensing terms, release dates, general availability or other characteristics of Software.
+
+(b) This Agreement, including the Third Party Software license agreements, constitutes the entire agreement between the parties concerning Licensee's use of Software, and supersedes any and all prior or contemporaneous oral or written representations, communications, or advertising with respect to Software. No purchase order, other ordering document or any hand written or typewritten text which purports to modify or supplement the printed text of this Agreement or any schedule will add to or vary the terms of this Agreement unless signed by both Licensee and Licensor.
+
+(c) A waiver by either party of any term or condition of this Agreement or any breach thereof, in any one instance, will not waive such term or condition or any subsequent breach. The provisions of this Agreement which require or contemplate performance after the expiration or termination of this Agreement will be enforceable notwithstanding said expiration or termination.
+
+(d) This Agreement will be governed by the laws of Czech Republic, without reference to conflict of laws principles. Licensee agrees that any litigation relating to this Agreement may only be brought in, and will be subject to the jurisdiction of, any Court of Czech Republic.
+
+(e) Titles are inserted for convenience only and will not affect in any way the meaning or interpretation of this Agreement. If any provision of this Agreement is held invalid, the remainder of this Agreement will continue in full force and effect. Either Licensor or Licensee may assign this Agreement in the case of a merger or sale of substantially all of its respective assets to another entity. This Agreement will be binding upon and will inure to the benefit of the parties, their successors and assigns.
+
+For exceptions or modifications to this Agreement, please contact Licensor at:
+Address: Na hrebenech II 1718/10, Prague, 14700, Czech Republic
+Fax: +420 241 722 540
+E-mail: sales@jetbrains.com
\ No newline at end of file
diff --git a/licenses/WebStorm_Academic b/licenses/WebStorm_Academic
new file mode 100644
index 000000000000..f2827d44a0e8
--- /dev/null
+++ b/licenses/WebStorm_Academic
@@ -0,0 +1,111 @@
+License Agreement for WebStorm
+Academic License
+
+IMPORTANT! READ CAREFULLY: THIS IS A LEGAL AGREEMENT. BY DOWNLOADING, INSTALLING, COPYING, SAVING ON YOUR COMPUTER, OR OTHERWISE USING THIS SOFTWARE, YOU (LICENSEE, AS DEFINED BELOW) ARE BECOMING A PARTY TO THIS AGREEMENT AND YOU ARE CONSENTING TO BE BOUND BY ALL THE TERMS AND CONDITIONS OF THIS AGREEMENT.
+IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT, YOU SHOULD NOT DOWNLOAD, INSTALL AND USE THE SOFTWARE.
+
+1. PARTIES
+
+(a) "Licensor" means JetBrains s.r.o., having its principal place of business at Na hrebenech II 1718/10, Prague, 14700, Czech Republic, registered with Commercial Register kept by the Municipal Court of Prague, Section C, file 86211, ID.Nr.: 265 02 275.
+
+(b) "Licensee" means the individual who is a student, faculty or staff member at an educational institution, or the educational institution specified in the License Certificate, exercising rights under, and complying with all of the terms of, this Agreement. For purposes of this definition, "educational institution" means a public or private school, college, university or other post secondary educational establishment.
+
+2. DEFINITIONS
+
+(a) "Authorized User" means (i) if Licensee is an individual, solely Licensee; (ii) if Licensee is an educational institution, any student, faculty or staff member authorized by Licensee to use the Software while performing duties within the scope of their employment or assignment.
+
+(b) "Client" means a computer device used by Authorized User for running the Software.
+
+(c) "License Certificate" means evidence of a license provided by Licensor to Licensee in electronic or printed form.
+
+(d) "License Key" means a unique key-code that enables a single Authorized User to use the Software at a time. Only Licensor and/or its representatives are permitted to produce License Keys for the Software.
+
+(e) "Software" means software program known as WebStorm in binary form, including its documentation, upgrades provided pursuant to Section 8 of this Agreement, and any third party software programs that are owned and licensed pursuant to Section 5 of this Agreement by parties other than Licensor and that either integrated with or made part of WebStorm (collectively, "Third Party Software").
+
+3. OWNERSHIP
+
+(a) The Software is the property of Licensor or its suppliers. The Software is licensed, not sold. Title and copyrights to the Software, in whole and in part and all copies thereof, and all modifications, enhancements, derivatives and other alterations of the Software regardless of who made any modifications, if any, are, and will remain, the sole and exclusive property of Licensor and its suppliers.
+
+(b) The Software is protected by United States Copyright Law and International Treaty provisions. Further, the structure, organization, and code embodied in the Software are the valuable and confidential trade secrets of Licensor and its suppliers and are protected by intellectual property laws and treaties. Licensee agrees to abide by the copyright law and all other applicable laws of the United States including, but not limited to, export control laws.
+
+4. GRANT OF LICENSE
+
+Subject to the terms, conditions, and limitations set forth in this Agreement, including any amendments thereto, Licensor hereby grants to Licensee a limited, non-exclusive, non-transferable license to use the Software as follows:
+
+(a) Licensee may:
+(i) install and use the licensed edition and version of the Software specified in License Certificate(s) on any number of Clients and on any operating system supported by the Software, provided that a number of concurrent users of the Software never exceeds the number of Authorized Users specified in the appropriate License Certificate(s) and that the same License Key is not used by multiple Authorized Users, on multiple Clients, or on different operating systems at a time;
+(ii) use the Software for non-commercial, educational purposes only, including conducting academic research or providing educational services; and
+(iii) make one back-up copy of the Software solely for archival purposes.
+
+(b) Licensee may not:
+(i) sell, redistribute, encumber, give, lend, rent, lease, sublicense, or otherwise transfer the Software, or any portions of the Software, to anyone without the prior written consent of Licensor;
+(ii) reverse engineer, decompile, disassemble, modify, translate, make any attempt to discover the source code of the Software, or create derivative works from the Software;
+(iii) allow the use of the same License Key by multiple Authorized Users, on multiple Clients or on different operating systems at a time. The Software may contain a feature preventing concurrent use of the same License Key by multiple Authorized Users, on multiple Clients or on different operating systems at a time; 
+(iv) use the Software for any commercial purpose.
+
+5. THIRD PARTY SOFTWARE LICENSE
+
+(a) Licensee agrees to comply with the terms and conditions contained in Third-Party Software license agreements with respect to the applicable Third-Party Software.
+ 
+(b) Licensee agrees and acknowledges that Sections 9 and 10 of this Agreement shall also govern Licensee's use of the Third-Party Software. Licensor will have no responsibility with respect to any Third Party Software, and Licensee will look solely to the licensor(s) of the Third Party Software for any remedy. Licensor claims no right in the Third Party Software, and the same is owned exclusively by the licensor(s) of the Third Party Software. 
+
+(c)	LICENSOR PROVIDES NO WARRANTY, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, TITLE, AND NON-INFRINGEMENT, WITH RESPECT TO ANY THIRD PARTY SOFTWARE.
+
+6. RESTRICTED USE DURING EVALUATION PERIOD
+
+(a) Subject to the terms of this Agreement, Licensee is granted a right to use the Software for evaluation purposes without charge for a period of thirty (30) days from the date of installation of the Software unless otherwise specified (Evaluation Period).
+
+(b) Licensees use of the Software during Evaluation Period shall be limited to the internal evaluation of the Software for the sole purpose of determining whether the Software meets Licensees requirements and whether Licensee desires to continue using the Software.
+
+(c) Upon expiration of Evaluation Period, Licensee must obtain License Key for perpetual use of the Software or cease using the Software. The Software contains a feature that will automatically disable the Software upon expiration of Evaluation Period. Licensee may not disable, destroy, or remove this feature of the Software, and any attempt to do so will be in violation of this Agreement and will terminate Licensee's rights to use the Software.
+
+7. LICENSE FEES AND PAYMENTS
+
+Licensee will pay to Licensor the license fee and other charges and expenses as set forth in an appropriate invoice or other purchase documentation. Licensor may charge Licensee interest for any payment that is more than thirty (30) days past due at the rate of one and one-half percent (1.5%) per month or the highest amount allowed by law, whichever is lower.
+
+8. UPGRADES
+
+(a) All generally available Upgrades to the Software will be free of charge to Licensee during the initial one (1) year period after purchase of the Software. If Licensee obtains a new License Key for upgrade, Licensee shall destroy a License Key obtained for the previous version of the Software.
+
+(b) If not agreed otherwise in writing between Licensor and Licensee, upon upgrading to new version of Software the relationship between parties shall be governed and amended (if applicable) by the terms and conditions of Licensee agreement related to Software available at www.jetbrains.com on the day of upgrade purchase.
+
+9. LIMITED WARRANTY
+
+SOFTWARE IS PROVIDED TO LICENSEE "AS IS" AND WITHOUT WARRANTIES. LICENSOR MAKES NO WARRANTY AS TO ITS USE OR PERFORMANCE. TO THE MAXIMUM EXTENT PERMITTED BY APPLICABLE LAW, LICENSOR, AND ITS AFFILIATES, SUPPLIERS AND RESELLERS, DISCLAIM ALL OTHER WARRANTIES AND CONDITIONS, EITHER EXPRESS OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, TITLE, AND NON-INFRINGEMENT, WITH REGARD TO SOFTWARE, AND THE PROVISION OF OR FAILURE TO PROVIDE SUPPORT SERVICES. 
+
+10. DISCLAIMER OF DAMAGES
+
+(a)	TO THE MAXIMUM EXTENT PERMITTED BY APPLICABLE LAW, IN NO EVENT WILL LICENSOR OR ITS AFFILIATES, LICENSORS, SUPPLIERS OR RESELLERS BE LIABLE TO LICENSEE UNDER ANY THEORY FOR ANY DAMAGES SUFFERED BY LICENSEE OR ANY USER OF SOFTWARE, OR FOR ANY SPECIAL, INCIDENTAL, INDIRECT, CONSEQUENTIAL, OR SIMILAR DAMAGES (INCLUDING, BUT NOT LIMITED TO, DAMAGES FOR LOSS OF PROFITS OR CONFIDENTIAL OR OTHER INFORMATION, FOR BUSINESS INTERRUPTION, FOR PERSONAL INJURY, FOR LOSS OF PRIVACY, FOR FAILURE TO MEET ANY DUTY INCLUDING OF GOOD FAITH OR OF REASONABLE CARE, FOR NEGLIGENCE, AND FOR ANY OTHER PECUNIARY OR OTHER LOSS WHATSOEVER ) ARISING OUT OF THE USE OR INABILITY TO USE SOFTWARE, OR THE PROVISION OF OR FAILURE TO PROVIDE SUPPORT SERVICES, EVEN IF LICENSOR HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES, AND REGARDLESS OF THE LEGAL OR EQUITABLE THEORY (CONTRACT, TORT OR OTHERWISE) UPON WHICH THE CLAIM IS BASED.
+
+(b)	IN ANY CASE, LICENSOR'S ENTIRE LIABILITY UNDER ANY PROVISION OF THIS AGREEMENT WILL BE LIMITED TO THE AMOUNT ACTUALLY PAID BY LICENSEE FOR SOFTWARE UNDER THIS AGREEMENT. 
+
+11. EXPORT REGULATIONS
+
+Licensee agrees and accepts that Software may be subject to import and export laws of any country, including those of the European Union and United States (specifically the Export Administration Regulations (EAR)). Licensee acknowledges that it is not a citizen, national, or resident of, and is not under control of the governments of Cuba, Iran, North Korea, Sudan or Syria and is not otherwise a restricted end-user as defined by applicable export control laws. Further, Licensee acknowledges that it will not download or otherwise export or re-export Software or any related technical data directly or indirectly to the above-mentioned countries or to citizens, nationals, or residents of those countries, or to any other restricted end user or for any restricted end-use.
+
+12. TERMINATION
+
+If Licensee fails to comply with the terms and conditions of this Agreement, this Agreement and Licensee's right and license to use the Software will terminate immediately. Licensee may terminate this Agreement at any time by notifying Licensor. Upon the termination of this Agreement, Licensee must cease using the Software and delete the Software from its Clients and archives.
+
+LICENSEE AGREES THAT UPON TERMINATION OF THIS AGREEMENT FOR ANY REASON, LICENSOR MAY TAKE ACTIONS SO THAT THE SOFTWARE NO LONGER OPERATES.
+
+13. MARKETING
+
+Licensee agree to be identified as a customer of Licensor and that Licensor may refer to Licensee by name, trade name and trademark, if applicable, and may briefly describe Licensee's business in Licensor's marketing materials, on Licensor's web site, in public or legal documents. Licensee hereby grants Licensor a license to use Licensee's name and any of Licensee's trade names and trademarks solely pursuant to this marketing section.
+
+14. GENERAL
+
+(a) Licensor reserves the right at any time to cease the support of the Software and to alter prices, features, specifications, capabilities, functions, licensing terms, release dates, general availability or other characteristics of the Software.
+
+(b) This Agreement, including the Third Party Software license agreements, constitutes the entire agreement between the parties concerning Licensee's use of the Software, and supersedes any and all prior or contemporaneous oral or written representations, communications, or advertising with respect to the Software. No purchase order, other ordering document or any hand written or typewritten text which purports to modify or supplement the printed text of this Agreement or any schedule will add to or vary the terms of this Agreement unless signed by both Licensee and Licensor.
+
+(c) A waiver by either party of any term or condition of this Agreement or any breach thereof, in any one instance, will not waive such term or condition or any subsequent breach. The provisions of this Agreement which require or contemplate performance after the expiration or termination of this Agreement will be enforceable notwithstanding said expiration or termination.
+
+(d) This Agreement will be governed by the laws of Czech Republic, without reference to conflict of laws principles. Licensee agrees that any litigation relating to this Agreement may only be brought in, and will be subject to the jurisdiction of, any Court of Czech Republic.
+
+(e) Titles are inserted for convenience only and will not affect in any way the meaning or interpretation of this Agreement. If any provision of this Agreement is held invalid, the remainder of this Agreement will continue in full force and effect. Either Licensor or Licensee may assign this Agreement in the case of a merger or sale of substantially all of its respective assets to another entity. This Agreement will be binding upon and will inure to the benefit of the parties, their successors and assigns.
+
+For exceptions or modifications to this Agreement, please contact Licensor at:
+Address: Na hrebenech II 1718/10, Prague, 14700, Czech Republic

+Fax: +420 241 722 540
+E-mail: sales@jetbrains.com
\ No newline at end of file
diff --git a/licenses/WebStorm_Classroom b/licenses/WebStorm_Classroom
new file mode 100644
index 000000000000..73db152706da
--- /dev/null
+++ b/licenses/WebStorm_Classroom
@@ -0,0 +1,119 @@
+LICENSE AGREEMENT FOR WEBSTORM
+     (Classroom License) 
+     
+       Version 11, Effective as of  16 May 2013
+
+IMPORTANT! READ CAREFULLY: THIS IS A LEGAL AGREEMENT. BY DOWNLOADING, INSTALLING, COPYING, SAVING ON YOUR COMPUTER, OR OTHERWISE USING THIS SOFTWARE, YOU (LICENSEE, AS DEFINED BELOW) ARE BECOMING A PARTY TO THIS AGREEMENT AND YOU ARE CONSENTING TO BE BOUND BY ALL THE TERMS AND CONDITIONS OF THIS AGREEMENT.
+IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT, YOU SHOULD NOT DOWNLOAD, INSTALL AND USE THE SOFTWARE.
+
+1. PARTIES
+ 
+(a) "Licensor" means JetBrains s.r.o., having its principal place of business at Na h?ebenech II 1718/10, Prague, 14700, Czech Republic, registered with Commercial Register kept by the Municipal Court of Prague, Section C, file 86211, ID.Nr.: 265 02 275.
+
+(b) "Licensee" means a public or private school, college, training courses, university and other post secondary educational establishment specified in the License Certificate, exercising rights under, and complying with the terms of this Agreement.
+
+2. DEFINITIONS
+
+(a) "Authorized User" means any student, faculty or staff member authorized by Licensee to use the Software while performing duties within the scope of their employment or assignment.
+
+(b) "Software" means software program known as IntelliJ IDEA in binary form, including its documentation, upgrades provided pursuant to Section 7 of this Agreement, and any third party software programs that are owned and licensed pursuant to Section 6 of this Agreement by parties other than Licensor and that either integrated with or made part of IntelliJ IDEA (collectively, "Third Party Software").
+
+(c) "License Certificate" means evidence of a license provided by Licensor to Licensee in electronic or printed form.
+
+(d) "License Key" means a unique key-code that enables Licensee to use the Software by multiple Authorized Users at a time. Only Licensor and/or its representatives are permitted to produce License Keys for the Software.
+
+(e) "Client" means a computer device owned, leased or otherwise directly controlled by Licensee; that is part of Licensee's internal network domain, located at Licensee's permanent facilities, and used by Authorized User for running the Software.
+
+(f) "License Server" means a software program that issues and revokes License Tickets to/from Clients based on installed License Key.
+
+(g) "License ticket" means a token granted to a Client by the License Server in order to activate the Software installed on the Client.
+
+3. OWNERSHIP
+
+(a) The Software is the property of Licensor or its suppliers. The Software is licensed, not sold. Title and copyrights to the Software, in whole and in part and all copies thereof, and all modifications, enhancements, derivatives and other alterations of the Software regardless of who made any modifications, if any, are, and will remain, the sole and exclusive property of Licensor and its suppliers.
+
+(b) The Software is protected by United States Copyright Law and International Treaty provisions. Further, the structure, organization, and code embodied in the Software are the valuable and confidential trade secrets of Licensor and its suppliers and are protected by intellectual property laws and treaties. Licensee agrees to abide by the copyright law and all other applicable laws of the United States including, but not limited to, export control laws.
+
+4. GRANT OF LICENSE
+
+Subject to the terms, conditions, and limitations set forth in this Agreement, including any amendments thereto, Licensor hereby grants to Licensee a limited, non-exclusive, non-transferable, royalty-free license to use the Software for a period of 1 (one) year as follows:
+
+(a) Licensee may:
+
+(i) install and use the version of the Software that has been specified in License Certificate on any number of Clients;
+
+(ii) use the Software by Authorized Users solely in support of classroom instruction of students. The right to use the Software for any other purposes is expressly prohibited;
+
+(iii) allow Authorized Users to install and use the Software for homework at their residencies on personally owned computers and process respective License Tickets, provided that they agree to all provisions of this Agreement;
+
+(iv) install License Server solely on its own Clients (in such a case the Section 4 letter a) iii) of this Agreement shall not apply);
+
+(v) process License Tickets to Clients;
+and
+
+(vi) make one back-up copy of the Software for archival purposes.
+(b) Licensee may not:
+
+(i) sell, redistribute (except as set forth in Paragraph 5 herein), encumber, give, lend, rent, lease, sublicense, or otherwise transfer the Software, or any portions of the Software, to anyone without the prior written consent of Licensor;
+
+(ii) reverse engineer, decompile, disassemble, modify, translate, make any attempt to discover the source code of the Software, or create derivative works from the Software; or
+
+(iii) use the Software for any commercial purposes.
+
+Licensee agrees to comply with the terms of this Agreement, and to take reasonable measures to prevent use of the Software by Authorized Users in an inappropriate manner or access to the Software by unauthorized users.
+
+5. THIRD PARTY SOFTWARE LICENSE
+
+(a) Licensee agrees to comply with the terms and conditions contained in Third-Party Software license agreements with respect to the applicable Third-Party Software.
+
+(b) Licensee agrees and acknowledges that Sections 7 and 8 of this Agreement shall also govern Licensee's use of the Third-Party Software. Licensor will have no responsibility with respect to any Third Party Software, and Licensee will look solely to the licensor(s) of the Third Party Software for any remedy. Licensor claims no right in the Third Party Software, and the same is owned exclusively by the licensor(s) of the Third Party Software.
+
+(c) LICENSOR PROVIDES NO WARRANTY, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, TITLE, AND NON-INFRINGEMENT, WITH RESPECT TO ANY THIRD PARTY SOFTWARE.
+
+6. UPGRADES AND LICENSE RENEWAL
+
+(a)Upgrades to new versions of Software are optional and free of charge during the 1-year license term. Licensee may obtain the generally available new versions of Software by downloading them from Licensor's web site atwww.jetbrains.com. Licensee may renew its license for another year by submitting a written request to Licensor 30 (thirty) days prior to the license expiration date.
+
+(b) If not agreed otherwise in writing between Licensor and Licensee, upon upgrading to new version of Software the relationship between parties shall be governed and amended (if applicable) by the terms and conditions of License agreement related to Software available at www.jetbrains.com on the day of upgrade download or license renewal.
+
+7. LIMITED WARRANTY
+
+SOFTWARE IS PROVIDED TO LICENSEE "AS IS" AND WITHOUT WARRANTIES. LICENSOR MAKES NO WARRANTY AS TO ITS USE OR PERFORMANCE. TO THE MAXIMUM EXTENT PERMITTED BY APPLICABLE LAW, LICENSOR, AND ITS AFFILIATES, SUPPLIERS AND RESELLERS, DISCLAIM ALL OTHER WARRANTIES AND CONDITIONS, EITHER EXPRESS OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, TITLE, AND NON-INFRINGEMENT, WITH REGARD TO SOFTWARE, AND THE PROVISION OF OR FAILURE TO PROVIDE SUPPORT SERVICES.
+
+8. DISCLAIMER OF DAMAGES
+
+(a) TO THE MAXIMUM EXTENT PERMITTED BY APPLICABLE LAW, IN NO EVENT WILL LICENSOR OR ITS AFFILIATES, LICENSORS, SUPPLIERS OR RESELLERS BE LIABLE TO LICENSEE UNDER ANY THEORY FOR ANY DAMAGES SUFFERED BY LICENSEE OR ANY USER OF SOFTWARE, OR FOR ANY SPECIAL, INCIDENTAL, INDIRECT, CONSEQUENTIAL, OR SIMILAR DAMAGES (INCLUDING, BUT NOT LIMITED TO, DAMAGES FOR LOSS OF PROFITS OR CONFIDENTIAL OR OTHER INFORMATION, FOR BUSINESS INTERRUPTION, FOR PERSONAL INJURY, FOR LOSS OF PRIVACY, FOR FAILURE TO MEET ANY DUTY INCLUDING OF GOOD FAITH OR OF REASONABLE CARE, FOR NEGLIGENCE, AND FOR ANY OTHER PECUNIARY OR OTHER LOSS WHATSOEVER ) ARISING OUT OF THE USE OR INABILITY TO USE SOFTWARE, OR THE PROVISION OF OR FAILURE TO PROVIDE SUPPORT SERVICES, EVEN IF LICENSOR HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES, AND REGARDLESS OF THE LEGAL OR EQUITABLE THEORY (CONTRACT, TORT OR OTHERWISE) UPON WHICH THE CLAIM IS BASED.
+
+(b) IN ANY CASE, LICENSOR'S ENTIRE LIABILITY UNDER ANY PROVISION OF THIS AGREEMENT WILL BE LIMITED TO THE AMOUNT ACTUALLY PAID BY LICENSEE FOR SOFTWARE UNDER THIS AGREEMENT.
+
+9. EXPORT REGULATIONS
+
+Licensee agrees and accepts that Software may be subject to import and export laws of any country, including those of the European Union and United States (specifically the Export Administration Regulations (EAR)). Licensee acknowledges that it is not a citizen, national, or resident of, and is not under control of the governments of Cuba, Iran, North Korea, Sudan or Syria and is not otherwise a restricted end-user as defined by applicable export control laws. Further, Licensee acknowledges that it will not download or otherwise export or re-export Software or any related technical data directly or indirectly to the above-mentioned countries or to citizens, nationals, or residents of those countries, or to any other restricted end user or for any restricted end-use.
+
+10. TERMINATION
+
+If Licensee fails to comply with the terms and conditions of this Agreement, this Agreement and Licensee's right and license to use Software will terminate immediately. Licensee may terminate this Agreement at any time by notifying Licensor. Upon the termination of this Agreement, Licensee must delete Software from its computers and archives, and also ensure that it is deleted by Authorized Users.
+LICENSEE AGREES THAT UPON TERMINATION OF THIS AGREEMENT FOR ANY REASON, LICENSOR MAY TAKE ACTIONS SO THAT SOFTWARE NO LONGER OPERATES.
+
+11. MARKETING
+
+Licensee agree to be identified as a customer of Licensor and that Licensor may refer to Licensee by name, trade name and trademark, if applicable, and may briefly describe Licensee's business in Licensor's marketing materials, on Licensor's web site, in public or legal documents. Licensee hereby grants Licensor a license to use Licensee's name and any of Licensee's trade names and trademarks solely pursuant to this marketing section.
+
+12. GENERAL
+
+(a) Licensor reserves the right at any time to cease the support of Software and to alter prices, features, specifications, capabilities, functions, licensing terms, release dates, general availability or other characteristics of Software.
+
+(b) This Agreement, including the Third Party Software license agreements, constitutes the entire agreement between the parties concerning Licensee's use of Software, and supersedes any and all prior or contemporaneous oral or written representations, communications, or advertising with respect to Software. No purchase order, other ordering document or any hand written or typewritten text which purports to modify or supplement the printed text of this Agreement or any schedule will add to or vary the terms of this Agreement unless signed by both Licensee and Licensor.
+
+(c) A waiver by either party of any term or condition of this Agreement or any breach thereof, in any one instance, will not waive such term or condition or any subsequent breach. The provisions of this Agreement which require or contemplate performance after the expiration or termination of this Agreement will be enforceable notwithstanding said expiration or termination.
+
+(d) This Agreement will be governed by the laws of Czech Republic, without reference to conflict of laws principles. Licensee agrees that any litigation relating to this Agreement may only be brought in, and will be subject to the jurisdiction of, any Court of Czech Republic.
+
+(e) Titles are inserted for convenience only and will not affect in any way the meaning or interpretation of this Agreement. If any provision of this Agreement is held invalid, the remainder of this Agreement will continue in full force and effect. Either Licensor or Licensee may assign this Agreement in the case of a merger or sale of substantially all of its respective assets to another entity. This Agreement will be binding upon and will inure to the benefit of the parties, their successors and assigns.
+
+
+For exceptions or modifications to this Agreement, please contact Licensor at:
+
+Address: Na hrebenech II 1718/10, Prague, 14700, Czech Republic
+Fax: +420 241 722 540
+E-mail: sales@jetbrains.com
\ No newline at end of file
diff --git a/licenses/WebStorm_OpenSource b/licenses/WebStorm_OpenSource
new file mode 100644
index 000000000000..1ebe1d72232f
--- /dev/null
+++ b/licenses/WebStorm_OpenSource
@@ -0,0 +1,110 @@
+License Agreement for WebStorm
+Open Source Development License
+
+
+IMPORTANT! READ CAREFULLY: THIS IS A LEGAL AGREEMENT. BY DOWNLOADING, INSTALLING, COPYING, SAVING ON YOUR COMPUTER, OR OTHERWISE USING THIS SOFTWARE, YOU (LICENSEE, AS DEFINED BELOW) ARE BECOMING A PARTY TO THIS AGREEMENT AND YOU ARE CONSENTING TO BE BOUND BY ALL THE TERMS AND CONDITIONS OF THIS AGREEMENT.
+IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT, YOU SHOULD NOT DOWNLOAD, INSTALL AND USE THE SOFTWARE.
+
+1. PARTIES
+
+(a) "Licensor" means JetBrains s.r.o., having its principal place of business at Na hrebenech II 1718/10, Prague, 14700, Czech Republic, registered with Commercial Register kept by the Municipal Court of Prague, Section C, file 86211, ID.Nr.: 265 02 275.
+
+(b) "Licensee" means the individual or legal entity specified in the License Certificate. For legal entities, "Licensee" includes any entity which controls, is controlled by, or is under common control with Licensee. For purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares or beneficial ownership of such entity.
+
+2. DEFINITIONS
+
+(a) "Authorized User" means (i) if Licensee is an individual, solely Licensee; (ii) if Licensee is a legal entity, any employee, independent contractor and other temporary worker authorized by Licensee to use Software while performing duties within the scope of their employment or assignment; (iii) if Licensee meets the "Open Source definition", an open source development group member who is authorized by Licensee to use Software for the purpose of open source development.
+
+(b) "Software" means software program known as WebStorm in binary form, including its documentation, upgrades provided pursuant to Section 8 of this Agreement, and any third party software programs that are owned and licensed pursuant to Section 5 of this Agreement by parties other than Licensor and that are either integrated with or made part of WebStorm (collectively, "Third Party Software").
+
+(c) "License Certificate" means evidence of a license provided by Licensor to Licensee in electronic or printed form.
+
+(d) "License Key" means a unique key-code that enables a single Authorized User to use Software at a time. Only Licensor and/or its representatives are permitted to produce License Keys for Software.
+
+3. OWNERSHIP
+
+(a) Software is the property of Licensor or its suppliers. Software is licensed, not sold. Title and copyrights to Software, in whole and in part and all copies thereof, and all modifications, enhancements, derivatives and other alterations of Software regardless of who made any modifications, if any, are, and will remain, the sole and exclusive property of Licensor and its suppliers.
+
+(b) Software is protected by United States Copyright Law and International Treaty provisions. Further, the structure, organization, and code embodied in Software are the valuable and confidential trade secrets of Licensor and its suppliers and are protected by intellectual property laws and treaties. Licensee agrees to abide by the copyright law and all other applicable laws of the United States including, but not limited to, export control laws.
+
+4. GRANT OF LICENSE
+
+Subject to the terms, conditions, and limitations set forth in this Agreement, including any amendments thereto, Licensor hereby grants to Licensee a limited, non-exclusive, non-transferable license to use Software as follows:
+
+(a) Licensee may:
+(i) install and use the version of Software specified in License Certificate(s) on multiple computers and operating systems, provided that a number of concurrent users never exceeds the number of Authorized Users specified in the appropriate License Certificate(s) and that the same License Key is not used by multiple Authorized Users, on multiple computers, or on different operating systems at a time, and
+(ii) make one back-up copy of Software solely for archival purposes.
+
+(b) Licensee may not:
+(i) sell, redistribute (except as set forth in Paragraph 5 herein), encumber, give, lend, rent, lease, sublicense, or otherwise transfer Software, or any portions of Software, to anyone without the prior written consent of Licensor;
+(ii) reverse engineer, decompile, disassemble, modify, translate, make any attempt to discover the source code of Software, or create derivative works from Software, or
+(iii) allow the use of the same License Key by multiple Authorized Users, on multiple computers, or on different operating systems at a time.
+(c) License Limitations for Open Source Development:
+(i) if Licensee has been granted a Software license for open source development, the purpose of use of Software shall be restricted solely to development of non-commercial open source projects that meet the Open Source Definition at http://www.opensource.org/docs/osd. Any commercial use of a Software license for open source development is expressly prohibited;
+(ii) Licensee's right to use a Software license for open source development shall be limited to one (1) year. Licensee may renew its Software license for open source development for another year by submitting a written request to Licensor thirty (30) days prior to a license expiration date.
+
+5. THIRD PARTY SOFTWARE LICENSE
+
+(a) Licensee agrees to comply with the terms and conditions contained in Third-Party Software license agreements with respect to the applicable Third-Party Software.
+ 
+(b) Licensee agrees and acknowledges that Sections 9 and 10 of this Agreement shall also govern Licensee's use of the Third-Party Software. Licensor will have no responsibility with respect to any Third Party Software, and Licensee will look solely to the licensor(s) of the Third Party Software for any remedy. Licensor claims no right in the Third Party Software, and the same is owned exclusively by the licensor(s) of the Third Party Software.
+
+(c) LICENSOR PROVIDES NO WARRANTY, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, TITLE, AND NON-INFRINGEMENT, WITH RESPECT TO ANY THIRD PARTY SOFTWARE.
+
+6. RESTRICTED USE DURING EVALUATION PERIOD
+
+(a) Subject to the terms of this Agreement, Licensee is granted a right to use Software for evaluation purposes without charge for a period of thirty (30) days from the date of installation of Software unless otherwise specified (Evaluation Period).
+
+(b) Licensees use of Software during Evaluation Period shall be limited to the internal evaluation of Software for the sole purpose of determining whether Software meets Licensees requirements and whether Licensee desires to continue using Software.
+
+(c) Upon expiration of Evaluation Period, Licensee must obtain License Key for perpetual use of Software or cease using Software. Software contains a feature that will automatically disable Software upon expiration of Evaluation Period. Licensee may not disable, destroy, or remove this feature of Software, and any attempt to do so will be in violation of this Agreement and will terminate Licensee's rights to use Software.
+
+7. LICENSE FEES AND PAYMENTS
+
+Licensee will pay to Licensor the license fee and other charges and expenses as set forth in an appropriate invoice or other purchase documentation. Licensor may charge Licensee interest for any payment that is more than thirty (30) days past due at the rate of one and one-half percent (1.5%) per month or the highest amount allowed by law, whichever is lower.
+
+8. UPGRADES
+
+(a) All generally available Upgrades to Software will be free of charge to Licensee during the initial one (1) year period after download of Software. Upon installing any Upgrade, Licensee must cease using a previous version of Software and destroy License Key provided by Licensor for a previous version of Software.
+
+(b) If not agreed otherwise in writing between Licensor and Licensee, upon upgrading to new version of Software the relationship between parties shall be governed and amended (if applicable) by the terms and conditions of License agreement related to Software available at www.jetbrains.com on the day of upgrade download or purchase.
+
+9. LIMITED WARRANTY
+
+SOFTWARE IS PROVIDED TO LICENSEE "AS IS" AND WITHOUT WARRANTIES. LICENSOR MAKES NO WARRANTY AS TO ITS USE OR PERFORMANCE. TO THE MAXIMUM EXTENT PERMITTED BY APPLICABLE LAW, LICENSOR, AND ITS AFFILIATES, SUPPLIERS AND RESELLERS, DISCLAIM ALL OTHER WARRANTIES AND CONDITIONS, EITHER EXPRESS OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, TITLE, AND NON-INFRINGEMENT, WITH REGARD TO SOFTWARE, AND THE PROVISION OF OR FAILURE TO PROVIDE SUPPORT SERVICES. 
+
+10. DISCLAIMER OF DAMAGES
+
+(a)	TO THE MAXIMUM EXTENT PERMITTED BY APPLICABLE LAW, IN NO EVENT WILL LICENSOR OR ITS AFFILIATES, LICENSORS, SUPPLIERS OR RESELLERS BE LIABLE TO LICENSEE UNDER ANY THEORY FOR ANY DAMAGES SUFFERED BY LICENSEE OR ANY USER OF SOFTWARE, OR FOR ANY SPECIAL, INCIDENTAL, INDIRECT, CONSEQUENTIAL, OR SIMILAR DAMAGES (INCLUDING, BUT NOT LIMITED TO, DAMAGES FOR LOSS OF PROFITS OR CONFIDENTIAL OR OTHER INFORMATION, FOR BUSINESS INTERRUPTION, FOR PERSONAL INJURY, FOR LOSS OF PRIVACY, FOR FAILURE TO MEET ANY DUTY INCLUDING OF GOOD FAITH OR OF REASONABLE CARE, FOR NEGLIGENCE, AND FOR ANY OTHER PECUNIARY OR OTHER LOSS WHATSOEVER ) ARISING OUT OF THE USE OR INABILITY TO USE SOFTWARE, OR THE PROVISION OF OR FAILURE TO PROVIDE SUPPORT SERVICES, EVEN IF LICENSOR HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES, AND REGARDLESS OF THE LEGAL OR EQUITABLE THEORY (CONTRACT, TORT OR OTHERWISE) UPON WHICH THE CLAIM IS BASED.
+
+(b)	IN ANY CASE, LICENSOR'S ENTIRE LIABILITY UNDER ANY PROVISION OF THIS AGREEMENT WILL BE LIMITED TO THE AMOUNT ACTUALLY PAID BY LICENSEE FOR SOFTWARE UNDER THIS AGREEMENT. 
+
+11. EXPORT REGULATIONS
+
+Licensee agrees and accepts that Software may be subject to import and export laws of any country, including those of the European Union and United States (specifically the Export Administration Regulations (EAR)). Licensee acknowledges that it is not a citizen, national, or resident of, and is not under control of the governments of Cuba, Iran, North Korea, Sudan or Syria and is not otherwise a restricted end-user as defined by applicable export control laws. Further, Licensee acknowledges that it will not download or otherwise export or re-export Software or any related technical data directly or indirectly to the above-mentioned countries or to citizens, nationals, or residents of those countries, or to any other restricted end user or for any restricted end-use.
+
+12. TERMINATION
+
+If Licensee fails to comply with the terms and conditions of this Agreement, this Agreement and Licensee's right and license to use Software will terminate immediately. Licensee may terminate this Agreement at any time by notifying Licensor. Upon the termination of this Agreement, Licensee must cease using Software and delete Software from its computers and archives.
+
+LICENSEE AGREES THAT UPON TERMINATION OF THIS AGREEMENT FOR ANY REASON, LICENSOR MAY TAKE ACTIONS SO THAT SOFTWARE NO LONGER OPERATES.
+
+13. MARKETING
+Licensee agree to be identified as a customer of Licensor and that Licensor may refer to Licensee by name, trade name and trademark, if applicable, and may briefly describe Licensee's business in Licensor's marketing materials, on Licensor's web site, in public or legal documents. Licensee hereby grants Licensor a license to use Licensee's name and any of Licensee's trade names and trademarks solely pursuant to this marketing section.
+
+14. GENERAL
+
+(a) Licensor reserves the right at any time to cease the support of Software and to alter prices, features, specifications, capabilities, functions, licensing terms, release dates, general availability or other characteristics of Software.
+
+(b) This Agreement, including the Third Party Software license agreements, constitutes the entire agreement between the parties concerning Licensee's use of Software, and supersedes any and all prior or contemporaneous oral or written representations, communications, or advertising with respect to Software. No purchase order, other ordering document or any hand written or typewritten text which purports to modify or supplement the printed text of this Agreement or any schedule will add to or vary the terms of this Agreement unless signed by both Licensee and Licensor.
+
+(c) A waiver by either party of any term or condition of this Agreement or any breach thereof, in any one instance, will not waive such term or condition or any subsequent breach. The provisions of this Agreement which require or contemplate performance after the expiration or termination of this Agreement will be enforceable notwithstanding said expiration or termination.
+
+(d) This Agreement will be governed by the laws of Czech Republic, without reference to conflict of laws principles. Licensee agrees that any litigation relating to this Agreement may only be brought in, and will be subject to the jurisdiction of, any Court of Czech Republic.
+
+(e) Titles are inserted for convenience only and will not affect in any way the meaning or interpretation of this Agreement. If any provision of this Agreement is held invalid, the remainder of this Agreement will continue in full force and effect. Either Licensor or Licensee may assign this Agreement in the case of a merger or sale of substantially all of its respective assets to another entity. This Agreement will be binding upon and will inure to the benefit of the parties, their successors and assigns.
+
+For exceptions or modifications to this Agreement, please contact Licensor at:
+Address: Na hrebenech II 1718/10, Prague, 14700, Czech Republic
+Fax: +420 241 722 540
+E-mail: sales@jetbrains.com
\ No newline at end of file
diff --git a/licenses/WebStorm_personal b/licenses/WebStorm_personal
new file mode 100644
index 000000000000..dec6d70d98e0
--- /dev/null
+++ b/licenses/WebStorm_personal
@@ -0,0 +1,110 @@
+License Agreement for WebStorm
+Personal License
+
+
+IMPORTANT! READ CAREFULLY: THIS IS A LEGAL AGREEMENT. BY DOWNLOADING, INSTALLING, COPYING, SAVING ON YOUR COMPUTER, OR OTHERWISE USING THIS SOFTWARE, YOU (LICENSEE, AS DEFINED BELOW) ARE BECOMING A PARTY TO THIS AGREEMENT AND YOU ARE CONSENTING TO BE BOUND BY ALL THE TERMS AND CONDITIONS OF THIS AGREEMENT.
+IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT, YOU SHOULD NOT DOWNLOAD, INSTALL AND USE THE SOFTWARE.
+
+1. PARTIES
+
+(a) "Licensor" means JetBrains s.r.o., having its principal place of business at Na hrebenech II 1718/10, Prague, 14700, Czech Republic, registered with Commercial Register kept by the Municipal Court of Prague, Section C, file 86211, ID.Nr.: 265 02 275.
+
+(b) "Licensee" means the individual or legal entity specified in the License Certificate. For legal entities, "Licensee" includes any entity which controls, is controlled by, or is under common control with Licensee. For purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares or beneficial ownership of such entity.
+
+2. DEFINITIONS
+
+(a) "Software" means software program known as WebStorm in binary form, including its documentation, upgrades provided pursuant to Section 8 of this Agreement, and any third party software programs that are owned and licensed pursuant to Section 5 of this Agreement by parties other than Licensor and that are either integrated with or made part of WebStorm (collectively, "Third Party Software").
+
+(b) "License Certificate" means evidence of a license provided by Licensor to Licensee in electronic or printed form.
+
+(c) "License Key" means a unique key-code that enables a single Authorized User to use Software at a time. Only Licensor and/or its representatives are permitted to produce License Keys for Software.
+
+3. OWNERSHIP
+
+(a) Software is the property of Licensor or its suppliers. Software is licensed, not sold. Title and copyrights to Software, in whole and in part and all copies thereof, and all modifications, enhancements, derivatives and other alterations of Software regardless of who made any modifications, if any, are, and will remain, the sole and exclusive property of Licensor and its suppliers.
+
+(b) Software is protected by United States Copyright Law and International Treaty provisions. Further, the structure, organization, and code embodied in Software are the valuable and confidential trade secrets of Licensor and its suppliers and are protected by intellectual property laws and treaties. Licensee agrees to abide by the copyright law and all other applicable laws of the United States including, but not limited to, export control laws.
+
+4. GRANT OF LICENSE
+
+Subject to the terms, conditions, and limitations set forth in this Agreement, including any amendments thereto, Licensor hereby grants to Licensee a limited, non-exclusive, non-transferable license to use Software as follows:
+
+(a) Licensee may:
+(i) install and use the version of Software specified in License Certificate on multiple computers and operating systems, provided that Licensee is the only user of Software and that Software is not used on more than one machine and (or) operating system at a time, and
+(ii) make one back-up copy of Software solely for archival purposes.
+
+(b) Licensee may not:
+(i) sell, redistribute (except as set forth in Paragraph 5 herein), encumber, give, lend, rent, lease, sublicense, or otherwise transfer Software, or any portions of Software, to anyone without the prior written consent of Licensor;
+(ii) reverse engineer, decompile, disassemble, modify, translate, make any attempt to discover the source code of Software, or create derivative works from Software, or
+(iii) use the License Key on different computers or operating systems at a time.
+(c) Additional Limitations
+This License is only for natural persons who are purchasing the license using their own funds only. Notwithstanding anything to the contrary set forth above, Licensee may not use Software, and this license shall not be in effect, in the event that Licensee does not pay Software license fee using Licensee's own funds. If any third party pays Software license fee or if Licensee expects or receives reimbursement for Software license fee from any third party, this License shall be invalid and not in effect.
+
+5. THIRD PARTY SOFTWARE LICENSE
+
+(a) Licensee agrees to comply with the terms and conditions contained in Third-Party Software license agreements with respect to the applicable Third-Party Software.
+ 
+(b) Licensee agrees and acknowledges that Sections 9 and 10 of this Agreement shall also govern Licensee's use of the Third-Party Software. Licensor will have no responsibility with respect to any Third Party Software, and Licensee will look solely to the licensor(s) of the Third Party Software for any remedy. Licensor claims no right in the Third Party Software, and the same is owned exclusively by the licensor(s) of the Third Party Software.
+
+(c) LICENSOR PROVIDES NO WARRANTY, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, TITLE, AND NON-INFRINGEMENT, WITH RESPECT TO ANY THIRD PARTY SOFTWARE.
+
+6. RESTRICTED USE DURING EVALUATION PERIOD
+
+(a) Subject to the terms of this Agreement, Licensee is granted a right to use Software for evaluation purposes without charge for a period of thirty (30) days from the date of installation of Software unless otherwise specified (Evaluation Period).
+
+(b) Licensees use of Software during Evaluation Period shall be limited to the internal evaluation of Software for the sole purpose of determining whether Software meets Licensees requirements and whether Licensee desires to continue using Software.
+
+(c) Upon expiration of Evaluation Period, Licensee must obtain License Key for perpetual use of Software or cease using Software. Software contains a feature that will automatically disable Software upon expiration of Evaluation Period. Licensee may not disable, destroy, or remove this feature of Software, and any attempt to do so will be in violation of this Agreement and will terminate Licensee's rights to use Software.
+
+7. LICENSE FEES AND PAYMENTS
+
+Licensee will pay to Licensor the license fee and other charges and expenses as set forth in an appropriate invoice or other purchase documentation. Licensor may charge Licensee interest for any payment that is more than thirty (30) days past due at the rate of one and one-half percent (1.5%) per month or the highest amount allowed by law, whichever is lower.
+
+8. UPGRADES
+
+(a) All generally available Upgrades to Software will be free of charge to Licensee during the initial one (1) year period after purchase of Software. Upon installing any Upgrade, Licensee must cease using a previous version of Software and destroy License Key provided by Licensor for a previous version of Software.
+
+(b) If not agreed otherwise in writing between Licensor and Licensee, upon upgrading to new version of Software the relationship between parties shall be governed and amended (if applicable) by the terms and conditions of License agreement related to Software available at www.jetbrains.com on the day of upgrade download or purchase.
+
+9. LIMITED WARRANTY
+
+SOFTWARE IS PROVIDED TO LICENSEE "AS IS" AND WITHOUT WARRANTIES. LICENSOR MAKES NO WARRANTY AS TO ITS USE OR PERFORMANCE. TO THE MAXIMUM EXTENT PERMITTED BY APPLICABLE LAW, LICENSOR, AND ITS AFFILIATES, SUPPLIERS AND RESELLERS, DISCLAIM ALL OTHER WARRANTIES AND CONDITIONS, EITHER EXPRESS OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, TITLE, AND NON-INFRINGEMENT, WITH REGARD TO SOFTWARE, AND THE PROVISION OF OR FAILURE TO PROVIDE SUPPORT SERVICES. 
+
+10. DISCLAIMER OF DAMAGES
+
+(a)	TO THE MAXIMUM EXTENT PERMITTED BY APPLICABLE LAW, IN NO EVENT WILL LICENSOR OR ITS AFFILIATES, LICENSORS, SUPPLIERS OR RESELLERS BE LIABLE TO LICENSEE UNDER ANY THEORY FOR ANY DAMAGES SUFFERED BY LICENSEE OR ANY USER OF SOFTWARE, OR FOR ANY SPECIAL, INCIDENTAL, INDIRECT, CONSEQUENTIAL, OR SIMILAR DAMAGES (INCLUDING, BUT NOT LIMITED TO, DAMAGES FOR LOSS OF PROFITS OR CONFIDENTIAL OR OTHER INFORMATION, FOR BUSINESS INTERRUPTION, FOR PERSONAL INJURY, FOR LOSS OF PRIVACY, FOR FAILURE TO MEET ANY DUTY INCLUDING OF GOOD FAITH OR OF REASONABLE CARE, FOR NEGLIGENCE, AND FOR ANY OTHER PECUNIARY OR OTHER LOSS WHATSOEVER ) ARISING OUT OF THE USE OR INABILITY TO USE SOFTWARE, OR THE PROVISION OF OR FAILURE TO PROVIDE SUPPORT SERVICES, EVEN IF LICENSOR HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES, AND REGARDLESS OF THE LEGAL OR EQUITABLE THEORY (CONTRACT, TORT OR OTHERWISE) UPON WHICH THE CLAIM IS BASED.
+
+(b)	IN ANY CASE, LICENSOR'S ENTIRE LIABILITY UNDER ANY PROVISION OF THIS AGREEMENT WILL BE LIMITED TO THE AMOUNT ACTUALLY PAID BY LICENSEE FOR SOFTWARE UNDER THIS AGREEMENT. 
+
+11. EXPORT REGULATIONS
+
+Licensee agrees and accepts that Software may be subject to import and export laws of any country, including those of the European Union and United States (specifically the Export Administration Regulations (EAR)). Licensee acknowledges that it is not a citizen, national, or resident of, and is not under control of the governments of Cuba, Iran, North Korea, Sudan or Syria and is not otherwise a restricted end-user as defined by applicable export control laws. Further, Licensee acknowledges that it will not download or otherwise export or re-export Software or any related technical data directly or indirectly to the above-mentioned countries or to citizens, nationals, or residents of those countries, or to any other restricted end user or for any restricted end-use.
+
+12. TERM AND TERMINATION
+
+(a) Except as otherwise provided in License Certificate, the license granted herein shall be perpetual.
+
+(b) If Licensee fails to comply with the terms and conditions of this Agreement, this Agreement and Licensee's right and license to use Software will terminate immediately. Licensee may terminate this Agreement at any time by notifying Licensor. Upon the termination of this Agreement, Licensee must cease using Software and delete Software from its computers and archives.
+
+(c) LICENSEE AGREES THAT UPON TERMINATION OF THIS AGREEMENT FOR ANY REASON, LICENSOR MAY TAKE ACTIONS SO THAT SOFTWARE NO LONGER OPERATES.
+
+13. MARKETING
+
+Licensee agrees to be identified as a customer of Licensor and that Licensor may refer to Licensee by name, trade name and trademark, if applicable, and may briefly describe Licensee's business in Licensor's marketing materials, on Licensor's web site, in public or legal documents. Licensee hereby grants Licensor a license to use Licensee's name and any of Licensee's trade names and trademarks solely pursuant to this marketing section.
+
+14. GENERAL
+
+(a) Licensor reserves the right at any time to cease the support of Software and to alter prices, features, specifications, capabilities, functions, licensing terms, release dates, general availability or other characteristics of Software.
+
+(b) This Agreement, including the Third Party Software license agreements, constitutes the entire agreement between the parties concerning Licensee's use of Software, and supersedes any and all prior or contemporaneous oral or written representations, communications, or advertising with respect to Software. No purchase order, other ordering document or any hand written or typewritten text which purports to modify or supplement the printed text of this Agreement or any schedule will add to or vary the terms of this Agreement unless signed by both Licensee and Licensor.
+
+(c) A waiver by either party of any term or condition of this Agreement or any breach thereof, in any one instance, will not waive such term or condition or any subsequent breach. The provisions of this Agreement which require or contemplate performance after the expiration or termination of this Agreement will be enforceable notwithstanding said expiration or termination.
+
+(d) This Agreement will be governed by the laws of Czech Republic, without reference to conflict of laws principles. Licensee agrees that any litigation relating to this Agreement may only be brought in, and will be subject to the jurisdiction of, any Court of Czech Republic.
+
+(e) Titles are inserted for convenience only and will not affect in any way the meaning or interpretation of this Agreement. If any provision of this Agreement is held invalid, the remainder of this Agreement will continue in full force and effect. Either Licensor or Licensee may assign this Agreement in the case of a merger or sale of substantially all of its respective assets to another entity. This Agreement will be binding upon and will inure to the benefit of the parties, their successors and assigns.
+
+For exceptions or modifications to this Agreement, please contact Licensor at:
+Address: Na hrebenech II 1718/10, Prague, 14700, Czech Republic
+Fax: +420 241 722 540
+E-mail: sales@jetbrains.com
\ No newline at end of file
diff --git a/mail-client/balsa/balsa-2.5.2.ebuild b/mail-client/balsa/balsa-2.5.2.ebuild
index 63fb575a0165..41f83684c9ff 100644
--- a/mail-client/balsa/balsa-2.5.2.ebuild
+++ b/mail-client/balsa/balsa-2.5.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://pawsa.fedorapeople.org/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~sparc ~x86"
 
 IUSE="crypt gnome gtkhtml gnome-keyring +gtkspell kerberos ldap libnotify rubrica sqlite ssl webkit xface"
 REQUIRED_USE="gtkhtml? ( !webkit )"
diff --git a/mail-client/evolution/Manifest b/mail-client/evolution/Manifest
index e044e5a1e718..70697aba9d5f 100644
--- a/mail-client/evolution/Manifest
+++ b/mail-client/evolution/Manifest
@@ -1,3 +1,3 @@
 DIST evolution-3.12.11.tar.xz 11360812 SHA256 f9ec78ae7b9aadb7efc76777c4c93a98f7c61be2a4cfaaf351dd051604e981f5 SHA512 aef832fbfd6d7449f234e9cb0fdfabc2b75373220e37f5bc58379a2e91a3eacc39e6f8f37078c46adc11d5aa8f2d466974b8dcdcf88a68e68e7ad4a5f659a49c WHIRLPOOL 34a83a6a9be6c2e65fad3732fd86a523282fb8a1cb876da33595cec92c6c16fb8144ad6188381be9c58a301cc4e52fce04e577fd663ebfe31b0f96678126edbc
-DIST evolution-3.16.3.tar.xz 11877676 SHA256 cdc25d9c0c7749d9049d480a8fcde870b1991523bf7009ba101990df543207d6 SHA512 fd81e351ae9a482b48429b04ab41d53f25ad36823765dcd4c5810d8134788d7bdda35e78fdb453686ea7b6eca999f70cd4352486ef38da96a3a927fff3b2b98e WHIRLPOOL 96ea257e30b763db4fdf0ae39e3dc60e8845b3ad021538d2ab62dd1c0bf448f009bf39a89e695cbd1f6af08e18486d9968c6a7bac2772c6cd9ca4e38d356aee8
 DIST evolution-3.16.4.tar.xz 11946404 SHA256 60d90c4f36cc05f925f50dc7e8dcc4f83edd6d9b5476f14e75c1d10ce7fbd67f SHA512 d985cfdf5729e7442a9df4f69f486e617e98f59b7781ffb18dbf0424d5843e3046508b0bde0fbc083648b0b995cd0e534e68b9cc1e11cf21bca58791665480da WHIRLPOOL bce88813f90bbb1aec904ed6ee9163881a5a643b8bb2838f9dce47ac18ee457d9c930966bb12f0642d02177cbff1b98ef1a352297e3b5be0d633a7fadf89ce6b
+DIST evolution-3.16.5.tar.xz 11962476 SHA256 fef4e8d0a81dc4562f984dddc5ccfee885506a2e030692b5ac6cd50e32efce37 SHA512 6f99982c42d462cc449eb8c56e22cde1ff628111b52e12fd6c8cbcbf86dbc047431aea2507c7026589bfe54b020443f3a647190de72cc235ce45f72f8d55b222 WHIRLPOOL 462e71bd51a0d5be9d5f6d9f965ae3121612ebd56066de43d328dd003cd61ab155af0c48b58868bf220e6956eee01844cbe923ea64fb30a9b88ba10d1e4c74e3
diff --git a/mail-client/evolution/evolution-3.16.3.ebuild b/mail-client/evolution/evolution-3.16.3.ebuild
deleted file mode 100644
index f454653a52f4..000000000000
--- a/mail-client/evolution/evolution-3.16.3.ebuild
+++ /dev/null
@@ -1,161 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-
-inherit eutils flag-o-matic readme.gentoo gnome2
-
-DESCRIPTION="Integrated mail, addressbook and calendaring functionality"
-HOMEPAGE="https://wiki.gnome.org/Apps/Evolution"
-
-# Note: explicitly "|| ( LGPL-2 LGPL-3 )", not "LGPL-2+".
-LICENSE="|| ( LGPL-2 LGPL-3 ) CC-BY-SA-3.0 FDL-1.3+ OPENLDAP"
-SLOT="2.0"
-IUSE="+bogofilter crypt highlight ldap map spamassassin spell ssl +weather"
-# Needs x11-libs/libcryptui keyworded
-#KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd"
-
-# We need a graphical pinentry frontend to be able to ask for the GPG
-# password from inside evolution, bug 160302
-PINENTRY_DEPEND="|| ( app-crypt/pinentry[gtk] app-crypt/pinentry[qt4] )"
-
-# gtk+-3.16 needed for gtk_drag_cancel
-# glade-3 support is for maintainers only per configure.ac
-# pst is not mature enough and changes API/ABI frequently
-# dconf explicitely needed for backup plugin
-# google tasks requires >=libgdata-0.15.1
-# gnome-desktop support is optional with --enable-gnome-desktop
-# gnome-autoar (currently disabled because no release has been made)
-COMMON_DEPEND="
-	>=app-crypt/gcr-3.4
-	>=app-text/enchant-1.1.7
-	>=dev-libs/glib-2.40:2
-	>=dev-libs/libgdata-0.10:=
-	>=dev-libs/libxml2-2.7.3:2
-	>=gnome-base/gnome-desktop-2.91.3:3=
-	>=gnome-base/gsettings-desktop-schemas-2.91.92
-	>=gnome-extra/evolution-data-server-3.16:=[gtk,weather?]
-	>=media-libs/libcanberra-0.25[gtk3]
-	>=net-libs/libsoup-2.42:2.4
-	>=net-libs/webkit-gtk-2.2:3
-	>=x11-libs/cairo-1.9.15:=[glib]
-	>=x11-libs/gdk-pixbuf-2.24:2
-	>=x11-libs/gtk+-3.16:3
-	>=x11-libs/libnotify-0.7:=
-	>=x11-misc/shared-mime-info-0.22
-
-	>=app-text/iso-codes-0.49
-	dev-libs/atk
-	gnome-base/dconf
-	dev-libs/libical:=
-	x11-libs/libSM
-	x11-libs/libICE
-
-	crypt? (
-		>=app-crypt/gnupg-1.4
-		${PINENTRY_DEPEND}
-		x11-libs/libcryptui )
-	map? (
-		>=media-libs/libchamplain-0.12:0.12[gtk]
-		>=media-libs/clutter-1.0.0:1.0
-		>=media-libs/clutter-gtk-0.90:1.0
-		>=sci-geosciences/geocode-glib-3.10.0
-		x11-libs/mx:1.0 )
-	spell? ( app-text/gtkspell:3 )
-	ldap? ( >=net-nds/openldap-2:= )
-	ssl? (
-		>=dev-libs/nspr-4.6.1:=
-		>=dev-libs/nss-3.11:= )
-	weather? ( >=dev-libs/libgweather-3.8:2= )
-"
-DEPEND="${COMMON_DEPEND}
-	app-text/docbook-xml-dtd:4.1.2
-	dev-util/gtk-doc-am
-	>=dev-util/intltool-0.40.0
-	virtual/pkgconfig
-"
-# eautoreconf needs:
-#	app-text/yelp-tools
-#	>=gnome-base/gnome-common-2.12
-RDEPEND="${COMMON_DEPEND}
-	bogofilter? ( mail-filter/bogofilter )
-	highlight? ( app-text/highlight )
-	spamassassin? ( mail-filter/spamassassin )
-	!gnome-extra/evolution-exchange
-"
-
-if [[ ${PV} = 9999 ]]; then
-	DEPEND="${DEPEND}
-		app-text/yelp-tools
-		doc? ( >=dev-util/gtk-doc-1.14 )"
-fi
-
-DISABLE_AUTOFORMATTING="yes"
-DOC_CONTENTS="To change the default browser if you are not using GNOME, edit
-~/.local/share/applications/mimeapps.list so it includes the
-following content:
-
-[Default Applications]
-x-scheme-handler/http=firefox.desktop
-x-scheme-handler/https=firefox.desktop
-
-(replace firefox.desktop with the name of the appropriate .desktop
-file from /usr/share/applications if you use a different browser)."
-
-src_prepare() {
-	# Fix relink issues in src_install
-	ELTCONF="--reverse-deps"
-
-	gnome2_src_prepare
-
-}
-
-src_configure() {
-	# Use NSS/NSPR only if 'ssl' is enabled.
-	gnome2_src_configure \
-		--without-glade-catalog \
-		--disable-autoar \
-		--disable-code-coverage \
-		--disable-installed-tests \
-		--disable-pst-import \
-		--enable-canberra \
-		$(use_enable crypt libcryptui) \
-		$(use_enable highlight text-highlight) \
-		$(use_enable map contact-maps) \
-		$(use_enable spell gtkspell) \
-		$(use_enable ssl nss) \
-		$(use_enable ssl smime) \
-		$(use_with bogofilter) \
-		$(use_with ldap openldap) \
-		$(use_with spamassassin) \
-		$(usex ssl --enable-nss=yes "--without-nspr-libs
-			--without-nspr-includes
-			--without-nss-libs
-			--without-nss-includes") \
-		$(use_enable weather) \
-		ITSTOOL=$(type -P true)
-}
-
-src_install() {
-	DOCS="AUTHORS ChangeLog* HACKING MAINTAINERS NEWS* README"
-
-	gnome2_src_install
-
-	# Problems with prelink:
-	# https://bugzilla.gnome.org/show_bug.cgi?id=731680
-	# https://bugzilla.gnome.org/show_bug.cgi?id=732148
-	# https://bugzilla.redhat.com/show_bug.cgi?id=1114538
-	echo PRELINK_PATH_MASK=/usr/bin/evolution > ${T}/99${PN}
-	doenvd "${T}"/99${PN}
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	readme.gentoo_print_elog
-}
diff --git a/mail-client/evolution/evolution-3.16.5.ebuild b/mail-client/evolution/evolution-3.16.5.ebuild
new file mode 100644
index 000000000000..f4e691598aff
--- /dev/null
+++ b/mail-client/evolution/evolution-3.16.5.ebuild
@@ -0,0 +1,156 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+
+inherit eutils flag-o-matic readme.gentoo gnome2
+
+DESCRIPTION="Integrated mail, addressbook and calendaring functionality"
+HOMEPAGE="https://wiki.gnome.org/Apps/Evolution"
+
+# Note: explicitly "|| ( LGPL-2 LGPL-3 )", not "LGPL-2+".
+LICENSE="|| ( LGPL-2 LGPL-3 ) CC-BY-SA-3.0 FDL-1.3+ OPENLDAP"
+SLOT="2.0"
+IUSE="+bogofilter crypt highlight ldap map spamassassin spell ssl +weather"
+KEYWORDS="amd64 ~x86 ~x86-fbsd"
+
+# We need a graphical pinentry frontend to be able to ask for the GPG
+# password from inside evolution, bug 160302
+PINENTRY_DEPEND="|| ( app-crypt/pinentry[gnome-keyring] app-crypt/pinentry[gtk] app-crypt/pinentry[qt4] )"
+
+# glade-3 support is for maintainers only per configure.ac
+# pst is not mature enough and changes API/ABI frequently
+# dconf explicitely needed for backup plugin
+# google tasks requires >=libgdata-0.15.1
+# gnome-desktop support is optional with --enable-gnome-desktop
+# gnome-autoar (currently disabled because no release has been made)
+COMMON_DEPEND="
+	>=app-crypt/gcr-3.4
+	>=app-text/enchant-1.1.7
+	>=dev-libs/glib-2.40:2[dbus]
+	>=dev-libs/libgdata-0.10:=
+	>=dev-libs/libxml2-2.7.3:2
+	>=gnome-base/gnome-desktop-2.91.3:3=
+	>=gnome-base/gsettings-desktop-schemas-2.91.92
+	>=gnome-extra/evolution-data-server-3.16:=[gtk,weather?]
+	>=media-libs/libcanberra-0.25[gtk3]
+	>=net-libs/libsoup-2.42:2.4
+	>=net-libs/webkit-gtk-2.2:3
+	>=x11-libs/cairo-1.9.15:=[glib]
+	>=x11-libs/gdk-pixbuf-2.24:2
+	>=x11-libs/gtk+-3.10:3
+	>=x11-libs/libnotify-0.7:=
+	>=x11-misc/shared-mime-info-0.22
+
+	>=app-text/iso-codes-0.49
+	dev-libs/atk
+	gnome-base/dconf
+	dev-libs/libical:=
+	x11-libs/libSM
+	x11-libs/libICE
+
+	crypt? (
+		>=app-crypt/gnupg-1.4
+		${PINENTRY_DEPEND}
+		x11-libs/libcryptui )
+	map? (
+		>=media-libs/libchamplain-0.12:0.12[gtk]
+		>=media-libs/clutter-1.0.0:1.0
+		>=media-libs/clutter-gtk-0.90:1.0
+		>=sci-geosciences/geocode-glib-3.10.0
+		x11-libs/mx:1.0 )
+	spell? ( app-text/gtkspell:3 )
+	ldap? ( >=net-nds/openldap-2:= )
+	ssl? (
+		>=dev-libs/nspr-4.6.1:=
+		>=dev-libs/nss-3.11:= )
+	weather? ( >=dev-libs/libgweather-3.8:2= )
+"
+DEPEND="${COMMON_DEPEND}
+	app-text/docbook-xml-dtd:4.1.2
+	dev-util/gtk-doc-am
+	>=dev-util/intltool-0.40.0
+	dev-util/itstool
+	virtual/pkgconfig
+"
+# eautoreconf needs:
+#	app-text/yelp-tools
+#	>=gnome-base/gnome-common-2.12
+RDEPEND="${COMMON_DEPEND}
+	bogofilter? ( mail-filter/bogofilter )
+	highlight? ( app-text/highlight )
+	spamassassin? ( mail-filter/spamassassin )
+	!gnome-extra/evolution-exchange
+"
+
+if [[ ${PV} = 9999 ]]; then
+	DEPEND="${DEPEND}
+		app-text/yelp-tools
+		doc? ( >=dev-util/gtk-doc-1.14 )"
+fi
+
+DISABLE_AUTOFORMATTING="yes"
+DOC_CONTENTS="To change the default browser if you are not using GNOME, edit
+~/.local/share/applications/mimeapps.list so it includes the
+following content:
+
+[Default Applications]
+x-scheme-handler/http=firefox.desktop
+x-scheme-handler/https=firefox.desktop
+
+(replace firefox.desktop with the name of the appropriate .desktop
+file from /usr/share/applications if you use a different browser)."
+
+src_prepare() {
+	# Fix relink issues in src_install
+	ELTCONF="--reverse-deps"
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# Use NSS/NSPR only if 'ssl' is enabled.
+	gnome2_src_configure \
+		--without-glade-catalog \
+		--disable-autoar \
+		--disable-code-coverage \
+		--disable-installed-tests \
+		--disable-pst-import \
+		--enable-canberra \
+		$(use_enable crypt libcryptui) \
+		$(use_enable highlight text-highlight) \
+		$(use_enable map contact-maps) \
+		$(use_enable spell gtkspell) \
+		$(use_enable ssl nss) \
+		$(use_enable ssl smime) \
+		$(use_with bogofilter) \
+		$(use_with ldap openldap) \
+		$(use_with spamassassin) \
+		$(usex ssl --enable-nss=yes "--without-nspr-libs
+			--without-nspr-includes
+			--without-nss-libs
+			--without-nss-includes") \
+		$(use_enable weather)
+}
+
+src_install() {
+	DOCS="AUTHORS ChangeLog* HACKING MAINTAINERS NEWS* README"
+
+	gnome2_src_install
+
+	# Problems with prelink:
+	# https://bugzilla.gnome.org/show_bug.cgi?id=731680
+	# https://bugzilla.gnome.org/show_bug.cgi?id=732148
+	# https://bugzilla.redhat.com/show_bug.cgi?id=1114538
+	echo PRELINK_PATH_MASK=/usr/bin/evolution > ${T}/99${PN}
+	doenvd "${T}"/99${PN}
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+	readme.gentoo_print_elog
+}
diff --git a/mail-client/geary/geary-0.10.0.ebuild b/mail-client/geary/geary-0.10.0.ebuild
index 9c67de189cd3..7abbbef11287 100644
--- a/mail-client/geary/geary-0.10.0.ebuild
+++ b/mail-client/geary/geary-0.10.0.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Geary"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="nls"
 
 DEPEND="
diff --git a/mail-client/mutt/Manifest b/mail-client/mutt/Manifest
index 85c4eec02eed..7c79378414bd 100644
--- a/mail-client/mutt/Manifest
+++ b/mail-client/mutt/Manifest
@@ -2,5 +2,5 @@ DIST mutt-1.5.23-gentoo-patches-r5.tar.bz2 127745 SHA256 a2c457071b17fc1886c8f0d
 DIST mutt-1.5.23-gentoo-patches-r7.tar.bz2 167553 SHA256 354bd25bdba4f58b4bfcbc84b451199d0d801c239b7e610ff0ec3e76e838741e SHA512 7e7090d7bf74d3d0cc59facc3715f2671a5a2b82ab794b1e1b2b6178ff4059854b3fe6f5b3e3833381d24f7150bea2b8542f26e7ea29aa72752bda1ac3051b29 WHIRLPOOL 0e2f37efdcb4195c5d9d3ec7c859a1f1fa2316907e4b6352c470701ef3613e41502deccd3ca45b5a3e60e5353612b339a26f8c649d2813a0898d67a3802a1a99
 DIST mutt-1.5.23-gentoo-patches-r8.tar.bz2 167959 SHA256 30aed5383b77321b92e407b53d759d72ab6da105771a65cecbb07eae191e496b SHA512 5f88217f0fa94e5eb08aa574b1bfa78a512528eaff8127487c8fd3d3e9c59fb9090a11c3f72beff28ca36a3dd5a8ab155f9de880d332836a0ac12e72b64640f8 WHIRLPOOL 994e0bd6a80d4fbcd523d71cf7615deaa46f5e1753fdb5967730e0013cbb8de0d6ceba3c01ea015e3b363fb395456db7507f75fb52e860e28c03e71371acd2b6
 DIST mutt-1.5.23.tar.gz 3782032 SHA256 3af0701e57b9e1880ed3a0dee34498a228939e854a16cdccd24e5e502626fd37 SHA512 f1b4a7230253651857f61bd7215cce870a613012f613d4c907d401556083726c8ed7d429d57a8bf858c3b5b23683380d4c1494540d86ca80813e22cb6b95bc1e WHIRLPOOL b5a676d204aece8c572d57a027fa5a402b7afe8e5b7d4c83b2d1b1612eb0ac5cb58cd225757732a017f03444e0ea42dacffcf1cf2d46c18ae92d7d3306059c61
-DIST mutt-1.5.24-gentoo-patches.tar.bz2 78689 SHA256 8ee2997448a0d1b9039b7dd61bbda0781ad408a3a98ba6febd06ab90b1a86f4d SHA512 43fcc2a3565d97b073285a57f0a684d73706b95306a18d0e348b6230859acdbab83d2917cc6c1d0baba14efb046a5b79f4fdf47388144f769b4685380ca2922e WHIRLPOOL ea247724afa12e7a5ba8a55c773b6195153e0097cb244b62a7c5b287c877a6bc1670750ae6e99d8bef8a794bfcede0048e27d880717853815529c1674b08ebca
+DIST mutt-1.5.24-gentoo-patches-r1.tar.bz2 118546 SHA256 411ad728404f4e7743b82bb79020776ce5bdf614772c387b15992e14f7c444d2 SHA512 c19e6627683b91119bbbfcd5b3250cb3fb79ff9d62b45861002c50ac232f65447744313921fe10a517efb9cb93f5638615d5b8ce1dd946fab3083bd9eaffefc1 WHIRLPOOL cbd1a3858e3b187117e26718066a2f2dd9c690aca3a77b050142d12b96599adada1a8a723b91b000f9eda92d9ceed284a1ac5cdd243de8085a233f01fac003d7
 DIST mutt-1.5.24.tar.gz 3897115 SHA256 a292ca765ed7b19db4ac495938a3ef808a16193b7d623d65562bb8feb2b42200 SHA512 f7fe7edf9d1701a8e92761b1f5e6ef2e3a3b513af7898872cbe36a8800714cb76945788a60d2008820c57bc5344a4147e2686f690da42cfc8a912e3a432452b1 WHIRLPOOL 35408cabab100e688f8c6d0d598f79144b7c72fb31f41a720acb9a6381e7ca94d66e640fe1178b911cfb16dfde4c982362c4c78ea203aef3a3dbcba09dcdc023
diff --git a/mail-client/mutt/mutt-1.5.23-r7.ebuild b/mail-client/mutt/mutt-1.5.23-r7.ebuild
index f4016d47b75d..fd24cb6c8fc8 100644
--- a/mail-client/mutt/mutt-1.5.23-r7.ebuild
+++ b/mail-client/mutt/mutt-1.5.23-r7.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
 IUSE="berkdb crypt debug doc gdbm gnutls gpg idn imap kerberos mbox nls nntp pop qdbm sasl selinux sidebar slang smime smtp ssl tokyocabinet"
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ~ppc ~ppc64 sparc x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ~ppc64 sparc x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 CDEPEND="
 	app-misc/mime-types
 	nls? ( virtual/libintl )
diff --git a/mail-client/mutt/mutt-1.5.24-r1.ebuild b/mail-client/mutt/mutt-1.5.24-r1.ebuild
new file mode 100644
index 000000000000..a7b9a1c57a97
--- /dev/null
+++ b/mail-client/mutt/mutt-1.5.24-r1.ebuild
@@ -0,0 +1,254 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit eutils flag-o-matic autotools
+
+PATCHSET_REV="-r1"
+
+DESCRIPTION="A small but very powerful text-based mail client"
+HOMEPAGE="http://www.mutt.org/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
+	mirror://bitbucket/${PN}/${PN}/downloads/${P}.tar.gz
+	ftp://ftp.mutt.org/pub/mutt/${P}.tar.gz
+	mirror://gentoo/${P}-gentoo-patches${PATCHSET_REV}.tar.bz2
+	https://dev.gentoo.org/~grobian/distfiles/${P}-gentoo-patches${PATCHSET_REV}.tar.bz2"
+IUSE="berkdb crypt debug doc gdbm gnutls gpg idn imap kerberos mbox nls nntp pop qdbm sasl selinux sidebar slang smime smtp ssl tokyocabinet"
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+CDEPEND="
+	app-misc/mime-types
+	nls? ( virtual/libintl )
+	tokyocabinet?  ( dev-db/tokyocabinet )
+	!tokyocabinet? (
+		qdbm?  ( dev-db/qdbm )
+		!qdbm? (
+			gdbm?  ( sys-libs/gdbm )
+			!gdbm? ( berkdb? ( >=sys-libs/db-4 ) )
+		)
+	)
+	imap?    (
+		gnutls?  ( >=net-libs/gnutls-1.0.17 )
+		!gnutls? ( ssl? ( >=dev-libs/openssl-0.9.6 ) )
+		sasl?    ( >=dev-libs/cyrus-sasl-2 )
+	)
+	kerberos? ( virtual/krb5 )
+	pop?     (
+		gnutls?  ( >=net-libs/gnutls-1.0.17 )
+		!gnutls? ( ssl? ( >=dev-libs/openssl-0.9.6 ) )
+		sasl?    ( >=dev-libs/cyrus-sasl-2 )
+	)
+	smtp?     (
+		gnutls?  ( >=net-libs/gnutls-1.0.17 )
+		!gnutls? ( ssl? ( >=dev-libs/openssl-0.9.6 ) )
+		sasl?    ( >=dev-libs/cyrus-sasl-2 )
+	)
+	idn?     ( net-dns/libidn )
+	gpg?     ( >=app-crypt/gpgme-0.9.0 )
+	smime?   ( >=dev-libs/openssl-0.9.6 )
+	slang? ( sys-libs/slang )
+	!slang? ( >=sys-libs/ncurses-5.2 )
+"
+DEPEND="${CDEPEND}
+	net-mail/mailbase
+	doc? (
+		dev-libs/libxml2
+		dev-libs/libxslt
+		app-text/docbook-xsl-stylesheets
+		|| ( www-client/lynx www-client/w3m www-client/elinks )
+	)"
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-mutt )
+"
+PATCHDIR="${WORKDIR}"/${P}-gentoo-patches${PATCHSET_REV}
+
+src_prepare() {
+	# Post-release hot-fixes grabbed from HG, this is what all following
+	# patches are based on in my Mercurial patchqueue (mq).
+	# If you ever take over or need to modify patches here, just check
+	# out the gentoo branch(es) of Gentoo's Mutt Mercurial clone, and
+	# the patchqueue as it'll save you a lot of work.
+	# http://hg.code.sf.net/p/gentoomutt/code/
+	# http://hg.code.sf.net/p/gentoomuttpatches/code/
+	for rev in $(eval echo {0..${PR#r}}) ; do
+		local revpatch="${PATCHDIR}"/mutt-gentoo-${PV}-r${rev}.patch
+		[[ -e ${revpatch} ]] && \
+			epatch "${revpatch}"
+	done
+	# fix compilation with ncurses[tinfo], #459260
+	epatch "${PATCHDIR}"/ncurses-tinfo.patch
+
+	# this patch is non-generic and only works because we use a sysconfdir
+	# different from the one used by the mailbase ebuild
+	use prefix && epatch "${PATCHDIR}"/prefix-mailcap.patch
+
+	# must have fixes to compile or behave correctly, upstream
+	# ignores, disagrees or simply doesn't respond/apply
+	epatch "${PATCHDIR}"/bdb-prefix.patch # fix bdb detection
+	# same category, but functional bits
+	epatch "${PATCHDIR}"/dont-reveal-bbc.patch
+
+	# the big feature patches that upstream doesn't want to include, but
+	# nearly every distro has due to their usefulness
+	for p in "${PATCHDIR}"/[0-9][0-9]-*.patch ; do
+		epatch "${p}"
+	done
+
+	# we conditionalise this one, simply because it has considerable
+	# impact on the code
+	if use sidebar ; then
+		epatch "${PATCHDIR}"/sidebar-20140412.patch
+		epatch "${PATCHDIR}"/sidebar-dotpathsep.patch
+		epatch "${PATCHDIR}"/sidebar-counts.patch
+	fi
+
+	local upatches=
+	# allow user patches
+	epatch_user && upatches=" with user patches"
+
+	# patch version string for bug reports
+	sed -i -e 's/"Mutt %s (%s)"/"Mutt %s (%s, Gentoo '"${PVR}${upatches}"')"/' \
+		muttlib.c || die "failed patching in Gentoo version"
+
+	# many patches touch the buildsystem, we always need this
+	AT_M4DIR="m4" eautoreconf
+
+	# the configure script contains some "cleverness" whether or not to setgid
+	# the dotlock program, resulting in bugs like #278332
+	sed -i -e 's/@DOTLOCK_GROUP@//' \
+		Makefile.in || die "sed failed"
+
+	# don't just build documentation (lengthy process, with big dependencies)
+	if use !doc ; then
+		sed -i -e '/SUBDIRS =/s/doc//' Makefile.in || die
+	fi
+}
+
+src_configure() {
+	local myconf="
+		$(use_enable crypt pgp) \
+		$(use_enable debug) \
+		$(use_enable gpg gpgme) \
+		$(use_enable imap) \
+		$(use_enable nls) \
+		$(use_enable nntp) \
+		$(use_enable pop) \
+		$(use_enable smime) \
+		$(use_enable smtp) \
+		$(use_with idn) \
+		$(use_with kerberos gss) \
+		$(use slang && echo --with-slang=${EPREFIX}/usr) \
+		$(use !slang && echo --with-curses=${EPREFIX}/usr) \
+		--enable-compressed \
+		--enable-external-dotlock \
+		--enable-nfs-fix \
+		--sysconfdir=${EPREFIX}/etc/${PN} \
+		--with-docdir=${EPREFIX}/usr/share/doc/${PN}-${PVR} \
+		--with-regex \
+		--with-exec-shell=${EPREFIX}/bin/sh"
+
+	case $CHOST in
+		*-solaris*)
+			# Solaris has no flock in the standard headers
+			myconf+=" --enable-fcntl --disable-flock"
+			# wchar_t depends on locale
+			myconf+=" --without-wc-funcs"
+		;;
+		*)
+			myconf+=" --disable-fcntl --enable-flock"
+		;;
+	esac
+
+	# mutt prioritizes gdbm over bdb, so we will too.
+	# hcache feature requires at least one database is in USE.
+	if use tokyocabinet; then
+		myconf="${myconf} --enable-hcache \
+			--with-tokyocabinet --without-qdbm --without-gdbm --without-bdb"
+	elif use qdbm; then
+		myconf="${myconf} --enable-hcache \
+			--without-tokyocabinet --with-qdbm --without-gdbm --without-bdb"
+	elif use gdbm ; then
+		myconf="${myconf} --enable-hcache \
+			--without-tokyocabinet --without-qdbm --with-gdbm --without-bdb"
+	elif use berkdb; then
+		myconf="${myconf} --enable-hcache \
+			--without-tokyocabinet --without-qdbm --without-gdbm --with-bdb"
+	else
+		myconf="${myconf} --disable-hcache \
+			--without-tokyocabinet --without-qdbm --without-gdbm --without-bdb"
+	fi
+
+	# there's no need for gnutls, ssl or sasl without socket support
+	if use pop || use imap || use smtp ; then
+		if use gnutls; then
+			myconf="${myconf} --with-gnutls"
+		elif use ssl; then
+			myconf="${myconf} --with-ssl"
+		fi
+		# not sure if this should be mutually exclusive with the other two
+		myconf="${myconf} $(use_with sasl)"
+	else
+		myconf="${myconf} --without-gnutls --without-ssl --without-sasl"
+	fi
+
+	if use mbox; then
+		myconf="${myconf} --with-mailpath=${EPREFIX}/var/spool/mail"
+	else
+		myconf="${myconf} --with-homespool=Maildir"
+	fi
+
+	econf ${myconf} || die "configure failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "install failed"
+	if use mbox; then
+		insinto /etc/mutt
+		newins "${FILESDIR}"/Muttrc.mbox Muttrc
+	else
+		insinto /etc/mutt
+		doins "${FILESDIR}"/Muttrc
+	fi
+
+	# A newer file is provided by app-misc/mime-types. So we link it.
+	rm "${ED}"/etc/${PN}/mime.types
+	dosym /etc/mime.types /etc/${PN}/mime.types
+
+	# A man-page is always handy, so fake one
+	if use !doc; then
+		emake -C doc DESTDIR="${D}" muttrc.man || die
+		# make the fake slightly better, bug #413405
+		sed -e 's#@docdir@/manual.txt#http://www.mutt.org/doc/devel/manual.html#' \
+			-e 's#in @docdir@,#at http://www.mutt.org/,#' \
+			-e "s#@sysconfdir@#${EPREFIX}/etc/${PN}#" \
+			-e "s#@bindir@#${EPREFIX}/usr/bin#" \
+			doc/mutt.man > mutt.1
+		cp doc/muttbug.man flea.1
+		cp doc/muttrc.man muttrc.5
+		doman mutt.1 flea.1 muttrc.5
+	else
+		# nuke manpages that should be provided by an MTA, bug #177605
+		rm "${ED}"/usr/share/man/man5/{mbox,mmdf}.5 \
+			|| ewarn "failed to remove files, please file a bug"
+	fi
+
+	if use !prefix ; then
+		fowners root:mail /usr/bin/mutt_dotlock
+		fperms g+s /usr/bin/mutt_dotlock
+	fi
+
+	dodoc BEWARE COPYRIGHT ChangeLog NEWS OPS* PATCHES README* TODO VERSION
+}
+
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]] ; then
+		echo
+		elog "If you are new to mutt you may want to take a look at"
+		elog "the Gentoo QuickStart Guide to Mutt E-Mail:"
+		elog "   https://wiki.gentoo.org/wiki/Mutt"
+		echo
+	fi
+}
diff --git a/mail-client/mutt/mutt-1.5.24.ebuild b/mail-client/mutt/mutt-1.5.24.ebuild
deleted file mode 100644
index c2c1ed326b14..000000000000
--- a/mail-client/mutt/mutt-1.5.24.ebuild
+++ /dev/null
@@ -1,252 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit eutils flag-o-matic autotools
-
-PATCHSET_REV=""
-
-DESCRIPTION="A small but very powerful text-based mail client"
-HOMEPAGE="http://www.mutt.org/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
-	mirror://bitbucket/${PN}/${PN}/downloads/${P}.tar.gz
-	ftp://ftp.mutt.org/pub/mutt/${P}.tar.gz
-	mirror://gentoo/${P}-gentoo-patches${PATCHSET_REV}.tar.bz2
-	https://dev.gentoo.org/~grobian/distfiles/${P}-gentoo-patches${PATCHSET_REV}.tar.bz2"
-IUSE="berkdb crypt debug doc gdbm gnutls gpg idn imap kerberos mbox nls nntp pop qdbm sasl selinux sidebar slang smime smtp ssl tokyocabinet"
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-CDEPEND="
-	app-misc/mime-types
-	nls? ( virtual/libintl )
-	tokyocabinet?  ( dev-db/tokyocabinet )
-	!tokyocabinet? (
-		qdbm?  ( dev-db/qdbm )
-		!qdbm? (
-			gdbm?  ( sys-libs/gdbm )
-			!gdbm? ( berkdb? ( >=sys-libs/db-4 ) )
-		)
-	)
-	imap?    (
-		gnutls?  ( >=net-libs/gnutls-1.0.17 )
-		!gnutls? ( ssl? ( >=dev-libs/openssl-0.9.6 ) )
-		sasl?    ( >=dev-libs/cyrus-sasl-2 )
-	)
-	kerberos? ( virtual/krb5 )
-	pop?     (
-		gnutls?  ( >=net-libs/gnutls-1.0.17 )
-		!gnutls? ( ssl? ( >=dev-libs/openssl-0.9.6 ) )
-		sasl?    ( >=dev-libs/cyrus-sasl-2 )
-	)
-	smtp?     (
-		gnutls?  ( >=net-libs/gnutls-1.0.17 )
-		!gnutls? ( ssl? ( >=dev-libs/openssl-0.9.6 ) )
-		sasl?    ( >=dev-libs/cyrus-sasl-2 )
-	)
-	idn?     ( net-dns/libidn )
-	gpg?     ( >=app-crypt/gpgme-0.9.0 )
-	smime?   ( >=dev-libs/openssl-0.9.6 )
-	slang? ( sys-libs/slang )
-	!slang? ( >=sys-libs/ncurses-5.2 )
-"
-DEPEND="${CDEPEND}
-	net-mail/mailbase
-	doc? (
-		dev-libs/libxml2
-		dev-libs/libxslt
-		app-text/docbook-xsl-stylesheets
-		|| ( www-client/lynx www-client/w3m www-client/elinks )
-	)"
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-mutt )
-"
-PATCHDIR="${WORKDIR}"/${P}-gentoo-patches${PATCHSET_REV}
-
-src_prepare() {
-	# Post-release hot-fixes grabbed from HG, this is what all following
-	# patches are based on in my Mercurial patchqueue (mq).
-	# If you ever take over or need to modify patches here, just check
-	# out the gentoo branch(es) of Gentoo's Mutt Mercurial clone, and
-	# the patchqueue as it'll save you a lot of work.
-	# http://hg.code.sf.net/p/gentoomutt/code/
-	# http://hg.code.sf.net/p/gentoomuttpatches/code/
-	for rev in $(eval echo {0..${PR#r}}) ; do
-		local revpatch="${PATCHDIR}"/mutt-gentoo-${PV}-r${rev}.patch
-		[[ -e ${revpatch} ]] && \
-			epatch "${revpatch}"
-	done
-	# fix compilation with ncurses[tinfo], #459260
-	epatch "${PATCHDIR}"/ncurses-tinfo.patch
-
-	# this patch is non-generic and only works because we use a sysconfdir
-	# different from the one used by the mailbase ebuild
-	use prefix && epatch "${PATCHDIR}"/prefix-mailcap.patch
-
-	# must have fixes to compile or behave correctly, upstream
-	# ignores, disagrees or simply doesn't respond/apply
-	epatch "${PATCHDIR}"/bdb-prefix.patch # fix bdb detection
-	# same category, but functional bits
-	epatch "${PATCHDIR}"/dont-reveal-bbc.patch
-
-	# the big feature patches that upstream doesn't want to include, but
-	# nearly every distro has due to their usefulness
-	for p in "${PATCHDIR}"/[0-9][0-9]-*.patch ; do
-		epatch "${p}"
-	done
-
-	# we conditionalise this one, simply because it has considerable
-	# impact on the code
-	if use sidebar ; then
-		epatch "${PATCHDIR}"/sidebar-20140412.patch
-		epatch "${PATCHDIR}"/sidebar-dotpathsep.patch
-		epatch "${PATCHDIR}"/sidebar-counts.patch
-	fi
-
-	local upatches=
-	# allow user patches
-	epatch_user && upatches=" with user patches"
-
-	# patch version string for bug reports
-	sed -i -e 's/"Mutt %s (%s)"/"Mutt %s (%s, Gentoo '"${PVR}${upatches}"')"/' \
-		muttlib.c || die "failed patching in Gentoo version"
-
-	# many patches touch the buildsystem, we always need this
-	AT_M4DIR="m4" eautoreconf
-
-	# the configure script contains some "cleverness" whether or not to setgid
-	# the dotlock program, resulting in bugs like #278332
-	sed -i -e 's/@DOTLOCK_GROUP@//' \
-		Makefile.in || die "sed failed"
-
-	# don't just build documentation (lengthy process, with big dependencies)
-	if use !doc ; then
-		sed -i -e '/SUBDIRS =/s/doc//' Makefile.in || die
-	fi
-}
-
-src_configure() {
-	local myconf="
-		$(use_enable crypt pgp) \
-		$(use_enable debug) \
-		$(use_enable gpg gpgme) \
-		$(use_enable imap) \
-		$(use_enable nls) \
-		$(use_enable nntp) \
-		$(use_enable pop) \
-		$(use_enable smime) \
-		$(use_enable smtp) \
-		$(use_with idn) \
-		$(use_with kerberos gss) \
-		$(use slang && echo --with-slang) \
-		--enable-compressed \
-		--enable-external-dotlock \
-		--enable-nfs-fix \
-		--sysconfdir=${EPREFIX}/etc/${PN} \
-		--with-curses \
-		--with-docdir=${EPREFIX}/usr/share/doc/${PN}-${PVR} \
-		--with-regex \
-		--with-exec-shell=${EPREFIX}/bin/sh"
-
-	case $CHOST in
-		*-solaris*)
-			# Solaris has no flock in the standard headers
-			myconf="${myconf} --enable-fcntl --disable-flock"
-		;;
-		*)
-			myconf="${myconf} --disable-fcntl --enable-flock"
-		;;
-	esac
-
-	# mutt prioritizes gdbm over bdb, so we will too.
-	# hcache feature requires at least one database is in USE.
-	if use tokyocabinet; then
-		myconf="${myconf} --enable-hcache \
-			--with-tokyocabinet --without-qdbm --without-gdbm --without-bdb"
-	elif use qdbm; then
-		myconf="${myconf} --enable-hcache \
-			--without-tokyocabinet --with-qdbm --without-gdbm --without-bdb"
-	elif use gdbm ; then
-		myconf="${myconf} --enable-hcache \
-			--without-tokyocabinet --without-qdbm --with-gdbm --without-bdb"
-	elif use berkdb; then
-		myconf="${myconf} --enable-hcache \
-			--without-tokyocabinet --without-qdbm --without-gdbm --with-bdb"
-	else
-		myconf="${myconf} --disable-hcache \
-			--without-tokyocabinet --without-qdbm --without-gdbm --without-bdb"
-	fi
-
-	# there's no need for gnutls, ssl or sasl without socket support
-	if use pop || use imap || use smtp ; then
-		if use gnutls; then
-			myconf="${myconf} --with-gnutls"
-		elif use ssl; then
-			myconf="${myconf} --with-ssl"
-		fi
-		# not sure if this should be mutually exclusive with the other two
-		myconf="${myconf} $(use_with sasl)"
-	else
-		myconf="${myconf} --without-gnutls --without-ssl --without-sasl"
-	fi
-
-	if use mbox; then
-		myconf="${myconf} --with-mailpath=${EPREFIX}/var/spool/mail"
-	else
-		myconf="${myconf} --with-homespool=Maildir"
-	fi
-
-	econf ${myconf} || die "configure failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "install failed"
-	if use mbox; then
-		insinto /etc/mutt
-		newins "${FILESDIR}"/Muttrc.mbox Muttrc
-	else
-		insinto /etc/mutt
-		doins "${FILESDIR}"/Muttrc
-	fi
-
-	# A newer file is provided by app-misc/mime-types. So we link it.
-	rm "${ED}"/etc/${PN}/mime.types
-	dosym /etc/mime.types /etc/${PN}/mime.types
-
-	# A man-page is always handy, so fake one
-	if use !doc; then
-		emake -C doc DESTDIR="${D}" muttrc.man || die
-		# make the fake slightly better, bug #413405
-		sed -e 's#@docdir@/manual.txt#http://www.mutt.org/doc/devel/manual.html#' \
-			-e 's#in @docdir@,#at http://www.mutt.org/,#' \
-			-e "s#@sysconfdir@#${EPREFIX}/etc/${PN}#" \
-			-e "s#@bindir@#${EPREFIX}/usr/bin#" \
-			doc/mutt.man > mutt.1
-		cp doc/muttbug.man flea.1
-		cp doc/muttrc.man muttrc.5
-		doman mutt.1 flea.1 muttrc.5
-	else
-		# nuke manpages that should be provided by an MTA, bug #177605
-		rm "${ED}"/usr/share/man/man5/{mbox,mmdf}.5 \
-			|| ewarn "failed to remove files, please file a bug"
-	fi
-
-	if use !prefix ; then
-		fowners root:mail /usr/bin/mutt_dotlock
-		fperms g+s /usr/bin/mutt_dotlock
-	fi
-
-	dodoc BEWARE COPYRIGHT ChangeLog NEWS OPS* PATCHES README* TODO VERSION
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]] ; then
-		echo
-		elog "If you are new to mutt you may want to take a look at"
-		elog "the Gentoo QuickStart Guide to Mutt E-Mail:"
-		elog "   https://wiki.gentoo.org/wiki/Mutt"
-		echo
-	fi
-}
diff --git a/mail-client/thunderbird/thunderbird-38.2.0.ebuild b/mail-client/thunderbird/thunderbird-38.2.0.ebuild
index f7f9b9e6f675..c7a4cf98c7a7 100644
--- a/mail-client/thunderbird/thunderbird-38.2.0.ebuild
+++ b/mail-client/thunderbird/thunderbird-38.2.0.ebuild
@@ -244,7 +244,7 @@ src_compile() {
 	mkdir -p "${BUILD_OBJ_DIR}" && cd "${BUILD_OBJ_DIR}" || die
 
 	CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" \
-	MOZ_MAKE_FLAGS="${MAKEOPTS}" SHELL="${SHELL}" \
+	MOZ_MAKE_FLAGS="${MAKEOPTS}" SHELL="${SHELL:-${EPREFIX%/}/bin/bash}" \
 	emake -f "${S}"/client.mk
 
 	# Only build enigmail extension if crypt enabled.
diff --git a/media-gfx/eog-plugins/eog-plugins-3.16.1.ebuild b/media-gfx/eog-plugins/eog-plugins-3.16.1.ebuild
index 5d2c6565505e..58dd66b27412 100644
--- a/media-gfx/eog-plugins/eog-plugins-3.16.1.ebuild
+++ b/media-gfx/eog-plugins/eog-plugins-3.16.1.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/EyeOfGnome/Plugins"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 IUSE="+exif +flickr map +picasa +python"
 REQUIRED_USE="
diff --git a/media-gfx/eog/eog-3.16.3.ebuild b/media-gfx/eog/eog-3.16.3.ebuild
index 987816fff276..912585ca8aa8 100644
--- a/media-gfx/eog/eog-3.16.3.ebuild
+++ b/media-gfx/eog/eog-3.16.3.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/EyeOfGnome"
 LICENSE="GPL-2+"
 SLOT="1"
 IUSE="+exif +introspection +jpeg lcms +svg tiff xmp"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 
 REQUIRED_USE="exif? ( jpeg )"
 
diff --git a/media-gfx/fontforge/fontforge-20150430.ebuild b/media-gfx/fontforge/fontforge-20150430.ebuild
index e49a4bba3712..215b441c7f7b 100644
--- a/media-gfx/fontforge/fontforge-20150430.ebuild
+++ b/media-gfx/fontforge/fontforge-20150430.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/fontforge/fontforge/archive/${PV}.tar.gz -> ${P}.tar
 
 LICENSE="BSD GPL-3+"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="cairo truetype-debugger gif gtk jpeg png +python readline tiff svg unicode X"
 
 REQUIRED_USE="
diff --git a/media-gfx/gimp/gimp-2.8.14-r1.ebuild b/media-gfx/gimp/gimp-2.8.14-r1.ebuild
index 879011b5fea8..06622c9e77cd 100644
--- a/media-gfx/gimp/gimp-2.8.14-r1.ebuild
+++ b/media-gfx/gimp/gimp-2.8.14-r1.ebuild
@@ -5,7 +5,7 @@
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
 
-inherit versionator autotools eutils gnome2 fdo-mime multilib python-single-r1
+inherit versionator virtualx autotools eutils gnome2 fdo-mime multilib python-single-r1
 
 DESCRIPTION="GNU Image Manipulation Program"
 HOMEPAGE="http://www.gimp.org/"
@@ -136,6 +136,10 @@ _clean_up_locales() {
 	done
 }
 
+src_test() {
+	Xemake check
+}
+
 src_install() {
 	gnome2_src_install
 
diff --git a/media-gfx/gnome-font-viewer/gnome-font-viewer-3.16.2.ebuild b/media-gfx/gnome-font-viewer/gnome-font-viewer-3.16.2.ebuild
index 2a88939d23f6..6c059f4d9f1c 100644
--- a/media-gfx/gnome-font-viewer/gnome-font-viewer-3.16.2.ebuild
+++ b/media-gfx/gnome-font-viewer/gnome-font-viewer-3.16.2.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://git.gnome.org/browse/gnome-font-viewer"
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="0"
 IUSE=""
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux"
 
 COMMON_DEPEND="
 	>=dev-libs/glib-2.35.1:2
diff --git a/media-gfx/gnome-photos/gnome-photos-3.16.2.ebuild b/media-gfx/gnome-photos/gnome-photos-3.16.2.ebuild
index fac1f6a9c4d2..ac47f7bf67ff 100644
--- a/media-gfx/gnome-photos/gnome-photos-3.16.2.ebuild
+++ b/media-gfx/gnome-photos/gnome-photos-3.16.2.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Photos"
 
 LICENSE="GPL-2+ LGPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="test"
 
 RDEPEND="
diff --git a/media-gfx/gnome-screenshot/gnome-screenshot-3.16.2.ebuild b/media-gfx/gnome-screenshot/gnome-screenshot-3.16.2.ebuild
index e2d3c37bb85a..181254b8d638 100644
--- a/media-gfx/gnome-screenshot/gnome-screenshot-3.16.2.ebuild
+++ b/media-gfx/gnome-screenshot/gnome-screenshot-3.16.2.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://git.gnome.org/browse/gnome-screenshot"
 LICENSE="GPL-2+"
 SLOT="0"
 IUSE=""
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux"
 
 # libcanberra 0.26-r2 is needed for gtk+:3 fixes
 COMMON_DEPEND="
diff --git a/media-gfx/gphoto2/Manifest b/media-gfx/gphoto2/Manifest
index 8385caa0102c..cf7316fb3002 100644
--- a/media-gfx/gphoto2/Manifest
+++ b/media-gfx/gphoto2/Manifest
@@ -1,2 +1,2 @@
-DIST gphoto2-2.5.5.tar.bz2 751227 SHA256 54e9aea97d926bfd7ffbe3b91fcf239ce58be0833df2938a385a67fdcadd14b4 SHA512 542653b5285df2941b971e7f158c6fddebddbe42525f5f7dfcb9ad69007568e8c7f60e49f220823aaa0b93fd4ba35b47e3b81ac222a3e666b98f7f01d905ef19 WHIRLPOOL 3f1d8ae18525c262623da24202c56a902ce74644e35efe6e2a7dc4d0ba5f4afeb46e6806820807885b4099614d8fa9f3f5fd059dacc934ea119d7bbe542a2d73
 DIST gphoto2-2.5.6.tar.bz2 756926 SHA256 55e5ec8b2bba4ed358f15eda466f61c79d6f75c220237f821ac687a3ceb336e8 SHA512 8877a87f624c9036f3409e78e9f28cccea2bcb8218d7d46636f19c7576a7480ab0d2fabd0a486b3f75e1be7db93f5121dd90ce806a772963f49f7a0c409ffba1 WHIRLPOOL 28be1adce983b6029cb1c781cbc3f45e1f1bce50085d0bce67c2015eddb10deb24ab55096d76928499af4db4eab0d0fc0a7e7bc9b3fd64a1530a403aad3ae3fc
+DIST gphoto2-2.5.8.tar.bz2 777235 SHA256 a9abcd15d95f205318d17e3ac12af7ce523d2bc4943709d50b0a12c30cc5ee4d SHA512 87230aa3a6cd897da38a3f8ed11b82076a98ec5ef9fa63927b5d390b2381ce3cee9d620a2a16cbab901f22db8eb97508523ea790a9195e7c833bbcfe4a265afa WHIRLPOOL f98e183e0ccb1aee4df14ff08beecb0ec2cc271c85667ad0528e5275d3944716be50d261f4f03ddcc379e4c9cd85fac418b55a8d0f63b089e957a6a7ec97335d
diff --git a/media-gfx/gphoto2/gphoto2-2.5.5.ebuild b/media-gfx/gphoto2/gphoto2-2.5.5.ebuild
deleted file mode 100644
index 146ea40bd990..000000000000
--- a/media-gfx/gphoto2/gphoto2-2.5.5.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-inherit autotools
-
-DESCRIPTION="Free, redistributable digital camera software application"
-HOMEPAGE="http://www.gphoto.org/"
-SRC_URI="mirror://sourceforge/gphoto/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ppc ppc64 sparc x86"
-IUSE="aalib exif ncurses nls readline"
-
-# aalib -> needs libjpeg
-RDEPEND="
-	dev-libs/popt
-	>=media-libs/libgphoto2-2.5.4[exif?]
-	aalib? (
-		media-libs/aalib
-		virtual/jpeg:0 )
-	exif? (	media-libs/libexif )
-	ncurses? ( dev-libs/cdk )
-	readline? ( sys-libs/readline )
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	nls? ( >=sys-devel/gettext-0.14.1 )
-"
-
-src_prepare() {
-	# Leave GCC debug builds under user control
-	sed -r '/(C|LD)FLAGS/ s/ -g( |")/\1/' \
-		-i configure{.ac,} || die
-	eautoreconf
-}
-
-src_configure() {
-	CPPFLAGS="-I/usr/include/cdk" econf \
-		--docdir=/usr/share/doc/${PF} \
-		$(use_with aalib) \
-		$(use_with aalib jpeg) \
-		$(use_with exif libexif auto) \
-		$(use_with ncurses cdk) \
-		$(use_enable nls) \
-		$(use_with readline)
-}
-
-src_install() {
-	emake DESTDIR="${D}" \
-		HTML_DIR="${D}"/usr/share/doc/${PF}/sgml \
-		install
-
-	dodoc ChangeLog NEWS* README AUTHORS
-	rm -rf "${D}"/usr/share/doc/${PF}/sgml/gphoto2
-}
diff --git a/media-gfx/gphoto2/gphoto2-2.5.8.ebuild b/media-gfx/gphoto2/gphoto2-2.5.8.ebuild
new file mode 100644
index 000000000000..a2b39c679fc0
--- /dev/null
+++ b/media-gfx/gphoto2/gphoto2-2.5.8.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+inherit autotools
+
+DESCRIPTION="Free, redistributable digital camera software application"
+HOMEPAGE="http://www.gphoto.org/"
+SRC_URI="mirror://sourceforge/gphoto/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="aalib exif ncurses nls readline"
+
+# aalib -> needs libjpeg
+RDEPEND="
+	dev-libs/popt
+	>=media-libs/libgphoto2-2.5.6[exif?]
+	aalib? (
+		media-libs/aalib
+		virtual/jpeg:0 )
+	exif? (	media-libs/libexif )
+	ncurses? ( dev-libs/cdk )
+	readline? ( sys-libs/readline:0 )
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	nls? ( >=sys-devel/gettext-0.14.1 )
+"
+
+src_prepare() {
+	# Leave GCC debug builds under user control
+	sed -r '/(C|LD)FLAGS/ s/ -g( |")/\1/' \
+		-i configure{.ac,} || die
+	eautoreconf
+}
+
+src_configure() {
+	CPPFLAGS="-I/usr/include/cdk" \
+		econf \
+			--docdir=/usr/share/doc/${PF} \
+			$(use_with aalib) \
+			$(use_with aalib jpeg) \
+			$(use_with exif libexif auto) \
+			$(use_with ncurses cdk) \
+			$(use_enable nls) \
+			$(use_with readline)
+}
+
+src_install() {
+	emake DESTDIR="${D}" \
+		HTML_DIR="${D}"/usr/share/doc/${PF}/sgml \
+		install
+
+	dodoc ChangeLog NEWS* README AUTHORS
+	rm -rf "${D}"/usr/share/doc/${PF}/sgml/gphoto2
+}
diff --git a/media-gfx/gthumb/gthumb-3.4.0.ebuild b/media-gfx/gthumb/gthumb-3.4.0.ebuild
index ead252ef0e15..c434647c52ba 100644
--- a/media-gfx/gthumb/gthumb-3.4.0.ebuild
+++ b/media-gfx/gthumb/gthumb-3.4.0.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/gthumb"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="cdr exif gnome-keyring gstreamer http jpeg json lcms raw slideshow svg tiff test webkit webp"
 
 COMMON_DEPEND="
diff --git a/media-gfx/kgraphviewer/Manifest b/media-gfx/kgraphviewer/Manifest
index 75b695050de7..83501e7c2d62 100644
--- a/media-gfx/kgraphviewer/Manifest
+++ b/media-gfx/kgraphviewer/Manifest
@@ -1,3 +1 @@
-DIST kgraphviewer-2.1.1.tar.gz 1409604 SHA256 5840e9dc0cc813c18c0b64aaf4346aeb95eefcc95d2c5068ff81a8f39c81f4b8 SHA512 b1d3b493351ebbc0875861e9ba764e7e8157a37bf1500cacd51fc15605f8ff202ecc07325c2fef89dfc92ccbdcf82c826962879e547cc32db01bf8af208827e8 WHIRLPOOL 7c5fea85bd499c9cd6535d6735c6ad99fba577b9d81a32bbe4166ddeb5328204e1328f459da2138434b874584c8f3f292082b95840732874781a625d67b44f77
-DIST kgraphviewer-2.1.1_p20140331.tar.xz 1000816 SHA256 71455b44e92c4d6107ccb50224ec8ff97c9546f77341763175d41de18fefab6a SHA512 945a90c60b75d741dea445ff38bf2ada7125be02c117b15b796277cc2e45d6c7eb963112bfacb84e5bd9331c9a9fe40c15b247e6294a53010dff10c666190fd4 WHIRLPOOL 9e6e963ac28819324a49342ab9559b296cecd246c9b13d26df0f68e129a57cfa893729096de19b93bc1a2973361165923e156ac9f3d3b38377dd9e67c1b7bf97
 DIST kgraphviewer-2.2.0.tar.xz 806100 SHA256 85ca4778d428e807a94d9587c5086f7ee8239780f373491bee46f49a46e945ef SHA512 2b3ba671256e4a7d30915dd5d498e2e760729c0783c5c609c50e48b94e985fff86c4cbfb91dd571ab899e4b0db1c4af3604b97c0954db1acde2780b48803c7f7 WHIRLPOOL b9a2b9db63edaaeef308441736db4fdd46cd1a3f70acff3c35a6fd1404394bd5bc3d59f1ed20e57fccc966e5b8562fbd671a169b975e89fbacdd39e833838660
diff --git a/media-gfx/kgraphviewer/files/kgraphviewer-2.1.1-boost-1.50.patch b/media-gfx/kgraphviewer/files/kgraphviewer-2.1.1-boost-1.50.patch
deleted file mode 100644
index 46c9490629cf..000000000000
--- a/media-gfx/kgraphviewer/files/kgraphviewer-2.1.1-boost-1.50.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 470bf0a4774a600dbd958b781342589a337d8898 Mon Sep 17 00:00:00 2001
-From: Michael Palimaka <kensington@gentoo.org>
-Date: Wed, 11 Jul 2012 01:58:00 +1000
-Subject: [PATCH] Fix build with boost-1.50
-
-REVIEW: 105494
----
- src/part/DotGraphParsingHelper.cpp | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/src/part/DotGraphParsingHelper.cpp b/src/part/DotGraphParsingHelper.cpp
-index 69cac49..7d46837 100644
---- a/src/part/DotGraphParsingHelper.cpp
-+++ b/src/part/DotGraphParsingHelper.cpp
-@@ -26,10 +26,10 @@
- #include "graphedge.h"
- 
- #include <boost/throw_exception.hpp>
--#include <boost/spirit/core.hpp>
--#include <boost/spirit/utility/distinct.hpp>
--#include <boost/spirit/utility/loops.hpp>
--#include <boost/spirit/utility/confix.hpp>
-+#include <boost/spirit/include/classic_core.hpp>
-+#include <boost/spirit/include/classic_distinct.hpp>
-+#include <boost/spirit/include/classic_loops.hpp>
-+#include <boost/spirit/include/classic_confix.hpp>
- 
- 
- #include <iostream>
--- 
-1.7.11.1
-
diff --git a/media-gfx/kgraphviewer/kgraphviewer-2.1.1.ebuild b/media-gfx/kgraphviewer/kgraphviewer-2.1.1.ebuild
deleted file mode 100644
index 3697e30e78c1..000000000000
--- a/media-gfx/kgraphviewer/kgraphviewer-2.1.1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-KDE_LINGUAS="ar be bg ca ca@valencia cs da de el en_GB eo es et eu fr ga gl hi hne
-hr is it ja km ku lt mai nb nds nl nn pa pl pt pt_BR ro ru se sk sv th tr uk vi
-zh_CN zh_TW"
-KDE_HANDBOOK="optional"
-inherit kde4-base
-
-DESCRIPTION="KDE graphviz dot graph file viewer"
-HOMEPAGE="https://www.kde.org/applications/graphics/kgraphviewer/
-https://extragear.kde.org/apps/kgraphviewer/"
-SRC_URI="https://api.opensuse.org/public/source/home:milianw:kdeapps/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2 FDL-1.2"
-SLOT="4"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug"
-
-RDEPEND="
-	media-gfx/graphviz
-	sys-libs/zlib
-"
-DEPEND="${RDEPEND}
-	>=dev-libs/boost-1.38
-"
-
-PATCHES=( "${FILESDIR}/${P}-boost-1.50.patch" )
diff --git a/media-gfx/kgraphviewer/kgraphviewer-2.1.1_p20140331.ebuild b/media-gfx/kgraphviewer/kgraphviewer-2.1.1_p20140331.ebuild
deleted file mode 100644
index 5c11a06e1cbf..000000000000
--- a/media-gfx/kgraphviewer/kgraphviewer-2.1.1_p20140331.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-KDE_LINGUAS="ar be bg bs ca ca@valencia cs da de el en_GB eo es et eu fi fr ga
-gl hi hne hr hu is it ja km ku lt mai mr nb nds nl nn pa pl pt pt_BR ro ru se sk sv
-th tr ug uk vi zh_CN zh_TW"
-KDE_HANDBOOK="optional"
-inherit kde4-base
-
-DESCRIPTION="KDE graphviz dot graph file viewer"
-HOMEPAGE="https://www.kde.org/applications/graphics/kgraphviewer/
-https://extragear.kde.org/apps/kgraphviewer/"
-SRC_URI="https://dev.gentoo.org/~kensington/distfiles/${P}.tar.xz"
-
-LICENSE="GPL-2 FDL-1.2"
-SLOT="4"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug"
-
-RDEPEND="
-	>=media-gfx/graphviz-2.30
-"
-DEPEND="${RDEPEND}
-	>=dev-libs/boost-1.38
-"
diff --git a/media-gfx/kgraphviewer/metadata.xml b/media-gfx/kgraphviewer/metadata.xml
index 8d1e86a9cefb..a23f444b67d6 100644
--- a/media-gfx/kgraphviewer/metadata.xml
+++ b/media-gfx/kgraphviewer/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>kde</herd>
+	<herd>kde</herd>
 </pkgmetadata>
diff --git a/media-gfx/librecad/Manifest b/media-gfx/librecad/Manifest
index e1de478d536b..b31d576e710c 100644
--- a/media-gfx/librecad/Manifest
+++ b/media-gfx/librecad/Manifest
@@ -1,3 +1,4 @@
 DIST librecad-2.0.5.zip 16743868 SHA256 00fba891ccf90328f122c081e9a55f5cf6a908932b92b4414f4ee3b186b48f87 SHA512 afacc5dd833d8a9daba0e9a93f9578f066ada6dff3de4676d8604bbfbce6fba5615c75f498b9ee242b3a7bfcb2746b97a3fbd6b97526990b4ad39757344e3cc5 WHIRLPOOL 5b79ebecec469083a5b13b3e71b76fd116baf935d09c04e979efd583ec58fd17a3bef9e707b3603bba3256527a845f9be4a10271daeaec3fee09ce7fe82fca36
 DIST librecad-2.0.6.zip 17401781 SHA256 09a58f9a4b578eb7381f299414344f82c6e320156c20b3ff1e9e1ae5f2770a30 SHA512 0f8452674659adc943d87aa3d70763682b3e5e7c82530afee98d50dfa4977e8f2e0efcd224087eed68a51727a234d58b8740b00ed0941b6af78dc2938ed15241 WHIRLPOOL 6bb40ae33f28b5ad6adfc91334741d3fe50c6a7f42b0e253554bfacd8f4e7152a495b9e62b8760f28de8c69c77aed73750e094db96d2757fad7cd58ed3200897
 DIST librecad-2.0.7.zip 17457197 SHA256 36d2fa1c60324bb743f0ddde0b9da1dc6b57a370422de714adef27a0cd32d9d2 SHA512 afbe094dd565e2b058c5b1c28e88b76b883d1b9f20f60047e5a7771ec5d353e6a3e73abee8e4d7ac5f916ead7fb15719cf7bab034d670f7d7f54ca394d314803 WHIRLPOOL 5d196be5e54e4ceb7f2650015f35bf6ba77440b7a81d51f68a9a15408d399779f5c61289a5adaacbf1538735f7f0761152371291bab8bc8c8fb8109c3e1ddfc3
+DIST librecad-2.0.8.zip 23469997 SHA256 3f3affbff85fd16746a0e551777c4f234d2b03384d04edf9483d36db1c7144a3 SHA512 d0dd1fdcaafbb7b83a8d0791e132633e9a72648d7d8d7ffdfc02bb092348472a05917df7ea1f2096404afabc92d586b75f6cafa3bc54da535bcaf005c96ed8a7 WHIRLPOOL 14ae2c433345b5081c92426913744d57f2fa4a97621fb55143995365381d5fbed6c8ad6a1f3a6d215dc4791e3493259b3e09801bfb288a85de7db87f010aae49
diff --git a/media-gfx/librecad/librecad-2.0.8.ebuild b/media-gfx/librecad/librecad-2.0.8.ebuild
new file mode 100644
index 000000000000..f2f38129f6bb
--- /dev/null
+++ b/media-gfx/librecad/librecad-2.0.8.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils qmake-utils
+
+DESCRIPTION="Generic 2D CAD program"
+HOMEPAGE="http://www.librecad.org/"
+SRC_URI="https://github.com/LibreCAD/LibreCAD/archive/${PV/_/}.zip -> ${P}.zip"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+IUSE="3d debug doc tools qt4 +qt5"
+REQUIRED_USE="|| ( qt4 qt5 )"
+
+DEPEND="
+	qt4? (
+		dev-qt/qtcore:4
+		dev-qt/qtgui:4
+		dev-qt/qtsvg:4
+		dev-qt/qthelp:4
+	)
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qthelp:5
+		dev-qt/qtprintsupport:5
+		dev-qt/qtsvg:5
+		dev-qt/qtwidgets:5
+		dev-qt/qtxml:5
+	)
+	dev-libs/boost
+	dev-cpp/muParser
+	media-libs/freetype"
+
+RDEPEND="${DEPEND}"
+S="${WORKDIR}/LibreCAD-${PV}"
+
+src_prepare() {
+	# currently RS_VECTOR3D causes an internal compiler error on GCC-4.8
+	use 3d || sed -i -e '/RS_VECTOR2D/ s/^#//' librecad/src/src.pro || die
+}
+
+src_configure() {
+	if use qt4
+	then
+		eqmake4 -r
+	else
+		eqmake5 -r
+	fi
+}
+
+src_install() {
+	dobin unix/librecad
+	use tools && dobin unix/ttf2lff
+	insinto /usr/share/${PN}
+	doins -r unix/resources/*
+	use doc && dohtml -r librecad/support/doc/*
+	insinto /usr/share/appdata
+	doins unix/appdata/librecad.appdata.xml
+	doicon librecad/res/main/"${PN}".png
+	make_desktop_entry ${PN} LibreCAD ${PN} Graphics
+}
diff --git a/media-gfx/librecad/librecad-9999.ebuild b/media-gfx/librecad/librecad-9999.ebuild
new file mode 100644
index 000000000000..0c9ba9ba0ee9
--- /dev/null
+++ b/media-gfx/librecad/librecad-9999.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils git-r3 qmake-utils
+
+DESCRIPTION="Generic 2D CAD program"
+HOMEPAGE="http://www.librecad.org/"
+SRC_URI=""
+EGIT_REPO_URI="https://github.com/LibreCAD/LibreCAD.git"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS=""
+IUSE="3d debug doc tools qt4 +qt5"
+REQUIRED_USE="|| ( qt4 qt5 )"
+
+DEPEND="
+	qt4? (
+		dev-qt/qtcore:4
+		dev-qt/qtgui:4
+		dev-qt/qtsvg:4
+		dev-qt/qthelp:4
+	)
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qthelp:5
+		dev-qt/qtprintsupport:5
+		dev-qt/qtsvg:5
+		dev-qt/qtwidgets:5
+		dev-qt/qtxml:5
+	)
+
+	dev-libs/boost
+	dev-cpp/muParser
+	media-libs/freetype"
+
+RDEPEND="${DEPEND}"
+S="${WORKDIR}/librecad-${PV}"
+
+src_prepare() {
+	# currently RS_VECTOR3D causes an internal compiler error on GCC-4.8
+	use 3d || sed -i -e '/RS_VECTOR2D/ s/^#//' librecad/src/src.pro || die
+}
+
+src_configure() {
+	if use qt4
+	then
+		eqmake4 -r
+	else
+		eqmake5 -r
+	fi
+}
+
+src_install() {
+	dobin unix/librecad
+	use tools && dobin unix/ttf2lff
+	insinto /usr/share
+	doins -r unix/appdata
+	insinto /usr/share/${PN}
+	doins -r unix/resources/*
+	use doc && dohtml -r librecad/support/doc/*
+	insinto /usr/share/appdata
+	doins unix/appdata/librecad.appdata.xml
+	doicon librecad/res/main/${PN}.png
+	make_desktop_entry ${PN} LibreCAD ${PN} Graphics
+}
diff --git a/media-gfx/librecad/metadata.xml b/media-gfx/librecad/metadata.xml
index ab2b883492bc..d34c73e9be18 100644
--- a/media-gfx/librecad/metadata.xml
+++ b/media-gfx/librecad/metadata.xml
@@ -5,7 +5,8 @@
     <email>slis@gentoo.org</email>
   </maintainer>
   <use>
-    <flag name="tools">Build additional tool programs</flag>
+    <flag name="3d">Require all 2D coordinates stored as 3D</flag>
+    <flag name="tools">Build additional tool programs: tff2lff</flag>
   </use>
   <upstream>
     <remote-id type="github">LibreCAD/LibreCAD</remote-id>
diff --git a/media-gfx/openmesh/openmesh-3.2.ebuild b/media-gfx/openmesh/openmesh-3.2.ebuild
index a743001de11f..1f2eefb4a2ce 100644
--- a/media-gfx/openmesh/openmesh-3.2.ebuild
+++ b/media-gfx/openmesh/openmesh-3.2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="http://openmesh.org/media/Releases/${MY_PV/-RC/RC}/${MY_PN}-${MY_PV}.ta
 
 LICENSE="LGPL-3-with-linking-exception"
 SLOT="0"
-KEYWORDS="~amd64 ia64 x86"
+KEYWORDS="amd64 ia64 x86"
 IUSE="qt4 qt5 static-libs"
 
 RDEPEND="
diff --git a/media-gfx/openscad/Manifest b/media-gfx/openscad/Manifest
index 335ddd5d9d97..4adfe12200e1 100644
--- a/media-gfx/openscad/Manifest
+++ b/media-gfx/openscad/Manifest
@@ -1,2 +1 @@
-DIST openscad-2013.06.src.tar.gz 4083085 SHA256 f277a8c3e6a548272f95279e50de6d4a6d73552775ab7a33c7f837c8e59173df SHA512 b0993c5a4517ebc13b88bc0167f9fc73d12a6a97938f0b6f6b1e5e436e1fb4704f6ff6a181c51f4cd0fb64c49493296d7172914ec5ae03c26a78da505a32edfc WHIRLPOOL 4a0366b0c6ae0aab91172af2c85a5ad785e5ad3526c3370350b813cda03fd3fb15d03a107e6d1f5e96c03fd6fbe9325f3b66c5c332d2bf0404bfde1eec8e48a1
-DIST openscad-2014.03.src.tar.gz 4417283 SHA256 865fdc637a3ceb0678d35e88995411d8e70e8a7937625d7ede147a1570a561c3 SHA512 32398f6d31109a77215972452740ac5612db34dc08613166f0c7e91ce117c0476c34a8282e9e1ba500bfbff56a60e81573605f2a7ca979b146686341c897e3f5 WHIRLPOOL 6caa2a74fb3f554b615f94576c481d9d309f74dc87a6d76e8d8d0b5577cc6b8a2b859f3ba044b191acf06228247988e43885d7344f76355f1c70264a5dc9c9e1
+DIST openscad-2015.03.src.tar.gz 12748351 SHA256 68ce08adc9e90c606ad948fe0f3405ce62b03b6bf34c45dd3dfc6b20c1846182 SHA512 dadabe86c4897e1e074f67d7a94fb4a3813dd4e89997ec9106b343a4d015b88aef17c91b7b6351ef4ae08ff1da6cbb7ae92fcf89c271746a665e3422d4a3fe23 WHIRLPOOL 83540fc42d2b57d06a49030894f407d9eb68bdeec67e1028cb0f0bbe51d7872eab15103c25290a4243457e3f570a296fcb8a51efac9f28caf7b6c2d71d22f8d3
diff --git a/media-gfx/openscad/openscad-2013.06.ebuild b/media-gfx/openscad/openscad-2013.06.ebuild
deleted file mode 100644
index d840086f47d6..000000000000
--- a/media-gfx/openscad/openscad-2013.06.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit qt4-r2
-
-DESCRIPTION="The Programmers Solid 3D CAD Modeller"
-HOMEPAGE="http://www.openscad.org/"
-SRC_URI="https://openscad.googlecode.com/files/${P}.src.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-CDEPEND="media-gfx/opencsg
-	sci-mathematics/cgal
-	dev-qt/qtcore:4
-	dev-qt/qtgui:4
-	dev-qt/qtopengl:4
-	dev-cpp/eigen:2
-	dev-libs/gmp
-	dev-libs/mpfr
-	dev-libs/boost:=
-	sys-libs/glibc
-"
-DEPEND="${CDEPEND} sys-devel/gcc"
-RDEPEND="${CDEPEND}"
-
-src_prepare() {
-	#Use our CFLAGS (specifically don't force x86)
-	sed -i "s/QMAKE_CXXFLAGS_RELEASE = .*//g" ${PN}.pro
-
-	sed -i "s/\/usr\/local/\/usr/g" ${PN}.pro
-}
diff --git a/media-gfx/openscad/openscad-2014.03.ebuild b/media-gfx/openscad/openscad-2014.03.ebuild
deleted file mode 100644
index edfdc55972db..000000000000
--- a/media-gfx/openscad/openscad-2014.03.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit qt4-r2
-
-DESCRIPTION="The Programmers Solid 3D CAD Modeller"
-HOMEPAGE="http://www.openscad.org/"
-SRC_URI="http://files.openscad.org/${P}.src.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-CDEPEND="media-gfx/opencsg
-	sci-mathematics/cgal
-	dev-qt/qtcore:4
-	dev-qt/qtgui:4
-	dev-qt/qtopengl:4
-	dev-cpp/eigen:3
-	dev-libs/gmp
-	dev-libs/mpfr
-	dev-libs/boost:=
-	sys-libs/glibc
-"
-DEPEND="${CDEPEND} sys-devel/gcc"
-RDEPEND="${CDEPEND}"
-
-src_prepare() {
-	#Use our CFLAGS (specifically don't force x86)
-	sed -i "s/QMAKE_CXXFLAGS_RELEASE = .*//g" ${PN}.pro
-
-	sed -i "s/\/usr\/local/\/usr/g" ${PN}.pro
-}
diff --git a/media-gfx/openscad/openscad-2015.03.ebuild b/media-gfx/openscad/openscad-2015.03.ebuild
new file mode 100644
index 000000000000..3248a7800708
--- /dev/null
+++ b/media-gfx/openscad/openscad-2015.03.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit qt4-r2
+
+DESCRIPTION="The Programmers Solid 3D CAD Modeller"
+HOMEPAGE="http://www.openscad.org/"
+SRC_URI="http://files.openscad.org/${P}.src.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+CDEPEND="media-gfx/opencsg
+	sci-mathematics/cgal
+	dev-qt/qtcore:4
+	dev-qt/qtgui:4
+	dev-qt/qtopengl:4
+	dev-cpp/eigen:3
+	dev-libs/gmp:0
+	dev-libs/mpfr:0
+	dev-libs/boost:=
+	x11-libs/qscintilla
+"
+DEPEND="${CDEPEND}"
+RDEPEND="${CDEPEND}"
+
+src_prepare() {
+	#Use our CFLAGS (specifically don't force x86)
+	sed -i "s/QMAKE_CXXFLAGS_RELEASE = .*//g" ${PN}.pro  || die
+
+	sed -i "s/\/usr\/local/\/usr/g" ${PN}.pro || die
+}
diff --git a/media-gfx/paint-mono/metadata.xml b/media-gfx/paint-mono/metadata.xml
index 069dd9168434..3e1ab24888e2 100644
--- a/media-gfx/paint-mono/metadata.xml
+++ b/media-gfx/paint-mono/metadata.xml
@@ -4,5 +4,6 @@
 	<herd>dotnet</herd>
 	<upstream>
 		<remote-id type="google-code">paint-mono</remote-id>
+		<remote-id type="github">shana/paint-mono</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/media-gfx/qiviewer/metadata.xml b/media-gfx/qiviewer/metadata.xml
index ca0e4aca4059..77264be218d8 100644
--- a/media-gfx/qiviewer/metadata.xml
+++ b/media-gfx/qiviewer/metadata.xml
@@ -6,7 +6,10 @@
 		<email>pinkbyte@gentoo.org</email>
 		<name>Sergey Popov</name>
 	</maintainer>
-<use>
-	<flag name="webp">Build support for WEBP image format</flag>
-</use>
+	<use>
+		<flag name="webp">Build support for WEBP image format</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">samkpo/qiviewer</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/media-gfx/raw-thumbnailer/metadata.xml b/media-gfx/raw-thumbnailer/metadata.xml
index 7e6529ba09e3..65b786ac033f 100644
--- a/media-gfx/raw-thumbnailer/metadata.xml
+++ b/media-gfx/raw-thumbnailer/metadata.xml
@@ -8,5 +8,6 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="google-code">raw-thumbnailer</remote-id>
+		<remote-id type="github">erlendd/raw-thumbnailer</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/media-gfx/simple-scan/Manifest b/media-gfx/simple-scan/Manifest
index bf99088cd581..b3b9baeaa582 100644
--- a/media-gfx/simple-scan/Manifest
+++ b/media-gfx/simple-scan/Manifest
@@ -1,3 +1,3 @@
 DIST simple-scan-3.14.3.tar.xz 483900 SHA256 bb26128b6cce329932209fceed1bf8c21f0847f543aa417946682d413640c01b SHA512 0985c759daef2f08df280b89faf7c3a1b304a4e5b380c68fda2dd36ab480406ecc4e5a9d68e09042f78450ca614726e1b6068ed45342edfe59636d378ccf6e37 WHIRLPOOL 0f4a023effcc0151cf5c2c43efca92b3d517ef6a44fb001f2a214eb66da2694443b0d8e7e8c403b15fc6257190a3d6f2bbd73e3cfc101816452b583005eec17e
-DIST simple-scan-3.16.0.tar.xz 487904 SHA256 8d137e024ea9090941c992040fee30949706bb9f1ca5f04915394605ad8da7d3 SHA512 f4d07fa262f665893825cf4f8a8778db87c51384a82f9151504a9ea9cea1106292ce9b0121b1ccfef315631388991ffa492d556d15a410ee253c5e5c46bcccdf WHIRLPOOL 9a510a02d31d48ad6e009dacaa49338a98f65c7cc255b15c1a321ff05982731edd7c28f08d510f117a0bbf512594039b88d54c79fb4259879b977de557617fb7
 DIST simple-scan-3.16.1.tar.xz 487764 SHA256 f0fdb236336ddaa82390bc4647aa8df0037e8efe87a45ae37e9cb9144c82ee9d SHA512 15be4a3263cc28e027bc1f868f7894a39faf8f622d2f98a24d84704fae34be8526754a9776a8ab87f63ce34ba53871d76bbb452ee4ac16db9cb9a9b9d8d011d5 WHIRLPOOL f61ee901c77f9f0a380dfa4264c53072cb750fdf3e558e12024bb9872001884cdcc319f5f64ae711e62827d8e34e2a9a38adbe08891dfd9b197df1f49def5367
+DIST simple-scan-3.16.2.tar.xz 487808 SHA256 1c6727591813e7fd44da932adbae226001ce3a7b8f1a162c9b19d1dc630d7402 SHA512 5f665698f7c7bad57a41bfbb388c6861839cc56d6d25dbd74ea563d64fab63b6fd798f2b957b46ae69177b7e15963ef8f17d26f2a071bf89b6f1e2b6e7f1a835 WHIRLPOOL 098d8f3b16d3bac85e12d3034902df84fa1e3b76a346277114d3f19b5f8fd5a80b84fc1e88b595035cdfa483bdac952128ab20fd16f0f68040455f8afffa74db
diff --git a/media-gfx/simple-scan/simple-scan-3.16.0.ebuild b/media-gfx/simple-scan/simple-scan-3.16.0.ebuild
deleted file mode 100644
index 223d1b3852cd..000000000000
--- a/media-gfx/simple-scan/simple-scan-3.16.0.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="no"
-
-inherit gnome2 versionator
-
-DESCRIPTION="Simple document scanning utility"
-HOMEPAGE="https://launchpad.net/simple-scan"
-
-MY_PV=$(get_version_component_range 1-2)
-SRC_URI="https://launchpad.net/${PN}/${MY_PV}/${PV}/+download/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-COMMON_DEPEND="
-	>=dev-libs/glib-2.32:2
-	>=media-gfx/sane-backends-1.0.20:=
-	>=sys-libs/zlib-1.2.3.1:=
-	virtual/jpeg:0=
-	virtual/libgudev:=
-	x11-libs/cairo:=
-	>=x11-libs/gtk+-3:3
-	|| (
-		>=x11-misc/colord-0.1.24:=[udev]
-		x11-misc/colord:=[scanner] )
-"
-RDEPEND="${COMMON_DEPEND}
-	x11-misc/xdg-utils
-	|| (
-		x11-themes/adwaita-icon-theme
-		x11-themes/gnome-icon-theme )
-"
-DEPEND="${COMMON_DEPEND}
-	app-text/yelp-tools
-	>=dev-util/intltool-0.35.0
-	virtual/pkgconfig
-"
-
-src_configure() {
-	DOCS="NEWS README.md"
-	gnome2_src_configure \
-		VALAC=$(type -P true)
-}
diff --git a/media-gfx/simple-scan/simple-scan-3.16.2.ebuild b/media-gfx/simple-scan/simple-scan-3.16.2.ebuild
new file mode 100644
index 000000000000..af5d03de20f9
--- /dev/null
+++ b/media-gfx/simple-scan/simple-scan-3.16.2.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+
+inherit gnome2 versionator
+
+DESCRIPTION="Simple document scanning utility"
+HOMEPAGE="https://launchpad.net/simple-scan"
+
+MY_PV=$(get_version_component_range 1-2)
+SRC_URI="https://launchpad.net/${PN}/${MY_PV}/${PV}/+download/${P}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~x86"
+IUSE=""
+
+COMMON_DEPEND="
+	>=dev-libs/glib-2.32:2
+	>=media-gfx/sane-backends-1.0.20:=
+	>=sys-libs/zlib-1.2.3.1:=
+	virtual/jpeg:0=
+	virtual/libgudev:=
+	x11-libs/cairo:=
+	>=x11-libs/gtk+-3:3
+	>=x11-misc/colord-0.1.24:=[udev]
+"
+RDEPEND="${COMMON_DEPEND}
+	x11-misc/xdg-utils
+	|| (
+		x11-themes/adwaita-icon-theme
+		x11-themes/gnome-icon-theme )
+"
+DEPEND="${COMMON_DEPEND}
+	app-text/yelp-tools
+	>=dev-util/intltool-0.35.0
+	virtual/pkgconfig
+"
+
+src_configure() {
+	DOCS="NEWS README.md"
+	gnome2_src_configure \
+		VALAC=$(type -P true)
+}
diff --git a/media-gfx/svg2rlg/svg2rlg-0.3.ebuild b/media-gfx/svg2rlg/svg2rlg-0.3.ebuild
index 764e61cacc41..e658f29e075e 100644
--- a/media-gfx/svg2rlg/svg2rlg-0.3.ebuild
+++ b/media-gfx/svg2rlg/svg2rlg-0.3.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ppc ~ppc64 x86"
+KEYWORDS="~alpha amd64 ~arm hppa ~ppc ~ppc64 x86"
 IUSE=""
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/media-libs/FusionSound/FusionSound-1.1.1-r1.ebuild b/media-libs/FusionSound/FusionSound-1.1.1-r1.ebuild
index 1d803eb3fe7e..e48342840e2e 100644
--- a/media-libs/FusionSound/FusionSound-1.1.1-r1.ebuild
+++ b/media-libs/FusionSound/FusionSound-1.1.1-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.directfb.org/downloads/Core/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 hppa ppc x86"
+KEYWORDS="alpha amd64 hppa ppc ppc64 x86"
 IUSE="alsa cddb ffmpeg mad oss timidity vorbis"
 
 RDEPEND=">=dev-libs/DirectFB-${PV}
diff --git a/media-libs/babl/babl-0.1.12.ebuild b/media-libs/babl/babl-0.1.12.ebuild
index 53917a0babba..931473ccccb5 100644
--- a/media-libs/babl/babl-0.1.12.ebuild
+++ b/media-libs/babl/babl-0.1.12.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == *9999* ]]; then
 	SRC_URI=""
 else
 	SRC_URI="http://ftp.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.bz2"
-	KEYWORDS="alpha ~amd64 arm hppa ia64 ~mips ppc ppc64 sparc ~x86 ~amd64-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+	KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="A dynamic, any to any, pixel format conversion library"
diff --git a/media-libs/clutter-gst/Manifest b/media-libs/clutter-gst/Manifest
index 3ea5f1cbc1d1..c1bc6e81100f 100644
--- a/media-libs/clutter-gst/Manifest
+++ b/media-libs/clutter-gst/Manifest
@@ -1,3 +1,3 @@
 DIST clutter-gst-2.0.16.tar.xz 357380 SHA256 a944f84186937021aba6329c23954f6015d33bf151ba8994e13c59cefd742039 SHA512 ace0eceb8f99ad78190f6ebb9caf45ccc5597fff2e4dfda4e3bf539e87f41d3d60f66637219244bd28fe32f374460e3456c8dc5d0c60ac057cc73f2f1d60c764 WHIRLPOOL dd60f5722381f8e7678cd9e47b191a1e80c313c138d3cd5cb0acb1131d13ca565dd4f9e8117eda7ed1c81ae0b0bb9cca44530403615f3545ba44c012c12b70eb
-DIST clutter-gst-3.0.6.tar.xz 391404 SHA256 d6d5493ae57cc175deee479304569c419d2bb90de3be124e6f3350ae7e73df76 SHA512 bf8a4b7ae1f7ae92a05230564cb6aac8dc3d17bd7d07067bdc9a2055ca976d5c74ae92f33d91aa2315234df77e7b779e1b9b755ca62145cda47c585693eb9448 WHIRLPOOL d96b2bb4d9e293aaf3a038fb06df9d8e320f4f9fc403f005a705371d5b316bf6a08bcec71869c4252daa4f6b0caa18c31dfbea38d4e0f62740116c02a0742208
+DIST clutter-gst-3.0.10.tar.xz 391424 SHA256 2dbdbc3292e92684bbdbf1694c61f6b781f5810e4d79a415dfdee2f7ee42148c SHA512 e1ab8e57bade63c076c1426ed3b87d20034ff8fb54146c754ec4b990ec6d2102c4d87a1b1c3c9def17abe6985e2a59e44253cae1053f64a779dc8ef71a2951e7 WHIRLPOOL 5f8fba3a49c268650cdfee6d0959202a19288042f09acebdc3457f138193fae27fd0074a478032d8773446e05df3f0214e2038ea77feb90a6ea6046d7e361c86
 DIST clutter-gst-3.0.8.tar.xz 390628 SHA256 582e85b88482e16f7ec719363e38fadf84fab4d4baaa21e5227a454b824f135c SHA512 37960b676d440f879fbda8b14b0d3d6974527354abc1368fa2353793eff2ef4c6b4f50b6259b0016b22ae787d022c371aa512ad4441f6217e54ee35089be8b3a WHIRLPOOL 485d00ba7fcea8c7f92aaf7c56aaaa4e022c790b6941ec317314195b2f64766ded8a7acc1673951d871e1523ccccb4fe9761b50a432eeaaf25afffb2d7abf8a8
diff --git a/media-libs/clutter-gst/clutter-gst-3.0.10.ebuild b/media-libs/clutter-gst/clutter-gst-3.0.10.ebuild
new file mode 100644
index 000000000000..b0d58d25c018
--- /dev/null
+++ b/media-libs/clutter-gst/clutter-gst-3.0.10.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="yes"
+GNOME2_LA_PUNT="yes"
+PYTHON_COMPAT=( python2_7 )
+
+inherit gnome2 python-any-r1
+
+HOMEPAGE="http://www.clutter-project.org/"
+DESCRIPTION="GStreamer integration library for Clutter"
+
+LICENSE="LGPL-2.1+"
+SLOT="3.0"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="examples +introspection"
+
+# >=cogl-1.18 provides cogl-2.0-experimental
+# FIXME:
+# - udev is automagic
+# - provide a USE flag for HW decode support (--enable-gl-texture-upload)
+COMMON_DEPEND="
+	>=dev-libs/glib-2.20:2
+	>=media-libs/clutter-1.20:1.0=[introspection?]
+	>=media-libs/cogl-1.18:1.0=[introspection?]
+	>=media-libs/gstreamer-1.4:1.0[introspection?]
+	>=media-libs/gst-plugins-bad-1.4:1.0
+	>=media-libs/gst-plugins-base-1.4:1.0[introspection?]
+	virtual/libgudev
+	introspection? ( >=dev-libs/gobject-introspection-0.6.8:= )
+"
+# uses goom from gst-plugins-good
+RDEPEND="${COMMON_DEPEND}
+	>=media-libs/gst-plugins-good-1.4:1.0
+"
+DEPEND="${COMMON_DEPEND}
+	${PYTHON_DEPS}
+	>=dev-util/gtk-doc-am-1.11
+	virtual/pkgconfig
+"
+
+src_configure() {
+	gnome2_src_configure \
+		--disable-maintainer-flags \
+		$(use_enable introspection)
+}
+
+src_compile() {
+	# Clutter tries to access dri without userpriv, upstream bug #661873
+	# Massive failure of a hack, see bug 360219, bug 360073, bug 363917
+	unset DISPLAY
+	gnome2_src_compile
+}
+
+src_install() {
+	gnome2_src_install
+
+	if use examples; then
+		insinto /usr/share/doc/"${PF}"/examples
+		doins examples/{*.c,*.png,README}
+	fi
+}
diff --git a/media-libs/clutter-gst/clutter-gst-3.0.6.ebuild b/media-libs/clutter-gst/clutter-gst-3.0.6.ebuild
deleted file mode 100644
index 9d67d6d4dc7d..000000000000
--- a/media-libs/clutter-gst/clutter-gst-3.0.6.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="yes"
-GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python2_7 )
-
-inherit gnome2 python-any-r1
-
-HOMEPAGE="http://www.clutter-project.org/"
-DESCRIPTION="GStreamer integration library for Clutter"
-
-LICENSE="LGPL-2.1+"
-SLOT="3.0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="examples +introspection"
-
-# >=cogl-1.18 provides cogl-2.0-experimental
-# FIXME:
-# - udev is automagic
-# - provide a USE flag for HW decode support (--enable-gl-texture-upload)
-COMMON_DEPEND="
-	>=dev-libs/glib-2.20:2
-	>=media-libs/clutter-1.20:1.0=[introspection?]
-	>=media-libs/cogl-1.18:1.0=[introspection?]
-	>=media-libs/gstreamer-1.4:1.0[introspection?]
-	>=media-libs/gst-plugins-bad-1.4:1.0
-	>=media-libs/gst-plugins-base-1.4:1.0[introspection?]
-	virtual/libgudev
-	introspection? ( >=dev-libs/gobject-introspection-0.6.8 )
-"
-# uses goom from gst-plugins-good
-RDEPEND="${COMMON_DEPEND}
-	>=media-libs/gst-plugins-good-1.4:1.0
-"
-DEPEND="${COMMON_DEPEND}
-	${PYTHON_DEPS}
-	>=dev-util/gtk-doc-am-1.11
-	virtual/pkgconfig
-"
-
-src_configure() {
-	gnome2_src_configure \
-		--disable-maintainer-flags \
-		$(use_enable introspection)
-}
-
-src_compile() {
-	# Clutter tries to access dri without userpriv, upstream bug #661873
-	# Massive failure of a hack, see bug 360219, bug 360073, bug 363917
-	unset DISPLAY
-	gnome2_src_compile
-}
-
-src_install() {
-	gnome2_src_install
-
-	if use examples; then
-		insinto /usr/share/doc/"${PF}"/examples
-		doins examples/{*.c,*.png,README}
-	fi
-}
diff --git a/media-libs/clutter-gtk/clutter-gtk-1.6.2.ebuild b/media-libs/clutter-gtk/clutter-gtk-1.6.2.ebuild
index e57ee1d5c1de..28fc18921ba3 100644
--- a/media-libs/clutter-gtk/clutter-gtk-1.6.2.ebuild
+++ b/media-libs/clutter-gtk/clutter-gtk-1.6.2.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Clutter"
 LICENSE="LGPL-2.1+"
 
 SLOT="1.0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 IUSE="examples +introspection"
 
 RDEPEND="
diff --git a/media-libs/clutter/clutter-1.22.4.ebuild b/media-libs/clutter/clutter-1.22.4.ebuild
index 1af52388cb3c..a5c80f0982e9 100644
--- a/media-libs/clutter/clutter-1.22.4.ebuild
+++ b/media-libs/clutter/clutter-1.22.4.ebuild
@@ -18,7 +18,7 @@ REQUIRED_USE="
 	|| ( aqua wayland X )
 	wayland? ( egl )
 "
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 
 # NOTE: glx flavour uses libdrm + >=mesa-7.3
 # >=libX11-1.3.1 needed for X Generic Event support
diff --git a/media-libs/cogl/cogl-1.20.0.ebuild b/media-libs/cogl/cogl-1.20.0.ebuild
index 984b93dd5a8e..e4ebfc38d51a 100644
--- a/media-libs/cogl/cogl-1.20.0.ebuild
+++ b/media-libs/cogl/cogl-1.20.0.ebuild
@@ -17,7 +17,7 @@ SLOT="1.0/20" # subslot = .so version
 IUSE="examples gles2 gstreamer +introspection +kms +opengl +pango test wayland" # doc profile
 REQUIRED_USE="wayland? ( gles2 )
 	|| ( gles2 opengl )"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 
 COMMON_DEPEND="
 	>=dev-libs/glib-2.32:2
diff --git a/media-libs/game-music-emu/metadata.xml b/media-libs/game-music-emu/metadata.xml
index 1d206b9a1f24..09332b4694c7 100644
--- a/media-libs/game-music-emu/metadata.xml
+++ b/media-libs/game-music-emu/metadata.xml
@@ -4,5 +4,6 @@
 	<herd>sound</herd>
 	<upstream>
 		<remote-id type="google-code">game-music-emu</remote-id>
+		<remote-id type="bitbucket">mpyne/game-music-emu</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/media-libs/gegl/gegl-0.3.0.ebuild b/media-libs/gegl/gegl-0.3.0.ebuild
index 2b00923e3bbb..d501766e152e 100644
--- a/media-libs/gegl/gegl-0.3.0.ebuild
+++ b/media-libs/gegl/gegl-0.3.0.ebuild
@@ -18,7 +18,7 @@ if [[ ${PV} == *9999* ]]; then
 	SRC_URI=""
 else
 	SRC_URI="http://download.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.bz2"
-	KEYWORDS="alpha ~amd64 arm hppa ia64 ~mips ppc ppc64 sparc ~x86 ~amd64-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+	KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="A graph based image processing framework"
diff --git a/media-libs/grilo/grilo-0.2.12.ebuild b/media-libs/grilo/grilo-0.2.12.ebuild
index 796c66c18eb5..6a7ac00728a8 100644
--- a/media-libs/grilo/grilo-0.2.12.ebuild
+++ b/media-libs/grilo/grilo-0.2.12.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Grilo"
 
 LICENSE="LGPL-2.1+"
 SLOT="0.2/1" # subslot is libgrilo-0.2 soname suffix
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 
 IUSE="gtk examples +introspection +network playlist test vala"
 REQUIRED_USE="test? ( introspection )"
diff --git a/media-libs/gsound/gsound-1.0.1.ebuild b/media-libs/gsound/gsound-1.0.1.ebuild
index 391f0cc0caec..3be6412558ad 100644
--- a/media-libs/gsound/gsound-1.0.1.ebuild
+++ b/media-libs/gsound/gsound-1.0.1.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/GSound"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="+introspection"
 
 # vala setup required for vapigen check
diff --git a/media-libs/gstreamer-editing-services/gstreamer-editing-services-1.4.0.ebuild b/media-libs/gstreamer-editing-services/gstreamer-editing-services-1.4.0.ebuild
index efea46f2fec2..7f0a6e71638b 100644
--- a/media-libs/gstreamer-editing-services/gstreamer-editing-services-1.4.0.ebuild
+++ b/media-libs/gstreamer-editing-services/gstreamer-editing-services-1.4.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://gstreamer.freedesktop.org/src/${PN}/${P}.tar.xz"
 
 LICENSE="LGPL-2+"
 SLOT="1.0"
-KEYWORDS="amd64"
+KEYWORDS="amd64 ~x86"
 IUSE="+introspection"
 
 # FIXME: There is something odd with pygobject check for >=4.22,
diff --git a/media-libs/gupnp-dlna/gupnp-dlna-0.10.3.ebuild b/media-libs/gupnp-dlna/gupnp-dlna-0.10.3.ebuild
index d0d48960e042..3d164cfeead6 100644
--- a/media-libs/gupnp-dlna/gupnp-dlna-0.10.3.ebuild
+++ b/media-libs/gupnp-dlna/gupnp-dlna-0.10.3.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="http://gupnp.org/"
 
 LICENSE="LGPL-2"
 SLOT="2.0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="+introspection"
 
 RDEPEND="
diff --git a/media-libs/harfbuzz/harfbuzz-0.9.41.ebuild b/media-libs/harfbuzz/harfbuzz-0.9.41.ebuild
index 58e018663488..0c38fcabb1e9 100644
--- a/media-libs/harfbuzz/harfbuzz-0.9.41.ebuild
+++ b/media-libs/harfbuzz/harfbuzz-0.9.41.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="http://www.freedesktop.org/wiki/Software/HarfBuzz"
 LICENSE="Old-MIT ISC icu"
 SLOT="0/0.9.18" # 0.9.18 introduced the harfbuzz-icu split; bug #472416
 [[ ${PV} == 9999 ]] || \
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris"
 
 IUSE="+cairo fontconfig +glib +graphite icu +introspection static-libs test +truetype"
 REQUIRED_USE="introspection? ( glib )"
diff --git a/media-libs/iulib/metadata.xml b/media-libs/iulib/metadata.xml
index 0213a52c37fe..da2a1b940f55 100644
--- a/media-libs/iulib/metadata.xml
+++ b/media-libs/iulib/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
+	<maintainer>
+		<email>maintainer-needed@gentoo.org</email>
+	</maintainer>
 	<upstream>
 		<remote-id type="google-code">iulib</remote-id>
+		<remote-id type="github">tmbdev/iulib</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/media-libs/libass/libass-0.12.3.ebuild b/media-libs/libass/libass-0.12.3.ebuild
index baf99952a753..3cbdc332b5ab 100644
--- a/media-libs/libass/libass-0.12.3.ebuild
+++ b/media-libs/libass/libass-0.12.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/libass/libass/releases/download/${PV}/${P}.tar.xz"
 
 LICENSE="ISC"
 SLOT="0/5" # subslot = libass soname version
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~mips ~ppc ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="+enca +fontconfig +harfbuzz static-libs"
 
 RDEPEND="fontconfig? ( >=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}] )
diff --git a/media-libs/libebur128/Manifest b/media-libs/libebur128/Manifest
index 74aba6353ef4..604420c796f5 100644
--- a/media-libs/libebur128/Manifest
+++ b/media-libs/libebur128/Manifest
@@ -1,2 +1,3 @@
 DIST ebu-loudness-test-setv03.zip 80837115 SHA256 c97e8e1f962ee0a97dca37d205418b3469dd0d1e2a627fa9f505f2f1c01f54ec SHA512 ffa60e3f17370a7436614269ce33b2e3c8ec84c2477f05bd42b436bbd07b7018ae9ef935c9fd75ccff731bdf24b8231397ccc95fd003cdf6e04578ee62a663d5 WHIRLPOOL d4d128c90759c6462c1d76183960d46eae8f434a47059c1e448d8550e9ba04daef3452d9a7bd2b38f1a85ac5551ae2983bd5fa6bcd66f7df6a88dcbc38bf3bd3
 DIST libebur128-1.0.2.tar.gz 29794 SHA256 9b334d31a26b47ba6740bb7bbee7a24461d535f426b1ed42368c187e27c08323 SHA512 10f0248db9ebae48c0b3a62f5bab668d77bf10cd004267593b0cec1c5fcd5b1223fff2ae82d6753db7329210a0d7feb5a65a1c030e92607805d05c1b9885416a WHIRLPOOL 4656d8e05d98d2a1b8d286602b2671d2016ec0b8e35f66689d97ad700c61fcb1234e85308ab00f01a6ac51d741232054b251da04594f646138eb5d0103564585
+DIST libebur128-1.0.3.tar.gz 19804 SHA256 dd90d0e44bd4db1e038d990b4538a7317b2f44f29eaf2e206c247663234d9d52 SHA512 586ae80c31b9ef1d315821cef6901edd3f3d5309299411e969cce18cdc1911639971ad249b3b49edae9195b428557dbfa3281a5dc22da20a245e66c497eb0422 WHIRLPOOL c5d62232ed6bc05bf909a809fc38c15d79d1278ecc708ca94d4b41e37d38985d50764eeff9a6c5a4582baf3963864d512ba90d6b7a90c363b3bb334ebb860fda
diff --git a/media-libs/libebur128/files/libebur128-1.0.3_fix-tests.patch b/media-libs/libebur128/files/libebur128-1.0.3_fix-tests.patch
new file mode 100644
index 000000000000..34a49cbea35e
--- /dev/null
+++ b/media-libs/libebur128/files/libebur128-1.0.3_fix-tests.patch
@@ -0,0 +1,23 @@
+From d5a443afaf8bb16188d4069891c63ceab67bdb80 Mon Sep 17 00:00:00 2001
+From: Diogo Pereira <sir.suriv@gmail.com>
+Date: Mon, 7 Sep 2015 18:46:20 +0100
+Subject: [PATCH] Fix tests build
+
+---
+ test/CMakeLists.txt | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
+index 28716f0..9bc67d4 100644
+--- a/test/CMakeLists.txt
++++ b/test/CMakeLists.txt
+@@ -3,7 +3,8 @@ cmake_minimum_required(VERSION 2.8.9)
+ set(ENABLE_TESTS OFF CACHE BOOL "Build test binaries, needs libsndfile")
+ 
+ if(ENABLE_TESTS)
+-  find_pkg_config(SNDFILE sndfile REQUIRED)
++  find_package(PkgConfig REQUIRED)
++  pkg_check_modules(SNDFILE REQUIRED sndfile)
+ 
+   include_directories(${EBUR128_INCLUDE_DIR})
+   include_directories(SYSTEM ${SNDFILE_INCLUDE_DIRS})
diff --git a/media-libs/libebur128/libebur128-1.0.3.ebuild b/media-libs/libebur128/libebur128-1.0.3.ebuild
new file mode 100644
index 000000000000..5e02b137ce5a
--- /dev/null
+++ b/media-libs/libebur128/libebur128-1.0.3.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit cmake-multilib
+
+DESCRIPTION="A library implementing the EBU R128 loudness standard"
+HOMEPAGE="https://github.com/jiixyj/libebur128"
+SRC_URI="https://github.com/jiixyj/libebur128/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	test? ( https://tech.ebu.ch/files/live/sites/tech/files/shared/testmaterial/ebu-loudness-test-setv03.zip )"
+
+LICENSE="MIT"
+SLOT="0/1"
+KEYWORDS="~amd64"
+IUSE="+speex static-libs test"
+
+RDEPEND="speex? ( media-libs/speex[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}
+	test? ( media-libs/libsndfile[${MULTILIB_USEDEP}]
+		app-arch/unzip )"
+
+# Fix tests build. Merged upstream (#39).
+PATCHES=( "${FILESDIR}/${P}_fix-tests.patch" )
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_disable speex SPEEXDSP)
+		$(cmake-utils_use_build static-libs STATIC_LIBS)
+		$(cmake-utils_use_enable test TESTS)
+	)
+	cmake-utils_src_configure
+}
+
+multilib_src_test() {
+	cd "${WORKDIR}"
+	"${BUILD_DIR}"/r128-test-library | tee test-results
+	grep -c "^FAILED" test-results > /dev/null \
+		&& die "At least one test failed"
+}
diff --git a/media-libs/libebur128/metadata.xml b/media-libs/libebur128/metadata.xml
index c586b3264aa7..65ce2e8898c4 100644
--- a/media-libs/libebur128/metadata.xml
+++ b/media-libs/libebur128/metadata.xml
@@ -1,12 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>amynka@gentoo.org</email>
-	</maintainer>
-	<longdescription>
+<maintainer>
+	<email>amynka@gentoo.org</email>
+	<name>Amy Winston</name>
+</maintainer>
+<longdescription lang="en">
+	libebur128 is a library that implements the EBU R128 standard for loudness normalisation.
 </longdescription>
-	<upstream>
-		<remote-id type="github">jiixyj/libebur128</remote-id>
-	</upstream>
+<upstream>
+	<maintainer status="active">
+		<email>jan.kokemueller@gmail.com</email>
+		<name>Jan Kokemüller</name>
+	</maintainer>
+	<maintainer status="active">
+		<email>superjoe30@gmail.com</email>
+		<name>Andrew Kelley</name>
+	</maintainer>
+	<remote-id type="github">jiixyj/libebur128</remote-id>
+	<bugs-to>https://github.com/jiixyj/libebur128/issues</bugs-to>
+</upstream>
 </pkgmetadata>
diff --git a/media-libs/libgphoto2/Manifest b/media-libs/libgphoto2/Manifest
index 8b6d4d41290c..fed00e799983 100644
--- a/media-libs/libgphoto2/Manifest
+++ b/media-libs/libgphoto2/Manifest
@@ -1,2 +1,2 @@
-DIST libgphoto2-2.5.5.1.tar.bz2 6699687 SHA256 600e6bde24545eef4d2d8285af389a5ae738707becb018c78611b2d8a3054846 SHA512 a274bb553abed2f498b28388b2e2bc1810b4f57823744e7461248020818f1b79430198d81091aaa8ddc18a2a2acc5acf4fce5800e80da5e7ba534f0c094c749a WHIRLPOOL 8831627d38a0d53eecc8cbbd54595f7c0eff93a6b78ba40b1651b36d843c1bb973e8ce07ebeba0bffd3dafe4302abcd2512472b76c3225fedc1df4c827aa5190
 DIST libgphoto2-2.5.7.tar.bz2 6726164 SHA256 7260193277bdb4c319dd8f151224f87deac9fde64cbe5d2eb25d9c19e4d09894 SHA512 eaff704eb4ccfc6f7a2890c6583ece268005d91acbf8c5e192e2ac91e5a2f5f4f6c84b4dfc95773a6e6023fb12cb0e63d75eed8cd4f8a98019069ac6ab4e60f1 WHIRLPOOL 87a2fa5bbff780dce0131bcca90169bc4c273a42f4b99f2d614accba42284c1a6087ff4b1dbc6bdf139b88b95df6e4367404c873ac27b8388e594af2959dd563
+DIST libgphoto2-2.5.8.tar.bz2 6941251 SHA256 031a262e342fae43f724afe66787947ce1fb483277dfe5a8cf1fbe92c58e27b6 SHA512 142957ce3c80e8ac091005ba51b24fc0b199aa46f1a196cb0cfd71e0101d6020f4dd0ec2deb7209ef9ff7b946453b5fd9faf944047c07eb9962d8d52c876b1f4 WHIRLPOOL 0a214237cc646dcf3902e065eae862a4d9b8a9df533e39a5508e41dabd837060a135fac79edb28394ab4638e86513abdeee6ca940ca6fe744833c94432e336c1
diff --git a/media-libs/libgphoto2/libgphoto2-2.5.5.1-r1.ebuild b/media-libs/libgphoto2/libgphoto2-2.5.5.1-r1.ebuild
deleted file mode 100644
index 53046c3ce145..000000000000
--- a/media-libs/libgphoto2/libgphoto2-2.5.5.1-r1.ebuild
+++ /dev/null
@@ -1,233 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-# TODO
-# 1. Track upstream bug --disable-docs does not work.
-#	http://sourceforge.net/tracker/index.php?func=detail&aid=1643870&group_id=8874&atid=108874
-
-EAPI="5"
-
-inherit multilib multilib-minimal udev user
-
-DESCRIPTION="Library that implements support for numerous digital cameras"
-HOMEPAGE="http://www.gphoto.org/"
-SRC_URI="mirror://sourceforge/gphoto/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0/6" # libgphoto2.so soname version
-
-KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux"
-IUSE="doc examples exif gd jpeg nls serial zeroconf"
-
-# By default, drivers for all supported cameras will be compiled.
-# If you want to only compile for specific camera(s), set CAMERAS
-# environment to a space-separated list (no commas) of drivers that
-# you want to build.
-IUSE_CAMERAS="
-	adc65 agfa_cl20 aox ax203
-	barbie
-	canon casio_qv clicksmart310
-	digigr8 digita dimagev dimera3500 directory
-	enigma13
-	fuji
-	gsmart300
-	hp215
-	iclick
-	jamcam jd11 jl2005a jl2005c
-	kodak_dc120 kodak_dc210 kodak_dc240 kodak_dc3200 kodak_ez200 konica konica_qm150
-	largan lg_gsm
-	mars mustek
-	panasonic_coolshot panasonic_l859 panasonic_dc1000 panasonic_dc1580 pccam300 pccam600 pentax polaroid_pdc320 polaroid_pdc640 polaroid_pdc700 ptp2
-	ricoh ricoh_g3
-	samsung sierra sipix_blink2 sipix_web2 smal sonix sony_dscf1 sony_dscf55 soundvision spca50x sq905 st2205 stv0674 stv0680 sx330z
-	toshiba_pdrm11 topfield tp6801
-"
-
-for camera in ${IUSE_CAMERAS}; do
-	IUSE="${IUSE} cameras_${camera}"
-done
-
-# libgphoto2 actually links to libltdl, leave old libtool multilib dep there for now
-RDEPEND="
-	>=dev-libs/libxml2-2.9.1-r4:2[${MULTILIB_USEDEP}]
-	|| (
-		dev-libs/libltdl:0[${MULTILIB_USEDEP}]
-		>=sys-devel/libtool-2.4.2-r1[${MULTILIB_USEDEP}]
-	)
-	>=virtual/libusb-1-r1:1[${MULTILIB_USEDEP}]
-	cameras_ax203? ( >=media-libs/gd-2.0.35-r4:=[${MULTILIB_USEDEP}] )
-	cameras_st2205? ( >=media-libs/gd-2.0.35-r4:=[${MULTILIB_USEDEP}] )
-	exif? ( >=media-libs/libexif-0.6.21-r1:=[${MULTILIB_USEDEP}] )
-	gd? ( >=media-libs/gd-2.0.35-r4[jpeg=,${MULTILIB_USEDEP}] )
-	jpeg? ( >=virtual/jpeg-0-r2:0[${MULTILIB_USEDEP}] )
-	serial? ( >=dev-libs/lockdev-1.0.3.1.2-r2[${MULTILIB_USEDEP}] )
-	zeroconf? ( >=net-dns/avahi-0.6.31-r2[mdnsresponder-compat,${MULTILIB_USEDEP}] )
-	!<sys-fs/udev-175
-	abi_x86_32? (
-		!<=app-emulation/emul-linux-x86-medialibs-20140508
-		!app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)]
-	)"
-DEPEND="${RDEPEND}
-	dev-util/gtk-doc-am
-	sys-devel/flex
-	>=sys-devel/gettext-0.14.1
-	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
-	doc? ( app-doc/doxygen )
-"
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/gphoto2-port-config
-	/usr/bin/gphoto2-config
-)
-
-pkg_pretend() {
-	if ! echo "${USE}" | grep "cameras_" > /dev/null 2>&1; then
-		einfo "No camera drivers will be built since you did not specify any."
-	fi
-}
-
-pkg_setup() {
-	enewgroup plugdev
-}
-
-src_prepare() {
-	# Handle examples ourselves
-	sed 's/^\(SUBDIRS =.*\)examples\(.*\)$/\1\2/' -i Makefile.am Makefile.in \
-		|| die "examples sed failed"
-
-	# Fix pkgconfig file when USE="-exif"
-	# https://sourceforge.net/p/gphoto/bugs/980/
-	if ! use exif; then
-		sed -i "s/, @REQUIREMENTS_FOR_LIBEXIF@//" libgphoto2.pc.in || die " libgphoto2.pc sed failed"
-	fi
-
-	# If running eautoreconf
-	# sed -e 's/sleep 2//' -i m4m/gp-camlibs.m4 || die
-	sed -e 's/sleep 2//' -i configure || die
-}
-
-multilib_src_configure() {
-	local cameras
-	local cam
-	local cam_warn=no
-	for cam in ${IUSE_CAMERAS} ; do
-		if use "cameras_${cam}"; then
-			cameras="${cameras},${cam}"
-		else
-			cam_warn=yes
-		fi
-	done
-
-	if [ "${cam_warn}" = "yes" ]; then
-		[ -z "${cameras}" ] || cameras="${cameras:1}"
-		einfo "Enabled camera drivers: ${cameras:-none}"
-		ewarn "Upstream will not support you if you do not compile all camera drivers first"
-	else
-		cameras="all"
-		einfo "Enabled camera drivers: all"
-	fi
-
-	local myconf
-	use doc || myconf=( ac_cv_path_DOXYGEN=false )
-
-	# gd detection is broken: https://sourceforge.net/p/gphoto/bugs/982/
-	if use gd; then
-		export LIBGD_CFLAGS=" "
-		export LIBGD_LIBS="-lgd"
-	fi
-
-	# Upstream doesn't default to --enable-option-checking due having another
-	# configure in libgphoto2_port/ that also needs to be checked on every bump
-	#
-	# Serial port uses either lockdev or ttylock, but we don't have ttylock
-	ECONF_SOURCE=${S} \
-	econf \
-		--disable-docs \
-		--disable-gp2ddb \
-		$(use_with zeroconf bonjour) \
-		$(use_enable nls) \
-		$(use_with exif libexif auto) \
-		$(use_with gd) \
-		$(use_with jpeg) \
-		$(use_enable serial) \
-		$(use_enable serial lockdev) \
-		--with-libusb=no \
-		--with-libusb-1.0=auto \
-		--disable-ttylock \
-		--with-camlibs=${cameras} \
-		--with-doc-dir="${EPREFIX}"/usr/share/doc/${PF} \
-		--with-html-dir="${EPREFIX}"/usr/share/doc/${PF}/html \
-		--with-hotplug-doc-dir="${EPREFIX}"/usr/share/doc/${PF}/hotplug \
-		--with-rpmbuild=$(type -P true) \
-		udevscriptdir="$(get_udevdir)" \
-		"${myconf[@]}"
-}
-
-multilib_src_compile() {
-	default
-
-	if multilib_is_native_abi && use doc; then
-		doxygen doc/Doxyfile || die "Documentation generation failed"
-	fi
-}
-
-multilib_src_install_all() {
-	# Empty dependency_libs in .la files, bug #386665
-	find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} +
-
-	# Remove recursive symlink
-	# https://sourceforge.net/p/gphoto/bugs/983/
-	rm "${ED}/usr/include/gphoto2/gphoto2" || die
-
-	# Clean up unwanted files
-	rm "${ED}/usr/share/doc/${PF}/"{ABOUT-NLS,COPYING} || die "rm failed"
-	dodoc ChangeLog NEWS* README* AUTHORS TESTERS MAINTAINERS HACKING
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins examples/README examples/*.c examples/*.h
-	fi
-
-	# FIXME: fixup autoconf bug
-	if ! use doc && [ -d "${ED}/usr/share/doc/${PF}/apidocs.html" ]; then
-		rm -fr "${ED}/usr/share/doc/${PF}/apidocs.html"
-	fi
-	# end fixup
-
-	local udev_rules cam_list
-	udev_rules="$(get_udevdir)/rules.d/70-libgphoto2.rules"
-	cam_list="/usr/$(get_libdir)/libgphoto2/print-camera-list"
-
-	if [ -x "${ED}"${cam_list} ]; then
-		# Let print-camera-list find libgphoto2.so
-		export LD_LIBRARY_PATH="${ED}/usr/$(get_libdir)"
-		# Let libgphoto2 find its camera-modules
-		export CAMLIBS="${ED}/usr/$(get_libdir)/libgphoto2/${PV}"
-
-		einfo "Generating UDEV-rules ..."
-		mkdir -p "${ED}"/${udev_rules%/*}
-		echo -e "# do not edit this file, it will be overwritten on update\n#" \
-			> "${ED}"/${udev_rules}
-		"${ED}"${cam_list} udev-rules version 175 group plugdev >> "${ED}"/${udev_rules} \
-			|| die "failed to create udev-rules"
-	else
-		eerror "Unable to find print-camera-list"
-		eerror "and therefore unable to generate hotplug usermap."
-		eerror "You will have to manually generate it by running:"
-		eerror " ${cam_list} udev-rules version 175 group plugdev > ${udev_rules}"
-	fi
-
-}
-
-pkg_postinst() {
-	if ! has_version "sys-auth/consolekit[acl]" && ! has_version "sys-apps/systemd[acl]" ; then
-		elog "Don't forget to add yourself to the plugdev group "
-		elog "if you want to be able to access your camera."
-	fi
-
-	local old_udev_rules="${EROOT}"etc/udev/rules.d/99-libgphoto2.rules
-	if [[ -f ${old_udev_rules} ]]; then
-		rm -f "${old_udev_rules}"
-	fi
-}
diff --git a/media-libs/libgphoto2/libgphoto2-2.5.8.ebuild b/media-libs/libgphoto2/libgphoto2-2.5.8.ebuild
new file mode 100644
index 000000000000..bb6baa2d9a52
--- /dev/null
+++ b/media-libs/libgphoto2/libgphoto2-2.5.8.ebuild
@@ -0,0 +1,214 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+# TODO
+# 1. Track upstream bug --disable-docs does not work.
+#	http://sourceforge.net/tracker/index.php?func=detail&aid=1643870&group_id=8874&atid=108874
+
+EAPI="5"
+
+inherit eutils multilib multilib-minimal udev user
+
+DESCRIPTION="Library that implements support for numerous digital cameras"
+HOMEPAGE="http://www.gphoto.org/"
+SRC_URI="mirror://sourceforge/gphoto/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+
+# FIXME: should we also bump for libgphoto2_port.so soname version?
+SLOT="0/6" # libgphoto2.so soname version
+
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux"
+IUSE="doc examples exif gd jpeg nls serial"
+
+# By default, drivers for all supported cameras will be compiled.
+# If you want to only compile for specific camera(s), set CAMERAS
+# environment to a space-separated list (no commas) of drivers that
+# you want to build.
+IUSE_CAMERAS="
+	adc65 agfa_cl20 aox ax203
+	barbie
+	canon casio_qv clicksmart310
+	digigr8 digita dimagev dimera3500 directory
+	enigma13
+	fuji
+	gsmart300
+	hp215
+	iclick
+	jamcam jd11 jl2005a jl2005c
+	kodak_dc120 kodak_dc210 kodak_dc240 kodak_dc3200 kodak_ez200 konica konica_qm150
+	largan lg_gsm
+	mars mustek
+	panasonic_coolshot panasonic_l859 panasonic_dc1000 panasonic_dc1580 pccam300 pccam600 pentax polaroid_pdc320 polaroid_pdc640 polaroid_pdc700 ptp2
+	ricoh ricoh_g3
+	samsung sierra sipix_blink2 sipix_web2 smal sonix sony_dscf1 sony_dscf55 soundvision spca50x sq905 st2205 stv0674 stv0680 sx330z
+	toshiba_pdrm11 topfield tp6801
+"
+
+for camera in ${IUSE_CAMERAS}; do
+	IUSE="${IUSE} cameras_${camera}"
+done
+
+# libgphoto2 actually links to libltdl
+RDEPEND="
+	>=dev-libs/libxml2-2.9.1-r4:2[${MULTILIB_USEDEP}]
+	dev-libs/libltdl:0[${MULTILIB_USEDEP}]
+	>=virtual/libusb-1-r1:1[${MULTILIB_USEDEP}]
+	cameras_ax203? ( >=media-libs/gd-2.0.35-r4:=[${MULTILIB_USEDEP}] )
+	cameras_st2205? ( >=media-libs/gd-2.0.35-r4:=[${MULTILIB_USEDEP}] )
+	exif? ( >=media-libs/libexif-0.6.21-r1:=[${MULTILIB_USEDEP}] )
+	gd? ( >=media-libs/gd-2.0.35-r4[jpeg=,${MULTILIB_USEDEP}] )
+	jpeg? ( >=virtual/jpeg-0-r2:0[${MULTILIB_USEDEP}] )
+	serial? ( >=dev-libs/lockdev-1.0.3.1.2-r2[${MULTILIB_USEDEP}] )
+	!<sys-fs/udev-175
+	abi_x86_32? (
+		!<=app-emulation/emul-linux-x86-medialibs-20140508
+		!app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)]
+	)
+"
+DEPEND="${RDEPEND}
+	dev-util/gtk-doc-am
+	sys-devel/flex
+	>=sys-devel/gettext-0.14.1
+	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
+	doc? ( app-doc/doxygen )
+"
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/gphoto2-port-config
+	/usr/bin/gphoto2-config
+)
+
+pkg_pretend() {
+	if ! echo "${USE}" | grep "cameras_" > /dev/null 2>&1; then
+		einfo "No camera drivers will be built since you did not specify any."
+	fi
+}
+
+pkg_setup() {
+	enewgroup plugdev
+}
+
+src_prepare() {
+	# Handle examples ourselves
+	sed 's/^\(SUBDIRS =.*\)examples\(.*\)$/\1\2/' -i Makefile.am Makefile.in \
+		|| die "examples sed failed"
+
+	# If running eautoreconf
+	# sed -e 's/sleep 2//' -i m4m/gp-camlibs.m4 || die
+	sed -e 's/sleep 2//' -i configure || die
+}
+
+multilib_src_configure() {
+	local cameras
+	local cam
+	local cam_warn=no
+	for cam in ${IUSE_CAMERAS} ; do
+		if use "cameras_${cam}"; then
+			cameras="${cameras},${cam}"
+		else
+			cam_warn=yes
+		fi
+	done
+
+	if [ "${cam_warn}" = "yes" ]; then
+		[ -z "${cameras}" ] || cameras="${cameras:1}"
+		einfo "Enabled camera drivers: ${cameras:-none}"
+		ewarn "Upstream will not support you if you do not compile all camera drivers first"
+	else
+		cameras="all"
+		einfo "Enabled camera drivers: all"
+	fi
+
+	local myconf
+	use doc || myconf=( ac_cv_path_DOXYGEN=false )
+
+	# Upstream doesn't default to --enable-option-checking due having another
+	# configure in libgphoto2_port/ that also needs to be checked on every bump
+	#
+	# Serial port uses either lockdev or ttylock, but we don't have ttylock
+	ECONF_SOURCE=${S} \
+	econf \
+		--disable-docs \
+		--disable-gp2ddb \
+		$(use_enable nls) \
+		$(use_with exif libexif auto) \
+		$(use_with gd) \
+		$(use_with jpeg) \
+		$(use_enable serial) \
+		$(use_enable serial lockdev) \
+		--with-libusb=no \
+		--with-libusb-1.0=auto \
+		--disable-ttylock \
+		--with-camlibs=${cameras} \
+		--with-doc-dir="${EPREFIX}"/usr/share/doc/${PF} \
+		--with-html-dir="${EPREFIX}"/usr/share/doc/${PF}/html \
+		--with-hotplug-doc-dir="${EPREFIX}"/usr/share/doc/${PF}/hotplug \
+		--with-rpmbuild=$(type -P true) \
+		udevscriptdir="$(get_udevdir)" \
+		"${myconf[@]}"
+}
+
+multilib_src_compile() {
+	default
+
+	if multilib_is_native_abi && use doc; then
+		doxygen doc/Doxyfile || die "Documentation generation failed"
+	fi
+}
+
+multilib_src_install_all() {
+	prune_libtool_files --modules
+
+	# Clean up unwanted files
+	rm "${ED}/usr/share/doc/${PF}/"{ABOUT-NLS,COPYING} || die "rm failed"
+	dodoc ChangeLog NEWS* README* AUTHORS TESTERS MAINTAINERS HACKING
+
+	if use examples; then
+		insinto /usr/share/doc/${PF}/examples
+		doins examples/README examples/*.c examples/*.h
+	fi
+
+	# FIXME: fixup autoconf bug #????
+	if ! use doc && [ -d "${ED}/usr/share/doc/${PF}/apidocs.html" ]; then
+		rm -fr "${ED}/usr/share/doc/${PF}/apidocs.html"
+	fi
+	# end fixup
+
+	local udev_rules cam_list
+	udev_rules="$(get_udevdir)/rules.d/70-libgphoto2.rules"
+	cam_list="/usr/$(get_libdir)/libgphoto2/print-camera-list"
+
+	if [ -x "${ED}"${cam_list} ]; then
+		# Let print-camera-list find libgphoto2.so
+		export LD_LIBRARY_PATH="${ED}/usr/$(get_libdir)"
+		# Let libgphoto2 find its camera-modules
+		export CAMLIBS="${ED}/usr/$(get_libdir)/libgphoto2/${PV}"
+
+		einfo "Generating UDEV-rules ..."
+		mkdir -p "${ED}"/${udev_rules%/*}
+		echo -e "# do not edit this file, it will be overwritten on update\n#" \
+			> "${ED}"/${udev_rules}
+		"${ED}"${cam_list} udev-rules version 175 group plugdev >> "${ED}"/${udev_rules} \
+			|| die "failed to create udev-rules"
+	else
+		eerror "Unable to find print-camera-list"
+		eerror "and therefore unable to generate hotplug usermap."
+		eerror "You will have to manually generate it by running:"
+		eerror " ${cam_list} udev-rules version 175 group plugdev > ${udev_rules}"
+	fi
+
+}
+
+pkg_postinst() {
+	if ! has_version "sys-auth/consolekit[acl]" && ! has_version "sys-apps/systemd[acl]" ; then
+		elog "Don't forget to add yourself to the plugdev group "
+		elog "if you want to be able to access your camera."
+	fi
+
+	local old_udev_rules="${EROOT}"etc/udev/rules.d/99-libgphoto2.rules
+	if [[ -f ${old_udev_rules} ]]; then
+		rm -f "${old_udev_rules}"
+	fi
+}
diff --git a/media-libs/libhdhomerun/Manifest b/media-libs/libhdhomerun/Manifest
index c8b91c47cae2..a3dd2025336a 100644
--- a/media-libs/libhdhomerun/Manifest
+++ b/media-libs/libhdhomerun/Manifest
@@ -1,3 +1,2 @@
-DIST libhdhomerun_20130117.tgz 41931 SHA256 80c8abb889b642339c6e30695ea1a0fcaaf48b76bdeaf3b29245297a42eb3141 SHA512 7065f6a0fd7bf67cc62e3b9462887594f7f9ad1617c13aa0f4d9fc7798600488a13179328fab9321be91f198873f961242064c3bb7b9567c63a8b0443d3c04c4 WHIRLPOOL 5fde51e79c6021fd8dc737415175f5ab89e95f23460d4b5e18dc5e2af04d8a7ac3c4ab06f82d27e46260843e13fd24dd2eec99f8711955a26259c4997ff528c5
-DIST libhdhomerun_20130328.tgz 41931 SHA256 66fdf3785f12bc4bcd4a9a6d322a1ad762bedff1a0888531b0ac5476491e4ed0 SHA512 3adbc34fd0aa8c045d491a85aa43f54e728de0b3959af6c675917fca46a66f2625511d879e8277060a5cefedccddc4e9352b2b6c1c70995352f4e6df4b6958cc WHIRLPOOL 0bd8dcbb0cbe64625967afb4592815bcede48fc953771d1e9d26ef380df9289121801e73e4c765dcd19b825c40ee4757b06eb42ad54f8cd39af29bb4664fd5c3
 DIST libhdhomerun_20140121.tgz 47685 SHA256 a86308e7145c0cecb226ee913e7ce44258ef24fcba979d1f32dcff89022f9809 SHA512 bf7bfed024980b4a58d860b28194c6f3a394071ba1e3e25b46b2a20709e5de51fbb61779d46c9f1f01efd1553abf0332b3711afeb21479576f7f40da7f22eca1 WHIRLPOOL f5972c72a5e5eb708d4ada2eb0d09a409370c595ccd9da1d2b0f400e35c4ff41b828dd853116fe6c4c1ca725894423844e14dcf91e5c01d79454179b68c31014
+DIST libhdhomerun_20150826.tgz 49169 SHA256 907dfbd1eb82aebd8b09e7c00c21a02433e6baaacf4a4f99aa2511b1d5244baf SHA512 9b401c1649dc8c32ea9019b732631f9213cb66c43771aa148fa318202fc11739c005c474be6a77a6a7807818b5179f77debb5b2d2411d865cc87bb3d7ab629a6 WHIRLPOOL b069b5839821d55c5efaf28afbe174de3f32132dd5e4cd8ef348cba05bcc2ea4e436eb418c3323beb6816d82e046b76ace4c2a75d05fa3f61a6b7af9b09e5a8b
diff --git a/media-libs/libhdhomerun/libhdhomerun-20130117.ebuild b/media-libs/libhdhomerun/libhdhomerun-20130117.ebuild
deleted file mode 100644
index adbfffdf772b..000000000000
--- a/media-libs/libhdhomerun/libhdhomerun-20130117.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils
-
-DESCRIPTION="SiliconDust HDHomeRun Utilties"
-HOMEPAGE="http://www.silicondust.com/support/hdhomerun/downloads/linux/"
-SRC_URI="http://download.silicondust.com/hdhomerun/${PN}_${PV}.tgz"
-
-LICENSE="LGPL-3+"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${PN}"
-
-src_prepare() {
-	epatch "${FILESDIR}/dont-strip.patch"
-}
-
-src_configure() {
-	:
-}
-
-src_install() {
-	dobin hdhomerun_config
-	dolib libhdhomerun.so
-
-	insinto /usr/include/hdhomerun
-	doins *.h
-}
diff --git a/media-libs/libhdhomerun/libhdhomerun-20130328.ebuild b/media-libs/libhdhomerun/libhdhomerun-20130328.ebuild
deleted file mode 100644
index 9ab38090625c..000000000000
--- a/media-libs/libhdhomerun/libhdhomerun-20130328.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils
-
-DESCRIPTION="SiliconDust HDHomeRun Utilties"
-HOMEPAGE="http://www.silicondust.com/support/hdhomerun/downloads/linux/"
-SRC_URI="http://download.silicondust.com/hdhomerun/${PN}_${PV}.tgz"
-
-LICENSE="LGPL-3+"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${PN}"
-
-src_prepare() {
-	epatch "${FILESDIR}/dont-strip.patch"
-}
-
-src_configure() {
-	:
-}
-
-src_install() {
-	dobin hdhomerun_config
-	dolib libhdhomerun.so
-
-	insinto /usr/include/hdhomerun
-	doins *.h
-}
diff --git a/media-libs/libhdhomerun/libhdhomerun-20150826.ebuild b/media-libs/libhdhomerun/libhdhomerun-20150826.ebuild
new file mode 100644
index 000000000000..5ed4f27f7daf
--- /dev/null
+++ b/media-libs/libhdhomerun/libhdhomerun-20150826.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils
+
+DESCRIPTION="SiliconDust HDHomeRun Utilties"
+HOMEPAGE="http://www.silicondust.com/support/hdhomerun/downloads/linux/"
+SRC_URI="http://download.silicondust.com/hdhomerun/${PN}_${PV}.tgz"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${PN}"
+
+src_prepare() {
+	epatch "${FILESDIR}/dont-strip.patch"
+}
+
+src_configure() {
+	:
+}
+
+src_install() {
+	dobin hdhomerun_config
+	dolib libhdhomerun.so
+
+	insinto /usr/include/hdhomerun
+	doins *.h
+}
diff --git a/media-libs/libmediaart/Manifest b/media-libs/libmediaart/Manifest
index 704e638996cd..b3b181e214e3 100644
--- a/media-libs/libmediaart/Manifest
+++ b/media-libs/libmediaart/Manifest
@@ -1,3 +1,2 @@
-DIST libmediaart-0.4.0.tar.xz 270220 SHA256 e8ec92a642f4df7f988364f6451adf89e1611d7379a636d8c7eff4ca21a0fd1c SHA512 7d3870b47f53a52597126a2f691b89eca9800bb82d7723601756fae57ba32b348b10135ffbabe1922de5dd4400fd41d69eac923d3df0de744a3a600c84dd46c7 WHIRLPOOL 59102f907d0702cd5ddc580b3d2878138bac82a5bfda4a3e30eee6ea8f2cfe36d2278a1158e586a11d9e72689429018229069632d5108168e0b902b2ccadf932
 DIST libmediaart-0.7.0.tar.xz 5811244 SHA256 3a9dffcad862aed7c0921579b93080d694b8a66f3676bfee8037867f653a1cd3 SHA512 94ca38ca2ec2bdd7f3a6f39c7f658053d8c46caba8bad97d004663da027c0308a305ce791b33af3d07e3fe8647a967b1ee1c6f808bbe1b4839844aa10cb0891a WHIRLPOOL 781237cff0511b937408f8f3cf72b336c32b84ec38f08d598e2eba56c89ce2b76deafb8705d41e5bc73f2f39833966dbd67f62bcb28e67108499d6d1bb72897b
 DIST libmediaart-1.9.0.tar.xz 5814844 SHA256 94668adb29d4dc3115b0fd105942ebd5ca6f5f9dbb2afa8a191a73a747dd506f SHA512 fcfdad1d62710a39ea21daf23b13eb0b6d64a521f359153bb79247bae8e91fde3d879f807ed2528f3476425f5214cae755b117b4d06d78ee3af41bcc9a3b3ab4 WHIRLPOOL a78cf905853873d5f778b7ae157b2b260a55e3b07ff59d93fa7f95efb53f2b2adb918bb1a5eecc8a66e6d59ee172e9dea04bbadca4bdc20766d710127b1fef79
diff --git a/media-libs/libmediaart/libmediaart-0.4.0.ebuild b/media-libs/libmediaart/libmediaart-0.4.0.ebuild
deleted file mode 100644
index 3000d0485b97..000000000000
--- a/media-libs/libmediaart/libmediaart-0.4.0.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="no"
-VALA_USE_DEPEND="vapigen"
-VALA_MIN_API_VERSION="0.16"
-
-inherit gnome2 vala virtualx
-
-DESCRIPTION="Manages, extracts and handles media art caches"
-HOMEPAGE="https://github.com/curlybeast/libmediaart"
-
-LICENSE="LGPL-2.1+"
-SLOT="1.0"
-KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sparc x86"
-IUSE="gtk +introspection qt4 qt5 vala"
-REQUIRED_USE="
-	?? ( gtk qt4 qt5 )
-	vala? ( introspection )
-"
-
-RDEPEND="
-	>=dev-libs/glib-2.35.1:2
-	gtk? ( >=x11-libs/gdk-pixbuf-2.12:2 )
-	introspection? ( >=dev-libs/gobject-introspection-1.30 )
-	qt4? ( dev-qt/qtgui:4 )
-	qt5? ( dev-qt/qtgui:5 )
-"
-DEPEND="${RDEPEND}
-	>=dev-util/gtk-doc-am-1.8
-	virtual/pkgconfig
-	vala? ( $(vala_depend) )
-"
-
-src_prepare() {
-	use vala && vala_src_prepare
-	gnome2_src_prepare
-}
-
-src_configure() {
-	local myconf=""
-	if use qt4 -o use qt5 ; then
-		myconf="${myconf} --enable-qt"
-	else
-		myconf="${myconf} --disable-qt"
-	fi
-
-	gnome2_src_configure \
-		--enable-unit-tests \
-		$(use_enable gtk gdkpixbuf) \
-		$(use_enable introspection) \
-		$(use_enable vala) \
-		${myconf}
-}
-
-src_test() {
-	dbus-launch Xemake check #513502
-}
diff --git a/media-libs/libmediaart/libmediaart-0.7.0.ebuild b/media-libs/libmediaart/libmediaart-0.7.0.ebuild
index 1cc7ae1e5c8f..54348670fa2f 100644
--- a/media-libs/libmediaart/libmediaart-0.7.0.ebuild
+++ b/media-libs/libmediaart/libmediaart-0.7.0.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://github.com/GNOME/libmediaart"
 
 LICENSE="LGPL-2.1+"
 SLOT="1.0"
-KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE="gtk +introspection qt4 qt5 vala"
 REQUIRED_USE="
 	?? ( gtk qt4 qt5 )
diff --git a/media-libs/libmediaart/libmediaart-1.9.0.ebuild b/media-libs/libmediaart/libmediaart-1.9.0.ebuild
index 3a6ffe2e4e4d..9a58e60bb9e2 100644
--- a/media-libs/libmediaart/libmediaart-1.9.0.ebuild
+++ b/media-libs/libmediaart/libmediaart-1.9.0.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://github.com/GNOME/libmediaart"
 
 LICENSE="LGPL-2.1+"
 SLOT="2.0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="gtk +introspection qt4 qt5 vala"
 REQUIRED_USE="
 	?? ( gtk qt4 qt5 )
diff --git a/media-libs/libraw/libraw-0.16.2.ebuild b/media-libs/libraw/libraw-0.16.2.ebuild
index 2258bb2804df..57c78d623243 100644
--- a/media-libs/libraw/libraw-0.16.2.ebuild
+++ b/media-libs/libraw/libraw-0.16.2.ebuild
@@ -23,7 +23,7 @@ SRC_URI="http://www.libraw.org/data/${MY_P}.tar.gz
 # http://www.libraw.org/data/LICENSE.LibRaw.pdf
 LICENSE="LGPL-2.1 CDDL GPL-2 GPL-3"
 SLOT="0/10" # subslot = libraw soname version
-KEYWORDS="~alpha ~amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="demosaic examples jpeg jpeg2k +lcms openmp"
 
 RDEPEND="jpeg? ( >=virtual/jpeg-0-r2:0[${MULTILIB_USEDEP}] )
diff --git a/media-libs/libsdl2/libsdl2-2.0.3-r200.ebuild b/media-libs/libsdl2/libsdl2-2.0.3-r200.ebuild
index 42b779d965aa..66786d235403 100644
--- a/media-libs/libsdl2/libsdl2-2.0.3-r200.ebuild
+++ b/media-libs/libsdl2/libsdl2-2.0.3-r200.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://www.libsdl.org/release/${MY_P}.tar.gz"
 
 LICENSE="ZLIB"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ppc64 x86"
+KEYWORDS="~alpha amd64 arm hppa ppc64 x86"
 
 IUSE="cpu_flags_x86_3dnow alsa altivec custom-cflags dbus fusionsound gles haptic +joystick cpu_flags_x86_mmx nas opengl oss pulseaudio +sound cpu_flags_x86_sse cpu_flags_x86_sse2 static-libs +threads tslib udev +video wayland X xinerama xscreensaver"
 REQUIRED_USE="
diff --git a/media-libs/libsoundio/Manifest b/media-libs/libsoundio/Manifest
new file mode 100644
index 000000000000..a0b6df83d050
--- /dev/null
+++ b/media-libs/libsoundio/Manifest
@@ -0,0 +1 @@
+DIST libsoundio-1.0.0.tar.gz 112139 SHA256 f05d87916266b6b32020c3e13b78ce9f3a758c43c8f8c8bbaf37578d99e1d3e2 SHA512 d0a0eda701d99ef658ee2858dbf4be2ec872d74bc1c9d05ed5484adcc17e774530c150fcd86cd1213a8dceb6373dfd3319a2c97c506ada0cdfe0f02551c0ddd0 WHIRLPOOL 1720e8eb64dc407a17dfbc9ccc8406184e0fa8c5bcc799553e5af181c9faebc0d0ba75fab0c8d9f6332fec6db1711ae9d6afe4be0e970fd5e9b526511b0a8965
diff --git a/media-libs/libsoundio/files/libsoundio-1.0.0_clang.patch b/media-libs/libsoundio/files/libsoundio-1.0.0_clang.patch
new file mode 100644
index 000000000000..9c417c0b63b1
--- /dev/null
+++ b/media-libs/libsoundio/files/libsoundio-1.0.0_clang.patch
@@ -0,0 +1,32 @@
+From 85c219067579e299f9faddd2c24836cf96cc245b Mon Sep 17 00:00:00 2001
+From: Andrew Kelley <superjoe30@gmail.com>
+Date: Thu, 3 Sep 2015 14:05:19 -0700
+Subject: [PATCH] build: fix build on linux with clang
+
+closes #8
+---
+ src/alsa.cpp | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/alsa.cpp b/src/alsa.cpp
+index 18ef1de..8e779a6 100644
+--- a/src/alsa.cpp
++++ b/src/alsa.cpp
+@@ -1016,7 +1016,7 @@ static int instream_wait_for_poll(SoundIoInStreamPrivate *is) {
+     }
+ }
+ 
+-void outstream_thread_run(void *arg) {
++static void outstream_thread_run(void *arg) {
+     SoundIoOutStreamPrivate *os = (SoundIoOutStreamPrivate *) arg;
+     SoundIoOutStream *outstream = &os->pub;
+     SoundIoOutStreamAlsa *osa = &os->backend_data.alsa;
+@@ -1367,7 +1367,7 @@ static int outstream_start_alsa(SoundIoPrivate *si, SoundIoOutStreamPrivate *os)
+     return 0;
+ }
+ 
+-int outstream_begin_write_alsa(SoundIoPrivate *si, SoundIoOutStreamPrivate *os,
++static int outstream_begin_write_alsa(SoundIoPrivate *si, SoundIoOutStreamPrivate *os,
+         struct SoundIoChannelArea **out_areas, int *frame_count)
+ {
+     *out_areas = nullptr;
diff --git a/media-libs/libsoundio/files/libsoundio-1.0.0_examples_tests.patch b/media-libs/libsoundio/files/libsoundio-1.0.0_examples_tests.patch
new file mode 100644
index 000000000000..aa322c1c7896
--- /dev/null
+++ b/media-libs/libsoundio/files/libsoundio-1.0.0_examples_tests.patch
@@ -0,0 +1,182 @@
+From a3dd080fda5a3581de0602b5887cda87dca2a915 Mon Sep 17 00:00:00 2001
+From: hasufell <hasufell@hasufell.de>
+Date: Sat, 5 Sep 2015 14:07:22 +0200
+Subject: [PATCH] Make building examples and tests optional
+
+---
+ CMakeLists.txt | 136 +++++++++++++++++++++++++++++++--------------------------
+ 1 file changed, 74 insertions(+), 62 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index c109af4..7fa8247 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -25,6 +25,8 @@ set(LIBSOUNDIO_VERSION "${LIBSOUNDIO_VERSION_MAJOR}.${LIBSOUNDIO_VERSION_MINOR}.
+ message("Configuring libsoundio version ${LIBSOUNDIO_VERSION}")
+ 
+ option(BUILD_STATIC_LIBS "Build static libraries" ON)
++option(BUILD_EXAMPLE_PROGRAMS "Build example programs" ON)
++option(BUILD_TESTS "Build tests" ON)
+ option(ENABLE_JACK "Enable JACK backend" ON)
+ option(ENABLE_PULSEAUDIO "Enable PulseAudio backend" ON)
+ option(ENABLE_ALSA "Enable ALSA backend" ON)
+@@ -254,80 +256,88 @@ install(FILES
+ 
+ # Example Programs
+ 
+-add_executable(sio_sine example/sio_sine.c)
+-set_target_properties(sio_sine PROPERTIES
+-    LINKER_LANGUAGE C
+-    COMPILE_FLAGS ${EXAMPLE_CFLAGS})
+-target_link_libraries(sio_sine libsoundio_shared)
+-install(TARGETS sio_sine DESTINATION ${CMAKE_INSTALL_BINDIR})
++if(BUILD_EXAMPLE_PROGRAMS)
++    add_executable(sio_sine example/sio_sine.c)
++    set_target_properties(sio_sine PROPERTIES
++        LINKER_LANGUAGE C
++        COMPILE_FLAGS ${EXAMPLE_CFLAGS})
++    target_link_libraries(sio_sine libsoundio_shared)
++    install(TARGETS sio_sine DESTINATION ${CMAKE_INSTALL_BINDIR})
+ 
+-add_executable(sio_list_devices example/sio_list_devices.c)
+-set_target_properties(sio_list_devices PROPERTIES
+-    LINKER_LANGUAGE C
+-    COMPILE_FLAGS ${EXAMPLE_CFLAGS})
+-target_link_libraries(sio_list_devices libsoundio_shared)
+-install(TARGETS sio_list_devices DESTINATION ${CMAKE_INSTALL_BINDIR})
++    add_executable(sio_list_devices example/sio_list_devices.c)
++    set_target_properties(sio_list_devices PROPERTIES
++        LINKER_LANGUAGE C
++        COMPILE_FLAGS ${EXAMPLE_CFLAGS})
++    target_link_libraries(sio_list_devices libsoundio_shared)
++    install(TARGETS sio_list_devices DESTINATION ${CMAKE_INSTALL_BINDIR})
+ 
+-add_executable(sio_microphone example/sio_microphone.c)
+-set_target_properties(sio_microphone PROPERTIES
+-    LINKER_LANGUAGE C
+-    COMPILE_FLAGS ${EXAMPLE_CFLAGS})
+-target_link_libraries(sio_microphone libsoundio_shared)
+-install(TARGETS sio_microphone DESTINATION ${CMAKE_INSTALL_BINDIR})
++    add_executable(sio_microphone example/sio_microphone.c)
++    set_target_properties(sio_microphone PROPERTIES
++        LINKER_LANGUAGE C
++        COMPILE_FLAGS ${EXAMPLE_CFLAGS})
++    target_link_libraries(sio_microphone libsoundio_shared)
++    install(TARGETS sio_microphone DESTINATION ${CMAKE_INSTALL_BINDIR})
+ 
+-add_executable(sio_record example/sio_record.c)
+-set_target_properties(sio_record PROPERTIES
+-    LINKER_LANGUAGE C
+-    COMPILE_FLAGS ${EXAMPLE_CFLAGS})
+-target_link_libraries(sio_record libsoundio_shared)
+-install(TARGETS sio_record DESTINATION ${CMAKE_INSTALL_BINDIR})
++    add_executable(sio_record example/sio_record.c)
++    set_target_properties(sio_record PROPERTIES
++        LINKER_LANGUAGE C
++        COMPILE_FLAGS ${EXAMPLE_CFLAGS})
++    target_link_libraries(sio_record libsoundio_shared)
++    install(TARGETS sio_record DESTINATION ${CMAKE_INSTALL_BINDIR})
++endif()
+ 
++if(BUILD_TESTS)
++    include_directories(
++        "${CMAKE_SOURCE_DIR}/test"
++    )
+ 
+-add_executable(unit_tests "${CMAKE_SOURCE_DIR}/test/unit_tests.cpp" ${LIBSOUNDIO_SOURCES})
+-target_link_libraries(unit_tests LINK_PUBLIC ${LIBSOUNDIO_LIBS})
+-set_target_properties(unit_tests PROPERTIES
+-    LINKER_LANGUAGE C
+-    COMPILE_FLAGS ${TEST_CFLAGS}
+-    LINK_FLAGS ${TEST_LDFLAGS}
+-)
++    add_executable(unit_tests "${CMAKE_SOURCE_DIR}/test/unit_tests.cpp" ${LIBSOUNDIO_SOURCES})
++    target_link_libraries(unit_tests LINK_PUBLIC ${LIBSOUNDIO_LIBS})
++    set_target_properties(unit_tests PROPERTIES
++        LINKER_LANGUAGE C
++        COMPILE_FLAGS ${TEST_CFLAGS}
++        LINK_FLAGS ${TEST_LDFLAGS}
++    )
+ 
+-add_executable(latency "${CMAKE_SOURCE_DIR}/test/latency.cpp" ${LIBSOUNDIO_SOURCES})
+-target_link_libraries(latency LINK_PUBLIC ${LIBSOUNDIO_LIBS})
+-set_target_properties(latency PROPERTIES
+-    LINKER_LANGUAGE C
+-    COMPILE_FLAGS ${LIB_CFLAGS}
+-)
++    add_executable(latency "${CMAKE_SOURCE_DIR}/test/latency.cpp" ${LIBSOUNDIO_SOURCES})
++    target_link_libraries(latency LINK_PUBLIC ${LIBSOUNDIO_LIBS})
++    set_target_properties(latency PROPERTIES
++        LINKER_LANGUAGE C
++        COMPILE_FLAGS ${LIB_CFLAGS}
++    )
+ 
+-add_executable(underflow test/underflow.c)
+-set_target_properties(underflow PROPERTIES
+-    LINKER_LANGUAGE C
+-    COMPILE_FLAGS ${EXAMPLE_CFLAGS})
+-target_link_libraries(underflow libsoundio_shared)
++    add_executable(underflow test/underflow.c)
++    set_target_properties(underflow PROPERTIES
++        LINKER_LANGUAGE C
++        COMPILE_FLAGS ${EXAMPLE_CFLAGS})
++    target_link_libraries(underflow libsoundio_shared)
+ 
+-add_executable(backend_disconnect_recover test/backend_disconnect_recover.c)
+-set_target_properties(backend_disconnect_recover PROPERTIES
+-    LINKER_LANGUAGE C
+-    COMPILE_FLAGS ${EXAMPLE_CFLAGS})
+-target_link_libraries(backend_disconnect_recover libsoundio_shared)
++    add_executable(backend_disconnect_recover test/backend_disconnect_recover.c)
++    set_target_properties(backend_disconnect_recover PROPERTIES
++        LINKER_LANGUAGE C
++        COMPILE_FLAGS ${EXAMPLE_CFLAGS})
++    target_link_libraries(backend_disconnect_recover libsoundio_shared)
+ 
+-add_executable(overflow test/overflow.c)
+-set_target_properties(overflow PROPERTIES
+-    LINKER_LANGUAGE C
+-    COMPILE_FLAGS ${EXAMPLE_CFLAGS})
+-target_link_libraries(overflow libsoundio_shared)
++    add_executable(overflow test/overflow.c)
++    set_target_properties(overflow PROPERTIES
++        LINKER_LANGUAGE C
++        COMPILE_FLAGS ${EXAMPLE_CFLAGS})
++    target_link_libraries(overflow libsoundio_shared)
+ 
+ 
+ 
+-add_custom_target(coverage
+-    DEPENDS unit_tests
+-    WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
+-    COMMAND lcov --directory . --zerocounters --rc lcov_branch_coverage=1
+-    COMMAND ./unit_tests
+-    COMMAND lcov --directory . --capture --output-file coverage.info --rc lcov_branch_coverage=1
+-    COMMAND lcov --remove coverage.info '/usr/*' --output-file coverage.info.cleaned --rc lcov_branch_coverage=1
+-    COMMAND genhtml -o coverage coverage.info.cleaned --rc lcov_branch_coverage=1
+-    COMMAND rm coverage.info coverage.info.cleaned
+-)
++    add_custom_target(coverage
++        DEPENDS unit_tests
++        WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
++        COMMAND lcov --directory . --zerocounters --rc lcov_branch_coverage=1
++        COMMAND ./unit_tests
++        COMMAND lcov --directory . --capture --output-file coverage.info --rc lcov_branch_coverage=1
++        COMMAND lcov --remove coverage.info '/usr/*' --output-file coverage.info.cleaned --rc lcov_branch_coverage=1
++        COMMAND genhtml -o coverage coverage.info.cleaned --rc lcov_branch_coverage=1
++        COMMAND rm coverage.info coverage.info.cleaned
++    )
++endif()
++
+ 
+ add_custom_target(doc
+     WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
+@@ -342,6 +352,8 @@ message("\n"
+     "* Install Directory            : ${CMAKE_INSTALL_PREFIX}\n"
+     "* Build Type                   : ${CMAKE_BUILD_TYPE}\n"
+     "* Build static libs            : ${BUILD_STATIC_LIBS}\n"
++    "* Build examples               : ${BUILD_EXAMPLE_PROGRAMS}\n"
++    "* Build tests                  : ${BUILD_TESTS}\n"
+ )
+ 
+ message(
diff --git a/media-libs/libsoundio/files/libsoundio-1.0.0_static-libs.patch b/media-libs/libsoundio/files/libsoundio-1.0.0_static-libs.patch
new file mode 100644
index 000000000000..4b0875c5a62f
--- /dev/null
+++ b/media-libs/libsoundio/files/libsoundio-1.0.0_static-libs.patch
@@ -0,0 +1,52 @@
+From 0a20aec2a14dcfbcbc741d2002985073094634d8 Mon Sep 17 00:00:00 2001
+From: Diogo Pereira <sir.suriv@gmail.com>
+Date: Fri, 4 Sep 2015 17:21:54 +0100
+Subject: [PATCH] Make building static libs optional
+
+---
+ CMakeLists.txt | 18 +++++++++++-------
+ 1 file changed, 11 insertions(+), 7 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 0e66834..c109af4 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -24,6 +24,7 @@ set(LIBSOUNDIO_VERSION_PATCH 0)
+ set(LIBSOUNDIO_VERSION "${LIBSOUNDIO_VERSION_MAJOR}.${LIBSOUNDIO_VERSION_MINOR}.${LIBSOUNDIO_VERSION_PATCH}")
+ message("Configuring libsoundio version ${LIBSOUNDIO_VERSION}")
+ 
++option(BUILD_STATIC_LIBS "Build static libraries" ON)
+ option(ENABLE_JACK "Enable JACK backend" ON)
+ option(ENABLE_PULSEAUDIO "Enable PulseAudio backend" ON)
+ option(ENABLE_ALSA "Enable ALSA backend" ON)
+@@ -237,13 +238,15 @@ target_link_libraries(libsoundio_shared LINK_PUBLIC ${LIBSOUNDIO_LIBS})
+ install(TARGETS libsoundio_shared DESTINATION ${CMAKE_INSTALL_LIBDIR})
+ 
+ 
+-add_library(libsoundio_static STATIC ${LIBSOUNDIO_SOURCES})
+-set_target_properties(libsoundio_static PROPERTIES
+-    OUTPUT_NAME soundio
+-    COMPILE_FLAGS ${LIB_CFLAGS}
+-    LINKER_LANGUAGE C
+-)
+-install(TARGETS libsoundio_static DESTINATION ${CMAKE_INSTALL_LIBDIR})
++if(BUILD_STATIC_LIBS)
++    add_library(libsoundio_static STATIC ${LIBSOUNDIO_SOURCES})
++    set_target_properties(libsoundio_static PROPERTIES
++        OUTPUT_NAME soundio
++        COMPILE_FLAGS ${LIB_CFLAGS}
++        LINKER_LANGUAGE C
++    )
++    install(TARGETS libsoundio_static DESTINATION ${CMAKE_INSTALL_LIBDIR})
++endif()
+ 
+ install(FILES
+     ${LIBSOUNDIO_HEADERS}
+@@ -338,6 +341,7 @@ message("\n"
+     "--------------------\n"
+     "* Install Directory            : ${CMAKE_INSTALL_PREFIX}\n"
+     "* Build Type                   : ${CMAKE_BUILD_TYPE}\n"
++    "* Build static libs            : ${BUILD_STATIC_LIBS}\n"
+ )
+ 
+ message(
diff --git a/media-libs/libsoundio/libsoundio-1.0.0.ebuild b/media-libs/libsoundio/libsoundio-1.0.0.ebuild
new file mode 100644
index 000000000000..e7fc38681a5f
--- /dev/null
+++ b/media-libs/libsoundio/libsoundio-1.0.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit cmake-multilib
+
+DESCRIPTION="C99 library providing cross-platform audio input and output."
+HOMEPAGE="http://libsound.io/"
+SRC_URI="http://libsound.io/release/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/1"
+KEYWORDS="~amd64"
+IUSE="alsa coreaudio examples pulseaudio static-libs"
+
+DEPEND="alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
+	pulseaudio? ( media-sound/pulseaudio[${MULTILIB_USEDEP}] )"
+RDEPEND="${DEPEND}"
+
+# All of these patches have been merged upstream (#8, #16, #20)
+PATCHES=( "${FILESDIR}/${P}_clang.patch"
+	"${FILESDIR}/${P}_static-libs.patch"
+	"${FILESDIR}/${P}_examples_tests.patch" )
+
+# ENABLE_JACK does not support the current version of jack1
+# See https://github.com/andrewrk/libsoundio/issues/11
+multilib_src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_enable alsa ALSA)
+		$(cmake-utils_use_enable coreaudio COREAUDIO)
+		-DENABLE_JACK=OFF
+		$(cmake-utils_use_enable pulseaudio PULSEAUDIO)
+		-DENABLE_WASAPI=OFF
+		$(cmake-utils_use static-libs BUILD_STATIC_LIBS)
+		-DBUILD_EXAMPLE_PROGRAMS=$(multilib_native_usex examples "ON" "OFF")
+		-DBUILD_TESTS=OFF
+	)
+	cmake-utils_src_configure
+}
diff --git a/media-libs/libsoundio/metadata.xml b/media-libs/libsoundio/metadata.xml
new file mode 100644
index 000000000000..c6026bf4e066
--- /dev/null
+++ b/media-libs/libsoundio/metadata.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>proxy-maintainers</herd>
+<maintainer>
+	<email>sir.suriv@gmail.com</email>
+	<name>Diogo Pereira</name>
+	<description>Proxy maintainer. Assign bugs to him.</description>
+</maintainer>
+<longdescription lang="en">
+	C99 library providing cross-platform audio input and output. The API is
+	suitable for real-time software such as digital audio workstations as
+	well as consumer software such as music players.
+</longdescription>
+<upstream>
+	<maintainer status="active">
+		<email>superjoe30@gmail.com</email>
+		<name>Andrew Kelley</name>
+	</maintainer>
+	<remote-id type="github">andrewrk/libsoundio</remote-id>
+	<bugs-to>https://github.com/andrewrk/libsoundio/issues</bugs-to>
+	<doc lang="en">http://libsound.io/doc/</doc>
+</upstream>
+</pkgmetadata>
diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest
index e268a176ea08..53849106ba42 100644
--- a/media-libs/mesa/Manifest
+++ b/media-libs/mesa/Manifest
@@ -4,6 +4,8 @@ DIST MesaLib-10.4.6.tar.bz2 7520024 SHA256 d8baedd20e79ccd98a5a7b05e23d59a30892e
 DIST MesaLib-7.10.3.tar.bz2 6056837 SHA256 1e701fc839b872677ddca9ed8784d754c9da1fbeda98173980e06aa7df0e85c0 SHA512 aa1f5f068b305fae5519e11cad2db9c6dc647d3122252bbcb210f13ac6ef1b667ae750344898bca7c5bfae94934db05eff915cb7417a59590e6d3ba230817aa8 WHIRLPOOL 5c2adda647936ed4163a4e4d5afad8344eb576712f9432f697aa0fc22ca17d7aaf0aeb6ad2d4e7e0825dc27cae570660332450778f8091e9b27aad2865c9b5fc
 DIST mesa-10.5.8.tar.xz 6993084 SHA256 2866b855c5299a4aed066338c77ff6467c389b2c30ada7647be8758663da2b54 SHA512 d7fc441b4cdad8a2905f03091af26ca7b01573bf4d0d928e950270981e4c6e7d20dba6aa97a60500b9a335a3c5cabc7f388a5338d43d391eed3f09dea60b77b2 WHIRLPOOL 68cc3d8490da9759b9d790053c70429be4c529c63b114f65f411112f76cd4daccc3490120a85a84d01cdcb989c0a0e58016b4d80f2238f2320b1caff797f3390
 DIST mesa-10.6.5.tar.xz 7037400 SHA256 fb6fac3c85bcfa9d06b8dd439169f23f0c0924a88e44362e738b99b1feff762f SHA512 46be6bd683d286bdf9ab8b4c1b1b32f89c95701b8c48cee49b060f5beaacea4540a69b99b4fde0f80acdd8e725552bef17dbd4251b9e977caeb5fd9d0ba56595 WHIRLPOOL dee48a0c680aae01cc39dc9157ea7c4c353b7ffdf543ab1cde8e76612a462ff3e3cb33433abff6d88f6800b71a02cd8cfcc23be98218d3cc4f85f424f3d12474
+DIST mesa-10.6.6.tar.xz 7040744 SHA256 570f2154b7340ff5db61ff103bc6e85165b8958798b78a50fa2df488e98e5778 SHA512 a251dc258ccf2fbeccbff3447a23c0f417722244322c8887fe4a50b0013d3da3705ffbfe412b61717d2c3370cb6a88bec51b91e1b77a5b987d6fbf0fdbfe4a5e WHIRLPOOL 6f441a5b19b496d14b659b1ba3b70d2ead685ab1eb7d77b77c24d69127bd69ce6453feed1e042840bdb6cf47f68caa61c73c07ec2259a697acc3393e42111be6
 DIST mesa-11.0.0-rc1.tar.xz 7250800 SHA256 4a61c15c5ba9bb2ed6c6d5d622363ac4149bd903966fa3c346ba6f06b05e0767 SHA512 203af66bf71a7a59d8bbcec9e6a8b3d75666361ffd8e74bc236e8378d628c1dcfeccde3830d56b344274e30ca920243a5fe6cc55d398856632644cac9add0af3 WHIRLPOOL c244003c071601dd997e18993b5ba27c6896c8332b18b0711c343de34e080643d53bfec54a09e62dbd409f0faadf70ba4ce3026e36017736f9a119d768b40baf
 DIST mesa-11.0.0-rc2.tar.xz 7251904 SHA256 e45008b21cc9919c5d4f7c83d69dd15a2f247f8a299be45a0370ed0d26304341 SHA512 781ff9db9be53713793c8e74cc8aed6bfa85db20d3f3684ed0c418c5f31e12379f0818d7b47ad6bdf46267de7ea0202b6df6030a22822cdd0563ae3b18475c4c WHIRLPOOL ea9611eee073dd6e4eab497a37d7ab3ff0f9137f2200f6c7b7bc654baf599af3c3d7af708e5227edb1f47f10dc063024c4db1d27b78e28ed75fd73f61a8ac876
+DIST mesa-11.0.0-rc3.tar.xz 7256736 SHA256 6188679020894140d923eff3c62485a1ee942a8c1c3a2fe617addfca607f916f SHA512 ae0563369d7f0508f4701cabe505701f81dcdbd4797dbc99aa24014bd29f7b7c6d84e7460ffe8d8a7d424b7e59fedae49aacc28e51a01939f0d07af105d57599 WHIRLPOOL 870e4361d15ebb19525f3b4a1e60be172b73ba0b9aa2b469e015f2c79b63c8a0afec2808de13d4fe699edad33f91e49ee896fc5efeeb90ce9ca1be999984c8e2
 DIST mesa-7.10.1-gentoo-patches-01.tar.bz2 5488 SHA256 31cd4f6d1a0a70249c40452919074856d120cd473a01a8457e3dc147a1b622d8 SHA512 c62b45b32e396e67f629003fc5242b7b4df054b8e20b5237489212bc4f0171534915a02fc9efa68965068121d10660b5cd92a419efabe33fd4596a97a39249c2 WHIRLPOOL 5f171959e3a31f5c38438b4806ce371bb8fdf1c7a87501865e4ed5d5ab284cda9568b7773005997d7a1cff151f95e64c027b36c0be48a4dd288a7ab8b5f69b97
diff --git a/media-libs/mesa/mesa-10.6.6.ebuild b/media-libs/mesa/mesa-10.6.6.ebuild
new file mode 100644
index 000000000000..4386f87e2577
--- /dev/null
+++ b/media-libs/mesa/mesa-10.6.6.ebuild
@@ -0,0 +1,463 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+EGIT_REPO_URI="git://anongit.freedesktop.org/mesa/mesa"
+
+if [[ ${PV} = 9999* ]]; then
+	GIT_ECLASS="git-r3"
+	EXPERIMENTAL="true"
+fi
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit autotools multilib-minimal python-any-r1 pax-utils ${GIT_ECLASS}
+
+OPENGL_DIR="xorg-x11"
+
+MY_P="${P/_/-}"
+FOLDER="${PV/_rc*/}"
+
+DESCRIPTION="OpenGL-like graphic library for Linux"
+HOMEPAGE="http://mesa3d.sourceforge.net/"
+
+if [[ $PV == 9999* ]]; then
+	SRC_URI=""
+else
+	SRC_URI="ftp://ftp.freedesktop.org/pub/mesa/${FOLDER}/${MY_P}.tar.xz"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~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"
+RESTRICT="!bindist? ( bindist )"
+
+INTEL_CARDS="i915 i965 ilo intel"
+RADEON_CARDS="r100 r200 r300 r600 radeon radeonsi"
+VIDEO_CARDS="${INTEL_CARDS} ${RADEON_CARDS} freedreno nouveau vmware"
+for card in ${VIDEO_CARDS}; do
+	IUSE_VIDEO_CARDS+=" video_cards_${card}"
+done
+
+IUSE="${IUSE_VIDEO_CARDS}
+	bindist +classic d3d9 debug +dri3 +egl +gallium +gbm gles1 gles2 +llvm
+	+nptl opencl osmesa pax_kernel openmax pic selinux +udev vaapi vdpau
+	wayland xvmc xa kernel_FreeBSD"
+
+REQUIRED_USE="
+	d3d9?   ( dri3 gallium )
+	llvm?   ( gallium )
+	opencl? ( gallium llvm )
+	openmax? ( gallium )
+	gles1?  ( egl )
+	gles2?  ( egl )
+	vaapi? ( gallium )
+	vdpau? ( gallium )
+	wayland? ( egl gbm )
+	xa?  ( gallium )
+	video_cards_freedreno?  ( gallium )
+	video_cards_intel?  ( classic )
+	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 llvm )
+	video_cards_r600?   ( gallium )
+	video_cards_radeonsi?   ( gallium llvm )
+	video_cards_vmware? ( gallium )
+	${PYTHON_REQUIRED_USE}
+"
+
+LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.60"
+# keep correct libdrm and dri2proto dep
+# keep blocks in rdepend for binpkg
+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-eselect/eselect-mesa )
+	gallium? ( app-eselect/eselect-mesa )
+	>=app-eselect/eselect-opengl-1.3.0
+	udev? ( kernel_linux? ( >=virtual/libudev-215:=[${MULTILIB_USEDEP}] ) )
+	>=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}]
+	gbm? ( >=virtual/libudev-215:=[${MULTILIB_USEDEP}] )
+	dri3? ( >=virtual/libudev-215:=[${MULTILIB_USEDEP}] )
+	>=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}]
+	>=x11-libs/libxshmfence-1.1:=[${MULTILIB_USEDEP}]
+	>=x11-libs/libXdamage-1.1.4-r1:=[${MULTILIB_USEDEP}]
+	>=x11-libs/libXext-1.3.2:=[${MULTILIB_USEDEP}]
+	>=x11-libs/libXxf86vm-1.1.3:=[${MULTILIB_USEDEP}]
+	>=x11-libs/libxcb-1.9.3:=[${MULTILIB_USEDEP}]
+	x11-libs/libXfixes:=[${MULTILIB_USEDEP}]
+	llvm? (
+		video_cards_radeonsi? ( || (
+			>=dev-libs/elfutils-0.155-r1:=[${MULTILIB_USEDEP}]
+			>=dev-libs/libelf-0.8.13-r2:=[${MULTILIB_USEDEP}]
+			) )
+		!video_cards_r600? (
+			video_cards_radeon? ( || (
+				>=dev-libs/elfutils-0.155-r1:=[${MULTILIB_USEDEP}]
+				>=dev-libs/libelf-0.8.13-r2:=[${MULTILIB_USEDEP}]
+				) )
+		)
+		>=sys-devel/llvm-3.4.2:=[${MULTILIB_USEDEP}]
+	)
+	opencl? (
+				app-eselect/eselect-opencl
+				dev-libs/libclc
+				|| (
+					>=dev-libs/elfutils-0.155-r1:=[${MULTILIB_USEDEP}]
+					>=dev-libs/libelf-0.8.13-r2:=[${MULTILIB_USEDEP}]
+				)
+			)
+	openmax? ( >=media-libs/libomxil-bellagio-0.9.3:=[${MULTILIB_USEDEP}] )
+	vaapi? ( >=x11-libs/libva-0.35.0:=[${MULTILIB_USEDEP}] )
+	vdpau? ( >=x11-libs/libvdpau-0.7:=[${MULTILIB_USEDEP}] )
+	wayland? ( >=dev-libs/wayland-1.2.0:=[${MULTILIB_USEDEP}] )
+	xvmc? ( >=x11-libs/libXvMC-1.0.8:=[${MULTILIB_USEDEP}] )
+	${LIBDRM_DEPSTRING}[video_cards_freedreno?,video_cards_nouveau?,video_cards_vmware?,${MULTILIB_USEDEP}]
+"
+for card in ${INTEL_CARDS}; do
+	RDEPEND="${RDEPEND}
+		video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
+	"
+done
+
+for card in ${RADEON_CARDS}; do
+	RDEPEND="${RDEPEND}
+		video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_radeon] )
+	"
+done
+
+DEPEND="${RDEPEND}
+	llvm? (
+		video_cards_radeonsi? ( sys-devel/llvm[video_cards_radeon] )
+	)
+	opencl? (
+				>=sys-devel/llvm-3.4.2:=[${MULTILIB_USEDEP}]
+				>=sys-devel/clang-3.4.2:=[${MULTILIB_USEDEP}]
+				>=sys-devel/gcc-4.6
+	)
+	sys-devel/gettext
+	virtual/pkgconfig
+	>=x11-proto/dri2proto-2.8-r1:=[${MULTILIB_USEDEP}]
+	dri3? (
+		>=x11-proto/dri3proto-1.0:=[${MULTILIB_USEDEP}]
+		>=x11-proto/presentproto-1.0:=[${MULTILIB_USEDEP}]
+	)
+	>=x11-proto/glproto-1.4.17-r1:=[${MULTILIB_USEDEP}]
+	>=x11-proto/xextproto-7.2.1-r1:=[${MULTILIB_USEDEP}]
+	>=x11-proto/xf86driproto-2.1.1-r1:=[${MULTILIB_USEDEP}]
+	>=x11-proto/xf86vidmodeproto-2.3.1-r1:=[${MULTILIB_USEDEP}]
+"
+[[ ${PV} == "9999" ]] && DEPEND+="
+	sys-devel/bison
+	sys-devel/flex
+	${PYTHON_DEPS}
+	$(python_gen_any_dep ">=dev-python/mako-0.7.3[\${PYTHON_USEDEP}]")
+"
+
+S="${WORKDIR}/${MY_P}"
+EGIT_CHECKOUT_DIR=${S}
+
+QA_WX_LOAD="
+x86? (
+	!pic? (
+		usr/lib*/libglapi.so.0.0.0
+		usr/lib*/libGLESv1_CM.so.1.1.0
+		usr/lib*/libGLESv2.so.2.0.0
+		usr/lib*/libGL.so.1.2.0
+		usr/lib*/libOSMesa.so.8.0.0
+	)
+)"
+
+pkg_setup() {
+	# warning message for bug 459306
+	if use llvm && has_version sys-devel/llvm[!debug=]; then
+		ewarn "Mismatch between debug USE flags in media-libs/mesa and sys-devel/llvm"
+		ewarn "detected! This can cause problems. For details, see bug 459306."
+	fi
+
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	# fix for hardened pax_kernel, bug 240956
+	[[ ${PV} != 9999* ]] && epatch "${FILESDIR}"/glx_ro_text_segm.patch
+
+	eautoreconf
+}
+
+multilib_src_configure() {
+	local myconf
+
+	if use classic; then
+		# Configurable DRI drivers
+		driver_enable swrast
+
+		# Intel code
+		driver_enable video_cards_i915 i915
+		driver_enable video_cards_i965 i965
+		if ! use video_cards_i915 && \
+			! use video_cards_i965; then
+			driver_enable video_cards_intel i915 i965
+		fi
+
+		# Nouveau code
+		driver_enable video_cards_nouveau nouveau
+
+		# ATI code
+		driver_enable video_cards_r100 radeon
+		driver_enable video_cards_r200 r200
+		if ! use video_cards_r100 && \
+				! use video_cards_r200; then
+			driver_enable video_cards_radeon radeon r200
+		fi
+	fi
+
+	if use egl; then
+		myconf+="--with-egl-platforms=x11$(use wayland && echo ",wayland")$(use gbm && echo ",drm") "
+	fi
+
+	if use gallium; then
+		myconf+="
+			$(use_enable d3d9 nine)
+			$(use_enable llvm gallium-llvm)
+			$(use_enable openmax omx)
+			$(use_enable vaapi va)
+			$(use_enable vdpau)
+			$(use_enable xa)
+			$(use_enable xvmc)
+		"
+		use vaapi && myconf+="--with-va-libdir=/usr/$(get_libdir)/va/drivers"
+
+		gallium_enable swrast
+		gallium_enable video_cards_vmware svga
+		gallium_enable video_cards_nouveau nouveau
+		gallium_enable video_cards_i915 i915
+		gallium_enable video_cards_ilo ilo
+		if ! use video_cards_i915 && \
+			! use video_cards_i965; then
+			gallium_enable video_cards_intel i915
+		fi
+
+		gallium_enable video_cards_r300 r300
+		gallium_enable video_cards_r600 r600
+		gallium_enable video_cards_radeonsi radeonsi
+		if ! use video_cards_r300 && \
+				! use video_cards_r600; then
+			gallium_enable video_cards_radeon r300 r600
+		fi
+
+		gallium_enable video_cards_freedreno freedreno
+		# opencl stuff
+		if use opencl; then
+			myconf+="
+				$(use_enable opencl)
+				--with-clang-libdir="${EPREFIX}/usr/lib"
+				"
+		fi
+	fi
+
+	# x86 hardened pax_kernel needs glx-rts, bug 240956
+	if use pax_kernel; then
+		myconf+="
+			$(use_enable x86 glx-rts)
+		"
+	fi
+
+	# on abi_x86_32 hardened we need to have asm disable
+	if [[ ${ABI} == x86* ]] && use pic; then
+		myconf+=" --disable-asm"
+	fi
+
+	# build fails with BSD indent, bug #428112
+	use userland_GNU || export INDENT=cat
+
+	ECONF_SOURCE="${S}" \
+	econf \
+		--enable-dri \
+		--enable-glx \
+		--enable-shared-glapi \
+		$(use_enable !bindist texture-float) \
+		$(use_enable d3d9 nine) \
+		$(use_enable debug) \
+		$(use_enable dri3) \
+		$(use_enable egl) \
+		$(use_enable gbm) \
+		$(use_enable gles1) \
+		$(use_enable gles2) \
+		$(use_enable nptl glx-tls) \
+		$(use_enable osmesa) \
+		$(use_enable !udev sysfs) \
+		--enable-llvm-shared-libs \
+		--with-dri-drivers=${DRI_DRIVERS} \
+		--with-gallium-drivers=${GALLIUM_DRIVERS} \
+		PYTHON2="${PYTHON}" \
+		${myconf}
+}
+
+multilib_src_install() {
+	emake install DESTDIR="${D}"
+
+	if use classic || use gallium; then
+			ebegin "Moving DRI/Gallium drivers for dynamic switching"
+			local gallium_drivers=( i915_dri.so i965_dri.so r300_dri.so r600_dri.so swrast_dri.so )
+			keepdir /usr/$(get_libdir)/dri
+			dodir /usr/$(get_libdir)/mesa
+			for x in ${gallium_drivers[@]}; do
+				if [ -f "$(get_libdir)/gallium/${x}" ]; then
+					mv -f "${ED}/usr/$(get_libdir)/dri/${x}" "${ED}/usr/$(get_libdir)/dri/${x/_dri.so/g_dri.so}" \
+						|| die "Failed to move ${x}"
+				fi
+			done
+			if use classic; then
+				emake -C "${BUILD_DIR}/src/mesa/drivers/dri" DESTDIR="${D}" install
+			fi
+			for x in "${ED}"/usr/$(get_libdir)/dri/*.so; do
+				if [ -f ${x} -o -L ${x} ]; then
+					mv -f "${x}" "${x/dri/mesa}" \
+						|| die "Failed to move ${x}"
+				fi
+			done
+			pushd "${ED}"/usr/$(get_libdir)/dri || die "pushd failed"
+			ln -s ../mesa/*.so . || die "Creating symlink failed"
+			# remove symlinks to drivers known to eselect
+			for x in ${gallium_drivers[@]}; do
+				if [ -f ${x} -o -L ${x} ]; then
+					rm "${x}" || die "Failed to remove ${x}"
+				fi
+			done
+			popd
+		eend $?
+	fi
+	if use opencl; then
+		ebegin "Moving Gallium/Clover OpenCL implementation for dynamic switching"
+		local cl_dir="/usr/$(get_libdir)/OpenCL/vendors/mesa"
+		dodir ${cl_dir}/{lib,include}
+		if [ -f "${ED}/usr/$(get_libdir)/libOpenCL.so" ]; then
+			mv -f "${ED}"/usr/$(get_libdir)/libOpenCL.so* \
+			"${ED}"${cl_dir}
+		fi
+		if [ -f "${ED}/usr/include/CL/opencl.h" ]; then
+			mv -f "${ED}"/usr/include/CL \
+			"${ED}"${cl_dir}/include
+		fi
+		eend $?
+	fi
+
+	if use openmax; then
+		echo "XDG_DATA_DIRS=\"${EPREFIX}/usr/share/mesa/xdg\"" > "${T}/99mesaxdgomx"
+		doenvd "${T}"/99mesaxdgomx
+		keepdir /usr/share/mesa/xdg
+	fi
+}
+
+multilib_src_install_all() {
+	prune_libtool_files --all
+	einstalldocs
+
+	if use !bindist; then
+		dodoc docs/patents.txt
+	fi
+
+	# Install config file for eselect mesa
+	insinto /usr/share/mesa
+	newins "${FILESDIR}/eselect-mesa.conf.9.2" eselect-mesa.conf
+}
+
+multilib_src_test() {
+	if use llvm; then
+		local llvm_tests='lp_test_arit lp_test_arit lp_test_blend lp_test_blend lp_test_conv lp_test_conv lp_test_format lp_test_format lp_test_printf lp_test_printf'
+		pushd src/gallium/drivers/llvmpipe >/dev/null || die
+		emake ${llvm_tests}
+		pax-mark m ${llvm_tests}
+		popd >/dev/null || die
+	fi
+	emake check
+}
+
+pkg_postinst() {
+	# Switch to the xorg implementation.
+	echo
+	eselect opengl set --use-old ${OPENGL_DIR}
+
+	# Select classic/gallium drivers
+	if use classic || use gallium; then
+		eselect mesa set --auto
+	fi
+
+	# Switch to mesa opencl
+	if use opencl; then
+		eselect opencl set --use-old ${PN}
+	fi
+
+	# run omxregister-bellagio to make the OpenMAX drivers known system-wide
+	if use openmax; then
+		ebegin "Registering OpenMAX drivers"
+		BELLAGIO_SEARCH_PATH="${EPREFIX}/usr/$(get_libdir)/libomxil-bellagio0" \
+			OMX_BELLAGIO_REGISTRY=${EPREFIX}/usr/share/mesa/xdg/.omxregister \
+			omxregister-bellagio
+		eend $?
+	fi
+
+	# warn about patent encumbered texture-float
+	if use !bindist; then
+		elog "USE=\"bindist\" was not set. Potentially patent encumbered code was"
+		elog "enabled. Please see patents.txt for an explanation."
+	fi
+
+	if ! has_version media-libs/libtxc_dxtn; then
+		elog "Note that in order to have full S3TC support, it is necessary to install"
+		elog "media-libs/libtxc_dxtn as well. This may be necessary to get nice"
+		elog "textures in some apps, and some others even require this to run."
+	fi
+}
+
+pkg_prerm() {
+	if use openmax; then
+		rm "${EPREFIX}"/usr/share/mesa/xdg/.omxregister
+	fi
+}
+
+# $1 - VIDEO_CARDS flag
+# other args - names of DRI drivers to enable
+# TODO: avoid code duplication for a more elegant implementation
+driver_enable() {
+	case $# in
+		# for enabling unconditionally
+		1)
+			DRI_DRIVERS+=",$1"
+			;;
+		*)
+			if use $1; then
+				shift
+				for i in $@; do
+					DRI_DRIVERS+=",${i}"
+				done
+			fi
+			;;
+	esac
+}
+
+gallium_enable() {
+	case $# in
+		# for enabling unconditionally
+		1)
+			GALLIUM_DRIVERS+=",$1"
+			;;
+		*)
+			if use $1; then
+				shift
+				for i in $@; do
+					GALLIUM_DRIVERS+=",${i}"
+				done
+			fi
+			;;
+	esac
+}
diff --git a/media-libs/mesa/mesa-11.0.0_rc3.ebuild b/media-libs/mesa/mesa-11.0.0_rc3.ebuild
new file mode 100644
index 000000000000..309e8824f24f
--- /dev/null
+++ b/media-libs/mesa/mesa-11.0.0_rc3.ebuild
@@ -0,0 +1,466 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+EGIT_REPO_URI="git://anongit.freedesktop.org/mesa/mesa"
+
+if [[ ${PV} = 9999* ]]; then
+	GIT_ECLASS="git-r3"
+	EXPERIMENTAL="true"
+fi
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit autotools multilib-minimal python-any-r1 pax-utils ${GIT_ECLASS}
+
+OPENGL_DIR="xorg-x11"
+
+MY_P="${P/_/-}"
+FOLDER="${PV/_rc*/}"
+
+DESCRIPTION="OpenGL-like graphic library for Linux"
+HOMEPAGE="http://mesa3d.sourceforge.net/"
+
+if [[ $PV == 9999* ]]; then
+	SRC_URI=""
+else
+	SRC_URI="ftp://ftp.freedesktop.org/pub/mesa/${FOLDER}/${MY_P}.tar.xz"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~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"
+RESTRICT="!bindist? ( bindist )"
+
+INTEL_CARDS="i915 i965 ilo intel"
+RADEON_CARDS="r100 r200 r300 r600 radeon radeonsi"
+VIDEO_CARDS="${INTEL_CARDS} ${RADEON_CARDS} freedreno nouveau vmware"
+for card in ${VIDEO_CARDS}; do
+	IUSE_VIDEO_CARDS+=" video_cards_${card}"
+done
+
+IUSE="${IUSE_VIDEO_CARDS}
+	bindist +classic d3d9 debug +dri3 +egl +gallium +gbm gles1 gles2 +llvm
+	+nptl opencl osmesa pax_kernel openmax pic selinux +udev vaapi vdpau
+	wayland xvmc xa kernel_FreeBSD"
+
+REQUIRED_USE="
+	d3d9?   ( dri3 gallium )
+	llvm?   ( gallium )
+	opencl? ( gallium llvm )
+	openmax? ( gallium )
+	gles1?  ( egl )
+	gles2?  ( egl )
+	vaapi? ( gallium )
+	vdpau? ( gallium )
+	wayland? ( egl gbm )
+	xa?  ( gallium )
+	video_cards_freedreno?  ( gallium )
+	video_cards_intel?  ( classic )
+	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 llvm )
+	video_cards_r600?   ( gallium )
+	video_cards_radeonsi?   ( gallium llvm )
+	video_cards_vmware? ( gallium )
+	${PYTHON_REQUIRED_USE}
+"
+
+LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.64"
+# keep correct libdrm and dri2proto dep
+# keep blocks in rdepend for binpkg
+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-eselect/eselect-mesa )
+	gallium? ( app-eselect/eselect-mesa )
+	>=app-eselect/eselect-opengl-1.3.0
+	udev? ( kernel_linux? ( >=virtual/libudev-215:=[${MULTILIB_USEDEP}] ) )
+	>=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}]
+	gbm? ( >=virtual/libudev-215:=[${MULTILIB_USEDEP}] )
+	dri3? ( >=virtual/libudev-215:=[${MULTILIB_USEDEP}] )
+	>=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}]
+	>=x11-libs/libxshmfence-1.1:=[${MULTILIB_USEDEP}]
+	>=x11-libs/libXdamage-1.1.4-r1:=[${MULTILIB_USEDEP}]
+	>=x11-libs/libXext-1.3.2:=[${MULTILIB_USEDEP}]
+	>=x11-libs/libXxf86vm-1.1.3:=[${MULTILIB_USEDEP}]
+	>=x11-libs/libxcb-1.9.3:=[${MULTILIB_USEDEP}]
+	x11-libs/libXfixes:=[${MULTILIB_USEDEP}]
+	llvm? (
+		video_cards_radeonsi? ( || (
+			>=dev-libs/elfutils-0.155-r1:=[${MULTILIB_USEDEP}]
+			>=dev-libs/libelf-0.8.13-r2:=[${MULTILIB_USEDEP}]
+			) )
+		!video_cards_r600? (
+			video_cards_radeon? ( || (
+				>=dev-libs/elfutils-0.155-r1:=[${MULTILIB_USEDEP}]
+				>=dev-libs/libelf-0.8.13-r2:=[${MULTILIB_USEDEP}]
+				) )
+		)
+		>=sys-devel/llvm-3.4.2:=[${MULTILIB_USEDEP}]
+	)
+	opencl? (
+				app-eselect/eselect-opencl
+				dev-libs/libclc
+				|| (
+					>=dev-libs/elfutils-0.155-r1:=[${MULTILIB_USEDEP}]
+					>=dev-libs/libelf-0.8.13-r2:=[${MULTILIB_USEDEP}]
+				)
+			)
+	openmax? ( >=media-libs/libomxil-bellagio-0.9.3:=[${MULTILIB_USEDEP}] )
+	vaapi? ( >=x11-libs/libva-0.35.0:=[${MULTILIB_USEDEP}] )
+	vdpau? ( >=x11-libs/libvdpau-1.1:=[${MULTILIB_USEDEP}] )
+	wayland? ( >=dev-libs/wayland-1.2.0:=[${MULTILIB_USEDEP}] )
+	xvmc? ( >=x11-libs/libXvMC-1.0.8:=[${MULTILIB_USEDEP}] )
+	${LIBDRM_DEPSTRING}[video_cards_freedreno?,video_cards_nouveau?,video_cards_vmware?,${MULTILIB_USEDEP}]
+"
+for card in ${INTEL_CARDS}; do
+	RDEPEND="${RDEPEND}
+		video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
+	"
+done
+
+for card in ${RADEON_CARDS}; do
+	RDEPEND="${RDEPEND}
+		video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_radeon] )
+	"
+done
+RDEPEND="${RDEPEND}
+	video_cards_radeonsi? ( ${LIBDRM_DEPSTRING}[video_cards_amdgpu] )
+"
+
+DEPEND="${RDEPEND}
+	llvm? (
+		video_cards_radeonsi? ( sys-devel/llvm[video_cards_radeon] )
+	)
+	opencl? (
+				>=sys-devel/llvm-3.4.2:=[${MULTILIB_USEDEP}]
+				>=sys-devel/clang-3.4.2:=[${MULTILIB_USEDEP}]
+				>=sys-devel/gcc-4.6
+	)
+	sys-devel/gettext
+	virtual/pkgconfig
+	>=x11-proto/dri2proto-2.8-r1:=[${MULTILIB_USEDEP}]
+	dri3? (
+		>=x11-proto/dri3proto-1.0:=[${MULTILIB_USEDEP}]
+		>=x11-proto/presentproto-1.0:=[${MULTILIB_USEDEP}]
+	)
+	>=x11-proto/glproto-1.4.17-r1:=[${MULTILIB_USEDEP}]
+	>=x11-proto/xextproto-7.2.1-r1:=[${MULTILIB_USEDEP}]
+	>=x11-proto/xf86driproto-2.1.1-r1:=[${MULTILIB_USEDEP}]
+	>=x11-proto/xf86vidmodeproto-2.3.1-r1:=[${MULTILIB_USEDEP}]
+"
+[[ ${PV} == "9999" ]] && DEPEND+="
+	sys-devel/bison
+	sys-devel/flex
+	${PYTHON_DEPS}
+	$(python_gen_any_dep ">=dev-python/mako-0.7.3[\${PYTHON_USEDEP}]")
+"
+
+S="${WORKDIR}/${MY_P}"
+EGIT_CHECKOUT_DIR=${S}
+
+QA_WX_LOAD="
+x86? (
+	!pic? (
+		usr/lib*/libglapi.so.0.0.0
+		usr/lib*/libGLESv1_CM.so.1.1.0
+		usr/lib*/libGLESv2.so.2.0.0
+		usr/lib*/libGL.so.1.2.0
+		usr/lib*/libOSMesa.so.8.0.0
+	)
+)"
+
+pkg_setup() {
+	# warning message for bug 459306
+	if use llvm && has_version sys-devel/llvm[!debug=]; then
+		ewarn "Mismatch between debug USE flags in media-libs/mesa and sys-devel/llvm"
+		ewarn "detected! This can cause problems. For details, see bug 459306."
+	fi
+
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	# fix for hardened pax_kernel, bug 240956
+	[[ ${PV} != 9999* ]] && epatch "${FILESDIR}"/glx_ro_text_segm.patch
+
+	eautoreconf
+}
+
+multilib_src_configure() {
+	local myconf
+
+	if use classic; then
+		# Configurable DRI drivers
+		driver_enable swrast
+
+		# Intel code
+		driver_enable video_cards_i915 i915
+		driver_enable video_cards_i965 i965
+		if ! use video_cards_i915 && \
+			! use video_cards_i965; then
+			driver_enable video_cards_intel i915 i965
+		fi
+
+		# Nouveau code
+		driver_enable video_cards_nouveau nouveau
+
+		# ATI code
+		driver_enable video_cards_r100 radeon
+		driver_enable video_cards_r200 r200
+		if ! use video_cards_r100 && \
+				! use video_cards_r200; then
+			driver_enable video_cards_radeon radeon r200
+		fi
+	fi
+
+	if use egl; then
+		myconf+="--with-egl-platforms=x11$(use wayland && echo ",wayland")$(use gbm && echo ",drm") "
+	fi
+
+	if use gallium; then
+		myconf+="
+			$(use_enable d3d9 nine)
+			$(use_enable llvm gallium-llvm)
+			$(use_enable openmax omx)
+			$(use_enable vaapi va)
+			$(use_enable vdpau)
+			$(use_enable xa)
+			$(use_enable xvmc)
+		"
+		use vaapi && myconf+="--with-va-libdir=/usr/$(get_libdir)/va/drivers"
+
+		gallium_enable swrast
+		gallium_enable video_cards_vmware svga
+		gallium_enable video_cards_nouveau nouveau
+		gallium_enable video_cards_i915 i915
+		gallium_enable video_cards_ilo ilo
+		if ! use video_cards_i915 && \
+			! use video_cards_i965; then
+			gallium_enable video_cards_intel i915
+		fi
+
+		gallium_enable video_cards_r300 r300
+		gallium_enable video_cards_r600 r600
+		gallium_enable video_cards_radeonsi radeonsi
+		if ! use video_cards_r300 && \
+				! use video_cards_r600; then
+			gallium_enable video_cards_radeon r300 r600
+		fi
+
+		gallium_enable video_cards_freedreno freedreno
+		# opencl stuff
+		if use opencl; then
+			myconf+="
+				$(use_enable opencl)
+				--with-clang-libdir="${EPREFIX}/usr/lib"
+				"
+		fi
+	fi
+
+	# x86 hardened pax_kernel needs glx-rts, bug 240956
+	if use pax_kernel; then
+		myconf+="
+			$(use_enable x86 glx-rts)
+		"
+	fi
+
+	# on abi_x86_32 hardened we need to have asm disable
+	if [[ ${ABI} == x86* ]] && use pic; then
+		myconf+=" --disable-asm"
+	fi
+
+	# build fails with BSD indent, bug #428112
+	use userland_GNU || export INDENT=cat
+
+	ECONF_SOURCE="${S}" \
+	econf \
+		--enable-dri \
+		--enable-glx \
+		--enable-shared-glapi \
+		$(use_enable !bindist texture-float) \
+		$(use_enable d3d9 nine) \
+		$(use_enable debug) \
+		$(use_enable dri3) \
+		$(use_enable egl) \
+		$(use_enable gbm) \
+		$(use_enable gles1) \
+		$(use_enable gles2) \
+		$(use_enable nptl glx-tls) \
+		$(use_enable osmesa) \
+		$(use_enable !udev sysfs) \
+		--enable-llvm-shared-libs \
+		--with-dri-drivers=${DRI_DRIVERS} \
+		--with-gallium-drivers=${GALLIUM_DRIVERS} \
+		PYTHON2="${PYTHON}" \
+		${myconf}
+}
+
+multilib_src_install() {
+	emake install DESTDIR="${D}"
+
+	if use classic || use gallium; then
+			ebegin "Moving DRI/Gallium drivers for dynamic switching"
+			local gallium_drivers=( i915_dri.so i965_dri.so r300_dri.so r600_dri.so swrast_dri.so )
+			keepdir /usr/$(get_libdir)/dri
+			dodir /usr/$(get_libdir)/mesa
+			for x in ${gallium_drivers[@]}; do
+				if [ -f "$(get_libdir)/gallium/${x}" ]; then
+					mv -f "${ED}/usr/$(get_libdir)/dri/${x}" "${ED}/usr/$(get_libdir)/dri/${x/_dri.so/g_dri.so}" \
+						|| die "Failed to move ${x}"
+				fi
+			done
+			if use classic; then
+				emake -C "${BUILD_DIR}/src/mesa/drivers/dri" DESTDIR="${D}" install
+			fi
+			for x in "${ED}"/usr/$(get_libdir)/dri/*.so; do
+				if [ -f ${x} -o -L ${x} ]; then
+					mv -f "${x}" "${x/dri/mesa}" \
+						|| die "Failed to move ${x}"
+				fi
+			done
+			pushd "${ED}"/usr/$(get_libdir)/dri || die "pushd failed"
+			ln -s ../mesa/*.so . || die "Creating symlink failed"
+			# remove symlinks to drivers known to eselect
+			for x in ${gallium_drivers[@]}; do
+				if [ -f ${x} -o -L ${x} ]; then
+					rm "${x}" || die "Failed to remove ${x}"
+				fi
+			done
+			popd
+		eend $?
+	fi
+	if use opencl; then
+		ebegin "Moving Gallium/Clover OpenCL implementation for dynamic switching"
+		local cl_dir="/usr/$(get_libdir)/OpenCL/vendors/mesa"
+		dodir ${cl_dir}/{lib,include}
+		if [ -f "${ED}/usr/$(get_libdir)/libOpenCL.so" ]; then
+			mv -f "${ED}"/usr/$(get_libdir)/libOpenCL.so* \
+			"${ED}"${cl_dir}
+		fi
+		if [ -f "${ED}/usr/include/CL/opencl.h" ]; then
+			mv -f "${ED}"/usr/include/CL \
+			"${ED}"${cl_dir}/include
+		fi
+		eend $?
+	fi
+
+	if use openmax; then
+		echo "XDG_DATA_DIRS=\"${EPREFIX}/usr/share/mesa/xdg\"" > "${T}/99mesaxdgomx"
+		doenvd "${T}"/99mesaxdgomx
+		keepdir /usr/share/mesa/xdg
+	fi
+}
+
+multilib_src_install_all() {
+	prune_libtool_files --all
+	einstalldocs
+
+	if use !bindist; then
+		dodoc docs/patents.txt
+	fi
+
+	# Install config file for eselect mesa
+	insinto /usr/share/mesa
+	newins "${FILESDIR}/eselect-mesa.conf.9.2" eselect-mesa.conf
+}
+
+multilib_src_test() {
+	if use llvm; then
+		local llvm_tests='lp_test_arit lp_test_arit lp_test_blend lp_test_blend lp_test_conv lp_test_conv lp_test_format lp_test_format lp_test_printf lp_test_printf'
+		pushd src/gallium/drivers/llvmpipe >/dev/null || die
+		emake ${llvm_tests}
+		pax-mark m ${llvm_tests}
+		popd >/dev/null || die
+	fi
+	emake check
+}
+
+pkg_postinst() {
+	# Switch to the xorg implementation.
+	echo
+	eselect opengl set --use-old ${OPENGL_DIR}
+
+	# Select classic/gallium drivers
+	if use classic || use gallium; then
+		eselect mesa set --auto
+	fi
+
+	# Switch to mesa opencl
+	if use opencl; then
+		eselect opencl set --use-old ${PN}
+	fi
+
+	# run omxregister-bellagio to make the OpenMAX drivers known system-wide
+	if use openmax; then
+		ebegin "Registering OpenMAX drivers"
+		BELLAGIO_SEARCH_PATH="${EPREFIX}/usr/$(get_libdir)/libomxil-bellagio0" \
+			OMX_BELLAGIO_REGISTRY=${EPREFIX}/usr/share/mesa/xdg/.omxregister \
+			omxregister-bellagio
+		eend $?
+	fi
+
+	# warn about patent encumbered texture-float
+	if use !bindist; then
+		elog "USE=\"bindist\" was not set. Potentially patent encumbered code was"
+		elog "enabled. Please see patents.txt for an explanation."
+	fi
+
+	if ! has_version media-libs/libtxc_dxtn; then
+		elog "Note that in order to have full S3TC support, it is necessary to install"
+		elog "media-libs/libtxc_dxtn as well. This may be necessary to get nice"
+		elog "textures in some apps, and some others even require this to run."
+	fi
+}
+
+pkg_prerm() {
+	if use openmax; then
+		rm "${EPREFIX}"/usr/share/mesa/xdg/.omxregister
+	fi
+}
+
+# $1 - VIDEO_CARDS flag
+# other args - names of DRI drivers to enable
+# TODO: avoid code duplication for a more elegant implementation
+driver_enable() {
+	case $# in
+		# for enabling unconditionally
+		1)
+			DRI_DRIVERS+=",$1"
+			;;
+		*)
+			if use $1; then
+				shift
+				for i in $@; do
+					DRI_DRIVERS+=",${i}"
+				done
+			fi
+			;;
+	esac
+}
+
+gallium_enable() {
+	case $# in
+		# for enabling unconditionally
+		1)
+			GALLIUM_DRIVERS+=",$1"
+			;;
+		*)
+			if use $1; then
+				shift
+				for i in $@; do
+					GALLIUM_DRIVERS+=",${i}"
+				done
+			fi
+			;;
+	esac
+}
diff --git a/media-libs/nas/nas-1.9.4-r1.ebuild b/media-libs/nas/nas-1.9.4-r1.ebuild
index 045d1cd32b1e..443843d6a602 100644
--- a/media-libs/nas/nas-1.9.4-r1.ebuild
+++ b/media-libs/nas/nas-1.9.4-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.src.tar.gz"
 
 LICENSE="HPND MIT"
 SLOT="0"
-KEYWORDS="alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
 IUSE="doc static-libs"
 
 RDEPEND="x11-libs/libICE
diff --git a/media-libs/openjpeg/metadata.xml b/media-libs/openjpeg/metadata.xml
index f50e8dfa9018..7c804ffbed5a 100644
--- a/media-libs/openjpeg/metadata.xml
+++ b/media-libs/openjpeg/metadata.xml
@@ -5,5 +5,6 @@
 	<upstream>
 		<remote-id type="google-code">openjpeg</remote-id>
 		<remote-id type="sourceforge">openjpeg.mirror</remote-id>
+		<remote-id type="github">uclouvain/openjpeg</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/media-libs/rubberband/rubberband-1.8.1.ebuild b/media-libs/rubberband/rubberband-1.8.1.ebuild
index 910bdcb9a720..e8da3efbbed8 100644
--- a/media-libs/rubberband/rubberband-1.8.1.ebuild
+++ b/media-libs/rubberband/rubberband-1.8.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://code.breakfastquay.com/attachments/download/34/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~hppa ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 hppa ~ppc ppc64 ~x86"
 IUSE="static-libs"
 
 RDEPEND="media-libs/vamp-plugin-sdk
diff --git a/media-plugins/grilo-plugins/grilo-plugins-0.2.14.ebuild b/media-plugins/grilo-plugins/grilo-plugins-0.2.14.ebuild
index 6089a6b35a48..87440e392ebd 100644
--- a/media-plugins/grilo-plugins/grilo-plugins-0.2.14.ebuild
+++ b/media-plugins/grilo-plugins/grilo-plugins-0.2.14.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Grilo"
 
 LICENSE="LGPL-2.1+"
 SLOT="0.2"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc ~ppc64 ~x86"
 IUSE="daap +dvd flickr freebox gnome-online-accounts lua pocket subtitles thetvdb tracker upnp-av +vimeo +youtube"
 
 # Bump gom requirement to avoid segfaults
diff --git a/media-plugins/gst-plugins-libav/Manifest b/media-plugins/gst-plugins-libav/Manifest
index 1e995970e045..8ecd88965311 100644
--- a/media-plugins/gst-plugins-libav/Manifest
+++ b/media-plugins/gst-plugins-libav/Manifest
@@ -1,2 +1 @@
-DIST gst-libav-1.2.4.tar.xz 4580144 SHA256 2a69480d63fc2db93249d9e2e229ab3541bbc2db881b0f64de13d0bfc7d1f037 SHA512 64b24f0995865bc736946ad0709b37d6557ce1b91359371c7aaf48d02a0cb486f3bf90b72f483c8ccb661cd5fb637564809bc92d070ad901576bae5b17db0273 WHIRLPOOL 94948887c9ff642ab7e87695acb19b2a210946dd1938776d7d653017fc5231c9144e48c3d467f8c893513a29976d4e8b88457ed44bb0849cdb6f721e1ea576b0
 DIST gst-libav-1.4.5.tar.xz 5220508 SHA256 605c62624604f3bb5c870844cc1f2711779cc533b004c2aa1d8c0d58557afbbc SHA512 a2f9250a51440358d205ef160119498d52cf4944fe810e736e4561f2cdbb8dabad6220d6e4da507f013c42bea69ce72acc373982642278de0a03605bbcd4f75f WHIRLPOOL 075ad91101def8ee8958eaf3051390a76efa3860a4d6796b7f5f86f9b175ca493aa3094e59b24b19c59025337683178f43346e887d7b5efe46b0f9aeadcd28d2
diff --git a/media-plugins/gst-plugins-libav/files/gst-plugins-libav-1.2.4-ffmpeg2.patch b/media-plugins/gst-plugins-libav/files/gst-plugins-libav-1.2.4-ffmpeg2.patch
deleted file mode 100644
index 3deeea061512..000000000000
--- a/media-plugins/gst-plugins-libav/files/gst-plugins-libav-1.2.4-ffmpeg2.patch
+++ /dev/null
@@ -1,120 +0,0 @@
-Index: gst-libav-1.2.0/ext/libav/gstavauddec.c
-===================================================================
---- gst-libav-1.2.0.orig/ext/libav/gstavauddec.c
-+++ gst-libav-1.2.0/ext/libav/gstavauddec.c
-@@ -460,7 +460,7 @@ gst_ffmpegauddec_audio_frame (GstFFMpegA
-     GstBuffer ** outbuf, GstFlowReturn * ret)
- {
-   gint len = -1;
--  gint have_data = AVCODEC_MAX_AUDIO_FRAME_SIZE;
-+  gint have_data = 0;
-   AVPacket packet;
-   AVFrame frame;
- 
-Index: gst-libav-1.2.0/ext/libav/gstavaudenc.c
-===================================================================
---- gst-libav-1.2.0.orig/ext/libav/gstavaudenc.c
-+++ gst-libav-1.2.0/ext/libav/gstavaudenc.c
-@@ -289,7 +289,6 @@ gst_ffmpegaudenc_set_format (GstAudioEnc
-   ffmpegaudenc->context->coder_type = 0;
-   ffmpegaudenc->context->context_model = 0;
-   ffmpegaudenc->context->scenechange_threshold = 0;
--  ffmpegaudenc->context->inter_threshold = 0;
- 
-   /* fetch pix_fmt and so on */
-   gst_ffmpeg_audioinfo_to_context (info, ffmpegaudenc->context);
-Index: gst-libav-1.2.0/ext/libav/gstavcfg.c
-===================================================================
---- gst-libav-1.2.0.orig/ext/libav/gstavcfg.c
-+++ gst-libav-1.2.0/ext/libav/gstavcfg.c
-@@ -171,13 +171,10 @@ gst_ffmpeg_idct_algo_get_type (void)
-       {FF_IDCT_INT, "JPEG reference Integer", "int"},
-       {FF_IDCT_SIMPLE, "Simple", "simple"},
-       {FF_IDCT_SIMPLEMMX, "Simple MMX", "simplemmx"},
--      {FF_IDCT_LIBMPEG2MMX, "LIBMPEG2MMX", "libmpeg2mmx"},
-       {FF_IDCT_ARM, "ARM", "arm"},
-       {FF_IDCT_ALTIVEC, "ALTIVEC", "altivec"},
-       {FF_IDCT_SH4, "SH4", "sh4"},
-       {FF_IDCT_SIMPLEARM, "SIMPLEARM", "simplearm"},
--      {FF_IDCT_H264, "H264", "h264"},
--      {FF_IDCT_VP3, "VP3", "vp3"},
-       {FF_IDCT_IPP, "IPP", "ipp"},
-       {FF_IDCT_XVIDMMX, "XVIDMMX", "xvidmmx"},
-       {0, NULL, NULL},
-@@ -274,9 +271,6 @@ gst_ffmpeg_flags_get_type (void)
-           "global-headers"},
-       {CODEC_FLAG_AC_PRED, "H263 Advanced Intra Coding / MPEG4 AC prediction",
-           "aic"},
--      {CODEC_FLAG_CBP_RD, "Rate Distoration Optimization for CBP", "cbp-rd"},
--      {CODEC_FLAG_QP_RD, "Rate Distoration Optimization for QP selection",
--          "qp-rd"},
-       {CODEC_FLAG_CLOSED_GOP, "Closed GOP", "closedgop"},
-       {0, NULL, NULL},
-     };
-@@ -564,18 +558,6 @@ gst_ffmpeg_cfg_init (void)
-       -100, G_MAXINT, 0, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
-   gst_ffmpeg_add_pspec (pspec, max_key_interval, FALSE, mpeg, NULL);
- 
--  pspec = g_param_spec_int ("luma-elim-threshold",
--      "Luma Elimination Threshold",
--      "Luma Single Coefficient Elimination Threshold",
--      -99, 99, 0, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
--  gst_ffmpeg_add_pspec (pspec, config.luma_elim_threshold, FALSE, mpeg, NULL);
--
--  pspec = g_param_spec_int ("chroma-elim-threshold",
--      "Chroma Elimination Threshold",
--      "Chroma Single Coefficient Elimination Threshold",
--      -99, 99, 0, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
--  gst_ffmpeg_add_pspec (pspec, config.chroma_elim_threshold, FALSE, mpeg, NULL);
--
-   pspec = g_param_spec_float ("lumi-masking", "Luminance Masking",
-       "Luminance Masking", -1.0f, 1.0f, 0.0f,
-       G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
-Index: gst-libav-1.2.0/ext/libav/gstavcodecmap.c
-===================================================================
---- gst-libav-1.2.0.orig/ext/libav/gstavcodecmap.c
-+++ gst-libav-1.2.0/ext/libav/gstavcodecmap.c
-@@ -788,12 +788,10 @@ gst_ffmpeg_codecid_to_caps (enum AVCodec
-           break;
-       }
- 
--      /* FIXME: context->sub_id must be filled in during decoding */
-       caps =
-           gst_ff_vid_caps_new (context, NULL, codec_id, encode,
-           "video/x-pn-realvideo", "rmversion", G_TYPE_INT, version, NULL);
-       if (context) {
--        gst_caps_set_simple (caps, "format", G_TYPE_INT, context->sub_id, NULL);
-         if (context->extradata_size >= 8) {
-           gst_caps_set_simple (caps,
-               "subformat", G_TYPE_INT, GST_READ_UINT32_BE (context->extradata),
-@@ -2892,18 +2890,6 @@ gst_ffmpeg_caps_with_codecid (enum AVCod
-     }
-       break;
- 
--    case AV_CODEC_ID_RV10:
--    case AV_CODEC_ID_RV20:
--    case AV_CODEC_ID_RV30:
--    case AV_CODEC_ID_RV40:
--    {
--      gint format;
--
--      if (gst_structure_get_int (str, "format", &format))
--        context->sub_id = format;
--
--      break;
--    }
-     case AV_CODEC_ID_COOK:
-     case AV_CODEC_ID_RA_288:
-     case AV_CODEC_ID_RA_144:
-Index: gst-libav-1.2.0/ext/libav/gstavvidenc.c
-===================================================================
---- gst-libav-1.2.0.orig/ext/libav/gstavvidenc.c
-+++ gst-libav-1.2.0/ext/libav/gstavvidenc.c
-@@ -338,7 +338,6 @@ gst_ffmpegvidenc_set_format (GstVideoEnc
-   ffmpegenc->context->coder_type = 0;
-   ffmpegenc->context->context_model = 0;
-   ffmpegenc->context->scenechange_threshold = 0;
--  ffmpegenc->context->inter_threshold = 0;
- 
-   /* and last but not least the pass; CBR, 2-pass, etc */
-   ffmpegenc->context->flags |= ffmpegenc->pass;
diff --git a/media-plugins/gst-plugins-libav/files/gst-plugins-libav-1.2.4-fix-memory-leak.patch b/media-plugins/gst-plugins-libav/files/gst-plugins-libav-1.2.4-fix-memory-leak.patch
deleted file mode 100644
index 6745e800b6f7..000000000000
--- a/media-plugins/gst-plugins-libav/files/gst-plugins-libav-1.2.4-fix-memory-leak.patch
+++ /dev/null
@@ -1,96 +0,0 @@
---- ext/libav/gstavviddec.c
-+++ ext/libav/gstavviddec.c
-@@ -523,6 +523,7 @@ open_failed:
- 
- typedef struct
- {
-+  GstFFMpegVidDec *ffmpegdec;
-   GstVideoCodecFrame *frame;
-   gboolean mapped;
-   GstVideoFrame vframe;
-@@ -530,13 +531,17 @@ typedef struct
- } GstFFMpegVidDecVideoFrame;
- 
- static GstFFMpegVidDecVideoFrame *
--gst_ffmpegviddec_video_frame_new (GstVideoCodecFrame * frame)
-+gst_ffmpegviddec_video_frame_new (GstFFMpegVidDec * ffmpegdec,
-+    GstVideoCodecFrame * frame)
- {
-   GstFFMpegVidDecVideoFrame *dframe;
- 
-   dframe = g_slice_new0 (GstFFMpegVidDecVideoFrame);
-+  dframe->ffmpegdec = ffmpegdec;
-   dframe->frame = frame;
- 
-+  GST_DEBUG_OBJECT (ffmpegdec, "new video frame %p", dframe);
-+
-   return dframe;
- }
- 
-@@ -544,6 +549,8 @@ static void
- gst_ffmpegviddec_video_frame_free (GstFFMpegVidDec * ffmpegdec,
-     GstFFMpegVidDecVideoFrame * frame)
- {
-+  GST_DEBUG_OBJECT (ffmpegdec, "free video frame %p", frame);
-+
-   if (frame->mapped)
-     gst_video_frame_unmap (&frame->vframe);
-   gst_video_decoder_release_frame (GST_VIDEO_DECODER (ffmpegdec), frame->frame);
-@@ -551,6 +558,14 @@ gst_ffmpegviddec_video_frame_free (GstFFMpegVidDec * ffmpegdec,
-   g_slice_free (GstFFMpegVidDecVideoFrame, frame);
- }
- 
-+static void
-+dummy_free_buffer (void *opaque, uint8_t * data)
-+{
-+  GstFFMpegVidDecVideoFrame *frame = opaque;
-+
-+  gst_ffmpegviddec_video_frame_free (frame->ffmpegdec, frame);
-+}
-+
- /* called when ffmpeg wants us to allocate a buffer to write the decoded frame
-  * into. We try to give it memory from our pool */
- static int
-@@ -589,7 +604,8 @@ gst_ffmpegviddec_get_buffer (AVCodecContext * context, AVFrame * picture)
-     goto duplicate_frame;
- 
-   /* GstFFMpegVidDecVideoFrame receives the frame ref */
--  picture->opaque = dframe = gst_ffmpegviddec_video_frame_new (frame);
-+  picture->opaque = dframe =
-+      gst_ffmpegviddec_video_frame_new (ffmpegdec, frame);
- 
-   GST_DEBUG_OBJECT (ffmpegdec, "storing opaque %p", dframe);
- 
-@@ -695,12 +711,20 @@ invalid_frame:
- fallback:
-   {
-     int c;
-+    gboolean first = TRUE;
-     int ret = avcodec_default_get_buffer (context, picture);
- 
-     GST_LOG_OBJECT (ffmpegdec, "performing fallback alloc");
--    for (c = 0; c < AV_NUM_DATA_POINTERS; c++)
-+    for (c = 0; c < AV_NUM_DATA_POINTERS; c++) {
-       ffmpegdec->stride[c] = picture->linesize[c];
- 
-+      if (picture->buf[c] == NULL && first) {
-+        picture->buf[c] =
-+            av_buffer_create (NULL, 0, dummy_free_buffer, dframe, 0);
-+        first = FALSE;
-+      }
-+    }
-+
-     return ret;
-   }
- duplicate_frame:
-@@ -1684,8 +1718,8 @@ gst_ffmpegviddec_decide_allocation (GstVideoDecoder * decoder, GstQuery * query)
-     avcodec_align_dimensions2 (ffmpegdec->context, &width, &height,
-         linesize_align);
-     edge =
--        ffmpegdec->context->
--        flags & CODEC_FLAG_EMU_EDGE ? 0 : avcodec_get_edge_width ();
-+        ffmpegdec->
-+        context->flags & CODEC_FLAG_EMU_EDGE ? 0 : avcodec_get_edge_width ();
-     /* increase the size for the padding */
-     width += edge << 1;
-     height += edge << 1;
diff --git a/media-plugins/gst-plugins-libav/files/gst-plugins-libav-1.4.5-allocate-buffer.patch b/media-plugins/gst-plugins-libav/files/gst-plugins-libav-1.4.5-allocate-buffer.patch
new file mode 100644
index 000000000000..72c69dbcec13
--- /dev/null
+++ b/media-plugins/gst-plugins-libav/files/gst-plugins-libav-1.4.5-allocate-buffer.patch
@@ -0,0 +1,42 @@
+From 055ae13e08ed1af220001de7b55d5c9defe64476 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian@centricular.com>
+Date: Mon, 9 Mar 2015 22:01:43 +0100
+Subject: avviddec: Error out if we try to allocate a buffer without being
+ negotiated
+
+Otherwise we just run into assertions because we should've errored out
+already.
+
+diff --git a/ext/libav/gstavviddec.c b/ext/libav/gstavviddec.c
+index 5a1b7ed..23f9c74 100644
+--- a/ext/libav/gstavviddec.c
++++ b/ext/libav/gstavviddec.c
+@@ -1114,6 +1114,9 @@ get_output_buffer (GstFFMpegVidDec * ffmpegdec, GstVideoCodecFrame * frame)
+ 
+   GST_LOG_OBJECT (ffmpegdec, "get output buffer");
+ 
++  if (!ffmpegdec->output_state)
++    goto not_negotiated;
++
+   ret =
+       gst_video_decoder_allocate_output_frame (GST_VIDEO_DECODER (ffmpegdec),
+       frame);
+@@ -1154,9 +1157,14 @@ get_output_buffer (GstFFMpegVidDec * ffmpegdec, GstVideoCodecFrame * frame)
+   /* special cases */
+ alloc_failed:
+   {
+-    GST_DEBUG_OBJECT (ffmpegdec, "pad_alloc failed");
++    GST_DEBUG_OBJECT (ffmpegdec, "allocation failed");
+     return ret;
+   }
++not_negotiated:
++  {
++    GST_DEBUG_OBJECT (ffmpegdec, "not negotiated");
++    return GST_FLOW_NOT_NEGOTIATED;
++  }
+ }
+ 
+ static void
+-- 
+cgit v0.10.2
+
diff --git a/media-plugins/gst-plugins-libav/files/gst-plugins-libav-1.4.5-fix-memleak.patch b/media-plugins/gst-plugins-libav/files/gst-plugins-libav-1.4.5-fix-memleak.patch
new file mode 100644
index 000000000000..60c0a0fe831a
--- /dev/null
+++ b/media-plugins/gst-plugins-libav/files/gst-plugins-libav-1.4.5-fix-memleak.patch
@@ -0,0 +1,23 @@
+From 98f0b80c8d0ff5da7b3dc579a0230e9efeae87fd Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian@centricular.com>
+Date: Tue, 2 Jun 2015 09:09:09 +0200
+Subject: avauddev: Unref decoded AVFrame after we're done with it
+
+Otherwise we might leak some memory, like all compressed data when using
+avdec_ac3.
+
+diff --git a/ext/libav/gstavauddec.c b/ext/libav/gstavauddec.c
+index dd32466..bf16857 100644
+--- a/ext/libav/gstavauddec.c
++++ b/ext/libav/gstavauddec.c
+@@ -590,6 +590,7 @@ gst_ffmpegauddec_audio_frame (GstFFMpegAudDec * ffmpegdec,
+   }
+ 
+ beach:
++  av_frame_unref (&frame);
+   GST_DEBUG_OBJECT (ffmpegdec, "return flow %d, out %p, len %d",
+       *ret, *outbuf, len);
+   return len;
+-- 
+cgit v0.10.2
+
diff --git a/media-plugins/gst-plugins-libav/files/gst-plugins-libav-1.4.5-h265-fixes.patch b/media-plugins/gst-plugins-libav/files/gst-plugins-libav-1.4.5-h265-fixes.patch
new file mode 100644
index 000000000000..a00bc14783e6
--- /dev/null
+++ b/media-plugins/gst-plugins-libav/files/gst-plugins-libav-1.4.5-h265-fixes.patch
@@ -0,0 +1,34 @@
+From ac54ee0473f71e0c7fc195883b9ac6ae15f302af Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian@centricular.com>
+Date: Fri, 5 Jun 2015 11:57:37 +0200
+Subject: avviddec: Release stream lock while calling avcodec_decode_video2()
+
+It might call back into us from another thread and try to take
+the stream lock again, e.g. to allocate a buffer. Fixes avdec_h265
+not outputting anything.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=726020
+
+diff --git a/ext/libav/gstavviddec.c b/ext/libav/gstavviddec.c
+index e2d8245..b876b18 100644
+--- a/ext/libav/gstavviddec.c
++++ b/ext/libav/gstavviddec.c
+@@ -1246,8 +1246,15 @@ gst_ffmpegviddec_video_frame (GstFFMpegVidDec * ffmpegdec,
+     GST_DEBUG_OBJECT (ffmpegdec, "copy pal %p %p", &packet, pal);
+   }
+ 
++  /* This might call into get_buffer() from another thread,
++   * which would cause a deadlock. Release the lock here
++   * and taking it again later seems safe
++   * See https://bugzilla.gnome.org/show_bug.cgi?id=726020
++   */
++  GST_VIDEO_DECODER_STREAM_UNLOCK (ffmpegdec);
+   len = avcodec_decode_video2 (ffmpegdec->context,
+       ffmpegdec->picture, have_data, &packet);
++  GST_VIDEO_DECODER_STREAM_LOCK (ffmpegdec);
+ 
+   GST_DEBUG_OBJECT (ffmpegdec, "after decode: len %d, have_data %d",
+       len, *have_data);
+-- 
+cgit v0.10.2
+
diff --git a/media-plugins/gst-plugins-libav/files/gst-plugins-libav-1.4.5-post-error.patch b/media-plugins/gst-plugins-libav/files/gst-plugins-libav-1.4.5-post-error.patch
new file mode 100644
index 000000000000..470302046cdf
--- /dev/null
+++ b/media-plugins/gst-plugins-libav/files/gst-plugins-libav-1.4.5-post-error.patch
@@ -0,0 +1,24 @@
+From 07d185161ea5d543f2ae1c6485da79dd7ee01173 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Olivier=20Cr=C3=AAte?= <olivier.crete@collabora.com>
+Date: Tue, 2 Jun 2015 20:48:33 -0400
+Subject: avviddec: Post error message before returning a flow error
+
+This is required.
+
+diff --git a/ext/libav/gstavviddec.c b/ext/libav/gstavviddec.c
+index 23f9c74..e2d8245 100644
+--- a/ext/libav/gstavviddec.c
++++ b/ext/libav/gstavviddec.c
+@@ -1479,7 +1479,8 @@ gst_ffmpegviddec_handle_frame (GstVideoDecoder * decoder,
+       GST_TIME_ARGS (frame->pts), GST_TIME_ARGS (frame->duration));
+ 
+   if (!gst_buffer_map (frame->input_buffer, &minfo, GST_MAP_READ)) {
+-    GST_ERROR_OBJECT (ffmpegdec, "Failed to map buffer");
++    GST_ELEMENT_ERROR (ffmpegdec, STREAM, DECODE, ("Decoding problem"),
++        ("Failed to map buffer for reading"));
+     return GST_FLOW_ERROR;
+   }
+ 
+-- 
+cgit v0.10.2
+
diff --git a/media-plugins/gst-plugins-libav/gst-plugins-libav-1.2.4-r1.ebuild b/media-plugins/gst-plugins-libav/gst-plugins-libav-1.2.4-r1.ebuild
deleted file mode 100644
index 70482c11058b..000000000000
--- a/media-plugins/gst-plugins-libav/gst-plugins-libav-1.2.4-r1.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-inherit eutils flag-o-matic multilib-minimal
-
-MY_PN="gst-libav"
-DESCRIPTION="FFmpeg based gstreamer plugin"
-HOMEPAGE="http://gstreamer.freedesktop.org/modules/gst-libav.html"
-SRC_URI="http://gstreamer.freedesktop.org/src/${MY_PN}/${MY_PN}-${PV}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="1.0"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="libav +orc"
-
-RDEPEND="
-	>=media-libs/gstreamer-1.2.3:1.0[${MULTILIB_USEDEP}]
-	>=media-libs/gst-plugins-base-1.2.3:1.0[${MULTILIB_USEDEP}]
-	libav? (
-		<media-video/libav-10:0=[${MULTILIB_USEDEP}]
-		>=media-video/libav-9.12:0=[${MULTILIB_USEDEP}] )
-	!libav? ( >=media-video/ffmpeg-1.2.6-r1:0=[${MULTILIB_USEDEP}] )
-	orc? ( >=dev-lang/orc-0.4.17[${MULTILIB_USEDEP}] )
-"
-DEPEND="${RDEPEND}
-	>=dev-util/gtk-doc-am-1.12
-	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
-"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_prepare() {
-	# compatibility with recent releases
-	# TODO: likely apply them with libav-10 when it's out but there will
-	# probably be an upstream gst-libav release compatible at that time.
-	if has_version '>=media-video/ffmpeg-2.0' ; then
-		sed -i -e 's/ CODEC_ID/ AV_CODEC_ID/g' \
-			   -e 's/ CodecID/ AVCodecID/g' \
-			   ext/libav/*.{c,h} || die
-		epatch "${FILESDIR}/${PN}-1.2.4-ffmpeg2.patch"
-		epatch "${FILESDIR}/${PN}-1.2.4-fix-memory-leak.patch" #494282
-	fi
-}
-
-multilib_src_configure() {
-	GST_PLUGINS_BUILD=""
-	# always use system ffmpeg/libav if possible
-	ECONF_SOURCE=${S} \
-	econf \
-		--disable-maintainer-mode \
-		--with-package-name="Gentoo GStreamer ebuild" \
-		--with-package-origin="https://www.gentoo.org" \
-		--disable-fatal-warnings \
-		--with-system-libav \
-		$(use_enable orc)
-}
-
-multilib_src_compile() {
-	# Don't build with -Werror
-	emake ERROR_CFLAGS=
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	prune_libtool_files --modules
-}
-
-pkg_postinst() {
-	if ! use libav; then
-		elog "Please note that upstream uses media-video/libav"
-		elog "rather than media-video/ffmpeg. If you encounter any"
-		elog "issues try to move from ffmpeg to libav."
-	fi
-}
diff --git a/media-plugins/gst-plugins-libav/gst-plugins-libav-1.2.4.ebuild b/media-plugins/gst-plugins-libav/gst-plugins-libav-1.2.4.ebuild
deleted file mode 100644
index e8be69c907a1..000000000000
--- a/media-plugins/gst-plugins-libav/gst-plugins-libav-1.2.4.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-inherit eutils flag-o-matic multilib-minimal
-
-MY_PN="gst-libav"
-DESCRIPTION="FFmpeg based gstreamer plugin"
-HOMEPAGE="http://gstreamer.freedesktop.org/modules/gst-libav.html"
-SRC_URI="http://gstreamer.freedesktop.org/src/${MY_PN}/${MY_PN}-${PV}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="1.0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="+orc"
-
-RDEPEND="
-	>=media-libs/gstreamer-1.2.3:1.0[${MULTILIB_USEDEP}]
-	>=media-libs/gst-plugins-base-1.2.3:1.0[${MULTILIB_USEDEP}]
-	>=virtual/ffmpeg-9-r1[${MULTILIB_USEDEP}]
-	!!>=media-video/libav-10
-	orc? ( >=dev-lang/orc-0.4.17[${MULTILIB_USEDEP}] )
-"
-DEPEND="${RDEPEND}
-	>=dev-util/gtk-doc-am-1.12
-	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
-"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_prepare() {
-	# compatibility with recent releases
-	# TODO: likely apply them with libav-10 when it's out but there will
-	# probably be an upstream gst-libav release compatible at that time.
-	if has_version '>=media-video/ffmpeg-2.0' ; then
-		sed -i -e 's/ CODEC_ID/ AV_CODEC_ID/g' \
-			   -e 's/ CodecID/ AVCodecID/g' \
-			   ext/libav/*.{c,h} || die
-		epatch "${FILESDIR}/${PN}-1.2.4-ffmpeg2.patch"
-		epatch "${FILESDIR}/${PN}-1.2.4-fix-memory-leak.patch" #494282
-	fi
-}
-
-multilib_src_configure() {
-	GST_PLUGINS_BUILD=""
-	# always use system ffmpeg/libav if possible
-	ECONF_SOURCE=${S} \
-	econf \
-		--disable-maintainer-mode \
-		--with-package-name="Gentoo GStreamer ebuild" \
-		--with-package-origin="https://www.gentoo.org" \
-		--disable-fatal-warnings \
-		--with-system-libav \
-		$(use_enable orc)
-}
-
-multilib_src_compile() {
-	# Don't build with -Werror
-	emake ERROR_CFLAGS=
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	prune_libtool_files --modules
-}
-
-pkg_postinst() {
-	if has_version "media-video/ffmpeg"; then
-		elog "Please note that upstream uses media-video/libav"
-		elog "rather than media-video/ffmpeg. If you encounter any"
-		elog "issues try to move from ffmpeg to libav."
-	fi
-}
diff --git a/media-plugins/gst-plugins-libav/gst-plugins-libav-1.4.5-r2.ebuild b/media-plugins/gst-plugins-libav/gst-plugins-libav-1.4.5-r2.ebuild
new file mode 100644
index 000000000000..471b7eaadb28
--- /dev/null
+++ b/media-plugins/gst-plugins-libav/gst-plugins-libav-1.4.5-r2.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+inherit eutils flag-o-matic multilib-minimal
+
+MY_PN="gst-libav"
+DESCRIPTION="FFmpeg based gstreamer plugin"
+HOMEPAGE="http://gstreamer.freedesktop.org/modules/gst-libav.html"
+SRC_URI="http://gstreamer.freedesktop.org/src/${MY_PN}/${MY_PN}-${PV}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="1.0"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE="libav +orc"
+
+RDEPEND="
+	>=media-libs/gstreamer-1.4.0:1.0[${MULTILIB_USEDEP}]
+	>=media-libs/gst-plugins-base-1.4.0:1.0[${MULTILIB_USEDEP}]
+	!libav? ( >=media-video/ffmpeg-2.2:0=[${MULTILIB_USEDEP}] )
+	libav? ( >=media-video/libav-10:0=[${MULTILIB_USEDEP}] )
+	orc? ( >=dev-lang/orc-0.4.17[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}
+	app-arch/xz-utils
+	>=dev-util/gtk-doc-am-1.12
+	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
+"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+src_prepare() {
+	# Upstream patches
+	# avviddec: Error out if we try to allocate a buffer without being negotiated
+	epatch "${FILESDIR}"/${P}-allocate-buffer.patch
+
+	# avauddev: Unref decoded AVFrame after we're done with it
+	epatch "${FILESDIR}"/${P}-fix-memleak.patch
+
+	# avviddec: Post error message before returning a flow error
+	epatch "${FILESDIR}"/${P}-post-error.patch
+
+	# avviddec: Release stream lock while calling avcodec_decode_video2()
+	epatch "${FILESDIR}"/${P}-h265-fixes.patch
+}
+
+multilib_src_configure() {
+	GST_PLUGINS_BUILD=""
+	# always use system ffmpeg/libav if possible
+	ECONF_SOURCE=${S} \
+	econf \
+		--disable-maintainer-mode \
+		--with-package-name="Gentoo GStreamer ebuild" \
+		--with-package-origin="https://www.gentoo.org" \
+		--disable-fatal-warnings \
+		--with-system-libav \
+		$(use_enable orc)
+}
+
+multilib_src_compile() {
+	# Don't build with -Werror
+	emake ERROR_CFLAGS=
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	prune_libtool_files --modules
+}
diff --git a/media-plugins/gst-plugins-libav/gst-plugins-libav-1.4.5.ebuild b/media-plugins/gst-plugins-libav/gst-plugins-libav-1.4.5.ebuild
deleted file mode 100644
index e3453c28de1b..000000000000
--- a/media-plugins/gst-plugins-libav/gst-plugins-libav-1.4.5.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-inherit eutils flag-o-matic multilib-minimal
-
-MY_PN="gst-libav"
-DESCRIPTION="FFmpeg based gstreamer plugin"
-HOMEPAGE="http://gstreamer.freedesktop.org/modules/gst-libav.html"
-SRC_URI="http://gstreamer.freedesktop.org/src/${MY_PN}/${MY_PN}-${PV}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="1.0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="+orc"
-
-RDEPEND="
-	>=media-libs/gstreamer-1.4.0:1.0[${MULTILIB_USEDEP}]
-	>=media-libs/gst-plugins-base-1.4.0:1.0[${MULTILIB_USEDEP}]
-	|| ( >=media-video/ffmpeg-2.2:0[${MULTILIB_USEDEP}] >=media-video/libav-9[${MULTILIB_USEDEP}] )
-	orc? ( >=dev-lang/orc-0.4.17[${MULTILIB_USEDEP}] )
-"
-DEPEND="${RDEPEND}
-	app-arch/xz-utils
-	>=dev-util/gtk-doc-am-1.12
-	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
-"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_prepare() {
-	# https://bugzilla.gnome.org/show_bug.cgi?id=743984
-	epatch "${FILESDIR}/${PN}-1.4.5-libav9.patch"
-}
-
-multilib_src_configure() {
-	GST_PLUGINS_BUILD=""
-	# always use system ffmpeg/libav if possible
-	ECONF_SOURCE=${S} \
-	econf \
-		--disable-maintainer-mode \
-		--with-package-name="Gentoo GStreamer ebuild" \
-		--with-package-origin="https://www.gentoo.org" \
-		--disable-fatal-warnings \
-		--with-system-libav \
-		$(use_enable orc)
-}
-
-multilib_src_compile() {
-	# Don't build with -Werror
-	emake ERROR_CFLAGS=
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	prune_libtool_files --modules
-}
diff --git a/media-plugins/gst-plugins-vaapi/Manifest b/media-plugins/gst-plugins-vaapi/Manifest
index 60140b1f479f..c3a659665982 100644
--- a/media-plugins/gst-plugins-vaapi/Manifest
+++ b/media-plugins/gst-plugins-vaapi/Manifest
@@ -1 +1,2 @@
 DIST gstreamer-vaapi-0.5.10.tar.bz2 1333822 SHA256 0dd236c7bf225322b8934fdba99a7a9e4542566a2acbe7564cdc3ec2c8b73c9d SHA512 bb0c2c29100f2edfdbf76d2de2a554b988779a9fc462788b537f08f6e62f0fdfaa7f12e4e4d49f1abf887533dcbd79bf0c734895bc73f5bc4b0bc3ba0ac07120 WHIRLPOOL 27350341e2899bd50aa8795bde505f4da78f23b9d1615e1a8706516ed482f7f2bae0db8f121b16a6163327cd2323f755b39b6605f16ea725dfabc766ee5ec74e
+DIST gstreamer-vaapi-0.6.0.tar.bz2 1406631 SHA256 f6a4c657606849fb09ee2db778c80278cfa4546e9103862f273c910e208872b8 SHA512 f280655b712ebc14438074a1a659a49417457f34a903c9220a2b7594ef8c6836319f0f22a9bdff5a3899771eb53df1c75de5c3f625094caa0a00964f55025515 WHIRLPOOL a4b75203d8fa53dbd177a7fd08ceb480f10f819985c992d9d384bfeaeb099c8ecbb02d2ac7560f527acd329ac588859e36ab5077067584aea6f951e75b0b905a
diff --git a/media-plugins/gst-plugins-vaapi/gst-plugins-vaapi-0.6.0.ebuild b/media-plugins/gst-plugins-vaapi/gst-plugins-vaapi-0.6.0.ebuild
new file mode 100644
index 000000000000..f20b5648f991
--- /dev/null
+++ b/media-plugins/gst-plugins-vaapi/gst-plugins-vaapi-0.6.0.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+inherit eutils multilib-minimal
+
+MY_PN="gstreamer-vaapi"
+DESCRIPTION="Hardware accelerated video decoding through VA-API plugin"
+HOMEPAGE="http://gitorious.org/vaapi/gstreamer-vaapi"
+SRC_URI="http://www.freedesktop.org/software/vaapi/releases/${MY_PN}/${MY_PN}-${PV}.tar.bz2"
+
+LICENSE="LGPL-2.1"
+SLOT="1.0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+drm opengl wayland +X"
+REQUIRED_USE="|| ( drm opengl wayland X )"
+
+RDEPEND="
+	>=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]
+	>=media-libs/gstreamer-1.2.3:1.0[${MULTILIB_USEDEP}]
+	>=media-libs/gst-plugins-base-1.2.3:1.0[${MULTILIB_USEDEP}]
+	>=media-libs/gst-plugins-bad-1.2.3:1.0[${MULTILIB_USEDEP}]
+	>=x11-libs/libva-1.4.0[drm?,X?,opengl?,wayland?,${MULTILIB_USEDEP}]
+	drm? (
+		>=virtual/libudev-208:=[${MULTILIB_USEDEP}]
+		>=x11-libs/libdrm-2.4.46[${MULTILIB_USEDEP}] )
+	X? (
+		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libXrandr-1.4.2[${MULTILIB_USEDEP}] )
+	opengl? (
+		>=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}]
+		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libXrandr-1.4.2[${MULTILIB_USEDEP}] )
+	wayland? ( >=dev-libs/wayland-1.0.6[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}
+	>=dev-util/gtk-doc-am-1.12
+	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+multilib_src_configure() {
+	ECONF_SOURCE=${S} \
+	econf \
+		--enable-builtin-libvpx=no \
+		--disable-static \
+		--enable-egl \
+		$(use_enable drm) \
+		$(use_enable opengl glx) \
+		$(use_enable wayland) \
+		$(use_enable X x11)
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	prune_libtool_files --modules
+}
diff --git a/media-plugins/gst-plugins-vaapi/metadata.xml b/media-plugins/gst-plugins-vaapi/metadata.xml
index ca8b22bc6ce1..6552820010a8 100644
--- a/media-plugins/gst-plugins-vaapi/metadata.xml
+++ b/media-plugins/gst-plugins-vaapi/metadata.xml
@@ -2,6 +2,9 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>gstreamer</herd>
+	<use>
+		<flag name="drm">Enable DRM renderer</flag>
+	</use>
 	<upstream>
 		<remote-id type="gitorious">vaapi/gstreamer-vaapi</remote-id>
 	</upstream>
diff --git a/media-plugins/live/Manifest b/media-plugins/live/Manifest
index fca8aadd9879..d62f3066f256 100644
--- a/media-plugins/live/Manifest
+++ b/media-plugins/live/Manifest
@@ -1,3 +1,4 @@
 DIST live.2012.01.07.tar.gz 534076 SHA256 8f3d167959b355c571caab2ee12cf70c89f09e93484f150080a59367b35c8131 SHA512 f38e8978a630078b9933d7540fee290d08a53b17137265392be9ce04f4e0e18b52953dc9cee208d8403e484d9e67c43a6e0700495aef708279ed090dcec72744 WHIRLPOOL 0ca17abb5ced98d0327f48163f975f2f65dbb3d37984f063e4946ccbc2dcad5f57dc7cccf16e2dce1ee496cef5012ecefc2a24aca75303c602a943f6f87cd419
 DIST live.2012.09.13.tar.gz 560899 SHA256 d5667373aed8766c0a983a71b37c208976e93f181974d3a1a4ab6d9845df9be7 SHA512 344c29038e9882b3ad8678ceec7755aca5013e3b0821ca6b9d846cc1c926c1dc125b71dce91986b760793123ebff9f291aaf0dbfb3570721968f641a2b530c5d WHIRLPOOL 1b76f557e2a8441b36ceba7d274eccf4b9337224c63c1b4d4d8b3e3ba4277d9bbf4e7ebc0665e914bc476cae5178ae09ad8bc0dc1024a676ded94b293c2a0b13
 DIST live.2013.02.11.tar.gz 570837 SHA256 2cd619e61b9293a094a2cbb8dd7a7505f8e74e6197b80989093425ac78a86d83 SHA512 c0f2efbf2af06d5e5f2bc58955ca37942022a439e3c48bec06a49b636e08d4d31855e884586448c698b0c90d35ef24f282570d0026c4454c9e58855ff36713be WHIRLPOOL 121fb4815c44db793a3c225faa5c16e68a8f975e45e8c4d492886aa82a57dd1571ad14076375767524cb848336b702cccc9ab17af79787ac489b6eb789fd9bd9
+DIST live.2015.08.07.tar.gz 616595 SHA256 1a27410aea9723e9e0c60850c57b52a08eed32a4ecfa88942026d2b9c0ac3fdc SHA512 afcd5552c4696a6a3a8e95759a908e8166611ec563728649e5d428b77dba9fbdd1db882a65359498bc5763d71ef2ccc442ec6d36ad672fa6709ae1203eaf8a3c WHIRLPOOL 34c2c4c3fdac6a105ec0a23f09ffdb6900d36fc180694d7b74fb6312463c1fc733637d9f244ee40aee8935752d0da86423a5e584f3efb33fae07a6696cf2b26b
diff --git a/media-plugins/live/live-2015.08.07.ebuild b/media-plugins/live/live-2015.08.07.ebuild
new file mode 100644
index 000000000000..a787b3130fd0
--- /dev/null
+++ b/media-plugins/live/live-2015.08.07.ebuild
@@ -0,0 +1,129 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit flag-o-matic eutils toolchain-funcs multilib multilib-minimal
+
+DESCRIPTION="Libraries for standards-based RTP/RTCP/RTSP multimedia streaming"
+HOMEPAGE="http://www.live555.com/"
+SRC_URI="http://www.live555.com/liveMedia/public/${P/-/.}.tar.gz
+	mirror://gentoo/${P/-/.}.tar.gz"
+
+LICENSE="LGPL-2.1"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE="examples static-libs"
+DOCS=( "live-shared/README" )
+
+# Alexis Ballier <aballier@gentoo.org>
+# Be careful, bump this everytime you bump the package and the ABI has changed.
+# If you don't know, ask someone.
+LIVE_ABI_VERSION=7
+SLOT="0/${LIVE_ABI_VERSION}"
+
+src_unpack() {
+	unpack ${A}
+	mkdir -p "${S}"
+	mv "${WORKDIR}/live" "${S}/" || die
+}
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-recursive2.patch"
+
+	if use static-libs ; then
+		cp -pPR live live-shared
+		mv live live-static
+	else
+		mv live live-shared
+	fi
+
+	use static-libs && cp "${FILESDIR}/config.gentoo" live-static
+	cp "${FILESDIR}/config.gentoo-so-r1" live-shared
+
+	case ${CHOST} in
+		*-solaris*)
+			use static-libs && { sed -i \
+				-e '/^COMPILE_OPTS /s/$/ -DSOLARIS -DXLOCALE_NOT_USED/' \
+				-e '/^LIBS_FOR_CONSOLE_APPLICATION /s/$/ -lsocket -lnsl/' \
+				live-static/config.gentoo \
+				|| die ; }
+			sed -i \
+				-e '/^COMPILE_OPTS /s/$/ -DSOLARIS -DXLOCALE_NOT_USED/' \
+				-e '/^LIBS_FOR_CONSOLE_APPLICATION /s/$/ -lsocket -lnsl/' \
+				live-shared/config.gentoo-so-r1 \
+				|| die
+		;;
+		*-darwin*)
+			use static-libs && { sed -i \
+				-e '/^COMPILE_OPTS /s/$/ -DBSD=1 -DHAVE_SOCKADDR_LEN=1/' \
+				-e '/^LINK /s/$/ /' \
+				-e '/^LIBRARY_LINK /s/$/ /' \
+				-e '/^LIBRARY_LINK_OPTS /s/-Bstatic//' \
+				live-static/config.gentoo \
+				|| die static ; }
+			sed -i \
+				-e '/^COMPILE_OPTS /s/$/ -DBSD=1 -DHAVE_SOCKADDR_LEN=1/' \
+				-e '/^LINK /s/$/ /' \
+				-e '/^LIBRARY_LINK /s/=.*$/= $(CXX) -o /' \
+				-e '/^LIBRARY_LINK_OPTS /s:-shared.*$:-undefined suppress -flat_namespace -dynamiclib -install_name '"${EPREFIX}/usr/$(get_libdir)/"'$@:' \
+				-e '/^LIB_SUFFIX /s/so/dylib/' \
+				live-shared/config.gentoo-so-r1 \
+				|| die shared
+		;;
+	esac
+	multilib_copy_sources
+}
+
+src_configure() { :; }
+
+multilib_src_compile() {
+	tc-export CC CXX LD
+
+	if use static-libs ; then
+		cd "${BUILD_DIR}/live-static"
+
+		einfo "Beginning static library build"
+		./genMakefiles gentoo
+		emake -j1 LINK_OPTS="-L. $(raw-ldflags)" || die "failed to build static libraries"
+	fi
+
+	cd "${BUILD_DIR}/live-shared"
+	einfo "Beginning shared library build"
+	./genMakefiles gentoo-so-r1
+	local suffix=$(get_libname ${LIVE_ABI_VERSION})
+	emake -j1 LINK_OPTS="-L. ${LDFLAGS}" LIB_SUFFIX="${suffix#.}" || die "failed to build shared libraries"
+
+	for i in liveMedia groupsock UsageEnvironment BasicUsageEnvironment ; do
+		pushd "${BUILD_DIR}/live-shared/${i}" > /dev/null
+		ln -s lib${i}.${suffix#.} lib${i}$(get_libname) || die
+		popd > /dev/null
+	done
+
+	if multilib_is_native_abi; then
+		einfo "Beginning programs build"
+		for i in $(use examples && echo "testProgs") proxyServer mediaServer ; do
+			cd "${BUILD_DIR}/live-shared/${i}"
+			emake LINK_OPTS="-L. ${LDFLAGS}" || die "failed to build test programs"
+		done
+	fi
+}
+
+multilib_src_install() {
+	for library in UsageEnvironment liveMedia BasicUsageEnvironment groupsock; do
+		use static-libs && dolib.a live-static/${library}/lib${library}.a
+		dolib.so live-shared/${library}/lib${library}$(get_libname ${LIVE_ABI_VERSION})
+		dosym lib${library}$(get_libname ${LIVE_ABI_VERSION}) /usr/$(get_libdir)/lib${library}$(get_libname)
+
+		insinto /usr/include/${library}
+		doins live-shared/${library}/include/*h
+	done
+
+	if multilib_is_native_abi; then
+		# Should we really install these?
+		use examples && find live-shared/testProgs -type f -perm 755 -print0 | \
+			xargs -0 dobin
+
+		dobin live-shared/mediaServer/live555MediaServer
+		dobin live-shared/proxyServer/live555ProxyServer
+	fi
+}
diff --git a/media-plugins/mythplugins/Manifest b/media-plugins/mythplugins/Manifest
index 04f34c05a1d0..ac91c9937e6f 100644
--- a/media-plugins/mythplugins/Manifest
+++ b/media-plugins/mythplugins/Manifest
@@ -1,12 +1,6 @@
 DIST mythplugins-0.26.0-9fd7c6102b2cd1a3760337663803b110446c6ea7.tar.xz 45980 SHA256 a3ec6dcde8ee74b0a518c42555947b0a9050f63625df4f6b94a4830768267242 SHA512 490a2bfdfe1011721e17a74f25d6a404d14af855b5790620553467d7efd0a3dc050fa2c716ba88a06924ba1c456b40968f2862557688c0d31999f05549f6d39a WHIRLPOOL db6a1b277e0c0bf122a1c910f446dc6a924c7cdb82bb23996e8f45239185c60d59e0974b62ea281b807eafce2fcb72f2f96d0f8051cc47ea1b8602d49c82e372
 DIST mythplugins-0.26.0.tar.bz2 36673620 SHA256 4e7f0493f37792c084c1b4d0b5863b4201ebce6d62ab7c6cc31ca74087d83c62 SHA512 51c10f46186e14e69c5626f2ae0955692c71aa7459fd018efaab1b99809cad533a84754d53455017102ff6f94cc9905dc303248a29d4095ba8f4f685bb022f49 WHIRLPOOL a2b995f2a94a2eb22fa0740dd840a2fe2d9d4b808af1dc43e9d83c626d93ed95134d64db2049e4b79379838ae16b1de6547b56277531e2752e6779b3cddbf25a
 DIST mythplugins-0.27-583395f5a376637efcd408a102fa64d0f188c12f.tar.xz 58328 SHA256 b8d7b2338236baeb20a26d2c83eb3c92b9a6f0aa96c66542e47018e4c833a213 SHA512 1ed2786f9c1fd0f7d607806b6ca34100ec116191e02573cc5def18c2581bb841e6f7e5b9fe066bfb9f52931b314ead157a64ab84a27bae06610282237d249dfc WHIRLPOOL 56977fab1cb93768164c4e3feb2fe503d22d44e70fd046cdbe3b05de0066a8792afd1097721029713b3f4f30c79e34d8ba617afe4c1241af0f1a741854cc3349
-DIST mythplugins-0.27.1-082d5c1fbccd48dd862f14007c0445dee8502f3d.tar.xz 10552 SHA256 5848fd15bd924ba605cd20d122afa41b9e9c2999d4d44c1ca6a6a38e1556a388 SHA512 157acf9a95a5f6352022ec5e79bc5b95bf7a58789b57fde1dbc1f3f2309cfc39efd05234f32808cd472062f22855b4bd2d74e6b79df5828640e59973419a7a93 WHIRLPOOL ad993020fb444942e7b2e7456525f23c514d2b2117e8570cdeb33977c58faaca7a87deba83b161c9f500e00b4ef21a9ef3ebde321c7715be68c7a3159339be0c
-DIST mythplugins-0.27.3-e1d575da2fdde7ae7119972c688b0ddd15e676c4.tar.xz 1300 SHA256 474717393208877b7813f6d560255d55b30386fc1756888f190396155c89b20b SHA512 c40a066a65ac06fb0dd9f9270917165817adc2a2d37a2ccd15dce2a3624826fa16cfff5df696256b299cb61c83a0527f8f5b304b53a3280f665783747f34e942 WHIRLPOOL 7f02084b34e24ee845c5a236ab94a1853ad40bae3c26f8ccf65d9c0c44129a63946e3b1b4bc037a7ae37dafd1c0a4777642189a54592a5bb262c66cdf8c20c81
-DIST mythplugins-0.27.4-3b4390396bf09dfe3741508ecf7fc71a004abd01.tar.xz 200 SHA256 1c46beb6bcdcfc43caf8a076110b6ad4ada6ef7edb00d4f9503a24a474a51c9c SHA512 bde3d68b40998038099c6c1042a2d40c310f783860f008ae30cdb2088226244ae8a37d329f38ae68c192e93d9c5a80b7e5eb2107d8938095b7724a9327da8220 WHIRLPOOL 86e60d132be0a79a4a728c49730b747b995aeb9f887d88e462a4d06c0e5128e7635800b33952cf6648c5311d2e2a9f8931914825be9c782fd5ae58657e36f3d3
 DIST mythplugins-0.27.5-9498257571e8158926b60a0eefc74568c4436823.tar.xz 1364 SHA256 8b7abe67562767478f583fe36704570612425f82a05b9288cc82e3015bf2fc16 SHA512 2fe3a317ecdffc06d9e9b554cf8bfb54a324b7f1441038d51e9f77d13b53693ed6d2721282b239967c6d539947e1b119f579e49b42ba62f7dafd0144c0d28622 WHIRLPOOL 5fc5222364fbb11312f92f8adaef3adff46e89251afcdeea48d1466625072d068ebdb66f9426140765da6f4fc02a117b086033a319f148700cc164bad6fbc0f1
-DIST mythtv-0.27.1.tar.gz 85612356 SHA256 a7039ba46347f1d6a0ed392a53117639c8cba6bc458a6ad30082046d8ad85de7 SHA512 f2c79765948c0a00c7a92f24d2315b5af3044333f67ed8925a59c5bebbdebf98792ef05e2bc8864bfbe77be8cc8ff530e3f4e8761320cfe5ed21369341d8915e WHIRLPOOL 938e0e77070473a523323fe64e40eb416809b40b16943d66a5914d65caa7530dd4b5ba5209919050a7b4968c9e5ca5155ee970f165b39a5c77392debb20bf0ad
-DIST mythtv-0.27.3.tar.gz 85624583 SHA256 8eaaf8c6e42ca6eb81f180467de90d597dbeabb1bb14b7085da353d2980db8f4 SHA512 c825c6d5a4fab6fe3179dbb78730575732615ab41cf2d21f82c6e6317ab62c9a6570cd9d204c39c04d176138c90dfdc95892cd8336bb8487051f1f3842cc0866 WHIRLPOOL b9382dbe1019bde96135ff404039d4db5ef03d52d5f2d75cfd3005e1e5eea702529df3a45497c081de89d9ecfd5a6a143b6dadc228e581453b9aa75c63bcc042
-DIST mythtv-0.27.4.tar.gz 85644227 SHA256 1f734ffc776e4938aa913e49ce94279f2c2d520c62af278f1d04fe399723365b SHA512 6f858f32467756e96db6f79ccb2c42edc0bf22d217cb7b9dc9188ada994bbb9aafe9f72dd71aca10cd26bad1bd5d344af64487ec5fc925872aba81cf7aa257c8 WHIRLPOOL 65cd1869b7cee00197179b13a138d466dc443ecaf23c665754e0451e7ab51940e7235cb74d23ed7296be2c716f443c9c42df2fdd918a0480a04c63381ebce2c4
 DIST mythtv-0.27.5.tar.gz 85652939 SHA256 7e625f94332effeadfba8e7ae7c98d44a83bfc25b7c59e39adce67dc2f4e1e1b SHA512 b912e010e54271f9321ac1b11d4a31e4093f86c0f2ae3139d4b55085bab142ca3fc6d847d163f6b75aa31320404914c71c094528dc8ee7d70086e56a828b9169 WHIRLPOOL e9ebbbabac6ed53b4ec90537371a63e053bb9a2c0a0e920e43d3d2e475f87bdd0ac5a4604045498e88aaf06b11eb054d50dea7881c87dbd45a36c08309e1b880
 DIST mythtv-0.27.tar.gz 85904162 SHA256 494ebd7ee384e751c05ee0a1b3dcd3618caf72f1e94810381c09c2b5d1c799f0 SHA512 2ea070497a7610b8e1548112d9925a28aeedba819c2d063e88cc63daf69947379ce7213e357c26bf2221f8a8e865c937dee3b9bf2695644f2f1adeadf6d11116 WHIRLPOOL 74c4fade0d0f93a64e5f1da3120358f15f6f8891f53b7c74b41a286369e192790cae87829b79a3a90ce3ca23ede63b3dfa809b514b68cee220432794414b8a47
diff --git a/media-plugins/mythplugins/mythplugins-0.27.1_p20140817.ebuild b/media-plugins/mythplugins/mythplugins-0.27.1_p20140817.ebuild
deleted file mode 100644
index 3be3c06ea6c4..000000000000
--- a/media-plugins/mythplugins/mythplugins-0.27.1_p20140817.ebuild
+++ /dev/null
@@ -1,164 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_DEPEND="2:2.6"
-BACKPORTS="082d5c1fbccd48dd862f14007c0445dee8502f3d"
-MY_P=${P%_p*}
-
-inherit eutils python
-
-DESCRIPTION="Official MythTV plugins"
-HOMEPAGE="http://www.mythtv.org"
-SRC_URI="https://github.com/MythTV/mythtv/archive/v0.27.1.tar.gz -> mythtv-0.27.1.tar.gz
-	${BACKPORTS:+https://dev.gentoo.org/~rich0/distfiles/${MY_P}-${BACKPORTS}.tar.xz}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-MYTHPLUGINS="mytharchive mythbrowser mythgallery mythgame \
-mythmusic mythnetvision mythnews mythweather mythzoneminder"
-
-IUSE="${MYTHPLUGINS} cdda cdr exif fftw raw"
-
-DEPEND="!media-plugins/mytharchive
-	!media-plugins/mythbrowser
-	!media-plugins/mythgallery
-	!media-plugins/mythgame
-	!media-plugins/mythmovies
-	!media-plugins/mythmusic
-	!media-plugins/mythnetvision
-	!media-plugins/mythnews
-	!media-plugins/mythweather
-	=media-tv/mythtv-${PV}*:=[python]
-	dev-libs/glib:=
-	dev-libs/libxml2:=
-	dev-qt/qtcore:4
-	dev-qt/qtgui:4
-	dev-qt/qtopengl:4
-	dev-qt/qtsql:4
-	dev-libs/openssl:=
-	media-libs/alsa-lib:=
-	media-libs/faac:=
-	media-libs/freetype:=
-	media-libs/libass:=
-	media-libs/libiec61883:=
-	media-libs/libogg:=
-	media-libs/libpng:=
-	media-libs/libtheora:=
-	media-libs/libvpx:=
-	media-libs/x264:=
-	media-libs/xvid:=
-	virtual/libudev:=
-	sys-libs/libavc1394:=
-	sys-libs/libraw1394:=
-	x11-libs/libX11:=
-	sys-libs/zlib:=
-	x11-libs/libXext:=
-	x11-libs/libXinerama:=
-	x11-libs/libXrandr:=
-	x11-libs/libXv:=
-	x11-libs/libXxf86vm:=
-	media-sound/lame:=
-	fftw? ( sci-libs/fftw:= )
-	sys-apps/util-linux:=
-	mythzoneminder? ( virtual/mysql:= )
-	mytharchive? (
-		app-cdr/dvd+rw-tools
-		virtual/python-imaging:=
-		media-video/dvdauthor
-		media-video/mjpegtools[png]
-		media-video/transcode
-		virtual/cdrtools
-	)
-	mythgallery? (
-		media-libs/tiff:=
-		virtual/opengl
-		exif? ( >media-libs/libexif-0.6.9:= )
-		raw? ( media-gfx/dcraw )
-	)
-	mythmusic? (
-		>=media-libs/flac-1.1.2:=
-		>=media-libs/libvorbis-1.0:=
-		>=media-libs/taglib-1.6:=
-		virtual/opengl
-		cdda? (
-			dev-libs/libcdio:=
-			cdr? ( virtual/cdrtools )
-		)
-
-	)
-	mythnetvision? (
-		=dev-lang/python-2*:=[xml]
-		dev-python/lxml:=
-		dev-python/mysql-python:=
-		dev-python/oauth:=
-		dev-python/pycurl:=
-	)
-	mythweather? (
-		dev-perl/DateManip
-		dev-perl/DateTime-Format-ISO8601
-		>=dev-perl/DateTime-1
-		dev-perl/ImageSize
-		dev-perl/JSON
-		dev-perl/SOAP-Lite
-		dev-perl/XML-Simple
-		dev-perl/XML-Parser
-		dev-perl/XML-SAX
-		dev-perl/XML-XPath
-	)
-	mythbrowser? (
-		dev-qt/qtwebkit:4
-	)"
-RDEPEND="${DEPEND}"
-
-REQUIRED_USE="
-	cdda? ( mythmusic )
-	cdr? ( mythmusic cdda )
-	exif? ( mythgallery )
-	fftw? ( mythmusic )
-	mythnews? ( mythbrowser )
-	raw? ( mythgallery )"
-
-S="${WORKDIR}/mythtv-0.27.1/mythplugins"
-
-pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
-}
-
-src_prepare() {
-	[[ -n ${BACKPORTS} ]] && \
-		EPATCH_FORCE=yes EPATCH_SUFFIX="patch" EPATCH_SOURCE="${WORKDIR}/${MY_P}/patches" \
-			epatch
-
-	epatch_user
-}
-
-src_configure() {
-	./configure \
-		--prefix=/usr \
-		--python=python2 \
-		--enable-opengl \
-		$(use_enable mythzoneminder) \
-		$(use_enable mytharchive) \
-		$(use_enable mythbrowser) \
-		$(use_enable mythgallery) \
-		$(use_enable mythgame) \
-		$(use_enable mythmusic) \
-		$(use_enable mythnetvision) \
-		$(use_enable mythnews) \
-		$(use_enable mythweather) \
-		$(use_enable cdda cdio) \
-		$(use_enable exif) \
-		$(use_enable exif new-exif) \
-		$(use_enable raw dcraw) \
-		|| die "configure failed"
-}
-
-src_install() {
-	emake INSTALL_ROOT="${D}" install || die "make install failed"
-}
diff --git a/media-plugins/mythplugins/mythplugins-0.27.3_p20141009.ebuild b/media-plugins/mythplugins/mythplugins-0.27.3_p20141009.ebuild
deleted file mode 100644
index dec07eb8a8b5..000000000000
--- a/media-plugins/mythplugins/mythplugins-0.27.3_p20141009.ebuild
+++ /dev/null
@@ -1,168 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_DEPEND="2:2.6"
-BACKPORTS="e1d575da2fdde7ae7119972c688b0ddd15e676c4"
-MY_P=${P%_p*}
-
-inherit eutils python
-
-DESCRIPTION="Official MythTV plugins"
-HOMEPAGE="http://www.mythtv.org"
-SRC_URI="https://github.com/MythTV/mythtv/archive/v0.27.3.tar.gz -> mythtv-0.27.3.tar.gz
-	${BACKPORTS:+https://dev.gentoo.org/~rich0/distfiles/${MY_P}-${BACKPORTS}.tar.xz}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-MYTHPLUGINS="mytharchive mythbrowser mythgallery mythgame \
-mythmusic mythnetvision mythnews mythweather mythzoneminder"
-
-IUSE="${MYTHPLUGINS} alsa cdda cdr exif fftw hls ieee1394 libass raw theora vorbis xml xvid"
-
-DEPEND="!media-plugins/mytharchive
-	!media-plugins/mythbrowser
-	!media-plugins/mythgallery
-	!media-plugins/mythgame
-	!media-plugins/mythmovies
-	!media-plugins/mythmusic
-	!media-plugins/mythnetvision
-	!media-plugins/mythnews
-	!media-plugins/mythweather
-	=media-tv/mythtv-${PV}*:=[alsa=,hls=,ieee1394=,libass=,python,theora=,vorbis=,xml=,xvid=]
-	dev-libs/glib:=
-	xml? ( >=dev-libs/libxml2-2.6.0:= )
-	dev-qt/qtcore:4
-	dev-qt/qtgui:4
-	dev-qt/qtopengl:4
-	dev-qt/qtsql:4
-	dev-libs/openssl:=
-	alsa? ( >=media-libs/alsa-lib-1.0.24:= )
-	hls? (
-		media-libs/faac:=
-		media-libs/libvpx:=
-		>=media-libs/x264-0.0.20111220:=
-		>=media-sound/lame-3.93.1
-	)
-	media-libs/freetype:=
-	libass? ( >=media-libs/libass-0.9.11:= )
-	media-libs/libpng:=
-	theora? ( media-libs/libtheora:= media-libs/libogg:= )
-	vorbis? ( media-libs/libogg:= )
-	xvid? ( >=media-libs/xvid-1.1.0:= )
-	virtual/libudev:=
-	ieee1394? (
-		>=sys-libs/libraw1394-1.2.0:=
-		>=sys-libs/libavc1394-0.5.3:=
-		>=media-libs/libiec61883-1.0.0:=
-	)
-	x11-libs/libX11:=
-	sys-libs/zlib:=
-	x11-libs/libXext:=
-	x11-libs/libXinerama:=
-	x11-libs/libXrandr:=
-	x11-libs/libXv:=
-	x11-libs/libXxf86vm:=
-	fftw? ( sci-libs/fftw:= )
-	sys-apps/util-linux:=
-	mythzoneminder? ( virtual/mysql:= )
-	mytharchive? (
-		app-cdr/dvd+rw-tools
-		virtual/python-imaging:=
-		media-video/dvdauthor
-		media-video/mjpegtools[png]
-		media-video/transcode
-		virtual/cdrtools
-	)
-	mythgallery? (
-		media-libs/tiff:=
-		virtual/opengl
-		exif? ( >media-libs/libexif-0.6.9:= )
-		raw? ( media-gfx/dcraw )
-	)
-	mythmusic? (
-		>=media-libs/flac-1.1.2:=
-		>=media-libs/taglib-1.6:=
-		vorbis? ( >=media-libs/libvorbis-1.0:= )
-		virtual/opengl
-		cdda? (
-			dev-libs/libcdio:=
-			cdr? ( virtual/cdrtools )
-		)
-
-	)
-	mythnetvision? (
-		=dev-lang/python-2*:=[xml]
-		dev-python/lxml:=
-		dev-python/mysql-python:=
-		dev-python/oauth:=
-		dev-python/pycurl:=
-	)
-	mythweather? (
-		dev-perl/DateManip
-		dev-perl/DateTime-Format-ISO8601
-		>=dev-perl/DateTime-1
-		dev-perl/ImageSize
-		dev-perl/JSON
-		dev-perl/SOAP-Lite
-		dev-perl/XML-Simple
-		dev-perl/XML-Parser
-		dev-perl/XML-SAX
-		dev-perl/XML-XPath
-	)
-	mythbrowser? (
-		dev-qt/qtwebkit:4
-	)"
-RDEPEND="${DEPEND}"
-
-REQUIRED_USE="
-	cdda? ( mythmusic )
-	cdr? ( mythmusic cdda )
-	exif? ( mythgallery )
-	fftw? ( mythmusic )
-	mythnews? ( mythbrowser )
-	raw? ( mythgallery )"
-
-S="${WORKDIR}/mythtv-0.27.3/mythplugins"
-
-pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
-}
-
-src_prepare() {
-	[[ -n ${BACKPORTS} ]] && \
-		EPATCH_FORCE=yes EPATCH_SUFFIX="patch" EPATCH_SOURCE="${WORKDIR}/${MY_P}/patches" \
-			epatch
-
-	epatch_user
-}
-
-src_configure() {
-	./configure \
-		--prefix=/usr \
-		--python=python2 \
-		--enable-opengl \
-		$(use_enable mythzoneminder) \
-		$(use_enable mytharchive) \
-		$(use_enable mythbrowser) \
-		$(use_enable mythgallery) \
-		$(use_enable mythgame) \
-		$(use_enable mythmusic) \
-		$(use_enable mythnetvision) \
-		$(use_enable mythnews) \
-		$(use_enable mythweather) \
-		$(use_enable cdda cdio) \
-		$(use_enable exif) \
-		$(use_enable exif new-exif) \
-		$(use_enable raw dcraw) \
-		|| die "configure failed"
-}
-
-src_install() {
-	emake INSTALL_ROOT="${D}" install || die "make install failed"
-}
diff --git a/media-plugins/mythplugins/mythplugins-0.27.4_p20150124.ebuild b/media-plugins/mythplugins/mythplugins-0.27.4_p20150124.ebuild
deleted file mode 100644
index 59774c1dde13..000000000000
--- a/media-plugins/mythplugins/mythplugins-0.27.4_p20150124.ebuild
+++ /dev/null
@@ -1,168 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_DEPEND="2:2.7"
-BACKPORTS="3b4390396bf09dfe3741508ecf7fc71a004abd01"
-MY_P=${P%_p*}
-
-inherit eutils python
-
-DESCRIPTION="Official MythTV plugins"
-HOMEPAGE="http://www.mythtv.org"
-SRC_URI="https://github.com/MythTV/mythtv/archive/v0.27.4.tar.gz -> mythtv-0.27.4.tar.gz
-	${BACKPORTS:+https://dev.gentoo.org/~rich0/distfiles/${MY_P}-${BACKPORTS}.tar.xz}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-MYTHPLUGINS="mytharchive mythbrowser mythgallery mythgame \
-mythmusic mythnetvision mythnews mythweather mythzoneminder"
-
-IUSE="${MYTHPLUGINS} alsa cdda cdr exif fftw hls ieee1394 libass raw theora vorbis xml xvid"
-
-DEPEND="!media-plugins/mytharchive
-	!media-plugins/mythbrowser
-	!media-plugins/mythgallery
-	!media-plugins/mythgame
-	!media-plugins/mythmovies
-	!media-plugins/mythmusic
-	!media-plugins/mythnetvision
-	!media-plugins/mythnews
-	!media-plugins/mythweather
-	=media-tv/mythtv-${PV}*:=[alsa=,hls=,ieee1394=,libass=,python,theora=,vorbis=,xml=,xvid=]
-	dev-libs/glib:=
-	xml? ( >=dev-libs/libxml2-2.6.0:= )
-	dev-qt/qtcore:4
-	dev-qt/qtgui:4
-	dev-qt/qtopengl:4
-	dev-qt/qtsql:4
-	dev-libs/openssl:=
-	alsa? ( >=media-libs/alsa-lib-1.0.24:= )
-	hls? (
-		media-libs/faac:=
-		media-libs/libvpx:=
-		>=media-libs/x264-0.0.20111220:=
-		>=media-sound/lame-3.93.1
-	)
-	media-libs/freetype:=
-	libass? ( >=media-libs/libass-0.9.11:= )
-	media-libs/libpng:=
-	theora? ( media-libs/libtheora:= media-libs/libogg:= )
-	vorbis? ( media-libs/libogg:= )
-	xvid? ( >=media-libs/xvid-1.1.0:= )
-	virtual/libudev:=
-	ieee1394? (
-		>=sys-libs/libraw1394-1.2.0:=
-		>=sys-libs/libavc1394-0.5.3:=
-		>=media-libs/libiec61883-1.0.0:=
-	)
-	x11-libs/libX11:=
-	sys-libs/zlib:=
-	x11-libs/libXext:=
-	x11-libs/libXinerama:=
-	x11-libs/libXrandr:=
-	x11-libs/libXv:=
-	x11-libs/libXxf86vm:=
-	fftw? ( sci-libs/fftw:= )
-	sys-apps/util-linux:=
-	mythzoneminder? ( virtual/mysql:= )
-	mytharchive? (
-		app-cdr/dvd+rw-tools
-		virtual/python-imaging:=
-		media-video/dvdauthor
-		media-video/mjpegtools[png]
-		media-video/transcode
-		virtual/cdrtools
-	)
-	mythgallery? (
-		media-libs/tiff:=
-		virtual/opengl
-		exif? ( >media-libs/libexif-0.6.9:= )
-		raw? ( media-gfx/dcraw )
-	)
-	mythmusic? (
-		>=media-libs/flac-1.1.2:=
-		>=media-libs/taglib-1.6:=
-		vorbis? ( >=media-libs/libvorbis-1.0:= )
-		virtual/opengl
-		cdda? (
-			dev-libs/libcdio:=
-			cdr? ( virtual/cdrtools )
-		)
-
-	)
-	mythnetvision? (
-		=dev-lang/python-2*:=[xml]
-		dev-python/lxml:=
-		dev-python/mysql-python:=
-		dev-python/oauth:=
-		dev-python/pycurl:=
-	)
-	mythweather? (
-		dev-perl/DateManip
-		dev-perl/DateTime-Format-ISO8601
-		>=dev-perl/DateTime-1
-		dev-perl/ImageSize
-		dev-perl/JSON
-		dev-perl/SOAP-Lite
-		dev-perl/XML-Simple
-		dev-perl/XML-Parser
-		dev-perl/XML-SAX
-		dev-perl/XML-XPath
-	)
-	mythbrowser? (
-		dev-qt/qtwebkit:4
-	)"
-RDEPEND="${DEPEND}"
-
-REQUIRED_USE="
-	cdda? ( mythmusic )
-	cdr? ( mythmusic cdda )
-	exif? ( mythgallery )
-	fftw? ( mythmusic )
-	mythnews? ( mythbrowser )
-	raw? ( mythgallery )"
-
-S="${WORKDIR}/mythtv-0.27.4/mythplugins"
-
-pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
-}
-
-src_prepare() {
-	[[ -n ${BACKPORTS} ]] && \
-		EPATCH_FORCE=yes EPATCH_SUFFIX="patch" EPATCH_SOURCE="${WORKDIR}/${MY_P}/patches" \
-			epatch
-
-	epatch_user
-}
-
-src_configure() {
-	./configure \
-		--prefix=/usr \
-		--python=python2 \
-		--enable-opengl \
-		$(use_enable mythzoneminder) \
-		$(use_enable mytharchive) \
-		$(use_enable mythbrowser) \
-		$(use_enable mythgallery) \
-		$(use_enable mythgame) \
-		$(use_enable mythmusic) \
-		$(use_enable mythnetvision) \
-		$(use_enable mythnews) \
-		$(use_enable mythweather) \
-		$(use_enable cdda cdio) \
-		$(use_enable exif) \
-		$(use_enable exif new-exif) \
-		$(use_enable raw dcraw) \
-		|| die "configure failed"
-}
-
-src_install() {
-	emake INSTALL_ROOT="${D}" install || die "make install failed"
-}
diff --git a/media-plugins/mythplugins/mythplugins-0.27.5_p20150627-r1.ebuild b/media-plugins/mythplugins/mythplugins-0.27.5_p20150627-r1.ebuild
new file mode 100644
index 000000000000..e72d72122cb2
--- /dev/null
+++ b/media-plugins/mythplugins/mythplugins-0.27.5_p20150627-r1.ebuild
@@ -0,0 +1,174 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="xml"
+BACKPORTS="9498257571e8158926b60a0eefc74568c4436823"
+MY_P=${P%_p*}
+
+inherit eutils python-single-r1
+
+DESCRIPTION="Official MythTV plugins"
+HOMEPAGE="http://www.mythtv.org"
+SRC_URI="https://github.com/MythTV/mythtv/archive/v0.27.5.tar.gz -> mythtv-0.27.5.tar.gz
+	${BACKPORTS:+https://dev.gentoo.org/~rich0/distfiles/${MY_P}-${BACKPORTS}.tar.xz}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+MYTHPLUGINS="mytharchive mythbrowser mythgallery mythgame \
+mythmusic mythnetvision mythnews mythweather mythzoneminder"
+
+IUSE="${MYTHPLUGINS} alsa cdda cdr exif fftw hls ieee1394 libass raw theora vorbis xml xvid"
+
+DEPEND="!media-plugins/mytharchive
+	!media-plugins/mythbrowser
+	!media-plugins/mythgallery
+	!media-plugins/mythgame
+	!media-plugins/mythmovies
+	!media-plugins/mythmusic
+	!media-plugins/mythnetvision
+	!media-plugins/mythnews
+	!media-plugins/mythweather
+	=media-tv/mythtv-${PV}*:=[alsa=,hls=,ieee1394=,libass=,python,theora=,vorbis=,xml=,xvid=]
+	dev-libs/glib:=
+	xml? ( >=dev-libs/libxml2-2.6.0:= )
+	dev-qt/qtcore:4
+	dev-qt/qtgui:4
+	dev-qt/qtopengl:4
+	dev-qt/qtsql:4
+	dev-libs/openssl:=
+	alsa? ( >=media-libs/alsa-lib-1.0.24:= )
+	hls? (
+		media-libs/faac:=
+		media-libs/libvpx:=
+		>=media-libs/x264-0.0.20111220:=
+		>=media-sound/lame-3.93.1
+	)
+	media-libs/freetype:=
+	libass? ( >=media-libs/libass-0.9.11:= )
+	media-libs/libpng:=
+	theora? (
+		media-libs/libtheora:=
+		media-libs/libogg:=
+	)
+	xvid? ( >=media-libs/xvid-1.1.0:= )
+	virtual/libudev:=
+	ieee1394? (
+		>=sys-libs/libraw1394-1.2.0:=
+		>=sys-libs/libavc1394-0.5.3:=
+		>=media-libs/libiec61883-1.0.0:=
+	)
+	x11-libs/libX11:=
+	sys-libs/zlib:=
+	x11-libs/libXext:=
+	x11-libs/libXinerama:=
+	x11-libs/libXrandr:=
+	x11-libs/libXv:=
+	x11-libs/libXxf86vm:=
+	fftw? ( sci-libs/fftw:= )
+	sys-apps/util-linux:=
+	mythzoneminder? ( virtual/mysql )
+	mytharchive? (
+		app-cdr/dvd+rw-tools
+		virtual/python-imaging:=
+		media-video/dvdauthor
+		media-video/mjpegtools[png]
+		media-video/transcode
+		virtual/cdrtools
+	)
+	mythgallery? (
+		media-libs/tiff:=
+		virtual/opengl
+		exif? ( >media-libs/libexif-0.6.9:= )
+		raw? ( media-gfx/dcraw )
+	)
+	mythmusic? (
+		>=media-libs/flac-1.1.2:=
+		>=media-libs/taglib-1.6:=
+		>=media-libs/libvorbis-1.0:=
+		media-libs/libogg:=
+		>=media-sound/lame-3.93.1
+		virtual/opengl
+		cdda? (
+			dev-libs/libcdio:=
+			cdr? ( virtual/cdrtools )
+		)
+
+	)
+	mythnetvision? (
+		${PYTHON_DEPS}
+		dev-python/lxml:=
+		dev-python/mysql-python:=
+		dev-python/oauth:=
+		dev-python/pycurl:=
+	)
+	mythweather? (
+		dev-perl/DateManip
+		dev-perl/DateTime-Format-ISO8601
+		>=dev-perl/DateTime-1
+		dev-perl/ImageSize
+		dev-perl/JSON
+		dev-perl/SOAP-Lite
+		dev-perl/XML-Simple
+		dev-perl/XML-Parser
+		dev-perl/XML-SAX
+		dev-perl/XML-XPath
+	)
+	mythbrowser? (
+		dev-qt/qtwebkit:4
+	)"
+RDEPEND="${DEPEND}"
+
+REQUIRED_USE="
+	cdda? ( mythmusic )
+	cdr? ( mythmusic cdda )
+	exif? ( mythgallery )
+	fftw? ( mythmusic )
+	mythmusic? ( vorbis )
+	mythnews? ( mythbrowser )
+	raw? ( mythgallery )
+	mythnetvision? ( ${PYTHON_REQUIRED_USE} )"
+
+S="${WORKDIR}/mythtv-0.27.5/mythplugins"
+
+pkg_setup() {
+	use mythnetvision && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	[[ -n ${BACKPORTS} ]] && \
+		EPATCH_FORCE=yes EPATCH_SUFFIX="patch" EPATCH_SOURCE="${WORKDIR}/${MY_P}/patches" \
+			epatch
+
+	epatch_user
+}
+
+src_configure() {
+	./configure \
+		--prefix=/usr \
+		--python=${EPYTHON} \
+		--enable-opengl \
+		$(use_enable mythzoneminder) \
+		$(use_enable mytharchive) \
+		$(use_enable mythbrowser) \
+		$(use_enable mythgallery) \
+		$(use_enable mythgame) \
+		$(use_enable mythmusic) \
+		$(use_enable mythnetvision) \
+		$(use_enable mythnews) \
+		$(use_enable mythweather) \
+		$(use_enable cdda cdio) \
+		$(use_enable exif) \
+		$(use_enable exif new-exif) \
+		$(use_enable raw dcraw) \
+		|| die "configure failed"
+}
+
+src_install() {
+	emake INSTALL_ROOT="${D}" install || die "make install failed"
+}
diff --git a/media-plugins/mythplugins/mythplugins-0.27.5_p20150627.ebuild b/media-plugins/mythplugins/mythplugins-0.27.5_p20150627.ebuild
deleted file mode 100644
index bf96d054bc8c..000000000000
--- a/media-plugins/mythplugins/mythplugins-0.27.5_p20150627.ebuild
+++ /dev/null
@@ -1,168 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_DEPEND="2:2.7"
-BACKPORTS="9498257571e8158926b60a0eefc74568c4436823"
-MY_P=${P%_p*}
-
-inherit eutils python
-
-DESCRIPTION="Official MythTV plugins"
-HOMEPAGE="http://www.mythtv.org"
-SRC_URI="https://github.com/MythTV/mythtv/archive/v0.27.5.tar.gz -> mythtv-0.27.5.tar.gz
-	${BACKPORTS:+https://dev.gentoo.org/~rich0/distfiles/${MY_P}-${BACKPORTS}.tar.xz}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-MYTHPLUGINS="mytharchive mythbrowser mythgallery mythgame \
-mythmusic mythnetvision mythnews mythweather mythzoneminder"
-
-IUSE="${MYTHPLUGINS} alsa cdda cdr exif fftw hls ieee1394 libass raw theora vorbis xml xvid"
-
-DEPEND="!media-plugins/mytharchive
-	!media-plugins/mythbrowser
-	!media-plugins/mythgallery
-	!media-plugins/mythgame
-	!media-plugins/mythmovies
-	!media-plugins/mythmusic
-	!media-plugins/mythnetvision
-	!media-plugins/mythnews
-	!media-plugins/mythweather
-	=media-tv/mythtv-${PV}*:=[alsa=,hls=,ieee1394=,libass=,python,theora=,vorbis=,xml=,xvid=]
-	dev-libs/glib:=
-	xml? ( >=dev-libs/libxml2-2.6.0:= )
-	dev-qt/qtcore:4
-	dev-qt/qtgui:4
-	dev-qt/qtopengl:4
-	dev-qt/qtsql:4
-	dev-libs/openssl:=
-	alsa? ( >=media-libs/alsa-lib-1.0.24:= )
-	hls? (
-		media-libs/faac:=
-		media-libs/libvpx:=
-		>=media-libs/x264-0.0.20111220:=
-		>=media-sound/lame-3.93.1
-	)
-	media-libs/freetype:=
-	libass? ( >=media-libs/libass-0.9.11:= )
-	media-libs/libpng:=
-	theora? ( media-libs/libtheora:= media-libs/libogg:= )
-	vorbis? ( media-libs/libogg:= )
-	xvid? ( >=media-libs/xvid-1.1.0:= )
-	virtual/libudev:=
-	ieee1394? (
-		>=sys-libs/libraw1394-1.2.0:=
-		>=sys-libs/libavc1394-0.5.3:=
-		>=media-libs/libiec61883-1.0.0:=
-	)
-	x11-libs/libX11:=
-	sys-libs/zlib:=
-	x11-libs/libXext:=
-	x11-libs/libXinerama:=
-	x11-libs/libXrandr:=
-	x11-libs/libXv:=
-	x11-libs/libXxf86vm:=
-	fftw? ( sci-libs/fftw:= )
-	sys-apps/util-linux:=
-	mythzoneminder? ( virtual/mysql )
-	mytharchive? (
-		app-cdr/dvd+rw-tools
-		virtual/python-imaging:=
-		media-video/dvdauthor
-		media-video/mjpegtools[png]
-		media-video/transcode
-		virtual/cdrtools
-	)
-	mythgallery? (
-		media-libs/tiff:=
-		virtual/opengl
-		exif? ( >media-libs/libexif-0.6.9:= )
-		raw? ( media-gfx/dcraw )
-	)
-	mythmusic? (
-		>=media-libs/flac-1.1.2:=
-		>=media-libs/taglib-1.6:=
-		vorbis? ( >=media-libs/libvorbis-1.0:= )
-		virtual/opengl
-		cdda? (
-			dev-libs/libcdio:=
-			cdr? ( virtual/cdrtools )
-		)
-
-	)
-	mythnetvision? (
-		=dev-lang/python-2*:=[xml]
-		dev-python/lxml:=
-		dev-python/mysql-python:=
-		dev-python/oauth:=
-		dev-python/pycurl:=
-	)
-	mythweather? (
-		dev-perl/DateManip
-		dev-perl/DateTime-Format-ISO8601
-		>=dev-perl/DateTime-1
-		dev-perl/ImageSize
-		dev-perl/JSON
-		dev-perl/SOAP-Lite
-		dev-perl/XML-Simple
-		dev-perl/XML-Parser
-		dev-perl/XML-SAX
-		dev-perl/XML-XPath
-	)
-	mythbrowser? (
-		dev-qt/qtwebkit:4
-	)"
-RDEPEND="${DEPEND}"
-
-REQUIRED_USE="
-	cdda? ( mythmusic )
-	cdr? ( mythmusic cdda )
-	exif? ( mythgallery )
-	fftw? ( mythmusic )
-	mythnews? ( mythbrowser )
-	raw? ( mythgallery )"
-
-S="${WORKDIR}/mythtv-0.27.5/mythplugins"
-
-pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
-}
-
-src_prepare() {
-	[[ -n ${BACKPORTS} ]] && \
-		EPATCH_FORCE=yes EPATCH_SUFFIX="patch" EPATCH_SOURCE="${WORKDIR}/${MY_P}/patches" \
-			epatch
-
-	epatch_user
-}
-
-src_configure() {
-	./configure \
-		--prefix=/usr \
-		--python=python2 \
-		--enable-opengl \
-		$(use_enable mythzoneminder) \
-		$(use_enable mytharchive) \
-		$(use_enable mythbrowser) \
-		$(use_enable mythgallery) \
-		$(use_enable mythgame) \
-		$(use_enable mythmusic) \
-		$(use_enable mythnetvision) \
-		$(use_enable mythnews) \
-		$(use_enable mythweather) \
-		$(use_enable cdda cdio) \
-		$(use_enable exif) \
-		$(use_enable exif new-exif) \
-		$(use_enable raw dcraw) \
-		|| die "configure failed"
-}
-
-src_install() {
-	emake INSTALL_ROOT="${D}" install || die "make install failed"
-}
diff --git a/media-plugins/quodlibet-plugins/metadata.xml b/media-plugins/quodlibet-plugins/metadata.xml
index 2b2512fb3b3b..6f518c30ace9 100644
--- a/media-plugins/quodlibet-plugins/metadata.xml
+++ b/media-plugins/quodlibet-plugins/metadata.xml
@@ -6,4 +6,7 @@
 		<name>Matthias Maier</name>
 	</maintainer>
 	<herd>sound</herd>
+	<upstream>
+		<remote-id type="github">quodlibet/quodlibet</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/media-plugins/vdr-duplicates/Manifest b/media-plugins/vdr-duplicates/Manifest
index 2256c06fb4ea..0d74894f964e 100644
--- a/media-plugins/vdr-duplicates/Manifest
+++ b/media-plugins/vdr-duplicates/Manifest
@@ -1 +1,2 @@
 DIST vdr-duplicates-0.0.5.tgz 14745 SHA256 9ebe5efcf41a504f9bd3dbeb0cd709e101a31f2cac89f266e5cc1a6426c2cbb4 SHA512 9e8ec30cbf9b1447aa00152be48237a8688dcfd746b06774b3f5d87d7100037ee8f890507c06d203a81bc05b4b476e326a3c1f0fe84e222a876a7de534b2495d WHIRLPOOL a80b7d9247485bfe0de6cc07061b3906b629e332a4aea09ab5e3526cc35146522ff244f96be73e416deca70eaeb9e6ba1240c28437d7c7296911a870f7ad044f
+DIST vdr-duplicates-0.1.0.tgz 16696 SHA256 6e40acb6dbc7103dce858b5caad5cc96fb21dd9dc2d2c53a60e78a44d626510f SHA512 1ada8262ed349af98ba3ea62bb732b69febff29d74a7dd225f3ee3216e3ea7d5a20fea71ad4f7dd2f87da5a27b7f6de0dcd56554e6f819f3a002e51633c50500 WHIRLPOOL 83be55c0b83555f115111ab2447340ab8fe5994e443590c8f09590cd341d239fd7a32306b4aa4d9c3ed0e5165cc9758c37ce9dccc9e2658e99629f17f30a6d84
diff --git a/media-plugins/vdr-duplicates/vdr-duplicates-0.1.0.ebuild b/media-plugins/vdr-duplicates/vdr-duplicates-0.1.0.ebuild
new file mode 100644
index 000000000000..5fab165a704f
--- /dev/null
+++ b/media-plugins/vdr-duplicates/vdr-duplicates-0.1.0.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit vdr-plugin-2
+
+DESCRIPTION="VDR Plugin: show duplicated records"
+HOMEPAGE="http://www.tolleri.net/vdr/"
+SRC_URI="http://www.tolleri.net/vdr/plugins/${P}.tgz"
+
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+LICENSE="GPL-2"
+IUSE=""
+
+DEPEND=">=media-video/vdr-2.0.0"
+RDEPEND="${DEPEND}"
diff --git a/media-sound/alsamixergui/alsamixergui-0.9.0.1.2-r4.ebuild b/media-sound/alsamixergui/alsamixergui-0.9.0.1.2-r4.ebuild
index c24b9a4741db..d3d7099d11c0 100644
--- a/media-sound/alsamixergui/alsamixergui-0.9.0.1.2-r4.ebuild
+++ b/media-sound/alsamixergui/alsamixergui-0.9.0.1.2-r4.ebuild
@@ -36,7 +36,7 @@ src_prepare() {
 
 src_configure() {
 	append-ldflags "-L$(dirname $(fltk-config --libs))"
-	append-flags "-I/usr/include/fltk"
+	append-flags "-I$(fltk-config --includedir)"
 	econf
 }
 
diff --git a/media-sound/cantata/metadata.xml b/media-sound/cantata/metadata.xml
index 4bf3ab690394..312ce3f77280 100644
--- a/media-sound/cantata/metadata.xml
+++ b/media-sound/cantata/metadata.xml
@@ -9,4 +9,7 @@
 		<flag name="replaygain">Enable ReplayGain support, for relative volume adjustments</flag>
 		<flag name="streams">Enable support for streams tab (to save favourite streams, and search for others)</flag>
 	</use>
+	<upstream>
+		<remote-id type="github">cdrummond/cantata</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/media-sound/gejengel/metadata.xml b/media-sound/gejengel/metadata.xml
index d9fbae1396c9..b6d93507fdf1 100644
--- a/media-sound/gejengel/metadata.xml
+++ b/media-sound/gejengel/metadata.xml
@@ -11,5 +11,6 @@
 	</longdescription>
 	<upstream>
 		<remote-id type="google-code">gejengel</remote-id>
+		<remote-id type="github">dirkvdb/gejengel</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/media-sound/gnome-music/Manifest b/media-sound/gnome-music/Manifest
index 6c2cca991663..c55622ae4deb 100644
--- a/media-sound/gnome-music/Manifest
+++ b/media-sound/gnome-music/Manifest
@@ -1,2 +1,3 @@
 DIST gnome-music-3.14.3.1.tar.xz 1466232 SHA256 9bf614cd790bc7abebe56c65f3acae56c90ea5488f97a41a8ef70bcbce42604a SHA512 ce394fdd6701f5da2b1ac1bf9ca66de706a335ac5022466260a4e5a76646a062f7b48cf27207baea37c29805b234fe0fabe34fe47cea33009b27dbc5aec54e9b WHIRLPOOL 0672023af6dc95da76c78030bfb88c3f74ae127c69715cfc624d1391c5a651808a32203e6a7e20e6408977f610c23c3153ca71616fde21b3dfb290605cf98c35
 DIST gnome-music-3.16.1.tar.xz 1477652 SHA256 116945d87fbac6aea2aedfa8e6a98bef720675916a0a6e9ae21aa83d450ad2df SHA512 dfc65d4d951fa9e87b9969b9a4c8affe467770ac37f8bf2027135b26668b099217a467cec6747f16f9cfed04f2403b13923bcd59c2548a9a22f4090adef7e2c2 WHIRLPOOL 9b9af3cdc935189a4aafbe475a1da8481389ddf70495c80a1d0834df370d3b9e195526152837638e2b29023e9734acea6ffed0f5f903b9865d3e26d25b596977
+DIST gnome-music-3.16.2.tar.xz 1479984 SHA256 362cf90f6cd41c38845b7afa01ce2f5fbb70ce7694139a69f5dac16620723588 SHA512 c634a72f5c539e7e0792f780dcced1b48c56a0467182ab60506d3d22d1b7b7ff030b79f440ea874b8fca5b084bc121668cd5f03f2eb3ffbd82b7fa810a2885d2 WHIRLPOOL e576f033d1194ea7b9232d420a3e5e4a895ce6836f0e4d592579ea0baeab2b3113f9cf3eafa2f17922ad14c2f45e9b79f07291664ab7404000d74d421bf0c9b4
diff --git a/media-sound/gnome-music/gnome-music-3.16.2.ebuild b/media-sound/gnome-music/gnome-music-3.16.2.ebuild
new file mode 100644
index 000000000000..2aa9fd31ea59
--- /dev/null
+++ b/media-sound/gnome-music/gnome-music-3.16.2.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+PYTHON_COMPAT=( python{3_3,3_4} )
+
+inherit gnome2 python-r1
+
+DESCRIPTION="Music management for Gnome"
+HOMEPAGE="https://wiki.gnome.org/Apps/Music"
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+KEYWORDS="amd64 ~x86"
+
+COMMON_DEPEND="
+	${PYTHON_DEPS}
+	>=dev-libs/glib-2.28:2
+	>=dev-libs/gobject-introspection-1.35.9:=
+	>=media-libs/grilo-0.2.6:0.2[introspection]
+	media-libs/libmediaart:2.0
+	>=x11-libs/gtk+-3.13.2:3[introspection]
+"
+# xdg-user-dirs-update needs to be there to create needed dirs
+# https://bugzilla.gnome.org/show_bug.cgi?id=731613
+RDEPEND="${COMMON_DEPEND}
+	app-misc/tracker[introspection(+)]
+	|| (
+		app-misc/tracker[gstreamer]
+		app-misc/tracker[ffmpeg]
+	)
+	dev-python/pygobject:3[cairo,${PYTHON_USEDEP}]
+	dev-python/dbus-python[${PYTHON_USEDEP}]
+	media-libs/gstreamer:1.0[introspection]
+	media-libs/gst-plugins-base:1.0[introspection]
+	media-plugins/gst-plugins-meta:1.0
+	media-plugins/grilo-plugins:0.2[tracker]
+	x11-misc/xdg-user-dirs
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-util/intltool-0.26
+	dev-util/itstool
+	virtual/pkgconfig
+"
+
+pkg_setup() {
+	python_setup
+}
diff --git a/media-sound/gnome-sound-recorder/gnome-sound-recorder-3.16.0.ebuild b/media-sound/gnome-sound-recorder/gnome-sound-recorder-3.16.0.ebuild
index ae9380114ba9..d7213b870259 100644
--- a/media-sound/gnome-sound-recorder/gnome-sound-recorder-3.16.0.ebuild
+++ b/media-sound/gnome-sound-recorder/gnome-sound-recorder-3.16.0.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/ThreePointEleven/Features/SoundRecorder"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64 ~x86"
 IUSE=""
 
 # For the list of plugins, see src/audioProfile.js
diff --git a/media-sound/ncmpcpp/Manifest b/media-sound/ncmpcpp/Manifest
index d8b915f3aa88..ef0dbcd3fb74 100644
--- a/media-sound/ncmpcpp/Manifest
+++ b/media-sound/ncmpcpp/Manifest
@@ -1,2 +1,3 @@
 DIST ncmpcpp-0.6.4.tar.bz2 429705 SHA256 757e2e06b7e17009c24e2b46a69f008e61aa679476f93e00dc602ca087c805f1 SHA512 c60a6c2c89a9297d73360ec8819e8ae66ca53090c5ea5d3daf235e708467ee20006b1fff344c9312ccb0941c8307f3d84bcdc9cbf500955c74b10bd6a823c19f WHIRLPOOL 56bd22148f38289030a558b43008f83e9e0ccd1ff178be183ad935d08b397de51c49f2c7d84ab9504b62b0105516f460ff131d65a99af9e73519783e15c84797
 DIST ncmpcpp-0.6.5.tar.bz2 429699 SHA256 51128f6835c592c8d4367a66b08e06a9419a86c9d5c6e91d0f1dc73af56cd1fd SHA512 b120bd3c0697d51755e04908d29ddd4180ae662d3f02d60e967ccbefca87471eaf0dcf4ebed5d76203b7a0a6dd17a397f318a65087c1b8ec1e3fb4178964e581 WHIRLPOOL c4fa51645de9f1c7a530ee06113bc0fce5954d155112de4921dec2af5da58465b646c193f8359708b51619ec5f0fc9968680ec22549f97352f9309006499c77b
+DIST ncmpcpp-0.6.6.tar.bz2 429353 SHA256 2b7408b207c3ffd1ddd11bcb9c0a1f2434bb80db990dcf482968cf915ebc0e67 SHA512 5f288c1e5b96b38586e6c3230b09380584e902bc5d44147433093c48e4b61efd32b3b405ee96b4341e56ab2b26590ed2320bf1ca188e46796c13be5da52acb58 WHIRLPOOL f4976fac3eb65f8952104b545d9532c743a07de987ebb0c89fb2ba51f359748ec8a14dc143330fe37e7e0d6115125c834d2a05c6d640214926dae384f4315f05
diff --git a/media-sound/ncmpcpp/ncmpcpp-0.6.5.ebuild b/media-sound/ncmpcpp/ncmpcpp-0.6.5.ebuild
index 45e453f06e32..e89b3d7a1132 100644
--- a/media-sound/ncmpcpp/ncmpcpp-0.6.5.ebuild
+++ b/media-sound/ncmpcpp/ncmpcpp-0.6.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://ncmpcpp.rybczak.net/stable/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 arm hppa ~ppc ppc64 ~sparc x86"
+KEYWORDS="amd64 arm hppa ppc ppc64 ~sparc x86"
 IUSE="clock curl outputs taglib unicode visualizer"
 
 RDEPEND="
diff --git a/media-sound/ncmpcpp/ncmpcpp-0.6.6.ebuild b/media-sound/ncmpcpp/ncmpcpp-0.6.6.ebuild
new file mode 100644
index 000000000000..fae8b4835a42
--- /dev/null
+++ b/media-sound/ncmpcpp/ncmpcpp-0.6.6.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils
+
+DESCRIPTION="featureful ncurses based MPD client inspired by ncmpc"
+HOMEPAGE="http://ncmpcpp.rybczak.net/"
+SRC_URI="http://ncmpcpp.rybczak.net/stable/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="clock curl outputs taglib unicode visualizer"
+
+RDEPEND="
+	>=media-libs/libmpdclient-2.1
+	curl? ( net-misc/curl )
+	dev-libs/boost:=[nls,threads]
+	sys-libs/ncurses[unicode?]
+	sys-libs/readline:*
+	taglib? ( media-libs/taglib )
+	visualizer? ( sci-libs/fftw:3.0 )
+"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	sed -i -e '/^docdir/d' {,doc/}Makefile{.am,.in} || die
+	sed -i -e 's|COPYING||g' Makefile{.am,.in} || die
+}
+
+src_configure() {
+	econf \
+		$(use_enable clock) \
+		$(use_enable outputs) \
+		$(use_enable unicode) \
+		$(use_enable visualizer) \
+		$(use_with curl) \
+		$(use_with taglib) \
+		$(use_with visualizer fftw) \
+		--docdir=/usr/share/doc/${PF}
+}
+
+src_install() {
+	default
+
+	dodoc doc/{bindings,config}
+}
+
+pkg_postinst() {
+	echo
+	elog "Example configuration files have been installed at"
+	elog "${ROOT}usr/share/doc/${PF}"
+	elog "${P} uses ~/.ncmpcpp/config and ~/.ncmpcpp/bindings"
+	elog "as user configuration files."
+	echo
+	if use visualizer; then
+	elog "If you want to use the visualizer, you need mpd with fifo enabled."
+	echo
+	fi
+}
diff --git a/media-sound/pithos/pithos-1.0.1.ebuild b/media-sound/pithos/pithos-1.0.1.ebuild
index 27f94504a195..0d82599f3ade 100644
--- a/media-sound/pithos/pithos-1.0.1.ebuild
+++ b/media-sound/pithos/pithos-1.0.1.ebuild
@@ -22,9 +22,8 @@ SLOT="0"
 KEYWORDS="~amd64"
 IUSE="libnotify appindicator +keybinder"
 
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/pylast[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}
+RDEPEND="
+	dev-python/pylast[${PYTHON_USEDEP}]
 	dev-python/dbus-python[${PYTHON_USEDEP}]
 	>=dev-python/pygobject-3.12[${PYTHON_USEDEP}]
 	media-libs/gstreamer:1.0[introspection]
@@ -33,9 +32,11 @@ RDEPEND="${DEPEND}
 	libnotify? ( x11-libs/libnotify[introspection] )
 	appindicator? ( dev-libs/libappindicator:3[introspection] )
 	keybinder? ( dev-libs/keybinder:3[introspection] )"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
 
 PATCHES=("${FILESDIR}/${PN}-1.0.0-icons.patch")
 
 python_test() {
-	esetup.py test || die
+	esetup.py test
 }
diff --git a/media-sound/pithos/pithos-1.1.1.ebuild b/media-sound/pithos/pithos-1.1.1.ebuild
index f187a8e4b16c..d93c812df1e0 100644
--- a/media-sound/pithos/pithos-1.1.1.ebuild
+++ b/media-sound/pithos/pithos-1.1.1.ebuild
@@ -22,8 +22,8 @@ SLOT="0"
 KEYWORDS="~amd64"
 IUSE="libnotify appindicator +keybinder"
 
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}
+RDEPEND="
+	dev-python/pylast[${PYTHON_USEDEP}]
 	dev-python/dbus-python[${PYTHON_USEDEP}]
 	>=dev-python/pygobject-3.12[${PYTHON_USEDEP}]
 	x11-libs/pango[introspection]
@@ -34,7 +34,9 @@ RDEPEND="${DEPEND}
 	libnotify? ( x11-libs/libnotify[introspection] )
 	appindicator? ( dev-libs/libappindicator:3[introspection] )
 	keybinder? ( dev-libs/keybinder:3[introspection] )"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
 
 python_test() {
-	esetup.py test || die
+	esetup.py test
 }
diff --git a/media-sound/pithos/pithos-9999.ebuild b/media-sound/pithos/pithos-9999.ebuild
index 120ed367782c..81978c6f5223 100644
--- a/media-sound/pithos/pithos-9999.ebuild
+++ b/media-sound/pithos/pithos-9999.ebuild
@@ -22,8 +22,8 @@ SLOT="0"
 KEYWORDS=""
 IUSE="libnotify appindicator +keybinder"
 
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}
+RDEPEND="
+	dev-python/pylast[${PYTHON_USEDEP}]
 	dev-python/dbus-python[${PYTHON_USEDEP}]
 	>=dev-python/pygobject-3.12[${PYTHON_USEDEP}]
 	x11-libs/pango[introspection]
@@ -34,7 +34,9 @@ RDEPEND="${DEPEND}
 	libnotify? ( x11-libs/libnotify[introspection] )
 	appindicator? ( dev-libs/libappindicator:3[introspection] )
 	keybinder? ( dev-libs/keybinder:3[introspection] )"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
 
 python_test() {
-	esetup.py test || die
+	esetup.py test
 }
diff --git a/media-sound/pulseaudio/pulseaudio-6.0.ebuild b/media-sound/pulseaudio/pulseaudio-6.0.ebuild
index 6bca2354daaa..8ae760eafdae 100644
--- a/media-sound/pulseaudio/pulseaudio-6.0.ebuild
+++ b/media-sound/pulseaudio/pulseaudio-6.0.ebuild
@@ -17,7 +17,7 @@ LICENSE="!gdbm? ( LGPL-2.1 ) gdbm? ( GPL-2 )"
 
 SLOT="0"
 #KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
 
 # +alsa-plugin as discussed in bug #519530
 IUSE="+alsa +alsa-plugin +asyncns bluetooth +caps dbus doc equalizer +gdbm +glib
@@ -379,4 +379,11 @@ pkg_postinst() {
 		elog "The libsamplerate based resamplers are now deprecated, because they offer no"
 		elog "particular advantage over speex. Upstream suggests disabling them."
 	fi
+
+	# Needed for pulseaudio-6.0 update from older versions
+	if use udev; then
+		if ! version_is_at_least 6.0 ${REPLACING_VERSIONS}; then
+			udevadm control --reload && udevadm trigger
+		fi
+	fi
 }
diff --git a/media-sound/sound-juicer/sound-juicer-3.16.1.ebuild b/media-sound/sound-juicer/sound-juicer-3.16.1.ebuild
index b2914190d230..dd617e4439ca 100644
--- a/media-sound/sound-juicer/sound-juicer-3.16.1.ebuild
+++ b/media-sound/sound-juicer/sound-juicer-3.16.1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/SoundJuicer"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE="flac test vorbis"
 
 COMMON_DEPEND="
diff --git a/media-sound/soundconverter/Manifest b/media-sound/soundconverter/Manifest
index bdcc404ecc5a..e6c0c748ff05 100644
--- a/media-sound/soundconverter/Manifest
+++ b/media-sound/soundconverter/Manifest
@@ -1,3 +1 @@
-DIST soundconverter-2.1.3.tar.xz 193176 SHA256 26a78f14210af911c12b71f3452a77bceb5fc6b1f6b626de4d4c961299a76cd1 SHA512 0768630d0fb7e89d37cba793e150eda81b98edd536a41f529e99812451ae8134b7257da7c97ceb3d8780ae640d9c8d23665103d0c08ef0811bbc01ec07ee41d0 WHIRLPOOL 823839018b1f6bb1a914354fd02fcb9c0721d3727b747e908cd97899ef4b6f773d2d98cd724bb15b2b7be0316c9a6e7c3e4e9829db65163a77ef9290168fdc04
-DIST soundconverter-2.1.4.tar.xz 193428 SHA256 2b125dda38f5d494d97fa43c8a238b6354510f9a0540d6e912eea59b4f22bf4a SHA512 27f24c40e965cc4c2f7045956b7856cc4d2b840b95b8da9363d0b987cf8d65616db484f2266516070d8018efdfed33d9a84b64e7cf8cad5e6d4d08b1409d9ad9 WHIRLPOOL 6241a96dfcd4b6ea8f31d945b941a6b0d9f06dc6869f1ad92d18e1e924987e5a4fec743707e763b481718fa92d96ec52a331439ea7ea1adefa47eac5ee2e956d
 DIST soundconverter-2.1.5.tar.xz 195380 SHA256 cace2109b967744325e4ce8938d286b78b86f0615d4f145966f42decc7a74e06 SHA512 6d42bd2cfa200e7af8c69ce94580a4f96bdb0354623207e5d1c3beadee89920363b5b8cee4cdcfa6fcbd036860d50f739b05e34e9a34608fe3d6243876936c6a WHIRLPOOL e3f9ea4bbe012aa8b977321ee85601c69d67324b35654b494ffe6792af8043a21af7d7d429929cea28fe7273e08e11f93da9b00cb4f99c88f22266e6b0c3419d
diff --git a/media-sound/soundconverter/files/soundconverter-2.1.5-files-dropping.patch b/media-sound/soundconverter/files/soundconverter-2.1.5-files-dropping.patch
new file mode 100644
index 000000000000..859151e805a2
--- /dev/null
+++ b/media-sound/soundconverter/files/soundconverter-2.1.5-files-dropping.patch
@@ -0,0 +1,25 @@
+From 8c0b59e4ba46d97916193d01be683d459e7fb0fb Mon Sep 17 00:00:00 2001
+From: kassoulet <gautier@soundconverter.org>
+Date: Sat, 7 Feb 2015 16:23:49 +0100
+Subject: [PATCH] Fix broken files dropping.
+
+The current folder was added to the list of dropped files.
+
+Closes lp:1419259
+---
+ soundconverter/ui.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/soundconverter/ui.py b/soundconverter/ui.py
+index c652254..a7656a1 100644
+--- a/soundconverter/ui.py
++++ b/soundconverter/ui.py
+@@ -174,7 +174,7 @@ def drag_data_received(self, widget, context, x, y, selection,
+                              mime_id, time):
+         widget.stop_emission('drag_data_received')
+         if mime_id >= 0 and mime_id < len(self.drop_mime_types):
+-            uris = [filename_to_uri(uri.strip()) for uri in selection.data.split('\n')]
++            uris = [filename_to_uri(uri.strip()) for uri in selection.data.split('\n') if uri]
+             self.add_uris(uris)
+             context.finish(True, False, time)
+ 
diff --git a/media-sound/soundconverter/soundconverter-2.1.3.ebuild b/media-sound/soundconverter/soundconverter-2.1.3.ebuild
deleted file mode 100644
index ccd04cd94742..000000000000
--- a/media-sound/soundconverter/soundconverter-2.1.3.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-# TODO: convert
-#	dev-python/gconf-python
-#	dev-python/gnome-vfs-python
-#	dev-python/libgnome-python
-# See bug #477814
-
-EAPI=5
-
-GCONF_DEBUG=no
-PYTHON_COMPAT=( python2_7 )
-inherit gnome2 multilib python-single-r1
-
-DESCRIPTION="A simple audiofile converter application for the GNOME environment"
-HOMEPAGE="http://soundconverter.org/"
-SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="aac flac mp3 opus vorbis"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	dev-python/gconf-python
-	dev-python/gnome-vfs-python
-	=dev-python/gst-python-0.10*[${PYTHON_USEDEP}]
-	dev-python/pygobject:2[${PYTHON_USEDEP}]
-	>=dev-python/pygtk-2.12[${PYTHON_USEDEP}]
-	dev-python/libgnome-python
-	gnome-base/libglade
-	aac? (
-		=media-plugins/gst-plugins-faac-0.10*
-		=media-plugins/gst-plugins-faad-0.10*
-		)
-	flac? ( =media-plugins/gst-plugins-flac-0.10* )
-	mp3? (
-		=media-plugins/gst-plugins-lame-0.10*
-		=media-plugins/gst-plugins-mad-0.10*
-		=media-plugins/gst-plugins-taglib-0.10*
-		)
-	vorbis? (
-		=media-plugins/gst-plugins-ogg-0.10*
-		=media-plugins/gst-plugins-vorbis-0.10*
-		)
-	opus? (
-		=media-plugins/gst-plugins-opus-0.10*
-		)
-"
-DEPEND="${RDEPEND}
-	app-arch/xz-utils
-	dev-util/intltool
-	virtual/pkgconfig
-	sys-devel/gettext
-"
-
-src_prepare() {
-	python_fix_shebang .
-	gnome2_src_prepare
-}
-
-src_install() {
-	gnome2_src_install
-	python_optimize "${ED%/}"/usr/$(get_libdir)/soundconverter/python
-}
diff --git a/media-sound/soundconverter/soundconverter-2.1.4.ebuild b/media-sound/soundconverter/soundconverter-2.1.4.ebuild
deleted file mode 100644
index 5b54170af8b8..000000000000
--- a/media-sound/soundconverter/soundconverter-2.1.4.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-GCONF_DEBUG=no
-PYTHON_COMPAT=( python2_7 )
-
-inherit gnome2 multilib python-single-r1
-
-DESCRIPTION="A simple audiofile converter application for the GNOME environment"
-HOMEPAGE="http://soundconverter.org/"
-SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="aac flac mp3 opus vorbis"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	dev-python/gconf-python[${PYTHON_USEDEP}]
-	dev-python/gnome-vfs-python[${PYTHON_USEDEP}]
-	dev-python/gst-python:0.10[${PYTHON_USEDEP}]
-	dev-python/pygobject:2[${PYTHON_USEDEP}]
-	>=dev-python/pygtk-2.12[${PYTHON_USEDEP}]
-	dev-python/libgnome-python[${PYTHON_USEDEP}]
-	gnome-base/libglade[${PYTHON_USEDEP}]
-	aac? (
-		media-plugins/gst-plugins-faac:0.10
-		media-plugins/gst-plugins-faad:0.10 )
-	flac? ( media-plugins/gst-plugins-flac:0.10 )
-	mp3? (
-		media-plugins/gst-plugins-lame:0.10
-		media-plugins/gst-plugins-mad:0.10
-		media-plugins/gst-plugins-taglib:0.10 )
-	vorbis? (
-		media-plugins/gst-plugins-ogg:0.10
-		media-plugins/gst-plugins-vorbis:0.10 )
-	opus? (	media-plugins/gst-plugins-opus:0.10 )
-"
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	virtual/pkgconfig
-	sys-devel/gettext
-"
-
-src_prepare() {
-	python_fix_shebang .
-	gnome2_src_prepare
-}
-
-src_install() {
-	gnome2_src_install
-	python_optimize "${ED%/}"/usr/$(get_libdir)/soundconverter/python
-}
diff --git a/media-sound/soundconverter/soundconverter-2.1.5-r1.ebuild b/media-sound/soundconverter/soundconverter-2.1.5-r1.ebuild
new file mode 100644
index 000000000000..a313c3f966a9
--- /dev/null
+++ b/media-sound/soundconverter/soundconverter-2.1.5-r1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+GCONF_DEBUG=no
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils gnome2 multilib python-single-r1
+
+DESCRIPTION="A simple audiofile converter application for the GNOME environment"
+HOMEPAGE="http://soundconverter.org/"
+SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 ~x86"
+
+IUSE="aac flac mp3 opus vorbis"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	dev-python/gconf-python[${PYTHON_USEDEP}]
+	dev-python/gnome-vfs-python[${PYTHON_USEDEP}]
+	dev-python/gst-python:0.10[${PYTHON_USEDEP}]
+	dev-python/pygobject:2[${PYTHON_USEDEP}]
+	>=dev-python/pygtk-2.12[${PYTHON_USEDEP}]
+	dev-python/libgnome-python[${PYTHON_USEDEP}]
+	gnome-base/libglade[${PYTHON_USEDEP}]
+	aac? (
+		media-plugins/gst-plugins-faac:0.10
+		media-plugins/gst-plugins-faad:0.10 )
+	flac? ( media-plugins/gst-plugins-flac:0.10 )
+	mp3? (
+		media-plugins/gst-plugins-lame:0.10
+		media-plugins/gst-plugins-mad:0.10
+		media-plugins/gst-plugins-taglib:0.10 )
+	vorbis? (
+		media-plugins/gst-plugins-ogg:0.10
+		media-plugins/gst-plugins-vorbis:0.10 )
+	opus? (	media-plugins/gst-plugins-opus:0.10 )
+"
+DEPEND="${RDEPEND}
+	dev-util/intltool
+	virtual/pkgconfig
+	sys-devel/gettext
+"
+
+src_prepare() {
+	# Fix broken files dropping, upstream bug #1419259
+	epatch "${FILESDIR}/${P}-files-dropping.patch"
+
+	python_fix_shebang .
+	gnome2_src_prepare
+}
+
+src_install() {
+	gnome2_src_install
+	python_optimize "${ED%/}"/usr/$(get_libdir)/soundconverter/python
+}
diff --git a/media-sound/streamtranscoder/streamtranscoder-3.1.11.ebuild b/media-sound/streamtranscoder/streamtranscoder-3.1.11.ebuild
index 5bb3ca9ea07f..748da965a29d 100644
--- a/media-sound/streamtranscoder/streamtranscoder-3.1.11.ebuild
+++ b/media-sound/streamtranscoder/streamtranscoder-3.1.11.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://www.oddsock.org/tools/streamTranscoderV3/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~sparc x86"
+KEYWORDS="amd64 ppc ~sparc x86"
 IUSE=""
 
 RDEPEND=">=media-libs/libogg-1.1
diff --git a/media-sound/teamspeak-client-bin/Manifest b/media-sound/teamspeak-client-bin/Manifest
index c8ccff53dcb0..c0fa4170ebef 100644
--- a/media-sound/teamspeak-client-bin/Manifest
+++ b/media-sound/teamspeak-client-bin/Manifest
@@ -1,4 +1,4 @@
-DIST TeamSpeak3-Client-linux_amd64-3.0.13.1.run 33207717 SHA256 211aa921c73369e074e59aa4b664c9d288f98a5f1172f9f8b006a46df5dd4856 SHA512 3d5fc5b419cfd683a0c7787f3ec4b6df14bd944db85eb0abffdbc2b14e5c913cbf77353b46cf81c89f8a34127d362f1312c3e7d6a21b9087b78a171ce0349d9c WHIRLPOOL d2ca0eb74ea5393941dc0613c5ff8462bbae484d61a8d1e2a3e7a04905e777d328e34e073c7a2394d0be6385c92e386d74617c39f7ab6fcb47b13ba5201538c0
 DIST TeamSpeak3-Client-linux_amd64-3.0.16.run 35784109 SHA256 62034baddf352dd2fea615f0aac9a6df7eae363bb3ed7cad78c1fb996b86773f SHA512 a65d986fe4860caf1bba8217fcf429fe4571867439e734e5838893e31167fa1f134c4cabbd3ef80d744f22298172d87496e4f025f51fd7c275781a3bc2c56838 WHIRLPOOL bf3bd39f93aa08b625e659d2cdd5ab857e0f940a344f5535f2941cce367a57b5191b61f18c7b5e63c3b051dac57ebb8c3df739ebc0fec1a721e863afc1e833c2
-DIST TeamSpeak3-Client-linux_x86-3.0.13.1.run 33947497 SHA256 0162f1cef570acde7245fb62c3ed52aa606234375a14d0bcce35500b183d9cc2 SHA512 32af801f73de876e667f31b8046baf9df6498a1ad6f71de2ca33257ee685abc80f200750e4c8e6cb5931635d31f261de9cb409f930c1e99e42be5f9543dbf062 WHIRLPOOL 69964e6b757f77c9ba87b3efa19b55ced5aa60a0ee50af3011426682832d307e4eb79554d8928f5647556258d40808eb5259d3606c7b2df27dcdb95c19078482
+DIST TeamSpeak3-Client-linux_amd64-3.0.17.run 42685092 SHA256 22a427c2cb42087979f559a6c36c873857087fff1a1c8a48688b2e17dc967f7e SHA512 4869aa109e984cde53a0a1faef6fdaff82fdac237119cb69df7bdf06f5fdf878143c62d39b098f1b85277f370702fa37a307a24961462f05750a2d1df2b674b1 WHIRLPOOL ec9bf82cec4a51dc0ddaee16ee55c354216977db441f9526b2127406fbc992ae39c4ce3dd85fa0acbe80ee87218e7b241d21bb7feb8aa79ec7d2528ed3e03c7d
 DIST TeamSpeak3-Client-linux_x86-3.0.16.run 36484150 SHA256 3fb21e9b428c0b535c90b0a191bcf1baae29bf99be7cf4621b9da276dd5e76ac SHA512 67b1da2769b1a34cd1affc3e36c1d74d7225711666e1c6d0ededbc4c0dc94d52b9d07181ea89db4d8ec09e58f9e61081f981663338ed7d7ec8efac3719f4b0ad WHIRLPOOL 9c2d51ae9d5a77b833ce7ee400cc611df6727e4793de51d6c95fa8e864d5f17bfe2272ac451751250333ac567bb5b3d4366184113f0d74545ed36088dc2bf438
+DIST TeamSpeak3-Client-linux_x86-3.0.17.run 43059396 SHA256 22e14cad852b4ac84189c63fc3899fec9224e658f77b8613e854419502e366dd SHA512 344d903f5963bc079a95b567267c253ec66179033a86192a89895747dba39e39283f41640e19a0a5546e854ea5252b557508963634483fa8f807b06d6697f0fe WHIRLPOOL a1bac380052950dc2b798f7febf3a565fd3ff993f6465765f42a16d7efe2254231e4d612f8e3680157df2dd8c74df21fa5a411e9aec89dd8955585838cce4dd8
diff --git a/media-sound/teamspeak-client-bin/metadata.xml b/media-sound/teamspeak-client-bin/metadata.xml
index 2302bbaf42a4..4a48abc1f4d1 100644
--- a/media-sound/teamspeak-client-bin/metadata.xml
+++ b/media-sound/teamspeak-client-bin/metadata.xml
@@ -7,5 +7,10 @@
     <name>Karol Herbst</name>
     <description>Proxy-Maintainer. Assign bugs to him</description>
   </maintainer>
+  <maintainer>
+    <email>dryatu@gmail.com</email>
+    <name>Sami Loone</name>
+    <description>Proxy-Maintainer. Assign bugs to him</description>
+  </maintainer>
   <longdescription>TeamSpeak Client (Voice Communication Software)</longdescription>
 </pkgmetadata>
diff --git a/media-sound/teamspeak-client-bin/teamspeak-client-bin-3.0.13.1.ebuild b/media-sound/teamspeak-client-bin/teamspeak-client-bin-3.0.13.1.ebuild
deleted file mode 100644
index ac0ea4b9a0a9..000000000000
--- a/media-sound/teamspeak-client-bin/teamspeak-client-bin-3.0.13.1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit eutils unpacker
-
-DESCRIPTION="TeamSpeak Client - Voice Communication Software"
-HOMEPAGE="http://www.teamspeak.com/"
-SRC_URI="
-	amd64? ( http://ftp.4players.de/pub/hosted/ts3/releases/${PV}/TeamSpeak3-Client-linux_amd64-${PV/_/-}.run )
-	x86? ( http://ftp.4players.de/pub/hosted/ts3/releases/${PV}/TeamSpeak3-Client-linux_x86-${PV/_/-}.run )"
-
-LICENSE="teamspeak3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="alsa pulseaudio"
-
-REQUIRED_USE="|| ( alsa pulseaudio )"
-
-RDEPEND="
-	dev-qt/qtcore:4
-	dev-qt/qtgui:4[accessibility,xinerama]
-	dev-qt/qtsql:4
-	sys-libs/glibc
-	sys-libs/zlib
-	alsa? ( media-libs/alsa-lib )
-	pulseaudio? ( media-sound/pulseaudio )"
-
-RESTRICT="fetch mirror strip"
-
-S="${WORKDIR}"
-
-pkg_nofetch() {
-	elog "Please download ${A}"
-	elog "from ${HOMEPAGE}?page=downloads and place this"
-	elog "file in ${DISTDIR}"
-}
-
-src_prepare() {
-	# Remove the qt-libraries as they just cause trouble with the system's Qt, see bug #328807.
-	rm libQt* || die "Couldn't remove bundled Qt libraries."
-
-	# Remove unwanted soundbackends.
-	if ! use alsa ; then
-		rm soundbackends/libalsa* || die
-	fi
-
-	if ! use pulseaudio ; then
-		rm soundbackends/libpulseaudio* || die
-	fi
-
-	# Rename the tsclient to its shorter version, required by the teamspeak3 script we install.
-	mv ts3client_linux_* ts3client || die "Couldn't rename ts3client to its shorter version."
-}
-
-src_install() {
-	insinto /opt/teamspeak3-client
-	doins -r *
-
-	fperms +x /opt/teamspeak3-client/ts3client
-
-	dobin "${FILESDIR}/teamspeak3"
-
-	make_desktop_entry teamspeak3 TeamSpeak3 \
-		"/opt/teamspeak3-client/pluginsdk/docs/client_html/images/logo.png" \
-		Network
-}
diff --git a/media-sound/teamspeak-client-bin/teamspeak-client-bin-3.0.17.ebuild b/media-sound/teamspeak-client-bin/teamspeak-client-bin-3.0.17.ebuild
new file mode 100644
index 000000000000..942d30173ead
--- /dev/null
+++ b/media-sound/teamspeak-client-bin/teamspeak-client-bin-3.0.17.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit eutils unpacker
+
+DESCRIPTION="TeamSpeak Client - Voice Communication Software"
+HOMEPAGE="http://www.teamspeak.com/"
+SRC_URI="
+	amd64? ( http://ftp.4players.de/pub/hosted/ts3/releases/${PV}/TeamSpeak3-Client-linux_amd64-${PV/_/-}.run )
+	x86? ( http://ftp.4players.de/pub/hosted/ts3/releases/${PV}/TeamSpeak3-Client-linux_x86-${PV/_/-}.run )"
+
+LICENSE="teamspeak3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="alsa pulseaudio"
+
+REQUIRED_USE="|| ( alsa pulseaudio )"
+
+RDEPEND="
+	dev-libs/quazip:0/0[qt5]
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5[accessibility]
+	dev-qt/qtnetwork:5
+	dev-qt/qtsql:5[sqlite]
+	dev-qt/qtwidgets:5
+	sys-libs/glibc
+	sys-libs/zlib
+	alsa? ( media-libs/alsa-lib )
+	pulseaudio? ( media-sound/pulseaudio )"
+
+RESTRICT="fetch strip"
+
+S="${WORKDIR}"
+
+pkg_nofetch() {
+	elog "Please download ${A}"
+	elog "from ${HOMEPAGE}?page=downloads and place this"
+	elog "file in ${DISTDIR}"
+}
+
+src_prepare() {
+	# Remove the qt-libraries as they just cause trouble with the system's Qt, see bug #328807.
+	rm libQt* || die "Couldn't remove bundled Qt libraries."
+
+	rm -r platforms sqldrivers qt.conf || die "Couldn't remove bundle Qt files."
+
+	# Remove unwanted soundbackends.
+	if ! use alsa ; then
+		rm soundbackends/libalsa* || die
+	fi
+
+	if ! use pulseaudio ; then
+		rm soundbackends/libpulseaudio* || die
+	fi
+
+	# Remove quazip
+	rm libquazip.so || die
+
+	# Rename the tsclient to its shorter version, required by the teamspeak3 script we install.
+	mv ts3client_linux_* ts3client || die "Couldn't rename ts3client to its shorter version."
+}
+
+src_install() {
+	insinto /opt/teamspeak3-client
+	doins -r *
+
+	fperms +x /opt/teamspeak3-client/ts3client
+
+	dobin "${FILESDIR}/teamspeak3"
+
+	make_desktop_entry teamspeak3 TeamSpeak3 \
+		"/opt/teamspeak3-client/pluginsdk/docs/client_html/images/logo.png" \
+		Network
+}
diff --git a/media-sound/volti/metadata.xml b/media-sound/volti/metadata.xml
index b7f49681830a..be06d1013244 100644
--- a/media-sound/volti/metadata.xml
+++ b/media-sound/volti/metadata.xml
@@ -4,5 +4,6 @@
 	<herd>sound</herd>
 	<upstream>
 		<remote-id type="google-code">volti</remote-id>
+		<remote-id type="github">gen2brain/volti</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/media-tv/kodi/kodi-15.1.ebuild b/media-tv/kodi/kodi-15.1.ebuild
index 80d676586fbd..aae07df3afe4 100644
--- a/media-tv/kodi/kodi-15.1.ebuild
+++ b/media-tv/kodi/kodi-15.1.ebuild
@@ -34,7 +34,7 @@ HOMEPAGE="http://kodi.tv/ http://kodi.wiki/"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="airplay alsa avahi bluetooth bluray caps cec css dbus debug +fishbmc gles goom java joystick midi mysql nfs +opengl profile +projectm pulseaudio +rsxs rtmp +samba sftp +spectrum test +texturepacker udisks upnp upower +usb vaapi vdpau +waveform webserver +X"
+IUSE="airplay alsa avahi bluetooth bluray caps cec css dbus debug +fishbmc gles goom java joystick midi mysql nfs +opengl profile +projectm pulseaudio +rsxs rtmp +samba sftp +spectrum test texturepacker udisks upnp upower +usb vaapi vdpau +waveform webserver +X"
 REQUIRED_USE="
 	rsxs? ( X )
 	udisks? ( dbus )
diff --git a/media-tv/kodi/kodi-9999.ebuild b/media-tv/kodi/kodi-9999.ebuild
index 3ac121968807..ff61848248fd 100644
--- a/media-tv/kodi/kodi-9999.ebuild
+++ b/media-tv/kodi/kodi-9999.ebuild
@@ -34,7 +34,7 @@ HOMEPAGE="http://kodi.tv/ http://kodi.wiki/"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="airplay alsa avahi bluetooth bluray caps cec css dbus debug +fishbmc gles goom java joystick midi mysql nfs +opengl profile +projectm pulseaudio +rsxs rtmp +samba sftp +spectrum test +texturepacker udisks upnp upower +usb vaapi vdpau +waveform webserver +X"
+IUSE="airplay alsa avahi bluetooth bluray caps cec css dbus debug +fishbmc gles goom java joystick midi mysql nfs +opengl profile +projectm pulseaudio +rsxs rtmp +samba sftp +spectrum test texturepacker udisks upnp upower +usb vaapi vdpau +waveform webserver +X"
 REQUIRED_USE="
 	rsxs? ( X )
 	udisks? ( dbus )
diff --git a/media-tv/mythtv/Manifest b/media-tv/mythtv/Manifest
index 931c9d39c812..b750a4e33fe7 100644
--- a/media-tv/mythtv/Manifest
+++ b/media-tv/mythtv/Manifest
@@ -1,12 +1,7 @@
 DIST mythtv-0.26.0-9fd7c6102b2cd1a3760337663803b110446c6ea7.tar.xz 179540 SHA256 ae63398f1ea8884950eb4653c42f6bf71e504738112f5ac8f4d13c1988098d95 SHA512 599dab7a51e9e2f5e240e6d80aadf3bc1f89b8f83e0a5c2e6c82695926ef3f1b7694a73d95b0a296544f9642f1e070a809d86563a415498345a3c1049f269aa4 WHIRLPOOL 74c8aa8f2846eb67f88bddacf5d7c5aa0445e0fe2fbd0f6f2f284e51e1f2c024ca8b7ef22639b7e201b8304421859d7bab802a7d2fe9343ec40d36453f0bfa8e
 DIST mythtv-0.26.0.tar.bz2 40887666 SHA256 2f158962ca3009db563dabc32827c47788a688bd67a25abd76f4baa9c3cfe306 SHA512 8c8766542b6a1a877d400fd99343e8149d9c6cc4ab1e425db358bdbdc10b6cb7422bb4bdcf984ce64b2cf02b0ad0725606b266558afcadff9ec9c9bb95bb49c0 WHIRLPOOL c737a1dbdfafe65ae5ee3bde8d0b3a9ad50ebfccec784d6907c78d03f9732637cfbf8b82ecfca80af0b049c65d70c608a81ac3bf27a8070ba3f32d657f5137bb
 DIST mythtv-0.27-583395f5a376637efcd408a102fa64d0f188c12f.tar.xz 298048 SHA256 2b18428980fe8951694eb9c8594aa2559df491b029987e1a4b983128fdea4f51 SHA512 1d8c2a61bd91d7116ba3b43251d517bda3c8db3c235e73dde66116dc02d14806db9c80bacf6e19eaf816c4765d8e51fe9b53900efa3112134c564c08cc0ca012 WHIRLPOOL 3d50908d085f844cd210c568b50c55c47e4fe8dd8423ffe18303a7c799a45e24dfceaa5221e6f59596394484162d9992f46d5f66b0ad3c57fbb5a240def68dec
-DIST mythtv-0.27.1-082d5c1fbccd48dd862f14007c0445dee8502f3d.tar.xz 161652 SHA256 271c12af8bdf6188f1a11f07ac7c3ad45374cc60211e4a005975af66d5421739 SHA512 ed7ecb9fc5d3abe592e195309d88979a41132ebd99e92e59e2471f17c3f5da089cc5846d817a5228657cef37fade5724f9ac8f0e335ec45855158996a2317016 WHIRLPOOL 86a99cc0a74c75789a98e18fd57b5627b59c650da02602d947a8ccd854ed2bf210e76bf858bc16a2a6fd93763149257ae0e3ea95f44aecf0916b5f1a2b81460d
-DIST mythtv-0.27.1.tar.gz 85612356 SHA256 a7039ba46347f1d6a0ed392a53117639c8cba6bc458a6ad30082046d8ad85de7 SHA512 f2c79765948c0a00c7a92f24d2315b5af3044333f67ed8925a59c5bebbdebf98792ef05e2bc8864bfbe77be8cc8ff530e3f4e8761320cfe5ed21369341d8915e WHIRLPOOL 938e0e77070473a523323fe64e40eb416809b40b16943d66a5914d65caa7530dd4b5ba5209919050a7b4968c9e5ca5155ee970f165b39a5c77392debb20bf0ad
-DIST mythtv-0.27.3-e1d575da2fdde7ae7119972c688b0ddd15e676c4.tar.xz 77584 SHA256 43e54366582c71c0835771987be6dd33543326ba2aba4efb8a57f83b965647cc SHA512 0360b990d0ec5eade879879c516a9169c50aafaff8b08fff60d4d65e93b3c2dadac36869f958e070b644eea72592344a7f678c78a25ae7950372e17b725a1cd1 WHIRLPOOL 5eb3b1cbea2defad1143ad3934ad5d2c2585595013bc8619f8e436eebcdfa35efe377bf40b50281140901314b5c1daf2c8654b9a0f7ab4be59fdc49c5d278c43
-DIST mythtv-0.27.3.tar.gz 85624583 SHA256 8eaaf8c6e42ca6eb81f180467de90d597dbeabb1bb14b7085da353d2980db8f4 SHA512 c825c6d5a4fab6fe3179dbb78730575732615ab41cf2d21f82c6e6317ab62c9a6570cd9d204c39c04d176138c90dfdc95892cd8336bb8487051f1f3842cc0866 WHIRLPOOL b9382dbe1019bde96135ff404039d4db5ef03d52d5f2d75cfd3005e1e5eea702529df3a45497c081de89d9ecfd5a6a143b6dadc228e581453b9aa75c63bcc042
-DIST mythtv-0.27.4-3b4390396bf09dfe3741508ecf7fc71a004abd01.tar.xz 12752 SHA256 b3331d8dbe36d34c88ab42aec2d2d84e2bb51ba11b714f23c5faa91e32ce06de SHA512 8f80378cfc5be8058baa74f7d25e8ec0a0405201e6f8b77b6cb96ba91dbd9b9251947ba7b6e48efad5270624769195891e2c48e0c8d0a16d6f8893801103a26b WHIRLPOOL 140d8dfb39942ef587b551099942b6b284bd49e070225aaee71f3fb4feebfc0ce293461b87fe9f6477def2745a6d71226fb103cf090a25fc33ecf85bd62212b6
-DIST mythtv-0.27.4.tar.gz 85644227 SHA256 1f734ffc776e4938aa913e49ce94279f2c2d520c62af278f1d04fe399723365b SHA512 6f858f32467756e96db6f79ccb2c42edc0bf22d217cb7b9dc9188ada994bbb9aafe9f72dd71aca10cd26bad1bd5d344af64487ec5fc925872aba81cf7aa257c8 WHIRLPOOL 65cd1869b7cee00197179b13a138d466dc443ecaf23c665754e0451e7ab51940e7235cb74d23ed7296be2c716f443c9c42df2fdd918a0480a04c63381ebce2c4
+DIST mythtv-0.27.5-32fd3968acea905d71d9769996487eff280233ea.tar.xz 12292 SHA256 482aadc121a7e770da6d10b5014947ec9ff1350ccc7f672bdc4650ef13e68cca SHA512 8e84cf76541b775143b94da156fdcde1f24d964b58a9423323de730e23142b57c9c44ef01c2202bbb7126058d41153f77f524eebed70f65210c2b9427255ee3a WHIRLPOOL 7375659815ee6170edab81411232bcf73b54575dbb8e69cb5c9c7ff0f13105eddeb01c4026e78ef8c9e7e9d1782880e41a628697c8dd697778cbb4711b3cb820
 DIST mythtv-0.27.5-9498257571e8158926b60a0eefc74568c4436823.tar.xz 11992 SHA256 aef3b944a9f4b49daa3f5489b58a080db35eb7b85c76819d9d00ccf1adfadfdf SHA512 bddc80f6d7e7ad583459a2192660e6101d53d8821c0f875634f90588bc6fbff86c80fa75f6e8cb859fd5164a81f0ad3427939d57da2b112741b1ea9ce646659d WHIRLPOOL 249d4f5332d943669610b96363b6d2b19d63973ba191bd62900e7d31362b4c541077ffe6ca9eae6027c6d1d5fea1d691722739ff9d0d7af6566d288921444961
 DIST mythtv-0.27.5.tar.gz 85652939 SHA256 7e625f94332effeadfba8e7ae7c98d44a83bfc25b7c59e39adce67dc2f4e1e1b SHA512 b912e010e54271f9321ac1b11d4a31e4093f86c0f2ae3139d4b55085bab142ca3fc6d847d163f6b75aa31320404914c71c094528dc8ee7d70086e56a828b9169 WHIRLPOOL e9ebbbabac6ed53b4ec90537371a63e053bb9a2c0a0e920e43d3d2e475f87bdd0ac5a4604045498e88aaf06b11eb054d50dea7881c87dbd45a36c08309e1b880
 DIST mythtv-0.27.tar.gz 85904162 SHA256 494ebd7ee384e751c05ee0a1b3dcd3618caf72f1e94810381c09c2b5d1c799f0 SHA512 2ea070497a7610b8e1548112d9925a28aeedba819c2d063e88cc63daf69947379ce7213e357c26bf2221f8a8e865c937dee3b9bf2695644f2f1adeadf6d11116 WHIRLPOOL 74c4fade0d0f93a64e5f1da3120358f15f6f8891f53b7c74b41a286369e192790cae87829b79a3a90ce3ca23ede63b3dfa809b514b68cee220432794414b8a47
diff --git a/media-tv/mythtv/files/mythbackend.conf-r1 b/media-tv/mythtv/files/mythbackend.conf-r1
new file mode 100644
index 000000000000..3857ae74e46f
--- /dev/null
+++ b/media-tv/mythtv/files/mythbackend.conf-r1
@@ -0,0 +1,19 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+# Accepts any valid combination of logging options to mythbackend
+# To get a valid list run: /usr/bin/mythbackend -v help
+#MYTHBACKEND_VERBOSE="general"
+
+# Configures where mythbackend logs
+# Valid values:
+# * files           - logs each individual daemon in /var/log/mythtv (default)
+# * database        - logs into the database
+# * syslog FACILITY - logs to syslog using FACILITY (see syslog(3))
+# * console         - logs only to the console (no mythlogserver)
+#MYTHBACKEND_LOGGING="files"
+
+# Allows you to pass specific startup options to mythbackend
+# e.g. --noupnp
+#MYTHBACKEND_OPTS=""
diff --git a/media-tv/mythtv/files/mythbackend.init-r1 b/media-tv/mythtv/files/mythbackend.init-r1
new file mode 100644
index 000000000000..e7bbeb186e93
--- /dev/null
+++ b/media-tv/mythtv/files/mythbackend.init-r1
@@ -0,0 +1,70 @@
+#!/sbin/runscript
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+description="MythTV backend recording daemon"
+extra_commands="resched upnprebuild"
+description_resched="Forces the recording scheduler to update"
+description_upnprebuild="Rebuilds the UPnP media cache"
+
+depend() {
+	# mythbackend doesn't need to run on the same machine that
+	# mysql runs on. so its use for that reason
+	use logger net.lo mysql LCDd
+}
+
+start() {
+	local logging=
+
+	[ -z "${MYTHBACKEND_VERBOSE}" ] && \
+		MYTHBACKEND_VERBOSE="general"
+	[ -z "${MYTHBACKEND_LOGGING}" ] && \
+		MYTHBACKEND_LOGGING="files"
+	case "${MYTHBACKEND_LOGGING}" in
+		database) logging="--enable-dblog" ;;
+		syslog\ *) logging="--${MYTHBACKEND_LOGGING}" ;;
+		files) logging="--logpath /var/log/mythtv" ;;
+		console) logging="--nologserver" ;;
+		*)
+			eerror "Invalid MYTHBACKEND_LOGGING value"
+			exit 1
+			;;
+	esac
+
+	#fixes for bug #101308
+	unset DISPLAY
+	unset SESSION_MANAGER
+
+	# Work around any strange permissions that may be on these files.
+	[ "x${MYTHBACKEND_LOGGING}" = "xfiles" ] && \
+		checkpath --dir --owner mythv:video --mode 0664 /var/log/mythtv
+	checkpath --dir --owner mythv:video --mode 0664 /home/mythtv
+
+	ebegin "Starting MythTV Backend"
+	start-stop-daemon --start --quiet --exec /usr/bin/mythbackend \
+                --pidfile /var/run/mythbackend.pid -- \
+		--daemon --pidfile /var/run/mythbackend.pid --user mythtv:video \
+		--verbose ${MYTHBACKEND_VERBOSE} \
+		${logging} ${MYTHBACKEND_OPTS}
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping MythTV Backend"
+	start-stop-daemon --stop --retry 10 --progress \
+		--pidfile=/var/run/mythbackend.pid
+	eend $?
+}
+
+resched() {
+	ebegin "Updating the recording scheduler"
+	/usr/bin/mythbackend --resched
+	eend $?
+}
+
+upnprebuild() {
+	ebegin "Rebuilding UPnP media cache"
+	/usr/bin/mythbackend --upnprebuild
+	eend $?
+}
diff --git a/media-tv/mythtv/files/mythtv.logrotate.d-r3 b/media-tv/mythtv/files/mythtv.logrotate.d-r3
deleted file mode 100644
index 220776a1d087..000000000000
--- a/media-tv/mythtv/files/mythtv.logrotate.d-r3
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-/var/log/mythtv/*.log {
-    weekly
-    rotate 8
-    nocompress
-    nocreate
-    notifempty
-    sharedscripts
-    missingok
-    olddir /var/log/mythtv/old
-    postrotate
-        killall -HUP mythfrontend
-        killall -HUP mythbackend
-        killall -HUP mythlcdserver
-        find /var/log/mythtv/old -type f -mtime +30 -delete
-    endscript
-}
diff --git a/media-tv/mythtv/mythtv-0.27.1_p20140817.ebuild b/media-tv/mythtv/mythtv-0.27.1_p20140817.ebuild
deleted file mode 100644
index d2771be88a28..000000000000
--- a/media-tv/mythtv/mythtv-0.27.1_p20140817.ebuild
+++ /dev/null
@@ -1,353 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_DEPEND="python? 2:2.6"
-BACKPORTS="082d5c1fbccd48dd862f14007c0445dee8502f3d"
-MY_P=${P%_p*}
-
-inherit flag-o-matic multilib eutils python user systemd
-
-MYTHTV_VERSION="v0.27.1"
-MYTHTV_BRANCH="fixes/0.27"
-
-DESCRIPTION="Homebrew PVR project"
-HOMEPAGE="http://www.mythtv.org"
-SRC_URI="https://github.com/MythTV/mythtv/archive/v0.27.1.tar.gz -> mythtv-0.27.1.tar.gz
-	${BACKPORTS:+https://dev.gentoo.org/~rich0/distfiles/${MY_P}-${BACKPORTS}.tar.xz}"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-
-IUSE_INPUT_DEVICES="input_devices_joystick"
-IUSE="alsa altivec libass autostart bluray cec crystalhd debug dvb dvd \
-egl fftw +hls ieee1394 jack lcd lirc perl pulseaudio python raop +theora \
-vaapi vdpau +vorbis +xml xmltv +xvid ${IUSE_INPUT_DEVICES}"
-
-REQUIRED_USE="
-	bluray? ( xml )
-	theora? ( vorbis )"
-
-COMMON="
-	>=media-libs/freetype-2.0:=
-	sys-libs/zlib:=
-	x11-libs/libX11:=
-	x11-libs/libXext:=
-	x11-libs/libXinerama:=
-	x11-libs/libXv:=
-	x11-libs/libXrandr:=
-	x11-libs/libXxf86vm:=
-	>=dev-qt/qtcore-4.7.2:4=
-	>=dev-qt/qtdbus-4.7.2:4=
-	>=dev-qt/qtgui-4.7.2:4=
-	>=dev-qt/qtscript-4.7.2:4=
-	>=dev-qt/qtsql-4.7.2:4=[mysql]
-	>=dev-qt/qtopengl-4.7.2:4=[egl?]
-	>=dev-qt/qtwebkit-4.7.2:4=
-	x11-misc/wmctrl:=
-	virtual/mysql:=
-	virtual/opengl:=
-	alsa? ( >=media-libs/alsa-lib-1.0.24:= )
-	bluray? (
-		dev-libs/libcdio:=
-		media-libs/libbluray:=
-	)
-	cec? ( dev-libs/libcec:= )
-	dvb? (
-		media-libs/libdvb:=
-		virtual/linuxtv-dvb-headers:=
-	)
-	dvd? ( dev-libs/libcdio:= )
-	egl? ( media-libs/mesa:=[egl] )
-	fftw? ( sci-libs/fftw:3.0= )
-	hls? (
-		media-libs/faac:=
-		media-libs/libvpx:=
-		>=media-libs/x264-0.0.20111220:=
-		>=media-sound/lame-3.93.1
-	)
-	ieee1394? (
-		>=sys-libs/libraw1394-1.2.0:=
-		>=sys-libs/libavc1394-0.5.3:=
-		>=media-libs/libiec61883-1.0.0:=
-	)
-	jack? ( media-sound/jack-audio-connection-kit )
-	lcd? ( app-misc/lcdproc )
-	libass? ( >=media-libs/libass-0.9.11:= )
-	lirc? ( app-misc/lirc )
-	perl? (
-		dev-perl/DBD-mysql
-		dev-perl/Net-UPnP
-		dev-perl/LWP-Protocol-https
-		dev-perl/HTTP-Message
-		dev-perl/IO-Socket-INET6
-		>=dev-perl/libwww-perl-5
-	)
-	pulseaudio? ( media-sound/pulseaudio )
-	python? (
-		dev-python/mysql-python
-		dev-python/lxml
-		dev-python/urlgrabber
-	)
-	raop? (
-		dev-libs/openssl:=
-		net-dns/avahi[mdnsresponder-compat]
-	)
-	theora? ( media-libs/libtheora:= media-libs/libogg:= )
-	vaapi? ( x11-libs/libva:= )
-	vdpau? ( x11-libs/libvdpau:= )
-	vorbis? ( >=media-libs/libvorbis-1.0:= media-libs/libogg:= )
-	xml? ( >=dev-libs/libxml2-2.6.0:= )
-	xvid? ( >=media-libs/xvid-1.1.0:= )
-	!media-tv/mythtv-bindings
-	!x11-themes/mythtv-themes
-	media-libs/taglib:=
-	dev-libs/glib:=
-	"
-
-RDEPEND="${COMMON}
-	media-fonts/corefonts
-	media-fonts/dejavu
-	media-fonts/liberation-fonts
-	x11-apps/xinit
-	autostart? (
-		net-dialup/mingetty
-		x11-wm/evilwm
-		x11-apps/xset
-	)
-	dvd? ( media-libs/libdvdcss:= )
-	xmltv? ( >=media-tv/xmltv-0.5.43 )
-	"
-
-DEPEND="${COMMON}
-	dev-lang/yasm
-	x11-proto/xineramaproto
-	x11-proto/xf86vidmodeproto
-	"
-
-S="${WORKDIR}/${MY_P}/mythtv"
-
-MYTHTV_GROUPS="video,audio,tty,uucp"
-
-pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
-	enewuser mythtv -1 /bin/bash /home/mythtv ${MYTHTV_GROUPS}
-	usermod -a -G ${MYTHTV_GROUPS} mythtv
-}
-
-src_prepare() {
-	[[ -n ${BACKPORTS} ]] && \
-		EPATCH_FORCE=yes EPATCH_SUFFIX="patch" EPATCH_SOURCE="${S}/../patches" \
-			epatch
-
-	# Perl bits need to go into vender_perl and not site_perl
-	sed -e "s:pure_install:pure_install INSTALLDIRS=vendor:" \
-		-i "${S}"/bindings/perl/Makefile
-
-	# Fix up the version info since we are using the fixes/${PV} branch
-	echo "SOURCE_VERSION=\"${MYTHTV_VERSION}\"" > "${S}"/VERSION
-	echo "BRANCH=\"${MYTHTV_BRANCH}\"" >> "${S}"/VERSION
-
-	echo "setting.extra -= -ldconfig" >> "${S}"/programs/mythfrontend/mythfrontend.pro
-
-	epatch "${FILESDIR}/libdir-27.patch"
-
-	epatch_user
-}
-
-src_configure() {
-	local myconf=
-
-	# Setup paths
-	myconf="${myconf} --prefix=${EPREFIX}/usr"
-	myconf="${myconf} --libdir=${EPREFIX}/usr/$(get_libdir)"
-	myconf="${myconf} --libdir-name=$(get_libdir)"
-	myconf="${myconf} --mandir=${EPREFIX}/usr/share/man"
-
-	# Audio
-	myconf="${myconf} $(use_enable alsa audio-alsa)"
-	myconf="${myconf} $(use_enable jack audio-jack)"
-	use pulseaudio || myconf="${myconf} --disable-audio-pulseoutput"
-
-	use altivec    || myconf="${myconf} --disable-altivec"
-	myconf="${myconf} $(use_enable dvb)"
-	myconf="${myconf} $(use_enable ieee1394 firewire)"
-	myconf="${myconf} $(use_enable lirc)"
-	myconf="${myconf} $(use_enable xvid libxvid)"
-	myconf="${myconf} --dvb-path=/usr/include"
-	myconf="${myconf} --enable-xrandr"
-	myconf="${myconf} --enable-xv"
-	myconf="${myconf} --enable-x11"
-	myconf="${myconf} --enable-nonfree"
-	use cec || myconf="${myconf} --disable-libcec"
-	use raop || myconf="${myconf} --disable-libdns-sd"
-	myconf="${myconf} $(use_enable theora libtheora)"
-	myconf="${myconf} $(use_enable vorbis libvorbis)"
-
-	if use hls; then
-		myconf="${myconf} --enable-libmp3lame"
-		myconf="${myconf} --enable-libx264"
-		myconf="${myconf} --enable-libvpx"
-		myconf="${myconf} --enable-libfaac"
-	fi
-
-	if use perl && use python; then
-		myconf="${myconf} --with-bindings=perl,python"
-	elif use perl; then
-		myconf="${myconf} --without-bindings=python"
-		myconf="${myconf} --with-bindings=perl"
-	elif use python; then
-		myconf="${myconf} --without-bindings=perl"
-		myconf="${myconf} --with-bindings=python"
-	else
-		myconf="${myconf} --without-bindings=perl,python"
-	fi
-
-	use python && myconf="${myconf} --python=$(PYTHON)"
-
-	if use debug; then
-		myconf="${myconf} --compile-type=debug"
-	else
-		myconf="${myconf} --compile-type=release"
-		#myconf="${myconf} --enable-debug" does nothing per sphery
-		#myconf="${myconf} --disable-stripping" does nothing per sphery
-	fi
-
-	# Video
-	use vdpau && myconf="${myconf} --enable-vdpau"
-	myconf="${myconf} $(use_enable vaapi)"
-	use crystalhd && myconf="${myconf} --enable-crystalhd"
-
-	# Input
-	use input_devices_joystick || myconf="${myconf} --disable-joystick-menu"
-
-	# Clean up DSO load times and other compiler bits
-	myconf="${myconf} --enable-symbol-visibility"
-	myconf="${myconf} --enable-pic"
-
-	# CPU settings
-	for i in $(get-flag march) $(get-flag mcpu) $(get-flag mtune) ; do
-		[ "${i}" = "native" ] && i="host"
-		myconf="${myconf} --cpu=${i}"
-		break
-	done
-
-	if tc-is-cross-compiler ; then
-		myconf="${myconf} --enable-cross-compile --arch=$(tc-arch-kernel)"
-		myconf="${myconf} --cross-prefix=${CHOST}-"
-	fi
-
-	# Build boosters
-	has distcc ${FEATURES} || myconf="${myconf} --disable-distcc"
-	has ccache ${FEATURES} || myconf="${myconf} --disable-ccache"
-
-	chmod +x ./external/FFmpeg/version.sh
-
-	einfo "Running ./configure ${myconf}"
-	./configure \
-		--cc="$(tc-getCC)" \
-		--cxx="$(tc-getCXX)" \
-		--ar="$(tc-getAR)" \
-		--extra-cflags="${CFLAGS}" \
-		--extra-cxxflags="${CXXFLAGS}" \
-		--extra-ldflags="${LDFLAGS}" \
-		${myconf} || die "configure died"
-}
-
-src_install() {
-	emake INSTALL_ROOT="${D}" install || die "install failed"
-	dodoc AUTHORS UPGRADING README
-
-	insinto /usr/share/mythtv/database
-	doins database/*
-
-	newinitd "${FILESDIR}"/mythbackend.init mythbackend
-	newconfd "${FILESDIR}"/mythbackend.conf mythbackend
-	systemd_dounit "${FILESDIR}"/mythbackend.service
-
-	dodoc keys.txt
-
-	keepdir /etc/mythtv
-	chown -R mythtv "${ED}"/etc/mythtv
-	keepdir /var/log/mythtv
-	chown -R mythtv "${ED}"/var/log/mythtv
-	dodir /var/log/mythtv/old
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/mythtv.logrotate.d-r4 mythtv
-
-	insinto /usr/share/mythtv/contrib
-	doins -r contrib/*
-
-	# Install our mythfrontend wrapper which is similar to Mythbuntu's
-	mv "${ED}/usr/bin/mythfrontend" "${ED}/usr/bin/mythfrontend.real"
-	newbin "${FILESDIR}"/mythfrontend.wrapper mythfrontend
-	newconfd "${FILESDIR}"/mythfrontend.conf mythfrontend
-
-	if use autostart; then
-		dodir /etc/env.d/
-		echo 'CONFIG_PROTECT="/home/mythtv/"' > "${ED}"/etc/env.d/95mythtv
-
-		insinto /home/mythtv
-		newins "${FILESDIR}"/bash_profile .bash_profile
-		newins "${FILESDIR}"/xinitrc-r1 .xinitrc
-	fi
-
-	# Make Python files executable
-	find "${ED}/usr/share/mythtv" -type f -name '*.py' | while read file; do
-		if [[ ! "${file##*/}" = "__init__.py" ]]; then
-			chmod a+x "${file}"
-		fi
-	done
-
-	# Ensure that Python scripts are executed by Python 2
-	python_convert_shebangs -q -r 2 "${ED}/usr/share/mythtv"
-
-	# Make shell & perl scripts executable
-	find "${ED}" -type f -name '*.sh' -o -type f -name '*.pl' | \
-		while read file; do
-		chmod a+x "${file}"
-	done
-}
-
-pkg_preinst() {
-	export CONFIG_PROTECT="${CONFIG_PROTECT} ${EROOT}/home/mythtv/"
-}
-
-pkg_postinst() {
-	use python && python_mod_optimize MythTV
-
-	elog "To have this machine operate as recording host for MythTV, "
-	elog "mythbackend must be running. Run the following:"
-	elog "rc-update add mythbackend default"
-	elog
-	elog "Your recordings folder must be owned 'mythtv'. e.g."
-	elog "chown -R mythtv /var/lib/mythtv"
-
-	elog "Want mythfrontend to start automatically?"
-	elog "Set USE=autostart. Details can be found at:"
-	elog "https://dev.gentoo.org/~cardoe/mythtv/autostart.html"
-	elog
-	elog "Note that the systemd unit now restarts by default and logs"
-	elog "to journald via the console at the notice verbosity."
-}
-
-pkg_postrm() {
-	use python && python_mod_cleanup MythTV
-}
-
-pkg_info() {
-	if [[ -f "${EROOT}"/usr/bin/mythfrontend ]]; then
-		"${EROOT}"/usr/bin/mythfrontend --version
-	fi
-}
-
-pkg_config() {
-	echo "Creating mythtv MySQL user and mythconverg database if it does not"
-	echo "already exist. You will be prompted for your MySQL root password."
-	"${EROOT}"/usr/bin/mysql -u root -p < "${EROOT}"/usr/share/mythtv/database/mc.sql
-}
diff --git a/media-tv/mythtv/mythtv-0.27.3_p20141009.ebuild b/media-tv/mythtv/mythtv-0.27.3_p20141009.ebuild
deleted file mode 100644
index 60f7f10aa424..000000000000
--- a/media-tv/mythtv/mythtv-0.27.3_p20141009.ebuild
+++ /dev/null
@@ -1,355 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_DEPEND="python? 2:2.6"
-BACKPORTS="e1d575da2fdde7ae7119972c688b0ddd15e676c4"
-MY_P=${P%_p*}
-
-inherit flag-o-matic multilib eutils python user systemd
-
-MYTHTV_VERSION="v0.27.3"
-MYTHTV_BRANCH="fixes/0.27"
-
-DESCRIPTION="Homebrew PVR project"
-HOMEPAGE="http://www.mythtv.org"
-SRC_URI="https://github.com/MythTV/mythtv/archive/v0.27.3.tar.gz -> mythtv-0.27.3.tar.gz
-	${BACKPORTS:+https://dev.gentoo.org/~rich0/distfiles/${MY_P}-${BACKPORTS}.tar.xz}"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-
-IUSE_INPUT_DEVICES="input_devices_joystick"
-IUSE="alsa altivec libass autostart bluray cec crystalhd debug dvb dvd \
-egl fftw +hls ieee1394 jack lcd lirc perl pulseaudio python raop +theora \
-vaapi vdpau +vorbis +xml xmltv +xvid ${IUSE_INPUT_DEVICES}"
-
-REQUIRED_USE="
-	bluray? ( xml )
-	theora? ( vorbis )"
-
-COMMON="
-	>=media-libs/freetype-2.0:=
-	sys-libs/zlib:=
-	x11-libs/libX11:=
-	x11-libs/libXext:=
-	x11-libs/libXinerama:=
-	x11-libs/libXv:=
-	x11-libs/libXrandr:=
-	x11-libs/libXxf86vm:=
-	>=dev-qt/qtcore-4.7.2:4=
-	>=dev-qt/qtdbus-4.7.2:4=
-	>=dev-qt/qtgui-4.7.2:4=
-	>=dev-qt/qtscript-4.7.2:4=
-	>=dev-qt/qtsql-4.7.2:4=[mysql]
-	>=dev-qt/qtopengl-4.7.2:4=[egl?]
-	>=dev-qt/qtwebkit-4.7.2:4=
-	x11-misc/wmctrl:=
-	virtual/mysql:=
-	virtual/opengl:=
-	alsa? ( >=media-libs/alsa-lib-1.0.24:= )
-	bluray? (
-		dev-libs/libcdio:=
-		media-libs/libbluray:=
-	)
-	cec? ( dev-libs/libcec:= )
-	dvb? (
-		media-libs/libdvb:=
-		virtual/linuxtv-dvb-headers:=
-	)
-	dvd? ( dev-libs/libcdio:= )
-	egl? ( media-libs/mesa:=[egl] )
-	fftw? ( sci-libs/fftw:3.0= )
-	hls? (
-		media-libs/faac:=
-		media-libs/libvpx:=
-		>=media-libs/x264-0.0.20111220:=
-		>=media-sound/lame-3.93.1
-	)
-	ieee1394? (
-		>=sys-libs/libraw1394-1.2.0:=
-		>=sys-libs/libavc1394-0.5.3:=
-		>=media-libs/libiec61883-1.0.0:=
-	)
-	jack? ( media-sound/jack-audio-connection-kit )
-	lcd? ( app-misc/lcdproc )
-	libass? ( >=media-libs/libass-0.9.11:= )
-	lirc? ( app-misc/lirc )
-	perl? (
-		dev-perl/DBD-mysql
-		dev-perl/Net-UPnP
-		dev-perl/LWP-Protocol-https
-		dev-perl/HTTP-Message
-		dev-perl/IO-Socket-INET6
-		>=dev-perl/libwww-perl-5
-	)
-	pulseaudio? ( media-sound/pulseaudio )
-	python? (
-		dev-python/mysql-python
-		dev-python/lxml
-		dev-python/urlgrabber
-	)
-	raop? (
-		dev-libs/openssl:=
-		net-dns/avahi[mdnsresponder-compat]
-	)
-	theora? ( media-libs/libtheora:= media-libs/libogg:= )
-	vaapi? ( x11-libs/libva:= )
-	vdpau? ( x11-libs/libvdpau:= )
-	vorbis? ( >=media-libs/libvorbis-1.0:= media-libs/libogg:= )
-	xml? ( >=dev-libs/libxml2-2.6.0:= )
-	xvid? ( >=media-libs/xvid-1.1.0:= )
-	!media-tv/mythtv-bindings
-	!x11-themes/mythtv-themes
-	media-libs/taglib:=
-	dev-libs/glib:=
-	"
-
-RDEPEND="${COMMON}
-	media-fonts/corefonts
-	media-fonts/dejavu
-	media-fonts/liberation-fonts
-	x11-apps/xinit
-	autostart? (
-		net-dialup/mingetty
-		x11-wm/evilwm
-		x11-apps/xset
-	)
-	dvd? ( media-libs/libdvdcss:= )
-	xmltv? ( >=media-tv/xmltv-0.5.43 )
-	"
-
-DEPEND="${COMMON}
-	dev-lang/yasm
-	x11-proto/xineramaproto
-	x11-proto/xf86vidmodeproto
-	"
-
-S="${WORKDIR}/${MY_P}/mythtv"
-
-MYTHTV_GROUPS="video,audio,tty,uucp"
-
-pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
-	enewuser mythtv -1 /bin/bash /home/mythtv ${MYTHTV_GROUPS}
-	usermod -a -G ${MYTHTV_GROUPS} mythtv
-}
-
-src_prepare() {
-	[[ -n ${BACKPORTS} ]] && \
-		EPATCH_FORCE=yes EPATCH_SUFFIX="patch" EPATCH_SOURCE="${S}/../patches" \
-			epatch
-
-	# Perl bits need to go into vender_perl and not site_perl
-	sed -e "s:pure_install:pure_install INSTALLDIRS=vendor:" \
-		-i "${S}"/bindings/perl/Makefile
-
-	# Fix up the version info since we are using the fixes/${PV} branch
-	echo "SOURCE_VERSION=\"${MYTHTV_VERSION}\"" > "${S}"/VERSION
-	echo "BRANCH=\"${MYTHTV_BRANCH}\"" >> "${S}"/VERSION
-
-	echo "setting.extra -= -ldconfig" >> "${S}"/programs/mythfrontend/mythfrontend.pro
-
-	epatch "${FILESDIR}/libdir-27.patch"
-
-	epatch_user
-}
-
-src_configure() {
-	local myconf=
-
-	# Setup paths
-	myconf="${myconf} --prefix=${EPREFIX}/usr"
-	myconf="${myconf} --libdir=${EPREFIX}/usr/$(get_libdir)"
-	myconf="${myconf} --libdir-name=$(get_libdir)"
-	myconf="${myconf} --mandir=${EPREFIX}/usr/share/man"
-
-	# Audio
-	myconf="${myconf} $(use_enable alsa audio-alsa)"
-	myconf="${myconf} $(use_enable jack audio-jack)"
-	use pulseaudio || myconf="${myconf} --disable-audio-pulseoutput"
-
-	use altivec    || myconf="${myconf} --disable-altivec"
-	myconf="${myconf} $(use_enable dvb)"
-	myconf="${myconf} $(use_enable ieee1394 firewire)"
-	myconf="${myconf} $(use_enable lirc)"
-	myconf="${myconf} $(use_enable xvid libxvid)"
-	myconf="${myconf} --dvb-path=/usr/include"
-	myconf="${myconf} --enable-xrandr"
-	myconf="${myconf} --enable-xv"
-	myconf="${myconf} --enable-x11"
-	myconf="${myconf} --enable-nonfree"
-	use cec || myconf="${myconf} --disable-libcec"
-	use raop || myconf="${myconf} --disable-libdns-sd"
-	myconf="${myconf} $(use_enable theora libtheora)"
-	myconf="${myconf} $(use_enable vorbis libvorbis)"
-
-	if use hls; then
-		myconf="${myconf} --enable-libmp3lame"
-		myconf="${myconf} --enable-libx264"
-		myconf="${myconf} --enable-libvpx"
-		myconf="${myconf} --enable-libfaac"
-	fi
-
-	myconf="${myconf} $(use_enable libass)"
-
-	if use perl && use python; then
-		myconf="${myconf} --with-bindings=perl,python"
-	elif use perl; then
-		myconf="${myconf} --without-bindings=python"
-		myconf="${myconf} --with-bindings=perl"
-	elif use python; then
-		myconf="${myconf} --without-bindings=perl"
-		myconf="${myconf} --with-bindings=python"
-	else
-		myconf="${myconf} --without-bindings=perl,python"
-	fi
-
-	use python && myconf="${myconf} --python=$(PYTHON)"
-
-	if use debug; then
-		myconf="${myconf} --compile-type=debug"
-	else
-		myconf="${myconf} --compile-type=release"
-		#myconf="${myconf} --enable-debug" does nothing per sphery
-		#myconf="${myconf} --disable-stripping" does nothing per sphery
-	fi
-
-	# Video
-	use vdpau && myconf="${myconf} --enable-vdpau"
-	myconf="${myconf} $(use_enable vaapi)"
-	use crystalhd && myconf="${myconf} --enable-crystalhd"
-
-	# Input
-	use input_devices_joystick || myconf="${myconf} --disable-joystick-menu"
-
-	# Clean up DSO load times and other compiler bits
-	myconf="${myconf} --enable-symbol-visibility"
-	myconf="${myconf} --enable-pic"
-
-	# CPU settings
-	for i in $(get-flag march) $(get-flag mcpu) $(get-flag mtune) ; do
-		[ "${i}" = "native" ] && i="host"
-		myconf="${myconf} --cpu=${i}"
-		break
-	done
-
-	if tc-is-cross-compiler ; then
-		myconf="${myconf} --enable-cross-compile --arch=$(tc-arch-kernel)"
-		myconf="${myconf} --cross-prefix=${CHOST}-"
-	fi
-
-	# Build boosters
-	has distcc ${FEATURES} || myconf="${myconf} --disable-distcc"
-	has ccache ${FEATURES} || myconf="${myconf} --disable-ccache"
-
-	chmod +x ./external/FFmpeg/version.sh
-
-	einfo "Running ./configure ${myconf}"
-	./configure \
-		--cc="$(tc-getCC)" \
-		--cxx="$(tc-getCXX)" \
-		--ar="$(tc-getAR)" \
-		--extra-cflags="${CFLAGS}" \
-		--extra-cxxflags="${CXXFLAGS}" \
-		--extra-ldflags="${LDFLAGS}" \
-		${myconf} || die "configure died"
-}
-
-src_install() {
-	emake INSTALL_ROOT="${D}" install || die "install failed"
-	dodoc AUTHORS UPGRADING README
-
-	insinto /usr/share/mythtv/database
-	doins database/*
-
-	newinitd "${FILESDIR}"/mythbackend.init mythbackend
-	newconfd "${FILESDIR}"/mythbackend.conf mythbackend
-	systemd_dounit "${FILESDIR}"/mythbackend.service
-
-	dodoc keys.txt
-
-	keepdir /etc/mythtv
-	chown -R mythtv "${ED}"/etc/mythtv
-	keepdir /var/log/mythtv
-	chown -R mythtv "${ED}"/var/log/mythtv
-	dodir /var/log/mythtv/old
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/mythtv.logrotate.d-r4 mythtv
-
-	insinto /usr/share/mythtv/contrib
-	doins -r contrib/*
-
-	# Install our mythfrontend wrapper which is similar to Mythbuntu's
-	mv "${ED}/usr/bin/mythfrontend" "${ED}/usr/bin/mythfrontend.real"
-	newbin "${FILESDIR}"/mythfrontend.wrapper mythfrontend
-	newconfd "${FILESDIR}"/mythfrontend.conf mythfrontend
-
-	if use autostart; then
-		dodir /etc/env.d/
-		echo 'CONFIG_PROTECT="/home/mythtv/"' > "${ED}"/etc/env.d/95mythtv
-
-		insinto /home/mythtv
-		newins "${FILESDIR}"/bash_profile .bash_profile
-		newins "${FILESDIR}"/xinitrc-r1 .xinitrc
-	fi
-
-	# Make Python files executable
-	find "${ED}/usr/share/mythtv" -type f -name '*.py' | while read file; do
-		if [[ ! "${file##*/}" = "__init__.py" ]]; then
-			chmod a+x "${file}"
-		fi
-	done
-
-	# Ensure that Python scripts are executed by Python 2
-	python_convert_shebangs -q -r 2 "${ED}/usr/share/mythtv"
-
-	# Make shell & perl scripts executable
-	find "${ED}" -type f -name '*.sh' -o -type f -name '*.pl' | \
-		while read file; do
-		chmod a+x "${file}"
-	done
-}
-
-pkg_preinst() {
-	export CONFIG_PROTECT="${CONFIG_PROTECT} ${EROOT}/home/mythtv/"
-}
-
-pkg_postinst() {
-	use python && python_mod_optimize MythTV
-
-	elog "To have this machine operate as recording host for MythTV, "
-	elog "mythbackend must be running. Run the following:"
-	elog "rc-update add mythbackend default"
-	elog
-	elog "Your recordings folder must be owned 'mythtv'. e.g."
-	elog "chown -R mythtv /var/lib/mythtv"
-
-	elog "Want mythfrontend to start automatically?"
-	elog "Set USE=autostart. Details can be found at:"
-	elog "https://dev.gentoo.org/~cardoe/mythtv/autostart.html"
-	elog
-	elog "Note that the systemd unit now restarts by default and logs"
-	elog "to journald via the console at the notice verbosity."
-}
-
-pkg_postrm() {
-	use python && python_mod_cleanup MythTV
-}
-
-pkg_info() {
-	if [[ -f "${EROOT}"/usr/bin/mythfrontend ]]; then
-		"${EROOT}"/usr/bin/mythfrontend --version
-	fi
-}
-
-pkg_config() {
-	echo "Creating mythtv MySQL user and mythconverg database if it does not"
-	echo "already exist. You will be prompted for your MySQL root password."
-	"${EROOT}"/usr/bin/mysql -u root -p < "${EROOT}"/usr/share/mythtv/database/mc.sql
-}
diff --git a/media-tv/mythtv/mythtv-0.27.4_p20150124.ebuild b/media-tv/mythtv/mythtv-0.27.4_p20150124.ebuild
deleted file mode 100644
index 4a5fb22604f8..000000000000
--- a/media-tv/mythtv/mythtv-0.27.4_p20150124.ebuild
+++ /dev/null
@@ -1,355 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_DEPEND="python? 2:2.7"
-BACKPORTS="3b4390396bf09dfe3741508ecf7fc71a004abd01"
-MY_P=${P%_p*}
-
-inherit flag-o-matic multilib eutils python user systemd
-
-MYTHTV_VERSION="v0.27.4"
-MYTHTV_BRANCH="fixes/0.27"
-
-DESCRIPTION="Homebrew PVR project"
-HOMEPAGE="http://www.mythtv.org"
-SRC_URI="https://github.com/MythTV/mythtv/archive/v0.27.4.tar.gz -> mythtv-0.27.4.tar.gz
-	${BACKPORTS:+https://dev.gentoo.org/~rich0/distfiles/${MY_P}-${BACKPORTS}.tar.xz}"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-
-IUSE_INPUT_DEVICES="input_devices_joystick"
-IUSE="alsa altivec libass autostart bluray cec crystalhd debug dvb dvd \
-egl fftw +hls ieee1394 jack lcd lirc perl pulseaudio python raop +theora \
-vaapi vdpau +vorbis +xml xmltv +xvid ${IUSE_INPUT_DEVICES}"
-
-REQUIRED_USE="
-	bluray? ( xml )
-	theora? ( vorbis )"
-
-COMMON="
-	>=media-libs/freetype-2.0:=
-	sys-libs/zlib:=
-	x11-libs/libX11:=
-	x11-libs/libXext:=
-	x11-libs/libXinerama:=
-	x11-libs/libXv:=
-	x11-libs/libXrandr:=
-	x11-libs/libXxf86vm:=
-	>=dev-qt/qtcore-4.7.2:4=
-	>=dev-qt/qtdbus-4.7.2:4=
-	>=dev-qt/qtgui-4.7.2:4=
-	>=dev-qt/qtscript-4.7.2:4=
-	>=dev-qt/qtsql-4.7.2:4=[mysql]
-	>=dev-qt/qtopengl-4.7.2:4=[egl?]
-	>=dev-qt/qtwebkit-4.7.2:4=
-	x11-misc/wmctrl:=
-	virtual/mysql:=
-	virtual/opengl:=
-	alsa? ( >=media-libs/alsa-lib-1.0.24:= )
-	bluray? (
-		dev-libs/libcdio:=
-		media-libs/libbluray:=
-	)
-	cec? ( dev-libs/libcec:= )
-	dvb? (
-		media-libs/libdvb:=
-		virtual/linuxtv-dvb-headers:=
-	)
-	dvd? ( dev-libs/libcdio:= )
-	egl? ( media-libs/mesa:=[egl] )
-	fftw? ( sci-libs/fftw:3.0= )
-	hls? (
-		media-libs/faac:=
-		media-libs/libvpx:=
-		>=media-libs/x264-0.0.20111220:=
-		>=media-sound/lame-3.93.1
-	)
-	ieee1394? (
-		>=sys-libs/libraw1394-1.2.0:=
-		>=sys-libs/libavc1394-0.5.3:=
-		>=media-libs/libiec61883-1.0.0:=
-	)
-	jack? ( media-sound/jack-audio-connection-kit )
-	lcd? ( app-misc/lcdproc )
-	libass? ( >=media-libs/libass-0.9.11:= )
-	lirc? ( app-misc/lirc )
-	perl? (
-		dev-perl/DBD-mysql
-		dev-perl/Net-UPnP
-		dev-perl/LWP-Protocol-https
-		dev-perl/HTTP-Message
-		dev-perl/IO-Socket-INET6
-		>=dev-perl/libwww-perl-5
-	)
-	pulseaudio? ( media-sound/pulseaudio )
-	python? (
-		dev-python/mysql-python
-		dev-python/lxml
-		dev-python/urlgrabber
-	)
-	raop? (
-		dev-libs/openssl:=
-		net-dns/avahi[mdnsresponder-compat]
-	)
-	theora? ( media-libs/libtheora:= media-libs/libogg:= )
-	vaapi? ( x11-libs/libva:= )
-	vdpau? ( x11-libs/libvdpau:= )
-	vorbis? ( >=media-libs/libvorbis-1.0:= media-libs/libogg:= )
-	xml? ( >=dev-libs/libxml2-2.6.0:= )
-	xvid? ( >=media-libs/xvid-1.1.0:= )
-	!media-tv/mythtv-bindings
-	!x11-themes/mythtv-themes
-	media-libs/taglib:=
-	dev-libs/glib:=
-	"
-
-RDEPEND="${COMMON}
-	media-fonts/corefonts
-	media-fonts/dejavu
-	media-fonts/liberation-fonts
-	x11-apps/xinit
-	autostart? (
-		net-dialup/mingetty
-		x11-wm/evilwm
-		x11-apps/xset
-	)
-	dvd? ( media-libs/libdvdcss:= )
-	xmltv? ( >=media-tv/xmltv-0.5.43 )
-	"
-
-DEPEND="${COMMON}
-	dev-lang/yasm
-	x11-proto/xineramaproto
-	x11-proto/xf86vidmodeproto
-	"
-
-S="${WORKDIR}/${MY_P}/mythtv"
-
-MYTHTV_GROUPS="video,audio,tty,uucp"
-
-pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
-	enewuser mythtv -1 /bin/bash /home/mythtv ${MYTHTV_GROUPS}
-	usermod -a -G ${MYTHTV_GROUPS} mythtv
-}
-
-src_prepare() {
-	[[ -n ${BACKPORTS} ]] && \
-		EPATCH_FORCE=yes EPATCH_SUFFIX="patch" EPATCH_SOURCE="${S}/../patches" \
-			epatch
-
-	# Perl bits need to go into vender_perl and not site_perl
-	sed -e "s:pure_install:pure_install INSTALLDIRS=vendor:" \
-		-i "${S}"/bindings/perl/Makefile
-
-	# Fix up the version info since we are using the fixes/${PV} branch
-	echo "SOURCE_VERSION=\"${MYTHTV_VERSION}\"" > "${S}"/VERSION
-	echo "BRANCH=\"${MYTHTV_BRANCH}\"" >> "${S}"/VERSION
-
-	echo "setting.extra -= -ldconfig" >> "${S}"/programs/mythfrontend/mythfrontend.pro
-
-	epatch "${FILESDIR}/libdir-27.patch"
-
-	epatch_user
-}
-
-src_configure() {
-	local myconf=
-
-	# Setup paths
-	myconf="${myconf} --prefix=${EPREFIX}/usr"
-	myconf="${myconf} --libdir=${EPREFIX}/usr/$(get_libdir)"
-	myconf="${myconf} --libdir-name=$(get_libdir)"
-	myconf="${myconf} --mandir=${EPREFIX}/usr/share/man"
-
-	# Audio
-	myconf="${myconf} $(use_enable alsa audio-alsa)"
-	myconf="${myconf} $(use_enable jack audio-jack)"
-	use pulseaudio || myconf="${myconf} --disable-audio-pulseoutput"
-
-	use altivec    || myconf="${myconf} --disable-altivec"
-	myconf="${myconf} $(use_enable dvb)"
-	myconf="${myconf} $(use_enable ieee1394 firewire)"
-	myconf="${myconf} $(use_enable lirc)"
-	myconf="${myconf} $(use_enable xvid libxvid)"
-	myconf="${myconf} --dvb-path=/usr/include"
-	myconf="${myconf} --enable-xrandr"
-	myconf="${myconf} --enable-xv"
-	myconf="${myconf} --enable-x11"
-	myconf="${myconf} --enable-nonfree"
-	use cec || myconf="${myconf} --disable-libcec"
-	use raop || myconf="${myconf} --disable-libdns-sd"
-	myconf="${myconf} $(use_enable theora libtheora)"
-	myconf="${myconf} $(use_enable vorbis libvorbis)"
-
-	if use hls; then
-		myconf="${myconf} --enable-libmp3lame"
-		myconf="${myconf} --enable-libx264"
-		myconf="${myconf} --enable-libvpx"
-		myconf="${myconf} --enable-libfaac"
-	fi
-
-	myconf="${myconf} $(use_enable libass)"
-
-	if use perl && use python; then
-		myconf="${myconf} --with-bindings=perl,python"
-	elif use perl; then
-		myconf="${myconf} --without-bindings=python"
-		myconf="${myconf} --with-bindings=perl"
-	elif use python; then
-		myconf="${myconf} --without-bindings=perl"
-		myconf="${myconf} --with-bindings=python"
-	else
-		myconf="${myconf} --without-bindings=perl,python"
-	fi
-
-	use python && myconf="${myconf} --python=$(PYTHON)"
-
-	if use debug; then
-		myconf="${myconf} --compile-type=debug"
-	else
-		myconf="${myconf} --compile-type=release"
-		#myconf="${myconf} --enable-debug" does nothing per sphery
-		#myconf="${myconf} --disable-stripping" does nothing per sphery
-	fi
-
-	# Video
-	use vdpau && myconf="${myconf} --enable-vdpau"
-	myconf="${myconf} $(use_enable vaapi)"
-	use crystalhd && myconf="${myconf} --enable-crystalhd"
-
-	# Input
-	use input_devices_joystick || myconf="${myconf} --disable-joystick-menu"
-
-	# Clean up DSO load times and other compiler bits
-	myconf="${myconf} --enable-symbol-visibility"
-	myconf="${myconf} --enable-pic"
-
-	# CPU settings
-	for i in $(get-flag march) $(get-flag mcpu) $(get-flag mtune) ; do
-		[ "${i}" = "native" ] && i="host"
-		myconf="${myconf} --cpu=${i}"
-		break
-	done
-
-	if tc-is-cross-compiler ; then
-		myconf="${myconf} --enable-cross-compile --arch=$(tc-arch-kernel)"
-		myconf="${myconf} --cross-prefix=${CHOST}-"
-	fi
-
-	# Build boosters
-	has distcc ${FEATURES} || myconf="${myconf} --disable-distcc"
-	has ccache ${FEATURES} || myconf="${myconf} --disable-ccache"
-
-	chmod +x ./external/FFmpeg/version.sh
-
-	einfo "Running ./configure ${myconf}"
-	./configure \
-		--cc="$(tc-getCC)" \
-		--cxx="$(tc-getCXX)" \
-		--ar="$(tc-getAR)" \
-		--extra-cflags="${CFLAGS}" \
-		--extra-cxxflags="${CXXFLAGS}" \
-		--extra-ldflags="${LDFLAGS}" \
-		${myconf} || die "configure died"
-}
-
-src_install() {
-	emake INSTALL_ROOT="${D}" install || die "install failed"
-	dodoc AUTHORS UPGRADING README
-
-	insinto /usr/share/mythtv/database
-	doins database/*
-
-	newinitd "${FILESDIR}"/mythbackend.init mythbackend
-	newconfd "${FILESDIR}"/mythbackend.conf mythbackend
-	systemd_dounit "${FILESDIR}"/mythbackend.service
-
-	dodoc keys.txt
-
-	keepdir /etc/mythtv
-	chown -R mythtv "${ED}"/etc/mythtv
-	keepdir /var/log/mythtv
-	chown -R mythtv "${ED}"/var/log/mythtv
-	dodir /var/log/mythtv/old
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/mythtv.logrotate.d-r4 mythtv
-
-	insinto /usr/share/mythtv/contrib
-	doins -r contrib/*
-
-	# Install our mythfrontend wrapper which is similar to Mythbuntu's
-	mv "${ED}/usr/bin/mythfrontend" "${ED}/usr/bin/mythfrontend.real"
-	newbin "${FILESDIR}"/mythfrontend.wrapper mythfrontend
-	newconfd "${FILESDIR}"/mythfrontend.conf mythfrontend
-
-	if use autostart; then
-		dodir /etc/env.d/
-		echo 'CONFIG_PROTECT="/home/mythtv/"' > "${ED}"/etc/env.d/95mythtv
-
-		insinto /home/mythtv
-		newins "${FILESDIR}"/bash_profile .bash_profile
-		newins "${FILESDIR}"/xinitrc-r1 .xinitrc
-	fi
-
-	# Make Python files executable
-	find "${ED}/usr/share/mythtv" -type f -name '*.py' | while read file; do
-		if [[ ! "${file##*/}" = "__init__.py" ]]; then
-			chmod a+x "${file}"
-		fi
-	done
-
-	# Ensure that Python scripts are executed by Python 2
-	python_convert_shebangs -q -r 2 "${ED}/usr/share/mythtv"
-
-	# Make shell & perl scripts executable
-	find "${ED}" -type f -name '*.sh' -o -type f -name '*.pl' | \
-		while read file; do
-		chmod a+x "${file}"
-	done
-}
-
-pkg_preinst() {
-	export CONFIG_PROTECT="${CONFIG_PROTECT} ${EROOT}/home/mythtv/"
-}
-
-pkg_postinst() {
-	use python && python_mod_optimize MythTV
-
-	elog "To have this machine operate as recording host for MythTV, "
-	elog "mythbackend must be running. Run the following:"
-	elog "rc-update add mythbackend default"
-	elog
-	elog "Your recordings folder must be owned 'mythtv'. e.g."
-	elog "chown -R mythtv /var/lib/mythtv"
-
-	elog "Want mythfrontend to start automatically?"
-	elog "Set USE=autostart. Details can be found at:"
-	elog "https://dev.gentoo.org/~cardoe/mythtv/autostart.html"
-	elog
-	elog "Note that the systemd unit now restarts by default and logs"
-	elog "to journald via the console at the notice verbosity."
-}
-
-pkg_postrm() {
-	use python && python_mod_cleanup MythTV
-}
-
-pkg_info() {
-	if [[ -f "${EROOT}"/usr/bin/mythfrontend ]]; then
-		"${EROOT}"/usr/bin/mythfrontend --version
-	fi
-}
-
-pkg_config() {
-	echo "Creating mythtv MySQL user and mythconverg database if it does not"
-	echo "already exist. You will be prompted for your MySQL root password."
-	"${EROOT}"/usr/bin/mysql -u root -p < "${EROOT}"/usr/share/mythtv/database/mc.sql
-}
diff --git a/media-tv/mythtv/mythtv-0.27.5_p20150904.ebuild b/media-tv/mythtv/mythtv-0.27.5_p20150904.ebuild
new file mode 100644
index 000000000000..9a16f8025d79
--- /dev/null
+++ b/media-tv/mythtv/mythtv-0.27.5_p20150904.ebuild
@@ -0,0 +1,363 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+BACKPORTS="32fd3968acea905d71d9769996487eff280233ea"
+MY_P=${P%_p*}
+
+inherit flag-o-matic multilib eutils python-single-r1 user systemd
+
+MYTHTV_VERSION="v0.27.5"
+MYTHTV_BRANCH="fixes/0.27"
+
+DESCRIPTION="Homebrew PVR project"
+HOMEPAGE="http://www.mythtv.org"
+SRC_URI="https://github.com/MythTV/mythtv/archive/v0.27.5.tar.gz -> mythtv-0.27.5.tar.gz
+	${BACKPORTS:+https://dev.gentoo.org/~cardoe/distfiles/${MY_P}-${BACKPORTS}.tar.xz}"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+
+IUSE_INPUT_DEVICES="input_devices_joystick"
+IUSE="alsa altivec libass autostart bluray cec crystalhd debug dvb dvd \
+egl fftw +hls ieee1394 jack lcd lirc perl pulseaudio python raop +theora \
+vaapi vdpau +vorbis +wrapper +xml xmltv +xvid ${IUSE_INPUT_DEVICES}"
+
+REQUIRED_USE="
+	bluray? ( xml )
+	python? ( ${PYTHON_REQUIRED_USE} )
+	theora? ( vorbis )"
+
+COMMON="
+	>=media-libs/freetype-2.0:=
+	>=media-sound/lame-3.93.1
+	sys-libs/zlib:=
+	x11-libs/libX11:=
+	x11-libs/libXext:=
+	x11-libs/libXinerama:=
+	x11-libs/libXv:=
+	x11-libs/libXrandr:=
+	x11-libs/libXxf86vm:=
+	>=dev-qt/qtcore-4.7.2:4=
+	>=dev-qt/qtdbus-4.7.2:4=
+	>=dev-qt/qtgui-4.7.2:4=
+	>=dev-qt/qtscript-4.7.2:4=
+	>=dev-qt/qtsql-4.7.2:4=[mysql]
+	>=dev-qt/qtopengl-4.7.2:4=[egl?]
+	>=dev-qt/qtwebkit-4.7.2:4=
+	x11-misc/wmctrl:=
+	virtual/mysql
+	virtual/opengl:=
+	alsa? ( >=media-libs/alsa-lib-1.0.24:= )
+	bluray? (
+		dev-libs/libcdio:=
+		media-libs/libbluray:=
+		sys-fs/udisks:0
+	)
+	cec? ( dev-libs/libcec:= )
+	dvb? (
+		media-libs/libdvb:=
+		virtual/linuxtv-dvb-headers:=
+	)
+	dvd? (
+		dev-libs/libcdio:=
+		sys-fs/udisks:0
+	)
+	egl? ( media-libs/mesa:=[egl] )
+	fftw? ( sci-libs/fftw:3.0= )
+	hls? (
+		media-libs/faac:=
+		media-libs/libvpx:=
+		>=media-libs/x264-0.0.20111220:=
+	)
+	ieee1394? (
+		>=sys-libs/libraw1394-1.2.0:=
+		>=sys-libs/libavc1394-0.5.3:=
+		>=media-libs/libiec61883-1.0.0:=
+	)
+	jack? ( media-sound/jack-audio-connection-kit )
+	lcd? ( app-misc/lcdproc )
+	libass? ( >=media-libs/libass-0.9.11:= )
+	lirc? ( app-misc/lirc )
+	perl? (
+		dev-perl/DBD-mysql
+		dev-perl/Net-UPnP
+		dev-perl/LWP-Protocol-https
+		dev-perl/HTTP-Message
+		dev-perl/IO-Socket-INET6
+		>=dev-perl/libwww-perl-5
+	)
+	pulseaudio? ( media-sound/pulseaudio )
+	python? (
+		${PYTHON_DEPS}
+		dev-python/mysql-python
+		dev-python/lxml
+		dev-python/urlgrabber
+	)
+	raop? (
+		dev-libs/openssl:=
+		net-dns/avahi[mdnsresponder-compat]
+	)
+	theora? ( media-libs/libtheora:= media-libs/libogg:= )
+	vaapi? ( x11-libs/libva:= )
+	vdpau? ( x11-libs/libvdpau:= )
+	vorbis? ( >=media-libs/libvorbis-1.0:= media-libs/libogg:= )
+	xml? ( >=dev-libs/libxml2-2.6.0:= )
+	xvid? ( >=media-libs/xvid-1.1.0:= )
+	!media-tv/mythtv-bindings
+	!x11-themes/mythtv-themes
+	media-libs/taglib:=
+	dev-libs/glib:=
+	"
+
+RDEPEND="${COMMON}
+	media-fonts/corefonts
+	media-fonts/dejavu
+	media-fonts/liberation-fonts
+	x11-apps/xinit
+	autostart? (
+		net-dialup/mingetty
+		x11-wm/evilwm
+		x11-apps/xset
+	)
+	dvd? ( media-libs/libdvdcss:= )
+	xmltv? ( >=media-tv/xmltv-0.5.43 )
+	"
+
+DEPEND="${COMMON}
+	dev-lang/yasm
+	x11-proto/xineramaproto
+	x11-proto/xf86vidmodeproto
+	"
+
+S="${WORKDIR}/${MY_P}/mythtv"
+
+MYTHTV_GROUPS="video,audio,tty,uucp"
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+	enewuser mythtv -1 /bin/bash /home/mythtv ${MYTHTV_GROUPS}
+	usermod -a -G ${MYTHTV_GROUPS} mythtv
+}
+
+src_prepare() {
+	[[ -n ${BACKPORTS} ]] && \
+		EPATCH_FORCE=yes EPATCH_SUFFIX="patch" EPATCH_SOURCE="${S}/../patches" \
+			epatch
+
+	# Perl bits need to go into vender_perl and not site_perl
+	sed -e "s:pure_install:pure_install INSTALLDIRS=vendor:" \
+		-i "${S}"/bindings/perl/Makefile
+
+	# Fix up the version info since we are using the fixes/${PV} branch
+	echo "SOURCE_VERSION=\"${MYTHTV_VERSION}\"" > "${S}"/VERSION
+	echo "BRANCH=\"${MYTHTV_BRANCH}\"" >> "${S}"/VERSION
+	echo "SOURCE_VERSION=\"${BACKPORTS}\"" > "${S}"/EXPORTED_VERSION
+	echo "BRANCH=\"${MYTHTV_BRANCH}\"" >> "${S}"/EXPORTED_VERSION
+
+	echo "setting.extra -= -ldconfig" >> "${S}"/programs/mythfrontend/mythfrontend.pro
+
+	epatch "${FILESDIR}/libdir-27.patch"
+
+	epatch_user
+}
+
+src_configure() {
+	local myconf=
+
+	# Setup paths
+	myconf="${myconf} --prefix=${EPREFIX}/usr"
+	myconf="${myconf} --libdir=${EPREFIX}/usr/$(get_libdir)"
+	myconf="${myconf} --libdir-name=$(get_libdir)"
+	myconf="${myconf} --mandir=${EPREFIX}/usr/share/man"
+
+	# Audio
+	myconf="${myconf} $(use_enable alsa audio-alsa)"
+	myconf="${myconf} $(use_enable jack audio-jack)"
+	use pulseaudio || myconf="${myconf} --disable-audio-pulseoutput"
+
+	use altivec    || myconf="${myconf} --disable-altivec"
+	myconf="${myconf} $(use_enable dvb)"
+	myconf="${myconf} $(use_enable ieee1394 firewire)"
+	myconf="${myconf} $(use_enable lirc)"
+	myconf="${myconf} $(use_enable xvid libxvid)"
+	myconf="${myconf} --dvb-path=/usr/include"
+	myconf="${myconf} --enable-xrandr"
+	myconf="${myconf} --enable-xv"
+	myconf="${myconf} --enable-x11"
+	myconf="${myconf} --enable-nonfree"
+	myconf="${myconf} --enable-libmp3lame"
+	use cec || myconf="${myconf} --disable-libcec"
+	use raop || myconf="${myconf} --disable-libdns-sd"
+	myconf="${myconf} $(use_enable theora libtheora)"
+	myconf="${myconf} $(use_enable vorbis libvorbis)"
+
+	if use hls; then
+		myconf="${myconf} --enable-libx264"
+		myconf="${myconf} --enable-libvpx"
+		myconf="${myconf} --enable-libfaac"
+	fi
+
+	myconf="${myconf} $(use_enable libass)"
+
+	if use perl && use python; then
+		myconf="${myconf} --with-bindings=perl,python"
+	elif use perl; then
+		myconf="${myconf} --without-bindings=python"
+		myconf="${myconf} --with-bindings=perl"
+	elif use python; then
+		myconf="${myconf} --without-bindings=perl"
+		myconf="${myconf} --with-bindings=python"
+	else
+		myconf="${myconf} --without-bindings=perl,python"
+	fi
+
+	use python && myconf="${myconf} --python=${EPYTHON}"
+
+	if use debug; then
+		myconf="${myconf} --compile-type=debug"
+	else
+		myconf="${myconf} --compile-type=release"
+		#myconf="${myconf} --enable-debug" does nothing per sphery
+		#myconf="${myconf} --disable-stripping" does nothing per sphery
+	fi
+
+	# Video
+	myconf="${myconf} $(use_enable vdpau)"
+	myconf="${myconf} $(use_enable vaapi)"
+	myconf="${myconf} $(use_enable crystalhd)"
+
+	# Input
+	use input_devices_joystick || myconf="${myconf} --disable-joystick-menu"
+
+	# Clean up DSO load times and other compiler bits
+	myconf="${myconf} --enable-symbol-visibility"
+	myconf="${myconf} --enable-pic"
+
+	# CPU settings
+	for i in $(get-flag march) $(get-flag mcpu) $(get-flag mtune) ; do
+		[ "${i}" = "native" ] && i="host"
+		myconf="${myconf} --cpu=${i}"
+		break
+	done
+
+	if tc-is-cross-compiler ; then
+		myconf="${myconf} --enable-cross-compile --arch=$(tc-arch-kernel)"
+		myconf="${myconf} --cross-prefix=${CHOST}-"
+	fi
+
+	# Build boosters
+	has distcc ${FEATURES} || myconf="${myconf} --disable-distcc"
+	has ccache ${FEATURES} || myconf="${myconf} --disable-ccache"
+
+	chmod +x ./external/FFmpeg/version.sh
+
+	einfo "Running ./configure ${myconf}"
+	./configure \
+		--cc="$(tc-getCC)" \
+		--cxx="$(tc-getCXX)" \
+		--ar="$(tc-getAR)" \
+		--extra-cflags="${CFLAGS}" \
+		--extra-cxxflags="${CXXFLAGS}" \
+		--extra-ldflags="${LDFLAGS}" \
+		${myconf} || die "configure died"
+}
+
+src_install() {
+	emake INSTALL_ROOT="${D}" install || die "install failed"
+	dodoc AUTHORS UPGRADING README
+
+	insinto /usr/share/mythtv/database
+	doins database/*
+
+	newinitd "${FILESDIR}"/mythbackend.init-r1 mythbackend
+	newconfd "${FILESDIR}"/mythbackend.conf-r1 mythbackend
+	systemd_dounit "${FILESDIR}"/mythbackend.service
+
+	dodoc keys.txt
+
+	keepdir /etc/mythtv
+	chown -R mythtv "${ED}"/etc/mythtv
+	keepdir /var/log/mythtv
+	chown -R mythtv "${ED}"/var/log/mythtv
+	dodir /var/log/mythtv/old
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/mythtv.logrotate.d-r4 mythtv
+
+	insinto /usr/share/mythtv/contrib
+	# Ensure we don't install scripts needing the perl bindings (bug #516968)
+	use perl || find contrib/ -name '*.pl' -exec rm -f {} \;
+	# Ensure we don't install scripts needing the python bindings (bug #516968)
+	use python || find contrib/ -name '*.py' -exec rm -f {} \;
+	doins -r contrib/*
+
+	# Install our mythfrontend wrapper which is similar to Mythbuntu's
+	if use wrapper; then
+		mv "${ED}/usr/bin/mythfrontend" "${ED}/usr/bin/mythfrontend.real"
+		newbin "${FILESDIR}"/mythfrontend.wrapper mythfrontend
+		newconfd "${FILESDIR}"/mythfrontend.conf mythfrontend
+	fi
+
+	if use autostart; then
+		dodir /etc/env.d/
+		echo 'CONFIG_PROTECT="/home/mythtv/"' > "${ED}"/etc/env.d/95mythtv
+
+		insinto /home/mythtv
+		newins "${FILESDIR}"/bash_profile .bash_profile
+		newins "${FILESDIR}"/xinitrc-r1 .xinitrc
+	fi
+
+	# Make Python files executable
+	find "${ED}/usr/share/mythtv" -type f -name '*.py' | while read file; do
+		if [[ ! "${file##*/}" = "__init__.py" ]]; then
+			chmod a+x "${file}"
+		fi
+	done
+
+	# Ensure that Python scripts are executed by Python 2
+	python_fix_shebang "${ED}/usr/share/mythtv"
+
+	# Make shell & perl scripts executable
+	find "${ED}" -type f -name '*.sh' -o -type f -name '*.pl' | \
+		while read file; do
+		chmod a+x "${file}"
+	done
+}
+
+pkg_preinst() {
+	export CONFIG_PROTECT="${CONFIG_PROTECT} ${EROOT}/home/mythtv/"
+}
+
+pkg_postinst() {
+	elog "To have this machine operate as recording host for MythTV, "
+	elog "mythbackend must be running. Run the following:"
+	elog "rc-update add mythbackend default"
+	elog
+	elog "Your recordings folder must be owned 'mythtv'. e.g."
+	elog "chown -R mythtv /var/lib/mythtv"
+
+	elog "Want mythfrontend to start automatically?"
+	elog "Set USE=autostart. Details can be found at:"
+	elog "https://dev.gentoo.org/~cardoe/mythtv/autostart.html"
+	elog
+	elog "Note that the systemd unit now restarts by default and logs"
+	elog "to journald via the console at the notice verbosity."
+}
+
+pkg_info() {
+	if [[ -f "${EROOT}"/usr/bin/mythfrontend ]]; then
+		"${EROOT}"/usr/bin/mythfrontend --version
+	fi
+}
+
+pkg_config() {
+	echo "Creating mythtv MySQL user and mythconverg database if it does not"
+	echo "already exist. You will be prompted for your MySQL root password."
+	"${EROOT}"/usr/bin/mysql -u root -p < "${EROOT}"/usr/share/mythtv/database/mc.sql
+}
diff --git a/media-video/cclive/cclive-0.9.3-r1.ebuild b/media-video/cclive/cclive-0.9.3-r1.ebuild
index e911be3df68f..8566a4e9e4d7 100644
--- a/media-video/cclive/cclive-0.9.3-r1.ebuild
+++ b/media-video/cclive/cclive-0.9.3-r1.ebuild
@@ -26,6 +26,7 @@ DEPEND="${RDEPEND}
 
 src_prepare() {
 	epatch "${FILESDIR}"/${P}-iostream.patch #527658
+	epatch "${FILESDIR}"/${P}-boost-ver-check.patch #548310
 }
 
 src_configure() {
diff --git a/media-video/cclive/files/cclive-0.9.3-boost-ver-check.patch b/media-video/cclive/files/cclive-0.9.3-boost-ver-check.patch
new file mode 100644
index 000000000000..23e69dd1b665
--- /dev/null
+++ b/media-video/cclive/files/cclive-0.9.3-boost-ver-check.patch
@@ -0,0 +1,18 @@
+https://bugs.gentoo.org/548310
+
+apply boost.m4 updates to fix building w/gcc-5
+
+--- a/configure
++++ b/configure
+@@ -17481,8 +17481,10 @@
+ boost-lib-version = BOOST_LIB_VERSION
+ _ACEOF
+ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
++  grep -v '#' |
+   tr -d '\r' |
+-  $SED -n -e "/^boost-lib-version = /{s///;s/\"//g;p;q;}" >conftest.i 2>&1; then :
++  tr -s '\n' ' ' |
++  $SED -n -e "/^boost-lib-version = /{s///;s/[\" ]//g;p;q;}" >conftest.i 2>&1; then :
+   boost_cv_lib_version=`cat conftest.i`
+ fi
+ rm -rf conftest*
diff --git a/media-video/cheese/cheese-3.16.1.ebuild b/media-video/cheese/cheese-3.16.1.ebuild
index 3eff6f955dd1..db4ed2182372 100644
--- a/media-video/cheese/cheese-3.16.1.ebuild
+++ b/media-video/cheese/cheese-3.16.1.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Cheese"
 LICENSE="GPL-2+"
 SLOT="0/7" # subslot = libcheese soname version
 IUSE="+introspection test"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86"
 
 # using clutter-gst-2.0.0 results in GLSL errors; bug #478702
 COMMON_DEPEND="
diff --git a/media-video/gxine/Manifest b/media-video/gxine/Manifest
index 0392d7e95b33..474f3e3795f5 100644
--- a/media-video/gxine/Manifest
+++ b/media-video/gxine/Manifest
@@ -1 +1,2 @@
 DIST gxine-0.5.907.tar.xz 910528 SHA256 b5c925806a35cb23a24a80a39d494cefb529e22c957987741f269a994ab258d5 SHA512 dd35c8a8810c233e81a28e9f10504645662d60dc9609451e7c49c5d516bb041b61a3b9c8f330021af1e527064cf3f62f37bde98402df7426f501d0c78c571045 WHIRLPOOL 01037e358c515f01bd42ec48e54d92e7672162098a4d0a279f979dd01d9a6354dd37f7194f36f9dfc804a8730bd792676cef39e48b608104724a787bf9c51e57
+DIST gxine-0.5.908.tar.xz 917780 SHA256 832e47136ec68a573b22b6cc1c1d57607e78b05712ba9fb8e64464b5201ed9e7 SHA512 6172f442948655178fde837a5fa9194fdb06b5cc50f8cbbfcd153b72f9a360a5497bd7ebd09c8f2340547fd7a0c834d5c673712a13202768bf0c762ee41c5454 WHIRLPOOL 8e97e1f1d72a7b669c3346030522e4d2d755220fa337ad1a6486415f28d7ec375e4a5ae86fe2c7d3a4fb2ad84a76f5beb8d8c8ca7a4e06d9f1b0d1e01aebd00c
diff --git a/media-video/gxine/gxine-0.5.908.ebuild b/media-video/gxine/gxine-0.5.908.ebuild
new file mode 100644
index 000000000000..cea5adb95ed2
--- /dev/null
+++ b/media-video/gxine/gxine-0.5.908.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit autotools eutils fdo-mime gnome2-utils multilib nsplugins
+
+DESCRIPTION="GTK+ Front-End for libxine"
+HOMEPAGE="http://xine.sourceforge.net/"
+SRC_URI="mirror://sourceforge/xine/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="linguas_cs linguas_de lirc nls nsplugin udev +xcb xinerama"
+
+COMMON_DEPEND=">=media-libs/xine-lib-1.1.20
+	x11-libs/gtk+:2
+	>=dev-libs/glib-2
+	>=dev-lang/spidermonkey-1.8.2.15:0
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXrender
+	lirc? ( app-misc/lirc )
+	nls? ( virtual/libintl )
+	nsplugin? ( dev-libs/nspr
+		x11-libs/libXaw
+		x11-libs/libXt )
+	udev? ( virtual/libgudev:= )
+	xcb? ( x11-libs/libxcb )
+	xinerama? ( x11-libs/libXinerama )"
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )"
+
+src_prepare() {
+	# ld: cannot find -ljs
+	sed -i -e '/JS_LIBS="`spidermonkey_locate_lib/s:js:mozjs:' m4/_js.m4 || die
+
+	if has_version '>=dev-lang/spidermonkey-1.8.7:0'; then
+		sed -i -e 's:mozjs185:mozjs187:' m4/_js.m4 || die #422983
+	fi
+
+	epatch \
+		"${FILESDIR}"/${PN}-0.5.905-desktop.patch \
+		"${FILESDIR}"/${PN}-0.5.905-fix-nspr-useage.patch \
+		"${FILESDIR}"/${PN}-0.5.906-endif.patch \
+		"${FILESDIR}"/${PN}-0.5.907-underlinking.patch
+
+	# need to disable calling of xine-list when running without
+	# userpriv, otherwise we get sandbox violations (bug #233847)
+	if [[ ${EUID} == "0" ]]; then
+		sed -i -e 's:^XINE_LIST=.*$:XINE_LIST=:' configure.ac || die
+	fi
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable nls) \
+		$(use_enable lirc) \
+		--enable-watchdog \
+		$(use_with xcb) \
+		$(has_version '<dev-lang/spidermonkey-1.8.5' && echo --with-spidermonkey=/usr/include/js) \
+		$(use_with nsplugin browser-plugin) \
+		$(use_with udev gudev) \
+		--without-hal \
+		--without-dbus \
+		$(use_with xinerama)
+}
+
+src_install() {
+	emake DESTDIR="${D}" \
+		docdir=/usr/share/doc/${PF} \
+		docsdir=/usr/share/doc/${PF} \
+		install
+
+	dodoc AUTHORS BUGS ChangeLog README{,_l10n} TODO
+
+	use linguas_cs && dodoc README.cs
+	use linguas_de && dodoc README.de
+
+	use nsplugin && inst_plugin /usr/$(get_libdir)/gxine/gxineplugin.so
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+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/media-video/kaffeine/Manifest b/media-video/kaffeine/Manifest
index 78d91185f289..f9c083b527cf 100644
--- a/media-video/kaffeine/Manifest
+++ b/media-video/kaffeine/Manifest
@@ -1 +1,2 @@
 DIST kaffeine-1.2.2.tar.gz 489727 SHA256 b6476a93ddbf84142d4fe29f0757de871e11ce6ca32590affe863a75a231c8cb SHA512 31db518943c223e635822369548949a0c2162cdbbe59edbadb77f4820acf697293d67681553d5552b9435471240fee551786c8c652f1ae5ab9cfe9b8a9cf4459 WHIRLPOOL 232f4875398c4ce889cbf1f3d0aeadefce09d5c6ed64aaf82df9fb57472b7fc814f20fb0fec54db715b45965ff79ae2ae064bb008c4c5fcf96d5b4dd3c860157
+DIST kaffeine-1.3.1.tar.gz 1011607 SHA256 af3abe58e038478a0e50449d414c4885ff3e7a898724cf4216054a0360838aa6 SHA512 c0674153147dea231f8b1cd1d6de245d4af13893904937856371d9e1f2bd1b8df4d4389b324a02b34630cebb134ae47e9c405bcfa909b7fa680e2ff034db4471 WHIRLPOOL 49e5f528223b651e9f46fc44f0a94f69d15e743af31e53192473b95bb338b03bfcc93861343496ca29a55d8356ddf58789c75ed493beee42b22b47a69c083fea
diff --git a/media-video/kaffeine/kaffeine-1.3.1.ebuild b/media-video/kaffeine/kaffeine-1.3.1.ebuild
new file mode 100644
index 000000000000..f08f1409e698
--- /dev/null
+++ b/media-video/kaffeine/kaffeine-1.3.1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_LINGUAS="ar ast be bg ca ca@valencia cs da de el en_GB eo es et fi fr ga gl
+hr hu it ja km ko ku lt mai nb nds nl nn pa pl pt pt_BR ro ru se sk
+sr@ijekavian sr@ijekavianlatin sr@latin sv th tr uk zh_CN zh_TW"
+KDE_SCM="git"
+inherit kde4-base
+
+DESCRIPTION="KDE media player with digital TV support"
+HOMEPAGE="https://kaffeine.kde.org/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2 FDL-1.2"
+SLOT="4"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="debug"
+
+DEPEND="
+	x11-libs/libXScrnSaver
+	dev-qt/qtsql:4[sqlite]
+	>=media-video/vlc-1.2[X]
+	x11-libs/libXScrnSaver
+"
+RDEPEND="${DEPEND}"
+
+DOCS=( Changelog NOTES )
+
+PATCHES=( )
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_build debug DEBUG_MODULE)
+	)
+
+	kde4-base_src_configure
+}
diff --git a/media-video/kffmpegthumbnailer/metadata.xml b/media-video/kffmpegthumbnailer/metadata.xml
index cb33053f8c78..6e5a6249ce5f 100644
--- a/media-video/kffmpegthumbnailer/metadata.xml
+++ b/media-video/kffmpegthumbnailer/metadata.xml
@@ -8,5 +8,6 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="google-code">ffmpegthumbnailer</remote-id>
+		<remote-id type="github">dirkvdb/ffmpegthumbnailer</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/media-video/mplayer/mplayer-1.2_pre20150214-r1.ebuild b/media-video/mplayer/mplayer-1.2_pre20150214-r1.ebuild
index 2f489b55b544..380deaa0fb04 100644
--- a/media-video/mplayer/mplayer-1.2_pre20150214-r1.ebuild
+++ b/media-video/mplayer/mplayer-1.2_pre20150214-r1.ebuild
@@ -159,9 +159,9 @@ RDEPEND+="
 SLOT="0"
 LICENSE="GPL-2"
 if [[ ${PV} != *9999* ]]; then
-	KEYWORDS="alpha amd64 arm hppa ppc ppc64 sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+	KEYWORDS="alpha amd64 arm hppa ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 else
-	KEYWORDS="alpha amd64 arm hppa ppc ppc64 sparc"
+	KEYWORDS="alpha amd64 arm hppa ppc ppc64 sparc x86"
 fi
 
 # faac codecs are nonfree
diff --git a/media-video/mpv/mpv-0.9.2-r1.ebuild b/media-video/mpv/mpv-0.9.2-r1.ebuild
index ab9881a9b5cb..0a8a354aa556 100644
--- a/media-video/mpv/mpv-0.9.2-r1.ebuild
+++ b/media-video/mpv/mpv-0.9.2-r1.ebuild
@@ -19,7 +19,7 @@ if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI+=" https://github.com/mpv-player/mpv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ppc ppc64 ~sparc ~x86 ~amd64-linux"
 	DOCS+=( RELEASE_NOTES )
 fi
 
diff --git a/media-video/pitivi/pitivi-0.94.ebuild b/media-video/pitivi/pitivi-0.94.ebuild
index 450502290caf..157ec8bf5320 100644
--- a/media-video/pitivi/pitivi-0.94.ebuild
+++ b/media-video/pitivi/pitivi-0.94.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="http://www.pitivi.org"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE="v4l test"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/media-video/subdl/metadata.xml b/media-video/subdl/metadata.xml
index 564e8cdd2612..e87744a17fe7 100644
--- a/media-video/subdl/metadata.xml
+++ b/media-video/subdl/metadata.xml
@@ -7,5 +7,6 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="google-code">subdl</remote-id>
+		<remote-id type="github">akexakex/subdl</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/media-video/totem/Manifest b/media-video/totem/Manifest
index df6140552972..4414d7369072 100644
--- a/media-video/totem/Manifest
+++ b/media-video/totem/Manifest
@@ -1,3 +1,3 @@
 DIST totem-3.14.3.tar.xz 3171820 SHA256 a8eff72a83fe351e4421e37f920fc2869d6d1d76329a60045db43a12d0747400 SHA512 8e26742c370356882f14f8f17368ae80cc280bfc62d02f89128190c37a3085f44ba35d4cec102674341eb09a1ee6e8cc0f749ff52f2f722f5ea99cc22cd99c2f WHIRLPOOL 3f68866272b69c3868fc0fd1abbbb6b593ec05241f7cc7d2cb3373deb93fc1ffffe4ccc8bfbdcb3c8f0a88c820457ac5d04c94ef0c771cfb44471b11987955ae
-DIST totem-3.16.1.tar.xz 3165560 SHA256 c98d0006ece80f48f8e6bb6ed269857bad9746bf86669f212078c770441475da SHA512 1ccd62938aee2c13865c95188ccdb54771f0fb41f6d70856dbdd0bddf4c23945dff458452def18f1b7556ea159d3f0f40abaa56c9b1a833ca47968ee665c6a6d WHIRLPOOL f5e40a169e95e58d5dabf9842bce636640ab400dac8c1e60f1aac78d0be7a87e00ef2bb14c609a10df8e80aed85ba3c22ae28f64c98bd82c25760cd0dec448f0
 DIST totem-3.16.2.tar.xz 3172656 SHA256 8e9150d104499500939499e29d56b1593ca49777f35ad5a7a02192e23d811f32 SHA512 a7c85316252f657774000abbea8326214ccc275e15791d6b789993f295941d0d0c06889730207941d0df94c7a9178b663d4097cdcd18b80030421257936fc67a WHIRLPOOL b9b2ab49a2240765fc8cd7a5299eca97575f436af91d5da0b930c151788b17cc00cea358bdd171da32411f01f3ac77767b886adb3c188777f36f68b35f4147b7
+DIST totem-3.16.3.tar.xz 3172104 SHA256 278e6dc66d00a5ae7bedcadba987008139f0b66e534f629febbeb098d4504444 SHA512 424ce3e56ed40d8de5d69ffe8e069d804bcabdd664defeea3cfbcbd2210c5494843727eaf7671d20e6717e105790b60b361f06cccd75ab56dc1b9cbf3f3ef3e9 WHIRLPOOL 7738daba72bd0b5c4d61681af1c3698480865bcf84b7d8d6af2dac8dd0b6ca8922d0d28bbd1dbf76960f6aa54d9b57251d30d24e3e081cbf6ca382a127a81365
diff --git a/media-video/totem/totem-3.16.1.ebuild b/media-video/totem/totem-3.16.1.ebuild
deleted file mode 100644
index b1df0c5079dc..000000000000
--- a/media-video/totem/totem-3.16.1.ebuild
+++ /dev/null
@@ -1,133 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="yes"
-GNOME2_LA_PUNT="yes" # plugins are dlopened
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="threads"
-
-inherit autotools eutils gnome2 multilib python-single-r1
-
-DESCRIPTION="Media player for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Apps/Videos"
-
-LICENSE="GPL-2+ LGPL-2+"
-SLOT="0"
-IUSE="+introspection lirc nautilus +python test zeitgeist"
-# see bug #359379
-REQUIRED_USE="
-	python? ( introspection ${PYTHON_REQUIRED_USE} )
-	zeitgeist? ( introspection )
-"
-
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
-
-# FIXME:
-# Runtime dependency on gnome-session-2.91
-RDEPEND="
-	>=dev-libs/glib-2.35:2
-	>=dev-libs/libpeas-1.1[gtk]
-	>=dev-libs/libxml2-2.6:2
-	>=dev-libs/totem-pl-parser-3.10.1:0=[introspection?]
-	>=media-libs/clutter-1.17.3:1.0[gtk]
-	>=media-libs/clutter-gst-2.99.2:3.0
-	>=media-libs/clutter-gtk-1.5.5:1.0
-	>=x11-libs/cairo-1.14
-	>=x11-libs/gdk-pixbuf-2.23.0:2
-	>=x11-libs/gtk+-3.16:3[introspection?]
-
-	>=media-libs/grilo-0.2.12:0.2[playlist]
-	media-plugins/grilo-plugins:0.2
-	>=media-libs/gstreamer-1.3.1:1.0
-	>=media-libs/gst-plugins-base-1.4.2:1.0[X,introspection?,pango]
-	media-libs/gst-plugins-good:1.0
-	media-plugins/gst-plugins-meta:1.0
-	media-plugins/gst-plugins-taglib:1.0
-
-	x11-libs/libX11
-
-	gnome-base/gnome-desktop:3
-	gnome-base/gsettings-desktop-schemas
-	x11-themes/gnome-icon-theme-symbolic
-
-	introspection? ( >=dev-libs/gobject-introspection-0.6.7 )
-	lirc? ( app-misc/lirc )
-	nautilus? ( >=gnome-base/nautilus-2.91.3 )
-	python? (
-		${PYTHON_DEPS}
-		>=dev-libs/libpeas-1.1.0[${PYTHON_USEDEP}]
-		>=dev-python/pygobject-2.90.3:3[${PYTHON_USEDEP}]
-		dev-python/pyxdg[${PYTHON_USEDEP}]
-		dev-python/dbus-python[${PYTHON_USEDEP}]
-		>=x11-libs/gtk+-3.5.2:3[introspection] )
-	zeitgeist? ( >=gnome-extra/zeitgeist-0.9.12 )
-"
-DEPEND="${RDEPEND}
-	app-text/docbook-xml-dtd:4.5
-	app-text/scrollkeeper
-	app-text/yelp-tools
-	dev-libs/appstream-glib
-	>=dev-util/gtk-doc-am-1.14
-	>=dev-util/intltool-0.50.1
-	sys-devel/gettext
-	virtual/pkgconfig
-	x11-proto/xextproto
-	x11-proto/xproto
-
-	dev-libs/gobject-introspection-common
-	gnome-base/gnome-common
-"
-# eautoreconf needs:
-#	app-text/yelp-tools
-#	dev-libs/gobject-introspection-common
-#	gnome-base/gnome-common
-# docbook-xml-dtd is needed for user doc
-# Prevent dev-python/pylint dep, bug #482538
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	# Prevent pylint usage by tests, bug #482538
-	sed -i -e 's/ check-pylint//' src/plugins/Makefile.plugins || die
-
-	eautoreconf
-	gnome2_src_prepare
-
-	# FIXME: upstream should provide a way to set GST_INSPECT, bug #358755 & co.
-	# gst-inspect causes sandbox violations when a plugin needs write access to
-	# /dev/dri/card* in its init phase.
-	sed -e "s|\(gst10_inspect=\).*|\1$(type -P true)|" \
-		-i configure || die
-}
-
-src_configure() {
-	# Disabled: sample-python, sample-vala
-	local plugins="apple-trailers,autoload-subtitles,brasero-disc-recorder"
-	plugins+=",im-status,gromit,media-player-keys,ontop"
-	plugins+=",properties,recent,rotation,screensaver,screenshot"
-	plugins+=",skipto,vimeo"
-	use lirc && plugins+=",lirc"
-	use nautilus && plugins+=",save-file"
-	use python && plugins+=",dbusservice,pythonconsole,opensubtitles"
-	use zeitgeist && plugins+=",zeitgeist-dp"
-
-	# pylint is checked unconditionally, but is only used for make check
-	# appstream-util overriding necessary until upstream fixes their macro
-	# to respect configure switch
-	gnome2_src_configure \
-		--disable-run-in-source-tree \
-		--disable-static \
-		--enable-easy-codec-installation \
-		--enable-vala \
-		$(use_enable introspection) \
-		$(use_enable nautilus) \
-		$(use_enable python) \
-		PYLINT=$(type -P true) \
-		VALAC=$(type -P true) \
-		APPSTREAM_UTIL=$(type -P true) \
-		--with-plugins=${plugins}
-}
diff --git a/media-video/totem/totem-3.16.3.ebuild b/media-video/totem/totem-3.16.3.ebuild
new file mode 100644
index 000000000000..13edeeda9dc1
--- /dev/null
+++ b/media-video/totem/totem-3.16.3.ebuild
@@ -0,0 +1,132 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="yes"
+GNOME2_LA_PUNT="yes" # plugins are dlopened
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="threads"
+
+inherit autotools eutils gnome2 multilib python-single-r1
+
+DESCRIPTION="Media player for GNOME"
+HOMEPAGE="https://wiki.gnome.org/Apps/Videos"
+
+LICENSE="GPL-2+ LGPL-2+"
+SLOT="0"
+IUSE="+introspection lirc nautilus +python test zeitgeist"
+# see bug #359379
+REQUIRED_USE="
+	python? ( introspection ${PYTHON_REQUIRED_USE} )
+	zeitgeist? ( introspection )
+"
+
+KEYWORDS="amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+
+# FIXME:
+# Runtime dependency on gnome-session-2.91
+RDEPEND="
+	>=dev-libs/glib-2.35:2[dbus]
+	>=dev-libs/libpeas-1.1[gtk]
+	>=dev-libs/libxml2-2.6:2
+	>=dev-libs/totem-pl-parser-3.10.1:0=[introspection?]
+	>=media-libs/clutter-1.17.3:1.0[gtk]
+	>=media-libs/clutter-gst-2.99.2:3.0
+	>=media-libs/clutter-gtk-1.5.5:1.0
+	>=x11-libs/cairo-1.14
+	>=x11-libs/gdk-pixbuf-2.23.0:2
+	>=x11-libs/gtk+-3.16:3[introspection?]
+
+	>=media-libs/grilo-0.2.12:0.2[playlist]
+	media-plugins/grilo-plugins:0.2
+	>=media-libs/gstreamer-1.3.1:1.0
+	>=media-libs/gst-plugins-base-1.4.2:1.0[X,introspection?,pango]
+	media-libs/gst-plugins-good:1.0
+	media-plugins/gst-plugins-meta:1.0
+	media-plugins/gst-plugins-taglib:1.0
+
+	x11-libs/libX11
+
+	gnome-base/gnome-desktop:3
+	gnome-base/gsettings-desktop-schemas
+	x11-themes/gnome-icon-theme-symbolic
+
+	introspection? ( >=dev-libs/gobject-introspection-0.6.7:= )
+	lirc? ( app-misc/lirc )
+	nautilus? ( >=gnome-base/nautilus-2.91.3 )
+	python? (
+		${PYTHON_DEPS}
+		>=dev-libs/libpeas-1.1.0[${PYTHON_USEDEP}]
+		>=dev-python/pygobject-2.90.3:3[${PYTHON_USEDEP}]
+		dev-python/pyxdg[${PYTHON_USEDEP}]
+		dev-python/dbus-python[${PYTHON_USEDEP}]
+		>=x11-libs/gtk+-3.5.2:3[introspection] )
+	zeitgeist? ( >=gnome-extra/zeitgeist-0.9.12 )
+"
+DEPEND="${RDEPEND}
+	app-text/docbook-xml-dtd:4.5
+	app-text/yelp-tools
+	dev-libs/appstream-glib
+	>=dev-util/gtk-doc-am-1.14
+	>=dev-util/intltool-0.50.1
+	sys-devel/gettext
+	virtual/pkgconfig
+	x11-proto/xextproto
+	x11-proto/xproto
+
+	dev-libs/gobject-introspection-common
+	gnome-base/gnome-common
+"
+# eautoreconf needs:
+#	app-text/yelp-tools
+#	dev-libs/gobject-introspection-common
+#	gnome-base/gnome-common
+# docbook-xml-dtd is needed for user doc
+# Prevent dev-python/pylint dep, bug #482538
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	# Prevent pylint usage by tests, bug #482538
+	sed -i -e 's/ check-pylint//' src/plugins/Makefile.plugins || die
+
+	eautoreconf
+	gnome2_src_prepare
+
+	# FIXME: upstream should provide a way to set GST_INSPECT, bug #358755 & co.
+	# gst-inspect causes sandbox violations when a plugin needs write access to
+	# /dev/dri/card* in its init phase.
+	sed -e "s|\(gst10_inspect=\).*|\1$(type -P true)|" \
+		-i configure || die
+}
+
+src_configure() {
+	# Disabled: sample-python, sample-vala
+	local plugins="apple-trailers,autoload-subtitles,brasero-disc-recorder"
+	plugins+=",im-status,gromit,media-player-keys,ontop"
+	plugins+=",properties,recent,rotation,screensaver,screenshot"
+	plugins+=",skipto,vimeo"
+	use lirc && plugins+=",lirc"
+	use nautilus && plugins+=",save-file"
+	use python && plugins+=",dbusservice,pythonconsole,opensubtitles"
+	use zeitgeist && plugins+=",zeitgeist-dp"
+
+	# pylint is checked unconditionally, but is only used for make check
+	# appstream-util overriding necessary until upstream fixes their macro
+	# to respect configure switch
+	gnome2_src_configure \
+		--disable-run-in-source-tree \
+		--disable-static \
+		--enable-easy-codec-installation \
+		--enable-vala \
+		$(use_enable introspection) \
+		$(use_enable nautilus) \
+		$(use_enable python) \
+		PYLINT=$(type -P true) \
+		VALAC=$(type -P true) \
+		APPSTREAM_UTIL=$(type -P true) \
+		--with-plugins=${plugins}
+}
diff --git a/net-analyzer/dnsenum/metadata.xml b/net-analyzer/dnsenum/metadata.xml
index 5fcbf8e1851a..f59f8a409b18 100644
--- a/net-analyzer/dnsenum/metadata.xml
+++ b/net-analyzer/dnsenum/metadata.xml
@@ -1,11 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-<email>zerochaos@gentoo.org</email>
-<name>Rick Farina</name>
-</maintainer>
-<longdescription lang="en">
+	<maintainer>
+		<email>zerochaos@gentoo.org</email>
+		<name>Rick Farina</name>
+	</maintainer>
+	<longdescription lang="en">
 </longdescription>
+	<upstream>
+		<remote-id type="github">fwaeytens/dnsenum</remote-id>
+	</upstream>
 </pkgmetadata>
-
diff --git a/net-analyzer/fragroute/metadata.xml b/net-analyzer/fragroute/metadata.xml
index 78692635ad22..9c9de543b91c 100644
--- a/net-analyzer/fragroute/metadata.xml
+++ b/net-analyzer/fragroute/metadata.xml
@@ -2,4 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>netmon</herd>
+	<upstream>
+		<remote-id type="github">stsi/fragroute-ipv6</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/net-analyzer/icinga2/Manifest b/net-analyzer/icinga2/Manifest
index e91106becc68..765572df5ee7 100644
--- a/net-analyzer/icinga2/Manifest
+++ b/net-analyzer/icinga2/Manifest
@@ -1,3 +1,4 @@
+DIST icinga2-2.3.10.tar.gz 830680 SHA256 d29880b1adfd21d650a72e04a36e4dadb899b8452c4917e25e7ec3c5e65582c1 SHA512 14dee2d856f0dd1f2cd7185d68c9f90840acc086cb8c20eaa300585d2b3a491cadc44cb295fe6931a539aa305f4d9e00adb37b3d6cf33805989ff7eec0932630 WHIRLPOOL 98140d95133b01c3428b092dbbc8d9d9e5299e63d922fe07e60be2d0ed56ea3177210f64d6f71eba2bc99bdec0d297729539114266186e63dd2aceab98166914
 DIST icinga2-2.3.5.tar.gz 804780 SHA256 712d13e997fc6fbf02f8c2046851b1fda1291305f0d3d6792cbebf5fb1558225 SHA512 9302ee2360cbc69ff9bc06092b4ebe9fb77901d9d60eb073f41f781e2917f398ccbddb617bb306631c9d4d0dbe0312cdab6fc1369b2c2691cf116d7af04b1ea7 WHIRLPOOL a73f8ab1136b35283c343281d65e4ea3e78ecdc52a6d1775f3202374a0f5dc9927709e2aa705243243d3c8751e313c60b4d88b1d0f15d1514a50e8a4483d94f6
 DIST icinga2-2.3.6.tar.gz 816718 SHA256 96453fbfa418329b74d45bd2a202302add03d907fac28644e1228d869c478093 SHA512 bb16546bce387f4d828c1bba7dc0e5e1e89ca9c8a4bbb931d9fabd3fb0089329751814bee883b3320e0a7a0b2dd26c1e5b2970b2c33fc8172c3e73784d92a960 WHIRLPOOL 21d410a401ac8ada2857640061ede691b0c41b54aca49409fb3e7002195b1975c653351afffd06a375b6a78948ee96e875dcc982971d3332a994752ccc4c80af
 DIST icinga2-2.3.7.tar.gz 817712 SHA256 067335129daf464d800f48d75bf2fde6ae63c99db6a5126d3d322b6562dfdf28 SHA512 46c940b8081dc3e064121acdab366ba28c1156fc563064022099c3186e310d20bcc1743b643046e0579f42e8ea90b9dfa1f868b28df3eedcd18926c7f65c98f6 WHIRLPOOL 5363191df2c5a57d135866589fe683ea53623c3b0583c299e248e32e4822d1f0bb7806ad573ee9ecd402edecb80dc1ced5850550c595b97562126670b74977f9
diff --git a/net-analyzer/icinga2/icinga2-2.3.10-r1.ebuild b/net-analyzer/icinga2/icinga2-2.3.10-r1.ebuild
new file mode 100644
index 000000000000..fc4c95aae619
--- /dev/null
+++ b/net-analyzer/icinga2/icinga2-2.3.10-r1.ebuild
@@ -0,0 +1,133 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit cmake-utils depend.apache eutils systemd toolchain-funcs user
+
+DESCRIPTION="Distributed, general purpose, network monitoring engine"
+HOMEPAGE="http://icinga.org/icinga2"
+SRC_URI="https://github.com/Icinga/icinga2/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+mysql postgres classicui minimal nano-syntax +plugins +vim-syntax"
+
+DEPEND="
+	dev-libs/openssl:0
+	>=dev-libs/boost-1.41
+	sys-devel/bison
+	>=sys-devel/flex-2.5.35
+	mysql? ( virtual/mysql )
+	postgres? ( dev-db/postgresql:= )"
+
+RDEPEND="
+	${DEPEND}
+	plugins? ( || (
+		net-analyzer/monitoring-plugins
+		net-analyzer/nagios-plugins
+	) )
+	classicui? ( net-analyzer/icinga[web] )"
+
+REQUIRED_USE="!minimal? ( || ( mysql postgres ) )"
+
+want_apache2
+
+pkg_setup() {
+	depend.apache_pkg_setup
+	enewgroup icinga
+	enewgroup icingacmd
+	enewgroup nagios  # for plugins
+	enewuser icinga -1 -1 /var/lib/icinga2 "icinga,icingacmd,nagios"
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DICINGA2_UNITY_BUILD=FALSE
+		-DCMAKE_VERBOSE_MAKEFILE=ON
+		-DCMAKE_BUILD_TYPE=None
+		-DCMAKE_INSTALL_PREFIX=/usr
+		-DCMAKE_INSTALL_SYSCONFDIR=/etc
+		-DCMAKE_INSTALL_LOCALSTATEDIR=/var
+		-DICINGA2_SYSCONFIGFILE=/etc/conf.d/icinga2
+		-DICINGA2_USER=icinga
+		-DICINGA2_GROUP=icingacmd
+		-DICINGA2_COMMAND_USER=icinga
+		-DICINGA2_COMMAND_GROUP=icingacmd
+		-DINSTALL_SYSTEMD_SERVICE_AND_INITSCRIPT=yes
+	)
+	# default to off if minimal, allow the flags to be set otherwise
+	if use minimal; then
+		mycmakeargs+=(
+			-DICINGA2_WITH_MYSQL=OFF
+			-DICINGA2_WITH_PGSQL=OFF
+		)
+	else
+		mycmakeargs+=(
+			-DICINGA2_WITH_PGSQL=$(usex postgres ON OFF)
+			-DICINGA2_WITH_MYSQL=$(usex mysql ON OFF)
+		)
+	fi
+	cmake-utils_src_configure
+}
+
+src_install() {
+	BUILDDIR="${WORKDIR}"/icinga2-${PV}_build
+	cd $BUILDDIR
+
+	emake DESTDIR="${D}" install
+
+	einstalldocs
+
+	newinitd "${FILESDIR}"/icinga2.initd icinga2
+	newconfd "${FILESDIR}"/icinga2.confd icinga2
+
+	if use mysql ; then
+		docinto schema
+		newdoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_mysql/schema/mysql.sql mysql.sql
+		docinto schema/upgrade
+		dodoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_mysql/schema/upgrade/*
+	elif use postgres ; then
+		docinto schema
+		newdoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_pgsql/schema/pgsql.sql pgsql.sql
+		docinto schema/upgrade
+		dodoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_pgsql/schema/upgrade/*
+	fi
+
+	keepdir /etc/icinga2
+	keepdir /var/lib/icinga2/api/zones
+	keepdir /var/lib/icinga2/api/repository
+	keepdir /var/lib/icinga2/api/log
+	keepdir /var/spool/icinga2/perfdata
+
+	rm -r "${D}/var/run" || die "failed to remove /var/run"
+	rm -r "${D}/var/cache" || die "failed to remove /var/cache"
+
+	fowners icinga:icinga /etc/icinga2
+	fowners icinga:icinga /var/lib/icinga2
+	fowners icinga:icinga /var/spool/icinga2
+	fowners icinga:icinga /var/spool/icinga2/perfdata
+	fowners icinga:icingacmd /var/log/icinga2
+
+	fperms ug+rwX,o-rwx /etc/icinga2
+	fperms ug+rwX,o-rwx /var/lib/icinga2
+	fperms ug+rwX,o-rwx /var/spool/icinga2
+	fperms ug+rwX,o-rwx /var/log/icinga2
+
+	if use vim-syntax; then
+		insinto /usr/share/vim/vimfiles
+		doins -r "${WORKDIR}"/${P}/tools/syntax/vim/ftdetect
+		doins -r "${WORKDIR}"/${P}/tools/syntax/vim/syntax
+	fi
+
+	if use nano-syntax; then
+		insinto /usr/share/nano
+		doins "${WORKDIR}"/${P}/tools/syntax/nano/icinga2.nanorc
+	fi
+}
+
+pkg_postinst() {
+	elog "DB IDO schema upgrade required. http://docs.icinga.org/icinga2/snapshot/chapter-2.html#upgrading-the-mysql-database"
+	elog "You will need to update your configuration files, see https://dev.icinga.org/issues/5909"
+}
diff --git a/net-analyzer/icinga2/icinga2-2.3.10.ebuild b/net-analyzer/icinga2/icinga2-2.3.10.ebuild
new file mode 100644
index 000000000000..ac3a260334cf
--- /dev/null
+++ b/net-analyzer/icinga2/icinga2-2.3.10.ebuild
@@ -0,0 +1,163 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit cmake-utils depend.apache eutils systemd toolchain-funcs user versionator
+
+DESCRIPTION="Distributed, general purpose, network monitoring engine"
+HOMEPAGE="http://icinga.org/icinga2"
+SRC_URI="https://github.com/Icinga/icinga2/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+mysql postgres classicui minimal nano-syntax +plugins +vim-syntax"
+
+DEPEND="
+	dev-libs/openssl:=
+	>=dev-libs/boost-1.41
+	sys-devel/bison
+	>=sys-devel/flex-2.5.35
+	mysql? ( virtual/mysql )
+	postgres? ( dev-db/postgresql:= )"
+
+RDEPEND="
+	${DEPEND}
+	plugins? ( || (
+		net-analyzer/monitoring-plugins
+		net-analyzer/nagios-plugins
+	) )
+	classicui? ( net-analyzer/icinga[web] )"
+
+REQUIRED_USE="!minimal? ( || ( mysql postgres ) )"
+
+want_apache2
+
+pkg_setup() {
+	enewgroup icinga
+	enewgroup icingacmd
+	enewgroup nagios  # for plugins
+	enewuser icinga -1 -1 /var/lib/icinga2 "icinga,icingacmd,nagios"
+}
+
+src_prepare() {
+#	epatch "${FILESDIR}/${P}-create_var_cache.patch"
+	epatch_user
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DICINGA2_UNITY_BUILD=FALSE
+		-DCMAKE_VERBOSE_MAKEFILE=ON
+		-DCMAKE_BUILD_TYPE=None
+		-DCMAKE_INSTALL_PREFIX=/usr
+		-DCMAKE_INSTALL_SYSCONFDIR=/etc
+		-DCMAKE_INSTALL_LOCALSTATEDIR=/var
+		-DICINGA2_SYSCONFIGFILE=/etc/conf.d/icinga2
+		-DICINGA2_USER=icinga
+		-DICINGA2_GROUP=icingacmd
+		-DICINGA2_COMMAND_USER=icinga
+		-DICINGA2_COMMAND_GROUP=icingacmd
+		-DINSTALL_SYSTEMD_SERVICE_AND_INITSCRIPT=yes
+	)
+	if use minimal; then
+		mycmakeargs+=(
+			-DICINGA2_WITH_MYSQL=OFF
+			-DICINGA2_WITH_PGSQL=OFF
+		)
+	fi
+	if use postgres; then
+		mycmakeargs+=(
+			-DICINGA2_WITH_PGSQL=ON
+		)
+	else
+		mycmakeargs+=(
+			-DICINGA2_WITH_PGSQL=OFF
+		)
+	fi
+	if use mysql; then
+		mycmakeargs+=(
+			-DICINGA2_WITH_MYSQL=ON
+		)
+	else
+		mycmakeargs+=(
+			-DICINGA2_WITH_MYSQL=OFF
+		)
+	fi
+	cmake-utils_src_configure
+}
+
+src_install() {
+	BUILDDIR="${WORKDIR}"/icinga2-${PV}_build
+	cd $BUILDDIR
+
+	#if [[ -f Makefile ]] || [[ -f GNUmakefile ]] || [[ -f makefile ]] ; then
+
+		emake DESTDIR="${D}" install
+	#fi
+
+	cd "${WORKDIR}"/icinga2-${PV}
+	if ! declare -p DOCS >/dev/null 2>&1 ; then
+		local d
+		for d in README* ChangeLog AUTHORS NEWS TODO CHANGES THANKS BUGS \
+				FAQ CREDITS CHANGELOG ; do
+			[[ -s "${d}" ]] && dodoc "${d}"
+		done
+	elif declare -p DOCS | grep -q "^declare -a " ; then
+		dodoc "${DOCS[@]}"
+	else
+		dodoc ${DOCS}
+	fi
+
+	newinitd "${FILESDIR}"/icinga2.initd icinga2
+	newconfd "${FILESDIR}"/icinga2.confd icinga2
+
+	if use mysql ; then
+		docinto schema
+		newdoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_mysql/schema/mysql.sql mysql.sql
+		docinto schema/upgrade
+		#newdoc "${WORKDIR}"/icinga2-${PV}/components/db_ido_mysql/schema/upgrade/0.0.11.sql mysql-upgrade-1.12.0.sql
+	elif use postgres ; then
+		docinto schema
+		newdoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_pgsql/schema/pgsql.sql pgsql.sql
+		docinto schema/upgrade
+		#newdoc "${WORKDIR}"/icinga2-${PV}/components/db_ido_pgsql/schema/upgrade/0.0.11.sql pgsql-upgrade-1.12.0.sql
+	fi
+
+	keepdir /etc/icinga2
+	keepdir /var/lib/icinga2/api/zones
+	keepdir /var/lib/icinga2/api/repository
+	keepdir /var/lib/icinga2/api/log
+	keepdir /var/spool/icinga2/perfdata
+
+	rm -r "${D}var/run" || die "failed to remove /var/run"
+	rm -r "${D}var/cache" || die "failed to remove /var/cache"
+
+	fowners icinga:icinga /etc/icinga2
+	fowners icinga:icinga /var/lib/icinga2
+	fowners icinga:icinga /var/spool/icinga2
+	fowners icinga:icinga /var/spool/icinga2/perfdata
+	fowners icinga:icingacmd /var/log/icinga2
+
+	fperms ug+rwX,o-rwx /etc/icinga2
+	fperms ug+rwX,o-rwx /var/lib/icinga2
+	fperms ug+rwX,o-rwx /var/spool/icinga2
+	fperms ug+rwX,o-rwx /var/log/icinga2
+
+	if use vim-syntax; then
+		insinto /usr/share/vim/vimfiles
+		doins -r tools/syntax/vim/ftdetect
+		doins -r tools/syntax/vim/syntax
+	fi
+
+	if use nano-syntax; then
+		insinto /usr/share/nano
+		doins tools/syntax/nano/icinga2.nanorc
+	fi
+}
+
+pkg_postinst() {
+	elog "DB IDO schema upgrade required. http://docs.icinga.org/icinga2/snapshot/chapter-2.html#upgrading-the-mysql-database"
+	elog "You will need to update your configuration files, see https://dev.icinga.org/issues/5909"
+}
diff --git a/net-analyzer/metasploit/Manifest b/net-analyzer/metasploit/Manifest
index 67678608b417..7b154fdb3042 100644
--- a/net-analyzer/metasploit/Manifest
+++ b/net-analyzer/metasploit/Manifest
@@ -1,2 +1,2 @@
 DIST framework-2.7.tar.gz 5800216 SHA256 516952772aaa8982628460b927c9119850925f870903c5a131a9c9f0390cf77f SHA512 a65740c81e6c711e6661170ec0dd87919cad6c4aa3aaac08fdaa72b4825be4bea28ec09c78f818ddab7660f5b485b13f87e3175b43c625319ce89b044a40f2a0 WHIRLPOOL f309608e30488484b24555fec84e65ed0dcbeba62a69e6ec23c507dbc0fcf720551a795e2a0793886fcd38d3a9b160819c864720155f58f274577b0246f05946
-DIST framework-4.9.3.tar.bz2 36334540 SHA256 76aa4651b8235a018ccb46b31974fa8785e3d16bd753ac34d66fa60468d304b3 SHA512 a16608c718c57913fa5206032ca3707504f83fb25e1a9aec93dbec8d799c7d600f8f2eafb6882bddf64082a19bf9ad39b461c180946499f4e4821f249270ee6f WHIRLPOOL cd4fa596e810a63ee16147f7c4acd3af9b6389732159721c1ce560233ff0a2364964fa56393fbc2e5dc6d0ba161a484c5b7c02603cd23da081ea896c4fd7370e
+DIST metasploit-4.11.4_p2015090201.tar.gz 35211994 SHA256 1254dbb3e8cf33c7a6c8c701a0be13f78bbd2234503e636f1afacf88676aeea2 SHA512 b96c9735ef579b5f98d1fd7176f91bb1710d263a19d3ff891877df8e341baa1749d5fdce9825a19d9ecbe162b72ebcd11336d4d7884e066f4e199baaff8b4085 WHIRLPOOL 875db5df25112736dd62ec1195080d2567a670cf3a770e787b70c364c6b30b43bf906f7ba35901ff367ce940b02af7b17ae135693a28ff5fca9fc05038132ae2
diff --git a/net-analyzer/metasploit/metadata.xml b/net-analyzer/metasploit/metadata.xml
index 9ba0d4a92316..eae4ef006e12 100644
--- a/net-analyzer/metasploit/metadata.xml
+++ b/net-analyzer/metasploit/metadata.xml
@@ -7,9 +7,11 @@
 		<description>Very delicate package, ask before you touch please</description>
 	</maintainer>
 	<use>
-		<flag name='development'>Install dependencies needed for metasploit and exploit development</flag>
-		<flag name='lorcon'>Enable lorcon for raw packet injection</flag>
-		<flag name='oracle'>Enable restricted oracle modules which have additional deps</flag>
-		<flag name='pcap'>Enable libpcap for packet sniffing</flag>
+		<flag name="development">Install dependencies needed for metasploit and exploit development</flag>
+		<flag name="oracle">Enable restricted oracle modules which have additional deps</flag>
+		<flag name="pcap">Enable libpcap for packet sniffing</flag>
 	</use>
+	<upstream>
+		<remote-id type="github">rapid7/metasploit-framework</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/net-analyzer/metasploit/metasploit-4.11.4_p2015090201.ebuild b/net-analyzer/metasploit/metasploit-4.11.4_p2015090201.ebuild
new file mode 100644
index 000000000000..e3d537c6b278
--- /dev/null
+++ b/net-analyzer/metasploit/metasploit-4.11.4_p2015090201.ebuild
@@ -0,0 +1,297 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="5"
+
+#never ever ever have more than one ruby in here
+USE_RUBY="ruby21"
+inherit eutils ruby-ng
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/rapid7/metasploit-framework.git"
+	EGIT_CHECKOUT_DIR="${WORKDIR}"/all
+	inherit git-r3
+	KEYWORDS=""
+	SLOT="9999"
+else
+	##Tags https://github.com/rapid7/metasploit-framework/releases
+	##Releases https://github.com/rapid7/metasploit-framework/wiki/Downloads-by-Version
+	#SRC_URI="https://github.com/rapid7/metasploit-framework/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	##Snapshots
+	MY_PV=${PV/_p/-}
+	SRC_URI="https://github.com/rapid7/metasploit-framework/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~x86"
+	RUBY_S="${PN}-framework-${MY_PV}"
+	inherit versionator
+	SLOT="$(get_version_component_range 1).$(get_version_component_range 2)"
+fi
+
+DESCRIPTION="Advanced open-source framework for developing, testing, and using vulnerability exploit code"
+HOMEPAGE="http://www.metasploit.org/"
+LICENSE="BSD"
+IUSE="development +java oracle +pcap test"
+
+#multiple known bugs with tests reported upstream and ignored
+#http://dev.metasploit.com/redmine/issues/8418 - worked around (fix user creation when possible)
+RESTRICT="test"
+
+RUBY_COMMON_DEPEND="virtual/ruby-ssl
+	>=dev-ruby/activesupport-4.0.9:4.0
+	>=dev-ruby/actionpack-4.0.9:4.0
+	>=dev-ruby/activerecord-4.0.9:4.0
+	dev-ruby/bcrypt-ruby
+	dev-ruby/builder:3
+	dev-ruby/bundler
+	=dev-ruby/jsobfu-0.2*
+	dev-ruby/json
+	dev-ruby/kissfft
+	=dev-ruby/metasploit_data_models-1.2.5
+	dev-ruby/meterpreter_bins:0.0.22
+	dev-ruby/metasploit-payloads:1.0.9
+	>=dev-ruby/metasploit-credential-1.0.0:1.0
+	>=dev-ruby/metasploit-concern-1.0.0:1.0
+	>=dev-ruby/metasploit-model-1.0.0:1.0
+	dev-ruby/msgpack
+	dev-ruby/nokogiri
+	=dev-ruby/recog-2.0.6:2
+	=dev-ruby/rkelly-remix-0.0.6
+	dev-ruby/sqlite3
+	>=dev-ruby/pg-0.11
+	dev-ruby/packetfu:1.1.9
+	>=dev-ruby/rubyzip-1.1
+	dev-ruby/rb-readline-r7
+	dev-ruby/robots
+	java? ( dev-ruby/rjb )
+	oracle? ( dev-ruby/ruby-oci8 )
+	pcap? ( dev-ruby/pcaprub:*
+		dev-ruby/network_interface )
+	development? ( dev-ruby/fivemat
+			dev-ruby/pry
+			dev-ruby/redcarpet
+			dev-ruby/yard
+			>=dev-ruby/rake-10.0.0
+			>=dev-ruby/factory_girl-4.1.0 )"
+	#lorcon doesn't support ruby21
+	#lorcon? ( net-wireless/lorcon[ruby] )
+ruby_add_bdepend "${RUBY_COMMON_DEPEND}
+		test? ( >=dev-ruby/factory_girl-4.1.0
+			dev-ruby/fivemat
+			dev-ruby/database_cleaner
+			>=dev-ruby/rspec-2.12
+			dev-ruby/shoulda-matchers
+			dev-ruby/timecop
+			>=dev-ruby/rake-10.0.0 )"
+ruby_add_rdepend "${RUBY_COMMON_DEPEND}"
+
+COMMON_DEPEND="dev-db/postgresql[server]
+	>=app-crypt/johntheripper-1.7.9-r1[-minimal]
+	net-analyzer/nmap"
+RDEPEND+=" ${COMMON_DEPEND}
+	>=app-eselect/eselect-metasploit-0.16"
+
+RESTRICT="strip"
+
+QA_PREBUILT="
+	usr/$(get_libdir)/${PN}${SLOT}/data/templates/template_x86_linux.bin
+	usr/$(get_libdir)/${PN}${SLOT}/data/templates/template_armle_linux.bin
+	usr/$(get_libdir)/${PN}${SLOT}/data/templates/template_x86_solaris.bin
+	usr/$(get_libdir)/${PN}${SLOT}/data/templates/template_x64_linux.bin
+	usr/$(get_libdir)/${PN}${SLOT}/data/templates/template_x64_linux_dll.bin
+	usr/$(get_libdir)/${PN}${SLOT}/data/templates/template_x86_bsd.bin
+	usr/$(get_libdir)/${PN}${SLOT}/data/templates/template_x64_bsd.bin
+	usr/$(get_libdir)/${PN}${SLOT}/data/templates/template_mipsbe_linux.bin
+	usr/$(get_libdir)/${PN}${SLOT}/data/templates/template_mipsle_linux.bin
+	usr/$(get_libdir)/${PN}${SLOT}/data/meterpreter/msflinker_linux_x86.bin
+	usr/$(get_libdir)/${PN}${SLOT}/data/meterpreter/ext_server_sniffer.lso
+	usr/$(get_libdir)/${PN}${SLOT}/data/meterpreter/ext_server_networkpug.lso
+	usr/$(get_libdir)/${PN}${SLOT}/data/meterpreter/ext_server_stdapi.lso
+	usr/$(get_libdir)/${PN}${SLOT}/data/exploits/CVE-2013-2171.bin
+	usr/$(get_libdir)/${PN}${SLOT}/data/exploits/CVE-2014-3153.elf
+	usr/$(get_libdir)/${PN}${SLOT}/data/android/libs/x86/libndkstager.so
+	usr/$(get_libdir)/${PN}${SLOT}/data/android/libs/mips/libndkstager.so
+	usr/$(get_libdir)/${PN}${SLOT}/data/android/libs/armeabi/libndkstager.so
+	"
+
+pkg_setup() {
+	if use test; then
+		su postgres -c "dropdb msf_test_database" #this is intentionally allowed to fail
+		su postgres -c "createuser msf_test_user -d -S -R"
+		if [ $? -ne 0 ]; then
+			su postgres -c "dropuser msf_test_user" || die
+			su postgres -c "createuser msf_test_user -d -S -R" || die
+		fi
+		su postgres -c "createdb --owner=msf_test_user msf_test_database" || die
+	fi
+	ruby-ng_pkg_setup
+}
+
+all_ruby_unpack() {
+	if [[ ${PV} == "9999" ]] ; then
+		git-r3_src_unpack
+	else
+		default_src_unpack
+#		mv "${WORKDIR}"/all/msf3/* "${WORKDIR}"/all
+#		rm -r msf3
+		#msf_version=$(grep --color=never "CURRENT_VERSION =" ${S}/spec/lib/msf/core/framework_spec.rb)
+		#msf_version=${msf_version#*=}
+	fi
+}
+
+all_ruby_prepare() {
+	# add psexec patch from pull request 2657 to allow custom exe templates from any files, bypassing most AVs
+	#epatch "${FILESDIR}/agix_psexec_pull-2657.patch"
+	epatch_user
+
+	#unbundle johntheripper, at least it now defaults to running the system version
+	rm -r data/john/run.*
+	rm -r data/john/src.tar.bz2
+	#remove random "cpuinfo" binaries which a only needed to detect which bundled john to run
+	rm -r data/cpuinfo
+
+	#remove random oudated collected garbage
+	rm -r external
+
+	#remove unneeded ruby bundler versioning files
+	#Gemfile.lock contains the versions tested by the msf team but not the hard requirements
+	#we regen this file in each_ruby_prepare
+	rm Gemfile.lock
+	#The Gemfile contains real known deps
+	#add our dep on upstream rb-readline instead of bundled one
+	#and then they broke it...
+	#sed -i "/gem 'packetfu'/a #use upstream readline instead of bundled\ngem 'rb-readline'" Gemfile || die
+	sed -i "/gem 'fivemat'/s/, '1.2.1'//" Gemfile || die
+	#remove the bundled readline
+	#https://github.com/rapid7/metasploit-framework/pull/3105
+	#this PR was closed due to numerous changes to their local fork, almost entirely for non-linux
+	#but now we have to go back to bundled readline because otherwise it's broken
+	#rm lib/rbreadline.rb
+	#now we edit the Gemfile based on use flags
+	#even if we pass --without=blah bundler still calculates the deps and messes us up
+	if ! use pcap; then
+		sed -i -e "/^group :pcap do/,/^end$/d" Gemfile || die
+	fi
+	if ! use development; then
+		sed -i -e "/^group :development do/,/^end$/d" Gemfile || die
+	fi
+	if ! use test; then
+		sed -i -e "/^group :test/,/^end$/d" Gemfile || die
+	fi
+	if ! use test && ! use development; then
+		sed -i -e "/^group :development/,/^end$/d" Gemfile || die
+	fi
+	#We don't need simplecov
+	sed -i -e "/^group :coverage/,/^end$/d" Gemfile || die
+	sed -i -e "s#require 'simplecov'##" spec/spec_helper.rb || die
+
+	#we need to edit the gemspec too, since it tries to call git instead of anything sane
+	#probably a better way to fix this... if I care at some point
+	sed -i -e "/^  spec.files/,/^  }/d" metasploit-framework.gemspec || die
+
+	#let's bogart msfupdate
+	rm msfupdate
+	echo "#!/bin/sh" > msfupdate
+	echo "echo \"[*]\"" >> msfupdate
+	echo "echo \"[*] Attempting to update the Metasploit Framework...\"" >> msfupdate
+	echo "echo \"[*]\"" >> msfupdate
+	echo "echo \"\"" >> msfupdate
+	if [[ ${PV} == "9999" ]] ; then
+		echo "if [ -x /usr/bin/smart-live-rebuild ]; then" >> msfupdate
+		echo "	smart-live-rebuild -f net-analyzer/metasploit" >> msfupdate
+		echo "else" >> msfupdate
+		echo "	echo \"Please install app-portage/smart-live-rebuild for a better experience.\"" >> msfupdate
+		echo "emerge --oneshot \"=${CATEGORY}/${PF}\"" >> msfupdate
+		echo "fi" >> msfupdate
+	else
+		echo "echo \"Unable to update tagged version of metasploit.\"" >> msfupdate
+		echo "echo \"If you want the latest please install and eselect the live version (metasploit9999)\"" >> msfupdate
+		echo "echo \"emerge metasploit:9999 -vat && eselect metasploit set metasploit9999\"" >> msfupdate
+	fi
+	#this is set executable in src_install
+
+	#install our database.yml file before tests are run
+	cp "${FILESDIR}"/database.yml config/
+
+}
+
+each_ruby_prepare() {
+	MSF_ROOT="." BUNDLE_GEMFILE=Gemfile ${RUBY} -S bundle install --local || die
+	MSF_ROOT="." BUNDLE_GEMFILE=Gemfile ${RUBY} -S bundle check || die
+
+	#force all metasploit executables to use desired ruby version
+	#https://dev.metasploit.com/redmine/issues/8357
+	for file in $(ls -1 msf*)
+	do
+		#poorly adapted from python.eclass
+		sed -e "1s:^#![[:space:]]*\([^[:space:]]*/usr/bin/env[[:space:]]\)\?[[:space:]]*\([^[:space:]]*/\)\?ruby\([[:digit:]]\+\(\.[[:digit:]]\+\)\?\)\?\(\$\|[[:space:]].*\):#!\1\2${RUBY}:" -i "${file}" || die "Conversion of shebang in '${file}' failed"
+	done
+}
+
+each_ruby_test() {
+	#review dev-python/pymongo for ways to make the test compatible with FEATURES=network-sandbox
+
+	#we bogart msfupdate so no point in trying to test it
+	rm spec/msfupdate_spec.rb || die
+	#we don't really want to be uploading to virustotal during the tests
+	rm spec/tools/virustotal_spec.rb || die
+
+	# https://dev.metasploit.com/redmine/issues/8425
+	BUNDLE_GEMFILE=Gemfile ${RUBY} -S bundle exec rake db:create || die
+	BUNDLE_GEMFILE=Gemfile ${RUBY} -S bundle exec rake db:migrate || die
+
+	MSF_DATABASE_CONFIG=config/database.yml BUNDLE_GEMFILE=Gemfile ${RUBY} -S bundle exec rake  || die
+	su postgres -c "dropuser msf_test_user" || die "failed to cleanup msf_test-user"
+}
+
+each_ruby_install() {
+	#Tests have already been run, we don't need this stuff
+	rm -r spec || die
+	rm -r test || die
+	rm Gemfile.lock || die
+
+	#I'm 99% sure that this will only work for as long as we only support one ruby version.  Creativity will be needed if we wish to support multiple.
+	# should be as simple as copying everything into the target...
+	dodir /usr/$(get_libdir)/${PN}${SLOT}
+	cp -R * "${ED}"/usr/$(get_libdir)/${PN}${SLOT} || die "Copy files failed"
+	rm -Rf "${ED}"/usr/$(get_libdir)/${PN}${SLOT}/documentation "${ED}"/usr/$(get_libdir)/${PN}${SLOT}/README.md
+	fowners -R root:0 /
+
+}
+
+all_ruby_install() {
+	# do not remove LICENSE, bug #238137
+	dodir /usr/share/doc/${PF}
+	cp -R {documentation,README.md} "${ED}"/usr/share/doc/${PF} || die
+	dosym /usr/share/doc/${PF}/documentation /usr/$(get_libdir)/${PN}${SLOT}/documentation
+
+	fperms +x /usr/$(get_libdir)/${PN}${SLOT}/msfupdate
+
+	#tell revdep-rebuild to ignore binaries meant for the target
+	dodir /etc/revdep-rebuild
+	cat <<-EOF > "${ED}"/etc/revdep-rebuild/99-metasploit${SLOT}
+		#These dirs contain prebuilt binaries for running on the TARGET not the HOST
+		SEARCH_DIRS_MASK="/usr/lib*/${PN}${SLOT}/data/meterpreter"
+		SEARCH_DIRS_MASK="/usr/lib*/${PN}${SLOT}/data/exploits"
+	EOF
+}
+
+pkg_postinst() {
+	elog "Before use you should run 'env-update' and '. /etc/profile'"
+	elog "otherwise you may be missing important environmental variables."
+
+	elog "You need to prepare the database by running:"
+	elog "emerge --config postgresql"
+	elog "/etc/init.d/postgresql-<version> start"
+	elog "emerge --config =metasploit-${PV}"
+
+	"${EROOT}"/usr/bin/eselect metasploit set --use-old ${PN}${SLOT}
+
+	einfo
+	elog "Adjust /usr/lib/${PN}${SLOT}/config/database.yml if necessary"
+}
+
+pkg_config() {
+	einfo "If the following fails, it is likely because you forgot to start/config postgresql first"
+	su postgres -c "createuser msf_user -D -S -R"
+	su postgres -c "createdb --owner=msf_user msf_database"
+}
diff --git a/net-analyzer/metasploit/metasploit-4.9.3.ebuild b/net-analyzer/metasploit/metasploit-4.9.3.ebuild
deleted file mode 100644
index 4450ae20cae9..000000000000
--- a/net-analyzer/metasploit/metasploit-4.9.3.ebuild
+++ /dev/null
@@ -1,273 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/rapid7/metasploit-framework.git"
-	EGIT_CHECKOUT_DIR="${WORKDIR}"/all
-	inherit git-r3
-	KEYWORDS=""
-else
-	#https://github.com/rapid7/metasploit-framework/wiki/Downloads-by-Version
-	SRC_URI="http://downloads.metasploit.com/data/releases/archive/framework-${PV}.tar.bz2"
-	KEYWORDS="~amd64 ~arm ~x86"
-	S="${WORKDIR}"/msf3
-fi
-
-#ruby20 doesn't have wide enough support in gentoo yet (but is semi-supported upstream)
-USE_RUBY="ruby19"
-inherit eutils ruby-ng
-
-DESCRIPTION="Advanced open-source framework for developing, testing, and using vulnerability exploit code"
-HOMEPAGE="http://www.metasploit.org/"
-SLOT="4.9"
-LICENSE="BSD"
-IUSE="development +java lorcon oracle +pcap test"
-
-#multiple known bugs with tests reported upstream and ignored
-#http://dev.metasploit.com/redmine/issues/8418 - worked around (fix user creation when possible)
-RESTRICT="test"
-
-RUBY_COMMON_DEPEND="virtual/ruby-ssl
-	=dev-ruby/rkelly-remix-0.0.6
-	dev-ruby/bcrypt-ruby
-	dev-ruby/activesupport:3.2
-	dev-ruby/activerecord:3.2
-	dev-ruby/json
-	=dev-ruby/metasploit_data_models-0.17.0
-	dev-ruby/msgpack
-	dev-ruby/nokogiri
-	dev-ruby/sqlite3
-	dev-ruby/builder:3
-	>=dev-ruby/pg-0.11
-	=dev-ruby/packetfu-1.1.9
-	dev-ruby/rb-readline
-	dev-ruby/robots
-	dev-ruby/kissfft
-	java? ( dev-ruby/rjb )
-	lorcon? ( net-wireless/lorcon[ruby] )
-	oracle? ( dev-ruby/ruby-oci8 )
-	pcap? ( dev-ruby/pcaprub
-		dev-ruby/network_interface )
-	dev-ruby/bundler
-	development? ( dev-ruby/fivemat
-			dev-ruby/redcarpet
-			dev-ruby/yard
-			>=dev-ruby/rake-10.0.0
-			>=dev-ruby/factory_girl-4.1.0 )"
-ruby_add_bdepend "${RUBY_COMMON_DEPEND}
-		test? ( >=dev-ruby/factory_girl-4.1.0
-			dev-ruby/fivemat
-			dev-ruby/database_cleaner
-			>=dev-ruby/rspec-2.12
-			dev-ruby/shoulda-matchers
-			dev-ruby/timecop
-			>=dev-ruby/rake-10.0.0 )"
-ruby_add_rdepend "${RUBY_COMMON_DEPEND}"
-
-COMMON_DEPEND="dev-db/postgresql[server]
-	>=app-crypt/johntheripper-1.7.9-r1[-minimal]
-	net-analyzer/nmap"
-DEPEND+=" ${COMMON_DEPEND}"
-RDEPEND+=" ${COMMON_DEPEND}
-	>=app-eselect/eselect-metasploit-0.13"
-
-RESTRICT="strip"
-
-QA_PREBUILT="
-	usr/$(get_libdir)/${PN}${SLOT}/data/templates/template_x86_linux.bin
-	usr/$(get_libdir)/${PN}${SLOT}/data/templates/template_armle_linux.bin
-	usr/$(get_libdir)/${PN}${SLOT}/data/templates/template_x86_solaris.bin
-	usr/$(get_libdir)/${PN}${SLOT}/data/templates/template_x64_linux.bin
-	usr/$(get_libdir)/${PN}${SLOT}/data/templates/template_x86_bsd.bin
-	usr/$(get_libdir)/${PN}${SLOT}/data/templates/template_mipsbe_linux.bin
-	usr/$(get_libdir)/${PN}${SLOT}/data/templates/template_mipsle_linux.bin
-	usr/$(get_libdir)/${PN}${SLOT}/data/meterpreter/msflinker_linux_x86.bin
-	usr/$(get_libdir)/${PN}${SLOT}/data/meterpreter/ext_server_sniffer.lso
-	usr/$(get_libdir)/${PN}${SLOT}/data/meterpreter/ext_server_networkpug.lso
-	usr/$(get_libdir)/${PN}${SLOT}/data/meterpreter/ext_server_stdapi.lso
-	usr/$(get_libdir)/${PN}${SLOT}/data/templates/template_x86_linux.bin
-	usr/$(get_libdir)/${PN}${SLOT}/data/templates/template_armle_linux.bin
-	usr/$(get_libdir)/${PN}${SLOT}/data/templates/template_x86_solaris.bin
-	usr/$(get_libdir)/${PN}${SLOT}/data/templates/template_x64_linux.bin
-	usr/$(get_libdir)/${PN}${SLOT}/data/templates/template_x86_bsd.bin
-	usr/$(get_libdir)/${PN}${SLOT}/data/meterpreter/msflinker_linux_x86.bin
-	usr/$(get_libdir)/${PN}${SLOT}/data/meterpreter/ext_server_sniffer.lso
-	usr/$(get_libdir)/${PN}${SLOT}/data/meterpreter/ext_server_networkpug.lso
-	usr/$(get_libdir)/${PN}${SLOT}/data/meterpreter/ext_server_stdapi.lso
-	usr/$(get_libdir)/${PN}${SLOT}/data/exploits/CVE-2013-2171.bin
-	"
-
-pkg_setup() {
-	if use test; then
-		su postgres -c "dropdb msf_test_database" #this is intentionally allowed to fail
-		su postgres -c "createuser msf_test_user -d -S -R"
-		if [ $? -ne 0 ]; then
-			su postgres -c "dropuser msf_test_user" || die
-			su postgres -c "createuser msf_test_user -d -S -R" || die
-		fi
-		su postgres -c "createdb --owner=msf_test_user msf_test_database" || die
-	fi
-	ruby-ng_pkg_setup
-}
-
-all_ruby_unpack() {
-	if [[ ${PV} == "9999" ]] ; then
-		git-r3_src_unpack
-	else
-		default_src_unpack
-		mv "${WORKDIR}"/all/msf3/* "${WORKDIR}"/all
-		rm -r msf3
-	fi
-}
-
-all_ruby_prepare() {
-	# add psexec patch from pull request 2657 to allow custom exe templates from any files, bypassing most AVs
-	#epatch "${FILESDIR}/agix_psexec_pull-2657.patch"
-	epatch_user
-
-	#unbundle johntheripper, at least it now defaults to running the system version
-	rm -r data/john/run.*
-	rm -r data/john/src.tar.bz2
-	#remove random "cpuinfo" binaries which a only needed to detect which bundled john to run
-	rm -r data/cpuinfo
-
-	#remove random oudated collected garbage
-	rm -r external
-
-	#remove unneeded ruby bundler versioning files
-	#Gemfile.lock contains the versions tested by the msf team but not the hard requirements
-	#we regen this file in each_ruby_prepare
-	rm Gemfile.lock
-	#The Gemfile contains real known deps
-	#add our dep on upstream rb-readline instead of bundled one
-	sed -i "/gem 'packetfu'/a #use upstream readline instead of bundled\ngem 'rb-readline'" Gemfile || die
-	sed -i "/gem 'fivemat'/s/, '1.2.1'//" Gemfile || die
-	#remove the bundled readline
-	#https://github.com/rapid7/metasploit-framework/pull/3105
-	#this PR was closed due to numerous changes to their local fork, almost entirely for non-linux
-	rm lib/rbreadline.rb
-	#now we edit the Gemfile based on use flags
-	#even if we pass --without=blah bundler still calculates the deps and messes us up
-	if ! use pcap; then
-		sed -i -e "/^group :pcap do/,/^end$/d" Gemfile || die
-	fi
-	if ! use development; then
-		sed -i -e "/^group :development do/,/^end$/d" Gemfile || die
-	fi
-	if ! use test; then
-		sed -i -e "/^group :test/,/^end$/d" Gemfile || die
-	fi
-	if ! use test && ! use development; then
-		sed -i -e "/^group :development/,/^end$/d" Gemfile || die
-	fi
-	if use test; then
-		#We don't need simplecov
-		sed -i -e "s#gem 'simplecov', '0.5.4', :require => false##" Gemfile || die
-		sed -i -e "s#require 'simplecov'##" spec/spec_helper.rb || die
-	fi
-
-	#let's bogart msfupdate
-	rm msfupdate
-	echo "#!/bin/sh" > msfupdate
-	echo "echo \"[*]\"" >> msfupdate
-	echo "echo \"[*] Attempting to update the Metasploit Framework...\"" >> msfupdate
-	echo "echo \"[*]\"" >> msfupdate
-	echo "echo \"\"" >> msfupdate
-	if [[ ${PV} == "9999" ]] ; then
-		echo "emerge --oneshot \"=${CATEGORY}/${PF}\"" >> msfupdate
-	else
-		echo "echo \"Unable to update tagged version of metasploit.\"" >> msfupdate
-		echo "echo \"If you want the latest please install and eselect the live version (metasploit9999)\"" >> msfupdate
-		echo "echo \"emerge metasploit:9999 -vat && eselect metasploit set metasploit9999\"" >> msfupdate
-	fi
-	#this is set executable in src_install
-
-	#install our database.yml file before tests are run
-	cp "${FILESDIR}"/database.yml config/
-
-}
-
-each_ruby_prepare() {
-	${RUBY} -S bundle install --local || die
-	${RUBY} -S bundle check || die
-
-	#force all metasploit executables to ruby19, ruby18 is not supported anymore and ruby20 is not supported yet
-	#https://dev.metasploit.com/redmine/issues/8357
-	for file in $(ls -1 msf*)
-	do
-		#poorly adapted from python.eclass
-		sed -e "1s:^#![[:space:]]*\([^[:space:]]*/usr/bin/env[[:space:]]\)\?[[:space:]]*\([^[:space:]]*/\)\?ruby\([[:digit:]]\+\(\.[[:digit:]]\+\)\?\)\?\(\$\|[[:space:]].*\):#!\1\2${RUBY}:" -i "${file}" || die "Conversion of shebang in '${file}' failed"
-	done
-}
-
-each_ruby_test() {
-	#review dev-python/pymongo for ways to make the test compatible with FEATURES=network-sandbox
-
-	#we bogart msfupdate so no point in trying to test it
-	rm spec/msfupdate_spec.rb || die
-	#we don't really want to be uploading to virustotal during the tests
-	rm spec/tools/virustotal_spec.rb || die
-
-	# https://dev.metasploit.com/redmine/issues/8425
-	${RUBY} -S bundle exec rake db:create || die
-	${RUBY} -S bundle exec rake db:migrate || die
-
-	MSF_DATABASE_CONFIG=config/database.yml ${RUBY} -S bundle exec rake  || die
-	su postgres -c "dropuser msf_test_user" || die "failed to cleanup msf_test-user"
-}
-
-each_ruby_install() {
-	#Tests have already been run, we don't need this stuff
-	rm -r spec || die
-	rm -r test || die
-	rm Gemfile.lock || die
-
-	#I'm 99% sure that this will only work for as long as we only support one ruby version.  Creativity will be needed if we wish to support multiple.
-	# should be as simple as copying everything into the target...
-	dodir /usr/$(get_libdir)/${PN}${SLOT}
-	cp -R * "${ED}"/usr/$(get_libdir)/${PN}${SLOT} || die "Copy files failed"
-	rm -Rf "${ED}"/usr/$(get_libdir)/${PN}${SLOT}/documentation "${ED}"/usr/$(get_libdir)/${PN}${SLOT}/README.md
-	fowners -R root:0 /
-
-}
-
-all_ruby_install() {
-	# do not remove LICENSE, bug #238137
-	dodir /usr/share/doc/${PF}
-	cp -R {documentation,README.md} "${ED}"/usr/share/doc/${PF} || die
-	dosym /usr/share/doc/${PF}/documentation /usr/$(get_libdir)/${PN}${SLOT}/documentation
-
-	fperms +x /usr/$(get_libdir)/${PN}${SLOT}/msfupdate
-
-	#tell revdep-rebuild to ignore binaries meant for the target
-	dodir /etc/revdep-rebuild
-	cat <<-EOF > "${ED}"/etc/revdep-rebuild/99-metasploit${SLOT}
-		#These dirs contain prebuilt binaries for running on the TARGET not the HOST
-		SEARCH_DIRS_MASK="/usr/lib*/${PN}${SLOT}/data/meterpreter"
-		SEARCH_DIRS_MASK="/usr/lib*/${PN}${SLOT}/data/exploits"
-	EOF
-}
-
-pkg_postinst() {
-	elog "Before use you should run 'env-update' and '. /etc/profile'"
-	elog "otherwise you may be missing important environmental variables."
-
-	elog "You need to prepare the database by running:"
-	elog "emerge --config postgresql-server"
-	elog "/etc/init.d/postgresql-<version> start"
-	elog "emerge --config =metasploit-${PV}"
-
-	"${EROOT}"/usr/bin/eselect metasploit set --use-old ${PN}${SLOT}
-
-	einfo
-	elog "Adjust /usr/lib/${PN}${SLOT}/config/database.yml if necessary"
-}
-
-pkg_config() {
-	einfo "If the following fails, it is likely because you forgot to start/config postgresql first"
-	su postgres -c "createuser msf_user -D -S -R"
-	su postgres -c "createdb --owner=msf_user msf_database"
-}
diff --git a/net-analyzer/metasploit/metasploit-9999.ebuild b/net-analyzer/metasploit/metasploit-9999.ebuild
deleted file mode 100644
index 38ea5e220bf6..000000000000
--- a/net-analyzer/metasploit/metasploit-9999.ebuild
+++ /dev/null
@@ -1,274 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/rapid7/metasploit-framework.git"
-	EGIT_CHECKOUT_DIR="${WORKDIR}"/all
-	inherit git-r3
-	KEYWORDS=""
-else
-	#https://github.com/rapid7/metasploit-framework/wiki/Downloads-by-Version
-	SRC_URI="http://downloads.metasploit.com/data/releases/archive/framework-${PV}.tar.bz2"
-	KEYWORDS="~amd64 ~arm ~x86"
-	S="${WORKDIR}"/msf3
-fi
-
-#ruby20 doesn't have wide enough support in gentoo yet (but is semi-supported upstream)
-USE_RUBY="ruby19"
-inherit eutils ruby-ng
-
-DESCRIPTION="Advanced open-source framework for developing, testing, and using vulnerability exploit code"
-HOMEPAGE="http://www.metasploit.org/"
-SLOT="9999"
-LICENSE="BSD"
-IUSE="development +java lorcon oracle +pcap test"
-
-#multiple known bugs with tests reported upstream and ignored
-#http://dev.metasploit.com/redmine/issues/8418 - worked around (fix user creation when possible)
-RESTRICT="test"
-
-RUBY_COMMON_DEPEND="virtual/ruby-ssl
-	dev-ruby/activesupport:3.2
-	dev-ruby/activerecord:3.2
-	dev-ruby/bcrypt-ruby
-	dev-ruby/builder:3
-	dev-ruby/bundler
-	dev-ruby/json
-	dev-ruby/kissfft
-	=dev-ruby/metasploit_data_models-0.17.0
-	=dev-ruby/meterpreter_bins-0.0.6
-	dev-ruby/msgpack
-	dev-ruby/nokogiri
-	=dev-ruby/rkelly-remix-0.0.6
-	dev-ruby/sqlite3
-	>=dev-ruby/pg-0.11
-	=dev-ruby/packetfu-1.1.9
-	dev-ruby/rb-readline
-	dev-ruby/robots
-	java? ( dev-ruby/rjb )
-	lorcon? ( net-wireless/lorcon[ruby] )
-	oracle? ( dev-ruby/ruby-oci8 )
-	pcap? ( dev-ruby/pcaprub
-		dev-ruby/network_interface )
-	development? ( dev-ruby/fivemat
-			dev-ruby/redcarpet
-			dev-ruby/yard
-			>=dev-ruby/rake-10.0.0
-			>=dev-ruby/factory_girl-4.1.0 )"
-ruby_add_bdepend "${RUBY_COMMON_DEPEND}
-		test? ( >=dev-ruby/factory_girl-4.1.0
-			dev-ruby/fivemat
-			dev-ruby/database_cleaner
-			>=dev-ruby/rspec-2.12
-			dev-ruby/shoulda-matchers
-			dev-ruby/timecop
-			>=dev-ruby/rake-10.0.0 )"
-ruby_add_rdepend "${RUBY_COMMON_DEPEND}"
-
-COMMON_DEPEND="dev-db/postgresql[server]
-	>=app-crypt/johntheripper-1.7.9-r1[-minimal]
-	net-analyzer/nmap"
-DEPEND+=" ${COMMON_DEPEND}"
-RDEPEND+=" ${COMMON_DEPEND}
-	>=app-eselect/eselect-metasploit-0.13"
-
-RESTRICT="strip"
-
-QA_PREBUILT="
-	usr/$(get_libdir)/${PN}${SLOT}/data/templates/template_x86_linux.bin
-	usr/$(get_libdir)/${PN}${SLOT}/data/templates/template_armle_linux.bin
-	usr/$(get_libdir)/${PN}${SLOT}/data/templates/template_x86_solaris.bin
-	usr/$(get_libdir)/${PN}${SLOT}/data/templates/template_x64_linux.bin
-	usr/$(get_libdir)/${PN}${SLOT}/data/templates/template_x86_bsd.bin
-	usr/$(get_libdir)/${PN}${SLOT}/data/templates/template_mipsbe_linux.bin
-	usr/$(get_libdir)/${PN}${SLOT}/data/templates/template_mipsle_linux.bin
-	usr/$(get_libdir)/${PN}${SLOT}/data/meterpreter/msflinker_linux_x86.bin
-	usr/$(get_libdir)/${PN}${SLOT}/data/meterpreter/ext_server_sniffer.lso
-	usr/$(get_libdir)/${PN}${SLOT}/data/meterpreter/ext_server_networkpug.lso
-	usr/$(get_libdir)/${PN}${SLOT}/data/meterpreter/ext_server_stdapi.lso
-	usr/$(get_libdir)/${PN}${SLOT}/data/exploits/CVE-2013-2171.bin
-	usr/$(get_libdir)/${PN}${SLOT}/data/android/libs/x86/libndkstager.so
-	usr/$(get_libdir)/${PN}${SLOT}/data/android/libs/mips/libndkstager.so
-	usr/$(get_libdir)/${PN}${SLOT}/data/android/libs/armeabi/libndkstager.so
-	"
-
-pkg_setup() {
-	if use test; then
-		su postgres -c "dropdb msf_test_database" #this is intentionally allowed to fail
-		su postgres -c "createuser msf_test_user -d -S -R"
-		if [ $? -ne 0 ]; then
-			su postgres -c "dropuser msf_test_user" || die
-			su postgres -c "createuser msf_test_user -d -S -R" || die
-		fi
-		su postgres -c "createdb --owner=msf_test_user msf_test_database" || die
-	fi
-	ruby-ng_pkg_setup
-}
-
-all_ruby_unpack() {
-	if [[ ${PV} == "9999" ]] ; then
-		git-r3_src_unpack
-	else
-		default_src_unpack
-		mv "${WORKDIR}"/all/msf3/* "${WORKDIR}"/all
-		rm -r msf3
-	fi
-}
-
-all_ruby_prepare() {
-	# add psexec patch from pull request 2657 to allow custom exe templates from any files, bypassing most AVs
-	#epatch "${FILESDIR}/agix_psexec_pull-2657.patch"
-	epatch_user
-
-	#unbundle johntheripper, at least it now defaults to running the system version
-	rm -r data/john/run.*
-	rm -r data/john/src.tar.bz2
-	#remove random "cpuinfo" binaries which a only needed to detect which bundled john to run
-	rm -r data/cpuinfo
-
-	#remove random oudated collected garbage
-	rm -r external
-
-	#remove unneeded ruby bundler versioning files
-	#Gemfile.lock contains the versions tested by the msf team but not the hard requirements
-	#we regen this file in each_ruby_prepare
-	rm Gemfile.lock
-	#The Gemfile contains real known deps
-	#add our dep on upstream rb-readline instead of bundled one
-	sed -i "/gem 'packetfu'/a #use upstream readline instead of bundled\ngem 'rb-readline'" Gemfile || die
-	sed -i "/gem 'fivemat'/s/, '1.2.1'//" Gemfile || die
-	#remove the bundled readline
-	#https://github.com/rapid7/metasploit-framework/pull/3105
-	#this PR was closed due to numerous changes to their local fork, almost entirely for non-linux
-	rm lib/rbreadline.rb
-	#now we edit the Gemfile based on use flags
-	#even if we pass --without=blah bundler still calculates the deps and messes us up
-	if ! use pcap; then
-		sed -i -e "/^group :pcap do/,/^end$/d" Gemfile || die
-	fi
-	if ! use development; then
-		sed -i -e "/^group :development do/,/^end$/d" Gemfile || die
-	fi
-	if ! use test; then
-		sed -i -e "/^group :test/,/^end$/d" Gemfile || die
-	fi
-	if ! use test && ! use development; then
-		sed -i -e "/^group :development/,/^end$/d" Gemfile || die
-	fi
-	if use test; then
-		#We don't need simplecov
-		sed -i -e "s#gem 'simplecov', '0.5.4', :require => false##" Gemfile || die
-		sed -i -e "s#require 'simplecov'##" spec/spec_helper.rb || die
-	fi
-
-	#let's bogart msfupdate
-	rm msfupdate
-	echo "#!/bin/sh" > msfupdate
-	echo "echo \"[*]\"" >> msfupdate
-	echo "echo \"[*] Attempting to update the Metasploit Framework...\"" >> msfupdate
-	echo "echo \"[*]\"" >> msfupdate
-	echo "echo \"\"" >> msfupdate
-	if [[ ${PV} == "9999" ]] ; then
-		echo "if [ -x /usr/bin/smart-live-rebuild ]; then" >> msfupdate
-		echo "	smart-live-rebuild -f net-analyzer/metasploit" >> msfupdate
-		echo "else" >> msfupdate
-		echo "	echo \"Please install app-portage/smart-live-rebuild for a better experience.\"" >> msfupdate
-		echo "emerge --oneshot \"=${CATEGORY}/${PF}\"" >> msfupdate
-		echo "fi" >> msfupdate
-	else
-		echo "echo \"Unable to update tagged version of metasploit.\"" >> msfupdate
-		echo "echo \"If you want the latest please install and eselect the live version (metasploit9999)\"" >> msfupdate
-		echo "echo \"emerge metasploit:9999 -vat && eselect metasploit set metasploit9999\"" >> msfupdate
-	fi
-	#this is set executable in src_install
-
-	#install our database.yml file before tests are run
-	cp "${FILESDIR}"/database.yml config/
-
-}
-
-each_ruby_prepare() {
-	BUNDLE_GEMFILE=Gemfile ${RUBY} -S bundle install --local || die
-	BUNDLE_GEMFILE=Gemfile ${RUBY} -S bundle check || die
-
-	#force all metasploit executables to ruby19, ruby18 is not supported anymore and ruby20 is not supported yet
-	#https://dev.metasploit.com/redmine/issues/8357
-	for file in $(ls -1 msf*)
-	do
-		#poorly adapted from python.eclass
-		sed -e "1s:^#![[:space:]]*\([^[:space:]]*/usr/bin/env[[:space:]]\)\?[[:space:]]*\([^[:space:]]*/\)\?ruby\([[:digit:]]\+\(\.[[:digit:]]\+\)\?\)\?\(\$\|[[:space:]].*\):#!\1\2${RUBY}:" -i "${file}" || die "Conversion of shebang in '${file}' failed"
-	done
-}
-
-each_ruby_test() {
-	#review dev-python/pymongo for ways to make the test compatible with FEATURES=network-sandbox
-
-	#we bogart msfupdate so no point in trying to test it
-	rm spec/msfupdate_spec.rb || die
-	#we don't really want to be uploading to virustotal during the tests
-	rm spec/tools/virustotal_spec.rb || die
-
-	# https://dev.metasploit.com/redmine/issues/8425
-	BUNDLE_GEMFILE=Gemfile ${RUBY} -S bundle exec rake db:create || die
-	BUNDLE_GEMFILE=Gemfile ${RUBY} -S bundle exec rake db:migrate || die
-
-	MSF_DATABASE_CONFIG=config/database.yml BUNDLE_GEMFILE=Gemfile ${RUBY} -S bundle exec rake  || die
-	su postgres -c "dropuser msf_test_user" || die "failed to cleanup msf_test-user"
-}
-
-each_ruby_install() {
-	#Tests have already been run, we don't need this stuff
-	rm -r spec || die
-	rm -r test || die
-	rm Gemfile.lock || die
-
-	#I'm 99% sure that this will only work for as long as we only support one ruby version.  Creativity will be needed if we wish to support multiple.
-	# should be as simple as copying everything into the target...
-	dodir /usr/$(get_libdir)/${PN}${SLOT}
-	cp -R * "${ED}"/usr/$(get_libdir)/${PN}${SLOT} || die "Copy files failed"
-	rm -Rf "${ED}"/usr/$(get_libdir)/${PN}${SLOT}/documentation "${ED}"/usr/$(get_libdir)/${PN}${SLOT}/README.md
-	fowners -R root:0 /
-
-}
-
-all_ruby_install() {
-	# do not remove LICENSE, bug #238137
-	dodir /usr/share/doc/${PF}
-	cp -R {documentation,README.md} "${ED}"/usr/share/doc/${PF} || die
-	dosym /usr/share/doc/${PF}/documentation /usr/$(get_libdir)/${PN}${SLOT}/documentation
-
-	fperms +x /usr/$(get_libdir)/${PN}${SLOT}/msfupdate
-
-	#tell revdep-rebuild to ignore binaries meant for the target
-	dodir /etc/revdep-rebuild
-	cat <<-EOF > "${ED}"/etc/revdep-rebuild/99-metasploit${SLOT}
-		#These dirs contain prebuilt binaries for running on the TARGET not the HOST
-		SEARCH_DIRS_MASK="/usr/lib*/${PN}${SLOT}/data/meterpreter"
-		SEARCH_DIRS_MASK="/usr/lib*/${PN}${SLOT}/data/exploits"
-		SEARCH_DIRS_MASK="/usr/lib*/${PN}${SLOT}/data/android/libs"
-	EOF
-}
-
-pkg_postinst() {
-	elog "Before use you should run 'env-update' and '. /etc/profile'"
-	elog "otherwise you may be missing important environmental variables."
-
-	elog "You need to prepare the database by running:"
-	elog "emerge --config postgresql-server"
-	elog "/etc/init.d/postgresql-<version> start"
-	elog "emerge --config =metasploit-${PV}"
-
-	"${EROOT}"/usr/bin/eselect metasploit set --use-old ${PN}${SLOT}
-
-	einfo
-	elog "Adjust /usr/lib/${PN}${SLOT}/config/database.yml if necessary"
-}
-
-pkg_config() {
-	einfo "If the following fails, it is likely because you forgot to start/config postgresql first"
-	su postgres -c "createuser msf_user -D -S -R"
-	su postgres -c "createdb --owner=msf_user msf_database"
-}
diff --git a/net-analyzer/net-snmp/files/snmpd.conf b/net-analyzer/net-snmp/files/snmpd.conf
index 83c3c1d92b82..ba8ba66128b2 100644
--- a/net-analyzer/net-snmp/files/snmpd.conf
+++ b/net-analyzer/net-snmp/files/snmpd.conf
@@ -5,6 +5,9 @@
 # Initial (empty) options.
 SNMPD_FLAGS=""
 
+# Disable smux by default
+SNMPD_FLAGS="${SNMPD_FLAGS} -I -smux"
+
 # Enable connection logging.
 #SNMPD_FLAGS="${SNMPD_FLAGS} -a"
 
diff --git a/net-analyzer/net-snmp/net-snmp-5.7.3.ebuild b/net-analyzer/net-snmp/net-snmp-5.7.3-r1.ebuild
index 78e4d61d2caa..78e4d61d2caa 100644
--- a/net-analyzer/net-snmp/net-snmp-5.7.3.ebuild
+++ b/net-analyzer/net-snmp/net-snmp-5.7.3-r1.ebuild
diff --git a/net-analyzer/net-snmp/net-snmp-5.7.3_pre5-r2.ebuild b/net-analyzer/net-snmp/net-snmp-5.7.3_pre5-r2.ebuild
deleted file mode 100644
index 1160dfb6c18e..000000000000
--- a/net-analyzer/net-snmp/net-snmp-5.7.3_pre5-r2.ebuild
+++ /dev/null
@@ -1,163 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-DISTUTILS_SINGLE_IMPL=yesplz
-DISTUTILS_OPTIONAL=yesplz
-WANT_AUTOMAKE=none
-PATCHSET=1
-
-inherit autotools distutils-r1 eutils perl-module systemd
-
-DESCRIPTION="Software for generating and retrieving SNMP data"
-HOMEPAGE="http://net-snmp.sourceforge.net/"
-SRC_URI="
-	mirror://sourceforge/${PN}/${PN}/${PV/_pre*/}-pre-releases/${P/_pre*/}.${PV/*_}.tar.gz
-	https://dev.gentoo.org/~jer/${PN}-5.7.3-patches-${PATCHSET}.tar.xz
-"
-
-S=${WORKDIR}/${P/_/.}
-
-# GPL-2 for the init scripts
-LICENSE="HPND BSD GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="bzip2 doc elf ipv6 mfd-rewrites minimal perl python rpm selinux ssl tcpd X zlib lm_sensors ucd-compat pci netlink mysql"
-
-COMMON_DEPEND="
-	ssl? ( >=dev-libs/openssl-0.9.6d )
-	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
-	rpm? (
-		app-arch/rpm
-		dev-libs/popt
-	)
-	bzip2? ( app-arch/bzip2 )
-	zlib? ( >=sys-libs/zlib-1.1.4 )
-	elf? ( dev-libs/elfutils )
-	python? (
-		dev-python/setuptools[${PYTHON_USEDEP}]
-		${PYTHON_DEPS}
-	)
-	pci? ( sys-apps/pciutils )
-	lm_sensors? ( sys-apps/lm_sensors )
-	netlink? ( dev-libs/libnl:3 )
-	mysql? ( virtual/mysql )
-"
-DEPEND="
-	${COMMON_DEPEND}
-	doc? ( app-doc/doxygen )
-"
-RDEPEND="
-	${COMMON_DEPEND}
-	perl? (
-		X? ( dev-perl/perl-tk )
-		!minimal? ( dev-perl/TermReadKey )
-	)
-	selinux? ( sec-policy/selinux-snmp )
-"
-
-REQUIRED_USE="
-	python? ( ${PYTHON_REQUIRED_USE} )
-	rpm? ( bzip2 zlib )
-"
-
-RESTRICT=test
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	# snmpconf generates config files with proper selinux context
-	use selinux && epatch "${FILESDIR}"/${PN}-5.1.2-snmpconf-selinux.patch
-
-	epatch "${WORKDIR}"/patches/*.patch
-
-	epatch_user
-
-	eautoconf
-}
-
-src_configure() {
-	# keep this in the same line, configure.ac arguments are passed down to config.h
-	local mibs="host ucd-snmp/dlmod ucd-snmp/diskio ucd-snmp/extensible mibII/mta_sendmail smux etherlike-mib/dot3StatsTable"
-	use lm_sensors && mibs="${mibs} ucd-snmp/lmsensorsMib"
-
-	econf \
-		$(use_enable !ssl internal-md5) \
-		$(use_enable ipv6) \
-		$(use_enable mfd-rewrites) \
-		$(use_enable perl embedded-perl) \
-		$(use_enable ucd-compat ucd-snmp-compatibility) \
-		$(use_with bzip2) \
-		$(use_with elf) \
-		$(use_with mysql) \
-		$(use_with netlink nl) \
-		$(use_with pci) \
-		$(use_with perl perl-modules INSTALLDIRS=vendor) \
-		$(use_with python python-modules) \
-		$(use_with rpm) \
-		$(use_with ssl openssl) \
-		$(use_with tcpd libwrap) \
-		$(use_with zlib) \
-		--enable-shared --disable-static \
-		--with-default-snmp-version="3" \
-		--with-install-prefix="${D}" \
-		--with-ldflags="${LDFLAGS}" \
-		--with-logfile="/var/log/net-snmpd.log" \
-		--with-mib-modules="${mibs}" \
-		--with-persistent-directory="/var/lib/net-snmp" \
-		--with-sys-contact="root@Unknown" \
-		--with-sys-location="Unknown"
-}
-
-src_compile() {
-	emake \
-		OTHERLDFLAGS="${LDFLAGS}" \
-		sedscript all
-
-	use doc && emake docsdox
-}
-
-src_install () {
-	# bug #317965
-	emake -j1 DESTDIR="${D}" install
-
-	if use perl ; then
-		perl_delete_localpod
-		use X || rm -f "${D}"/usr/bin/tkmib
-	else
-		rm -f "${D}"/usr/bin/mib2c "${D}"/usr/bin/snmpcheck "${D}"/usr/bin/tkmib
-	fi
-
-	dodoc AGENT.txt ChangeLog FAQ INSTALL NEWS PORTING README* TODO
-	newdoc EXAMPLE.conf.def EXAMPLE.conf
-
-	use doc && dohtml docs/html/*
-
-	keepdir /var/lib/net-snmp
-
-	newinitd "${FILESDIR}"/snmpd.init.2 snmpd
-	newconfd "${FILESDIR}"/snmpd.conf snmpd
-
-	newinitd "${FILESDIR}"/snmptrapd.init.2 snmptrapd
-	newconfd "${FILESDIR}"/snmptrapd.conf snmptrapd
-
-	systemd_dounit "${FILESDIR}"/snmpd.service
-	systemd_dounit "${FILESDIR}"/snmptrapd.service
-
-	insinto /etc/snmp
-	newins "${S}"/EXAMPLE.conf snmpd.conf.example
-
-	# Remove everything not required for an agent.
-	# Keep only the snmpd, snmptrapd, MIBs, headers and libraries.
-	if use minimal; then
-		rm -rf \
-			"${D}"/usr/bin/{encode_keychange,snmp{get,getnext,set,usm,walk,bulkwalk,table,trap,bulkget,translate,status,delta,test,df,vacm,netstat,inform,check,conf},fixproc,traptoemail} \
-			"${D}"/usr/share/snmp/snmpconf-data \
-			"${D}"/usr/share/snmp/*.conf \
-			"${D}"/**/*.pl
-	fi
-}
diff --git a/net-analyzer/net-snmp/net-snmp-5.7.3_pre5-r3.ebuild b/net-analyzer/net-snmp/net-snmp-5.7.3_pre5-r3.ebuild
deleted file mode 100644
index a5bce40b369e..000000000000
--- a/net-analyzer/net-snmp/net-snmp-5.7.3_pre5-r3.ebuild
+++ /dev/null
@@ -1,180 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-DISTUTILS_SINGLE_IMPL=yesplz
-DISTUTILS_OPTIONAL=yesplz
-WANT_AUTOMAKE=none
-PATCHSET=1
-GENTOO_DEPEND_ON_PERL=no
-
-inherit autotools distutils-r1 eutils perl-module systemd
-
-DESCRIPTION="Software for generating and retrieving SNMP data"
-HOMEPAGE="http://net-snmp.sourceforge.net/"
-SRC_URI="
-	mirror://sourceforge/${PN}/${PN}/${PV/_pre*/}-pre-releases/${P/_pre*/}.${PV/*_}.tar.gz
-	https://dev.gentoo.org/~jer/${PN}-5.7.3-patches-${PATCHSET}.tar.xz
-"
-
-S=${WORKDIR}/${P/_/.}
-
-# GPL-2 for the init scripts
-LICENSE="HPND BSD GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="bzip2 doc elf ipv6 mfd-rewrites minimal perl python rpm selinux ssl tcpd X zlib lm_sensors ucd-compat pci netlink mysql"
-
-COMMON_DEPEND="
-	ssl? ( >=dev-libs/openssl-0.9.6d )
-	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
-	rpm? (
-		app-arch/rpm
-		dev-libs/popt
-	)
-	bzip2? ( app-arch/bzip2 )
-	zlib? ( >=sys-libs/zlib-1.1.4 )
-	elf? ( dev-libs/elfutils )
-	python? (
-		dev-python/setuptools[${PYTHON_USEDEP}]
-		${PYTHON_DEPS}
-	)
-	pci? ( sys-apps/pciutils )
-	lm_sensors? ( sys-apps/lm_sensors )
-	netlink? ( dev-libs/libnl:3 )
-	mysql? ( virtual/mysql )
-	perl? ( dev-lang/perl )
-"
-DEPEND="
-	${COMMON_DEPEND}
-	doc? ( app-doc/doxygen )
-"
-RDEPEND="
-	${COMMON_DEPEND}
-	perl? (
-		X? ( dev-perl/perl-tk )
-		!minimal? ( dev-perl/TermReadKey )
-	)
-	selinux? ( sec-policy/selinux-snmp )
-"
-
-REQUIRED_USE="
-	python? ( ${PYTHON_REQUIRED_USE} )
-	rpm? ( bzip2 zlib )
-"
-
-RESTRICT=test
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	# snmpconf generates config files with proper selinux context
-	use selinux && epatch "${FILESDIR}"/${PN}-5.1.2-snmpconf-selinux.patch
-
-	epatch "${WORKDIR}"/patches/*.patch
-
-	epatch_user
-
-	eautoconf
-}
-
-src_configure() {
-	# keep this in the same line, configure.ac arguments are passed down to config.h
-	local mibs="host ucd-snmp/dlmod ucd-snmp/diskio ucd-snmp/extensible mibII/mta_sendmail smux etherlike-mib/dot3StatsTable"
-	use lm_sensors && mibs="${mibs} ucd-snmp/lmsensorsMib"
-
-	econf \
-		$(use_enable !ssl internal-md5) \
-		$(use_enable ipv6) \
-		$(use_enable mfd-rewrites) \
-		$(use_enable perl embedded-perl) \
-		$(use_enable ucd-compat ucd-snmp-compatibility) \
-		$(use_with bzip2) \
-		$(use_with elf) \
-		$(use_with mysql) \
-		$(use_with netlink nl) \
-		$(use_with pci) \
-		$(use_with perl perl-modules INSTALLDIRS=vendor) \
-		$(use_with python python-modules) \
-		$(use_with rpm) \
-		$(use_with ssl openssl) \
-		$(use_with tcpd libwrap) \
-		$(use_with zlib) \
-		--enable-shared --disable-static \
-		--with-default-snmp-version="3" \
-		--with-install-prefix="${D}" \
-		--with-ldflags="${LDFLAGS}" \
-		--with-logfile="/var/log/net-snmpd.log" \
-		--with-mib-modules="${mibs}" \
-		--with-persistent-directory="/var/lib/net-snmp" \
-		--with-sys-contact="root@Unknown" \
-		--with-sys-location="Unknown"
-}
-
-src_compile() {
-	emake \
-		OTHERLDFLAGS="${LDFLAGS}" \
-		sedscript all
-
-	use doc && emake docsdox
-}
-
-src_install () {
-	# bug #317965
-	emake -j1 DESTDIR="${D}" install
-
-	if use perl ; then
-		perl_delete_localpod
-		if ! use X; then
-			rm "${D}"/usr/bin/tkmib || die
-		fi
-	else
-		rm -f \
-			"${D}"/usr/bin/fixproc \
-			"${D}"/usr/bin/ipf-mod.pl \
-			"${D}"/usr/bin/mib2c \
-			"${D}"/usr/bin/net-snmp-cert \
-			"${D}"/usr/bin/snmp-bridge-mib \
-			"${D}"/usr/bin/snmpcheck \
-			"${D}"/usr/bin/snmpconf \
-			"${D}"/usr/bin/tkmib \
-			"${D}"/usr/bin/traptoemail \
-			"${D}"/usr/share/snmp/mib2c.perl.conf \
-			"${D}"/usr/share/snmp/snmp_perl_trapd.pl \
-			|| die
-	fi
-
-	dodoc AGENT.txt ChangeLog FAQ INSTALL NEWS PORTING README* TODO
-	newdoc EXAMPLE.conf.def EXAMPLE.conf
-
-	use doc && dohtml docs/html/*
-
-	keepdir /var/lib/net-snmp
-
-	newinitd "${FILESDIR}"/snmpd.init.2 snmpd
-	newconfd "${FILESDIR}"/snmpd.conf snmpd
-
-	newinitd "${FILESDIR}"/snmptrapd.init.2 snmptrapd
-	newconfd "${FILESDIR}"/snmptrapd.conf snmptrapd
-
-	systemd_dounit "${FILESDIR}"/snmpd.service
-	systemd_dounit "${FILESDIR}"/snmptrapd.service
-
-	insinto /etc/snmp
-	newins "${S}"/EXAMPLE.conf snmpd.conf.example
-
-	# Remove everything not required for an agent.
-	# Keep only the snmpd, snmptrapd, MIBs, headers and libraries.
-	if use minimal; then
-		rm -rf \
-			"${D}"/**/*.pl \
-			"${D}"/usr/bin/{encode_keychange,snmp{get,getnext,set,usm,walk,bulkwalk,table,trap,bulkget,translate,status,delta,test,df,vacm,netstat,inform,check,conf},fixproc,traptoemail} \
-			"${D}"/usr/share/snmp/*.conf \
-			"${D}"/usr/share/snmp/snmpconf-data \
-			|| die
-	fi
-}
diff --git a/net-analyzer/nmapsi/Manifest b/net-analyzer/nmapsi/Manifest
index b410ee56c5f2..af40cfca2f1c 100644
--- a/net-analyzer/nmapsi/Manifest
+++ b/net-analyzer/nmapsi/Manifest
@@ -1,2 +1 @@
 DIST nmapsi4-0.4.1.tar.xz 3139252 SHA256 45482842f414179eb1a9ea0ae88fe4a43d59a54341b97a82be605b43cec41c9a SHA512 243e241a80069d9a7ff7c38c6ed12656385f13250ff707ff84f569807916aab11f14c784210d8cb3047519d80691f5068563c50dac18d74ec9bda8c3f320e802 WHIRLPOOL 99fb464e124ed7fbe2822395cf992aa0bdb49a889cdb855a3a7d03c8da394c3c4e5aadd2aeb2ef08c4383fa3ac396c37a7c26798869e455237e0d8d5e5b23ccc
-DIST nmapsi4-0.4.tar.xz 3138364 SHA256 6b4741656712bfc1eab11f242e4e25268fa52b0bb5efc265f981c5a94a321858 SHA512 b88dc36925020d445b5aa177c48152221f46e8ee82516679d055df609223fc8e1025b60a538cdb2ecfc939580bdd7afe42a9d7968e0b0c255c73cf6a04220182 WHIRLPOOL b64840301520c65269626524872bfc726143dfcd8ad1920f03d8ff010034df2bea9266c8d9c568c1c20ff9844f1c568792d6b4937763ccc0e7d8346fb3091c6d
diff --git a/net-analyzer/nmapsi/files/nmapsi-0.4.1-kdelibs-4.14.11.patch b/net-analyzer/nmapsi/files/nmapsi-0.4.1-kdelibs-4.14.11.patch
new file mode 100644
index 000000000000..f5a338ad7a9d
--- /dev/null
+++ b/net-analyzer/nmapsi/files/nmapsi-0.4.1-kdelibs-4.14.11.patch
@@ -0,0 +1,22 @@
+The uninstall target is created automatically by FindKDE4Internal. Due to
+cmake policy changes in kdelibs-4.14.11, this target name collision causes
+a build failure.
+
+https://bugs.gentoo.org/show_bug.cgi?id=558574
+
+--- CMakeLists.txt
++++ CMakeLists.txt
+@@ -35,13 +35,6 @@
+ 
+ add_subdirectory( src )
+ 
+-CONFIGURE_FILE( "${PROJECT_SOURCE_DIR}/cmake_uninstall.cmake.in"
+-                "${PROJECT_BINARY_DIR}/cmake_uninstall.cmake"
+-                IMMEDIATE @ONLY )
+-
+-ADD_CUSTOM_TARGET( uninstall
+-  "${CMAKE_COMMAND}" -P "${PROJECT_BINARY_DIR}/cmake_uninstall.cmake" )
+-
+ message("-------------------------------------------------------------------")
+ message(" Required for build:   qt4-dev (>>= 4.6) ")
+ message(" Required for runtime: nmap+nping ( >= 6.00 ), dig ")
diff --git a/net-analyzer/nmapsi/nmapsi-0.4.1.ebuild b/net-analyzer/nmapsi/nmapsi-0.4.1.ebuild
index ffb545d0cd18..6457fee79399 100644
--- a/net-analyzer/nmapsi/nmapsi-0.4.1.ebuild
+++ b/net-analyzer/nmapsi/nmapsi-0.4.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -34,9 +34,11 @@ RDEPEND="${DEPEND}
 S=${WORKDIR}/${MY_P}
 
 DOCS=( AUTHORS HACKING NEWS TODO Translation )
+PATCHES=( "${FILESDIR}/${P}-kdelibs-4.14.11.patch" )
 
 src_prepare() {
 	l10n_for_each_disabled_locale_do nmapsi_disable_locale
+	cmake-utils_src_prepare
 }
 
 src_configure() {
diff --git a/net-analyzer/nmapsi/nmapsi-0.4.ebuild b/net-analyzer/nmapsi/nmapsi-0.4.ebuild
deleted file mode 100644
index 1df63c17e8d3..000000000000
--- a/net-analyzer/nmapsi/nmapsi-0.4.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PLOCALES="ca cs de es fr it ru"
-
-inherit cmake-utils l10n
-
-MY_P=${PN}4-${PV}
-
-DESCRIPTION="A Qt4 frontend to nmap"
-HOMEPAGE="http://www.nmapsi4.org/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="kde"
-
-DEPEND="
-	dev-qt/qtcore:4
-	dev-qt/qtdbus:4
-	dev-qt/qtgui:4
-	dev-qt/qtwebkit:4
-	kde? ( kde-base/kdelibs:4 )
-"
-RDEPEND="${DEPEND}
-	>=net-analyzer/nmap-6.00
-	net-dns/bind-tools
-"
-
-S=${WORKDIR}/${MY_P}
-
-DOCS=(AUTHORS HACKING NEWS TODO Translation)
-
-src_prepare() {
-	l10n_for_each_disabled_locale_do nmapsi_disable_locale
-}
-
-nmapsi_disable_locale() {
-	sed -i -e "/ts\/${PN}4_${1}\.ts/d" src/CMakeLists.txt || die
-}
diff --git a/net-analyzer/pmacct/Manifest b/net-analyzer/pmacct/Manifest
index c7603289cdcd..73544d32b364 100644
--- a/net-analyzer/pmacct/Manifest
+++ b/net-analyzer/pmacct/Manifest
@@ -1,3 +1,2 @@
-DIST pmacct-0.14.3.tar.gz 746387 SHA256 c3197dcb21b131da82eaaecc9dccbff894c35bf1cb74214e93ae1e7c1bdef50e SHA512 310cee3f74d41befd74f981aff6c1a33a2db14c7010e8d1283374d8f6be49fb825a768f992c7b24acca74710413148fd61006ae7e87ad566b7193d575fa6df36 WHIRLPOOL bd7b8560ed5e30ff6342920ec04cca1795bf675dc90db7abf31c8d105f733109950ca28ac9c57d80cb2b6aef24f3db6259a71b170a032b1a77cdb98f5b7bcbe9
-DIST pmacct-1.5.0.tar.gz 843881 SHA256 28edc18aec67c2157c599dcf095dd9f26a4c06ca4dfe7da79390011b3fd432fc SHA512 e1ff47f6a987e76c5e5ac92896f9dac3722c681a5a85835dbf8bffba68dc5794c63f06c9576d1b8f667fb4fe2f9b17d8e0dd1d3a4a96673c43378d2aba3329a1 WHIRLPOOL e886a73e732b7e63f5453710913372dfab671d33bbbc85dc4f10daab89173cdf5579ddfd2ad4019855d67705b52bafd1b31d1e2d14da34dfc00877db444e1419
 DIST pmacct-1.5.1.tar.gz 874563 SHA256 96134549a10947f3f6d610b670a26f1a54e01af4be0eff09bf48c19246d33584 SHA512 c3a0ddaf1b8679df2097147ce844eb2a3e3058599aea457e463cd4e65a7601e0ce5bac5ca5e1c82afecd5edc92dae673eed3ed1787bfbd3e8ac2af5677885bb7 WHIRLPOOL bd071ac30493f5ee2e0393eb9277dfae2d2fdd6283293aee589ae41ab326b0aaef0ec9b70a421eeca4df857a0046ca7b196e0692ffdd2ea12d9a7c66a74e9a32
+DIST pmacct-1.5.2.tar.gz 897530 SHA256 c12e3897e2f9aa89333968da46eb46855f357750ac1e06e36e72f374e2b54df9 SHA512 3705432cc2a28e179de637b8fc11becd2022b36191a13d440d5bec7d7e594d0936773f202f3d82e983a83695176380aa6a7c27748b632b180000590be0ead599 WHIRLPOOL e7bb1fa1b7372af7d932e19da1d14f3922d8a8ebda245fa03e2a5f283c66141a9299cc9dfa6f32e9384c7d2c9a2d2ef35ef62d7b9910e4f76cacc132231420e5
diff --git a/net-analyzer/pmacct/files/pmacct-0.12.0-gentoo.patch b/net-analyzer/pmacct/files/pmacct-0.12.0-gentoo.patch
deleted file mode 100644
index 34efc1eda34d..000000000000
--- a/net-analyzer/pmacct/files/pmacct-0.12.0-gentoo.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/configure
-+++ b/configure
-@@ -1103,7 +1103,7 @@
- echo $ac_n "checking whether to enable debugging compiler options""... $ac_c" 1>&6
- echo "configure:1105: checking whether to enable debugging compiler options" >&5
- # Check whether --enable-debug or --disable-debug was given.
--if test "${enable_debug+set}" = set; then
-+if test "${enable_debug+set}" = TODO_THIS_WILL_NEVER_BE_TRUE; then
-   enableval="$enable_debug"
-   echo "$ac_t""yes" 1>&6
- 	tmp_CFLAGS=`echo $CFLAGS | sed 's/O2/O0/g'`
-@@ -1114,7 +1114,7 @@
-   	#CFLAGS="$CFLAGS -Wcast-align -Wcast-qual -Wnested-externs"
-   	#CFLAGS="$CFLAGS -Wshadow -Wbad-function-cast -Wwrite-strings"
- 	echo "$ac_t""no" 1>&6
--
-+	CFLAGS="$ac_save_CFLAGS"
- fi
- 
- 
diff --git a/net-analyzer/pmacct/files/pmacctd-init.d b/net-analyzer/pmacct/files/pmacctd-init.d
index 3a0cc734991c..0c3fb905bd94 100644
--- a/net-analyzer/pmacct/files/pmacctd-init.d
+++ b/net-analyzer/pmacct/files/pmacctd-init.d
@@ -25,13 +25,17 @@ checkconfig() {
 start() {
 	checkconfig || return 1
 	ebegin "Starting ${SVCNAME}"
-	start-stop-daemon --start --pidfile "${PMACCTDPID}" --exec /usr/sbin/"${SVCNAME}" \
-		-- -D -f "${PMACCTDCONF}" -F "${PMACCTDPID}" ${OPTS}
+	start-stop-daemon --start \
+		--pidfile "${PMACCTDPID}" \
+		--exec /usr/sbin/"${SVCNAME}" \
+		-- -D -f "${PMACCTDCONF}" \ -F "${PMACCTDPID}" ${OPTS}
 	eend $?
 }
 
 stop() {
 	ebegin "Stopping ${SVCNAME}"
-	start-stop-daemon --stop --pidfile "${PMACCTDPID}" --exec /usr/sbin/"${SVCNAME}"
+	start-stop-daemon --stop \
+		--pidfile "${PMACCTDPID}" \
+		--exec /usr/sbin/"${SVCNAME}"
 	eend $?
 }
diff --git a/net-analyzer/pmacct/pmacct-0.14.3.ebuild b/net-analyzer/pmacct/pmacct-0.14.3.ebuild
deleted file mode 100644
index c01735b38e04..000000000000
--- a/net-analyzer/pmacct/pmacct-0.14.3.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit eutils toolchain-funcs
-
-DESCRIPTION="A network tool to gather IP traffic information"
-HOMEPAGE="http://www.pmacct.net/"
-SRC_URI="http://www.pmacct.net/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="64bit debug geoip ipv6 mongodb mysql postgres sqlite threads ulog"
-
-DEPEND="
-	net-libs/libpcap
-	geoip? ( dev-libs/geoip )
-	mongodb? ( dev-libs/mongo-c-driver )
-	mysql? ( virtual/mysql )
-	postgres? ( dev-db/postgresql )
-	sqlite? ( =dev-db/sqlite-3* )
-"
-RDEPEND="${DEPEND}"
-
-DOCS=(
-	CONFIG-KEYS ChangeLog FAQS KNOWN-BUGS QUICKSTART README TODO TOOLS UPGRADE
-	docs/INTERNALS docs/PLUGINS docs/SIGNALS
-)
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-0.12.0-gentoo.patch
-	sed -i \
-		-e '/[[:space:]]ar /s|ar |$(AR) |g' \
-		$(find . -name Makefile.in) || die
-}
-
-src_configure() {
-	tc-export CC AR RANLIB
-
-	econf \
-		$(use_enable 64bit) \
-		$(use_enable debug) \
-		$(use_enable geoip) \
-		$(use_enable ipv6) \
-		$(use_enable mongodb) \
-		$(use_enable mysql) \
-		$(use_enable postgres pgsql) \
-		$(use_enable sqlite sqlite3) \
-		$(use_enable threads) \
-		$(use_enable ulog)
-}
-
-src_install() {
-	default
-
-	for dirname in examples sql; do
-		docinto ${dirname}
-		dodoc ${dirname}/*
-	done
-
-	newinitd "${FILESDIR}"/pmacctd-init.d pmacctd
-	newconfd "${FILESDIR}"/pmacctd-conf.d pmacctd
-
-	insinto /etc/pmacctd
-	newins examples/pmacctd-imt.conf.example pmacctd.conf
-}
diff --git a/net-analyzer/pmacct/pmacct-1.5.0.ebuild b/net-analyzer/pmacct/pmacct-1.5.0.ebuild
deleted file mode 100644
index 6baf16fc70f1..000000000000
--- a/net-analyzer/pmacct/pmacct-1.5.0.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit toolchain-funcs
-
-DESCRIPTION="A network tool to gather IP traffic information"
-HOMEPAGE="http://www.pmacct.net/"
-SRC_URI="http://www.pmacct.net/${P/_}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="64bit debug geoip ipv6 mongodb mysql postgres sqlite threads ulog"
-
-RDEPEND="
-	net-libs/libpcap
-	geoip? ( dev-libs/geoip )
-	mongodb? (
-		>=dev-libs/mongo-c-driver-0.8.1-r1
-		<dev-libs/mongo-c-driver-0.98
-	)
-	mysql? ( virtual/mysql )
-	postgres? ( dev-db/postgresql )
-	sqlite? ( =dev-db/sqlite-3* )
-"
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-"
-
-S="${WORKDIR}/${P/_/}"
-
-DOCS=(
-	CONFIG-KEYS ChangeLog FAQS KNOWN-BUGS QUICKSTART README TODO TOOLS UPGRADE
-	docs/INTERNALS docs/PLUGINS docs/SIGNALS
-)
-
-src_configure() {
-	tc-export CC AR RANLIB
-
-	econf \
-		$(use_enable 64bit) \
-		$(use_enable debug) \
-		$(use_enable geoip) \
-		$(use_enable ipv6) \
-		$(use_enable mongodb) \
-		$(use_enable mysql) \
-		$(use_enable postgres pgsql) \
-		$(use_enable sqlite sqlite3) \
-		$(use_enable threads) \
-		$(use_enable ulog) \
-		--disable-debug
-}
-
-src_install() {
-	default
-
-	for dirname in examples sql; do
-		docinto ${dirname}
-		dodoc -r ${dirname}/*
-	done
-
-	newinitd "${FILESDIR}"/pmacctd-init.d pmacctd
-	newconfd "${FILESDIR}"/pmacctd-conf.d pmacctd
-
-	insinto /etc/pmacctd
-	newins examples/pmacctd-imt.conf.example pmacctd.conf
-}
diff --git a/net-analyzer/pmacct/pmacct-1.5.2.ebuild b/net-analyzer/pmacct/pmacct-1.5.2.ebuild
new file mode 100644
index 000000000000..5332b543e0b8
--- /dev/null
+++ b/net-analyzer/pmacct/pmacct-1.5.2.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit toolchain-funcs
+
+DESCRIPTION="A network tool to gather IP traffic information"
+HOMEPAGE="http://www.pmacct.net/"
+SRC_URI="http://www.pmacct.net/${P/_}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="64bit debug geoip ipv6 mongodb mysql postgres sqlite threads ulog"
+
+RDEPEND="
+	net-libs/libpcap
+	geoip? ( dev-libs/geoip )
+	mongodb? (
+		>=dev-libs/mongo-c-driver-0.8.1-r1
+		<dev-libs/mongo-c-driver-0.98
+	)
+	mysql? ( virtual/mysql )
+	postgres? ( dev-db/postgresql:* )
+	sqlite? ( =dev-db/sqlite-3* )
+"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+"
+
+S="${WORKDIR}/${P/_/}"
+
+DOCS=(
+	CONFIG-KEYS ChangeLog FAQS KNOWN-BUGS QUICKSTART README TODO TOOLS UPGRADE
+	docs/INTERNALS docs/PLUGINS docs/SIGNALS
+)
+
+src_configure() {
+	tc-export CC AR RANLIB
+
+	econf \
+		$(use_enable 64bit) \
+		$(use_enable debug) \
+		$(use_enable geoip) \
+		$(use_enable ipv6) \
+		$(use_enable mongodb) \
+		$(use_enable mysql) \
+		$(use_enable postgres pgsql) \
+		$(use_enable sqlite sqlite3) \
+		$(use_enable threads) \
+		$(use_enable ulog) \
+		$(usex mysql "--with-mysql-includes=$(mysql_config --variable=pkgincludedir)" '') \
+		$(usex mysql "--with-mysql-libs=$(mysql_config --variable=pkglibdir)" '') \
+		--disable-debug
+}
+
+src_install() {
+	default
+
+	for dirname in examples sql; do
+		docinto ${dirname}
+		dodoc -r ${dirname}/*
+	done
+
+	newinitd "${FILESDIR}"/pmacctd-init.d pmacctd
+	newconfd "${FILESDIR}"/pmacctd-conf.d pmacctd
+
+	insinto /etc/pmacctd
+	newins examples/pmacctd-imt.conf.example pmacctd.conf
+}
diff --git a/net-analyzer/tcpflow/Manifest b/net-analyzer/tcpflow/Manifest
index 155045d6012c..2a4ad3c31b41 100644
--- a/net-analyzer/tcpflow/Manifest
+++ b/net-analyzer/tcpflow/Manifest
@@ -1,3 +1,4 @@
-DIST tcpflow-1.3.0.tar.gz 220055 SHA256 bd150e432292419b16af45fa951254b19d830709a1c931032ed475049af0b040 SHA512 4812bb4060535f6258496fec1fa5d9489e2832aa342ebb6f00e0717468d74463761637d5198951401d115f6d9c985475f56a435229070fa30f4fbc581f0c5587 WHIRLPOOL 98f50ad1f4882ce3d22d22975b646f48dac12833654d6acbc272626a1cb0e3b262a4e68236bf39073ef7602fcc7cb43efb9e4bd2b3668dcc7cb564af90122ab8
 DIST tcpflow_1.4.4+repack1-3.debian.tar.xz 12244 SHA256 e006b5c6288bbc46e01a8488f7bf448ddd97ac454fe906764ddc3c03696b1a4b SHA512 720f080e2ebb481d64c05b7f4629fb25d6a5c069ce7901959de1f5ad38af0b68ae51469d1df070021a21154e8cec960e8b077f6235e1eb6a476bae252627fd3a WHIRLPOOL 632047fad5f439c78c1d8fe6e39f97058073ac5ff707ff5719372a803e1ff01145202bb894f49e6ad9861b255a0ef04be7fefd76f2c4d34afc2d2c99e41d66e0
 DIST tcpflow_1.4.4+repack1.orig.tar.gz 525060 SHA256 3269742db7acc51ce0ae8bfbe3dfe536654694e276032555f1e825c6f463711f SHA512 d44d060dc7a373137bacca7d38a782d5059ae8b0aa3d92df221955e4af88413f1bba464132c0a3e04d12005a2f54c6252b59e6608154f7ede0a1d3b8d608c1f1 WHIRLPOOL d5646c6fffec95a68624a20f0ce2f086f03cb28a7df529e68636c28c16bc5ebdd81b5edce769d495209f3eb0fb1167fe3b241912c2497cffd99d4e668406acbd
+DIST tcpflow_1.4.5+repack1-1.debian.tar.xz 11144 SHA256 b917e994ac1cd64cb63f719700b0a9862359779286cab89c9c29f73e64ec2d5b SHA512 ed2c491595a3d5382ca79fe945467639af3d99658d002353f90e07aa6b1a955e57ab0fbbc3fadf964e9d6d3dba4fd327a02c1b07d6a239efdf90b365928b2a1e WHIRLPOOL 0854405a429bd2f7276b18acc204e5ac5cfde1bbd4a8f5308e6bf667355eb1ea8a98c52b30a5a24aacb4f8f7b8469e75c2c49fc5f187aa87b869fad9c91d025c
+DIST tcpflow_1.4.5+repack1.orig.tar.gz 725962 SHA256 1d9b4ce2dd85adc1c608f34ada576b7f5b6d51c686ae6b870c3c277049a24af0 SHA512 fed8589957e3c790b5b6837b9b578d5dcbde316122ed6b3d4f908d1d73f23c6ed8a11720ee0510e878eaa7a6c559a2f35e7df2c77e3cb1f2810040adf7ac2b85 WHIRLPOOL 8743e20cea0fbee37c9ee050e8bbe02871e8a32dba2bbed922b912de457aa4eaf5cd21e8828a08eb3eafbf8d3897541230fc37bc4a15f7126e6b8adfb9fea860
diff --git a/net-analyzer/tcpflow/tcpflow-1.3.0.ebuild b/net-analyzer/tcpflow/tcpflow-1.3.0.ebuild
deleted file mode 100644
index 8f119aacb542..000000000000
--- a/net-analyzer/tcpflow/tcpflow-1.3.0.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-
-DESCRIPTION="A tool for monitoring, capturing and storing TCP connections flows"
-HOMEPAGE="https://github.com/simsong/tcpflow"
-SRC_URI="mirror://github/simsong/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-KEYWORDS="amd64 ~arm ~ppc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
-SLOT="0"
-IUSE="test"
-
-RDEPEND="net-libs/libpcap
-	sys-libs/zlib"
-DEPEND="${RDEPEND}
-	test? ( sys-apps/coreutils )"
-
-src_prepare() {
-	sed -i -e 's:`md5 -q \(.*\)`:`md5sum \1 | cut -f1 -d" "`:' tests/*.sh || die
-}
diff --git a/net-analyzer/tcpflow/tcpflow-1.4.5_p1.ebuild b/net-analyzer/tcpflow/tcpflow-1.4.5_p1.ebuild
new file mode 100644
index 000000000000..0214c07800cf
--- /dev/null
+++ b/net-analyzer/tcpflow/tcpflow-1.4.5_p1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit autotools eutils
+
+DESCRIPTION="A tool for monitoring, capturing and storing TCP connections flows"
+HOMEPAGE="https://github.com/simsong/tcpflow http://packages.qa.debian.org/t/tcpflow.html"
+SRC_URI="
+	mirror://debian/pool/main/t/${PN}/${PN}_${PV/_p*}+repack1.orig.tar.gz
+	mirror://debian/pool/main/t/${PN}/${PN}_${PV/_p*}+repack1-${PV/*_p}.debian.tar.xz
+"
+
+LICENSE="GPL-3"
+KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+SLOT="0"
+IUSE="cairo test"
+
+RDEPEND="
+	app-forensics/afflib
+	dev-libs/boost
+	dev-libs/openssl
+	net-libs/http-parser
+	net-libs/libpcap
+	sys-libs/zlib
+	cairo? (
+		x11-libs/cairo
+	)
+"
+DEPEND="
+	${RDEPEND}
+	test? ( sys-apps/coreutils )
+"
+
+S=${WORKDIR}/${PN}
+
+src_prepare() {
+	epatch "${WORKDIR}"/debian/patches/*.patch
+
+	mv -f README{.md,} || die
+
+	sed -i -e 's:`md5 -q \(.*\)`:`md5sum \1 | cut -f1 -d" "`:' tests/*.sh || die
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(usex cairo --enable-cairo=true --enable-cairo=false) \
+		--without-o3
+}
diff --git a/net-analyzer/wireshark/wireshark-1.12.7.ebuild b/net-analyzer/wireshark/wireshark-1.12.7.ebuild
index 3293a5d006f0..9b712da76818 100644
--- a/net-analyzer/wireshark/wireshark-1.12.7.ebuild
+++ b/net-analyzer/wireshark/wireshark-1.12.7.ebuild
@@ -11,7 +11,7 @@ SRC_URI="${HOMEPAGE}download/src/all-versions/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0/${PV}"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 sparc ~x86 ~x86-fbsd"
 IUSE="
 	adns +caps crypt doc doc-pdf geoip +gtk3 ipv6 kerberos lua +netlink +pcap
 	portaudio +qt4 qt5 sbc selinux smi ssl zlib
diff --git a/net-dialup/picocom/metadata.xml b/net-dialup/picocom/metadata.xml
index 418d529e8a68..112e7d920cf9 100644
--- a/net-dialup/picocom/metadata.xml
+++ b/net-dialup/picocom/metadata.xml
@@ -7,5 +7,6 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="google-code">picocom</remote-id>
+		<remote-id type="github">npat-efault/picocom</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/net-dns/bind-tools/Manifest b/net-dns/bind-tools/Manifest
index 15de6564f82e..9f622242da7e 100644
--- a/net-dns/bind-tools/Manifest
+++ b/net-dns/bind-tools/Manifest
@@ -1,2 +1,3 @@
 DIST bind-9.10.1-P1.tar.gz 8356463 SHA256 974343108d32f253a130383d0ba51290fb7bf372092f1451f264a9e3ac09898d SHA512 5fedff46d9cb0ff2544624c6d998f4f4bcd82152730e8e936c2611847fe443018b5c5c1dfb1dc49888dde5e3e30c3814f08369525612f0770575d54a3133ed48 WHIRLPOOL 6f39ff0e15676ed68f6d48d2ec5894b00de5192edbbbff94444f62dcf83e62a1e72019d575da97b6e6cde91b8918da78721c48510dbaad88095d4f2b3af375eb
 DIST bind-9.10.2-P2.tar.gz 8469608 SHA256 b1e6f0af88634aaf48fb9d06bbf82968264f49b8e2685f061dd3fd4c1ab76c5f SHA512 f59a4e7ef268cd95be9c31b8f908a77b261c76bfad0572608f503175e4e06e69c22ee88f4b6ae9578cd096aa069d9401f76084c7e07b3e98e9dbbb40d535695c WHIRLPOOL 10b035f790a43552b22eed13a98b8dcfdc0cc0614342ae221ce23ba655fb40a46e336cca8575460bf26a792303c6eba61e184ca5deb219372fdd09609b4c9798
+DIST bind-9.10.2-P4.tar.gz 8471531 SHA256 c00b21ec1def212957f28efe9d10aac52d6ec515e84fbf2c42143f5d71429cb8 SHA512 71dd211167c46ada768389f818b114c9e101132544510df0fde7b83ccbe6ef4d7313a3a254f11efe1ccea43a35f74785de4757c9f6044320174f5a69d39cdd5c WHIRLPOOL 0e179fb597c906c05d820969b8a005511aac177c968ffb10d34c1eda132c6caf9aa6fe8348a16e6ce55317784e44645a5295ccdb2aa740ac5960d6bd85dca7db
diff --git a/net-dns/bind-tools/bind-tools-9.10.2_p4.ebuild b/net-dns/bind-tools/bind-tools-9.10.2_p4.ebuild
new file mode 100644
index 000000000000..8ee9b2e1bede
--- /dev/null
+++ b/net-dns/bind-tools/bind-tools-9.10.2_p4.ebuild
@@ -0,0 +1,125 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit eutils autotools flag-o-matic toolchain-funcs
+
+MY_PN=${PN//-tools}
+MY_PV=${PV/_p/-P}
+MY_PV=${MY_PV/_rc/rc}
+MY_P="${MY_PN}-${MY_PV}"
+
+DESCRIPTION="bind tools: dig, nslookup, host, nsupdate, dnssec-keygen"
+HOMEPAGE="http://www.isc.org/software/bind"
+SRC_URI="ftp://ftp.isc.org/isc/bind9/${MY_PV}/${MY_P}.tar.gz"
+
+LICENSE="ISC BSD BSD-2 HPND JNIC RSA openssl"
+SLOT="0"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc gost gssapi idn ipv6 readline seccomp ssl urandom xml"
+# no PKCS11 currently as it requires OpenSSL to be patched, also see bug 409687
+
+REQUIRED_USE="gost? ( ssl )"
+
+DEPEND="ssl? ( dev-libs/openssl:0 )
+	gost? ( >=dev-libs/openssl-1.0.0:0[-bindist] )
+	xml? ( dev-libs/libxml2 )
+	idn? ( net-dns/idnkit )
+	gssapi? ( virtual/krb5 )
+	readline? ( sys-libs/readline:0= )
+	seccomp? ( sys-libs/libseccomp )"
+RDEPEND="${DEPEND}
+	!<net-dns/bind-9.10.2"
+
+S="${WORKDIR}/${MY_P}"
+
+# bug 479092, requires networking
+RESTRICT="test"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-9.5.0_p1-lwconfig.patch #231247
+	epatch "${FILESDIR}"/${PN}-9.10.2-openssl.patch #417129
+
+	# Disable tests for now, bug 406399
+	sed -i '/^SUBDIRS/s:tests::' bin/Makefile.in lib/Makefile.in || die
+
+	# bug #220361
+	rm aclocal.m4
+	rm -rf libtool.m4/
+	eautoreconf
+}
+
+src_configure() {
+	local myconf=
+
+	if use urandom; then
+		myconf="${myconf} --with-randomdev=/dev/urandom"
+	else
+		myconf="${myconf} --with-randomdev=/dev/random"
+	fi
+
+	# bug 344029
+	append-cflags "-DDIG_SIGCHASE"
+
+	# localstatedir for nsupdate -l, bug 395785
+	tc-export BUILD_CC
+	econf \
+		--localstatedir=/var \
+		--without-python \
+		--without-libjson \
+		--disable-openssl-version-check \
+		$(use_enable ipv6) \
+		$(use_with idn) \
+		$(usex idn --with-idnlib=-lidnkit '') \
+		$(use_enable seccomp) \
+		$(use_with ssl openssl) \
+		$(use_with xml libxml2) \
+		$(use_with gssapi) \
+		$(use_with readline) \
+		$(use_with gost) \
+		${myconf}
+
+	# bug #151839
+	echo '#undef SO_BSDCOMPAT' >> config.h
+}
+
+src_compile() {
+	local AR=$(tc-getAR)
+
+	emake AR="${AR}" -C lib/
+	emake AR="${AR}" -C bin/delv/
+	emake AR="${AR}" -C bin/dig/
+	emake AR="${AR}" -C bin/nsupdate/
+	emake AR="${AR}" -C bin/dnssec/
+}
+
+src_install() {
+	dodoc README CHANGES FAQ
+
+	cd "${S}"/bin/delv
+	dobin delv
+	doman delv.1
+
+	cd "${S}"/bin/dig
+	dobin dig host nslookup
+	doman {dig,host,nslookup}.1
+
+	cd "${S}"/bin/nsupdate
+	dobin nsupdate
+	doman nsupdate.1
+	if use doc; then
+		dohtml nsupdate.html
+	fi
+
+	cd "${S}"/bin/dnssec
+	for tool in dsfromkey importkey keyfromlabel keygen \
+	  revoke settime signzone verify; do
+		dobin dnssec-"${tool}"
+		doman dnssec-"${tool}".8
+		if use doc; then
+			dohtml dnssec-"${tool}".html
+		fi
+	done
+}
diff --git a/net-dns/bind/Manifest b/net-dns/bind/Manifest
index 5831123d83bd..fa6c18105cf3 100644
--- a/net-dns/bind/Manifest
+++ b/net-dns/bind/Manifest
@@ -1,3 +1,3 @@
-DIST bind-9.10.2-P2.tar.gz 8469608 SHA256 b1e6f0af88634aaf48fb9d06bbf82968264f49b8e2685f061dd3fd4c1ab76c5f SHA512 f59a4e7ef268cd95be9c31b8f908a77b261c76bfad0572608f503175e4e06e69c22ee88f4b6ae9578cd096aa069d9401f76084c7e07b3e98e9dbbb40d535695c WHIRLPOOL 10b035f790a43552b22eed13a98b8dcfdc0cc0614342ae221ce23ba655fb40a46e336cca8575460bf26a792303c6eba61e184ca5deb219372fdd09609b4c9798
 DIST bind-9.10.2-P3.tar.gz 8469831 SHA256 78079a66dda455ffecfe93ef72d1ffc947f17b1c453d55ec06b860b49a5e1d4a SHA512 cf33c3f83ab7c46f5919c16719870310f9e82237df4ed7ba4f7eb76ddae14b9644bd67dbb6c46e75650f59185aee391d3ac6fee45b2edb88473f9dbc578bb016 WHIRLPOOL ff7e1c827bfb62e229b8d93c299ff0647614f8403ba84cd3ebdbcafd51d37fdfcee7afd3feaf73036dfc46904b9b506b1da7c7e8ae73e167fe6f1f0246dc6163
+DIST bind-9.10.2-P4.tar.gz 8471531 SHA256 c00b21ec1def212957f28efe9d10aac52d6ec515e84fbf2c42143f5d71429cb8 SHA512 71dd211167c46ada768389f818b114c9e101132544510df0fde7b83ccbe6ef4d7313a3a254f11efe1ccea43a35f74785de4757c9f6044320174f5a69d39cdd5c WHIRLPOOL 0e179fb597c906c05d820969b8a005511aac177c968ffb10d34c1eda132c6caf9aa6fe8348a16e6ce55317784e44645a5295ccdb2aa740ac5960d6bd85dca7db
 DIST dyndns-samples.tbz2 22866 SHA256 92fb06a92ca99cbbe96b90bcca229ef9c12397db57ae17e199dad9f1218fdbe8 SHA512 83b0bf99f8e9ff709e8e9336d8c5231b98a4b5f0c60c10792f34931e32cc638d261967dfa5a83151ec3740977d94ddd6e21e9ce91267b3e279b88affdbc18cac WHIRLPOOL 08d4e6a817f1d02597631e18152dbd55ea1bc4c82174be150cc77efc9e1f0f03b6471d1cefbe4229cd3161de752ef232a43ca274a07b78e9c974ceb04cfe99a2
diff --git a/net-dns/bind/bind-9.10.2_p2.ebuild b/net-dns/bind/bind-9.10.2_p2.ebuild
deleted file mode 100644
index 8642d0421be7..000000000000
--- a/net-dns/bind/bind-9.10.2_p2.ebuild
+++ /dev/null
@@ -1,407 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-# Re dlz/mysql and threads, needs to be verified..
-# MySQL uses thread local storage in its C api. Thus MySQL
-# requires that each thread of an application execute a MySQL
-# thread initialization to setup the thread local storage.
-# This is impossible to do safely while staying within the DLZ
-# driver API. This is a limitation caused by MySQL, and not the DLZ API.
-# Because of this BIND MUST only run with a single thread when
-# using the MySQL driver.
-
-EAPI="5"
-
-PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
-
-inherit python-r1 eutils autotools toolchain-funcs flag-o-matic multilib db-use user systemd
-
-MY_PV="${PV/_p/-P}"
-MY_PV="${MY_PV/_rc/rc}"
-MY_P="${PN}-${MY_PV}"
-
-SDB_LDAP_VER="1.1.0-fc14"
-
-RRL_PV="${MY_PV}"
-
-NSLINT_DIR="contrib/nslint-3.0a2/"
-
-# SDB-LDAP: http://bind9-ldap.bayour.com/
-
-DESCRIPTION="BIND - Berkeley Internet Name Domain - Name Server"
-HOMEPAGE="http://www.isc.org/software/bind"
-SRC_URI="ftp://ftp.isc.org/isc/bind9/${MY_PV}/${MY_P}.tar.gz
-	doc? ( mirror://gentoo/dyndns-samples.tbz2 )"
-#	sdb-ldap? (
-#		http://ftp.disconnected-by-peer.at/pub/bind-sdb-ldap-${SDB_LDAP_VER}.patch.bz2
-#	)"
-
-LICENSE="GPL-2 ISC BSD BSD-2 HPND JNIC openssl"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="berkdb +caps dlz doc filter-aaaa fixed-rrset geoip gost gssapi idn ipv6
-json ldap mysql nslint odbc postgres python rpz seccomp selinux ssl static-libs
-+threads urandom xml"
-# sdb-ldap - patch broken
-# no PKCS11 currently as it requires OpenSSL to be patched, also see bug 409687
-
-REQUIRED_USE="postgres? ( dlz )
-	berkdb? ( dlz )
-	mysql? ( dlz !threads )
-	odbc? ( dlz )
-	ldap? ( dlz )
-	gost? ( ssl )
-	threads? ( caps )"
-# sdb-ldap? ( dlz )
-
-DEPEND="ssl? ( dev-libs/openssl:0[-bindist] )
-	mysql? ( >=virtual/mysql-4.0 )
-	odbc? ( >=dev-db/unixODBC-2.2.6 )
-	ldap? ( net-nds/openldap )
-	idn? ( net-dns/idnkit )
-	postgres? ( dev-db/postgresql:= )
-	caps? ( >=sys-libs/libcap-2.1.0 )
-	xml? ( dev-libs/libxml2 )
-	geoip? ( >=dev-libs/geoip-1.4.6 )
-	gssapi? ( virtual/krb5 )
-	gost? ( >=dev-libs/openssl-1.0.0:0[-bindist] )
-	seccomp? ( sys-libs/libseccomp )
-	json? ( dev-libs/json-c )"
-#	sdb-ldap? ( net-nds/openldap )
-
-RDEPEND="${DEPEND}
-	selinux? ( sec-policy/selinux-bind )
-	|| ( sys-process/psmisc >=sys-freebsd/freebsd-ubin-9.0_rc sys-process/fuser-bsd )"
-
-S="${WORKDIR}/${MY_P}"
-
-# bug 479092, requires networking
-RESTRICT="test"
-
-pkg_setup() {
-	ebegin "Creating named group and user"
-	enewgroup named 40
-	enewuser named 40 -1 /etc/bind named
-	eend ${?}
-}
-
-src_prepare() {
-	# Adjusting PATHs in manpages
-	for i in bin/{named/named.8,check/named-checkconf.8,rndc/rndc.8} ; do
-		sed -i \
-			-e 's:/etc/named.conf:/etc/bind/named.conf:g' \
-			-e 's:/etc/rndc.conf:/etc/bind/rndc.conf:g' \
-			-e 's:/etc/rndc.key:/etc/bind/rndc.key:g' \
-			"${i}" || die "sed failed, ${i} doesn't exist"
-	done
-
-#	if use dlz; then
-#		# sdb-ldap patch as per  bug #160567
-#		# Upstream URL: http://bind9-ldap.bayour.com/
-#		# New patch take from bug 302735
-#		if use sdb-ldap; then
-#			epatch "${WORKDIR}"/${PN}-sdb-ldap-${SDB_LDAP_VER}.patch
-#			cp -fp contrib/sdb/ldap/ldapdb.[ch] bin/named/
-#			cp -fp contrib/sdb/ldap/{ldap2zone.1,ldap2zone.c} bin/tools/
-#			cp -fp contrib/sdb/ldap/{zone2ldap.1,zone2ldap.c} bin/tools/
-#		fi
-#	fi
-
-	# should be installed by bind-tools
-	sed -i -r -e "s:(nsupdate|dig|delv) ::g" bin/Makefile.in || die
-
-	# Disable tests for now, bug 406399
-	sed -i '/^SUBDIRS/s:tests::' bin/Makefile.in lib/Makefile.in || die
-
-	if use nslint; then
-		sed -i -e 's:/etc/named.conf:/etc/bind/named.conf:' ${NSLINT_DIR}/nslint.{c,8} || die
-	fi
-
-	# bug #220361
-	rm aclocal.m4
-	rm -rf libtool.m4/
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=""
-
-	if use urandom; then
-		myconf="${myconf} --with-randomdev=/dev/urandom"
-	else
-		myconf="${myconf} --with-randomdev=/dev/random"
-	fi
-
-	use geoip && myconf="${myconf} --with-geoip"
-
-	# bug #158664
-#	gcc-specs-ssp && replace-flags -O[23s] -O
-
-	# To include db.h from proper path
-	use berkdb && append-flags "-I$(db_includedir)"
-
-	export BUILD_CC=$(tc-getBUILD_CC)
-	econf \
-		--sysconfdir=/etc/bind \
-		--localstatedir=/var \
-		--with-libtool \
-		--enable-full-report \
-		$(use_enable threads) \
-		$(use_with dlz dlopen) \
-		$(use_with dlz dlz-filesystem) \
-		$(use_with dlz dlz-stub) \
-		$(use_with postgres dlz-postgres) \
-		$(use_with mysql dlz-mysql) \
-		$(use_with berkdb dlz-bdb) \
-		$(use_with ldap dlz-ldap) \
-		$(use_with odbc dlz-odbc) \
-		$(use_with ssl openssl "${EPREFIX}"/usr) \
-		$(use_with ssl ecdsa) \
-		$(use_with idn) \
-		$(use_enable ipv6) \
-		$(use_with xml libxml2) \
-		$(use_with gssapi) \
-		$(use_enable rpz rpz-nsip) \
-		$(use_enable rpz rpz-nsdname) \
-		$(use_enable caps linux-caps) \
-		$(use_with gost) \
-		$(use_enable filter-aaaa) \
-		$(use_enable fixed-rrset) \
-		$(use_with python) \
-		$(use_enable seccomp) \
-		$(use_with json libjson) \
-		--without-readline \
-		${myconf}
-
-	# $(use_enable static-libs static) \
-
-	# bug #151839
-	echo '#undef SO_BSDCOMPAT' >> config.h
-
-	if use nslint; then
-		cd $NSLINT_DIR
-		econf
-	fi
-}
-
-src_compile() {
-	emake
-
-	if use nslint; then
-		emake -C $NSLINT_DIR CCOPT="${CFLAGS}"
-	fi
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	if use nslint; then
-		cd $NSLINT_DIR
-		dobin nslint
-		doman nslint.8
-		cd "${S}"
-	fi
-
-	dodoc CHANGES FAQ README
-
-	if use idn; then
-		dodoc contrib/idn/README.idnkit
-	fi
-
-	if use doc; then
-		dodoc doc/arm/Bv9ARM.pdf
-
-		docinto misc
-		dodoc doc/misc/*
-
-		# might a 'html' useflag make sense?
-		docinto html
-		dohtml -r doc/arm/*
-
-		docinto contrib
-		dodoc contrib/scripts/{nanny.pl,named-bootconf.sh}
-
-		# some handy-dandy dynamic dns examples
-		pushd "${D}"/usr/share/doc/${PF} 1>/dev/null
-		tar xf "${DISTDIR}"/dyndns-samples.tbz2 || die
-		popd 1>/dev/null
-	fi
-
-	insinto /etc/bind
-	newins "${FILESDIR}"/named.conf-r8 named.conf
-
-	# ftp://ftp.rs.internic.net/domain/named.cache:
-	insinto /var/bind
-	doins "${FILESDIR}"/named.cache
-
-	insinto /var/bind/pri
-	newins "${FILESDIR}"/localhost.zone-r3 localhost.zone
-
-	newinitd "${FILESDIR}"/named.init-r13 named
-	newconfd "${FILESDIR}"/named.confd-r7 named
-
-	if use gost; then
-		sed -i -e 's/^OPENSSL_LIBGOST=${OPENSSL_LIBGOST:-0}$/OPENSSL_LIBGOST=${OPENSSL_LIBGOST:-1}/' "${D}/etc/init.d/named" || die
-	else
-		sed -i -e 's/^OPENSSL_LIBGOST=${OPENSSL_LIBGOST:-1}$/OPENSSL_LIBGOST=${OPENSSL_LIBGOST:-0}/' "${D}/etc/init.d/named" || die
-	fi
-
-	newenvd "${FILESDIR}"/10bind.env 10bind
-
-	# Let's get rid of those tools and their manpages since they're provided by bind-tools
-	rm -f "${D}"/usr/share/man/man1/{dig,host,nslookup}.1*
-	rm -f "${D}"/usr/share/man/man8/nsupdate.8*
-	rm -f "${D}"/usr/bin/{dig,host,nslookup,nsupdate}
-	rm -f "${D}"/usr/sbin/{dig,host,nslookup,nsupdate}
-	for tool in dsfromkey importkey keyfromlabel keygen \
-	  revoke settime signzone verify; do
-		rm -f "${D}"/usr/{,s}bin/dnssec-"${tool}"
-		rm -f "${D}"/usr/share/man/man8/dnssec-"${tool}".8*
-	done
-
-	# bug 405251, library archives aren't properly handled by --enable/disable-static
-	if ! use static-libs; then
-		find "${D}" -type f -name '*.a' -delete || die
-	fi
-
-	# bug 405251
-	find "${D}" -type f -name '*.la' -delete || die
-
-	if use python; then
-		install_python_tools() {
-			dosbin bin/python/dnssec-{checkds,coverage}
-		}
-		python_foreach_impl install_python_tools
-
-		python_replicate_script "${D}usr/sbin/dnssec-checkds"
-		python_replicate_script "${D}usr/sbin/dnssec-coverage"
-	fi
-
-	# bug 450406
-	dosym named.cache /var/bind/root.cache
-
-	dosym /var/bind/pri /etc/bind/pri
-	dosym /var/bind/sec /etc/bind/sec
-	dosym /var/bind/dyn /etc/bind/dyn
-	keepdir /var/bind/{pri,sec,dyn}
-
-	dodir /var/log/named
-
-	fowners root:named /{etc,var}/bind /var/log/named /var/bind/{sec,pri,dyn}
-	fowners root:named /var/bind/named.cache /var/bind/pri/localhost.zone /etc/bind/{bind.keys,named.conf}
-	fperms 0640 /var/bind/named.cache /var/bind/pri/localhost.zone /etc/bind/{bind.keys,named.conf}
-	fperms 0750 /etc/bind /var/bind/pri
-	fperms 0770 /var/log/named /var/bind/{,sec,dyn}
-
-	systemd_newunit "${FILESDIR}/named.service-r1" named.service
-	exeinto /usr/libexec
-	doexe "${FILESDIR}/generate-rndc-key.sh"
-}
-
-pkg_postinst() {
-	if [ ! -f '/etc/bind/rndc.key' ]; then
-		if use urandom; then
-			einfo "Using /dev/urandom for generating rndc.key"
-			/usr/sbin/rndc-confgen -r /dev/urandom -a
-			echo
-		else
-			einfo "Using /dev/random for generating rndc.key"
-			/usr/sbin/rndc-confgen -a
-			echo
-		fi
-		chown root:named /etc/bind/rndc.key
-		chmod 0640 /etc/bind/rndc.key
-	fi
-
-	einfo
-	einfo "You can edit /etc/conf.d/named to customize named settings"
-	einfo
-	use mysql || use postgres || use ldap && {
-		elog "If your named depends on MySQL/PostgreSQL or LDAP,"
-		elog "uncomment the specified rc_named_* lines in your"
-		elog "/etc/conf.d/named config to ensure they'll start before bind"
-		einfo
-	}
-	einfo "If you'd like to run bind in a chroot AND this is a new"
-	einfo "install OR your bind doesn't already run in a chroot:"
-	einfo "1) Uncomment and set the CHROOT variable in /etc/conf.d/named."
-	einfo "2) Run \`emerge --config '=${CATEGORY}/${PF}'\`"
-	einfo
-
-	CHROOT=$(source /etc/conf.d/named 2>/dev/null; echo ${CHROOT})
-	if [[ -n ${CHROOT} ]]; then
-		elog "NOTE: As of net-dns/bind-9.4.3_p5-r1 the chroot part of the init-script got some major changes!"
-		elog "To enable the old behaviour (without using mount) uncomment the"
-		elog "CHROOT_NOMOUNT option in your /etc/conf.d/named config."
-		elog "If you decide to use the new/default method, ensure to make backup"
-		elog "first and merge your existing configs/zones to /etc/bind and"
-		elog "/var/bind because bind will now mount the needed directories into"
-		elog "the chroot dir."
-	fi
-}
-
-pkg_config() {
-	CHROOT=$(source /etc/conf.d/named; echo ${CHROOT})
-	CHROOT_NOMOUNT=$(source /etc/conf.d/named; echo ${CHROOT_NOMOUNT})
-	CHROOT_GEOIP=$(source /etc/conf.d/named; echo ${CHROOT_GEOIP})
-
-	if [[ -z "${CHROOT}" ]]; then
-		eerror "This config script is designed to automate setting up"
-		eerror "a chrooted bind/named. To do so, please first uncomment"
-		eerror "and set the CHROOT variable in '/etc/conf.d/named'."
-		die "Unset CHROOT"
-	fi
-	if [[ -d "${CHROOT}" ]]; then
-		ewarn "NOTE: As of net-dns/bind-9.4.3_p5-r1 the chroot part of the init-script got some major changes!"
-		ewarn "To enable the old behaviour (without using mount) uncomment the"
-		ewarn "CHROOT_NOMOUNT option in your /etc/conf.d/named config."
-		ewarn
-		ewarn "${CHROOT} already exists... some things might become overridden"
-		ewarn "press CTRL+C if you don't want to continue"
-		sleep 10
-	fi
-
-	echo; einfo "Setting up the chroot directory..."
-
-	mkdir -m 0750 -p ${CHROOT}
-	mkdir -m 0755 -p ${CHROOT}/{dev,etc,var/log,run}
-	mkdir -m 0750 -p ${CHROOT}/etc/bind
-	mkdir -m 0770 -p ${CHROOT}/var/{bind,log/named} ${CHROOT}/run/named/
-	# As of bind 9.8.0
-	if has_version net-dns/bind[gost]; then
-		if [ "$(get_libdir)" = "lib64" ]; then
-			mkdir -m 0755 -p ${CHROOT}/usr/lib64/engines
-			ln -s lib64 ${CHROOT}/usr/lib
-		else
-			mkdir -m 0755 -p ${CHROOT}/usr/lib/engines
-		fi
-	fi
-	chown root:named ${CHROOT} ${CHROOT}/var/{bind,log/named} ${CHROOT}/run/named/ ${CHROOT}/etc/bind
-
-	mknod ${CHROOT}/dev/null c 1 3
-	chmod 0666 ${CHROOT}/dev/null
-
-	mknod ${CHROOT}/dev/zero c 1 5
-	chmod 0666 ${CHROOT}/dev/zero
-
-	if use urandom; then
-		mknod ${CHROOT}/dev/urandom c 1 9
-		chmod 0666 ${CHROOT}/dev/urandom
-	else
-		mknod ${CHROOT}/dev/random c 1 8
-		chmod 0666 ${CHROOT}/dev/random
-	fi
-
-	if [ "${CHROOT_NOMOUNT:-0}" -ne 0 ]; then
-		cp -a /etc/bind ${CHROOT}/etc/
-		cp -a /var/bind ${CHROOT}/var/
-	fi
-
-	if [ "${CHROOT_GEOIP:-0}" -eq 1 ]; then
-		mkdir -m 0755 -p ${CHROOT}/usr/share/GeoIP
-	fi
-
-	elog "You may need to add the following line to your syslog-ng.conf:"
-	elog "source jail { unix-stream(\"${CHROOT}/dev/log\"); };"
-}
diff --git a/net-dns/bind/bind-9.10.2_p3.ebuild b/net-dns/bind/bind-9.10.2_p3.ebuild
index 21a4739d7174..8642d0421be7 100644
--- a/net-dns/bind/bind-9.10.2_p3.ebuild
+++ b/net-dns/bind/bind-9.10.2_p3.ebuild
@@ -39,7 +39,7 @@ SRC_URI="ftp://ftp.isc.org/isc/bind9/${MY_PV}/${MY_P}.tar.gz
 
 LICENSE="GPL-2 ISC BSD BSD-2 HPND JNIC openssl"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="berkdb +caps dlz doc filter-aaaa fixed-rrset geoip gost gssapi idn ipv6
 json ldap mysql nslint odbc postgres python rpz seccomp selinux ssl static-libs
 +threads urandom xml"
diff --git a/net-dns/bind/bind-9.10.2_p4.ebuild b/net-dns/bind/bind-9.10.2_p4.ebuild
new file mode 100644
index 000000000000..fecac9f9fab9
--- /dev/null
+++ b/net-dns/bind/bind-9.10.2_p4.ebuild
@@ -0,0 +1,407 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+# Re dlz/mysql and threads, needs to be verified..
+# MySQL uses thread local storage in its C api. Thus MySQL
+# requires that each thread of an application execute a MySQL
+# thread initialization to setup the thread local storage.
+# This is impossible to do safely while staying within the DLZ
+# driver API. This is a limitation caused by MySQL, and not the DLZ API.
+# Because of this BIND MUST only run with a single thread when
+# using the MySQL driver.
+
+EAPI="5"
+
+PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
+
+inherit python-r1 eutils autotools toolchain-funcs flag-o-matic multilib db-use user systemd
+
+MY_PV="${PV/_p/-P}"
+MY_PV="${MY_PV/_rc/rc}"
+MY_P="${PN}-${MY_PV}"
+
+SDB_LDAP_VER="1.1.0-fc14"
+
+RRL_PV="${MY_PV}"
+
+NSLINT_DIR="contrib/nslint-3.0a2/"
+
+# SDB-LDAP: http://bind9-ldap.bayour.com/
+
+DESCRIPTION="BIND - Berkeley Internet Name Domain - Name Server"
+HOMEPAGE="http://www.isc.org/software/bind"
+SRC_URI="ftp://ftp.isc.org/isc/bind9/${MY_PV}/${MY_P}.tar.gz
+	doc? ( mirror://gentoo/dyndns-samples.tbz2 )"
+#	sdb-ldap? (
+#		http://ftp.disconnected-by-peer.at/pub/bind-sdb-ldap-${SDB_LDAP_VER}.patch.bz2
+#	)"
+
+LICENSE="GPL-2 ISC BSD BSD-2 HPND JNIC openssl"
+SLOT="0"
+KEYWORDS="alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="berkdb +caps dlz doc filter-aaaa fixed-rrset geoip gost gssapi idn ipv6
+json ldap mysql nslint odbc postgres python rpz seccomp selinux ssl static-libs
++threads urandom xml"
+# sdb-ldap - patch broken
+# no PKCS11 currently as it requires OpenSSL to be patched, also see bug 409687
+
+REQUIRED_USE="postgres? ( dlz )
+	berkdb? ( dlz )
+	mysql? ( dlz !threads )
+	odbc? ( dlz )
+	ldap? ( dlz )
+	gost? ( ssl )
+	threads? ( caps )"
+# sdb-ldap? ( dlz )
+
+DEPEND="ssl? ( dev-libs/openssl:0[-bindist] )
+	mysql? ( >=virtual/mysql-4.0 )
+	odbc? ( >=dev-db/unixODBC-2.2.6 )
+	ldap? ( net-nds/openldap )
+	idn? ( net-dns/idnkit )
+	postgres? ( dev-db/postgresql:= )
+	caps? ( >=sys-libs/libcap-2.1.0 )
+	xml? ( dev-libs/libxml2 )
+	geoip? ( >=dev-libs/geoip-1.4.6 )
+	gssapi? ( virtual/krb5 )
+	gost? ( >=dev-libs/openssl-1.0.0:0[-bindist] )
+	seccomp? ( sys-libs/libseccomp )
+	json? ( dev-libs/json-c )"
+#	sdb-ldap? ( net-nds/openldap )
+
+RDEPEND="${DEPEND}
+	selinux? ( sec-policy/selinux-bind )
+	|| ( sys-process/psmisc >=sys-freebsd/freebsd-ubin-9.0_rc sys-process/fuser-bsd )"
+
+S="${WORKDIR}/${MY_P}"
+
+# bug 479092, requires networking
+RESTRICT="test"
+
+pkg_setup() {
+	ebegin "Creating named group and user"
+	enewgroup named 40
+	enewuser named 40 -1 /etc/bind named
+	eend ${?}
+}
+
+src_prepare() {
+	# Adjusting PATHs in manpages
+	for i in bin/{named/named.8,check/named-checkconf.8,rndc/rndc.8} ; do
+		sed -i \
+			-e 's:/etc/named.conf:/etc/bind/named.conf:g' \
+			-e 's:/etc/rndc.conf:/etc/bind/rndc.conf:g' \
+			-e 's:/etc/rndc.key:/etc/bind/rndc.key:g' \
+			"${i}" || die "sed failed, ${i} doesn't exist"
+	done
+
+#	if use dlz; then
+#		# sdb-ldap patch as per  bug #160567
+#		# Upstream URL: http://bind9-ldap.bayour.com/
+#		# New patch take from bug 302735
+#		if use sdb-ldap; then
+#			epatch "${WORKDIR}"/${PN}-sdb-ldap-${SDB_LDAP_VER}.patch
+#			cp -fp contrib/sdb/ldap/ldapdb.[ch] bin/named/
+#			cp -fp contrib/sdb/ldap/{ldap2zone.1,ldap2zone.c} bin/tools/
+#			cp -fp contrib/sdb/ldap/{zone2ldap.1,zone2ldap.c} bin/tools/
+#		fi
+#	fi
+
+	# should be installed by bind-tools
+	sed -i -r -e "s:(nsupdate|dig|delv) ::g" bin/Makefile.in || die
+
+	# Disable tests for now, bug 406399
+	sed -i '/^SUBDIRS/s:tests::' bin/Makefile.in lib/Makefile.in || die
+
+	if use nslint; then
+		sed -i -e 's:/etc/named.conf:/etc/bind/named.conf:' ${NSLINT_DIR}/nslint.{c,8} || die
+	fi
+
+	# bug #220361
+	rm aclocal.m4
+	rm -rf libtool.m4/
+	eautoreconf
+}
+
+src_configure() {
+	local myconf=""
+
+	if use urandom; then
+		myconf="${myconf} --with-randomdev=/dev/urandom"
+	else
+		myconf="${myconf} --with-randomdev=/dev/random"
+	fi
+
+	use geoip && myconf="${myconf} --with-geoip"
+
+	# bug #158664
+#	gcc-specs-ssp && replace-flags -O[23s] -O
+
+	# To include db.h from proper path
+	use berkdb && append-flags "-I$(db_includedir)"
+
+	export BUILD_CC=$(tc-getBUILD_CC)
+	econf \
+		--sysconfdir=/etc/bind \
+		--localstatedir=/var \
+		--with-libtool \
+		--enable-full-report \
+		$(use_enable threads) \
+		$(use_with dlz dlopen) \
+		$(use_with dlz dlz-filesystem) \
+		$(use_with dlz dlz-stub) \
+		$(use_with postgres dlz-postgres) \
+		$(use_with mysql dlz-mysql) \
+		$(use_with berkdb dlz-bdb) \
+		$(use_with ldap dlz-ldap) \
+		$(use_with odbc dlz-odbc) \
+		$(use_with ssl openssl "${EPREFIX}"/usr) \
+		$(use_with ssl ecdsa) \
+		$(use_with idn) \
+		$(use_enable ipv6) \
+		$(use_with xml libxml2) \
+		$(use_with gssapi) \
+		$(use_enable rpz rpz-nsip) \
+		$(use_enable rpz rpz-nsdname) \
+		$(use_enable caps linux-caps) \
+		$(use_with gost) \
+		$(use_enable filter-aaaa) \
+		$(use_enable fixed-rrset) \
+		$(use_with python) \
+		$(use_enable seccomp) \
+		$(use_with json libjson) \
+		--without-readline \
+		${myconf}
+
+	# $(use_enable static-libs static) \
+
+	# bug #151839
+	echo '#undef SO_BSDCOMPAT' >> config.h
+
+	if use nslint; then
+		cd $NSLINT_DIR
+		econf
+	fi
+}
+
+src_compile() {
+	emake
+
+	if use nslint; then
+		emake -C $NSLINT_DIR CCOPT="${CFLAGS}"
+	fi
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	if use nslint; then
+		cd $NSLINT_DIR
+		dobin nslint
+		doman nslint.8
+		cd "${S}"
+	fi
+
+	dodoc CHANGES FAQ README
+
+	if use idn; then
+		dodoc contrib/idn/README.idnkit
+	fi
+
+	if use doc; then
+		dodoc doc/arm/Bv9ARM.pdf
+
+		docinto misc
+		dodoc doc/misc/*
+
+		# might a 'html' useflag make sense?
+		docinto html
+		dohtml -r doc/arm/*
+
+		docinto contrib
+		dodoc contrib/scripts/{nanny.pl,named-bootconf.sh}
+
+		# some handy-dandy dynamic dns examples
+		pushd "${D}"/usr/share/doc/${PF} 1>/dev/null
+		tar xf "${DISTDIR}"/dyndns-samples.tbz2 || die
+		popd 1>/dev/null
+	fi
+
+	insinto /etc/bind
+	newins "${FILESDIR}"/named.conf-r8 named.conf
+
+	# ftp://ftp.rs.internic.net/domain/named.cache:
+	insinto /var/bind
+	doins "${FILESDIR}"/named.cache
+
+	insinto /var/bind/pri
+	newins "${FILESDIR}"/localhost.zone-r3 localhost.zone
+
+	newinitd "${FILESDIR}"/named.init-r13 named
+	newconfd "${FILESDIR}"/named.confd-r7 named
+
+	if use gost; then
+		sed -i -e 's/^OPENSSL_LIBGOST=${OPENSSL_LIBGOST:-0}$/OPENSSL_LIBGOST=${OPENSSL_LIBGOST:-1}/' "${D}/etc/init.d/named" || die
+	else
+		sed -i -e 's/^OPENSSL_LIBGOST=${OPENSSL_LIBGOST:-1}$/OPENSSL_LIBGOST=${OPENSSL_LIBGOST:-0}/' "${D}/etc/init.d/named" || die
+	fi
+
+	newenvd "${FILESDIR}"/10bind.env 10bind
+
+	# Let's get rid of those tools and their manpages since they're provided by bind-tools
+	rm -f "${D}"/usr/share/man/man1/{dig,host,nslookup}.1*
+	rm -f "${D}"/usr/share/man/man8/nsupdate.8*
+	rm -f "${D}"/usr/bin/{dig,host,nslookup,nsupdate}
+	rm -f "${D}"/usr/sbin/{dig,host,nslookup,nsupdate}
+	for tool in dsfromkey importkey keyfromlabel keygen \
+	  revoke settime signzone verify; do
+		rm -f "${D}"/usr/{,s}bin/dnssec-"${tool}"
+		rm -f "${D}"/usr/share/man/man8/dnssec-"${tool}".8*
+	done
+
+	# bug 405251, library archives aren't properly handled by --enable/disable-static
+	if ! use static-libs; then
+		find "${D}" -type f -name '*.a' -delete || die
+	fi
+
+	# bug 405251
+	find "${D}" -type f -name '*.la' -delete || die
+
+	if use python; then
+		install_python_tools() {
+			dosbin bin/python/dnssec-{checkds,coverage}
+		}
+		python_foreach_impl install_python_tools
+
+		python_replicate_script "${D}usr/sbin/dnssec-checkds"
+		python_replicate_script "${D}usr/sbin/dnssec-coverage"
+	fi
+
+	# bug 450406
+	dosym named.cache /var/bind/root.cache
+
+	dosym /var/bind/pri /etc/bind/pri
+	dosym /var/bind/sec /etc/bind/sec
+	dosym /var/bind/dyn /etc/bind/dyn
+	keepdir /var/bind/{pri,sec,dyn}
+
+	dodir /var/log/named
+
+	fowners root:named /{etc,var}/bind /var/log/named /var/bind/{sec,pri,dyn}
+	fowners root:named /var/bind/named.cache /var/bind/pri/localhost.zone /etc/bind/{bind.keys,named.conf}
+	fperms 0640 /var/bind/named.cache /var/bind/pri/localhost.zone /etc/bind/{bind.keys,named.conf}
+	fperms 0750 /etc/bind /var/bind/pri
+	fperms 0770 /var/log/named /var/bind/{,sec,dyn}
+
+	systemd_newunit "${FILESDIR}/named.service-r1" named.service
+	exeinto /usr/libexec
+	doexe "${FILESDIR}/generate-rndc-key.sh"
+}
+
+pkg_postinst() {
+	if [ ! -f '/etc/bind/rndc.key' ]; then
+		if use urandom; then
+			einfo "Using /dev/urandom for generating rndc.key"
+			/usr/sbin/rndc-confgen -r /dev/urandom -a
+			echo
+		else
+			einfo "Using /dev/random for generating rndc.key"
+			/usr/sbin/rndc-confgen -a
+			echo
+		fi
+		chown root:named /etc/bind/rndc.key
+		chmod 0640 /etc/bind/rndc.key
+	fi
+
+	einfo
+	einfo "You can edit /etc/conf.d/named to customize named settings"
+	einfo
+	use mysql || use postgres || use ldap && {
+		elog "If your named depends on MySQL/PostgreSQL or LDAP,"
+		elog "uncomment the specified rc_named_* lines in your"
+		elog "/etc/conf.d/named config to ensure they'll start before bind"
+		einfo
+	}
+	einfo "If you'd like to run bind in a chroot AND this is a new"
+	einfo "install OR your bind doesn't already run in a chroot:"
+	einfo "1) Uncomment and set the CHROOT variable in /etc/conf.d/named."
+	einfo "2) Run \`emerge --config '=${CATEGORY}/${PF}'\`"
+	einfo
+
+	CHROOT=$(source /etc/conf.d/named 2>/dev/null; echo ${CHROOT})
+	if [[ -n ${CHROOT} ]]; then
+		elog "NOTE: As of net-dns/bind-9.4.3_p5-r1 the chroot part of the init-script got some major changes!"
+		elog "To enable the old behaviour (without using mount) uncomment the"
+		elog "CHROOT_NOMOUNT option in your /etc/conf.d/named config."
+		elog "If you decide to use the new/default method, ensure to make backup"
+		elog "first and merge your existing configs/zones to /etc/bind and"
+		elog "/var/bind because bind will now mount the needed directories into"
+		elog "the chroot dir."
+	fi
+}
+
+pkg_config() {
+	CHROOT=$(source /etc/conf.d/named; echo ${CHROOT})
+	CHROOT_NOMOUNT=$(source /etc/conf.d/named; echo ${CHROOT_NOMOUNT})
+	CHROOT_GEOIP=$(source /etc/conf.d/named; echo ${CHROOT_GEOIP})
+
+	if [[ -z "${CHROOT}" ]]; then
+		eerror "This config script is designed to automate setting up"
+		eerror "a chrooted bind/named. To do so, please first uncomment"
+		eerror "and set the CHROOT variable in '/etc/conf.d/named'."
+		die "Unset CHROOT"
+	fi
+	if [[ -d "${CHROOT}" ]]; then
+		ewarn "NOTE: As of net-dns/bind-9.4.3_p5-r1 the chroot part of the init-script got some major changes!"
+		ewarn "To enable the old behaviour (without using mount) uncomment the"
+		ewarn "CHROOT_NOMOUNT option in your /etc/conf.d/named config."
+		ewarn
+		ewarn "${CHROOT} already exists... some things might become overridden"
+		ewarn "press CTRL+C if you don't want to continue"
+		sleep 10
+	fi
+
+	echo; einfo "Setting up the chroot directory..."
+
+	mkdir -m 0750 -p ${CHROOT}
+	mkdir -m 0755 -p ${CHROOT}/{dev,etc,var/log,run}
+	mkdir -m 0750 -p ${CHROOT}/etc/bind
+	mkdir -m 0770 -p ${CHROOT}/var/{bind,log/named} ${CHROOT}/run/named/
+	# As of bind 9.8.0
+	if has_version net-dns/bind[gost]; then
+		if [ "$(get_libdir)" = "lib64" ]; then
+			mkdir -m 0755 -p ${CHROOT}/usr/lib64/engines
+			ln -s lib64 ${CHROOT}/usr/lib
+		else
+			mkdir -m 0755 -p ${CHROOT}/usr/lib/engines
+		fi
+	fi
+	chown root:named ${CHROOT} ${CHROOT}/var/{bind,log/named} ${CHROOT}/run/named/ ${CHROOT}/etc/bind
+
+	mknod ${CHROOT}/dev/null c 1 3
+	chmod 0666 ${CHROOT}/dev/null
+
+	mknod ${CHROOT}/dev/zero c 1 5
+	chmod 0666 ${CHROOT}/dev/zero
+
+	if use urandom; then
+		mknod ${CHROOT}/dev/urandom c 1 9
+		chmod 0666 ${CHROOT}/dev/urandom
+	else
+		mknod ${CHROOT}/dev/random c 1 8
+		chmod 0666 ${CHROOT}/dev/random
+	fi
+
+	if [ "${CHROOT_NOMOUNT:-0}" -ne 0 ]; then
+		cp -a /etc/bind ${CHROOT}/etc/
+		cp -a /var/bind ${CHROOT}/var/
+	fi
+
+	if [ "${CHROOT_GEOIP:-0}" -eq 1 ]; then
+		mkdir -m 0755 -p ${CHROOT}/usr/share/GeoIP
+	fi
+
+	elog "You may need to add the following line to your syslog-ng.conf:"
+	elog "source jail { unix-stream(\"${CHROOT}/dev/log\"); };"
+}
diff --git a/net-firewall/fwknop/Manifest b/net-firewall/fwknop/Manifest
index ae32b6f25adc..69bd5b575744 100644
--- a/net-firewall/fwknop/Manifest
+++ b/net-firewall/fwknop/Manifest
@@ -1 +1 @@
-DIST fwknop-2.6.6.tar.gz 2433846 SHA256 724e986b6bc47d3b6f5ba5c9232e2b411ae8ef4b2e8f7fffd16210c20d3be932 SHA512 ccd25701908a1bc653b59571013f0953ee40c967537b68cfaff48e1eea4fde11402712f70f07db308f7a37cfd49ef8ad11b1535d3012cf32e09cc677673c067f WHIRLPOOL df8025e8a2551e0485473715bc10fef31b373f38293b8f8f678aa7ec03f9fbe353a089cfbdbb783e5972b917313f4a90edfac4557e53bd962df6d8ba0e9fca2e
+DIST fwknop-2.6.7.tar.gz 2849006 SHA256 e96c13f725a4c3829c842743b14aedf591d30570df5c06556862a900b64def86 SHA512 8a8c5e76740c495342fd914309de564576ce5c7fda90dc0f0322782ace5f28ccbb4bcef4c0a3353a564b13ef7298a5cd75dcd4d26986b2fb5ec000b641fbf848 WHIRLPOOL 6de45c31cc39b7b44d0531dc19bd2727bc721cf156a04d830c295573fe40d95296c1591e3bd5ae2b597bea9a6015744061351655f1cf04a5d6a5cae6678d1126
diff --git a/net-firewall/fwknop/fwknop-2.6.6-r1.ebuild b/net-firewall/fwknop/fwknop-2.6.6-r1.ebuild
deleted file mode 100644
index 7fcc35d6ce5f..000000000000
--- a/net-firewall/fwknop/fwknop-2.6.6-r1.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-# Does work with python2_7, does not work with python3_3 on my machine
-# More feedback is welcome, since setup.py does not provide any info
-PYTHON_COMPAT=( python2_7 )
-DISTUTILS_OPTIONAL=1
-DISTUTILS_SINGLE_IMPL=1
-AUTOTOOLS_AUTORECONF=1
-AUTOTOOLS_IN_SOURCE_BUILD=1
-
-inherit autotools-utils distutils-r1 systemd
-
-DESCRIPTION="Single Packet Authorization and Port Knocking application"
-HOMEPAGE="http://www.cipherdyne.org/fwknop/"
-SRC_URI="https://github.com/mrash/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="client extras gdbm gpg python server udp-server"
-
-RDEPEND="
-	client? ( net-misc/wget[ssl] )
-	gpg? (
-		dev-libs/libassuan
-		dev-libs/libgpg-error
-	)
-	python? ( ${PYTHON_DEPS} )
-"
-DEPEND="${RDEPEND}
-	gdbm? ( sys-libs/gdbm )
-	gpg? ( app-crypt/gpgme )
-	server? (
-		!udp-server? ( net-libs/libpcap )
-		net-firewall/iptables
-	)
-"
-
-REQUIRED_USE="
-	python? ( ${PYTHON_REQUIRED_USE} )
-	udp-server? ( server )
-"
-
-DOCS=( ChangeLog README.md )
-
-src_prepare() {
-	# Install example configs with .example suffix
-	if use server; then
-		sed -i 's/conf;/conf.example;/g' "${S}"/Makefile.am || die
-	fi
-
-	autotools-utils_src_prepare
-
-	if use python; then
-		cd "${S}"/python || die
-		distutils-r1_src_prepare
-	fi
-}
-
-src_configure() {
-	local myeconfargs=(
-		--localstatedir=/run
-		--enable-digest-cache
-		$(use_enable client)
-		$(use_enable !gdbm file-cache)
-		$(use_enable server)
-		$(use_enable udp-server)
-		$(use_with gpg gpgme)
-	)
-	autotools-utils_src_configure
-}
-
-src_compile() {
-	autotools-utils_src_compile
-
-	if use python; then
-		cd "${S}"/python || die
-		distutils-r1_src_compile
-	fi
-}
-
-src_install() {
-	autotools-utils_src_install
-	prune_libtool_files --modules
-
-	if use server; then
-		newinitd "${FILESDIR}/fwknopd.init" fwknopd
-		newconfd "${FILESDIR}/fwknopd.confd" fwknopd
-		systemd_dounit "${FILESDIR}/fwknopd.service"
-		systemd_newtmpfilesd "${FILESDIR}/fwknopd.tmpfiles.conf" fwknopd.conf
-	fi
-
-	use extras && dodoc "${S}/extras/apparmor/usr.sbin.fwknopd"
-
-	if use python; then
-		# Unset DOCS since distutils-r1.eclass interferes
-		local DOCS=()
-		cd "${S}"/python || die
-		distutils-r1_src_install
-	fi
-}
diff --git a/net-firewall/fwknop/fwknop-2.6.7.ebuild b/net-firewall/fwknop/fwknop-2.6.7.ebuild
new file mode 100644
index 000000000000..2fc149ff0e68
--- /dev/null
+++ b/net-firewall/fwknop/fwknop-2.6.7.ebuild
@@ -0,0 +1,135 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+# Python extension supports only Python2
+# See https://github.com/mrash/fwknop/issues/167
+PYTHON_COMPAT=( python2_7 )
+DISTUTILS_OPTIONAL=1
+AUTOTOOLS_AUTORECONF=1
+AUTOTOOLS_IN_SOURCE_BUILD=1
+DISABLE_AUTOFORMATTING=1
+
+inherit autotools-utils distutils-r1 linux-info readme.gentoo systemd
+
+DESCRIPTION="Single Packet Authorization and Port Knocking application"
+HOMEPAGE="http://www.cipherdyne.org/fwknop/"
+SRC_URI="https://github.com/mrash/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="client extras firewalld gdbm gpg iptables python server udp-server"
+
+RDEPEND="
+	client? ( net-misc/wget[ssl] )
+	gpg? (
+		dev-libs/libassuan
+		dev-libs/libgpg-error
+	)
+	python? ( ${PYTHON_DEPS} )
+"
+DEPEND="${RDEPEND}
+	gdbm? ( sys-libs/gdbm )
+	gpg? ( app-crypt/gpgme )
+	firewalld? ( net-firewall/firewalld[${PYTHON_USEDEP}] )
+	iptables? ( net-firewall/iptables )
+	server? ( !udp-server? ( net-libs/libpcap ) )
+"
+
+REQUIRED_USE="
+	python? ( ${PYTHON_REQUIRED_USE} )
+	firewalld? ( server )
+	iptables? ( server )
+	server? ( ^^ ( firewalld iptables ) )
+	udp-server? ( server )
+"
+
+DOCS=( ChangeLog README.md )
+DOC_CONTENTS="
+Example configuration files were installed in /etc/fwknopd directory.
+Please edit them to fit your needs and then remove the .example suffix.
+
+fwknopd supports several backends: firewalld, iptables, ipfw, pf, ipf.
+You can set the desired backend via FIREWALL_EXE option in fwknopd.conf
+instead of the default one chosen at compile time.
+"
+
+pkg_pretend() {
+	if use server; then
+		if ! linux_config_exists || ! linux_chkconfig_present NETFILTER_XT_MATCH_COMMENT; then
+			ewarn "fwknopd uses the iptables 'comment' match to expire SPA rules,"
+			ewarn "which is a major security feature and is enabled by default."
+			ewarn "Please either enable NETFILTER_XT_MATCH_COMMENT support in your"
+			ewarn "kernel, or set the appropriate ENABLE_{FIREWD,IPT}_COMMENT_CHECK"
+			ewarn "to 'N' in your fwknopd.conf file."
+		fi
+	fi
+}
+
+src_prepare() {
+	# Install example configs with .example suffix
+	if use server; then
+		sed -i -e 's/conf;/conf.example;/g' "${S}"/Makefile.am || die
+	fi
+
+	autotools-utils_src_prepare
+
+	if use python; then
+		cd "${S}"/python || die
+		distutils-r1_src_prepare
+	fi
+}
+
+src_configure() {
+	local myeconfargs=(
+		--localstatedir=/run
+		--enable-digest-cache
+		$(use_enable client)
+		$(use_enable !gdbm file-cache)
+		$(use_enable server)
+		$(use_enable udp-server)
+		$(use_with gpg gpgme)
+	)
+	use firewalld && myeconfargs+=(--with-firewalld=/usr/sbin/firewalld)
+	use iptables && myeconfargs+=(--with-iptables=/sbin/iptables)
+
+	autotools-utils_src_configure
+}
+
+src_compile() {
+	autotools-utils_src_compile
+
+	if use python; then
+		cd "${S}"/python || die
+		distutils-r1_src_compile
+	fi
+}
+
+src_install() {
+	autotools-utils_src_install
+	prune_libtool_files --modules
+
+	if use server; then
+		newinitd "${FILESDIR}/fwknopd.init" fwknopd
+		newconfd "${FILESDIR}/fwknopd.confd" fwknopd
+		systemd_dounit extras/systemd/fwknopd.service
+		systemd_newtmpfilesd extras/systemd/fwknopd.tmpfiles.conf fwknopd.conf
+		readme.gentoo_create_doc
+	fi
+
+	use extras && dodoc "${S}/extras/apparmor/usr.sbin.fwknopd"
+
+	if use python; then
+		# Unset DOCS since distutils-r1.eclass interferes
+		local DOCS=()
+		cd "${S}"/python || die
+		distutils-r1_src_install
+	fi
+}
+
+pkg_postinst() {
+	use server && readme.gentoo_print_elog
+}
diff --git a/net-firewall/fwknop/metadata.xml b/net-firewall/fwknop/metadata.xml
index 79031c2f7e61..8b1bce7efec2 100644
--- a/net-firewall/fwknop/metadata.xml
+++ b/net-firewall/fwknop/metadata.xml
@@ -8,11 +8,13 @@
 	</maintainer>
 	<use>
 		<flag name="client">Build fwknop client</flag>
-		<flag name="gdbm">Replace file digest-cache with gdbm</flag>
+		<flag name="extras">Install example AppArmor policy for fwknopd server</flag>
+		<flag name="firewalld">Use <pkg>net-firewall/firewalld</pkg> as the default server backend</flag>
+		<flag name="gdbm">Replace file-based digest-cache with gdbm one</flag>
 		<flag name="gpg">Enable GPG support via <pkg>app-crypt/gpgme</pkg></flag>
+		<flag name="iptables">Use <pkg>net-firewall/iptables</pkg> as the default server backend</flag>
 		<flag name="server">Build fwknopd server</flag>
-		<flag name="extras">Install example apparmor policy</flag>
-		<flag name="udp-server">Build fwknopd with UDP server mode only</flag>
+		<flag name="udp-server">Enable UDP server mode only (no <pkg>net-libs/libpcap</pkg> dependency)</flag>
 	</use>
 	<upstream>
 		<remote-id type="github">mrash/fwknop</remote-id>
diff --git a/net-firewall/ufw-frontends/metadata.xml b/net-firewall/ufw-frontends/metadata.xml
index 9558d7412c05..9de1f77c1793 100644
--- a/net-firewall/ufw-frontends/metadata.xml
+++ b/net-firewall/ufw-frontends/metadata.xml
@@ -11,7 +11,12 @@
 	for UFW using PyGTK and PyQt (the latter in early stage of development).</longdescription>
 	<upstream>
 		<remote-id type="google-code">ufw-frontends</remote-id>
+		<remote-id type="github">baudm/ufw-frontends</remote-id>
 	</upstream>
-	<use><flag name="policykit">Use pkexec to gain root privileges</flag></use>
-	<use><flag name="kde">Use kdesu to gain root privileges (note: the flag has lower priority than "policykit")</flag></use>
+	<use>
+		<flag name="policykit">Use pkexec to gain root privileges</flag>
+	</use>
+	<use>
+		<flag name="kde">Use kdesu to gain root privileges (note: the flag has lower priority than "policykit")</flag>
+	</use>
 </pkgmetadata>
diff --git a/net-fs/openafs-kernel/openafs-kernel-1.6.12-r1.ebuild b/net-fs/openafs-kernel/openafs-kernel-1.6.12-r1.ebuild
index f7dd9d55002f..4149075de2ec 100644
--- a/net-fs/openafs-kernel/openafs-kernel-1.6.12-r1.ebuild
+++ b/net-fs/openafs-kernel/openafs-kernel-1.6.12-r1.ebuild
@@ -23,7 +23,7 @@ SRC_URI="
 
 LICENSE="IBM BSD openafs-krb5-a APSL-2"
 SLOT="0"
-KEYWORDS="amd64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE=""
 
 S=${WORKDIR}/${MY_P}
diff --git a/net-fs/openafs/openafs-1.6.12-r1.ebuild b/net-fs/openafs/openafs-1.6.12-r1.ebuild
index e678fa4fb403..97cb687e3fd7 100644
--- a/net-fs/openafs/openafs-1.6.12-r1.ebuild
+++ b/net-fs/openafs/openafs-1.6.12-r1.ebuild
@@ -22,7 +22,7 @@ SRC_URI="
 
 LICENSE="IBM BSD openafs-krb5-a APSL-2"
 SLOT="0"
-KEYWORDS="amd64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 sparc ~x86 ~amd64-linux ~x86-linux"
 
 IUSE="doc kerberos +modules pam"
 
diff --git a/net-fs/samba/Manifest b/net-fs/samba/Manifest
index 269247fa7e4a..fcdecc5adeab 100644
--- a/net-fs/samba/Manifest
+++ b/net-fs/samba/Manifest
@@ -4,5 +4,6 @@ DIST samba-3.6.25.tar.gz 34121828 SHA256 8f2c8a7f2bd89b0dfd228ed917815852f7c625b
 DIST samba-4.0.26.tar.gz 22155521 SHA256 ce2441992c6d18950d752edb2d1274b3f7e056b2e2e8516fc42e408e4a25894a SHA512 0df6f5961b2b6af1a4356540299acae52473f9d4342762d1556c859a36a63a7b8706c94f835581e96ecbf47a2d7fb09b67f93aa3869812215e9661dda7ee1906 WHIRLPOOL fda98da46719e6f4cefa58aef56f4d75120c4386b5e398e9b2ac3aa693255a6bce9606b1bf5646708d96e4f3c8982586501ccdae7c11f223b629ab128d33ae59
 DIST samba-4.1.19.tar.gz 19558250 SHA256 62f23dffacd4faf8ac557f9cf01a1595e39db0bbdd959c4c1890f46155c9f936 SHA512 116f022cfd55506028a14363e084080eeb93257d216958c70991b11f4f8f01195e7174371edcdd2c72cadcb7544c0b0b979d638a7a37600d7bbd0610020f028e WHIRLPOOL dd672fc7cb659f8a80177b6d19187e2557847e802db9b3cd5fd2b708dc78b9a31c675cac80afd3a36789d562a8582155c7ffcbad26b810b621cda08b0395e6c9
 DIST samba-4.1.20.tar.gz 19561057 SHA256 adcf021c2ee7ebdba99ed90bb06e45bcc8e3fd9419667622704276607b832038 SHA512 abdd696bb19ac458f72304208d62c21f0fee5459b9f8c4241e4cd8c1654e07455c0876013236a10296ba7ef72a7fca3de0bb6e1cd9d03817500720fb493b1988 WHIRLPOOL 48302e865be9860db7775ad864e30b4ca4bc30f9e791d529353b67e29bec79a11e1409e4b59a974111171927d73193fec46ae1dc40197e5a72ade775e82cd41d
-DIST samba-4.2.3.tar.gz 20721283 SHA256 b6dfa5ae4818d891ee2fcff04a5912f4a4fb2394b4f5e66a2a15b428da094c7c SHA512 33fd4deb3a9bb6ee7656fb716116f2ff3c65303ce7c13bdf2c4c618ce67e61f1d1fa77c7c29504e4bb4d6c5a094dcc54dc41999864e52ebd521d89a93666383a WHIRLPOOL 0684eae6fa815f3af99646721fd414e57e26966cc30b8c0e12bd8a1e651ac7984855521044b83becfd2beb70c5820d49d3dd1e702bb78109b34ec188b0e43191
+DIST samba-4.2.4.tar.gz 20735687 SHA256 fb326ea486973ab684f183774e93bb943fc231ab89937512e70331b86acdf6ae SHA512 a389fb2540858b778677197f01b5e2aa90c85c28e008d2f8e13a422cbf00a19ce862320b57b8141bd7838f74cbd4641efbe030c0fc2d86058f6584f9f8504d2f WHIRLPOOL 90dffe178647233fc8dec9b9ac15c7864f1700fc2aa739f24e33714e81f04ed364f6837ec95827a8ed6af6c7646e1b0eca83f22eaf196706ad9ea1ef8f425635
+DIST samba-4.3.0.tar.gz 20417699 SHA256 d8dbb6b29dec1d9aa295655c4aa4eadd1e5367ef7047be22f4d6a18ba8acdb63 SHA512 7edad171dd98a332ebfd51c7c380b1def3d1508399755fc2d333671ce4a7d5e73782871c5760341cb71460d3f7fc4b666d906d61b9e2b28f977301d08bc9a872 WHIRLPOOL cd204bb122cc344b63b01aebc151aeb01e533402eb511ba7c440fc718a568f8004f754a4502c74dfd58869e2e22cfd0f9822c2602e3642da5b69d2bdd2b76d39
 DIST smb_traffic_analyzer_v2.diff.bz2 12226 SHA256 1bae7eafbe8ac2382313d5ab9d43d73ba64b63a714f0f588516952d476fb868d SHA512 aa0e457a0dd282e61e6dfcd5705c29b319832dca9711b1b5baf8373e2f079991399c3537c050219ccb861a93f86353ebff677a5c625d2e3f1f3a13ee5c4087d0 WHIRLPOOL 85ee72a360f67ebe71be5cd400ecd635280a0d7c64ebb8b94656a5ef1a94f74a987de86408af00ce1b81cc8363b1b3cf14726860d29b72ee610d4bab73d6b139
diff --git a/net-fs/samba/files/4.3/samba4.confd b/net-fs/samba/files/4.3/samba4.confd
new file mode 100644
index 000000000000..58b2c7827bdf
--- /dev/null
+++ b/net-fs/samba/files/4.3/samba4.confd
@@ -0,0 +1,38 @@
+# Add "winbind" to the daemon_list if you also want winbind to start.
+# Replace "smbd nmbd" by "samba4" if you want the active directory domain controller part or the ntvfs
+# file server part or the rpc proxy to start.
+# Note that samba4 controls 'smbd' by itself, thus it can't be started manually. You can, however,
+# tweak the behaviour of a samba4-controlled smbd by modifying your '/etc/samba/smb.conf' file
+# accordingly.
+daemon_list="smbd nmbd"
+
+#----------------------------------------------------------------------------
+# Daemons calls: <daemon_name>_<command_option>
+#----------------------------------------------------------------------------
+my_service_name="samba"
+my_service_PRE="unset TMP TMPDIR"
+my_service_POST=""
+
+#----------------------------------------------------------------------------
+# Daemons calls: <daemon_name>_<command_option>
+#----------------------------------------------------------------------------
+smbd_start_options="-D"
+smbd_start="start-stop-daemon --start --exec /usr/sbin/smbd -- ${smbd_start_options}"
+smbd_stop="start-stop-daemon --stop --exec /usr/sbin/smbd"
+smbd_reload="killall -HUP smbd"
+
+nmbd_start_options="-D"
+nmbd_start="start-stop-daemon --start --exec /usr/sbin/nmbd -- ${nmbd_start_options}"
+nmbd_stop="start-stop-daemon --stop --exec /usr/sbin/nmbd"
+nmbd_reload="killall -HUP nmbd"
+
+samba4_start_options=""
+samba4_start="start-stop-daemon --start --exec /usr/sbin/samba -- ${samba4_start_options}"
+samba4_stop="start-stop-daemon --stop --exec /usr/sbin/samba"
+samba4_reload="killall -HUP samba"
+
+winbind_start_options=""
+winbind_start="start-stop-daemon --start --exec /usr/sbin/winbindd -- ${winbind_start_options}"
+winbind_stop="start-stop-daemon --stop --exec /usr/sbin/winbindd"
+winbind_reload="killall -HUP winbindd"
+
diff --git a/net-fs/samba/files/4.3/samba4.initd-r1 b/net-fs/samba/files/4.3/samba4.initd-r1
new file mode 100644
index 000000000000..ff42552e5d43
--- /dev/null
+++ b/net-fs/samba/files/4.3/samba4.initd-r1
@@ -0,0 +1,56 @@
+#!/sbin/runscript
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License, v2 or later
+# $Id$
+
+extra_started_commands="reload"
+piddir="/var/run/samba"
+
+depend() {
+	after slapd
+	need net
+	use cupsd
+}
+
+DAEMONNAME="${SVCNAME##samba.}"
+[ "${DAEMONNAME}" != "samba" ] && daemon_list=${DAEMONNAME}
+
+signal_do() {
+	local signal="$1"
+	[ -z "${signal}" ] && return 0
+
+	local result=0 last_result=0 daemon= cmd_exec=
+	for daemon in ${daemon_list} ; do
+		eval cmd_exec=\$${daemon}_${signal}
+		if [ -n "${cmd_exec}" ]; then
+			ebegin "${my_service_name} -> ${signal}: ${daemon}"
+			#echo ${cmd} '->' ${!cmd}
+			${cmd_exec} > /dev/null
+			last_result=$?
+			eend ${last_result}
+		fi
+		result=$(( ${result} + ${last_result} ))
+	done
+	return ${result}
+}
+
+start() {
+	${my_service_PRE}
+	[ -d "${piddir}" ] || mkdir -p "${piddir}"
+	signal_do start && return 0
+
+	eerror "Error: starting services (see system logs)"
+	signal_do stop
+	return 1
+}
+stop() {
+	${my_service_PRE}
+	if signal_do stop ; then
+		${my_service_POST}
+		return 0
+	fi
+}
+reload() {
+	${my_service_PRE}
+	signal_do reload
+}
diff --git a/net-fs/samba/metadata.xml b/net-fs/samba/metadata.xml
index d0c82d3de21f..9c4471915d80 100644
--- a/net-fs/samba/metadata.xml
+++ b/net-fs/samba/metadata.xml
@@ -1,30 +1,33 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>samba</herd>
-<maintainer>
-	<email>samba@gentoo.org</email>
-	<name>Samba Team</name>
-</maintainer>
-<longdescription>
-Samba is an Open Source/Free Software suite that provides seamless file and print services to SMB/CIFS clients. Integration with various accounting and antivirus backends. License: GNU General Public License.
-</longdescription>
-<use>
-	<flag name="ads">Enable Active Directory support</flag>
-	<flag name="swat">Enables support for swat configuration gui</flag>
-	<flag name="winbind">Enables support for the winbind auth daemon</flag>
-        <flag name="client">Enables the client part</flag>
-        <flag name="server">Enables the server part</flag>
-	<flag name="netapi">Enable building of netapi bits</flag>
-	<flag name="addns">Enable AD DNS integration</flag>
-	<flag name="aio">Enable asynchronous IO support</flag>
-	<flag name="cluster">Enable support for clustering</flag>
-	<flag name="dmapi">Enable support for DMAPI. This currently works only in combination with XFS.</flag>
-	<flag name="ldb">Enable the ldb tools</flag>
-	<flag name="quota">Enables support for user quotas</flag>
-	<flag name="smbclient">Enable smbclient tool</flag>
-	<flag name="smbsharemodes">Enable special smb share modes (?) </flag>
-	<flag name="smbtav2">Enable Samba Traffic Analyzer version 2 </flag>
-	<flag name="iprint">Enabling iPrint technology by Novell</flag>
-</use>
+	<herd>samba</herd>
+	<maintainer>
+		<email>samba@gentoo.org</email>
+		<name>Samba Team</name>
+	</maintainer>
+	<longdescription>
+		Samba is an Open Source/Free Software suite that provides seamless file and print services to SMB/CIFS clients. Integration with various accounting and antivirus backends. License: GNU General Public License.
+	</longdescription>
+	<use>
+		<flag name="addc">Enable Active Directory Domain Controller support</flag>
+		<flag name="ads">Enable Active Directory support</flag>
+		<flag name="swat">Enables support for swat configuration gui</flag>
+		<flag name="winbind">Enables support for the winbind auth daemon</flag>
+		<flag name="client">Enables the client part</flag>
+		<flag name="server">Enables the server part</flag>
+		<flag name="netapi">Enable building of netapi bits</flag>
+		<flag name="addns">Enable AD DNS integration</flag>
+		<flag name="aio">Enable asynchronous IO support</flag>
+		<flag name="cluster">Enable support for clustering</flag>
+		<flag name="dmapi">Enable support for DMAPI. This currently works only in combination with XFS.</flag>
+		<flag name="ldb">Enable the ldb tools</flag>
+		<flag name="quota">Enables support for user quotas</flag>
+		<flag name="smbclient">Enable smbclient tool</flag>
+		<flag name="smbsharemodes">Enable special smb share modes (?) </flag>
+		<flag name="smbtav2">Enable Samba Traffic Analyzer version 2 </flag>
+		<flag name="system-mitkrb5">Use <pkg>app-crypt/mit-krb5</pkg> instead of
+			<pkg>app-crypt/heimdal</pkg>.</flag>
+		<flag name="iprint">Enabling iPrint technology by Novell</flag>
+	</use>
 </pkgmetadata>
diff --git a/net-fs/samba/samba-4.2.3-r1.ebuild b/net-fs/samba/samba-4.2.3-r1.ebuild
deleted file mode 100644
index f6aff1b934af..000000000000
--- a/net-fs/samba/samba-4.2.3-r1.ebuild
+++ /dev/null
@@ -1,187 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE='threads(+)'
-
-inherit python-single-r1 waf-utils multilib linux-info systemd eutils
-
-MY_PV="${PV/_rc/rc}"
-MY_P="${PN}-${MY_PV}"
-
-SRC_PATH="stable"
-[[ ${PV} = *_rc* ]] && SRC_PATH="rc"
-
-SRC_URI="mirror://samba/${SRC_PATH}/${MY_P}.tar.gz"
-KEYWORDS="~amd64 ~hppa ~x86"
-[[ ${PV} = *_rc* ]] && KEYWORDS=""
-
-DESCRIPTION="Samba Suite Version 4"
-HOMEPAGE="http://www.samba.org/"
-LICENSE="GPL-3"
-
-SLOT="0"
-
-IUSE="acl addns ads aio avahi client cluster cups dmapi fam gnutls iprint
-ldap quota selinux syslog systemd test winbind"
-
-# sys-apps/attr is an automagic dependency (see bug #489748)
-# sys-libs/pam is an automagic dependency (see bug #489770)
-CDEPEND="${PYTHON_DEPS}
-	>=app-crypt/heimdal-1.5[-ssl]
-	dev-libs/iniparser:0
-	dev-libs/popt
-	sys-libs/readline:=
-	virtual/libiconv
-	dev-python/subunit[${PYTHON_USEDEP}]
-	>=net-libs/socket_wrapper-1.1.2
-	sys-apps/attr
-	sys-libs/libcap
-	>=sys-libs/ldb-1.1.20
-	sys-libs/ncurses:0=
-	>=sys-libs/nss_wrapper-1.0.2
-	>=sys-libs/ntdb-1.0[python,${PYTHON_USEDEP}]
-	>=sys-libs/talloc-2.1.2[python,${PYTHON_USEDEP}]
-	>=sys-libs/tdb-1.3.6[python,${PYTHON_USEDEP}]
-	>=sys-libs/tevent-0.9.25
-	>=sys-libs/uid_wrapper-1.0.1
-	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= )"
-DEPEND="${CDEPEND}
-	virtual/pkgconfig"
-RDEPEND="${CDEPEND}
-	client? ( net-fs/cifs-utils[ads?] )
-	selinux? ( sec-policy/selinux-samba )
-"
-
-REQUIRED_USE="ads? ( acl gnutls ldap )
-	${PYTHON_REQUIRED_USE}"
-
-RESTRICT="mirror"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=( "${FILESDIR}/${PN}-4.2.3-heimdal_compilefix.patch" )
-
-CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)"
-
-WAF_BINARY="${S}/buildtools/bin/waf"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-	if use aio; then
-		if ! linux_config_exists || ! linux_chkconfig_present AIO; then
-				ewarn "You must enable AIO support in your kernel config, "
-				ewarn "to be able to support asynchronous I/O. "
-				ewarn "You can find it at"
-				ewarn
-				ewarn "General Support"
-				ewarn " Enable AIO support "
-				ewarn
-				ewarn "and recompile your kernel..."
-		fi
-	fi
-}
-
-src_prepare() {
-	epatch ${PATCHES[@]}
-}
-
-src_configure() {
-	local myconf=''
-	use "cluster" && myconf+=" --with-ctdb-dir=/usr"
-	use "test" && myconf+=" --enable-selftest"
-	myconf="${myconf} \
-		--enable-fhs \
-		--sysconfdir=/etc \
-		--localstatedir=/var \
-		--with-modulesdir=/usr/$(get_libdir)/samba \
-		--with-pammodulesdir=/$(get_libdir)/security \
-		--with-piddir=/var/run/${PN} \
-		--disable-rpath \
-		--disable-rpath-install \
-		--nopyc \
-		--nopyo \
-		--bundled-libraries=NONE \
-		--builtin-libraries=NONE \
-		$(use_with addns dnsupdate) \
-		$(use_with acl acl-support) \
-		$(use_with ads) \
-		$(use_with aio aio-support) \
-		$(use_enable avahi) \
-		$(use_with cluster cluster-support) \
-		$(use_enable cups) \
-		$(use_with dmapi) \
-		$(use_with fam) \
-		$(use_enable gnutls) \
-		$(use_enable iprint) \
-		$(use_with ldap) \
-		--with-pam \
-		--with-pam_smbpass \
-		$(use_with quota quotas) \
-		$(use_with syslog) \
-		$(use_with systemd) \
-		$(use_with winbind)
-		"
-	use "ads" && myconf+=" --with-shared-modules=idmap_ad"
-
-	CPPFLAGS="-I${SYSROOT}/usr/include/et ${CPPFLAGS}" \
-		waf-utils_src_configure ${myconf}
-}
-
-src_install() {
-	waf-utils_src_install
-
-	# install ldap schema for server (bug #491002)
-	if use ldap ; then
-		insinto /etc/openldap/schema
-		doins examples/LDAP/samba.schema
-	fi
-
-	# Make all .so files executable
-	find "${D}" -type f -name "*.so" -exec chmod +x {} +
-
-	# install example config file
-	insinto /etc/samba
-	doins examples/smb.conf.default
-
-	# Install init script and conf.d file
-	newinitd "${CONFDIR}/samba4.initd-r1" samba
-	newconfd "${CONFDIR}/samba4.confd" samba
-
-	systemd_dotmpfilesd "${FILESDIR}"/samba.conf
-	systemd_dounit "${FILESDIR}"/nmbd.service
-	systemd_dounit "${FILESDIR}"/smbd.{service,socket}
-	systemd_newunit "${FILESDIR}"/smbd_at.service 'smbd@.service'
-	systemd_dounit "${FILESDIR}"/winbindd.service
-	systemd_dounit "${FILESDIR}"/samba.service
-}
-
-src_test() {
-	"${WAF_BINARY}" test || die "test failed"
-}
-
-pkg_postinst() {
-	ewarn "Be aware the this release contains the best of all of Samba's"
-	ewarn "technology parts, both a file server (that you can reasonably expect"
-	ewarn "to upgrade existing Samba 3.x releases to) and the AD domain"
-	ewarn "controller work previously known as 'samba4'."
-
-	elog "For further information and migration steps make sure to read "
-	elog "http://samba.org/samba/history/${P}.html "
-	elog "http://samba.org/samba/history/${PN}-4.2.0.html and"
-	elog "http://wiki.samba.org/index.php/Samba4/HOWTO "
-}
diff --git a/net-fs/samba/samba-4.2.4-r1.ebuild b/net-fs/samba/samba-4.2.4-r1.ebuild
new file mode 100644
index 000000000000..edc4797ee5b6
--- /dev/null
+++ b/net-fs/samba/samba-4.2.4-r1.ebuild
@@ -0,0 +1,197 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE='threads(+)'
+
+inherit python-single-r1 waf-utils multilib linux-info systemd eutils
+
+MY_PV="${PV/_rc/rc}"
+MY_P="${PN}-${MY_PV}"
+
+SRC_PATH="stable"
+[[ ${PV} = *_rc* ]] && SRC_PATH="rc"
+
+SRC_URI="mirror://samba/${SRC_PATH}/${MY_P}.tar.gz"
+KEYWORDS="~amd64 ~x86"
+[[ ${PV} = *_rc* ]] && KEYWORDS=""
+
+DESCRIPTION="Samba Suite Version 4"
+HOMEPAGE="http://www.samba.org/"
+LICENSE="GPL-3"
+
+SLOT="0"
+
+IUSE="acl addc addns ads aio avahi client cluster cups dmapi fam gnutls iprint
+ldap pam quota selinux syslog +system-mitkrb5 systemd test winbind"
+
+# sys-apps/attr is an automagic dependency (see bug #489748)
+# sys-libs/pam is an automagic dependency (see bug #489770)
+CDEPEND="${PYTHON_DEPS}
+	dev-libs/iniparser:0
+	dev-libs/popt
+	sys-libs/readline:=
+	virtual/libiconv
+	dev-python/subunit[${PYTHON_USEDEP}]
+	>=net-libs/socket_wrapper-1.1.2
+	sys-apps/attr
+	sys-libs/libcap
+	>=sys-libs/ldb-1.1.20
+	sys-libs/ncurses:0=
+	>=sys-libs/nss_wrapper-1.0.2
+	>=sys-libs/ntdb-1.0[python,${PYTHON_USEDEP}]
+	>=sys-libs/talloc-2.1.2[python,${PYTHON_USEDEP}]
+	>=sys-libs/tdb-1.3.6[python,${PYTHON_USEDEP}]
+	>=sys-libs/tevent-0.9.25
+	>=sys-libs/uid_wrapper-1.0.1
+	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 )
+	system-mitkrb5? ( app-crypt/mit-krb5 )
+	!system-mitkrb5? ( >=app-crypt/heimdal-1.5[-ssl] )
+	systemd? ( sys-apps/systemd:0= )"
+DEPEND="${CDEPEND}
+	virtual/pkgconfig"
+RDEPEND="${CDEPEND}
+	client? ( net-fs/cifs-utils[ads?] )
+	selinux? ( sec-policy/selinux-samba )
+"
+
+REQUIRED_USE="addc? ( gnutls )
+	ads? ( acl gnutls ldap )
+	${PYTHON_REQUIRED_USE}"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=( "${FILESDIR}/${PN}-4.2.3-heimdal_compilefix.patch" )
+
+CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)"
+
+WAF_BINARY="${S}/buildtools/bin/waf"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+	if use aio ; then
+		if ! linux_config_exists || ! linux_chkconfig_present AIO; then
+				ewarn "You must enable AIO support in your kernel config, "
+				ewarn "to be able to support asynchronous I/O. "
+				ewarn "You can find it at"
+				ewarn
+				ewarn "General Support"
+				ewarn " Enable AIO support "
+				ewarn
+				ewarn "and recompile your kernel..."
+		fi
+	fi
+	if ! use pam ; then
+		ewarn "You have pam USE flag disabled!"
+		ewarn "Unfortunately we still have to hard depend on virtual/pam as samba upstream"
+		ewarn "still unconditionally links libauth4-samba4.so library to libpam.so once being"
+		ewarn "found on the sytem."
+		ewarn "Disabling the pam USE flag only disables installation of samba's pam authenti-"
+		ewarn "cation modules."
+	fi
+}
+
+src_prepare() {
+	epatch ${PATCHES[@]}
+}
+
+src_configure() {
+	local myconf=()
+	myconf=(
+		--enable-fhs
+		--sysconfdir=/etc
+		--localstatedir=/var
+		--with-modulesdir=/usr/$(get_libdir)/samba
+		--with-piddir=/var/run/${PN}
+		--bundled-libraries=NONE
+		--builtin-libraries=NONE
+		--disable-rpath
+		--disable-rpath-install
+		--nopyc
+		--nopyo
+		$(use_with acl acl-support)
+		$(usex addc '' '--without-ad-dc')
+		$(use_with addns dnsupdate)
+		$(use_with ads)
+		$(usex ads '--with-shared-modules=idmap_ad' '')
+		$(use_with aio aio-support)
+		$(usex cluster '--with-ctdb-dir=/usr' '')
+		$(use_enable avahi)
+		$(use_with cluster cluster-support)
+		$(use_enable cups)
+		$(use_with dmapi)
+		$(use_with fam)
+		$(use_enable gnutls)
+		$(use_enable iprint)
+		$(use_with ldap)
+		$(use_with pam)
+		$(use_with pam pam_smbpass)
+		$(usex pam "--with-pammodulesdir=/$(get_libdir)/security" '')
+		$(use_with quota quotas)
+		$(use_with syslog)
+		$(use_with systemd)
+		$(usex system-mitkrb5 '--with-system-mitkrb5' '')
+		$(use_with winbind)
+		$(usex test '--enable-selftest' '')
+	)
+
+	CPPFLAGS="-I${SYSROOT}/usr/include/et ${CPPFLAGS}" \
+		waf-utils_src_configure ${myconf[@]}
+}
+
+src_install() {
+	waf-utils_src_install
+
+	# install ldap schema for server (bug #491002)
+	if use ldap ; then
+		insinto /etc/openldap/schema
+		doins examples/LDAP/samba.schema
+	fi
+
+	# Make all .so files executable
+	find "${D}" -type f -name "*.so" -exec chmod +x {} +
+
+	# install example config file
+	insinto /etc/samba
+	doins examples/smb.conf.default
+
+	# Install init script and conf.d file
+	newinitd "${CONFDIR}/samba4.initd-r1" samba
+	newconfd "${CONFDIR}/samba4.confd" samba
+
+	systemd_dotmpfilesd "${FILESDIR}"/samba.conf
+	systemd_dounit "${FILESDIR}"/nmbd.service
+	systemd_dounit "${FILESDIR}"/smbd.{service,socket}
+	systemd_newunit "${FILESDIR}"/smbd_at.service 'smbd@.service'
+	systemd_dounit "${FILESDIR}"/winbindd.service
+	systemd_dounit "${FILESDIR}"/samba.service
+}
+
+src_test() {
+	"${WAF_BINARY}" test || die "test failed"
+}
+
+pkg_postinst() {
+	ewarn "Be aware the this release contains the best of all of Samba's"
+	ewarn "technology parts, both a file server (that you can reasonably expect"
+	ewarn "to upgrade existing Samba 3.x releases to) and the AD domain"
+	ewarn "controller work previously known as 'samba4'."
+
+	elog "For further information and migration steps make sure to read "
+	elog "http://samba.org/samba/history/${P}.html "
+	elog "http://samba.org/samba/history/${PN}-4.2.0.html and"
+	elog "http://wiki.samba.org/index.php/Samba4/HOWTO "
+}
diff --git a/net-fs/samba/samba-4.3.0.ebuild b/net-fs/samba/samba-4.3.0.ebuild
new file mode 100644
index 000000000000..1875ddbb1d74
--- /dev/null
+++ b/net-fs/samba/samba-4.3.0.ebuild
@@ -0,0 +1,196 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE='threads(+)'
+
+inherit python-single-r1 waf-utils multilib linux-info systemd eutils
+
+MY_PV="${PV/_rc/rc}"
+MY_P="${PN}-${MY_PV}"
+
+SRC_PATH="stable"
+[[ ${PV} = *_rc* ]] && SRC_PATH="rc"
+
+SRC_URI="mirror://samba/${SRC_PATH}/${MY_P}.tar.gz"
+KEYWORDS="~amd64 ~x86"
+[[ ${PV} = *_rc* ]] && KEYWORDS=""
+
+DESCRIPTION="Samba Suite Version 4"
+HOMEPAGE="http://www.samba.org/"
+LICENSE="GPL-3"
+
+SLOT="0"
+
+IUSE="acl addc addns ads aio avahi client cluster cups dmapi fam gnutls iprint
+ldap pam quota selinux syslog +system-mitkrb5 systemd test winbind"
+
+# sys-apps/attr is an automagic dependency (see bug #489748)
+# sys-libs/pam is an automagic dependency (see bug #489770)
+CDEPEND="${PYTHON_DEPS}
+	dev-libs/iniparser:0
+	dev-libs/popt
+	sys-libs/readline:=
+	virtual/libiconv
+	dev-python/subunit[${PYTHON_USEDEP}]
+	>=net-libs/socket_wrapper-1.1.2
+	sys-apps/attr
+	sys-libs/libcap
+	>=sys-libs/ldb-1.1.20
+	sys-libs/ncurses:0=
+	>=sys-libs/nss_wrapper-1.0.2
+	>=sys-libs/talloc-2.1.2[python,${PYTHON_USEDEP}]
+	>=sys-libs/tdb-1.3.6[python,${PYTHON_USEDEP}]
+	>=sys-libs/tevent-0.9.25
+	>=sys-libs/uid_wrapper-1.0.1
+	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 )
+	system-mitkrb5? ( app-crypt/mit-krb5 )
+	!system-mitkrb5? ( >=app-crypt/heimdal-1.5[-ssl] )
+	systemd? ( sys-apps/systemd:0= )"
+DEPEND="${CDEPEND}
+	virtual/pkgconfig"
+RDEPEND="${CDEPEND}
+	client? ( net-fs/cifs-utils[ads?] )
+	selinux? ( sec-policy/selinux-samba )
+"
+
+REQUIRED_USE="addc? ( gnutls )
+	ads? ( acl gnutls ldap )
+	${PYTHON_REQUIRED_USE}"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=( "${FILESDIR}/${PN}-4.2.3-heimdal_compilefix.patch" )
+
+CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)"
+
+WAF_BINARY="${S}/buildtools/bin/waf"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+	if use aio ; then
+		if ! linux_config_exists || ! linux_chkconfig_present AIO; then
+				ewarn "You must enable AIO support in your kernel config, "
+				ewarn "to be able to support asynchronous I/O. "
+				ewarn "You can find it at"
+				ewarn
+				ewarn "General Support"
+				ewarn " Enable AIO support "
+				ewarn
+				ewarn "and recompile your kernel..."
+		fi
+	fi
+	if ! use pam ; then
+		ewarn "You have pam USE flag disabled!"
+		ewarn "Unfortunately we still have to hard depend on virtual/pam as samba upstream"
+		ewarn "still unconditionally links libauth4-samba4.so library to libpam.so once being"
+		ewarn "found on the sytem."
+		ewarn "Disabling the pam USE flag only disables installation of samba's pam authenti-"
+		ewarn "cation modules."
+	fi
+}
+
+src_prepare() {
+	epatch ${PATCHES[@]}
+}
+
+src_configure() {
+	local myconf=()
+	myconf=(
+		--enable-fhs
+		--sysconfdir=/etc
+		--localstatedir=/var
+		--with-modulesdir=/usr/$(get_libdir)/samba
+		--with-piddir=/var/run/${PN}
+		--bundled-libraries=NONE
+		--builtin-libraries=NONE
+		--disable-rpath
+		--disable-rpath-install
+		--nopyc
+		--nopyo
+		$(use_with acl acl-support)
+		$(usex addc '' '--without-ad-dc')
+		$(use_with addns dnsupdate)
+		$(use_with ads)
+		$(usex ads '--with-shared-modules=idmap_ad' '')
+		$(use_with aio aio-support)
+		$(usex cluster '--with-ctdb-dir=/usr' '')
+		$(use_enable avahi)
+		$(use_with cluster cluster-support)
+		$(use_enable cups)
+		$(use_with dmapi)
+		$(use_with fam)
+		$(use_enable gnutls)
+		$(use_enable iprint)
+		$(use_with ldap)
+		$(use_with pam)
+		$(use_with pam pam_smbpass)
+		$(usex pam "--with-pammodulesdir=/$(get_libdir)/security" '')
+		$(use_with quota quotas)
+		$(use_with syslog)
+		$(use_with systemd)
+		$(usex system-mitkrb5 '--with-system-mitkrb5' '')
+		$(use_with winbind)
+		$(usex test '--enable-selftest' '')
+	)
+
+	CPPFLAGS="-I${SYSROOT}/usr/include/et ${CPPFLAGS}" \
+		waf-utils_src_configure ${myconf[@]}
+}
+
+src_install() {
+	waf-utils_src_install
+
+	# install ldap schema for server (bug #491002)
+	if use ldap ; then
+		insinto /etc/openldap/schema
+		doins examples/LDAP/samba.schema
+	fi
+
+	# Make all .so files executable
+	find "${D}" -type f -name "*.so" -exec chmod +x {} +
+
+	# install example config file
+	insinto /etc/samba
+	doins examples/smb.conf.default
+
+	# Install init script and conf.d file
+	newinitd "${CONFDIR}/samba4.initd-r1" samba
+	newconfd "${CONFDIR}/samba4.confd" samba
+
+	systemd_dotmpfilesd "${FILESDIR}"/samba.conf
+	systemd_dounit "${FILESDIR}"/nmbd.service
+	systemd_dounit "${FILESDIR}"/smbd.{service,socket}
+	systemd_newunit "${FILESDIR}"/smbd_at.service 'smbd@.service'
+	systemd_dounit "${FILESDIR}"/winbindd.service
+	systemd_dounit "${FILESDIR}"/samba.service
+}
+
+src_test() {
+	"${WAF_BINARY}" test || die "test failed"
+}
+
+pkg_postinst() {
+	ewarn "Be aware the this release contains the best of all of Samba's"
+	ewarn "technology parts, both a file server (that you can reasonably expect"
+	ewarn "to upgrade existing Samba 3.x releases to) and the AD domain"
+	ewarn "controller work previously known as 'samba4'."
+
+	elog "For further information and migration steps make sure to read "
+	elog "http://samba.org/samba/history/${P}.html "
+	elog "http://samba.org/samba/history/${PN}-4.2.0.html and"
+	elog "http://wiki.samba.org/index.php/Samba4/HOWTO "
+}
diff --git a/net-ftp/filezilla/filezilla-3.13.0.ebuild b/net-ftp/filezilla/filezilla-3.13.0.ebuild
index 2678ed5a89df..876c91f75fc8 100644
--- a/net-ftp/filezilla/filezilla-3.13.0.ebuild
+++ b/net-ftp/filezilla/filezilla-3.13.0.ebuild
@@ -56,7 +56,7 @@ src_prepare() {
 }
 
 src_configure() {
-	# Does not build with system pugixml, use builtin for now
+	# system pugixml lacks long long ops support, use builtin for now
 	econf $(use_with dbus) $(use_enable nls locales) \
 		--with-pugixml=builtin \
 		--disable-autoupdatecheck
diff --git a/net-ftp/filezilla/filezilla-3.13.1.ebuild b/net-ftp/filezilla/filezilla-3.13.1.ebuild
index 63a9ecbc7909..00bfe84cb651 100644
--- a/net-ftp/filezilla/filezilla-3.13.1.ebuild
+++ b/net-ftp/filezilla/filezilla-3.13.1.ebuild
@@ -53,7 +53,7 @@ src_prepare() {
 }
 
 src_configure() {
-	# Does not build with system pugixml, use builtin for now
+	# system pugixml lacks long long ops support, use builtin for now
 	econf $(use_with dbus) $(use_enable nls locales) \
 		--with-pugixml=builtin \
 		--disable-autoupdatecheck
diff --git a/net-im/psi/psi-0.15.ebuild b/net-im/psi/psi-0.15.ebuild
index 25521bd495c9..372a13d846e3 100644
--- a/net-im/psi/psi-0.15.ebuild
+++ b/net-im/psi/psi-0.15.ebuild
@@ -18,7 +18,7 @@ done
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm hppa ~ppc ~ppc64 x86 ~x86-fbsd"
+KEYWORDS="amd64 ~arm hppa ppc ~ppc64 x86 ~x86-fbsd"
 IUSE="crypt dbus debug doc jingle spell ssl xscreensaver whiteboarding"
 RESTRICT="test"
 
diff --git a/net-irc/anope/anope-1.8.7-r1.ebuild b/net-irc/anope/anope-1.8.7-r1.ebuild
deleted file mode 100644
index 95b969e5687a..000000000000
--- a/net-irc/anope/anope-1.8.7-r1.ebuild
+++ /dev/null
@@ -1,120 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-inherit autotools eutils multilib versionator user
-
-DESCRIPTION="Anope IRC Services"
-HOMEPAGE="http://www.anope.org"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="mysql"
-
-DEPEND="mysql? ( virtual/mysql )"
-RDEPEND="${DEPEND}"
-
-pkg_pretend() {
-	local replaced_version
-	for replaced_version in ${REPLACING_VERSIONS} ; do
-		if ! version_is_at_least 1.8.7 ${replaced_version} && [[ -f ${ROOT}opt/anope/data/nick.db ]]; then
-			eerror "It looks like you have an older version of Anope installed."
-			eerror "To upgrade, shut down Anope and copy your databases to"
-			eerror "${ROOT}var/lib/anope and your configuration to ${ROOT}etc/anope"
-			eerror "You can do this by:"
-			eerror "# mkdir -p ${ROOT}var/lib/anope ${ROOT}etc/anope"
-			eerror "# chown anope:anope ${ROOT}var/lib/anope"
-			eerror "# mv ${ROOT}opt/anope/data/*.db ${ROOT}var/lib/anope"
-			eerror "# mv ${ROOT}opt/anope/data/services.conf ${ROOT}etc/anope"
-			die "Please move your anope database files from /opt/anope/data"
-		fi
-	done
-}
-
-pkg_setup() {
-	enewgroup anope
-	enewuser anope -1 -1 -1 anope
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/pid-patch.diff"
-	epatch "${FILESDIR}/${P}-ldflags-fix.patch"
-	epatch "${FILESDIR}/${P}-libdir-gentoo.patch"
-	epatch "${FILESDIR}"/${P}-mariadb.patch # bug 381119
-	eautoconf
-}
-
-src_configure() {
-	local myconf
-	if ! use mysql; then
-		myconf="${myconf} --without-mysql"
-	fi
-
-	econf \
-		${myconf} \
-		--with-bindir=/usr/bin/ \
-		--with-datadir=/var/lib/anope \
-		--with-libdir=/usr/$(get_libdir)/anope/ \
-		--with-rungroup=anope \
-		--with-permissions=077
-
-	sed -i -e "/^build:/s:$: language:g" "${S}"/Makefile || die "sed failed"
-}
-
-src_install() {
-	keepdir /var/log/anope /var/lib/anope/backups
-	fowners anope:anope /var/{lib,log}/anope /var/lib/anope/backups
-
-	local baselibdir
-	baselibdir="${D}/usr/$(get_libdir)/anope"
-
-	dodir /usr/$(get_libdir)/anope/{lang,modules}
-	emake DATDEST="${baselibdir}" \
-		BINDEST="${D}/usr/bin" \
-		MODULE_PATH="${baselibdir}/modules" \
-		install
-
-	newinitd "${FILESDIR}/anope-init.d" anope
-	newconfd "${FILESDIR}/anope-conf.d" anope
-
-	dodoc Changes Changes.conf Changes.lang Changes.mysql docs/* data/example.conf
-	use mysql && dodoc data/tables.sql
-
-	insinto /etc/anope
-	newins data/example.conf services.conf
-}
-
-pkg_preinst() {
-	if has_version net-irc/anope ; then
-		local directory
-		directory="${ROOT}"var/lib/anope/pre-update
-		elog "Making a backup of your databases to ${directory}"
-		if [ ! -d "${directory}" ]; then
-			mkdir -p "${directory}" || die "failed to create backup directory"
-			chown anope:anope "${directory}"/../ || die "failed to chown data directory"
-		fi
-		# don't die otherwise merge will fail if there are no existing databases
-		cp "${ROOT}"/var/lib/anope/*.db "${directory}"
-	fi
-}
-
-pkg_postinst() {
-	echo
-	ewarn "Anope won't run out of the box, you still have to configure it to match your IRCD's configuration."
-	ewarn "Edit /etc/anope/services.conf to configure Anope."
-
-	if use mysql; then
-		echo
-		ewarn "!!! ATTENTION !!!"
-		ewarn "Be sure to read Changes.mysql to update your MySQL"
-		ewarn "tables or anope will break after restart"
-		ewarn "!!! ATTENTION !!!"
-		echo
-		einfo "The mysql script for updating the tables is located in the"
-		einfo "/usr/share/doc/${PF} directory"
-	fi
-}
diff --git a/net-irc/anope/anope-1.8.7-r2.ebuild b/net-irc/anope/anope-1.8.7-r2.ebuild
new file mode 100644
index 000000000000..9f0afbc2cc90
--- /dev/null
+++ b/net-irc/anope/anope-1.8.7-r2.ebuild
@@ -0,0 +1,120 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+inherit autotools eutils multilib versionator user
+
+DESCRIPTION="Anope IRC Services"
+HOMEPAGE="http://www.anope.org"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="mysql"
+
+DEPEND="mysql? ( virtual/mysql )"
+RDEPEND="${DEPEND}"
+
+pkg_pretend() {
+	local replaced_version
+	for replaced_version in ${REPLACING_VERSIONS} ; do
+		if ! version_is_at_least 1.8.7 ${replaced_version} && [[ -f ${ROOT}opt/anope/data/nick.db ]]; then
+			eerror "It looks like you have an older version of Anope installed."
+			eerror "To upgrade, shut down Anope and copy your databases to"
+			eerror "${ROOT}var/lib/anope and your configuration to ${ROOT}etc/anope"
+			eerror "You can do this by:"
+			eerror "# mkdir -p ${ROOT}var/lib/anope ${ROOT}etc/anope"
+			eerror "# chown anope:anope ${ROOT}var/lib/anope"
+			eerror "# mv ${ROOT}opt/anope/data/*.db ${ROOT}var/lib/anope"
+			eerror "# mv ${ROOT}opt/anope/data/services.conf ${ROOT}etc/anope"
+			die "Please move your anope database files from /opt/anope/data"
+		fi
+	done
+}
+
+pkg_setup() {
+	enewgroup anope
+	enewuser anope -1 -1 -1 anope
+}
+
+src_prepare() {
+	epatch "${FILESDIR}/pid-patch.diff"
+	epatch "${FILESDIR}/${P}-ldflags-fix.patch"
+	epatch "${FILESDIR}/${P}-libdir-gentoo.patch"
+	epatch "${FILESDIR}"/${P}-mariadb.patch # bug 381119
+	eautoconf
+}
+
+src_configure() {
+	local myconf
+	if ! use mysql; then
+		myconf="${myconf} --without-mysql"
+	fi
+
+	econf \
+		${myconf} \
+		--with-bindir=/usr/bin/ \
+		--with-datadir=/var/lib/anope \
+		--with-libdir=/usr/$(get_libdir)/anope/ \
+		--with-rungroup=anope \
+		--with-permissions=077
+
+	sed -i -e "/^build:/s:$: language:g" "${S}"/Makefile || die "sed failed"
+}
+
+src_install() {
+	keepdir /var/log/anope /var/lib/anope/backups
+	fowners anope:anope /var/{lib,log}/anope /var/lib/anope/backups
+
+	local baselibdir
+	baselibdir="${D}/usr/$(get_libdir)/anope"
+
+	dodir /usr/$(get_libdir)/anope/{lang,modules}
+	emake DATDEST="${baselibdir}" \
+		BINDEST="${D}/usr/bin" \
+		MODULE_PATH="${baselibdir}/modules" \
+		install
+
+	newinitd "${FILESDIR}/anope-init.d" anope
+	newconfd "${FILESDIR}/anope-conf.d" anope
+
+	dodoc Changes Changes.conf Changes.lang Changes.mysql docs/* data/example.conf
+	use mysql && dodoc data/tables.sql
+
+	insinto /etc/anope
+	newins data/example.conf services.conf
+}
+
+pkg_preinst() {
+	if has_version net-irc/anope ; then
+		local directory
+		directory="${ROOT}"var/lib/anope/pre-update
+		elog "Making a backup of your databases to ${directory}"
+		if [ ! -d "${directory}" ]; then
+			mkdir -p "${directory}" || die "failed to create backup directory"
+			chown anope:anope "${directory}"/../ || die "failed to chown data directory"
+		fi
+		# don't die otherwise merge will fail if there are no existing databases
+		cp "${ROOT}"/var/lib/anope/*.db "${directory}"
+	fi
+}
+
+pkg_postinst() {
+	echo
+	ewarn "Anope won't run out of the box, you still have to configure it to match your IRCD's configuration."
+	ewarn "Edit /etc/anope/services.conf to configure Anope."
+
+	if use mysql; then
+		echo
+		ewarn "!!! ATTENTION !!!"
+		ewarn "Be sure to read Changes.mysql to update your MySQL"
+		ewarn "tables or anope will break after restart"
+		ewarn "!!! ATTENTION !!!"
+		echo
+		einfo "The mysql script for updating the tables is located in the"
+		einfo "/usr/share/doc/${PF} directory"
+	fi
+}
diff --git a/net-irc/anope/files/anope-init.d b/net-irc/anope/files/anope-init.d
index 6523007e93e5..f8d73c67eadc 100644
--- a/net-irc/anope/files/anope-init.d
+++ b/net-irc/anope/files/anope-init.d
@@ -7,6 +7,10 @@ PIDFILE=/run/anope/services.pid
 
 extra_started_commands="reload"
 
+depend() {
+	use ircd
+}
+
 start_pre() {
 	checkpath -o ${ANOPE_USER} -d "$(dirname $PIDFILE)"
 }
diff --git a/net-irc/polari/polari-3.16.1.ebuild b/net-irc/polari/polari-3.16.1.ebuild
index 1cf25198dd8e..effc63c51fb9 100644
--- a/net-irc/polari/polari-3.16.1.ebuild
+++ b/net-irc/polari/polari-3.16.1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Polari"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64 ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/net-libs/courier-authlib/courier-authlib-0.66.3.ebuild b/net-libs/courier-authlib/courier-authlib-0.66.3.ebuild
index eaccece8c04a..1f5e440cdb8e 100644
--- a/net-libs/courier-authlib/courier-authlib-0.66.3.ebuild
+++ b/net-libs/courier-authlib/courier-authlib-0.66.3.ebuild
@@ -5,7 +5,7 @@
 EAPI=5
 inherit eutils flag-o-matic multilib user
 
-KEYWORDS="alpha amd64 ~arm hppa ia64 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"
 
 DESCRIPTION="Courier authentication library"
 SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
diff --git a/net-libs/courier-unicode/courier-unicode-1.3.ebuild b/net-libs/courier-unicode/courier-unicode-1.3.ebuild
index 7d40f2082b9e..c72b5a45fc17 100644
--- a/net-libs/courier-unicode/courier-unicode-1.3.ebuild
+++ b/net-libs/courier-unicode/courier-unicode-1.3.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="http://www.courier-mta.org/"
 SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 sparc x86"
 IUSE=""
 
 src_install() {
diff --git a/net-libs/dleyna-connector-dbus/dleyna-connector-dbus-0.2.0.ebuild b/net-libs/dleyna-connector-dbus/dleyna-connector-dbus-0.2.0.ebuild
index 26a45db53e0f..8ab59f0c2ecc 100644
--- a/net-libs/dleyna-connector-dbus/dleyna-connector-dbus-0.2.0.ebuild
+++ b/net-libs/dleyna-connector-dbus/dleyna-connector-dbus-0.2.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://01.org/sites/default/files/downloads/dleyna/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="1.0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE=""
 
 RDEPEND="
diff --git a/net-libs/dleyna-core/dleyna-core-0.5.0.ebuild b/net-libs/dleyna-core/dleyna-core-0.5.0.ebuild
index 351f5b4088f1..e6a26d07898e 100644
--- a/net-libs/dleyna-core/dleyna-core-0.5.0.ebuild
+++ b/net-libs/dleyna-core/dleyna-core-0.5.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://01.org/sites/default/files/downloads/dleyna/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="1.0/4"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE=""
 
 RDEPEND="
diff --git a/net-libs/dleyna-renderer/dleyna-renderer-0.5.0.ebuild b/net-libs/dleyna-renderer/dleyna-renderer-0.5.0.ebuild
index 8412252d3935..d0a184445308 100644
--- a/net-libs/dleyna-renderer/dleyna-renderer-0.5.0.ebuild
+++ b/net-libs/dleyna-renderer/dleyna-renderer-0.5.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://01.org/sites/default/files/downloads/dleyna/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE=""
 
 COMMON_DEPEND="
diff --git a/net-libs/glib-networking/glib-networking-2.44.0.ebuild b/net-libs/glib-networking/glib-networking-2.44.0.ebuild
index 5819a055e291..b66817d63741 100644
--- a/net-libs/glib-networking/glib-networking-2.44.0.ebuild
+++ b/net-libs/glib-networking/glib-networking-2.44.0.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://git.gnome.org/browse/glib-networking/"
 LICENSE="LGPL-2+"
 SLOT="0"
 IUSE="+gnome +libproxy smartcard +ssl test"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 
 RDEPEND="
 	>=dev-libs/glib-2.39.1:2[${MULTILIB_USEDEP}]
diff --git a/net-libs/gnome-online-accounts/gnome-online-accounts-3.16.3-r1.ebuild b/net-libs/gnome-online-accounts/gnome-online-accounts-3.16.3-r1.ebuild
index a341946a608b..ceb8193dd43c 100644
--- a/net-libs/gnome-online-accounts/gnome-online-accounts-3.16.3-r1.ebuild
+++ b/net-libs/gnome-online-accounts/gnome-online-accounts-3.16.3-r1.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/GnomeOnlineAccounts"
 LICENSE="LGPL-2+"
 SLOT="0/1"
 IUSE="gnome +introspection kerberos" # telepathy"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 
 # pango used in goaeditablelabel
 # libsoup used in goaoauthprovider
diff --git a/net-libs/gnutls/gnutls-3.3.17.1.ebuild b/net-libs/gnutls/gnutls-3.3.17.1.ebuild
index 3b750d5a45c2..855524909a70 100644
--- a/net-libs/gnutls/gnutls-3.3.17.1.ebuild
+++ b/net-libs/gnutls/gnutls-3.3.17.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://gnupg/gnutls/v$(get_version_component_range 1-2)/${P}.tar.xz"
 # soon to be relicensed as LGPL-2.1 unless heartbeat extension enabled.
 LICENSE="GPL-3 LGPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE_LINGUAS=" en cs de fi fr it ms nl pl sv uk vi zh_CN"
 IUSE="+cxx +crywrap dane doc examples guile nls +openssl pkcs11 static-libs test zlib ${IUSE_LINGUAS// / linguas_}"
 # heartbeat support is not disabled until re-licensing happens fullyf
diff --git a/net-libs/libbtbb/Manifest b/net-libs/libbtbb/Manifest
index 66ade0f2b863..a6cf8153f101 100644
--- a/net-libs/libbtbb/Manifest
+++ b/net-libs/libbtbb/Manifest
@@ -1 +1 @@
-DIST libbtbb-2014-02-R4.tar.gz 165417 SHA256 6e79a2d8530596e34ad13fcce43dcf8b30b165d4629d5bf9c3eb7f8817980524 SHA512 9ab5ca45f9a88c78f8238c73eabbd04c69723e4ac9171551e3e073eff06acd5ad4197ea4f87036ae066aebb0d15705249899d2b7475e56bd224c83df6f0bd8d5 WHIRLPOOL 30fdc8948f5d1dd057887369f12a5660b1faabe14933ad876c00161fbd43dcebc80f512e370d4b8f56525a8bdcad057a4da8c545814276a65a691bb8e85383fb
+DIST libbtbb-2015-09-R2.tar.gz 222045 SHA256 35ce44636649163f0d9a4de5905f686470f54c79b408959760db8c8182853161 SHA512 e300ec09de34644a0cd2f4aba2fe0b03021aaa0b0fe5035022f1e698ff10867adfd84850d0d40e9c070fbd622efee1b614221c1f5b1818f1d4f5d58cc3f31919 WHIRLPOOL 99d8c621b263cd3cd82e423eabff21d4979b0407c31430aa26424d273c9e3ed802e68833e3a100588a46a9a2126a84d0be56e41c1b609ea2eed4a3d64203c995
diff --git a/net-libs/libbtbb/libbtbb-2014.02.4.ebuild b/net-libs/libbtbb/libbtbb-2014.02.4.ebuild
deleted file mode 100644
index 5ad431a258ac..000000000000
--- a/net-libs/libbtbb/libbtbb-2014.02.4.ebuild
+++ /dev/null
@@ -1,130 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit multilib cmake-utils
-
-DESCRIPTION="A library to decode Bluetooth baseband packets"
-HOMEPAGE="http://libbtbb.sourceforge.net/"
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/greatscottgadgets/libbtbb.git"
-	inherit git-r3
-	KEYWORDS=""
-else
-	MY_PV=${PV/\./-}
-	MY_PV=${MY_PV/./-R}
-	S=${WORKDIR}/${PN}-${MY_PV}
-	SRC_URI="https://github.com/greatscottgadgets/${PN}/archive/${MY_PV}.tar.gz -> ${PN}-${MY_PV}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0/${PV}"
-IUSE="+pcap +wireshark-plugins"
-
-RDEPEND="
-	wireshark-plugins? (
-		>=net-analyzer/wireshark-1.8.3-r1:=
-	)
-"
-DEPEND="${RDEPEND}
-	wireshark-plugins? ( dev-libs/glib
-			virtual/pkgconfig )"
-
-get_PV() { local pv=$(best_version $1); pv=${pv#$1-}; pv=${pv%-r*}; pv=${pv//_}; echo ${pv}; }
-
-which_plugins() {
-	if has_version '>=net-analyzer/wireshark-1.12.0'; then
-		plugins="btbb"
-	elif has_version '<net-analyzer/wireshark-1.12.0'; then
-		plugins="btbb btle btsm"
-	fi
-}
-
-src_prepare(){
-	CMAKE_USE_DIR="${S}"
-	BUILD_DIR="${S}"_build
-	cmake-utils_src_prepare
-
-	if use wireshark-plugins; then
-		which_plugins
-		for i in ${plugins}
-		do
-			sed -i 's#column_info#packet#' wireshark/plugins/${i}/cmake/FindWireshark.cmake || die
-			CMAKE_USE_DIR="${S}"/wireshark/plugins/${i}
-			BUILD_DIR="${WORKDIR}"/${i}_build
-			cmake-utils_src_prepare
-		done
-	fi
-}
-
-src_configure() {
-	CMAKE_USE_DIR="${S}"
-	BUILD_DIR="${S}"_build
-	local mycmakeargs=(
-	-DDISABLE_PYTHON=true
-	-DPACKAGE_MANAGER=true
-	$(cmake-utils_use pcap PCAPDUMP)
-	)
-	cmake-utils_src_configure
-
-	if use wireshark-plugins; then
-		for i in ${plugins}
-		do
-			CMAKE_USE_DIR="${S}"/wireshark/plugins/${i}
-			BUILD_DIR="${WORKDIR}"/${i}_build
-			local mycmakeargs=(
-			-DCMAKE_INSTALL_LIBDIR="/usr/$(get_libdir)/wireshark/plugins/$(get_PV net-analyzer/wireshark)"
-			)
-			cmake-utils_src_configure
-		done
-	fi
-}
-
-src_compile(){
-	CMAKE_USE_DIR="${S}"
-	BUILD_DIR="${S}"_build
-	cmake-utils_src_compile
-
-	if use wireshark-plugins; then
-		for i in ${plugins}
-		do
-			CMAKE_USE_DIR="${S}"/wireshark/plugins/${i}
-			BUILD_DIR="${WORKDIR}"/${i}_build
-			cmake-utils_src_compile
-		done
-	fi
-}
-
-src_test(){
-	CMAKE_USE_DIR="${S}"
-	BUILD_DIR="${S}"_build
-	cmake-utils_src_test
-
-	if use wireshark-plugins; then
-		for i in ${plugins}
-		do
-			CMAKE_USE_DIR="${S}"/wireshark/plugins/${i}
-			BUILD_DIR="${WORKDIR}"/${i}_build
-			cmake-utils_src_test
-		done
-	fi
-}
-
-src_install(){
-	CMAKE_USE_DIR="${S}"
-	BUILD_DIR="${S}"_build
-	cmake-utils_src_install
-
-	if use wireshark-plugins; then
-		for i in ${plugins}
-		do
-			CMAKE_USE_DIR="${S}"/wireshark/plugins/${i}
-			BUILD_DIR="${WORKDIR}"/${i}_build
-			cmake-utils_src_install
-		done
-	fi
-}
diff --git a/net-libs/libbtbb/libbtbb-2015.09.2.ebuild b/net-libs/libbtbb/libbtbb-2015.09.2.ebuild
new file mode 100644
index 000000000000..3d12be1e26ff
--- /dev/null
+++ b/net-libs/libbtbb/libbtbb-2015.09.2.ebuild
@@ -0,0 +1,133 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit multilib cmake-utils
+
+DESCRIPTION="A library to decode Bluetooth baseband packets"
+HOMEPAGE="http://libbtbb.sourceforge.net/"
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/greatscottgadgets/libbtbb.git"
+	inherit git-r3
+	KEYWORDS=""
+else
+	MY_PV=${PV/\./-}
+	MY_PV=${MY_PV/./-R}
+	S=${WORKDIR}/${PN}-${MY_PV}
+	SRC_URI="https://github.com/greatscottgadgets/${PN}/archive/${MY_PV}.tar.gz -> ${PN}-${MY_PV}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0/${PV}"
+IUSE="+pcap +wireshark-plugins"
+
+RDEPEND="
+	pcap? ( net-libs/libpcap )
+	wireshark-plugins? (
+		>=net-analyzer/wireshark-1.8.3-r1:=
+		!>net-analyzer/wireshark-1.98
+	)
+"
+DEPEND="${RDEPEND}
+	wireshark-plugins? ( dev-libs/glib
+			virtual/pkgconfig )"
+
+get_PV() { local pv=$(best_version $1); pv=${pv#$1-}; pv=${pv%-r*}; pv=${pv//_}; echo ${pv}; }
+
+which_plugins() {
+	if has_version '>=net-analyzer/wireshark-1.12.0'; then
+		plugins="btbb btbredr"
+	elif has_version '<net-analyzer/wireshark-1.12.0'; then
+		plugins="btbb btle btsm"
+	fi
+}
+
+src_prepare(){
+	CMAKE_USE_DIR="${S}"
+	BUILD_DIR="${S}"_build
+	cmake-utils_src_prepare
+
+	if use wireshark-plugins; then
+		which_plugins
+		for i in ${plugins}
+		do
+			sed -i 's#column_info#packet#' wireshark/plugins/${i}/cmake/FindWireshark.cmake || die
+			CMAKE_USE_DIR="${S}"/wireshark/plugins/${i}
+			BUILD_DIR="${WORKDIR}"/${i}_build
+			cmake-utils_src_prepare
+		done
+	fi
+}
+
+src_configure() {
+	CMAKE_USE_DIR="${S}"
+	BUILD_DIR="${S}"_build
+	local mycmakeargs=(
+		-DDISABLE_PYTHON=true
+		-DPACKAGE_MANAGER=true
+		$(cmake-utils_use pcap PCAPDUMP)
+		$(cmake-utils_use pcap USE_PCAP)
+	)
+	cmake-utils_src_configure
+
+	if use wireshark-plugins; then
+		for i in ${plugins}
+		do
+			CMAKE_USE_DIR="${S}"/wireshark/plugins/${i}
+			BUILD_DIR="${WORKDIR}"/${i}_build
+			local mycmakeargs=(
+			-DCMAKE_INSTALL_LIBDIR="/usr/$(get_libdir)/wireshark/plugins/$(get_PV net-analyzer/wireshark)"
+			)
+			cmake-utils_src_configure
+		done
+	fi
+}
+
+src_compile(){
+	CMAKE_USE_DIR="${S}"
+	BUILD_DIR="${S}"_build
+	cmake-utils_src_compile
+
+	if use wireshark-plugins; then
+		for i in ${plugins}
+		do
+			CMAKE_USE_DIR="${S}"/wireshark/plugins/${i}
+			BUILD_DIR="${WORKDIR}"/${i}_build
+			cmake-utils_src_compile
+		done
+	fi
+}
+
+src_test(){
+	CMAKE_USE_DIR="${S}"
+	BUILD_DIR="${S}"_build
+	cmake-utils_src_test
+
+	if use wireshark-plugins; then
+		for i in ${plugins}
+		do
+			CMAKE_USE_DIR="${S}"/wireshark/plugins/${i}
+			BUILD_DIR="${WORKDIR}"/${i}_build
+			cmake-utils_src_test
+		done
+	fi
+}
+
+src_install(){
+	CMAKE_USE_DIR="${S}"
+	BUILD_DIR="${S}"_build
+	cmake-utils_src_install
+
+	if use wireshark-plugins; then
+		for i in ${plugins}
+		do
+			CMAKE_USE_DIR="${S}"/wireshark/plugins/${i}
+			BUILD_DIR="${WORKDIR}"/${i}_build
+			cmake-utils_src_install
+		done
+	fi
+}
diff --git a/net-libs/libbtbb/libbtbb-9999.ebuild b/net-libs/libbtbb/libbtbb-9999.ebuild
index 610eaabf1484..3d12be1e26ff 100644
--- a/net-libs/libbtbb/libbtbb-9999.ebuild
+++ b/net-libs/libbtbb/libbtbb-9999.ebuild
@@ -40,7 +40,7 @@ get_PV() { local pv=$(best_version $1); pv=${pv#$1-}; pv=${pv%-r*}; pv=${pv//_};
 
 which_plugins() {
 	if has_version '>=net-analyzer/wireshark-1.12.0'; then
-		plugins="btbb"
+		plugins="btbb btbredr"
 	elif has_version '<net-analyzer/wireshark-1.12.0'; then
 		plugins="btbb btle btsm"
 	fi
diff --git a/net-libs/libcrafter/metadata.xml b/net-libs/libcrafter/metadata.xml
index 5ecde58044f6..6bfb7dbc5f46 100644
--- a/net-libs/libcrafter/metadata.xml
+++ b/net-libs/libcrafter/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>netmon</herd>
-<longdescription lang='en'>
+	<herd>netmon</herd>
+	<longdescription lang="en">
 Libcrafter is a high level library for C++ designed to facilitate the creation
 and decoding of network packets. It is able to craft or decode packets of most
 common networks protocols, send them on the wire, capture them and match
@@ -27,4 +27,7 @@ Ethernet, SLL (Linux cooked-mode capture), ARP, DHCP, DHCP options, IP, IP
 options, IPv6, ICMP, ICMPv6, ICMP extensions, ICMPv6 extensions, TCP, TCP
 options, UDP and DNS
 </longdescription>
+	<upstream>
+		<remote-id type="github">pellegre/libcrafter</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/net-libs/libgfbgraph/libgfbgraph-0.2.3.ebuild b/net-libs/libgfbgraph/libgfbgraph-0.2.3.ebuild
index 4a8ad2edf8e3..c08860f2d570 100644
--- a/net-libs/libgfbgraph/libgfbgraph-0.2.3.ebuild
+++ b/net-libs/libgfbgraph/libgfbgraph-0.2.3.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://git.gnome.org/browse/libgfbgraph/"
 
 LICENSE="LGPL-2.1+"
 SLOT="0.2"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="+introspection"
 
 RDEPEND="
diff --git a/net-libs/libgrss/libgrss-0.7.0.ebuild b/net-libs/libgrss/libgrss-0.7.0.ebuild
index f611ea26f90d..bad60c8c0890 100644
--- a/net-libs/libgrss/libgrss-0.7.0.ebuild
+++ b/net-libs/libgrss/libgrss-0.7.0.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://live.gnome.org/Libgrss"
 
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="+introspection"
 
 RDEPEND="
diff --git a/net-libs/libsoup-gnome/libsoup-gnome-2.50.0.ebuild b/net-libs/libsoup-gnome/libsoup-gnome-2.50.0.ebuild
index 0a993a75c1a7..5ff13afab15a 100644
--- a/net-libs/libsoup-gnome/libsoup-gnome-2.50.0.ebuild
+++ b/net-libs/libsoup-gnome/libsoup-gnome-2.50.0.ebuild
@@ -18,7 +18,7 @@ SRC_URI="${SRC_URI//-gnome}"
 LICENSE="LGPL-2+"
 SLOT="2.4"
 IUSE="debug +introspection"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x86-solaris"
 
 RDEPEND="
 	~net-libs/libsoup-${PV}[introspection?,${MULTILIB_USEDEP}]
diff --git a/net-libs/libsoup/libsoup-2.50.0.ebuild b/net-libs/libsoup/libsoup-2.50.0.ebuild
index d9354bbac525..a6bdbf2bcdaf 100644
--- a/net-libs/libsoup/libsoup-2.50.0.ebuild
+++ b/net-libs/libsoup/libsoup-2.50.0.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://wiki.gnome.org/LibSoup"
 LICENSE="LGPL-2+"
 SLOT="2.4"
 IUSE="debug +introspection samba ssl test"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 
 RDEPEND="
 	>=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]
diff --git a/net-libs/mbedtls/Manifest b/net-libs/mbedtls/Manifest
index 959c256958fa..375a07b4c4cf 100644
--- a/net-libs/mbedtls/Manifest
+++ b/net-libs/mbedtls/Manifest
@@ -1 +1,2 @@
 DIST mbedtls-2.0.0.tar.gz 1737179 SHA256 2af7f064580d7b7845c0a430b8111bd2ccc06d79d94589680f811c4c1091a1a1 SHA512 fd9f7e684a67f249512651727a84e5f327975ce05100d865fef8d5078e813eb2fb8d036d47fc2b15c7712e4900719e58718a6fd2a6592836c273f3b38f06eb0f WHIRLPOOL b73dc273ee18f035d25532e537cfdb21223613514f125cfa8e392d838da8f1c1a250915ab51d63b02d52d37a7e68ca21afc97c27388c60d455654238e3a7abc0
+DIST mbedtls-2.1.0.tar.gz 1770972 SHA256 2d95eaed5c2ecc7acf04afe5cdb5895b6feb31c4040a55020a314b5a0182a27a SHA512 b581bcafcd76cd5830c84f4b8b23196d1e5db06399fe5578368468eea3ab4f9b814e107cc552ab94f62ffbe3054cac3071bac5ce72484cb7bf30209e9f497eee WHIRLPOOL 0cb3399c35c7181b4ea7c6585616bc488be9faa75c5ae6010248e9a516a125c95c344d132f0ae5a0fdf57008fbb7a360035ed4fef9aba9c216753ed7d675850f
diff --git a/net-libs/mbedtls/mbedtls-2.1.0.ebuild b/net-libs/mbedtls/mbedtls-2.1.0.ebuild
new file mode 100644
index 000000000000..1c51012b3566
--- /dev/null
+++ b/net-libs/mbedtls/mbedtls-2.1.0.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit multilib cmake-utils multilib-minimal
+
+DESCRIPTION="Cryptographic library for embedded systems"
+HOMEPAGE="https://tls.mbed.org/"
+SRC_URI="https://github.com/ARMmbed/mbedtls/archive/mbedtls-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0/10" # slot for libmbedtls.so
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE="cpu_flags_x86_sse2 doc havege programs test threads zlib"
+
+RDEPEND="
+	programs? ( dev-libs/openssl:0 )
+	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}
+	doc? ( app-doc/doxygen media-gfx/graphviz )
+	test? ( dev-lang/perl )"
+
+S=${WORKDIR}/${PN}-${P}
+
+enable_mbedtls_option() {
+	local myopt="$@"
+	# check that config.h syntax is the same at version bump
+	sed -i \
+		-e "s://#define ${myopt}:#define ${myopt}:" \
+		include/mbedtls/config.h || die
+}
+
+src_prepare() {
+	use cpu_flags_x86_sse2 && enable_mbedtls_option MBEDTLS_HAVE_SSE2
+	use zlib && enable_mbedtls_option MBEDTLS_ZLIB_SUPPORT
+	use havege && enable_mbedtls_option MBEDTLS_HAVEGE_C
+	use threads && enable_mbedtls_option MBEDTLS_THREADING_C
+	use threads && enable_mbedtls_option MBEDTLS_THREADING_PTHREAD
+}
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		$(multilib_is_native_abi && cmake-utils_use_enable programs PROGRAMS \
+			|| echo -DENABLE_PROGRAMS=OFF)
+		$(cmake-utils_use_enable zlib ZLIB_SUPPORT)
+		-DUSE_STATIC_MBEDTLS_LIBRARY=OFF
+		$(cmake-utils_use_enable test TESTING)
+		-DUSE_SHARED_MBEDTLS_LIBRARY=ON
+		-DINSTALL_MBEDTLS_HEADERS=ON
+		-DLIB_INSTALL_DIR="/usr/$(get_libdir)"
+	)
+
+	cmake-utils_src_configure
+}
+
+multilib_src_compile() {
+	cmake-utils_src_compile
+	use doc && multilib_is_native_abi && emake apidoc
+}
+
+multilib_src_test() {
+	LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${BUILD_DIR}/library" \
+		cmake-utils_src_test
+}
+
+multilib_src_install() {
+	cmake-utils_src_install
+}
+
+multilib_src_install_all() {
+	einstalldocs
+
+	use doc && dohtml -r apidoc
+
+	if use programs ; then
+		# avoid file collisions with sys-apps/coreutils
+		local p e
+		for p in "${ED%/}"/usr/bin/* ; do
+			if [[ -x "${p}" && ! -d "${p}" ]] ; then
+				mv "${p}" "${ED%/}"/usr/bin/mbedtls_${p##*/} || die
+			fi
+		done
+		for e in aes hash pkey ssl test ; do
+			docinto "${e}"
+			dodoc programs/"${e}"/*.c
+			dodoc programs/"${e}"/*.txt
+		done
+	fi
+}
diff --git a/net-libs/openpgm/openpgm-5.1.118-r1.ebuild b/net-libs/openpgm/openpgm-5.1.118-r1.ebuild
index c95e63c35831..9262a3bb1af5 100644
--- a/net-libs/openpgm/openpgm-5.1.118-r1.ebuild
+++ b/net-libs/openpgm/openpgm-5.1.118-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://openpgm.googlecode.com/files/libpgm-${PV}~dfsg.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 arm hppa ~ppc ppc64 ~x86 ~x86-fbsd"
+KEYWORDS="amd64 arm hppa ppc ppc64 ~x86 ~x86-fbsd"
 IUSE="static-libs"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/net-libs/pacparser/metadata.xml b/net-libs/pacparser/metadata.xml
index 67c25ef2c2c0..e4e396310bbe 100644
--- a/net-libs/pacparser/metadata.xml
+++ b/net-libs/pacparser/metadata.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-  <email>bicatali@gentoo.org</email>
-</maintainer>
-<longdescription>
+  <maintainer>
+    <email>bicatali@gentoo.org</email>
+  </maintainer>
+  <longdescription>
   A library to parse proxy auto-config (PAC) files. Proxy auto-config
   files are a vastly used proxy configuration method these days. Web
   browsers can use a PAC file to determine which proxy server to use
@@ -20,7 +20,8 @@
   add this PAC file parsing capability to  any program (C and Python
   supported right now).
 </longdescription>
-<upstream>
-  <remote-id type="google-code">pacproxy</remote-id>
-</upstream>
+  <upstream>
+    <remote-id type="google-code">pacproxy</remote-id>
+    <remote-id type="github">pacparser/pacparser</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/net-libs/phodav/phodav-2.0-r1.ebuild b/net-libs/phodav/phodav-2.0-r1.ebuild
index 5bd28f85f407..bb9a7c7ae941 100644
--- a/net-libs/phodav/phodav-2.0-r1.ebuild
+++ b/net-libs/phodav/phodav-2.0-r1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/phodav"
 
 LICENSE="LGPL-2.1+"
 SLOT="2.0"
-KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha amd64 ~arm ~ppc ~ppc64 ~x86"
 IUSE="spice systemd zeroconf"
 
 RDEPEND="
diff --git a/net-libs/polarssl/polarssl-1.3.9.ebuild b/net-libs/polarssl/polarssl-1.3.9.ebuild
index 53e1121f91d1..c17e4e14886c 100644
--- a/net-libs/polarssl/polarssl-1.3.9.ebuild
+++ b/net-libs/polarssl/polarssl-1.3.9.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://polarssl.org/download/${P}-gpl.tgz"
 
 LICENSE="GPL-2"
 SLOT="0/7"
-KEYWORDS="alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="doc havege programs cpu_flags_x86_sse2 static-libs test threads zlib"
 
 RDEPEND="
diff --git a/net-libs/uhttpmock/uhttpmock-0.5.0.ebuild b/net-libs/uhttpmock/uhttpmock-0.5.0.ebuild
index ce0470b82849..72f3f6f49435 100644
--- a/net-libs/uhttpmock/uhttpmock-0.5.0.ebuild
+++ b/net-libs/uhttpmock/uhttpmock-0.5.0.ebuild
@@ -18,7 +18,7 @@ SLOT="0"
 IUSE="+introspection vala"
 REQUIRED_USE="vala? ( introspection )"
 
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
 
 RDEPEND="
 	>=dev-libs/glib-2.36.0:2
diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index 01dbc5fb94b5..4c9e10134c9f 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -1,4 +1,3 @@
 DIST webkitgtk-2.4.9.tar.xz 9840740 SHA256 afdf29e7828816cad0be2604cf19421e96d96bf493987328ffc8813bb20ac564 SHA512 5dfe5c31e0fcbab5e468a18e08918a439b214dcd620386fa32d35e9110e479b552a4b0b88a1bb8574b34445d5cc5219be349feded32fc1d2791a6c6279d61f98 WHIRLPOOL 26141cd12878bc8136ecffc1636fdcb037f342e5c27c8c557117564af9d1673af84c8c4fd10d3fdbe890bdf183791b18a210f57de9750422959a45c60390076c
 DIST webkitgtk-2.6.6.tar.xz 10000888 SHA256 541e114a203b0f649e89b3ad6b6fdeea1726739320a6b6a52b464cb66ea38eb9 SHA512 faac38cbd64daf180f2e2f9e7df9e1162ccd0b4f5c76b0133ef6d2b95b413b699923fda3a5026ba3c76562de59e4913c45a97cd654797867490633dd3099f5b4 WHIRLPOOL 20be78255c917ecd930e034e38053af054a4271445eaa43319f45db6fde6b369f002f2be5269a696c53200b2bf56b74959e7970932fd62f6c89e3ea1236ce72b
-DIST webkitgtk-2.8.3.tar.xz 10437676 SHA256 b3de60c8676ed54bb3d6201c742bbd702ee176fdfef5ca06f2fc514783792f16 SHA512 29a8f17d921a3015cea8e1e156c42b8f7d5504643157381888c9613a706070b2bde1435cc83048969cc24b525a3f7cd27a493d9636a4bace6bac921b2179874d WHIRLPOOL 03c6f1206203f79ae69c50dab085872a9920982ac556b7e611e114c4d5753ec31d7c6bf3ccf62ae08929886a02bff001a8ac74ad8a4e0ed96879f74539c0c3c4
 DIST webkitgtk-2.8.5.tar.xz 10455256 SHA256 3d1f0c534935f43fd74df90f2648fcee672d60f1f57a30fa557a77891ae04d20 SHA512 b87a4149aa133824c7855d562a872fef9067d8c7a78026b9ec29d9eb0798a4da827aac4a1ec4eb1a117f7ae50b14c415c6f04ba4ddee851cf55e2dc503c3eddb WHIRLPOOL 1bb1c542d73db31985d4afc6a9ab59730118e57f99aba1a8e81820880bf832386f77aee70f4a50cece180fdb905b7aa5a0f08b91a5eb64a77c3ad5dd82792ead
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.4.9-r200.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.4.9-r200.ebuild
index 6b86fe86b83a..d58738ca35bb 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.4.9-r200.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.4.9-r200.ebuild
@@ -15,7 +15,7 @@ SRC_URI="http://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="2" # no usable subslot
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ~ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos"
 
 IUSE="aqua coverage debug +egl +geoloc gles2 +gstreamer +introspection +jit libsecret +opengl spell +webgl +X"
 # bugs 372493, 416331
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.8.3.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.8.3.ebuild
deleted file mode 100644
index 3450a479fc19..000000000000
--- a/net-libs/webkit-gtk/webkit-gtk-2.8.3.ebuild
+++ /dev/null
@@ -1,241 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-CMAKE_MAKEFILE_GENERATOR="ninja"
-GCONF_DEBUG="no"
-PYTHON_COMPAT=( python2_7 )
-
-inherit check-reqs cmake-utils eutils flag-o-matic gnome2 pax-utils python-any-r1 toolchain-funcs versionator virtualx
-
-MY_P="webkitgtk-${PV}"
-DESCRIPTION="Open source web browser engine"
-HOMEPAGE="http://www.webkitgtk.org/"
-SRC_URI="http://www.webkitgtk.org/releases/${MY_P}.tar.xz"
-
-LICENSE="LGPL-2+ BSD"
-SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos"
-
-IUSE="coverage doc +egl +geoloc gles2 +gstreamer +introspection +jit libsecret +opengl spell wayland +webgl X"
-REQUIRED_USE="
-	geoloc? ( introspection )
-	gles2? ( egl )
-	introspection? ( gstreamer )
-	webgl? ( ^^ ( gles2 opengl ) )
-	!webgl? ( ?? ( gles2 opengl ) )
-	|| ( wayland X )
-"
-
-# use sqlite, svg by default
-# Aqua support in gtk3 is untested
-# gtk2 is needed for plugin process support, should we add a USE flag to configure this?
-RDEPEND="
-	dev-db/sqlite:3=
-	>=dev-libs/glib-2.36:2
-	>=dev-libs/icu-3.8.1-r1:=
-	>=dev-libs/libxml2-2.8:2
-	>=dev-libs/libxslt-1.1.7
-	>=media-libs/fontconfig-2.8:1.0
-	>=media-libs/freetype-2.4.2:2
-	>=media-libs/harfbuzz-0.9.18:=[icu(+)]
-	>=media-libs/libpng-1.4:0=
-	media-libs/libwebp:=
-	>=net-libs/gnutls-3
-	>=net-libs/libsoup-2.42:2.4[introspection?]
-	virtual/jpeg:0=
-	>=x11-libs/cairo-1.10.2:=
-	>=x11-libs/gtk+-3.14:3[introspection?]
-	x11-libs/libnotify
-	>=x11-libs/pango-1.30.0
-
-	>=x11-libs/gtk+-2.24.10:2
-
-	egl? ( media-libs/mesa[egl] )
-	geoloc? ( >=app-misc/geoclue-2.1.5:2.0 )
-	gles2? ( media-libs/mesa[gles2] )
-	gstreamer? (
-		>=media-libs/gstreamer-1.2:1.0
-		>=media-libs/gst-plugins-base-1.2:1.0 )
-	introspection? ( >=dev-libs/gobject-introspection-1.32.0 )
-	libsecret? ( app-crypt/libsecret )
-	opengl? ( virtual/opengl
-		x11-libs/cairo[opengl] )
-	spell? ( >=app-text/enchant-0.22:= )
-	wayland? ( >=x11-libs/gtk+-3.14:3[wayland] )
-	webgl? (
-		x11-libs/cairo[opengl]
-		x11-libs/libXcomposite
-		x11-libs/libXdamage )
-	X? (
-		x11-libs/cairo[X]
-		>=x11-libs/gtk+-3.14:3[X]
-		x11-libs/libX11
-		x11-libs/libXrender
-		x11-libs/libXt )
-"
-
-# paxctl needed for bug #407085
-# Need real bison, not yacc
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	>=dev-lang/perl-5.10
-	|| (
-		virtual/rubygems[ruby_targets_ruby20]
-		virtual/rubygems[ruby_targets_ruby21]
-		virtual/rubygems[ruby_targets_ruby22]
-		virtual/rubygems[ruby_targets_ruby19]
-	)
-	>=app-accessibility/at-spi2-core-2.5.3
-	>=dev-libs/atk-2.8.0
-	>=dev-util/gtk-doc-am-1.10
-	>=dev-util/gperf-3.0.1
-	>=sys-devel/bison-2.4.3
-	>=sys-devel/flex-2.5.34
-	|| ( >=sys-devel/gcc-4.7 >=sys-devel/clang-3.3 )
-	sys-devel/gettext
-	virtual/pkgconfig
-
-	doc? ( >=dev-util/gtk-doc-1.10 )
-	geoloc? ( dev-util/gdbus-codegen )
-	introspection? ( jit? ( sys-apps/paxctl ) )
-	test? (
-		dev-lang/python:2.7
-		dev-python/pygobject:3[python_targets_python2_7]
-		x11-themes/hicolor-icon-theme
-		jit? ( sys-apps/paxctl ) )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
-		einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
-		check-reqs_pkg_pretend
-	fi
-
-	if [[ ${MERGE_TYPE} != "binary" ]] && ! test-flag-CXX -std=c++11; then
-		die "You need at least GCC 4.7.x or Clang >= 3.3 for C++11-specific compiler flags"
-	fi
-}
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
-		check-reqs_pkg_setup
-	fi
-
-	[[ ${MERGE_TYPE} = "binary" ]] || python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	# Debian patches to fix support for some arches
-	# https://bugs.webkit.org/show_bug.cgi?id=129540
-	epatch "${FILESDIR}"/${PN}-2.6.0-{hppa,ia64}-platform.patch
-	# https://bugs.webkit.org/show_bug.cgi?id=129542
-	epatch "${FILESDIR}"/${PN}-2.8.1-ia64-malloc.patch
-
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# Respect CC, otherwise fails on prefix #395875
-	tc-export CC
-
-	# Arches without JIT support also need this to really disable it in all places
-	use jit || append-cppflags -DENABLE_JIT=0 -DENABLE_YARR_JIT=0 -DENABLE_ASSEMBLER=0
-
-	# It does not compile on alpha without this in LDFLAGS
-	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
-	use alpha && append-ldflags "-Wl,--no-relax"
-
-	# Sigbuses on SPARC with mcpu and co., bug #???
-	use sparc && filter-flags "-mvis"
-
-	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
-	use ppc64 && append-flags "-mminimal-toc"
-
-	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
-	# --no-keep-memory doesn't work on ia64, bug #502492
-	if ! use ia64; then
-		append-ldflags "-Wl,--no-keep-memory"
-	fi
-	if ! $(tc-getLD) --version | grep -q "GNU gold"; then
-		append-ldflags "-Wl,--reduce-memory-overheads"
-	fi
-
-	# older glibc needs this for INTPTR_MAX, bug #533976
-	if has_version "<sys-libs/glibc-2.18" ; then
-		append-cppflags "-D__STDC_LIMIT_MACROS"
-	fi
-
-	# Multiple rendering bugs on youtube, github, etc without this, bug #547224
-	append-flags $(test-flags -fno-strict-aliasing)
-
-	local ruby_interpreter=""
-
-	if has_version "virtual/rubygems[ruby_targets_ruby22]"; then
-		ruby_interpreter="RUBY=$(type -P ruby22)"
-	elif has_version "virtual/rubygems[ruby_targets_ruby21]"; then
-		ruby_interpreter="RUBY=$(type -P ruby21)"
-	elif has_version "virtual/rubygems[ruby_targets_ruby20]"; then
-		ruby_interpreter="RUBY=$(type -P ruby20)"
-	else
-		ruby_interpreter="RUBY=$(type -P ruby19)"
-	fi
-
-	# TODO: Check Web Audio support
-	# should somehow let user select between them?
-	#
-	# FTL_JIT requires llvm
-	local mycmakeargs=(
-		$(cmake-utils_use_enable test API_TESTS)
-		$(cmake-utils_use_enable doc GTKDOC)
-		$(cmake-utils_use_enable geoloc GEOLOCATION)
-		$(cmake-utils_use_find_package gles2 OpenGLES2)
-		$(cmake-utils_use_enable gles2 GLES2)
-		$(cmake-utils_use_enable gstreamer VIDEO)
-		$(cmake-utils_use_enable gstreamer WEB_AUDIO)
-		$(cmake-utils_use_enable introspection)
-		$(cmake-utils_use_enable jit)
-		$(cmake-utils_use_enable libsecret CREDENTIAL_STORAGE)
-		$(cmake-utils_use_enable spell SPELLCHECK SPELLCHECK)
-		$(cmake-utils_use_enable wayland WAYLAND_TARGET)
-		$(cmake-utils_use_enable webgl WEBGL)
-		$(cmake-utils_use_find_package egl EGL)
-		$(cmake-utils_use_find_package opengl OpenGL)
-		$(cmake-utils_use_enable X X11_TARGET)
-		-DCMAKE_BUILD_TYPE=Release
-		-DPORT=GTK
-		-DENABLE_PLUGIN_PROCESS_GTK2=ON
-		${ruby_interpreter}
-	)
-	if $(tc-getLD) --version | grep -q "GNU gold"; then
-		mycmakeargs+=( -DUSE_LD_GOLD=ON )
-	else
-		mycmakeargs+=( -DUSE_LD_GOLD=OFF )
-	fi
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-}
-
-src_test() {
-	# Prevents test failures on PaX systems
-	use jit && pax-mark m $(list-paxables Programs/*[Tt]ests/*) # Programs/unittests/.libs/test*
-
-	cmake-utils_src_test
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	# Prevents crashes on PaX systems, bug #522808
-	use jit && pax-mark m "${ED}usr/bin/jsc" "${ED}usr/libexec/webkit2gtk-4.0/WebKitWebProcess"
-	pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/WebKitPluginProcess"{,2}
-}
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.8.5.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.8.5.ebuild
index 18ae36ab6a0b..1add54acbf0c 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.8.5.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.8.5.ebuild
@@ -16,7 +16,7 @@ SRC_URI="http://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos"
 
 IUSE="coverage doc +egl +geoloc gles2 +gstreamer +introspection +jit libsecret +opengl spell wayland +webgl X"
 REQUIRED_USE="
diff --git a/net-mail/Freemail/Freemail-9999-r1.ebuild b/net-mail/Freemail/Freemail-9999-r1.ebuild
new file mode 100644
index 000000000000..83ec9f56b1b3
--- /dev/null
+++ b/net-mail/Freemail/Freemail-9999-r1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+EGIT_REPO_URI="git://github.com/freenet/plugin-Freemail-official.git
+	https://github.com/freenet/plugin-Freemail-official.git"
+EGIT_PROJECT="Freemail/official"
+EANT_BUILD_TARGET="dist"
+inherit eutils git-2 java-pkg-2 java-ant-2
+
+DESCRIPTION="Anonymous IMAP/SMTP e-mail server over Freenet"
+HOMEPAGE="http://www.freenetproject.org/tools.html"
+SRC_URI=""
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS=""
+IUSE=""
+
+CDEPEND="dev-java/bcprov:1.38
+	net-p2p/freenet"
+DEPEND="${CDEPEND}
+	>=virtual/jdk-1.5"
+RDEPEND="${CDEPEND}
+	>=virtual/jre-1.5"
+
+EANT_GENTOO_CLASSPATH="bcprov freenet"
+
+src_prepare() {
+	epatch "${FILESDIR}"/build.patch
+	java-ant_rewrite-classpath
+}
+
+src_install() {
+	java-pkg_dojar dist/"${PN}.jar"
+	dodir /var/freenet/plugins
+	fperms freenet:freenet /var/freenet/plugins
+	dodoc README || die "installation of documentation failed"
+}
+
+pkg_postinst () {
+	#force chmod for previously existing plugins dir owned by root
+	[[ $(stat --format="%U" /var/freenet/plugins) == "freenet" ]] || chown \
+		freenet:freenet /var/freenet/plugins
+	elog "To load Freemail, go to the plugin page of freenet and enter at"
+	elog "Plugin-URL: /usr/share/Freemail/lib/Freemail.jar"
+	elog " This should load the Freemail plugin."
+	elog "Set your email client to IMAP port 3143 and SMTP port 3025 on localhost."
+	elog "To bind freemail to different ports, or to a different freenet node, edit"
+	elog "/var/freenet/globalconfig."
+}
diff --git a/net-mail/Freemail/Freemail-9999.ebuild b/net-mail/Freemail/Freemail-9999.ebuild
deleted file mode 100644
index f200d9739eb0..000000000000
--- a/net-mail/Freemail/Freemail-9999.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="2"
-
-EGIT_REPO_URI="git://github.com/freenet/plugin-Freemail-official.git
-	https://github.com/freenet/plugin-Freemail-official.git"
-EGIT_PROJECT="Freemail/official"
-EANT_BUILD_TARGET="dist"
-inherit eutils git-2 java-pkg-2 java-ant-2
-
-DESCRIPTION="Anonymous IMAP/SMTP e-mail server over Freenet"
-HOMEPAGE="http://www.freenetproject.org/tools.html"
-SRC_URI=""
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS=""
-IUSE=""
-
-CDEPEND="dev-java/bcprov:0
-	net-p2p/freenet"
-DEPEND="${CDEPEND}
-	>=virtual/jdk-1.5"
-RDEPEND="${CDEPEND}
-	>=virtual/jre-1.5"
-
-EANT_GENTOO_CLASSPATH="bcprov freenet"
-src_prepare() {
-	epatch "${FILESDIR}"/build.patch
-	java-ant_rewrite-classpath
-}
-
-src_install() {
-	java-pkg_dojar dist/Freemail.jar
-	dodir /var/freenet/plugins
-	fperms freenet:freenet /var/freenet/plugins
-	dodoc README || die "installation of documentation failed"
-}
-
-pkg_postinst () {
-	#force chmod for previously existing plugins dir owned by root
-	[[ $(stat --format="%U" /var/freenet/plugins) == "freenet" ]] || chown \
-		freenet:freenet /var/freenet/plugins
-	elog "To load Freemail, go to the plugin page of freenet and enter at"
-	elog "Plugin-URL: /usr/share/Freemail/lib/Freemail.jar"
-	elog " This should load the Freemail plugin."
-	elog "Set your email client to IMAP port 3143 and SMTP port 3025 on localhost."
-	elog "To bind freemail to different ports, or to a different freenet node, edit"
-	elog "/var/freenet/globalconfig."
-}
diff --git a/net-mail/courier-imap/courier-imap-4.16.2.ebuild b/net-mail/courier-imap/courier-imap-4.16.2.ebuild
index 00f353569b49..a63c2d5bebd1 100644
--- a/net-mail/courier-imap/courier-imap-4.16.2.ebuild
+++ b/net-mail/courier-imap/courier-imap-4.16.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc64 ~x86"
+KEYWORDS="~amd64 ~hppa ~mips ~ppc64 ~x86"
 IUSE="berkdb debug fam +gdbm ipv6 selinux gnutls trashquota"
 
 REQUIRED_USE="|| ( berkdb gdbm )"
diff --git a/net-misc/aiccu/aiccu-2007.01.15-r5.ebuild b/net-misc/aiccu/aiccu-2007.01.15-r5.ebuild
index 1a4d54158791..c5058247abb6 100644
--- a/net-misc/aiccu/aiccu-2007.01.15-r5.ebuild
+++ b/net-misc/aiccu/aiccu-2007.01.15-r5.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://www.sixxs.net/archive/sixxs/aiccu/unix/${PN}_${PV//\./}.tar.gz"
 
 LICENSE="SixXS"
 SLOT="0"
-KEYWORDS="amd64 arm hppa ~ppc ~sparc ~x86"
+KEYWORDS="amd64 arm hppa ppc ~sparc ~x86"
 IUSE="systemd"
 
 RDEPEND="
diff --git a/net-misc/bfgminer/Manifest b/net-misc/bfgminer/Manifest
index 3f78149a8619..a956ce6b0409 100644
--- a/net-misc/bfgminer/Manifest
+++ b/net-misc/bfgminer/Manifest
@@ -7,3 +7,4 @@ DIST bfgminer-4.10.3.tar.xz 988552 SHA256 c9e4ac3754dad838d3a8120afd499751ac2e8b
 DIST bfgminer-5.0.0.tar.xz 1012092 SHA256 f1dada4d83737f7bc9623ad695a07a88808d8103c9c7617ce18825d241e328fd SHA512 fc1b116347e0b2af4e2c7f895368abe156019be5495e286df2f90708c16c1739e7362682389eb88ce64835d53545a5603eab4818d70018f7f872a28b4ec6c797 WHIRLPOOL 95085f7ddc374579520bae130b12923669c5788c0ea21e7377e57e907ed997936f6a413d9067c0121410bde42b33c0b194774794965a86328b60f3cf0d881165
 DIST bfgminer-5.1.0.tar.xz 1024292 SHA256 436595e8b3af267e8fed023ac6b5f208a385d891d0c3c1c41b8aa13f1c1e69c9 SHA512 826f3b1b2a3c0c0ce66ce888308cc531a2f8cf8212771bc07a650cf2811aeb40ed1d41ba1ffc8b3b16719cf261a5ce9d087bfa17603255cc53f0866b7ddc5459 WHIRLPOOL 9e1310b47f678c17840216e82f99d3c06152ad2efd49096ce27e31614282da62359bcca1e0a812ca2433fc933c5848ae0a8c271ccb2b7c8a7102e7d25b022ad2
 DIST bfgminer-5.2.0.tar.xz 1017012 SHA256 0cec8a4012d5784f781201d245bee834b0085274a24737ff3a4d0a28d48edc28 SHA512 5bb930d3cf9aed0ae9eaabbd92c3a26146a7308e61bcf5ebdf67f8f5f70a7bae1df0bad51312b4bdfabcc10547b0d991a1117db5f6b98b1047c1dae6fd880f85 WHIRLPOOL f18d4d029d6296d130bbb439b1323fe9ae8dfd89ddc3cdd3f4f85742969a17ccadb7ad49ff3527e9399d4b60ff6b7c2bd83cd291003e0f676af4307141b635da
+DIST bfgminer-5.3.0.tar.xz 1017536 SHA256 d48fa6e51ff70ee1a85f77334a24f842ca6774c073c2d864fe739f07093ef77f SHA512 935b2a0595a2230f8ba9f832a280f52418c1b50b884010bebd2059cbef83d28c535d8d0b3cd7abe5b2420f6dc9fa8e9e0e32839ccdb6cd002a1e874dc5b1841a WHIRLPOOL 0244c9cf2a8928590f69819cfaa222498ae9e0b65aba4c0bc3fc751b7712e9284110ef238dd3bdeaa0562f4eaa292b4257e4d509966ff8e92731dd3f1d9f8ecc
diff --git a/net-misc/bfgminer/bfgminer-3.10.10.ebuild b/net-misc/bfgminer/bfgminer-3.10.10.ebuild
index 26093d157c86..fea1916cec51 100644
--- a/net-misc/bfgminer/bfgminer-3.10.10.ebuild
+++ b/net-misc/bfgminer/bfgminer-3.10.10.ebuild
@@ -42,7 +42,7 @@ REQUIRED_USE='
 DEPEND='
 	net-misc/curl
 	ncurses? (
-		sys-libs/ncurses[unicode?]
+		sys-libs/ncurses:=[unicode?]
 	)
 	>=dev-libs/jansson-2
 	net-libs/libblkmaker:=
@@ -80,14 +80,7 @@ RDEPEND="${DEPEND}
 	opencl? (
 		|| (
 			virtual/opencl
-			virtual/opencl-sdk
-			dev-util/ati-stream-sdk
-			dev-util/ati-stream-sdk-bin
-			dev-util/amdstream
-			dev-util/amd-app-sdk
-			dev-util/amd-app-sdk-bin
 			dev-util/nvidia-cuda-sdk[opencl]
-			dev-util/intel-opencl-sdk
 		)
 	)
 "
diff --git a/net-misc/bfgminer/bfgminer-3.10.5.ebuild b/net-misc/bfgminer/bfgminer-3.10.5.ebuild
index 09f7262daba9..e47ba2e45adc 100644
--- a/net-misc/bfgminer/bfgminer-3.10.5.ebuild
+++ b/net-misc/bfgminer/bfgminer-3.10.5.ebuild
@@ -42,7 +42,7 @@ REQUIRED_USE='
 DEPEND='
 	net-misc/curl
 	ncurses? (
-		sys-libs/ncurses[unicode?]
+		sys-libs/ncurses:=[unicode?]
 	)
 	>=dev-libs/jansson-2
 	net-libs/libblkmaker
diff --git a/net-misc/bfgminer/bfgminer-3.10.8.ebuild b/net-misc/bfgminer/bfgminer-3.10.8.ebuild
index bd156beb5f10..fea1916cec51 100644
--- a/net-misc/bfgminer/bfgminer-3.10.8.ebuild
+++ b/net-misc/bfgminer/bfgminer-3.10.8.ebuild
@@ -42,7 +42,7 @@ REQUIRED_USE='
 DEPEND='
 	net-misc/curl
 	ncurses? (
-		sys-libs/ncurses[unicode?]
+		sys-libs/ncurses:=[unicode?]
 	)
 	>=dev-libs/jansson-2
 	net-libs/libblkmaker:=
diff --git a/net-misc/bfgminer/bfgminer-4.10.1.ebuild b/net-misc/bfgminer/bfgminer-4.10.1.ebuild
index edd840685ec2..66a4b78bd4b6 100644
--- a/net-misc/bfgminer/bfgminer-4.10.1.ebuild
+++ b/net-misc/bfgminer/bfgminer-4.10.1.ebuild
@@ -48,7 +48,7 @@ REQUIRED_USE='
 DEPEND='
 	net-misc/curl
 	ncurses? (
-		sys-libs/ncurses[unicode?]
+		sys-libs/ncurses:=[unicode?]
 	)
 	>=dev-libs/jansson-2
 	dev-libs/libbase58
diff --git a/net-misc/bfgminer/bfgminer-4.10.2.ebuild b/net-misc/bfgminer/bfgminer-4.10.2.ebuild
index edd840685ec2..66a4b78bd4b6 100644
--- a/net-misc/bfgminer/bfgminer-4.10.2.ebuild
+++ b/net-misc/bfgminer/bfgminer-4.10.2.ebuild
@@ -48,7 +48,7 @@ REQUIRED_USE='
 DEPEND='
 	net-misc/curl
 	ncurses? (
-		sys-libs/ncurses[unicode?]
+		sys-libs/ncurses:=[unicode?]
 	)
 	>=dev-libs/jansson-2
 	dev-libs/libbase58
diff --git a/net-misc/bfgminer/bfgminer-4.10.3.ebuild b/net-misc/bfgminer/bfgminer-4.10.3.ebuild
index 163781356fb7..66a4b78bd4b6 100644
--- a/net-misc/bfgminer/bfgminer-4.10.3.ebuild
+++ b/net-misc/bfgminer/bfgminer-4.10.3.ebuild
@@ -48,7 +48,7 @@ REQUIRED_USE='
 DEPEND='
 	net-misc/curl
 	ncurses? (
-		sys-libs/ncurses[unicode?]
+		sys-libs/ncurses:=[unicode?]
 	)
 	>=dev-libs/jansson-2
 	dev-libs/libbase58
@@ -87,14 +87,7 @@ RDEPEND="${DEPEND}
 	opencl? (
 		|| (
 			virtual/opencl
-			virtual/opencl-sdk
-			dev-util/ati-stream-sdk
-			dev-util/ati-stream-sdk-bin
-			dev-util/amdstream
-			dev-util/amd-app-sdk
-			dev-util/amd-app-sdk-bin
 			dev-util/nvidia-cuda-sdk[opencl]
-			dev-util/intel-opencl-sdk
 		)
 	)
 "
diff --git a/net-misc/bfgminer/bfgminer-5.0.0.ebuild b/net-misc/bfgminer/bfgminer-5.0.0.ebuild
index cd79ef780970..bad51c92a25a 100644
--- a/net-misc/bfgminer/bfgminer-5.0.0.ebuild
+++ b/net-misc/bfgminer/bfgminer-5.0.0.ebuild
@@ -65,7 +65,7 @@ REQUIRED_USE='
 DEPEND='
 	net-misc/curl
 	ncurses? (
-		sys-libs/ncurses[unicode?]
+		sys-libs/ncurses:=[unicode?]
 	)
 	>=dev-libs/jansson-2
 	dev-libs/libbase58
diff --git a/net-misc/bfgminer/bfgminer-5.1.0.ebuild b/net-misc/bfgminer/bfgminer-5.1.0.ebuild
index cd79ef780970..bad51c92a25a 100644
--- a/net-misc/bfgminer/bfgminer-5.1.0.ebuild
+++ b/net-misc/bfgminer/bfgminer-5.1.0.ebuild
@@ -65,7 +65,7 @@ REQUIRED_USE='
 DEPEND='
 	net-misc/curl
 	ncurses? (
-		sys-libs/ncurses[unicode?]
+		sys-libs/ncurses:=[unicode?]
 	)
 	>=dev-libs/jansson-2
 	dev-libs/libbase58
diff --git a/net-misc/bfgminer/bfgminer-5.2.0.ebuild b/net-misc/bfgminer/bfgminer-5.2.0.ebuild
index 136a2b86f119..bad51c92a25a 100644
--- a/net-misc/bfgminer/bfgminer-5.2.0.ebuild
+++ b/net-misc/bfgminer/bfgminer-5.2.0.ebuild
@@ -65,7 +65,7 @@ REQUIRED_USE='
 DEPEND='
 	net-misc/curl
 	ncurses? (
-		sys-libs/ncurses[unicode?]
+		sys-libs/ncurses:=[unicode?]
 	)
 	>=dev-libs/jansson-2
 	dev-libs/libbase58
@@ -104,14 +104,7 @@ RDEPEND="${DEPEND}
 	opencl? (
 		|| (
 			virtual/opencl
-			virtual/opencl-sdk
-			dev-util/ati-stream-sdk
-			dev-util/ati-stream-sdk-bin
-			dev-util/amdstream
-			dev-util/amd-app-sdk
-			dev-util/amd-app-sdk-bin
 			dev-util/nvidia-cuda-sdk[opencl]
-			dev-util/intel-opencl-sdk
 		)
 	)
 "
diff --git a/net-misc/bfgminer/bfgminer-5.3.0.ebuild b/net-misc/bfgminer/bfgminer-5.3.0.ebuild
new file mode 100644
index 000000000000..bad51c92a25a
--- /dev/null
+++ b/net-misc/bfgminer/bfgminer-5.3.0.ebuild
@@ -0,0 +1,195 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils
+
+DESCRIPTION="Modular Bitcoin ASIC/FPGA/GPU/CPU miner in C"
+HOMEPAGE="https://bitcointalk.org/?topic=168174"
+SRC_URI="http://luke.dashjr.org/programs/bitcoin/files/${PN}/${PV}/${P}.txz -> ${P}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86"
+
+# TODO: knc (needs i2c-tools header)
+# TODO: kncasic & titan (need systemwide knc-asic install)
+# TODO: minergate (needs actual miner_gate)
+IUSE="adl antminer avalon avalonmm bfsb bfx bifury bigpic bitforce bitfury cointerra cpumining drillbit dualminer examples gridseed hardened hashbuster hashbuster2 hashfast icarus jingtian keccak klondike +libusb littlefury lm_sensors metabank minion modminer nanofury ncurses opencl proxy proxy_getwork proxy_stratum rockminer screen scrypt +sha256d twinfury +udev udev-broad-rules unicode x6500 zeusminer ztex"
+REQUIRED_USE='
+	|| ( keccak scrypt sha256d )
+	|| ( antminer avalon avalonmm bfsb bfx bifury bigpic bitforce bitfury cointerra cpumining drillbit dualminer gridseed hashbuster hashbuster2 hashfast icarus klondike littlefury metabank modminer nanofury opencl proxy twinfury x6500 zeusminer ztex )
+	adl? ( opencl )
+	antminer? ( sha256d )
+	avalon? ( sha256d )
+	avalonmm? ( sha256d )
+	bfsb? ( sha256d bitfury )
+	bfx? ( sha256d bitfury libusb )
+	bifury? ( sha256d )
+	bigpic? ( sha256d bitfury )
+	bitforce? ( sha256d )
+	bitfury? ( sha256d )
+	cointerra? ( sha256d )
+	drillbit? ( sha256d bitfury )
+	dualminer? ( || ( sha256d scrypt ) icarus )
+	gridseed? ( scrypt )
+	hashbuster? ( sha256d bitfury )
+	hashbuster2? ( sha256d bitfury libusb )
+	hashfast? ( sha256d )
+	icarus? ( || ( scrypt sha256d ) )
+	jingtian? ( sha256d )
+	keccak? ( || ( cpumining opencl proxy ) )
+	klondike? ( sha256d libusb )
+	littlefury? ( sha256d bitfury )
+	lm_sensors? ( opencl )
+	metabank? ( sha256d bitfury )
+	minion? ( sha256d )
+	modminer? ( sha256d )
+	nanofury? ( sha256d bitfury )
+	scrypt? ( || ( cpumining dualminer gridseed opencl proxy zeusminer ) )
+	sha256d? ( || ( antminer avalon avalonmm bfx bifury bitforce bfsb bigpic bitfury cointerra cpumining drillbit dualminer hashbuster hashbuster2 hashfast icarus jingtian klondike littlefury metabank modminer nanofury opencl proxy rockminer twinfury x6500 ztex ) )
+	twinfury? ( bitfury )
+	unicode? ( ncurses )
+	proxy? ( || ( proxy_getwork proxy_stratum ) )
+	proxy_getwork? ( proxy )
+	proxy_stratum? ( proxy )
+	rockminer? ( sha256d )
+	twinfury? ( sha256d )
+	x6500? ( sha256d libusb )
+	zeusminer? ( scrypt )
+	ztex? ( sha256d libusb )
+'
+
+DEPEND='
+	net-misc/curl
+	ncurses? (
+		sys-libs/ncurses:=[unicode?]
+	)
+	>=dev-libs/jansson-2
+	dev-libs/libbase58
+	net-libs/libblkmaker
+	udev? (
+		virtual/udev
+	)
+	hashbuster? (
+		dev-libs/hidapi
+	)
+	libusb? (
+		virtual/libusb:1
+	)
+	lm_sensors? (
+		sys-apps/lm_sensors
+	)
+	nanofury? (
+		dev-libs/hidapi
+	)
+	proxy_getwork? (
+		net-libs/libmicrohttpd
+	)
+	proxy_stratum? (
+		dev-libs/libevent
+	)
+	screen? (
+		app-misc/screen
+		|| (
+			>=sys-apps/coreutils-8.15
+			sys-freebsd/freebsd-bin
+			app-misc/realpath
+		)
+	)
+'
+RDEPEND="${DEPEND}
+	opencl? (
+		|| (
+			virtual/opencl
+			dev-util/nvidia-cuda-sdk[opencl]
+		)
+	)
+"
+DEPEND="${DEPEND}
+	virtual/pkgconfig
+	>=dev-libs/uthash-1.9.7
+	sys-apps/sed
+	cpumining? (
+		amd64? (
+			>=dev-lang/yasm-1.0.1
+		)
+		x86? (
+			>=dev-lang/yasm-1.0.1
+		)
+	)
+"
+
+src_configure() {
+	local CFLAGS="${CFLAGS}"
+	local with_curses
+	use hardened && CFLAGS="${CFLAGS} -nopie"
+
+	if use ncurses; then
+		if use unicode; then
+			with_curses='--with-curses=ncursesw'
+		else
+			with_curses='--with-curses=ncurses'
+		fi
+	else
+		with_curses='--without-curses'
+	fi
+
+	CFLAGS="${CFLAGS}" \
+	econf \
+		--docdir="/usr/share/doc/${PF}" \
+		$(use_enable adl) \
+		$(use_enable antminer) \
+		$(use_enable avalon) \
+		$(use_enable avalonmm) \
+		$(use_enable bifury) \
+		$(use_enable bitforce) \
+		$(use_enable bfsb) \
+		$(use_enable bfx) \
+		$(use_enable bigpic) \
+		$(use_enable bitfury) \
+		$(use_enable cointerra) \
+		$(use_enable cpumining) \
+		$(use_enable drillbit) \
+		$(use_enable dualminer) \
+		$(use_enable gridseed) \
+		$(use_enable hashbuster) \
+		$(use_enable hashbuster2 hashbusterusb) \
+		$(use_enable hashfast) \
+		$(use_enable icarus) \
+		$(use_enable jingtian) \
+		$(use_enable keccak) \
+		$(use_enable klondike) \
+		$(use_enable littlefury) \
+		$(use_enable metabank) \
+		$(use_enable minion) \
+		$(use_enable modminer) \
+		$(use_enable nanofury) \
+		$(use_enable opencl) \
+		$(use_enable rockminer) \
+		$(use_enable scrypt) \
+		$(use_enable sha256d) \
+		$(use_enable twinfury) \
+		--with-system-libblkmaker \
+		$with_curses \
+		$(use_with udev libudev) \
+		$(use_enable udev-broad-rules broad-udevrules) \
+		$(use_with lm_sensors sensors) \
+		$(use_with proxy_getwork libmicrohttpd) \
+		$(use_with proxy_stratum libevent) \
+		$(use_enable x6500) \
+		$(use_enable zeusminer) \
+		$(use_enable ztex)
+}
+
+src_install() {
+	emake install DESTDIR="$D"
+	if ! use examples; then
+		rm -r "${D}/usr/share/doc/${PF}/rpc-examples"
+	fi
+	if ! use screen; then
+		rm "${D}/usr/bin/start-bfgminer.sh"
+	fi
+}
diff --git a/net-misc/chrome-remote-desktop/Manifest b/net-misc/chrome-remote-desktop/Manifest
index 84e18da07144..8dfeb994235a 100644
--- a/net-misc/chrome-remote-desktop/Manifest
+++ b/net-misc/chrome-remote-desktop/Manifest
@@ -1,6 +1,4 @@
-DIST chrome-remote-desktop_40.0.2214.44_amd64.deb 14745924 SHA256 ad808f914e7929d98ec030a13749139f51fc58a8372cd95eb893cf98f4c7d0d8 SHA512 eeeda7c30e38d8af4e02e7462db0abcf21a3d04410eba82b880f2752b43dcdc970ae835d9fba4f5c7484537394d935e33503eb6e9338475d708a88f9a22058f9 WHIRLPOOL 85d88bc3f417e16a8144eb3c6210c7800c7007d1c92464665c60ac9cd49fb126e887f703000d4e761770ac26029f9a685e49687ff6f2b96a0bb1ffd5d2aa42b1
-DIST chrome-remote-desktop_40.0.2214.44_i386.deb 15490864 SHA256 97e9acefa7330f23f264ba56cc8ad8e9ac3bcdbb26c1a3219bf6203c8845b55e SHA512 56f82a2f051bec8bd365307d91f61c15bbf8dbfc21b0ad26a3be994ccfea028eef7fd83e0ce1bcea25a53a109f33a9a9ab962cb1ffc71075d068d48b4dede43f WHIRLPOOL 56848354bcb8789912548174bc8d1b9a9b2145a9167ca695eb19af84f39226e9729d00db7a00e3e5241a6b181b349e4098d411686e77e5c7e1d73a7eab0497a3
-DIST chrome-remote-desktop_41.0.2272.41_amd64.deb 14857068 SHA256 3d6ed3c527bf0b069f2602b318ee2b39451bbb86768ea5f325ce48e3d75476dd SHA512 41720c209966fd7458f9f5b8b10b7aa19e8ba12b45a9676fa0cfddc54d880c8ece019b2e943daad8d1d8acc1df04c4879fe98272e43ea023e406faedf84a1fa3 WHIRLPOOL e699797fd2b4936851e00655f7204541a56be4b89f53236d70010b4e184ce29bba7afc100e428b4e7d3c51ae98d8350f0ada415f78fc7ab2e4ead62486e8e568
-DIST chrome-remote-desktop_41.0.2272.41_i386.deb 15534358 SHA256 b591a3815366832229902b1d15d9d2cb246651b715c08f58d7d52df1f4d2dad0 SHA512 d9610e93df2e636163935debdeeee25843ca5bd0071330de9c9ce63fda717e6e4d29791822867c37466b80e8136eac4a86678c9d1536300701510f2a8c10658f WHIRLPOOL 94fe2c5eabfb15e4f12d9babac1bb08c406eef21d156051969304411311654ff0d087d44aefbb07b79eb9f3bf93a50ab10ed9f8bc54d0607eee60e5a402b07e7
 DIST chrome-remote-desktop_44.0.2403.44_amd64.deb 15171514 SHA256 ff47c5611447d2b72726aa04d7e4cc78865d488f1390b0a7c5bfd5ebc5139415 SHA512 44bbf90d4fd487d25e1bda8d2fef1aed2d2b6cdda6f18df0055aa341ac9e06b76dc49f742d839d20c37d67a46852807ca03eba56d84f9024b71ceed93c4de135 WHIRLPOOL 8e9f6d55ce13380cacc5fbf17808f95be43988231bd57ddd7cc78829810adbadb23f0ba2ac0474cea44b4c424c983f8806e33f2f0ac1f01f630354934f22a60f
 DIST chrome-remote-desktop_44.0.2403.44_i386.deb 16004938 SHA256 dde48a5cd7ff840857bcb3fad811b9cd1406c800a2332027240f0fb5788d0254 SHA512 5172d73c4bb45835ed3398a7f82f3096241b22f116fb24abf719c9160f234b82c3bf46f0d7b5ce43f1f50c62a39291ea2644876dc4af77a90fb11f8301b585b3 WHIRLPOOL ef3f3326c20f67bff9d1788ed6c70673051fff1ac309644b7edcd3fe2a2dbbeb1f7f17d269187185f4a06f0a154109793f11eeb87387c1229939b88bd2f9322e
+DIST chrome-remote-desktop_45.0.2454.17_amd64.deb 15349384 SHA256 c176730b1d42c1855804836ab7532dce9523710c7f68db11811a2d8b4fc4f2a7 SHA512 139b50d607db138d674fe1b7159ab7ec08a8a574b3114ed21eb5b1f82b6b9b447348ad0b28d3752ec1f54855e95ff439af08c3b1f7b2928efbcec3ca795817da WHIRLPOOL 045ed2dd8c64a1b8be6f87f970e241977ee19de92061c97e231a9ca7bb2e926ec2b80c36ccb09e67bf65b78e87c7b21aaae84d278f89d93eb356d6034a15a73f
+DIST chrome-remote-desktop_45.0.2454.17_i386.deb 16146850 SHA256 c4687db4424f0cd867db6926d3a1d458c19baa77c176064fbb707bf38e8f68f4 SHA512 59441ca3f4a9177e8999bc9953fd7b58aaae9afcc8d55252ff0d3dac965c7aec632bb708a925e56ef1d2351b7dc3415f238ce88a9975d99d86565f78fb19e6b1 WHIRLPOOL 1690447e012af6740c10f8a4c6dceeb75e24219c4101e230da26d7f87bdc14c46079af2f72d1a99bec57a3e8bfc0e3a1955ad5d165338f6426cd85fd7bd0fff7
diff --git a/net-misc/chrome-remote-desktop/chrome-remote-desktop-40.0.2214.44.ebuild b/net-misc/chrome-remote-desktop/chrome-remote-desktop-40.0.2214.44.ebuild
deleted file mode 100644
index f07ac10a6580..000000000000
--- a/net-misc/chrome-remote-desktop/chrome-remote-desktop-40.0.2214.44.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-# Base URL: https://dl.google.com/linux/chrome-remote-desktop/deb/
-# Fetch the Release file:
-#  https://dl.google.com/linux/chrome-remote-desktop/deb/dists/stable/Release
-# Which gives you the Packages file:
-#  https://dl.google.com/linux/chrome-remote-desktop/deb/dists/stable/main/binary-i386/Packages
-#  https://dl.google.com/linux/chrome-remote-desktop/deb/dists/stable/main/binary-amd64/Packages
-# And finally gives you the file name:
-#  pool/main/c/chrome-remote-desktop/chrome-remote-desktop_29.0.1547.32_amd64.deb
-#
-# Use curl to find the answer:
-#  curl -q https://dl.google.com/linux/chrome-remote-desktop/deb/dists/stable/main/binary-i386/Packages | grep ^Filename
-
-EAPI="4"
-
-inherit unpacker
-
-DESCRIPTION="access remote computers via Chrome!"
-PLUGIN_URL="https://chrome.google.com/remotedesktop"
-HOMEPAGE="https://support.google.com/chrome/answer/1649523 ${PLUGIN_URL}"
-BASE_URI="https://dl.google.com/linux/chrome-remote-desktop/deb/pool/main/c/${PN}/${PN}_${PV}"
-SRC_URI="amd64? ( ${BASE_URI}_amd64.deb )
-	x86? ( ${BASE_URI}_i386.deb )"
-
-LICENSE="google-chrome"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE=""
-
-# All the libs this package links against.
-RDEPEND="app-admin/sudo
-	dev-lang/python
-	>=dev-libs/expat-2
-	dev-libs/glib:2
-	dev-libs/nspr
-	dev-libs/nss
-	dev-python/psutil
-	gnome-base/gconf:2
-	media-libs/fontconfig
-	media-libs/freetype:2
-	sys-devel/gcc
-	sys-libs/glibc
-	sys-libs/pam
-	x11-libs/cairo
-	x11-libs/gtk+:2
-	x11-libs/libX11
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXi
-	x11-libs/libXrandr
-	x11-libs/libXtst
-	x11-libs/pango"
-# Settings we just need at runtime.
-RDEPEND+="
-	x11-base/xorg-server[xvfb]"
-DEPEND=""
-
-S=${WORKDIR}
-
-QA_PREBUILT="/opt/google/chrome-remote-desktop/*"
-
-src_install() {
-	insinto /etc
-	doins -r etc/opt
-
-	insinto /opt
-	doins -r opt/google
-	chmod a+rx "${ED}"/opt/google/${PN}/* || die
-
-	dodir /etc/pam.d
-	dosym system-remote-login /etc/pam.d/${PN}
-
-	dodoc usr/share/doc/${PN}/changelog*
-
-	newinitd "${FILESDIR}"/${PN}.rc ${PN}
-	newconfd "${FILESDIR}"/${PN}.conf.d ${PN}
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]] ; then
-		elog "Two ways to launch the server:"
-		elog "(1) access an existing desktop"
-		elog "    (a) install the Chrome plugin on the server & client:"
-		elog "        ${PLUGIN_URL}"
-		elog "    (b) on the server, run the Chrome plugin & enable remote access"
-		elog "    (c) on the client, connect to the server"
-		elog "(2) headless system"
-		elog "    (a) install the Chrome plugin on the client:"
-		elog "        ${PLUGIN_URL}"
-		elog "    (b) visit https://accounts.google.com/o/oauth2/auth?response_type=code&scope=https://www.googleapis.com/auth/chromoting+https://www.googleapis.com/auth/googletalk+https://www.googleapis.com/auth/userinfo.email&access_type=offline&redirect_uri=https://chromoting-auth.googleplex.com/auth&approval_prompt=force&client_id=440925447803-avn2sj1kc099s0r7v62je5s339mu0am1.apps.googleusercontent.com&hl=en&from_login=1&as=-760f476eeaec11b8&pli=1&authuser=0"
-		elog "    (c) run the command mentioned on the server"
-		elog "    (d) on the client, connect to the server"
-		elog
-		elog "Configuration settings you might want to be aware of:"
-		elog "  ~/.${PN}-session - shell script to start your session"
-		elog "  /etc/init.d/${PN} - script to auto-restart server"
-	fi
-}
diff --git a/net-misc/chrome-remote-desktop/chrome-remote-desktop-41.0.2272.41-r1.ebuild b/net-misc/chrome-remote-desktop/chrome-remote-desktop-41.0.2272.41-r1.ebuild
deleted file mode 100644
index 0d69171a4d5e..000000000000
--- a/net-misc/chrome-remote-desktop/chrome-remote-desktop-41.0.2272.41-r1.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-# Base URL: https://dl.google.com/linux/chrome-remote-desktop/deb/
-# Fetch the Release file:
-#  https://dl.google.com/linux/chrome-remote-desktop/deb/dists/stable/Release
-# Which gives you the Packages file:
-#  https://dl.google.com/linux/chrome-remote-desktop/deb/dists/stable/main/binary-i386/Packages
-#  https://dl.google.com/linux/chrome-remote-desktop/deb/dists/stable/main/binary-amd64/Packages
-# And finally gives you the file name:
-#  pool/main/c/chrome-remote-desktop/chrome-remote-desktop_29.0.1547.32_amd64.deb
-#
-# Use curl to find the answer:
-#  curl -q https://dl.google.com/linux/chrome-remote-desktop/deb/dists/stable/main/binary-i386/Packages | grep ^Filename
-
-EAPI="4"
-
-inherit unpacker eutils
-
-DESCRIPTION="access remote computers via Chrome!"
-PLUGIN_URL="https://chrome.google.com/remotedesktop"
-HOMEPAGE="https://support.google.com/chrome/answer/1649523 ${PLUGIN_URL}"
-BASE_URI="https://dl.google.com/linux/chrome-remote-desktop/deb/pool/main/c/${PN}/${PN}_${PV}"
-SRC_URI="amd64? ( ${BASE_URI}_amd64.deb )
-	x86? ( ${BASE_URI}_i386.deb )"
-
-LICENSE="google-chrome"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE=""
-
-# All the libs this package links against.
-RDEPEND="app-admin/sudo
-	dev-lang/python
-	>=dev-libs/expat-2
-	dev-libs/glib:2
-	dev-libs/nspr
-	dev-libs/nss
-	dev-python/psutil
-	gnome-base/gconf:2
-	media-libs/fontconfig
-	media-libs/freetype:2
-	sys-devel/gcc
-	sys-libs/glibc
-	sys-libs/pam
-	x11-libs/cairo
-	x11-libs/gtk+:2
-	x11-libs/libX11
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXi
-	x11-libs/libXrandr
-	x11-libs/libXtst
-	x11-libs/pango"
-# Settings we just need at runtime.
-RDEPEND+="
-	x11-base/xorg-server[xvfb]"
-DEPEND=""
-
-S=${WORKDIR}
-
-QA_PREBUILT="/opt/google/chrome-remote-desktop/*"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-41.0.2272.41-always-sudo.patch #541708
-}
-
-src_install() {
-	insinto /etc
-	doins -r etc/opt
-
-	insinto /opt
-	doins -r opt/google
-	chmod a+rx "${ED}"/opt/google/${PN}/* || die
-
-	dodir /etc/pam.d
-	dosym system-remote-login /etc/pam.d/${PN}
-
-	dodoc usr/share/doc/${PN}/changelog*
-
-	newinitd "${FILESDIR}"/${PN}.rc ${PN}
-	newconfd "${FILESDIR}"/${PN}.conf.d ${PN}
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]] ; then
-		elog "Two ways to launch the server:"
-		elog "(1) access an existing desktop"
-		elog "    (a) install the Chrome plugin on the server & client:"
-		elog "        ${PLUGIN_URL}"
-		elog "    (b) on the server, run the Chrome plugin & enable remote access"
-		elog "    (c) on the client, connect to the server"
-		elog "(2) headless system"
-		elog "    (a) install the Chrome plugin on the client:"
-		elog "        ${PLUGIN_URL}"
-		elog "    (b) visit https://accounts.google.com/o/oauth2/auth?response_type=code&scope=https://www.googleapis.com/auth/chromoting+https://www.googleapis.com/auth/googletalk+https://www.googleapis.com/auth/userinfo.email&access_type=offline&redirect_uri=https://chromoting-auth.googleplex.com/auth&approval_prompt=force&client_id=440925447803-avn2sj1kc099s0r7v62je5s339mu0am1.apps.googleusercontent.com&hl=en&from_login=1&as=-760f476eeaec11b8&pli=1&authuser=0"
-		elog "    (c) run the command mentioned on the server"
-		elog "    (d) on the client, connect to the server"
-		elog
-		elog "Configuration settings you might want to be aware of:"
-		elog "  ~/.${PN}-session - shell script to start your session"
-		elog "  /etc/init.d/${PN} - script to auto-restart server"
-	fi
-}
diff --git a/net-misc/chrome-remote-desktop/chrome-remote-desktop-41.0.2272.41.ebuild b/net-misc/chrome-remote-desktop/chrome-remote-desktop-41.0.2272.41.ebuild
deleted file mode 100644
index f07ac10a6580..000000000000
--- a/net-misc/chrome-remote-desktop/chrome-remote-desktop-41.0.2272.41.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-# Base URL: https://dl.google.com/linux/chrome-remote-desktop/deb/
-# Fetch the Release file:
-#  https://dl.google.com/linux/chrome-remote-desktop/deb/dists/stable/Release
-# Which gives you the Packages file:
-#  https://dl.google.com/linux/chrome-remote-desktop/deb/dists/stable/main/binary-i386/Packages
-#  https://dl.google.com/linux/chrome-remote-desktop/deb/dists/stable/main/binary-amd64/Packages
-# And finally gives you the file name:
-#  pool/main/c/chrome-remote-desktop/chrome-remote-desktop_29.0.1547.32_amd64.deb
-#
-# Use curl to find the answer:
-#  curl -q https://dl.google.com/linux/chrome-remote-desktop/deb/dists/stable/main/binary-i386/Packages | grep ^Filename
-
-EAPI="4"
-
-inherit unpacker
-
-DESCRIPTION="access remote computers via Chrome!"
-PLUGIN_URL="https://chrome.google.com/remotedesktop"
-HOMEPAGE="https://support.google.com/chrome/answer/1649523 ${PLUGIN_URL}"
-BASE_URI="https://dl.google.com/linux/chrome-remote-desktop/deb/pool/main/c/${PN}/${PN}_${PV}"
-SRC_URI="amd64? ( ${BASE_URI}_amd64.deb )
-	x86? ( ${BASE_URI}_i386.deb )"
-
-LICENSE="google-chrome"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE=""
-
-# All the libs this package links against.
-RDEPEND="app-admin/sudo
-	dev-lang/python
-	>=dev-libs/expat-2
-	dev-libs/glib:2
-	dev-libs/nspr
-	dev-libs/nss
-	dev-python/psutil
-	gnome-base/gconf:2
-	media-libs/fontconfig
-	media-libs/freetype:2
-	sys-devel/gcc
-	sys-libs/glibc
-	sys-libs/pam
-	x11-libs/cairo
-	x11-libs/gtk+:2
-	x11-libs/libX11
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXi
-	x11-libs/libXrandr
-	x11-libs/libXtst
-	x11-libs/pango"
-# Settings we just need at runtime.
-RDEPEND+="
-	x11-base/xorg-server[xvfb]"
-DEPEND=""
-
-S=${WORKDIR}
-
-QA_PREBUILT="/opt/google/chrome-remote-desktop/*"
-
-src_install() {
-	insinto /etc
-	doins -r etc/opt
-
-	insinto /opt
-	doins -r opt/google
-	chmod a+rx "${ED}"/opt/google/${PN}/* || die
-
-	dodir /etc/pam.d
-	dosym system-remote-login /etc/pam.d/${PN}
-
-	dodoc usr/share/doc/${PN}/changelog*
-
-	newinitd "${FILESDIR}"/${PN}.rc ${PN}
-	newconfd "${FILESDIR}"/${PN}.conf.d ${PN}
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]] ; then
-		elog "Two ways to launch the server:"
-		elog "(1) access an existing desktop"
-		elog "    (a) install the Chrome plugin on the server & client:"
-		elog "        ${PLUGIN_URL}"
-		elog "    (b) on the server, run the Chrome plugin & enable remote access"
-		elog "    (c) on the client, connect to the server"
-		elog "(2) headless system"
-		elog "    (a) install the Chrome plugin on the client:"
-		elog "        ${PLUGIN_URL}"
-		elog "    (b) visit https://accounts.google.com/o/oauth2/auth?response_type=code&scope=https://www.googleapis.com/auth/chromoting+https://www.googleapis.com/auth/googletalk+https://www.googleapis.com/auth/userinfo.email&access_type=offline&redirect_uri=https://chromoting-auth.googleplex.com/auth&approval_prompt=force&client_id=440925447803-avn2sj1kc099s0r7v62je5s339mu0am1.apps.googleusercontent.com&hl=en&from_login=1&as=-760f476eeaec11b8&pli=1&authuser=0"
-		elog "    (c) run the command mentioned on the server"
-		elog "    (d) on the client, connect to the server"
-		elog
-		elog "Configuration settings you might want to be aware of:"
-		elog "  ~/.${PN}-session - shell script to start your session"
-		elog "  /etc/init.d/${PN} - script to auto-restart server"
-	fi
-}
diff --git a/net-misc/chrome-remote-desktop/chrome-remote-desktop-45.0.2454.17.ebuild b/net-misc/chrome-remote-desktop/chrome-remote-desktop-45.0.2454.17.ebuild
new file mode 100644
index 000000000000..52f80d8b26cf
--- /dev/null
+++ b/net-misc/chrome-remote-desktop/chrome-remote-desktop-45.0.2454.17.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+# Base URL: https://dl.google.com/linux/chrome-remote-desktop/deb/
+# Fetch the Release file:
+#  https://dl.google.com/linux/chrome-remote-desktop/deb/dists/stable/Release
+# Which gives you the Packages file:
+#  https://dl.google.com/linux/chrome-remote-desktop/deb/dists/stable/main/binary-i386/Packages
+#  https://dl.google.com/linux/chrome-remote-desktop/deb/dists/stable/main/binary-amd64/Packages
+# And finally gives you the file name:
+#  pool/main/c/chrome-remote-desktop/chrome-remote-desktop_29.0.1547.32_amd64.deb
+#
+# Use curl to find the answer:
+#  curl -q https://dl.google.com/linux/chrome-remote-desktop/deb/dists/stable/main/binary-i386/Packages | grep ^Filename
+
+EAPI="4"
+
+inherit unpacker eutils
+
+DESCRIPTION="access remote computers via Chrome!"
+PLUGIN_URL="https://chrome.google.com/remotedesktop"
+HOMEPAGE="https://support.google.com/chrome/answer/1649523 ${PLUGIN_URL}"
+BASE_URI="https://dl.google.com/linux/chrome-remote-desktop/deb/pool/main/c/${PN}/${PN}_${PV}"
+SRC_URI="amd64? ( ${BASE_URI}_amd64.deb )
+	x86? ( ${BASE_URI}_i386.deb )"
+
+LICENSE="google-chrome"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE=""
+
+# All the libs this package links against.
+RDEPEND="app-admin/sudo
+	dev-lang/python
+	>=dev-libs/expat-2
+	dev-libs/glib:2
+	dev-libs/nspr
+	dev-libs/nss
+	dev-python/psutil
+	gnome-base/gconf:2
+	media-libs/fontconfig
+	media-libs/freetype:2
+	sys-devel/gcc
+	sys-libs/glibc
+	sys-libs/pam
+	x11-libs/cairo
+	x11-libs/gtk+:2
+	x11-libs/libX11
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXi
+	x11-libs/libXrandr
+	x11-libs/libXtst
+	x11-libs/pango"
+# Settings we just need at runtime.
+RDEPEND+="
+	x11-base/xorg-server[xvfb]"
+DEPEND=""
+
+S=${WORKDIR}
+
+QA_PREBUILT="/opt/google/chrome-remote-desktop/*"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-44.0.2403.44-always-sudo.patch #541708
+}
+
+src_install() {
+	insinto /etc
+	doins -r etc/opt
+
+	insinto /opt
+	doins -r opt/google
+	chmod a+rx "${ED}"/opt/google/${PN}/* || die
+
+	dodir /etc/pam.d
+	dosym system-remote-login /etc/pam.d/${PN}
+
+	dodoc usr/share/doc/${PN}/changelog*
+
+	newinitd "${FILESDIR}"/${PN}.rc ${PN}
+	newconfd "${FILESDIR}"/${PN}.conf.d ${PN}
+}
+
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]] ; then
+		elog "Two ways to launch the server:"
+		elog "(1) access an existing desktop"
+		elog "    (a) install the Chrome plugin on the server & client:"
+		elog "        ${PLUGIN_URL}"
+		elog "    (b) on the server, run the Chrome plugin & enable remote access"
+		elog "    (c) on the client, connect to the server"
+		elog "(2) headless system"
+		elog "    (a) install the Chrome plugin on the client:"
+		elog "        ${PLUGIN_URL}"
+		elog "    (b) visit https://accounts.google.com/o/oauth2/auth?response_type=code&scope=https://www.googleapis.com/auth/chromoting+https://www.googleapis.com/auth/googletalk+https://www.googleapis.com/auth/userinfo.email&access_type=offline&redirect_uri=https://chromoting-auth.googleplex.com/auth&approval_prompt=force&client_id=440925447803-avn2sj1kc099s0r7v62je5s339mu0am1.apps.googleusercontent.com&hl=en&from_login=1&as=-760f476eeaec11b8&pli=1&authuser=0"
+		elog "    (c) run the command mentioned on the server"
+		elog "    (d) on the client, connect to the server"
+		elog
+		elog "Configuration settings you might want to be aware of:"
+		elog "  ~/.${PN}-session - shell script to start your session"
+		elog "  /etc/init.d/${PN} - script to auto-restart server"
+	fi
+}
diff --git a/net-misc/chrome-remote-desktop/files/chrome-remote-desktop-41.0.2272.41-always-sudo.patch b/net-misc/chrome-remote-desktop/files/chrome-remote-desktop-41.0.2272.41-always-sudo.patch
deleted file mode 100644
index 39e9d27e9d3a..000000000000
--- a/net-misc/chrome-remote-desktop/files/chrome-remote-desktop-41.0.2272.41-always-sudo.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-https://bugs.gentoo.org/541708
-
-just use `sudo` for everything
-
---- a/opt/google/chrome-remote-desktop/chrome-remote-desktop
-+++ b/opt/google/chrome-remote-desktop/chrome-remote-desktop
-@@ -1092,10 +1092,7 @@
-     except KeyError:
-       logging.info("Group '%s' not found." % CHROME_REMOTING_GROUP_NAME)
- 
--    if os.getenv("DISPLAY"):
--      sudo_command = "gksudo --description \"Chrome Remote Desktop\""
--    else:
--      sudo_command = "sudo"
-+    sudo_command = "sudo"
-     command = ("sudo -k && exec %(sudo)s -- sh -c "
-                "\"groupadd -f %(group)s && gpasswd --add %(user)s %(group)s\"" %
-                { 'group': CHROME_REMOTING_GROUP_NAME,
diff --git a/net-misc/dhcp/Manifest b/net-misc/dhcp/Manifest
index ef99fa7cf3f7..d4813d9c0670 100644
--- a/net-misc/dhcp/Manifest
+++ b/net-misc/dhcp/Manifest
@@ -1,3 +1,4 @@
 DIST dhcp-4.2.5-P1.tar.gz 8255960 SHA256 59b06c9f5d775e46999b422c45b9229402c462b114ce1685617bfb2b8b028250 SHA512 02a811b6e88ce013f7ecff6abf81d4b2aff82fff584521ae03fc3242b6036d0d0ad3afc6283fe8b97d18b8fffd4b6d2253386897ae2297c165240017f5f219ec WHIRLPOOL b8cf91c69ae0e1b234089ce3fae4b9daf5bde7f415d8cbc274ab4d006c8aa25f55807c70ba4c6771e0c9803ec5a99f8cc2088e561cac7d16479f5f022ee5459f
 DIST dhcp-4.3.1.tar.gz 8980806 SHA256 266cbca8a7a6bb8f9ccc5765da0d2b04099329314a54a4fc1022d510ad3e9af0 SHA512 84ca525fda825bf367a98754f1fb1b8eba5b095c92c25ddaec6e30b31008c7d5c43062ae43cecaa43731a8e78ae406a3123906fd402d2ba4b46b7adbae65aa6a WHIRLPOOL 3fd3720f6883b43856d2169264ee2adfb541b793604728c4e5cc3b647d4a88d6245fb6e53062de4118301cc15f0b4388363eba304bf3623dfb88c91bde94b2b6
 DIST dhcp-4.3.2.tar.gz 9230340 SHA256 6246c9b358759f6cdcc45104caaf76e732a211dbbbbf64a21f499c8db1298165 SHA512 b91a0a90736c6e8bd66a74af8c67949c81db3148eba23ee647f0987bbd98543f0dfd1605c94e152b28a606bbbecd94cd8a8112db5f5fe4c3d041101bda1b95da WHIRLPOOL a201cea52e96517ff1dae2b6c05b05da11feb4c2eed6dca539ea5ab3185711377cd7f7ed9ecc5e5f2bc30bc84d73a85d4140154c43b4f0f27a7e0a4a51f56787
+DIST dhcp-4.3.3.tar.gz 9205539 SHA256 553c4945b09b1c1b904c4780f34f72aaefa2fc8c6556715de0bc9d4e3d255ede SHA512 33671816e21456ffec57e2c9ab2d129377096b4e2e5b4ca8194dcd9495c6a9e18a2a5e79d4f05694f3dc841895aa0adb63afd7bd6fe4641eb5a80d3fd7e715d9 WHIRLPOOL 27e7f2fdd1f1f7b3309b444a67e21d139468317538345cc3599e6a47f20489fa5d07018eabe8e32c429f2f16f03c28b22b29bff2ab08972f541c63603bd3df9a
diff --git a/net-misc/dhcp/dhcp-4.2.5_p1-r1.ebuild b/net-misc/dhcp/dhcp-4.2.5_p1-r1.ebuild
deleted file mode 100644
index 8561aa995a05..000000000000
--- a/net-misc/dhcp/dhcp-4.2.5_p1-r1.ebuild
+++ /dev/null
@@ -1,247 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-
-inherit eutils toolchain-funcs user
-
-MY_PV="${PV//_alpha/a}"
-MY_PV="${MY_PV//_beta/b}"
-MY_PV="${MY_PV//_rc/rc}"
-MY_PV="${MY_PV//_p/-P}"
-MY_P="${PN}-${MY_PV}"
-DESCRIPTION="ISC Dynamic Host Configuration Protocol (DHCP) client/server"
-HOMEPAGE="http://www.isc.org/products/DHCP"
-SRC_URI="ftp://ftp.isc.org/isc/dhcp/${MY_P}.tar.gz
-	ftp://ftp.isc.org/isc/dhcp/${MY_PV}/${MY_P}.tar.gz"
-
-LICENSE="ISC BSD SSLeay GPL-2" # GPL-2 only for init script
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-IUSE="+client ipv6 kernel_linux ldap selinux +server ssl vim-syntax"
-
-DEPEND="selinux? ( sec-policy/selinux-dhcp )
-	client? (
-		kernel_linux? (
-			ipv6? ( sys-apps/iproute2 )
-			sys-apps/net-tools
-		)
-	)
-	ldap? (
-		net-nds/openldap
-		ssl? ( dev-libs/openssl )
-	)"
-RDEPEND="${DEPEND}
-	vim-syntax? ( app-vim/dhcpd-syntax )"
-
-S="${WORKDIR}/${MY_P}"
-
-src_unpack() {
-	unpack ${A}
-	# handle local bind hell
-	cd "${S}"/bind
-	unpack ./bind.tar.gz
-}
-
-src_prepare() {
-	# Gentoo patches - these will probably never be accepted upstream
-	# Fix some permission issues
-	epatch "${FILESDIR}"/${PN}-3.0-fix-perms.patch
-	# Enable dhclient to equery NTP servers
-	epatch "${FILESDIR}"/${PN}-4.0-dhclient-ntp.patch
-	# resolvconf support in dhclient-script
-	epatch "${FILESDIR}"/${PN}-4.2.2-dhclient-resolvconf.patch
-	# Stop downing the interface on Linux as that breaks link daemons
-	# such as wpa_supplicant and netplug
-	epatch "${FILESDIR}"/${PN}-3.0.3-dhclient-no-down.patch
-	epatch "${FILESDIR}"/${PN}-4.2.0-errwarn-message.patch
-	# Enable dhclient to get extra configuration from stdin
-	epatch "${FILESDIR}"/${PN}-4.2.2-dhclient-stdin-conf.patch
-	epatch "${FILESDIR}"/${PN}-4.2.2-nogateway.patch #265531
-	epatch "${FILESDIR}"/${PN}-4.2.4-quieter-ping.patch #296921
-	epatch "${FILESDIR}"/${PN}-4.2.4-always-accept-4.patch #437108
-	epatch "${FILESDIR}"/${PN}-4.2.5-iproute2-path.patch #480636
-	epatch "${FILESDIR}"/${PN}-4.2.5-bindtodevice-inet6.patch #471142
-
-	# Brand the version with Gentoo
-	sed -i \
-		-e "/VERSION=/s:'$: Gentoo-${PR}':" \
-		configure || die
-
-	# Change the hook script locations of the scripts
-	sed -i \
-		-e 's,/etc/dhclient-exit-hooks,/etc/dhcp/dhclient-exit-hooks,g' \
-		-e 's,/etc/dhclient-enter-hooks,/etc/dhcp/dhclient-enter-hooks,g' \
-		client/scripts/* || die
-
-	# No need for the linux script to force bash #158540
-	sed -i -e 's,#!/bin/bash,#!/bin/sh,' client/scripts/linux || die
-
-	# Quiet the freebsd logger a little
-	sed -i -e '/LOGGER=/ s/-s -p user.notice //g' client/scripts/freebsd || die
-
-	# Remove these options from the sample config
-	sed -i -r \
-		-e "/(script|host-name|domain-name) /d" \
-		client/dhclient.conf.example || die
-
-	if use client && ! use server ; then
-		sed -i -r \
-			-e '/^SUBDIRS/s:\<(dhcpctl|relay|server)\>::g' \
-			Makefile.in || die
-	elif ! use client && use server ; then
-		sed -i -r \
-			-e '/^SUBDIRS/s:\<client\>::' \
-			Makefile.in || die
-	fi
-
-	# Only install different man pages if we don't have en
-	if [[ " ${LINGUAS} " != *" en "* ]]; then
-		# Install Japanese man pages
-		if [[ " ${LINGUAS} " == *" ja "* && -d doc/ja_JP.eucJP ]]; then
-			einfo "Installing Japanese documention"
-			cp doc/ja_JP.eucJP/dhclient* client
-			cp doc/ja_JP.eucJP/dhcp* common
-		fi
-	fi
-	# Now remove the non-english docs so there are no errors later
-	rm -rf doc/ja_JP.eucJP
-
-	# make the bind build work
-	binddir=${S}/bind
-	cd "${binddir}" || die
-	cat <<-EOF > bindvar.tmp
-	binddir=${binddir}
-	GMAKE=${MAKE:-gmake}
-	EOF
-	epatch "${FILESDIR}"/${PN}-4.2.2-bind-disable.patch
-	cd bind-*/
-	epatch "${FILESDIR}"/${PN}-4.2.2-bind-parallel-build.patch #380717
-	epatch "${FILESDIR}"/${PN}-4.2.2-bind-build-flags.patch
-}
-
-src_configure() {
-	# bind defaults to stupid `/usr/bin/ar`
-	tc-export AR BUILD_CC
-	export ac_cv_path_AR=${AR}
-
-	# this is tested for by the bind build system, and can cause trouble
-	# when cross-building; since dhcp itself doesn't make use of libcap,
-	# simply disable it.
-	export ac_cv_lib_cap_cap_set_proc=no
-
-	# Use FHS sane paths ... some of these have configure options,
-	# but not all, so just do it all here.
-	local e="/etc/dhcp" r="/var/run/dhcp" l="/var/lib/dhcp"
-	cat <<-EOF >> includes/site.h
-	#define _PATH_DHCPD_CONF     "${e}/dhcpd.conf"
-	#define _PATH_DHCLIENT_CONF  "${e}/dhclient.conf"
-	#define _PATH_DHCPD_DB       "${l}/dhcpd.leases"
-	#define _PATH_DHCPD6_DB      "${l}/dhcpd6.leases"
-	#define _PATH_DHCLIENT_DB    "${l}/dhclient.leases"
-	#define _PATH_DHCLIENT6_DB   "${l}/dhclient6.leases"
-	#define _PATH_DHCPD_PID      "${r}/dhcpd.pid"
-	#define _PATH_DHCPD6_PID     "${r}/dhcpd6.pid"
-	#define _PATH_DHCLIENT_PID   "${r}/dhcpclient.pid"
-	#define _PATH_DHCLIENT6_PID  "${r}/dhcpclient6.pid"
-	#define _PATH_DHCRELAY_PID   "${r}/dhcrelay.pid"
-	#define _PATH_DHCRELAY6_PID  "${r}/dhcrelay6.pid"
-	EOF
-
-	econf \
-		--enable-paranoia \
-		--enable-early-chroot \
-		--sysconfdir=${e} \
-		$(use_enable ipv6 dhcpv6) \
-		$(use_with ldap) \
-		$(use ldap && use_with ssl ldapcrypto || echo --without-ldapcrypto)
-
-	# configure local bind cruft.  symtable option requires
-	# perl and we don't want to require that #383837.
-	cd bind/bind-*/ || die
-	eval econf \
-		$(sed -n '/ [.].configure /{s:^[^-]*::;s:>.*::;p}' ../Makefile) \
-		--disable-symtable \
-		--without-make-clean
-}
-
-src_compile() {
-	# build local bind cruft first
-	emake -C bind/bind-*/lib/export install
-	# then build standard dhcp code
-	emake AR="$(tc-getAR)"
-}
-
-src_install() {
-	default
-
-	dodoc README RELNOTES doc/{api+protocol,IANA-arp-parameters}
-	dohtml doc/References.html
-
-	if [[ -e client/dhclient ]] ; then
-		# move the client to /
-		dodir /sbin
-		mv "${D}"/usr/sbin/dhclient "${D}"/sbin/ || die
-
-		exeinto /sbin
-		if use kernel_linux ; then
-			newexe "${S}"/client/scripts/linux dhclient-script
-		else
-			newexe "${S}"/client/scripts/freebsd dhclient-script
-		fi
-	fi
-
-	if [[ -e server/dhcpd ]] ; then
-		if use ldap ; then
-			insinto /etc/openldap/schema
-			doins contrib/ldap/dhcp.*
-			dosbin contrib/ldap/dhcpd-conf-to-ldap
-		fi
-
-		newinitd "${FILESDIR}"/dhcpd.init5 dhcpd
-		newconfd "${FILESDIR}"/dhcpd.conf2 dhcpd
-		newinitd "${FILESDIR}"/dhcrelay.init3 dhcrelay
-		newconfd "${FILESDIR}"/dhcrelay.conf dhcrelay
-		newinitd "${FILESDIR}"/dhcrelay.init3 dhcrelay6
-		newconfd "${FILESDIR}"/dhcrelay6.conf dhcrelay6
-
-		sed -i "s:#@slapd@:$(usex ldap slapd ''):" "${ED}"/etc/init.d/* || die #442560
-	fi
-
-	# the default config files aren't terribly useful #384087
-	local f
-	for f in "${ED}"/etc/dhcp/*.conf.example ; do
-		mv "${f}" "${f%.example}" || die
-	done
-	sed -i '/^[^#]/s:^:#:' "${ED}"/etc/dhcp/*.conf || die
-}
-
-pkg_preinst() {
-	enewgroup dhcp
-	enewuser dhcp -1 -1 /var/lib/dhcp dhcp
-
-	# Keep the user files over the sample ones.  The
-	# hashing is to ignore the crappy defaults #384087.
-	local f h
-	for f in dhclient:da7c8496a96452190aecf9afceef4510 dhcpd:10979e7b71134bd7f04d2a60bd58f070 ; do
-		h=${f#*:}
-		f="/etc/dhcp/${f%:*}.conf"
-		if [ -e "${EROOT}"${f} ] ; then
-			case $(md5sum "${EROOT}"${f}) in
-				${h}*) ;;
-				*) cp -p "${EROOT}"${f} "${ED}"${f};;
-			esac
-		fi
-	done
-}
-
-pkg_postinst() {
-	if [[ -e "${ROOT}"/etc/init.d/dhcp ]] ; then
-		ewarn
-		ewarn "WARNING: The dhcp init script has been renamed to dhcpd"
-		ewarn "/etc/init.d/dhcp and /etc/conf.d/dhcp need to be removed and"
-		ewarn "and dhcp should be removed from the default runlevel"
-		ewarn
-	fi
-}
diff --git a/net-misc/dhcp/dhcp-4.2.5_p1.ebuild b/net-misc/dhcp/dhcp-4.2.5_p1.ebuild
deleted file mode 100644
index 4ef10a979298..000000000000
--- a/net-misc/dhcp/dhcp-4.2.5_p1.ebuild
+++ /dev/null
@@ -1,240 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-
-inherit eutils toolchain-funcs user
-
-MY_PV="${PV//_alpha/a}"
-MY_PV="${MY_PV//_beta/b}"
-MY_PV="${MY_PV//_rc/rc}"
-MY_PV="${MY_PV//_p/-P}"
-MY_P="${PN}-${MY_PV}"
-DESCRIPTION="ISC Dynamic Host Configuration Protocol (DHCP) client/server"
-HOMEPAGE="http://www.isc.org/products/DHCP"
-SRC_URI="ftp://ftp.isc.org/isc/dhcp/${MY_P}.tar.gz
-	ftp://ftp.isc.org/isc/dhcp/${MY_PV}/${MY_P}.tar.gz"
-
-LICENSE="ISC BSD SSLeay GPL-2" # GPL-2 only for init script
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-IUSE="+client ipv6 kernel_linux ldap selinux +server ssl vim-syntax"
-
-DEPEND="selinux? ( sec-policy/selinux-dhcp )
-	client? ( kernel_linux? ( sys-apps/net-tools ) )
-	ldap? (
-		net-nds/openldap
-		ssl? ( dev-libs/openssl )
-	)"
-RDEPEND="${DEPEND}
-	vim-syntax? ( app-vim/dhcpd-syntax )"
-
-S="${WORKDIR}/${MY_P}"
-
-src_unpack() {
-	unpack ${A}
-	# handle local bind hell
-	cd "${S}"/bind
-	unpack ./bind.tar.gz
-}
-
-src_prepare() {
-	# Gentoo patches - these will probably never be accepted upstream
-	# Fix some permission issues
-	epatch "${FILESDIR}"/${PN}-3.0-fix-perms.patch
-	# Enable dhclient to equery NTP servers
-	epatch "${FILESDIR}"/${PN}-4.0-dhclient-ntp.patch
-	# resolvconf support in dhclient-script
-	epatch "${FILESDIR}"/${PN}-4.2.2-dhclient-resolvconf.patch
-	# Stop downing the interface on Linux as that breaks link daemons
-	# such as wpa_supplicant and netplug
-	epatch "${FILESDIR}"/${PN}-3.0.3-dhclient-no-down.patch
-	epatch "${FILESDIR}"/${PN}-4.2.0-errwarn-message.patch
-	# Enable dhclient to get extra configuration from stdin
-	epatch "${FILESDIR}"/${PN}-4.2.2-dhclient-stdin-conf.patch
-	epatch "${FILESDIR}"/${PN}-4.2.2-nogateway.patch #265531
-	epatch "${FILESDIR}"/${PN}-4.2.4-quieter-ping.patch #296921
-	epatch "${FILESDIR}"/${PN}-4.2.4-always-accept-4.patch #437108
-
-	# Brand the version with Gentoo
-	sed -i \
-		-e "/VERSION=/s:'$: Gentoo-${PR}':" \
-		configure || die
-
-	# Change the hook script locations of the scripts
-	sed -i \
-		-e 's,/etc/dhclient-exit-hooks,/etc/dhcp/dhclient-exit-hooks,g' \
-		-e 's,/etc/dhclient-enter-hooks,/etc/dhcp/dhclient-enter-hooks,g' \
-		client/scripts/* || die
-
-	# No need for the linux script to force bash #158540
-	sed -i -e 's,#!/bin/bash,#!/bin/sh,' client/scripts/linux || die
-
-	# Quiet the freebsd logger a little
-	sed -i -e '/LOGGER=/ s/-s -p user.notice //g' client/scripts/freebsd || die
-
-	# Remove these options from the sample config
-	sed -i -r \
-		-e "/(script|host-name|domain-name) /d" \
-		client/dhclient.conf.example || die
-
-	if use client && ! use server ; then
-		sed -i -r \
-			-e '/^SUBDIRS/s:\<(dhcpctl|relay|server)\>::g' \
-			Makefile.in || die
-	elif ! use client && use server ; then
-		sed -i -r \
-			-e '/^SUBDIRS/s:\<client\>::' \
-			Makefile.in || die
-	fi
-
-	# Only install different man pages if we don't have en
-	if [[ " ${LINGUAS} " != *" en "* ]]; then
-		# Install Japanese man pages
-		if [[ " ${LINGUAS} " == *" ja "* && -d doc/ja_JP.eucJP ]]; then
-			einfo "Installing Japanese documention"
-			cp doc/ja_JP.eucJP/dhclient* client
-			cp doc/ja_JP.eucJP/dhcp* common
-		fi
-	fi
-	# Now remove the non-english docs so there are no errors later
-	rm -rf doc/ja_JP.eucJP
-
-	# make the bind build work
-	binddir=${S}/bind
-	cd "${binddir}" || die
-	cat <<-EOF > bindvar.tmp
-	binddir=${binddir}
-	GMAKE=${MAKE:-gmake}
-	EOF
-	epatch "${FILESDIR}"/${PN}-4.2.2-bind-disable.patch
-	cd bind-*/
-	epatch "${FILESDIR}"/${PN}-4.2.2-bind-parallel-build.patch #380717
-	epatch "${FILESDIR}"/${PN}-4.2.2-bind-build-flags.patch
-}
-
-src_configure() {
-	# bind defaults to stupid `/usr/bin/ar`
-	tc-export AR BUILD_CC
-	export ac_cv_path_AR=${AR}
-
-	# this is tested for by the bind build system, and can cause trouble
-	# when cross-building; since dhcp itself doesn't make use of libcap,
-	# simply disable it.
-	export ac_cv_lib_cap_cap_set_proc=no
-
-	# Use FHS sane paths ... some of these have configure options,
-	# but not all, so just do it all here.
-	local e="/etc/dhcp" r="/var/run/dhcp" l="/var/lib/dhcp"
-	cat <<-EOF >> includes/site.h
-	#define _PATH_DHCPD_CONF     "${e}/dhcpd.conf"
-	#define _PATH_DHCLIENT_CONF  "${e}/dhclient.conf"
-	#define _PATH_DHCPD_DB       "${l}/dhcpd.leases"
-	#define _PATH_DHCPD6_DB      "${l}/dhcpd6.leases"
-	#define _PATH_DHCLIENT_DB    "${l}/dhclient.leases"
-	#define _PATH_DHCLIENT6_DB   "${l}/dhclient6.leases"
-	#define _PATH_DHCPD_PID      "${r}/dhcpd.pid"
-	#define _PATH_DHCPD6_PID     "${r}/dhcpd6.pid"
-	#define _PATH_DHCLIENT_PID   "${r}/dhcpclient.pid"
-	#define _PATH_DHCLIENT6_PID  "${r}/dhcpclient6.pid"
-	#define _PATH_DHCRELAY_PID   "${r}/dhcrelay.pid"
-	#define _PATH_DHCRELAY6_PID  "${r}/dhcrelay6.pid"
-	EOF
-
-	econf \
-		--enable-paranoia \
-		--enable-early-chroot \
-		--sysconfdir=${e} \
-		$(use_enable ipv6 dhcpv6) \
-		$(use_with ldap) \
-		$(use ldap && use_with ssl ldapcrypto || echo --without-ldapcrypto)
-
-	# configure local bind cruft.  symtable option requires
-	# perl and we don't want to require that #383837.
-	cd bind/bind-*/ || die
-	eval econf \
-		$(sed -n '/ [.].configure /{s:^[^-]*::;s:>.*::;p}' ../Makefile) \
-		--disable-symtable \
-		--without-make-clean
-}
-
-src_compile() {
-	# build local bind cruft first
-	emake -C bind/bind-*/lib/export install
-	# then build standard dhcp code
-	emake AR="$(tc-getAR)"
-}
-
-src_install() {
-	default
-
-	dodoc README RELNOTES doc/{api+protocol,IANA-arp-parameters}
-	dohtml doc/References.html
-
-	if [[ -e client/dhclient ]] ; then
-		# move the client to /
-		dodir /sbin
-		mv "${D}"/usr/sbin/dhclient "${D}"/sbin/ || die
-
-		exeinto /sbin
-		if use kernel_linux ; then
-			newexe "${S}"/client/scripts/linux dhclient-script
-		else
-			newexe "${S}"/client/scripts/freebsd dhclient-script
-		fi
-	fi
-
-	if [[ -e server/dhcpd ]] ; then
-		if use ldap ; then
-			insinto /etc/openldap/schema
-			doins contrib/ldap/dhcp.*
-			dosbin contrib/ldap/dhcpd-conf-to-ldap
-		fi
-
-		newinitd "${FILESDIR}"/dhcpd.init5 dhcpd
-		newconfd "${FILESDIR}"/dhcpd.conf2 dhcpd
-		newinitd "${FILESDIR}"/dhcrelay.init3 dhcrelay
-		newconfd "${FILESDIR}"/dhcrelay.conf dhcrelay
-		newinitd "${FILESDIR}"/dhcrelay.init3 dhcrelay6
-		newconfd "${FILESDIR}"/dhcrelay6.conf dhcrelay6
-
-		sed -i "s:#@slapd@:$(usex ldap slapd ''):" "${ED}"/etc/init.d/* || die #442560
-	fi
-
-	# the default config files aren't terribly useful #384087
-	local f
-	for f in "${ED}"/etc/dhcp/*.conf.example ; do
-		mv "${f}" "${f%.example}" || die
-	done
-	sed -i '/^[^#]/s:^:#:' "${ED}"/etc/dhcp/*.conf || die
-}
-
-pkg_preinst() {
-	enewgroup dhcp
-	enewuser dhcp -1 -1 /var/lib/dhcp dhcp
-
-	# Keep the user files over the sample ones.  The
-	# hashing is to ignore the crappy defaults #384087.
-	local f h
-	for f in dhclient:da7c8496a96452190aecf9afceef4510 dhcpd:10979e7b71134bd7f04d2a60bd58f070 ; do
-		h=${f#*:}
-		f="/etc/dhcp/${f%:*}.conf"
-		if [ -e "${EROOT}"${f} ] ; then
-			case $(md5sum "${EROOT}"${f}) in
-				${h}*) ;;
-				*) cp -p "${EROOT}"${f} "${ED}"${f};;
-			esac
-		fi
-	done
-}
-
-pkg_postinst() {
-	if [[ -e "${ROOT}"/etc/init.d/dhcp ]] ; then
-		ewarn
-		ewarn "WARNING: The dhcp init script has been renamed to dhcpd"
-		ewarn "/etc/init.d/dhcp and /etc/conf.d/dhcp need to be removed and"
-		ewarn "and dhcp should be removed from the default runlevel"
-		ewarn
-	fi
-}
diff --git a/net-misc/dhcp/dhcp-4.3.3.ebuild b/net-misc/dhcp/dhcp-4.3.3.ebuild
new file mode 100644
index 000000000000..b5a75fa4cbdc
--- /dev/null
+++ b/net-misc/dhcp/dhcp-4.3.3.ebuild
@@ -0,0 +1,254 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+
+inherit eutils systemd toolchain-funcs user
+
+MY_PV="${PV//_alpha/a}"
+MY_PV="${MY_PV//_beta/b}"
+MY_PV="${MY_PV//_rc/rc}"
+MY_PV="${MY_PV//_p/-P}"
+MY_P="${PN}-${MY_PV}"
+DESCRIPTION="ISC Dynamic Host Configuration Protocol (DHCP) client/server"
+HOMEPAGE="http://www.isc.org/products/DHCP"
+SRC_URI="ftp://ftp.isc.org/isc/dhcp/${MY_P}.tar.gz
+	ftp://ftp.isc.org/isc/dhcp/${MY_PV}/${MY_P}.tar.gz"
+
+LICENSE="ISC BSD SSLeay GPL-2" # GPL-2 only for init script
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+IUSE="+client ipv6 kernel_linux ldap selinux +server ssl vim-syntax"
+
+DEPEND="
+	client? (
+		kernel_linux? (
+			ipv6? ( sys-apps/iproute2 )
+			sys-apps/net-tools
+		)
+	)
+	ldap? (
+		net-nds/openldap
+		ssl? ( dev-libs/openssl )
+	)"
+RDEPEND="${DEPEND}
+	selinux? ( sec-policy/selinux-dhcp )
+	vim-syntax? ( app-vim/dhcpd-syntax )"
+
+S="${WORKDIR}/${MY_P}"
+
+src_unpack() {
+	unpack ${A}
+	# handle local bind hell
+	cd "${S}"/bind
+	unpack ./bind.tar.gz
+}
+
+src_prepare() {
+	# Gentoo patches - these will probably never be accepted upstream
+	# Fix some permission issues
+	epatch "${FILESDIR}"/${PN}-3.0-fix-perms.patch
+	# Enable dhclient to equery NTP servers
+	epatch "${FILESDIR}"/${PN}-4.0-dhclient-ntp.patch
+	epatch "${FILESDIR}"/${PN}-4.3.1-dhclient-resolvconf.patch
+	# Stop downing the interface on Linux as that breaks link daemons
+	# such as wpa_supplicant and netplug
+	epatch "${FILESDIR}"/${PN}-3.0.3-dhclient-no-down.patch
+	# Enable dhclient to get extra configuration from stdin
+	epatch "${FILESDIR}"/${PN}-4.2.2-dhclient-stdin-conf.patch
+	epatch "${FILESDIR}"/${PN}-4.2.2-nogateway.patch #265531
+	epatch "${FILESDIR}"/${PN}-4.2.4-quieter-ping.patch #296921
+	epatch "${FILESDIR}"/${PN}-4.2.4-always-accept-4.patch #437108
+	epatch "${FILESDIR}"/${PN}-4.2.5-iproute2-path.patch #480636
+	epatch "${FILESDIR}"/${PN}-4.2.5-bindtodevice-inet6.patch #471142
+
+	# Brand the version with Gentoo
+	sed -i \
+		-e "/VERSION=/s:'$: Gentoo-${PR}':" \
+		configure || die
+
+	# Change the hook script locations of the scripts
+	sed -i \
+		-e 's,/etc/dhclient-exit-hooks,/etc/dhcp/dhclient-exit-hooks,g' \
+		-e 's,/etc/dhclient-enter-hooks,/etc/dhcp/dhclient-enter-hooks,g' \
+		client/scripts/* || die
+
+	# No need for the linux script to force bash #158540
+	sed -i -e 's,#!/bin/bash,#!/bin/sh,' client/scripts/linux || die
+
+	# Quiet the freebsd logger a little
+	sed -i -e '/LOGGER=/ s/-s -p user.notice //g' client/scripts/freebsd || die
+
+	# Remove these options from the sample config
+	sed -i -r \
+		-e "/(script|host-name|domain-name) /d" \
+		client/dhclient.conf.example || die
+
+	if use client && ! use server ; then
+		sed -i -r \
+			-e '/^SUBDIRS/s:\<(dhcpctl|relay|server)\>::g' \
+			Makefile.in || die
+	elif ! use client && use server ; then
+		sed -i -r \
+			-e '/^SUBDIRS/s:\<client\>::' \
+			Makefile.in || die
+	fi
+
+	# Only install different man pages if we don't have en
+	if [[ " ${LINGUAS} " != *" en "* ]]; then
+		# Install Japanese man pages
+		if [[ " ${LINGUAS} " == *" ja "* && -d doc/ja_JP.eucJP ]]; then
+			einfo "Installing Japanese documention"
+			cp doc/ja_JP.eucJP/dhclient* client
+			cp doc/ja_JP.eucJP/dhcp* common
+		fi
+	fi
+	# Now remove the non-english docs so there are no errors later
+	rm -rf doc/ja_JP.eucJP
+
+	# make the bind build work
+	binddir=${S}/bind
+	cd "${binddir}" || die
+	cat <<-EOF > bindvar.tmp
+	binddir=${binddir}
+	GMAKE=${MAKE:-gmake}
+	EOF
+	epatch "${FILESDIR}"/${PN}-4.3.3-bind-disable.patch
+	cd bind-*/
+	epatch "${FILESDIR}"/${PN}-4.2.2-bind-parallel-build.patch #380717
+	epatch "${FILESDIR}"/${PN}-4.2.2-bind-build-flags.patch
+}
+
+src_configure() {
+	# bind defaults to stupid `/usr/bin/ar`
+	tc-export AR BUILD_CC
+	export ac_cv_path_AR=${AR}
+
+	# this is tested for by the bind build system, and can cause trouble
+	# when cross-building; since dhcp itself doesn't make use of libcap,
+	# simply disable it.
+	export ac_cv_lib_cap_cap_set_proc=no
+
+	# Use FHS sane paths ... some of these have configure options,
+	# but not all, so just do it all here.
+	local e="/etc/dhcp" r="/var/run/dhcp" l="/var/lib/dhcp"
+	cat <<-EOF >> includes/site.h
+	#define _PATH_DHCPD_CONF     "${e}/dhcpd.conf"
+	#define _PATH_DHCLIENT_CONF  "${e}/dhclient.conf"
+	#define _PATH_DHCPD_DB       "${l}/dhcpd.leases"
+	#define _PATH_DHCPD6_DB      "${l}/dhcpd6.leases"
+	#define _PATH_DHCLIENT_DB    "${l}/dhclient.leases"
+	#define _PATH_DHCLIENT6_DB   "${l}/dhclient6.leases"
+	#define _PATH_DHCPD_PID      "${r}/dhcpd.pid"
+	#define _PATH_DHCPD6_PID     "${r}/dhcpd6.pid"
+	#define _PATH_DHCLIENT_PID   "${r}/dhcpclient.pid"
+	#define _PATH_DHCLIENT6_PID  "${r}/dhcpclient6.pid"
+	#define _PATH_DHCRELAY_PID   "${r}/dhcrelay.pid"
+	#define _PATH_DHCRELAY6_PID  "${r}/dhcrelay6.pid"
+	EOF
+
+	econf \
+		--enable-paranoia \
+		--enable-early-chroot \
+		--sysconfdir=${e} \
+		$(use_enable ipv6 dhcpv6) \
+		$(use_with ldap) \
+		$(use ldap && use_with ssl ldapcrypto || echo --without-ldapcrypto)
+
+	# configure local bind cruft.  symtable option requires
+	# perl and we don't want to require that #383837.
+	cd bind/bind-*/ || die
+	eval econf \
+		$(sed -n '/^bindconfig =/,/^$/{:a;N;$!ba;s,^[^-]*,,;s,\\\s*\n\s*--,--,g;s, @[[:upper:]]\+@,,g;P;D}' ../Makefile.in) \
+		--disable-symtable \
+		--without-make-clean
+}
+
+src_compile() {
+	# build local bind cruft first
+	emake -C bind/bind-*/lib/export install
+	# then build standard dhcp code
+	emake AR="$(tc-getAR)"
+}
+
+src_install() {
+	default
+
+	dodoc README RELNOTES doc/{api+protocol,IANA-arp-parameters}
+	dohtml doc/References.html
+
+	if [[ -e client/dhclient ]] ; then
+		# move the client to /
+		dodir /sbin
+		mv "${D}"/usr/sbin/dhclient "${D}"/sbin/ || die
+
+		exeinto /sbin
+		if use kernel_linux ; then
+			newexe "${S}"/client/scripts/linux dhclient-script
+		else
+			newexe "${S}"/client/scripts/freebsd dhclient-script
+		fi
+	fi
+
+	if [[ -e server/dhcpd ]] ; then
+		if use ldap ; then
+			insinto /etc/openldap/schema
+			doins contrib/ldap/dhcp.*
+			dosbin contrib/ldap/dhcpd-conf-to-ldap
+		fi
+
+		newinitd "${FILESDIR}"/dhcpd.init5 dhcpd
+		newconfd "${FILESDIR}"/dhcpd.conf2 dhcpd
+		newinitd "${FILESDIR}"/dhcrelay.init3 dhcrelay
+		newconfd "${FILESDIR}"/dhcrelay.conf dhcrelay
+		newinitd "${FILESDIR}"/dhcrelay.init3 dhcrelay6
+		newconfd "${FILESDIR}"/dhcrelay6.conf dhcrelay6
+
+		systemd_newtmpfilesd "${FILESDIR}"/dhcpd.tmpfiles dhcpd.conf
+		systemd_dounit "${FILESDIR}"/dhcpd4.service
+		systemd_dounit "${FILESDIR}"/dhcpd6.service
+		systemd_dounit "${FILESDIR}"/dhcrelay4.service
+		systemd_dounit "${FILESDIR}"/dhcrelay6.service
+		systemd_install_serviced "${FILESDIR}"/dhcrelay4.service.conf
+		systemd_install_serviced "${FILESDIR}"/dhcrelay6.service.conf
+
+		sed -i "s:#@slapd@:$(usex ldap slapd ''):" "${ED}"/etc/init.d/* || die #442560
+	fi
+
+	# the default config files aren't terribly useful #384087
+	local f
+	for f in "${ED}"/etc/dhcp/*.conf.example ; do
+		mv "${f}" "${f%.example}" || die
+	done
+	sed -i '/^[^#]/s:^:#:' "${ED}"/etc/dhcp/*.conf || die
+}
+
+pkg_preinst() {
+	enewgroup dhcp
+	enewuser dhcp -1 -1 /var/lib/dhcp dhcp
+
+	# Keep the user files over the sample ones.  The
+	# hashing is to ignore the crappy defaults #384087.
+	local f h
+	for f in dhclient:da7c8496a96452190aecf9afceef4510 dhcpd:10979e7b71134bd7f04d2a60bd58f070 ; do
+		h=${f#*:}
+		f="/etc/dhcp/${f%:*}.conf"
+		if [ -e "${EROOT}"${f} ] ; then
+			case $(md5sum "${EROOT}"${f}) in
+				${h}*) ;;
+				*) cp -p "${EROOT}"${f} "${ED}"${f};;
+			esac
+		fi
+	done
+}
+
+pkg_postinst() {
+	if [[ -e "${ROOT}"/etc/init.d/dhcp ]] ; then
+		ewarn
+		ewarn "WARNING: The dhcp init script has been renamed to dhcpd"
+		ewarn "/etc/init.d/dhcp and /etc/conf.d/dhcp need to be removed and"
+		ewarn "and dhcp should be removed from the default runlevel"
+		ewarn
+	fi
+}
diff --git a/net-misc/dhcp/files/dhcp-4.3.3-bind-disable.patch b/net-misc/dhcp/files/dhcp-4.3.3-bind-disable.patch
new file mode 100644
index 000000000000..1064bbf8e469
--- /dev/null
+++ b/net-misc/dhcp/files/dhcp-4.3.3-bind-disable.patch
@@ -0,0 +1,30 @@
+--- dhcp-4.3.3/bind/Makefile.in
++++ dhcp-4.3.3/bind/Makefile.in
+@@ -40,6 +40,7 @@
+ @BIND_ATF_TRUE@all: bind1 atf bind2
+ 
+ bind1:
++disable:
+ # Extract the source from the tarball, if it hasn't been already.
+ 	@if test -d ${bindsrcdir} ; then                    \
+ 		echo ${bindsrcdir} already unpacked... ;    \
+@@ -68,6 +69,7 @@
+ 	fi
+ 
+ atf:
++disable:
+ # Build and copy the ATF support if not yet installed.
+ 	@if test -d ./atf ; then				      \
+ 		echo ATF support already installed ;		      \
+@@ -79,6 +81,7 @@
+ 	fi
+ 
+ bind2:
++disable:
+ # Build and install the export libraries
+ # No need to do anything if we already have something installed.
+ 	@if test -d ${binddir}/lib ; then                                    \
+--- dhcp-4.3.3/bind/test
++++ dhcp-4.3.3/bind/test
+@@ -0,0 +1 @@
++--disable-kqueue --disable-epoll --disable-devpoll --without-openssl --without-libxml2 --enable-exportlib --with-gssapi=no --enable-threads=no @BINDCONFIG@ --with-export-includedir=${binddir}/include --with-export-libdir=${binddir}/lib
diff --git a/net-misc/dhcpcd/Manifest b/net-misc/dhcpcd/Manifest
index 1c93fe263fb9..7cf8786a6f23 100644
--- a/net-misc/dhcpcd/Manifest
+++ b/net-misc/dhcpcd/Manifest
@@ -1,3 +1,4 @@
 DIST dhcpcd-6.9.0.tar.bz2 176736 SHA256 1566a58ef785880c07762ff6c520e974cf42872be5fbb23b4520f4446b120a68 SHA512 bb02005ff54ad722961208be69f48c61fb72cf56c9ca89348f3e0973e96317b06b4eaf48412ec5e763c9e20bad6f38e06d520048f3412d3bf46716f5dfb671a6 WHIRLPOOL 450b89ff260cfef8e865d1f02b7aa7119d0e37a231d08577545d0091496cee370f5f9c2614e6d5ef2b9a99b412d909d3ed4711c7433b6de085b7dc62df84a4fb
 DIST dhcpcd-6.9.1.tar.xz 175656 SHA256 c03b750e1fe2890b62ac0e7d7092a1698b598adb6f88b67916586a619f7c066f SHA512 87ecd54fc94eb3fbebbf87c4037da4767f31ca60718c5fd8cc3dcff4c3294edf7808627ef909120b668f1b767f0d588dddb7c1920a971c86bdc83f72b64e33a3 WHIRLPOOL d8ef71fef224101a785c838ae48fbe440e7b3ca0f07d435d0a9f7a3fef458e28c094b08966ac88a25ec92fbadcfc06a52d55c39f5772427958f715d665cfe0e9
 DIST dhcpcd-6.9.2.tar.xz 176240 SHA256 e9f82422a35ad1f4f5f888a433a76e98e3cdd4419886c29ccbfb336eecc58a70 SHA512 9eb9dccdd26d9b088cf1bfdcef0ebcb83b8f18f1058a8ce385c3f69ab30682814215c24fbe5903d6a9ee7b4a5fbc93504949513987525515e1f597183e8b6920 WHIRLPOOL 86788c68d92ce774a96806bdcd03ff624ccf632f9bc5627cab218e63824e4da9d997300453de2d0fe299127880dc6d51a1bc9130246bebb425d32e1315f62455
+DIST dhcpcd-6.9.3.tar.xz 176320 SHA256 6089471ed695fa62ac8351466b96b4b6365fd14ec455a120a6524663808eae53 SHA512 0a895f17fa093ac758224bfddad003ee25f81fe96331b1952264c3623018e00048603c9a3c5ba385a93441e987b1ce4cd02ec1f42e1caca2e646a6ac4781c3d9 WHIRLPOOL 6de1622444cf393287abbd469016f3c3cc0a99e6ecc4b781c5b9e0389c899365cfefa46e93d16872e6427517f92ff4750e3a246604562922836ae112dbd4349d
diff --git a/net-misc/dhcpcd/dhcpcd-6.9.3.ebuild b/net-misc/dhcpcd/dhcpcd-6.9.3.ebuild
new file mode 100644
index 000000000000..3db5ed559d33
--- /dev/null
+++ b/net-misc/dhcpcd/dhcpcd-6.9.3.ebuild
@@ -0,0 +1,120 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+if [[ ${PV} == "9999" ]]; then
+	FOSSIL_URI="http://roy.marples.name/projects/dhcpcd"
+else
+	MY_P="${P/_alpha/-alpha}"
+	MY_P="${MY_P/_beta/-beta}"
+	MY_P="${MY_P/_rc/-rc}"
+	SRC_URI="http://roy.marples.name/downloads/${PN}/${MY_P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+	S="${WORKDIR}/${MY_P}"
+fi
+
+inherit eutils systemd toolchain-funcs
+
+DESCRIPTION="A fully featured, yet light weight RFC2131 compliant DHCP client"
+HOMEPAGE="http://roy.marples.name/projects/dhcpcd/"
+LICENSE="BSD-2"
+SLOT="0"
+IUSE="elibc_glibc +embedded ipv6 kernel_linux +udev"
+
+COMMON_DEPEND="udev? ( virtual/udev )"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}"
+
+if [[ ${PV} == "9999" ]]; then
+	DEPEND+=" dev-vcs/fossil"
+
+	src_unpack()
+	{
+		local distdir=${PORTAGE_ACTUAL_DISTDIR:-${DISTDIR}}
+		local repo=${distdir}/fossil/${PN}.fossil
+
+		addwrite "${distdir}"
+
+		if [[ -e "${repo}" ]]; then
+			fossil pull "${FOSSIL_URI}" -R "${repo}" || die
+		else
+			mkdir -p "${distdir}/fossil" || die
+			fossil clone "${FOSSIL_URI}" "${repo}" || die
+		fi
+
+		mkdir -p "${S}" || die
+		cd "${S}" || die
+		fossil open "${repo}" || die
+	}
+fi
+
+src_prepare()
+{
+	epatch_user
+}
+
+src_configure()
+{
+	local dev hooks rundir
+	use udev || dev="--without-dev --without-udev"
+	hooks="--with-hook=ntp.conf"
+	use elibc_glibc && hooks="${hooks} --with-hook=yp.conf"
+	use kernel_linux && rundir="--rundir=${EPREFIX}/run"
+	econf \
+		--prefix="${EPREFIX}" \
+		--libexecdir="${EPREFIX}/lib/dhcpcd" \
+		--dbdir="${EPREFIX}/var/lib/dhcpcd" \
+		--localstatedir="${EPREFIX}/var" \
+		${rundir} \
+		$(use_enable embedded) \
+		$(use_enable ipv6) \
+		${dev} \
+		CC="$(tc-getCC)" \
+		${hooks}
+}
+
+src_install()
+{
+	default
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	systemd_dounit "${FILESDIR}"/${PN}.service
+}
+
+pkg_postinst()
+{
+	# Upgrade the duid file to the new format if needed
+	local old_duid="${ROOT}"/var/lib/dhcpcd/dhcpcd.duid
+	local new_duid="${ROOT}"/etc/dhcpcd.duid
+	if [ -e "${old_duid}" ] && ! grep -q '..:..:..:..:..:..' "${old_duid}"; then
+		sed -i -e 's/\(..\)/\1:/g; s/:$//g' "${old_duid}"
+	fi
+
+	# Move the duid to /etc, a more sensible location
+	if [ -e "${old_duid}" -a ! -e "${new_duid}" ]; then
+		cp -p "${old_duid}" "${new_duid}"
+	fi
+
+	if [ -z "$REPLACING_VERSIONS" ]; then
+		elog
+	 elog "dhcpcd has zeroconf support active by default."
+		elog "This means it will always obtain an IP address even if no"
+		elog "DHCP server can be contacted, which will break any existing"
+		elog "failover support you may have configured in your net configuration."
+		elog "This behaviour can be controlled with the noipv4ll configuration"
+		elog "file option or the -L command line switch."
+		elog "See the dhcpcd and dhcpcd.conf man pages for more details."
+
+		elog
+		elog "Dhcpcd has duid enabled by default, and this may cause issues"
+		elog "with some dhcp servers. For more information, see"
+		elog "https://bugs.gentoo.org/show_bug.cgi?id=477356"
+	fi
+
+	if ! has_version net-dns/bind-tools; then
+		elog
+		elog "If you activate the lookup-hostname hook to look up your hostname"
+		elog "using the dns, you need to install net-dns/bind-tools."
+	fi
+}
diff --git a/net-misc/dleyna-server/dleyna-server-0.5.0.ebuild b/net-misc/dleyna-server/dleyna-server-0.5.0.ebuild
index 97a23ba91f1e..1490e084d695 100644
--- a/net-misc/dleyna-server/dleyna-server-0.5.0.ebuild
+++ b/net-misc/dleyna-server/dleyna-server-0.5.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://01.org/sites/default/files/downloads/dleyna/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE=""
 
 RDEPEND="
diff --git a/net-misc/gnome-online-miners/gnome-online-miners-3.14.3-r1.ebuild b/net-misc/gnome-online-miners/gnome-online-miners-3.14.3-r1.ebuild
index 836944a1bb07..e1c4f28f42f0 100644
--- a/net-misc/gnome-online-miners/gnome-online-miners-3.14.3-r1.ebuild
+++ b/net-misc/gnome-online-miners/gnome-online-miners-3.14.3-r1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/GnomeOnlineMiners"
 LICENSE="GPL-2+"
 SLOT="0"
 IUSE="flickr"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 # libgdata[gnome] needed for goa support
 RDEPEND="
diff --git a/net-misc/grive/Manifest b/net-misc/grive/Manifest
index ceeb9137ad14..7ab66d5021ad 100644
--- a/net-misc/grive/Manifest
+++ b/net-misc/grive/Manifest
@@ -1,3 +1 @@
-DIST grive-0.2.0.tar.gz 145760 SHA256 bb0de191cbe98e8efda6ce8fd5bcef3ae4903984aaaa9592909ddb4a24175f45 SHA512 5bae5d1de4655775347ca3148a0ae8b3294c56dff659cbd32f8c53d6cfa40f645d6f710a2e26e2189e51632bccaba494f45bec55a7721d6f7a40b467b1f3c7fd WHIRLPOOL 167093c15348bfdd6bd9b9db31919708ccd1f79b349ea43bd478227c500d8773d64cbf845e3c2f9747c3097945c4fea68462b3babfd81c0211cc52f03767c92e
-DIST grive-0.3.0_pre20130503.tar.gz 162471 SHA256 0b038cc627f898831872fdf3c20ac563f78a72094f594adda7ff737a1c1f207e SHA512 bd96a02366af47c5fde8e044066616c72a33607818d5e9cf4bea5fe70c0d63f83a2b726ce9a763cb907c78b2a563d7b2296b25e55743288dacef98adea3de729 WHIRLPOOL 38577f235fd9abc3f8f5da56c459c3569ac09cd1e3b16cfbea463a60103c25c0a4a4a163599974d35d8d146a5ec2c9c06e02c1cb518040a5462dd3200c7ebba9
-DIST grive-0.3.0_pre20141119.tar.gz 72990 SHA256 33b27eb534db51c525947810a21327195c24cb7c4ba3b448a33b2a7f98d4c014 SHA512 0ac69985fa597039ef5aaf91c7f1b4de8a1472406365cc1624c9410cdb02a186a4bf81a7d5e8d0272abfb68219de779815b38d030dfc550cd29caf313341cb4b WHIRLPOOL 9b184cdef9b0a74e53bb7235679ba358c7241df824a411c0473ac7a69e7cd1287d7edc6b65b636a59c81665af4b58def499a513921bc2056d210b9d14b811358
+DIST grive-0.4.0_pre20150905.tar.gz 158858 SHA256 c488e9956a48fa5416e1f6082ede649ae9d541b57a5170a4f6ff555e9e92e2aa SHA512 2a6842c742d79345ff805f92e74990de624d656c1f16fd98b2611e2359b051d6dfebef07590390eee3ea07e60143ca9e66ceecd675a3a75d6a099dcb0070ab46 WHIRLPOOL 22d25ea2913568d5132247f3472ca09ee5d291028b8303bd2f6784f1930e3308219f72e7a15b95a5e5a19637fb73e3d60181925afaa21e15f4fdaacc6d7769d4
diff --git a/net-misc/grive/grive-0.2.0-r1.ebuild b/net-misc/grive/grive-0.2.0-r1.ebuild
deleted file mode 100644
index 4d55755b0208..000000000000
--- a/net-misc/grive/grive-0.2.0-r1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit cmake-utils eutils multilib
-
-if [[ ${PV} = *9999 ]]; then
-	inherit git-2
-	EGIT_REPO_URI="git://github.com/Grive/${PN}.git"
-else
-	inherit eutils vcs-snapshot
-	SRC_URI="mirror://github/Grive/${PN}/tarball/v${PV} -> ${P}.tar.gz"
-fi
-
-DESCRIPTION="an open source Linux client for Google Drive"
-HOMEPAGE="http://www.lbreda.com/grive/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	dev-libs/boost:=
-	dev-libs/expat
-	dev-libs/json-c:=
-	dev-libs/libgcrypt:0=
-	net-misc/curl
-	sys-devel/binutils
-	sys-libs/glibc
-	sys-libs/zlib
-	"
-
-DEPEND="${RDEPEND}"
-
-DOCS=( "README" )
-
-src_prepare() {
-	epatch "${FILESDIR}"/"${P}"-check-bfd.h.patch
-
-	#include dir change in json-c-0.10 #462632 and #452234
-	if has_version ">=dev-libs/json-c-0.10" ; then
-		sed -i -e '/\(include\|INCLUDE\)/s@json/@json-c/@' \
-			libgrive/src/protocol/Json.cc \
-			cmake/Modules/FindJSONC.cmake || die
-	fi
-	#json-c library changed in 0.11, bug #467432
-	if has_version ">=dev-libs/json-c-0.11" ; then
-		sed -i -e '/LIBRARY/s@json)@json-c)@' \
-			cmake/Modules/FindJSONC.cmake || die
-	fi
-}
diff --git a/net-misc/grive/grive-0.3.0_pre20130503.ebuild b/net-misc/grive/grive-0.3.0_pre20130503.ebuild
deleted file mode 100644
index 00548e2f13cc..000000000000
--- a/net-misc/grive/grive-0.3.0_pre20130503.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit cmake-utils eutils multilib
-
-if [[ ${PV} = *9999 ]]; then
-	inherit git-2
-	EGIT_REPO_URI="git://github.com/Grive/${PN}.git"
-else
-	inherit eutils vcs-snapshot
-	COMMIT="27817e835fe115ebbda5410ec904aa49a2ad01f1"
-	SRC_URI="https://github.com/${PN}/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-fi
-
-DESCRIPTION="an open source Linux client for Google Drive"
-HOMEPAGE="http://www.lbreda.com/grive/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	dev-libs/boost:=
-	dev-libs/expat
-	dev-libs/json-c:=
-	dev-libs/libgcrypt:0=
-	dev-libs/yajl
-	dev-qt/qtcore:4
-	dev-qt/qtgui:4
-	net-misc/curl
-	sys-devel/binutils
-	sys-libs/glibc
-	sys-libs/zlib
-	"
-
-DEPEND="${RDEPEND}"
-
-DOCS=( "README" )
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}"-0.2.0-check-bfd.h.patch
-
-	#include dir change in json-c-0.10 #462632 and #452234
-	if has_version ">=dev-libs/json-c-0.10" ; then
-		sed -i -e '/\(include\|INCLUDE\)/s@json/@json-c/@' \
-			libgrive/src/protocol/Json.cc \
-			cmake/Modules/FindJSONC.cmake || die
-	fi
-	#json-c library changed in 0.11, bug #467432
-	if has_version ">=dev-libs/json-c-0.11" ; then
-		sed -i -e '/LIBRARY/s@json)@json-c)@' \
-			cmake/Modules/FindJSONC.cmake || die
-	fi
-
-	sed -i '/grive.1/s/^/#/' bgrive/CMakeLists.txt || die
-}
-
-src_install(){
-	cmake-utils_src_install
-
-	local icon size
-	for icon in icon/*/*.png; do
-		size=${icon##*/}
-		size=${size%.png}
-		newicon -s "${size}" "${icon}" ${PN}.png
-	done
-	make_desktop_entry bgrive
-}
diff --git a/net-misc/grive/grive-0.3.0_pre20141119.ebuild b/net-misc/grive/grive-0.3.0_pre20141119.ebuild
deleted file mode 100644
index 221f78fce166..000000000000
--- a/net-misc/grive/grive-0.3.0_pre20141119.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit cmake-utils
-
-if [[ ${PV} = *9999 ]]; then
-	inherit git-2
-	EGIT_REPO_URI="git://github.com/linwiz/${PN}.git"
-else
-	inherit vcs-snapshot
-	COMMIT="afd106ff47758d74daac4db35002e5e0d8d4d389"
-	SRC_URI="https://github.com/linwiz/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-fi
-
-DESCRIPTION="an open source Linux client for Google Drive"
-HOMEPAGE="http://www.lbreda.com/grive/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	dev-libs/boost:=
-	dev-libs/expat
-	>=dev-libs/json-c-0.11-r1:=
-	dev-libs/libgcrypt:0=
-	net-misc/curl
-	sys-libs/glibc
-	dev-libs/yajl
-	"
-
-DEPEND="${RDEPEND}"
-
-DOCS=( "README" )
diff --git a/net-misc/grive/grive-0.4.0_pre20150905.ebuild b/net-misc/grive/grive-0.4.0_pre20150905.ebuild
new file mode 100644
index 000000000000..59b1608601c1
--- /dev/null
+++ b/net-misc/grive/grive-0.4.0_pre20150905.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit cmake-utils
+
+if [[ ${PV} = *9999 ]]; then
+	inherit git-2
+	EGIT_REPO_URI="git://github.com/vitalif/${PN}2.git"
+else
+	inherit vcs-snapshot
+	COMMIT="5dc7028c8aebb26d35ed31c4b07ac180cc1887c9"
+	SRC_URI="https://github.com/vitalif/${PN}2/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+fi
+
+DESCRIPTION="An open source Linux client for Google Drive"
+HOMEPAGE="https://github.com/vitalif/grive2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	dev-libs/boost:=
+	dev-libs/expat
+	>=dev-libs/json-c-0.11-r1:=
+	dev-libs/libgcrypt:0=
+	net-misc/curl
+	sys-libs/glibc
+	dev-libs/yajl
+"
+DEPEND="${RDEPEND}"
diff --git a/net-misc/guacamole-server/Manifest b/net-misc/guacamole-server/Manifest
index aebe61f34b86..291baa068af7 100644
--- a/net-misc/guacamole-server/Manifest
+++ b/net-misc/guacamole-server/Manifest
@@ -3,3 +3,4 @@ DIST guacamole-server-0.9.0.tar.gz 556465 SHA256 289cb1ea0261396e9ede6aa0d2ac8d8
 DIST guacamole-server-0.9.2.tar.gz 595062 SHA256 b6e26751023082b6f0380323f05b8b50e71bcf4c1421c3118237b5a8df22660d SHA512 ed01bcbfc0612a1b05434cc5c412fbed6f877713049418aa25a577e9e020bd6abddeab4d31a50b5b4a6785b8c79f0625dd90181a643913bd813cbbba3a24bf6c WHIRLPOOL 6eac4e63cfabcedc2d31ed9c2063c6a0f0293dc0a9769e70bbf785d8236e5139caec5d255f9d2094220aca37eb2f96677223de6351a6c818141daf74e6b36185
 DIST guacamole-server-0.9.3.tar.gz 614640 SHA256 545e22401bbe62734c02577331c52e54dddf14dd950844d2ccc5aad318c16076 SHA512 eb296f17b27bc14633b511ce6cbe0025e18ea24e3b9b3e132b103de2071a9f18b64d7ced8f20bea1ab8f65755a047e98d670d522f4a5b4ec73e5696ecfb7d948 WHIRLPOOL db2f8f4d0839de9fa82bd0aeb047ed33468f817c0ee094388c7fb587ce044b586a097de94ac2e0e997bb757f31e6f4927e3b1d059f0caab6b7177ca37b5717a8
 DIST guacamole-server-0.9.7.tar.gz 639630 SHA256 285f367d89ee51981db84b00698b05b3d9ba5de2fb2922115c9e38d2b9b88d09 SHA512 c9ef2df6d0724c19e61b3f8913e94ff7c39f17e3beca0bd2eab1648e3c96d4b248bef9bc09b47fd8a4da6b994aea9df94e442286ce0fa3881d5e44b4923b1b14 WHIRLPOOL c7f2213b92e6ca40b93a251a72698229c7e34fbfaf00006b372910d7f2456c0cf6ccf75f8d89f136c41b61cd41ea492c52a14e970ff5bc2231fe826584c8d723
+DIST guacamole-server-0.9.8.tar.gz 691627 SHA256 6fcbff7b540ae296e049ff9b25b7b84bae247b54d2d8dfb5672fea4967406bdc SHA512 3bdbc9502070fa11fc276c7122a33a8428d130ad122157740618a5addf77bebf8d79e2c1a765f36a30feed2ac18f1911c84c9dc4a04e0235dd4d4069c8990a73 WHIRLPOOL 2e9be3f0a6492f1d6dab34f00f7decd5b7e133ad879ca6c4822496731a7fe3aac6cb22af43f634f3e526790187acea91f0ae3f3c6a4ab7901c2cbbec71b70ca3
diff --git a/net-misc/guacamole-server/guacamole-server-0.9.8.ebuild b/net-misc/guacamole-server/guacamole-server-0.9.8.ebuild
new file mode 100644
index 000000000000..d093bf36ed71
--- /dev/null
+++ b/net-misc/guacamole-server/guacamole-server-0.9.8.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils systemd user
+DESCRIPTION="This is the proxy-daemon used by www-apps/guacamole"
+
+HOMEPAGE="http://guac-dev.org/"
+SRC_URI="mirror://sourceforge/guacamole/${P}.tar.gz"
+
+LICENSE="MIT"
+
+SLOT="0"
+
+KEYWORDS="~amd64 ~x86"
+
+IUSE="rdesktop vnc ssh pulseaudio vorbis telnet ssl"
+
+DEPEND="x11-libs/cairo
+	media-libs/libpng:*
+	dev-libs/ossp-uuid
+	rdesktop? ( <net-misc/freerdp-1.1.0_beta1_p20150312 )
+	ssh? ( x11-libs/pango
+		net-libs/libssh2 )
+	telnet?	( net-libs/libtelnet
+		x11-libs/pango )
+	vnc? ( net-libs/libvncserver
+		pulseaudio? ( media-sound/pulseaudio ) )
+	ssl? ( dev-libs/openssl:* )
+	vorbis? ( media-libs/libvorbis )"
+
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	local myconf="--without-terminal --without-pango"
+	if use ssh || use telnet; then
+		myconf="--with-terminal --with-pango"
+	fi
+
+	econf $myconf \
+		$(use_with ssh) \
+		$(use_with rdesktop rdp) \
+		$(use_with vnc) \
+		$(use_with pulseaudio pulse) \
+		$(use_with vorbis) \
+		$(use_with telnet) \
+		$(use_with ssl)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	doinitd "${FILESDIR}/guacd"
+	systemd_dounit "${FILESDIR}/guacd.service"
+}
+
+pkg_postinst() {
+	enewgroup guacd
+	enewuser guacd -1 -1 -1 guacd
+}
diff --git a/net-misc/ipv6calc/Manifest b/net-misc/ipv6calc/Manifest
index d4e371879e3f..8a1dcb6fb7a3 100644
--- a/net-misc/ipv6calc/Manifest
+++ b/net-misc/ipv6calc/Manifest
@@ -1,3 +1,4 @@
 DIST ipv6calc-0.94.1.tar.gz 749953 SHA256 3bd73fd92c1d971fadea41b39830975b4a20bbcd26587dfb2835964b33de4040 SHA512 804aaa1a78aacd5c78e0de0642438ab85fe00d6bac36310022653c5f4d6e24c0d4c616133dcc9b0e35a0288f4f477f277376ea9465521702e5b46c098aa0fd16 WHIRLPOOL 481aabebcff8b4591105757c3e583c56f1fd2ae4ebe101cb562691abd0a2aaa55eee6eeaec9145e6caba2c1a5f9a4829af125465ea0836e4000c1a67a13e7691
 DIST ipv6calc-0.97.4.tar.gz 1037582 SHA256 ed2c9e895fdbffa3bee2e46591e0a010eacdefc1bf8eace5fbee9abaa9c3df39 SHA512 133f4e281da8eb1ea13b7c37123ae9f1b88e100553de758ceaa6cc63b0306e4711447bc7a4c171508fc5ce1ed447daec9749c5a75e5288deef0efcdc095bfcde WHIRLPOOL f6a9eb3201045851705f3631cd35e2aead26a167687b4c2064829ae530a803d6e48c57ac5d47996124b8e41706c1cc91850b9b42f225552640b4dbc9ebf17cb8
 DIST ipv6calc-0.99.0.tar.gz 1155118 SHA256 fc7535b900339d75d9862b1c3d359304330f72e94a4cade539dfb714e533fdb5 SHA512 18993711a9203b1d7ecbaa885cb8cb21738b4d25e379593f18b7f833ae7f1675339ec25b39bec7424735a97781a3dc9f4b4453e00873a3526dd3c2ff5ef64965 WHIRLPOOL 7e66df01d4270f88003bf8c44e93b4d4988744b488bd28eacd6e375e3e51c4f1d5717caeebbe2a6810a49342a5df86ac1e2ee0eabfc6bb1f14b289c0d1312dad
+DIST ipv6calc-0.99.1.tar.gz 1234188 SHA256 b0bc5d2f83c928524f82053b40f670589bd0181719046a2e4c267912a2ba1d28 SHA512 976c8a6b72e197b7f2e5096939f53a30440095aeac76043cddef38f671cf6c91d77b5c5b971276670f7e3f81404a72b41d8cc863e37c882974d034362d0a28de WHIRLPOOL 0bbff968d665e0c77afc110f018296d4ee6f6d284ab9328ce95db8a8536576fdf706b6ee22f213446dfb72be656e0353b0f4e4e317ce59c008355c7d0296dfda
diff --git a/net-misc/ipv6calc/ipv6calc-0.97.4.ebuild b/net-misc/ipv6calc/ipv6calc-0.97.4.ebuild
index 82290215b0b5..90d029ca4e8d 100644
--- a/net-misc/ipv6calc/ipv6calc-0.97.4.ebuild
+++ b/net-misc/ipv6calc/ipv6calc-0.97.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="ftp://ftp.bieringer.de/pub/linux/IPv6/ipv6calc/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 hppa ~ppc ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 hppa ppc ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="geoip test"
 
 RDEPEND="
diff --git a/net-misc/ipv6calc/ipv6calc-0.99.1.ebuild b/net-misc/ipv6calc/ipv6calc-0.99.1.ebuild
new file mode 100644
index 000000000000..526f6b80f208
--- /dev/null
+++ b/net-misc/ipv6calc/ipv6calc-0.99.1.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+inherit eutils
+
+DESCRIPTION="IPv6 address calculator"
+HOMEPAGE="http://www.deepspace6.net/projects/ipv6calc.html"
+SRC_URI="ftp://ftp.bieringer.de/pub/linux/IPv6/ipv6calc/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="geoip test"
+
+RDEPEND="
+	dev-libs/openssl:=
+	geoip? ( >=dev-libs/geoip-1.4.7 )
+"
+DEPEND="${RDEPEND}
+	test? ( dev-perl/Digest-SHA1 )
+"
+
+#dev-perl/URI is needed for web interface, that is not installed now
+
+src_configure() {
+	# These options are broken.  You can't disable them.  That's
+	# okay because we want then force enabled.
+	# --disable-db-as-registry
+	# --disable-db-cc-registry
+	if use geoip; then
+		myconf=$(use_enable geoip)
+		myconf+=" --with-geoip-db=${EPREFIX}/usr/share/GeoIP"
+	fi
+	econf \
+		--disable-bundled-getopt \
+		--disable-bundled-md5 \
+		--enable-shared \
+		--enable-dynamic-load \
+		--enable-db-ieee \
+		--enable-db-ipv4 \
+		--enable-db-ipv6 \
+		--disable-dbip \
+		--disable-external \
+		--disable-ip2location \
+		${myconf}
+}
+
+src_compile() {
+	# Disable default CFLAGS (-O2 and -g)
+	emake DEFAULT_CFLAGS=""
+}
+
+src_test() {
+	if [[ ${EUID} -eq 0 ]]; then
+		# Disable tests that fail as root
+		echo true > ipv6logstats/test_ipv6logstats.sh
+	fi
+	default
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dodoc ChangeLog CREDITS README TODO USAGE
+}
diff --git a/net-misc/lksctp-tools/lksctp-tools-1.0.16.ebuild b/net-misc/lksctp-tools/lksctp-tools-1.0.16.ebuild
index 92c033b79dec..5feba66c9b51 100644
--- a/net-misc/lksctp-tools/lksctp-tools-1.0.16.ebuild
+++ b/net-misc/lksctp-tools/lksctp-tools-1.0.16.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/lksctp/${P}.tar.gz"
 
 LICENSE="|| ( GPL-2+ LGPL-2.1 )"
 SLOT="0"
-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"
 IUSE="kernel_linux static-libs"
 
 # This is only supposed to work with Linux to begin with.
diff --git a/net-misc/modemmanager/modemmanager-1.4.10.ebuild b/net-misc/modemmanager/modemmanager-1.4.10.ebuild
index f4441121c4fe..3de6c3da6dbe 100644
--- a/net-misc/modemmanager/modemmanager-1.4.10.ebuild
+++ b/net-misc/modemmanager/modemmanager-1.4.10.ebuild
@@ -15,7 +15,7 @@ SRC_URI="http://www.freedesktop.org/software/ModemManager/ModemManager-${PV}.tar
 
 LICENSE="GPL-2+"
 SLOT="0/1" # subslot = dbus interface version, i.e. N in org.freedesktop.ModemManager${N}
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 IUSE="+introspection mbim policykit +qmi qmi-newest vala"
 REQUIRED_USE="
 	qmi-newest? ( qmi )
diff --git a/net-misc/mulk/mulk-0.6.0.ebuild b/net-misc/mulk/mulk-0.6.0.ebuild
index 545c6088e812..f92c34e3bdac 100644
--- a/net-misc/mulk/mulk-0.6.0.ebuild
+++ b/net-misc/mulk/mulk-0.6.0.ebuild
@@ -26,7 +26,7 @@ DEPEND="net-misc/curl
 		checksum? ( dev-libs/openssl )
 	)"
 
-REQUIRE_USE="checksum? ( metalink )"
+REQUIRED_USE="checksum? ( metalink )"
 
 RDEPEND="${DEPEND}"
 
diff --git a/net-misc/mulk/mulk-0.7.0.ebuild b/net-misc/mulk/mulk-0.7.0.ebuild
index ba5d01d4c697..def1aee1adfe 100644
--- a/net-misc/mulk/mulk-0.7.0.ebuild
+++ b/net-misc/mulk/mulk-0.7.0.ebuild
@@ -26,7 +26,7 @@ DEPEND="net-misc/curl
 		checksum? ( dev-libs/openssl )
 	)"
 
-REQUIRE_USE="checksum? ( metalink )"
+REQUIRED_USE="checksum? ( metalink )"
 
 RDEPEND="${DEPEND}"
 
diff --git a/net-misc/netcf/Manifest b/net-misc/netcf/Manifest
deleted file mode 100644
index 54a3deb24b93..000000000000
--- a/net-misc/netcf/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST netcf-0.1.9.tar.gz 579227 RMD160 29bc4166c605cb1a7ee75c00429002c5603c359d SHA1 9cb91e94989215ad23a7c3b3f5c59fefaf0df261 SHA256 01a6ad0879a1140deaf7b46d3d38a852370bcdc6456c43f02e2db0715c2fb3bb
diff --git a/net-misc/netcf/metadata.xml b/net-misc/netcf/metadata.xml
deleted file mode 100644
index b2b86fc4d13d..000000000000
--- a/net-misc/netcf/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer>
-		<email>cardoe@gentoo.org</email>
-		<name>Doug Goldstein</name>
-		<description>Anyone can take over this package if they
-			want</description>
-	</maintainer>
-</pkgmetadata>
-
diff --git a/net-misc/netcf/netcf-0.1.9.ebuild b/net-misc/netcf/netcf-0.1.9.ebuild
deleted file mode 100644
index 921e291a7266..000000000000
--- a/net-misc/netcf/netcf-0.1.9.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-DESCRIPTION="netcf is a cross-platform network configuration library"
-HOMEPAGE="https://fedorahosted.org/netcf/"
-SRC_URI="https://fedorahosted.org/released/netcf/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=">=app-admin/augeas-0.5.0
-		dev-libs/libnl:1.1
-		dev-libs/libxml2
-		dev-libs/libxslt
-		sys-libs/readline"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	# static libs are a waste of time and disk for this
-	econf --disable-static
-}
-
-src_install() {
-	emake DESTDIR="${ED}" install || die "install failed"
-	dodoc AUTHORS ChangeLog README NEWS
-}
diff --git a/net-misc/networkmanager-openswan/Manifest b/net-misc/networkmanager-openswan/Manifest
index 08d2d1aa6c76..6da569344d24 100644
--- a/net-misc/networkmanager-openswan/Manifest
+++ b/net-misc/networkmanager-openswan/Manifest
@@ -1,4 +1,2 @@
-DIST NetworkManager-openswan-0.9.8.4.tar.xz 301068 SHA256 b11bbfeb2eb2efe6392a94f4b8f41efc3c79a947ed2eff3f0881d5bcd2edf107 SHA512 0e32005d979923add3db42333f6bf3f5e6759cde9436a4f6deb9e21f0ec227b5fe91467dbb2e4d95ed576cbfef016096123e36684af006b4b38ed141cc3eab20 WHIRLPOOL d211035e4d2d1ba068a3fed2b09d6177114c1fd90253a8518064fff6b859144441fc42b5388db7ae5b61731d8713dc8c79bcd2caa4490fba0135677f7bfafe25
-DIST NetworkManager-openswan-1.0.0.tar.xz 306000 SHA256 baac8816c95cc8d50aa00cbe8a78d8ddeb0b8ce710367e7e776ef36dd80c97fd SHA512 c39a9d21bca6d1a831cdbbe58115801d317e0d3f62f2298d04333a940e425220915e5803fe8e32b9e18a78584acb7e978b885546ab99d15895f9a7281c2cd337 WHIRLPOOL 54dec450f81ddbc9f8554daa2f27d228fc7edd64b72dad2ee203a88b4a61e1955063b8d3680ed3d7660f67b138d9db340e5ac2c352b4fde7228589d44b4c137e
 DIST NetworkManager-openswan-1.0.2.tar.xz 307168 SHA256 9a31b792e9b0d6a577a00fe8b9fb45d363bed790b43bbedbf1015fefb164adba SHA512 b1b5b7f8085c1b7ff48970416b527cf28ca617c9073115c0753e36c9f0aa45961febe82a73aa77e51feca677ef5ac3e6c8c7c6d9601b12ecb2eeea8c56899d07 WHIRLPOOL 5cc047b199aff8e1fc27ae038a1ea2c99f34ef508eb0aeeaf6345307eddf8f189f2b9d66e545e97099c128f05c9a51bd779ebe64a46a8d9a2af98a1231d53f58
-DIST networkmanager-openswan-0.9.8.4-patches.tar.bz2 11604 SHA256 fbf01743fa6cd0cb8986a218d54e5da5d0eb8caed92f05f8aa68a87de07b4a0b SHA512 f488b5c25011ef5af2e862f2f9885b1529448303da47ca611339e8b5929be2212d4dcacc08e5b8075ef3f57ed1bd0f09d163e0582b14dcbf2a81b2dc12cc77b0 WHIRLPOOL d36dd8b68ec70e57ce2aea79ed50aa47e071416396de3a85f6fcdf3c0b722952265608695dc62d2e78f9c51c03a9279edf92386d635d09acdf7ed371f7600e2a
+DIST NetworkManager-openswan-1.0.6.tar.xz 306648 SHA256 79e1f85d10d6b80548594bedaed990643b730dbc738a2465ca78112dfa5db4e1 SHA512 e1f4fd9fe6e535fa717deb862cbf08e73e5f66a7a3d8ca328f653f009229a3a811de5157f641588a884528a8c9e2d63b22759864fa4d02276b1cf0721c8932ce WHIRLPOOL bf7fc847e8e28180821d14710717bd7cde90786dc3461bcd1791b194b9e619e895044bdd319754ffe6e50390e76e5b40e14d652ef58966e1c9e3db29ca5f30f8
diff --git a/net-misc/networkmanager-openswan/networkmanager-openswan-0.9.8.4-r1.ebuild b/net-misc/networkmanager-openswan/networkmanager-openswan-0.9.8.4-r1.ebuild
deleted file mode 100644
index 8b6819eb95bf..000000000000
--- a/net-misc/networkmanager-openswan/networkmanager-openswan-0.9.8.4-r1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="no"
-GNOME_ORG_MODULE="NetworkManager-${PN##*-}"
-
-inherit autotools eutils gnome2
-
-DESCRIPTION="NetworkManager Openswan plugin"
-HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
-
-SRC_URI="${SRC_URI} https://dev.gentoo.org/~pacho/gnome/${P}-patches.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="gtk"
-
-RDEPEND="
-	>=net-misc/networkmanager-0.9.8:=
-	>=dev-libs/dbus-glib-0.74
-	|| ( net-misc/openswan net-misc/libreswan )
-	gtk? (
-		>=x11-libs/gtk+-3.0.0:3
-		gnome-base/gnome-keyring
-		gnome-base/libgnome-keyring
-	)"
-
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	dev-util/intltool
-	virtual/pkgconfig"
-
-src_prepare() {
-	# Apply patches from Fedora, upstream bug #735692
-	epatch "${WORKDIR}/${P}-patches"/*.patch
-	echo "auth-dialog/nm-openswan-auth-dialog.desktop.in" >> po/POTFILES.in || die
-	echo "auth-dialog/nm-openswan-auth-dialog.desktop.in.in" >> po/POTFILES.in || die
-
-	eautoreconf
-}
-
-src_configure() {
-	gnome2_src_configure \
-		--disable-more-warnings \
-		--disable-static \
-		--with-dist-version=Gentoo \
-		--with-gtkver=3 \
-		$(use_with gtk gnome)
-}
diff --git a/net-misc/networkmanager-openswan/networkmanager-openswan-1.0.0.ebuild b/net-misc/networkmanager-openswan/networkmanager-openswan-1.0.0.ebuild
deleted file mode 100644
index 87cb09caea58..000000000000
--- a/net-misc/networkmanager-openswan/networkmanager-openswan-1.0.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="no"
-GNOME_ORG_MODULE="NetworkManager-${PN##*-}"
-
-inherit gnome2
-
-DESCRIPTION="NetworkManager Openswan plugin"
-HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="gtk"
-
-RDEPEND="
-	>=dev-libs/glib-2.32:2
-	>=dev-libs/libnl-3.2.8:3
-	>=net-misc/networkmanager-0.9.10:=
-	>=dev-libs/dbus-glib-0.74
-	|| ( net-misc/openswan net-misc/libreswan )
-	gtk? (
-		app-crypt/libsecret
-		>=x11-libs/gtk+-3.4:3
-	)
-"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	dev-util/intltool
-	virtual/pkgconfig
-"
-
-src_configure() {
-	gnome2_src_configure \
-		--disable-more-warnings \
-		--disable-static \
-		--with-dist-version=Gentoo \
-		$(use_with gtk gnome)
-}
diff --git a/net-misc/networkmanager-openswan/networkmanager-openswan-1.0.6.ebuild b/net-misc/networkmanager-openswan/networkmanager-openswan-1.0.6.ebuild
new file mode 100644
index 000000000000..a66b8445582d
--- /dev/null
+++ b/net-misc/networkmanager-openswan/networkmanager-openswan-1.0.6.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+GNOME_ORG_MODULE="NetworkManager-${PN##*-}"
+
+inherit gnome2
+
+DESCRIPTION="NetworkManager Openswan plugin"
+HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="amd64 ~x86"
+IUSE="gtk"
+
+RDEPEND="
+	>=dev-libs/glib-2.32:2
+	>=dev-libs/libnl-3.2.8:3
+	>=net-misc/networkmanager-0.9.10:=
+	>=dev-libs/dbus-glib-0.74
+	|| ( net-misc/openswan net-misc/libreswan )
+	gtk? (
+		app-crypt/libsecret
+		>=gnome-extra/nm-applet-0.9.10
+		>=x11-libs/gtk+-3.4:3
+	)
+"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	dev-util/intltool
+	virtual/pkgconfig
+"
+
+src_configure() {
+	gnome2_src_configure \
+		--disable-more-warnings \
+		--disable-static \
+		--with-dist-version=Gentoo \
+		$(use_with gtk gnome)
+}
diff --git a/net-misc/networkmanager-openvpn/Manifest b/net-misc/networkmanager-openvpn/Manifest
index 3a665930da91..9593c1979e97 100644
--- a/net-misc/networkmanager-openvpn/Manifest
+++ b/net-misc/networkmanager-openvpn/Manifest
@@ -1,4 +1,2 @@
-DIST NetworkManager-openvpn-0.9.10.0.tar.xz 400648 SHA256 7b65e738a189758b090eca7a2da63d444776c89adb979e71bcc3a982a1ff140d SHA512 89ba98c3c5e1598d4619b2199e3f4030d3b130e0b738478da28b0b6ccbb5083763b8709b1b2a61d8e847522eff09a25d56da8eadd2016e22e8838077d02f0e88 WHIRLPOOL 568acc5eb72bf701bad5822f99be19677e1ea4c2545f4503d7ba9885378902bcdb0ed68b5c074f1b79adf7a30fa5f2cb0d3813fbb7258e50bd9e6b7f84cb3e53
-DIST NetworkManager-openvpn-0.9.8.4.tar.xz 395816 SHA256 af8c52b6a61af3c178eed1ea8f1d4704bea87331fde43deb3d4aafe1821e6687 SHA512 e0b5f0dd4eb07adbc4d07dac4d3a2dd19f9154bb5eb654d2ae0ab4c9dce2f351c65e3b4edfd9635ac254b14cf5bed0aecf659b98f410d932ecd22b0363677e70 WHIRLPOOL b9c2a32325224d1e293ddf9072a69892ba41c253b0b493640fd5f6d048cbe93609c6252408a3ef148707d51cf512155ba24bddb5df8757dacafed1f8927f340f
-DIST NetworkManager-openvpn-1.0.0.tar.xz 406752 SHA256 d0ad918c8d3736b690f0ed031c03251829fa110aa339e0e531e47100551f1bf0 SHA512 f9034b4b5cccc990e361cc446e42397b12114437e639a31008cac03804dd66a5b27b69dcc72b4ba1d3beaba256f0ab8ed4f50a8a1503f224828251aae5131570 WHIRLPOOL 532d8561abf3c1acc8f068747e99492dde393b8a287f257e4a17f23ee62b2fd13e9bc03f97825f58f654b09021cb2a309977268cd07dd7649125c945d5fbfc7f
 DIST NetworkManager-openvpn-1.0.2.tar.xz 413496 SHA256 1643824bc7fdab42e1dab836bf81c328692295c86f146bde602eca093b394bb0 SHA512 7ee60b47ac0825e116e8c90c577fee778d2a271cdc97772aa716a9a348a576a3afb8db541473297a3cd775fd716d528df385622c54a82139b3701ebab1980a50 WHIRLPOOL fdbc330736bd8b24a834b01c5cc1dd81acaef557fa754b5668a8354ebc39c85288798259ae6c107c76d4fc329217f776057f7c50a631695d481e7ccee0ee385c
+DIST NetworkManager-openvpn-1.0.6.tar.xz 413464 SHA256 c982b644fa43d3019cb654a17e692bb3a7175a86d28065ea51f55ae7dfe45d8c SHA512 4ea2a6c71d73d5fd6db7a5c68b8521db6c1b24f3ae825a4db0ba540fc954408127b6e7a212b02139e518abc3e6fc715c14c7799e0e106e987e7a8c6bddffa48a WHIRLPOOL 5c9c769619bc32aa9bba42dd381c28c11f477c50077d89e6c2894548f15e2dc2e7e306411ec798b3436be7e2ce8925cc8928a5b517f801eb6ce2f73539e78ae8
diff --git a/net-misc/networkmanager-openvpn/networkmanager-openvpn-0.9.10.0.ebuild b/net-misc/networkmanager-openvpn/networkmanager-openvpn-0.9.10.0.ebuild
deleted file mode 100644
index bb02e71efe13..000000000000
--- a/net-misc/networkmanager-openvpn/networkmanager-openvpn-0.9.10.0.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-GNOME_ORG_MODULE="NetworkManager-${PN##*-}"
-GCONF_DEBUG="no"
-
-inherit eutils gnome2
-
-DESCRIPTION="NetworkManager OpenVPN plugin"
-HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="gtk test"
-
-RDEPEND="
-	>=dev-libs/dbus-glib-0.74
-	>=dev-libs/glib-2.32:2
-	>=net-misc/networkmanager-0.9.9
-	>=net-misc/openvpn-2.1_rc9
-	gtk? (
-		app-crypt/libsecret
-		>=gnome-extra/nm-applet-0.9.9.0
-		>=x11-libs/gtk+-3.4:3
-	)"
-
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	>=dev-util/intltool-0.35
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	# Test will fail if the machine doesn't have a particular locale installed
-	# FAIL: (tls-import-data) unexpected 'ca' secret value
-	sed '/test_non_utf8_import (plugin, test_dir)/ d' \
-		-i properties/tests/test-import-export.c || die "sed failed"
-
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-		--disable-more-warnings \
-		--disable-static \
-		--with-dist-version=Gentoo \
-		$(use_with gtk gnome) \
-		$(use_with test tests)
-}
diff --git a/net-misc/networkmanager-openvpn/networkmanager-openvpn-0.9.8.4.ebuild b/net-misc/networkmanager-openvpn/networkmanager-openvpn-0.9.8.4.ebuild
deleted file mode 100644
index 03f1daedef64..000000000000
--- a/net-misc/networkmanager-openvpn/networkmanager-openvpn-0.9.8.4.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-GNOME_ORG_MODULE="NetworkManager-${PN##*-}"
-
-inherit eutils gnome2-utils gnome.org
-
-DESCRIPTION="NetworkManager OpenVPN plugin"
-HOMEPAGE="https://www.gnome.org/projects/NetworkManager/"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-IUSE="gtk test"
-
-RDEPEND="
-	>=dev-libs/dbus-glib-0.74
-	>=net-misc/networkmanager-0.9.8
-	>=net-misc/openvpn-2.1_rc9
-	gtk? (
-		>=x11-libs/gtk+-2.91.4:3
-		gnome-base/gnome-keyring
-		gnome-base/libgnome-keyring
-	)"
-
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	>=dev-util/intltool-0.35
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	# Test will fail if the machine doesn't have a particular locale installed
-	# FAIL: (tls-import-data) unexpected 'ca' secret value
-	sed '/test_non_utf8_import (plugin, test_dir)/ d' \
-		-i properties/tests/test-import-export.c || die "sed failed"
-
-	gnome2_disable_deprecation_warning
-}
-
-src_configure() {
-	econf \
-		--disable-more-warnings \
-		--disable-static \
-		--with-dist-version=Gentoo \
-		--with-gtkver=3 \
-		$(use_with gtk gnome) \
-		$(use_with test tests)
-}
-
-src_install() {
-	default
-	prune_libtool_files
-}
diff --git a/net-misc/networkmanager-openvpn/networkmanager-openvpn-1.0.0-r1.ebuild b/net-misc/networkmanager-openvpn/networkmanager-openvpn-1.0.0-r1.ebuild
deleted file mode 100644
index 135bdf1df92b..000000000000
--- a/net-misc/networkmanager-openvpn/networkmanager-openvpn-1.0.0-r1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-GCONF_DEBUG="no"
-GNOME_ORG_MODULE="NetworkManager-${PN##*-}"
-
-inherit eutils gnome2
-
-DESCRIPTION="NetworkManager OpenVPN plugin"
-HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-IUSE="gtk test"
-
-RDEPEND="
-	>=dev-libs/dbus-glib-0.74
-	>=dev-libs/glib-2.32:2
-	>=net-misc/networkmanager-0.9.10:=
-	>=net-misc/openvpn-2.1_rc9
-	gtk? (
-		app-crypt/libsecret
-		>=gnome-extra/nm-applet-0.9.9.0
-		>=x11-libs/gtk+-3.4:3
-	)"
-
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	>=dev-util/intltool-0.35
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	# Test will fail if the machine doesn't have a particular locale installed
-	# FAIL: (tls-import-data) unexpected 'ca' secret value, upstream bug #742708
-	sed '/test_non_utf8_import (plugin, test_dir)/ d' \
-		-i properties/tests/test-import-export.c || die "sed failed"
-
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# --localstatedir=/var needed per bug #536248
-	gnome2_src_configure \
-		--localstatedir=/var \
-		--disable-more-warnings \
-		--disable-static \
-		--with-dist-version=Gentoo \
-		$(use_with gtk gnome) \
-		$(use_with test tests)
-}
diff --git a/net-misc/networkmanager-openvpn/networkmanager-openvpn-1.0.0.ebuild b/net-misc/networkmanager-openvpn/networkmanager-openvpn-1.0.0.ebuild
deleted file mode 100644
index 8fe1f5adbe5c..000000000000
--- a/net-misc/networkmanager-openvpn/networkmanager-openvpn-1.0.0.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-GCONF_DEBUG="no"
-GNOME_ORG_MODULE="NetworkManager-${PN##*-}"
-
-inherit eutils gnome2
-
-DESCRIPTION="NetworkManager OpenVPN plugin"
-HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="gtk test"
-
-RDEPEND="
-	>=dev-libs/dbus-glib-0.74
-	>=dev-libs/glib-2.32:2
-	>=net-misc/networkmanager-0.9.10:=
-	>=net-misc/openvpn-2.1_rc9
-	gtk? (
-		app-crypt/libsecret
-		>=gnome-extra/nm-applet-0.9.9.0
-		>=x11-libs/gtk+-3.4:3
-	)"
-
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	>=dev-util/intltool-0.35
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	# Test will fail if the machine doesn't have a particular locale installed
-	# FAIL: (tls-import-data) unexpected 'ca' secret value, upstream bug #742708
-	sed '/test_non_utf8_import (plugin, test_dir)/ d' \
-		-i properties/tests/test-import-export.c || die "sed failed"
-
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-		--disable-more-warnings \
-		--disable-static \
-		--with-dist-version=Gentoo \
-		$(use_with gtk gnome) \
-		$(use_with test tests)
-}
diff --git a/net-misc/networkmanager-openvpn/networkmanager-openvpn-1.0.6-r1.ebuild b/net-misc/networkmanager-openvpn/networkmanager-openvpn-1.0.6-r1.ebuild
new file mode 100644
index 000000000000..d653cc35f606
--- /dev/null
+++ b/net-misc/networkmanager-openvpn/networkmanager-openvpn-1.0.6-r1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+GCONF_DEBUG="no"
+GNOME_ORG_MODULE="NetworkManager-${PN##*-}"
+
+inherit eutils gnome2 user
+
+DESCRIPTION="NetworkManager OpenVPN plugin"
+HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~x86"
+IUSE="gtk test"
+
+RDEPEND="
+	>=dev-libs/dbus-glib-0.74
+	>=dev-libs/glib-2.32:2
+	>=net-misc/networkmanager-0.9.10:=
+	>=net-misc/openvpn-2.1_rc9
+	gtk? (
+		app-crypt/libsecret
+		>=gnome-extra/nm-applet-1.0.5
+		>=x11-libs/gtk+-3.4:3
+	)
+"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	>=dev-util/intltool-0.35
+	virtual/pkgconfig
+"
+
+pkg_setup() {
+	enewgroup nm-openvpn
+	enewuser nm-openvpn -1 -1 -1 nm-openvpn
+}
+
+src_prepare() {
+	# Test will fail if the machine doesn't have a particular locale installed
+	# FAIL: (tls-import-data) unexpected 'ca' secret value, upstream bug #742708
+	sed '/test_non_utf8_import (plugin, test_dir)/ d' \
+		-i properties/tests/test-import-export.c || die "sed failed"
+
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# --localstatedir=/var needed per bug #536248
+	gnome2_src_configure \
+		--localstatedir=/var \
+		--disable-more-warnings \
+		--disable-static \
+		--with-dist-version=Gentoo \
+		$(use_with gtk gnome) \
+		$(use_with test tests)
+}
diff --git a/net-misc/networkmanager-pptp/Manifest b/net-misc/networkmanager-pptp/Manifest
index b8fe619348c8..b00561885c73 100644
--- a/net-misc/networkmanager-pptp/Manifest
+++ b/net-misc/networkmanager-pptp/Manifest
@@ -1,4 +1,2 @@
-DIST NetworkManager-pptp-0.9.10.0.tar.xz 350984 SHA256 564b16c9b2821a1d2ede06f56f4db5cb0d62ccb35f87c92ad6c636ed48e0af58 SHA512 97ed2840e3615d9131319e752536fd5ed30d8fe1e3084fd82ec963f5efa30ff627cd30d1c21cc6382ea58c2edd4422d3ce597d170bb26c2471d044c19c19b2c8 WHIRLPOOL 932d9eeb9f2dce7cb528e5fd6f841208f09454830365ae99c1afa9c26bc05a6049a1b50c52b66d61a3eec9ef976f3eee2b9a9b01ed57b9a9b822c01430c96aa1
-DIST NetworkManager-pptp-0.9.8.4.tar.xz 353004 SHA256 97ba8f6f726056c3b8e0e1c8d2ab3d32791cadd7c3a38e0478fb2bd3ecafdce8 SHA512 86138cb91b22596c075575cad7ad6c5c9efa3cc6d3491bb148b6ba79007968764b6043c3b89d1034b6825d25f2cf56158f9f278d5a2c12636e34c541384e5489 WHIRLPOOL 2ce9389bbc3623748f74e706389ae7b6969aa82fe0c63dcc6293721b90d373d4046a7a89c09e26a80531724b7208eba49871b139924141969dddb519f9e6884d
-DIST NetworkManager-pptp-1.0.0.tar.xz 351716 SHA256 200d5c65cdae248d3b4d0daa76a4f8bc1432376ed4da7afedd5085bb0da7ee76 SHA512 554811d19324fa73406b6a37f0bcb8694f076e25eedb8f2ba6ac4acda4d2890bb4af750d6ec14df3a0ee330f137f385f40fa8ccb579c6d712a08d9aba9080b77 WHIRLPOOL cfd0e7cce0a049123d05e60acde1122569e0f80f414f4b0b89a74107f3898db4a95205f6e0646fe687fb4a3927682faae0fa1937b7634df30bc4db65fd75e04a
 DIST NetworkManager-pptp-1.0.2.tar.xz 353420 SHA256 37cb7c6064d1a65ea9b67bb9d31947c2434db3cfb55a2911481fa4e48e332017 SHA512 02518ed9b38ce8fde61d254a9375b709dbca394e5037f213203ab5b58dd7525813862d5a115f036612cefc362a28063cb2fd394621a53269a315578076592bbe WHIRLPOOL ca03929b928b8830b64ee8418e28f562d85da074a293e88938289230a4feb9afd691ef79fbdac8e435cc28fc0a98bb2b1161815b8c73c2bfd80a4c007f3a9dad
+DIST NetworkManager-pptp-1.0.6.tar.xz 354148 SHA256 96fa456ba43e62d017890efcad018894b1c0a9168f0aab3399f673313272c1be SHA512 0219b51d4a749f4f2164e9ffb94ae1c04fee2dc3477c0d16f8ed71d71728226568d733e86e880b76040affbf279718f2eb81b86be8dc76988ef0940c315a50ec WHIRLPOOL 70d92639cc578302aa3a306952998ca965839a10f30fef7e9bceb63274aea3934a4338cd6e4171cea839c1670d37dfad00bc8707ba02d24b4c8e710651d8f64f
diff --git a/net-misc/networkmanager-pptp/networkmanager-pptp-0.9.10.0.ebuild b/net-misc/networkmanager-pptp/networkmanager-pptp-0.9.10.0.ebuild
deleted file mode 100644
index 1bb2ddc57a41..000000000000
--- a/net-misc/networkmanager-pptp/networkmanager-pptp-0.9.10.0.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-GCONF_DEBUG="no"
-GNOME_ORG_MODULE="NetworkManager-${PN##*-}"
-
-inherit gnome2
-
-DESCRIPTION="NetworkManager PPTP plugin"
-HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="gtk"
-
-RDEPEND="
-	>=net-misc/networkmanager-0.9.6
-	>=dev-libs/dbus-glib-0.74
-	>=dev-libs/glib-2.32:2
-	net-dialup/ppp:=
-	net-dialup/pptpclient
-	gtk? (
-		app-crypt/libsecret
-		>=gnome-extra/nm-applet-0.9.9.0
-		>=x11-libs/gtk+-3.4:3
-	)"
-
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	dev-util/intltool
-	virtual/pkgconfig
-"
-
-src_configure() {
-	local myconf
-	# Same hack as net-dialup/pptpd to get proper plugin dir for ppp, bug #519986
-	local PPPD_VER=`best_version net-dialup/ppp`
-	PPPD_VER=${PPPD_VER#*/*-} #reduce it to ${PV}-${PR}
-	PPPD_VER=${PPPD_VER%%[_-]*} # main version without beta/pre/patch/revision
-	myconf="${myconf} --with-pppd-plugin-dir=/usr/$(get_libdir)/pppd/${PPPD_VER}"
-
-	gnome2_src_configure \
-		--disable-more-warnings \
-		--disable-static \
-		--with-dist-version=Gentoo \
-		$(use_with gtk gnome) \
-		${myconf}
-}
diff --git a/net-misc/networkmanager-pptp/networkmanager-pptp-0.9.8.4.ebuild b/net-misc/networkmanager-pptp/networkmanager-pptp-0.9.8.4.ebuild
deleted file mode 100644
index 6c7e092e4cde..000000000000
--- a/net-misc/networkmanager-pptp/networkmanager-pptp-0.9.8.4.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-GNOME_ORG_MODULE="NetworkManager-${PN##*-}"
-
-inherit eutils gnome2-utils gnome.org
-
-DESCRIPTION="NetworkManager PPTP plugin"
-HOMEPAGE="https://www.gnome.org/projects/NetworkManager/"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-IUSE="gtk"
-
-RDEPEND="
-	>=net-misc/networkmanager-0.9.8
-	>=dev-libs/dbus-glib-0.74
-	net-dialup/ppp
-	net-dialup/pptpclient
-	gtk? (
-		>=x11-libs/gtk+-2.91.4:3
-		gnome-base/gnome-keyring
-		gnome-base/libgnome-keyring
-	)"
-
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	dev-util/intltool
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	gnome2_disable_deprecation_warning
-}
-
-src_configure() {
-	econf \
-		--disable-more-warnings \
-		--disable-static \
-		--with-dist-version=Gentoo \
-		--with-gtkver=3 \
-		$(use_with gtk gnome)
-}
-
-src_install() {
-	default
-	prune_libtool_files
-}
diff --git a/net-misc/networkmanager-pptp/networkmanager-pptp-1.0.0.ebuild b/net-misc/networkmanager-pptp/networkmanager-pptp-1.0.0.ebuild
deleted file mode 100644
index 85f1c5d68f7e..000000000000
--- a/net-misc/networkmanager-pptp/networkmanager-pptp-1.0.0.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-GCONF_DEBUG="no"
-GNOME_ORG_MODULE="NetworkManager-${PN##*-}"
-
-inherit gnome2
-
-DESCRIPTION="NetworkManager PPTP plugin"
-HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-IUSE="gtk"
-
-RDEPEND="
-	>=net-misc/networkmanager-0.9.10:=
-	>=dev-libs/dbus-glib-0.74
-	>=dev-libs/glib-2.32:2
-	net-dialup/ppp:=
-	net-dialup/pptpclient
-	gtk? (
-		app-crypt/libsecret
-		>=gnome-extra/nm-applet-0.9.9.0
-		>=x11-libs/gtk+-3.4:3
-	)"
-
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	dev-util/intltool
-	virtual/pkgconfig
-"
-
-src_configure() {
-	local myconf
-	# Same hack as net-dialup/pptpd to get proper plugin dir for ppp, bug #519986
-	local PPPD_VER=`best_version net-dialup/ppp`
-	PPPD_VER=${PPPD_VER#*/*-} #reduce it to ${PV}-${PR}
-	PPPD_VER=${PPPD_VER%%[_-]*} # main version without beta/pre/patch/revision
-	myconf="${myconf} --with-pppd-plugin-dir=/usr/$(get_libdir)/pppd/${PPPD_VER}"
-
-	gnome2_src_configure \
-		--disable-more-warnings \
-		--disable-static \
-		--with-dist-version=Gentoo \
-		$(use_with gtk gnome) \
-		${myconf}
-}
diff --git a/net-misc/networkmanager-pptp/networkmanager-pptp-1.0.6.ebuild b/net-misc/networkmanager-pptp/networkmanager-pptp-1.0.6.ebuild
new file mode 100644
index 000000000000..142b77f2b136
--- /dev/null
+++ b/net-misc/networkmanager-pptp/networkmanager-pptp-1.0.6.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+GCONF_DEBUG="no"
+GNOME_ORG_MODULE="NetworkManager-${PN##*-}"
+
+inherit gnome2
+
+DESCRIPTION="NetworkManager PPTP plugin"
+HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~x86"
+IUSE="gtk"
+
+RDEPEND="
+	>=net-misc/networkmanager-0.9.10:=
+	>=dev-libs/dbus-glib-0.74
+	>=dev-libs/glib-2.32:2
+	net-dialup/ppp:=
+	net-dialup/pptpclient
+	gtk? (
+		app-crypt/libsecret
+		>=gnome-extra/nm-applet-1.0.5
+		>=x11-libs/gtk+-3.4:3
+	)
+"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	dev-util/intltool
+	virtual/pkgconfig
+"
+
+src_configure() {
+	local myconf
+	# Same hack as net-dialup/pptpd to get proper plugin dir for ppp, bug #519986
+	local PPPD_VER=`best_version net-dialup/ppp`
+	PPPD_VER=${PPPD_VER#*/*-} #reduce it to ${PV}-${PR}
+	PPPD_VER=${PPPD_VER%%[_-]*} # main version without beta/pre/patch/revision
+	myconf="${myconf} --with-pppd-plugin-dir=/usr/$(get_libdir)/pppd/${PPPD_VER}"
+
+	gnome2_src_configure \
+		--disable-more-warnings \
+		--disable-static \
+		--with-dist-version=Gentoo \
+		$(use_with gtk gnome) \
+		${myconf}
+}
diff --git a/net-misc/networkmanager-vpnc/Manifest b/net-misc/networkmanager-vpnc/Manifest
index 5c46a91f9a6c..fe7c93f311c0 100644
--- a/net-misc/networkmanager-vpnc/Manifest
+++ b/net-misc/networkmanager-vpnc/Manifest
@@ -1,4 +1,2 @@
-DIST NetworkManager-vpnc-0.9.10.0.tar.xz 348824 SHA256 cf9168876602af8d56c79c888ce168b62485dc65bb7690a86ce5f4603eb48774 SHA512 0291f605cbbc15ddc54ccc60f9249ff6f62e4724944a5a22183580cc66db28dcda75bee49cb1c2964a35e126fb9b956d9ffd1cbd1a7fe058ecd798464ad6cd9a WHIRLPOOL 32b74d78807a7989fbccb2bb044886626776e3860de69f72b5b661a7a5a92772b732cdc683a1c0c483e261df5a8584c7b4f9a1f87b262a5eb1cab606a8fab2f5
-DIST NetworkManager-vpnc-0.9.8.6.tar.xz 348168 SHA256 40306cd713d4e6e9df6a520d2992664d22173b3327e94df45a6dac23f0a8abd6 SHA512 ccd44a5a55caa46d950a1afca393987820fcd60f13a921599d6fa47d09508c5e72cc58861824b0d83376bd4cf3105f0ef1163d2b88afe72ea467f5f8f6a8ab1d WHIRLPOOL 292abff615e239460702f9eba44cdbfd2ab7710674f695e1772cc0b8d9ee3b7eff548ac0216b2ca43695d3c4c109c02b528d929ff6aedbef7a3725b64a7e77e0
-DIST NetworkManager-vpnc-1.0.0.tar.xz 356224 SHA256 5ed0413932cd2d6100dc8b95e11ce18c44a182d81aca1dfd0400a6e419359894 SHA512 c3b99e5c8bab084fe47684dc991044c1fab65e36a91c9df9dafde1a78dadffdecce12b001206ad4351638ae5a2518381a7952346908baa7346c2eaa2e3b41e93 WHIRLPOOL 66dc5aee71004ca58de871f4f1f4b416d41c37959bdc5b345d088e39ba12fd37bc34a65f98b37c728d16f48488011f4b0c39ca9cd09d4b1394ad4c99dd76baf9
 DIST NetworkManager-vpnc-1.0.2.tar.xz 358100 SHA256 3e17bfc505d304b3d21a784c06fc4b990cabdafd6886b47632496dfba0dea500 SHA512 8f6fdf84d4951c0f623791a40ff141db34d7d00b3d48e3afc80a8bb1d591840717ef7eb145c9c021423174404eeb3133c537d3b970940cd7b43595a0257473d3 WHIRLPOOL aea37a15d893ce0af9a2220afe70fe4c93f33783132a7fa1d4b19e5fd1922a2bc08dc0ce86ea029ecd09fee4b742dd3e407c8896afe3cd7cc71ce4a2152149e6
+DIST NetworkManager-vpnc-1.0.6.tar.xz 357504 SHA256 538298d72845863bf16435940333d30a32a3b28b03b67f9f46c8a0c32cbdcc43 SHA512 ca14dffd9cfc2758dd435990a8afb6985b80425bf7886b36183566320c98a529c0b71f9a46c4b1aebdfe1bdc427b7cdc8e23b248a2bd0a52ef04333fc11b2c7b WHIRLPOOL 9d1db24f40ec050defda1753105bbc1955b4ed3af82283f2b2f42cf0b2d5af4f6934e7790f15190f1e441d4ed1a093ab3429e2918e8ebc243743de7d31336664
diff --git a/net-misc/networkmanager-vpnc/networkmanager-vpnc-0.9.10.0.ebuild b/net-misc/networkmanager-vpnc/networkmanager-vpnc-0.9.10.0.ebuild
deleted file mode 100644
index ad715e6df1bc..000000000000
--- a/net-misc/networkmanager-vpnc/networkmanager-vpnc-0.9.10.0.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-GCONF_DEBUG="no"
-GNOME_ORG_MODULE="NetworkManager-${PN##*-}"
-
-inherit gnome2
-
-DESCRIPTION="NetworkManager VPNC plugin"
-HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="gtk test"
-
-RDEPEND="
-	>=net-misc/networkmanager-0.9.6
-	>=dev-libs/dbus-glib-0.74
-	>=dev-libs/glib-2.32:2
-	>=net-misc/vpnc-0.5
-	gtk? (
-		app-crypt/libsecret
-		>=gnome-extra/nm-applet-0.9.9.0
-		>=x11-libs/gtk+-3.4:3
-	)
-"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	dev-util/intltool
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	# Test will fail if the machine doesn't have a particular locale installed
-	sed '/test_non_utf8_import (plugin/ d' \
-		-i properties/tests/test-import-export.c || die "sed failed"
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-		--disable-more-warnings \
-		--disable-static \
-		--with-dist-version=Gentoo \
-		$(use_with gtk gnome) \
-		$(use_with test tests)
-}
diff --git a/net-misc/networkmanager-vpnc/networkmanager-vpnc-0.9.8.6.ebuild b/net-misc/networkmanager-vpnc/networkmanager-vpnc-0.9.8.6.ebuild
deleted file mode 100644
index df6b76a48baa..000000000000
--- a/net-misc/networkmanager-vpnc/networkmanager-vpnc-0.9.8.6.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-GNOME_ORG_MODULE="NetworkManager-${PN##*-}"
-
-inherit eutils gnome2-utils gnome.org
-
-DESCRIPTION="NetworkManager VPNC plugin"
-HOMEPAGE="https://www.gnome.org/projects/NetworkManager/"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-IUSE="gtk test"
-
-RDEPEND="
-	>=net-misc/networkmanager-0.9.8
-	>=dev-libs/dbus-glib-0.74
-	>=net-misc/vpnc-0.5
-	gtk? (
-		>=x11-libs/gtk+-2.91.4:3
-		gnome-base/gnome-keyring
-		gnome-base/libgnome-keyring
-	)
-"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	dev-util/intltool
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	# Test will fail if the machine doesn't have a particular locale installed
-	sed '/test_non_utf8_import (plugin/ d' \
-		-i properties/tests/test-import-export.c || die "sed failed"
-
-	gnome2_disable_deprecation_warning
-}
-
-src_configure() {
-	econf \
-		--disable-more-warnings \
-		--disable-static \
-		--with-dist-version=Gentoo \
-		--with-gtkver=3 \
-		$(use_with gtk gnome) \
-		$(use_with test tests)
-}
-
-src_install() {
-	default
-	prune_libtool_files
-}
diff --git a/net-misc/networkmanager-vpnc/networkmanager-vpnc-1.0.0.ebuild b/net-misc/networkmanager-vpnc/networkmanager-vpnc-1.0.0.ebuild
deleted file mode 100644
index 5765c3207c94..000000000000
--- a/net-misc/networkmanager-vpnc/networkmanager-vpnc-1.0.0.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-GCONF_DEBUG="no"
-GNOME_ORG_MODULE="NetworkManager-${PN##*-}"
-
-inherit gnome2
-
-DESCRIPTION="NetworkManager VPNC plugin"
-HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-IUSE="gtk test"
-
-RDEPEND="
-	>=net-misc/networkmanager-0.9.10:=
-	>=dev-libs/dbus-glib-0.74
-	>=dev-libs/glib-2.32:2
-	>=net-misc/vpnc-0.5
-	gtk? (
-		app-crypt/libsecret
-		>=gnome-extra/nm-applet-0.9.9.0
-		>=x11-libs/gtk+-3.4:3
-	)
-"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	dev-util/intltool
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	# Test will fail if the machine doesn't have a particular locale installed
-	# upstream bug #742708
-	sed '/test_non_utf8_import (plugin/ d' \
-		-i properties/tests/test-import-export.c || die "sed failed"
-
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-		--disable-more-warnings \
-		--disable-static \
-		--with-dist-version=Gentoo \
-		$(use_with gtk gnome) \
-		$(use_with test tests)
-}
diff --git a/net-misc/networkmanager-vpnc/networkmanager-vpnc-1.0.6.ebuild b/net-misc/networkmanager-vpnc/networkmanager-vpnc-1.0.6.ebuild
new file mode 100644
index 000000000000..71d980b47ab8
--- /dev/null
+++ b/net-misc/networkmanager-vpnc/networkmanager-vpnc-1.0.6.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+GCONF_DEBUG="no"
+GNOME_ORG_MODULE="NetworkManager-${PN##*-}"
+
+inherit gnome2
+
+DESCRIPTION="NetworkManager VPNC plugin"
+HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~x86"
+IUSE="gtk test"
+
+RDEPEND="
+	>=net-misc/networkmanager-0.9.10:=
+	>=dev-libs/dbus-glib-0.74
+	>=dev-libs/glib-2.32:2
+	>=net-misc/vpnc-0.5.3_p550
+	gtk? (
+		app-crypt/libsecret
+		>=gnome-extra/nm-applet-1.0.5
+		>=x11-libs/gtk+-3.4:3
+	)
+"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	dev-util/intltool
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	# Test will fail if the machine doesn't have a particular locale installed
+	# upstream bug #742708
+	sed '/test_non_utf8_import (plugin/ d' \
+		-i properties/tests/test-import-export.c || die "sed failed"
+
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure \
+		--disable-more-warnings \
+		--disable-static \
+		--with-dist-version=Gentoo \
+		$(use_with gtk gnome) \
+		$(use_with test tests)
+}
diff --git a/net-misc/networkmanager/Manifest b/net-misc/networkmanager/Manifest
index 96ae1db3c177..3d6b3b98e515 100644
--- a/net-misc/networkmanager/Manifest
+++ b/net-misc/networkmanager/Manifest
@@ -1,5 +1,3 @@
-DIST NetworkManager-0.9.10.1_pre20141101.tar.xz 2507248 SHA256 5f2e61c74713ce9ebb755c23c9aca279f321eb924247c282bdd50c2c8337fe40 SHA512 0cc4ec34e5933229a9b25e25b26d7619ac1a61275cd4c33a658c98578e6a27d4d2b1337c1e839467c625739a6ae2175ab6d883c4bfbe35642dbbafb7b11a421d WHIRLPOOL 1d0fb976ffc26aba74fc8b8bee081efc236ea647da0970a5564730522f2f837bfa5cd0853268d5098126810a4429b2ff7840f9cf66e6faa3bd5829b175679681
-DIST NetworkManager-0.9.8.10.tar.xz 2015492 SHA256 064d27223d3824859df12e1fb25b787fec1c68bbc864dc52a0289b9211c4c972 SHA512 8688b8dceadf87d26b76bdda76ecb0b383ecaa7991487e6f6ddc150cf311f2f0cb3487afd91f19ecde2925585e8d53c8761fd45743f25c488eff6a7811ca4200 WHIRLPOOL 29c4f2189eb812c23e8c1cfbce728c525282ad3f04d3c9c25b3a80a043c95f2a9419fa71ac6f8a59d7abde8a30275e68e3ef615b74f78c07846757d92f114e1c
-DIST NetworkManager-1.0.0.tar.xz 3210884 SHA256 3a66afec670c975edd9832e620b725a5f16ed267a1b9e1b2d51ef27250d85947 SHA512 7089496ce31bfdffe99c0f031b6326734d2e36b3bb9a2ed0ecbe3dad64bff0dc993b2e6bcac770b31bcfe634833bd8dbabc23d128356dbba8243a6d8fc489a5e WHIRLPOOL df928cb0a9be0782b1f853d808273f798ca62be5f0fd650caf033fb16b98ef696c7f90eaed90488ef7f6a9e607cf74cd865848523fbbf08cd26487e98b4a455a
 DIST NetworkManager-1.0.2.tar.xz 3210588 SHA256 359385707494bedbb48cfe0992ccfbcc4ac147dae1f7a47055c71e96439508ff SHA512 9c5884c75c2a2aae478d99bde4ecbb0dc4293b3f50dcf78a1579aa13e09ab95b01981a366f1dc58cd5d02fe77dc90fc0941f00142cd5ef1cea14c3b9d89f5c36 WHIRLPOOL 0a9f4bc6cc0f176bfc1c82294b45392c86b6d6a65cefe38fc80fce8f09584f275a23163d1909dfde9427405fe7b4086b8e2bc4995eded4cf441b8024fa00657d
 DIST NetworkManager-1.0.4.tar.xz 3364168 SHA256 e4099fa2f4f4b8d95d0ad9fdd03ec20960845085fa500bf79aecbf54cee018c9 SHA512 b07583ca654a95dc018a712626ba0065c2ff5d9904b326891be684b32526f360f287b46cbd11026277a385558c1b55e38a086ae2b0aab059b63a4f3e11566cb1 WHIRLPOOL d6a612a855e216b7b46c620a85ceb3b3893029cf83bb9699ed0ba1c2d349abdeb4ee8921155216fb8285ac369cea64704836984e86bbf3813d8287b4803fc49a
+DIST NetworkManager-1.0.6.tar.xz 3381092 SHA256 38ea002403e3b884ffa9aae25aea431d2a8420f81f4919761c83fb92648254bd SHA512 74e8f91bbd9a70f1764b06c729717e091d2be0a8e316fe1b6235e644b65f43add5214be7a1100fe9d30b1511f4a00b9892dce79bb8ba0f0b0d57089d2ba6ddbb WHIRLPOOL 5f1d8c905e4aaa78c742c16e773f8fdbcdb2771edf36565f6b419af457776084573aa43b384ba32885992e76b399d4f2fc7dc94ad4295ac28dcfa3d6b6994b97
diff --git a/net-misc/networkmanager/files/networkmanager-0.9.10.0-arpingpath.patch b/net-misc/networkmanager/files/networkmanager-0.9.10.0-arpingpath.patch
deleted file mode 100644
index f8e0d5260014..000000000000
--- a/net-misc/networkmanager/files/networkmanager-0.9.10.0-arpingpath.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Source: Timo Gurr <tgurr@exherbo.org>
-Upstream: Reported, https://bugzilla.gnome.org/show_bug.cgi?id=734131
-Reason: fix hardcoded path to arping
-
-diff -Naur NetworkManager-0.9.10.0.old/src/devices/nm-device.c NetworkManager-0.9.10.0/src/devices/nm-device.c
---- NetworkManager-0.9.10.0.old/src/devices/nm-device.c	2014-07-04 02:44:19.000000000 +0200
-+++ NetworkManager-0.9.10.0/src/devices/nm-device.c	2014-09-01 17:35:29.656282068 +0200
-@@ -4429,7 +4429,7 @@
- static void
- send_arps (NMDevice *self, const char *mode_arg)
- {
--	const char *argv[] = { "/sbin/arping", mode_arg, "-q", "-I", nm_device_get_ip_iface (self), "-c", "1", NULL, NULL };
-+	const char *argv[] = { "/bin/arping", mode_arg, "-q", "-I", nm_device_get_ip_iface (self), "-c", "1", NULL, NULL };
- 	int ip_arg = G_N_ELEMENTS (argv) - 2;
- 	NMConnection *connection;
- 	NMSettingIP4Config *s_ip4;
diff --git a/net-misc/networkmanager/files/networkmanager-0.9.8.4-pre-sleep.patch b/net-misc/networkmanager/files/networkmanager-0.9.8.4-pre-sleep.patch
deleted file mode 100644
index 6e6dfbe8ee29..000000000000
--- a/net-misc/networkmanager/files/networkmanager-0.9.8.4-pre-sleep.patch
+++ /dev/null
@@ -1,131 +0,0 @@
-From ffb08fa288cea4c9ac8f18fd83e063b2e86ac51b Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@gentoo.org>
-Date: Sun, 27 Jan 2013 23:39:56 -0500
-Subject: [PATCH] Implement "pre-sleep" action dispatch
-
-Based on work by Christian Becke <christianbecke@gmail.com> in
-https://bugzilla.gnome.org/show_bug.cgi?id=387832
----
- callouts/nm-dispatcher-utils.c |  3 ++-
- src/nm-dispatcher.c            |  8 ++++++--
- src/nm-dispatcher.h            |  3 ++-
- src/nm-manager.c               | 28 +++++++++++++++++++++-------
- 4 files changed, 31 insertions(+), 11 deletions(-)
-
-diff --git a/callouts/nm-dispatcher-utils.c b/callouts/nm-dispatcher-utils.c
-index 8824295..66cbc4b 100644
---- a/callouts/nm-dispatcher-utils.c
-+++ b/callouts/nm-dispatcher-utils.c
-@@ -409,7 +409,8 @@ nm_dispatcher_utils_construct_envp (const char *action,
- 	g_return_val_if_fail (*out_iface == NULL, NULL);
- 
- 	/* Hostname changes don't require a device nor contain a connection */
--	if (!strcmp (action, "hostname"))
-+	if (!strcmp (action, "hostname") ||
-+	    !strcmp (action, "pre-sleep"))
- 		return g_new0 (char *, 1);
- 
- 	/* Canonicalize the VPN interface name; "" is used when passing it through
-diff --git a/src/nm-dispatcher.c b/src/nm-dispatcher.c
-index 12cd0f0..42d7e12 100644
---- a/src/nm-dispatcher.c
-+++ b/src/nm-dispatcher.c
-@@ -237,6 +237,8 @@ action_to_string (DispatcherAction action)
- 		return "dhcp4-change";
- 	case DISPATCHER_ACTION_DHCP6_CHANGE:
- 		return "dhcp6-change";
-+	case DISPATCHER_ACTION_PRE_SLEEP:
-+		return "pre-sleep";
- 	default:
- 		break;
- 	}
-@@ -269,7 +271,8 @@ _dispatcher_call (DispatcherAction action,
- 	DispatchInfo *info;
- 
- 	/* All actions except 'hostname' require a device */
--	if (action != DISPATCHER_ACTION_HOSTNAME)
-+	if (action != DISPATCHER_ACTION_HOSTNAME &&
-+	    action != DISPATCHER_ACTION_PRE_SLEEP)
- 		g_return_val_if_fail (NM_IS_DEVICE (device), NULL);
- 	/* VPN actions require at least an IPv4 config (for now) */
- 	if (action == DISPATCHER_ACTION_VPN_UP)
-@@ -308,7 +311,8 @@ _dispatcher_call (DispatcherAction action,
- 	vpn_ip6_props = value_hash_create ();
- 
- 	/* hostname actions only send the hostname */
--	if (action != DISPATCHER_ACTION_HOSTNAME) {
-+	if (action != DISPATCHER_ACTION_HOSTNAME &&
-+	    action != DISPATCHER_ACTION_PRE_SLEEP) {
- 		fill_device_props (device,
- 		                   device_props,
- 		                   device_ip4_props,
-diff --git a/src/nm-dispatcher.h b/src/nm-dispatcher.h
-index 05a6c87..8e95834 100644
---- a/src/nm-dispatcher.h
-+++ b/src/nm-dispatcher.h
-@@ -39,7 +39,8 @@ typedef enum {
- 	DISPATCHER_ACTION_VPN_PRE_DOWN,
- 	DISPATCHER_ACTION_VPN_DOWN,
- 	DISPATCHER_ACTION_DHCP4_CHANGE,
--	DISPATCHER_ACTION_DHCP6_CHANGE
-+	DISPATCHER_ACTION_DHCP6_CHANGE,
-+	DISPATCHER_ACTION_PRE_SLEEP = 999,
- } DispatcherAction;
- 
- typedef void (*DispatcherFunc) (gconstpointer call, gpointer user_data);
-diff --git a/src/nm-manager.c b/src/nm-manager.c
-index 811f49d..f52956d 100644
---- a/src/nm-manager.c
-+++ b/src/nm-manager.c
-@@ -73,6 +73,7 @@
- #include "nm-sleep-monitor.h"
- #include "nm-connectivity.h"
- #include "nm-policy.h"
-+#include "nm-dispatcher.h"
- 
- 
- #define NM_AUTOIP_DBUS_SERVICE "org.freedesktop.nm_avahi_autoipd"
-@@ -3350,6 +3351,23 @@ impl_manager_deactivate_connection (NMManager *self,
- }
- 
- static void
-+pre_sleep_dispatcher_done (gpointer call, gpointer user_data)
-+{
-+	NMManager *self = (NMManager *) user_data;
-+	NMManagerPrivate *priv = NM_MANAGER_GET_PRIVATE (self);
-+	GSList *iter;
-+
-+	/* Just deactivate and down all devices from the device list,
-+	 * to keep things fast the device list will get resynced when
-+	 * the manager wakes up.
-+	 */
-+	for (iter = priv->devices; iter; iter = iter->next)
-+		nm_device_set_managed (NM_DEVICE (iter->data), FALSE, NM_DEVICE_STATE_REASON_SLEEPING);
-+
-+	nm_manager_update_state (self);
-+}
-+
-+static void
- do_sleep_wake (NMManager *self)
- {
- 	NMManagerPrivate *priv = NM_MANAGER_GET_PRIVATE (self);
-@@ -3359,13 +3377,9 @@ do_sleep_wake (NMManager *self)
- 	if (manager_sleeping (self)) {
- 		nm_log_info (LOGD_SUSPEND, "sleeping or disabling...");
- 
--		/* Just deactivate and down all devices from the device list,
--		 * to keep things fast the device list will get resynced when
--		 * the manager wakes up.
--		 */
--		for (iter = priv->devices; iter; iter = iter->next)
--			nm_device_set_managed (NM_DEVICE (iter->data), FALSE, NM_DEVICE_STATE_REASON_SLEEPING);
--
-+		nm_dispatcher_call (DISPATCHER_ACTION_PRE_SLEEP, NULL, NULL,
-+		                    pre_sleep_dispatcher_done, self);
-+		return;
- 	} else {
- 		nm_log_info (LOGD_SUSPEND, "waking up and re-enabling...");
- 
--- 
-1.8.3.2
-
diff --git a/net-misc/networkmanager/files/networkmanager-0.9.8.9-fix-crash-on-wifi-rescan.patch b/net-misc/networkmanager/files/networkmanager-0.9.8.9-fix-crash-on-wifi-rescan.patch
deleted file mode 100644
index 35e9c04aff4b..000000000000
--- a/net-misc/networkmanager/files/networkmanager-0.9.8.9-fix-crash-on-wifi-rescan.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From 4099c9242b091604466dda081dc5f6909354258b Mon Sep 17 00:00:00 2001
-From: M. Vefa Bicakci <m.v.b@runbox.com>
-Date: Sat, 24 May 2014 23:37:00 +0000
-Subject: core: fix crash during Wi-Fi rescan by emitting NM_DEVICE_AUTH_REQUEST signal correctly
-
-Fixes regression introduced by commit da59b6d2229b85afbb9e14846931376340dc6030.
-
-https://mail.gnome.org/archives/networkmanager-list/2014-May/msg00038.html
-
-Backport-of: d9653484859c426f707b4759bc9882f7a57c1152
-[thaller@redhat.com: original patch modified in nm-device-wifi.c to pass no
-                     connection, as it is done on master]
-Signed-off-by: Thomas Haller <thaller@redhat.com>
----
-diff --git a/src/nm-device-wifi.c b/src/nm-device-wifi.c
-index 8ca5278..052d68f 100644
---- a/src/nm-device-wifi.c
-+++ b/src/nm-device-wifi.c
-@@ -1563,6 +1563,7 @@ impl_device_request_scan (NMDeviceWifi *self,
- 	g_signal_emit_by_name (device,
- 	                       NM_DEVICE_AUTH_REQUEST,
- 	                       context,
-+	                       NULL,
- 	                       NM_AUTH_PERMISSION_NETWORK_CONTROL,
- 	                       TRUE,
- 	                       request_scan_cb,
-diff --git a/src/nm-manager.c b/src/nm-manager.c
-index 9037e64..96bf3b4 100644
---- a/src/nm-manager.c
-+++ b/src/nm-manager.c
-@@ -1874,10 +1874,10 @@ device_auth_request_cb (NMDevice *device,
- 	}
- 
- 	/* Ensure the subject has permissions for this connection */
--	if (!nm_auth_uid_in_acl (connection,
--	                         priv->session_monitor,
--	                         sender_uid,
--	                         &error_desc)) {
-+	if (connection != NULL && !nm_auth_uid_in_acl (connection,
-+	                                               priv->session_monitor,
-+	                                               sender_uid,
-+	                                               &error_desc)) {
- 		error = g_error_new_literal (NM_MANAGER_ERROR,
- 		                             NM_MANAGER_ERROR_PERMISSION_DENIED,
- 		                             error_desc);
---
-cgit v0.9.0.2-2-gbebe
diff --git a/net-misc/networkmanager/files/networkmanager-1.0.0-find-helpers.patch b/net-misc/networkmanager/files/networkmanager-1.0.0-find-helpers.patch
deleted file mode 100644
index a84909c8253e..000000000000
--- a/net-misc/networkmanager/files/networkmanager-1.0.0-find-helpers.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 6f643d2761650e53fd3b647526110a8473138b5d Mon Sep 17 00:00:00 2001
-From: Thomas Haller <thaller@redhat.com>
-Date: Thu, 8 Jan 2015 11:55:50 +0100
-Subject: core: add /bin to the default search path
-
-https://bugzilla.gnome.org/show_bug.cgi?id=742576
-(cherry picked from commit abbca50ca9d552a28eca792f12ec618df6128fff)
-
-diff --git a/src/NetworkManagerUtils.c b/src/NetworkManagerUtils.c
-index 2c291cd..6747b65 100644
---- a/src/NetworkManagerUtils.c
-+++ b/src/NetworkManagerUtils.c
-@@ -814,6 +814,7 @@ const char *const NM_PATHS_DEFAULT[] = {
- 	"/sbin/",
- 	"/usr/sbin/",
- 	"/usr/local/sbin/",
-+	"/bin/",
- 	"/usr/bin/",
- 	"/usr/local/bin/",
- 	NULL,
--- 
-cgit v0.10.2
-
diff --git a/net-misc/networkmanager/files/networkmanager-1.0.0-lto-switch.patch b/net-misc/networkmanager/files/networkmanager-1.0.0-lto-switch.patch
deleted file mode 100644
index 5d66c3393c71..000000000000
--- a/net-misc/networkmanager/files/networkmanager-1.0.0-lto-switch.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From cda2802fe960737abb4623166ca4f75a63b5fe5a Mon Sep 17 00:00:00 2001
-From: Thomas Haller <thaller@redhat.com>
-Date: Thu, 8 Jan 2015 12:01:32 +0100
-Subject: build: fix --enable-lto configure option to allow disabling option
- explicitly
-
-When specifying '--enable-lto=anything' or '--disable-lto',
-the configure script would always set enable_lto=yes.
-
-The only way to disable lto, was *not* specifying the
-configure option.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=742575
-(cherry picked from commit 6eccfda0face594f86dea495d2ed2546b0d37e77)
-
-diff --git a/configure.ac b/configure.ac
-index b6bf38e..b407686 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -821,10 +821,11 @@ AM_CONDITIONAL(BUILD_NMTUI, test "$build_nmtui" = yes)
- 
- NM_COMPILER_WARNINGS
- 
--AC_ARG_ENABLE(lto, AS_HELP_STRING([--enable-lto], [Enable Link Time Optimization for smaller size (default: no)]),
--              [enable_lto=yes], [enable_lto=no])
-+AC_ARG_ENABLE(lto, AS_HELP_STRING([--enable-lto], [Enable Link Time Optimization for smaller size (default: no)]))
- if (test "${enable_lto}" = "yes"); then
-     CFLAGS="-flto $CFLAGS"
-+else
-+    enable_lto='no'
- fi
- 
- 
--- 
-cgit v0.10.2
-
diff --git a/net-misc/networkmanager/files/networkmanager-1.0.0-remove-bashisms.patch b/net-misc/networkmanager/files/networkmanager-1.0.0-remove-bashisms.patch
deleted file mode 100644
index 366627f7eb18..000000000000
--- a/net-misc/networkmanager/files/networkmanager-1.0.0-remove-bashisms.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 4c3c9a38272112fe7a6a248ba521d55ac1b66892 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?R=C3=A9mi=20Cardona?= <remi@gentoo.org>
-Date: Sun, 25 Jan 2015 13:02:19 +0100
-Subject: [PATCH] build: use POSIX-compliant 'printf' instead of 'echo'
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Fixes the following error when running ./configure with dash:
-
-  checking for QT... yes
-  checking for moc-qt4... no
-  checking for moc... moc
-  configure: error: --with-udev-dir must be an absolute path or 'yes' or
-  'no'. Instead it is '/lib/udev'
-
-As per the Autoconf Manual's section on "Limitations of Shell Builtins":
-
-  The simple echo is probably the most surprising source of portability
-  troubles. It is not possible to use ‘echo’ portably unless both
-  options and escape sequences are omitted.
-
-https://www.gnu.org/software/automake/faq/autoconf.html#echo
-https://bugs.gentoo.org/536540
----
- configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index b407686..5c87c7e 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -302,7 +302,7 @@ AM_CONDITIONAL(WITH_QT, test "${enable_qt}" = "yes")
- 
- AC_ARG_WITH(udev-dir, AS_HELP_STRING([--with-udev-dir=DIR], [Absolute path of the udev base directory. Set to 'no' not to install the udev rules]), [], [with_udev_dir="yes"])
- if (test "$with_udev_dir" != 'no'); then
--	if (test "$with_udev_dir" != 'yes' && echo -n "$with_udev_dir" | grep -v -q '^/'); then
-+	if (test "$with_udev_dir" != 'yes' && printf '%s' "$with_udev_dir" | grep -v -q '^/'); then
- 		AC_MSG_ERROR([--with-udev-dir must be an absolute path or 'yes' or 'no'. Instead it is '$with_udev_dir'])
- 	fi
- 	if (test "$with_udev_dir" = 'yes'); then
--- 
-2.2.1
-
diff --git a/net-misc/networkmanager/files/nm-system-settings.conf-ifnet b/net-misc/networkmanager/files/nm-system-settings.conf-ifnet
deleted file mode 100644
index 4d14ee7b8041..000000000000
--- a/net-misc/networkmanager/files/nm-system-settings.conf-ifnet
+++ /dev/null
@@ -1,6 +0,0 @@
-[main]
-plugins=ifnet,keyfile
-
-[ifnet]
-managed=true
-auto_refresh=false
diff --git a/net-misc/networkmanager/networkmanager-0.9.10.1_pre20141101.ebuild b/net-misc/networkmanager/networkmanager-0.9.10.1_pre20141101.ebuild
deleted file mode 100644
index 54d9952bfe57..000000000000
--- a/net-misc/networkmanager/networkmanager-0.9.10.1_pre20141101.ebuild
+++ /dev/null
@@ -1,302 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="no"
-GNOME_ORG_MODULE="NetworkManager"
-GNOME2_LA_PUNT="yes"
-VALA_MIN_API_VERSION="0.18"
-VALA_USE_DEPEND="vapigen"
-
-# Tests need python2, https://bugzilla.gnome.org/show_bug.cgi?id=739448
-PYTHON_COMPAT=( python2_7 )
-
-inherit bash-completion-r1 eutils gnome2 linux-info multilib python-any-r1 systemd user readme.gentoo toolchain-funcs vala versionator virtualx udev
-
-DESCRIPTION="Universal network configuration daemon for laptops, desktops, servers and virtualization hosts"
-HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
-
-SRC_URI="https://dev.gentoo.org/~pacho/gnome/${GNOME_ORG_MODULE}-${PV}.tar.xz"
-
-LICENSE="GPL-2+"
-SLOT="0" # add subslot if libnm-util.so.2 or libnm-glib.so.4 bumps soname version
-
-IUSE="bluetooth connection-sharing consolekit +dhclient dhcpcd gnutls +introspection \
-kernel_linux +nss +modemmanager ncurses +ppp resolvconf selinux systemd teamd test \
-vala +wext +wifi zeroconf" # wimax
-
-KEYWORDS="amd64 arm ~ppc ~ppc64 x86"
-
-REQUIRED_USE="
-	modemmanager? ( ppp )
-	^^ ( nss gnutls )
-	^^ ( dhclient dhcpcd )
-"
-
-S="${WORKDIR}/${GNOME_ORG_MODULE}-0.9.10.1"
-
-# gobject-introspection-0.10.3 is needed due to gnome bug 642300
-# wpa_supplicant-0.7.3-r3 is needed due to bug 359271
-# TODO: Qt support?
-#
-# iputils version needed due path changes (#523632). Upstream fixed
-# it with a major refactor committed to 'master' for handling different
-# paths for arping and other tools and, then, the version requirement
-# will be able to be dropped on next major NM version
-COMMON_DEPEND="
-	>=sys-apps/dbus-1.2
-	>=dev-libs/dbus-glib-0.100
-	>=dev-libs/glib-2.32:2
-	>=dev-libs/libnl-3.2.8:3=
-	>=sys-auth/polkit-0.106
-	net-libs/libndp
-	>=net-libs/libsoup-2.26:2.4=
-	>=net-misc/iputils-20121221-r1
-	sys-libs/readline:0
-	>=virtual/libgudev-165:=
-	bluetooth? ( >=net-wireless/bluez-5 )
-	connection-sharing? (
-		net-dns/dnsmasq[dhcp]
-		net-firewall/iptables )
-	gnutls? (
-		dev-libs/libgcrypt:0=
-		net-libs/gnutls:= )
-	modemmanager? ( >=net-misc/modemmanager-0.7.991 )
-	ncurses? ( >=dev-libs/newt-0.52.15 )
-	nss? ( >=dev-libs/nss-3.11:= )
-	dhclient? ( =net-misc/dhcp-4*[client] )
-	dhcpcd? ( >=net-misc/dhcpcd-4.0.0_rc3 )
-	introspection? ( >=dev-libs/gobject-introspection-0.10.3 )
-	ppp? ( >=net-dialup/ppp-2.4.5:=[ipv6] net-dialup/rp-pppoe )
-	resolvconf? ( net-dns/openresolv )
-	systemd? ( >=sys-apps/systemd-183:0= )
-	teamd? ( >=net-misc/libteam-1.9 )
-	zeroconf? ( net-dns/avahi:=[autoipd] )
-	|| ( sys-power/upower sys-power/upower-pm-utils >=sys-apps/systemd-183 )
-"
-RDEPEND="${COMMON_DEPEND}
-	consolekit? ( sys-auth/consolekit )
-	wifi? ( >=net-wireless/wpa_supplicant-0.7.3-r3[dbus] )
-"
-DEPEND="${COMMON_DEPEND}
-	dev-util/gtk-doc-am
-	>=dev-util/intltool-0.40
-	>=sys-devel/gettext-0.17
-	>=sys-kernel/linux-headers-2.6.29
-	virtual/pkgconfig
-	vala? ( $(vala_depend) )
-	test? (
-		$(python_gen_any_dep '
-			dev-python/dbus-python[${PYTHON_USEDEP}]
-			dev-python/pygobject:2[${PYTHON_USEDEP}]')
-	)
-"
-
-sysfs_deprecated_check() {
-	ebegin "Checking for SYSFS_DEPRECATED support"
-
-	if { linux_chkconfig_present SYSFS_DEPRECATED_V2; }; then
-		eerror "Please disable SYSFS_DEPRECATED_V2 support in your kernel config and recompile your kernel"
-		eerror "or NetworkManager will not work correctly."
-		eerror "See https://bugs.gentoo.org/333639 for more info."
-		die "CONFIG_SYSFS_DEPRECATED_V2 support detected!"
-	fi
-	eend $?
-}
-
-pkg_pretend() {
-	if use kernel_linux; then
-		get_version
-		if linux_config_exists; then
-			sysfs_deprecated_check
-		else
-			ewarn "Was unable to determine your kernel .config"
-			ewarn "Please note that if CONFIG_SYSFS_DEPRECATED_V2 is set in your kernel .config, NetworkManager will not work correctly."
-			ewarn "See https://bugs.gentoo.org/333639 for more info."
-		fi
-
-	fi
-}
-
-pkg_setup() {
-	enewgroup plugdev
-}
-
-src_prepare() {
-	DOC_CONTENTS="To modify system network connections without needing to enter the
-		root password, add your user account to the 'plugdev' group."
-
-	# Find arping at proper place, bug #523632
-	epatch "${FILESDIR}/${PN}-0.9.10.0-arpingpath.patch"
-
-	# Force use of /run, avoid eautoreconf, upstream bug #737139
-	sed -e 's:$localstatedir/run/:/run/:' -i configure || die
-
-	use vala && vala_src_prepare
-
-	epatch_user # don't remove, users often want custom patches for NM
-
-	gnome2_src_prepare
-}
-
-src_configure() {
-	local myconf
-
-	# Same hack as net-dialup/pptpd to get proper plugin dir for ppp, bug #519986
-	if use ppp; then
-		local PPPD_VER=`best_version net-dialup/ppp`
-		PPPD_VER=${PPPD_VER#*/*-} #reduce it to ${PV}-${PR}
-		PPPD_VER=${PPPD_VER%%[_-]*} # main version without beta/pre/patch/revision
-		myconf="${myconf} --with-pppd-plugin-dir=/usr/$(get_libdir)/pppd/${PPPD_VER}"
-	fi
-
-	# unit files directory needs to be passed only when systemd is enabled,
-	# otherwise systemd support is not disabled completely, bug #524534
-	use systemd && myconf="${myconf} "$(systemd_with_unitdir)""
-
-	# TODO: enable wimax when we have a libnl:3 compatible revision of it
-	# wimax will be removed, bug #522822
-	# ifnet plugin always disabled until someone volunteers to actively
-	# maintain and fix it
-	gnome2_src_configure \
-		--disable-more-warnings \
-		--disable-static \
-		--localstatedir=/var \
-		--disable-ifnet \
-		--without-netconfig \
-		--with-dbus-sys-dir=/etc/dbus-1/system.d \
-		--with-udev-dir="$(get_udevdir)" \
-		--with-config-plugins-default=keyfile \
-		--with-iptables=/sbin/iptables \
-		--with-libsoup=yes \
-		--enable-concheck \
-		--with-crypto=$(usex nss nss gnutls) \
-		--with-session-tracking=$(usex systemd systemd $(usex consolekit consolekit no)) \
-		--with-suspend-resume=$(usex systemd systemd upower) \
-		$(use_enable bluetooth bluez5-dun) \
-		$(use_enable introspection) \
-		$(use_enable ppp) \
-		--disable-wimax \
-		$(use_with dhclient) \
-		$(use_with dhcpcd) \
-		$(use_with modemmanager modem-manager-1) \
-		$(use_with ncurses nmtui) \
-		$(use_with resolvconf) \
-		$(use_with selinux) \
-		$(use_enable teamd teamdctl) \
-		$(use_enable test tests) \
-		$(use_enable vala) \
-		--without-valgrind \
-		$(use_with wext) \
-		${myconf}
-}
-
-src_test() {
-	python_setup
-	Xemake check
-}
-
-src_install() {
-	# Install completions at proper place, bug #465100
-	gnome2_src_install completiondir="$(get_bashcompdir)"
-
-	readme.gentoo_create_doc
-
-	newinitd "${FILESDIR}/init.d.NetworkManager" NetworkManager
-	newconfd "${FILESDIR}/conf.d.NetworkManager" NetworkManager
-
-	# /var/run/NetworkManager is used by some distros, but not by Gentoo
-	rmdir -v "${ED}/var/run/NetworkManager" || die "rmdir failed"
-
-	# Need to keep the /etc/NetworkManager/dispatched.d for dispatcher scripts
-	keepdir /etc/NetworkManager/dispatcher.d
-
-	# Provide openrc net dependency only when nm is connected
-	exeinto /etc/NetworkManager/dispatcher.d
-	newexe "${FILESDIR}/10-openrc-status-r4" 10-openrc-status
-	sed -e "s:@EPREFIX@:${EPREFIX}:g" \
-		-i "${ED}/etc/NetworkManager/dispatcher.d/10-openrc-status" || die
-
-	keepdir /etc/NetworkManager/system-connections
-	chmod 0600 "${ED}"/etc/NetworkManager/system-connections/.keep* # bug #383765
-
-	# Allow users in plugdev group to modify system connections
-	insinto /usr/share/polkit-1/rules.d/
-	doins "${FILESDIR}/01-org.freedesktop.NetworkManager.settings.modify.system.rules"
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	readme.gentoo_print_elog
-
-	if [[ -e "${EROOT}etc/NetworkManager/nm-system-settings.conf" ]]; then
-		ewarn "The ${PN} system configuration file has moved to a new location."
-		ewarn "You must migrate your settings from ${EROOT}/etc/NetworkManager/nm-system-settings.conf"
-		ewarn "to ${EROOT}etc/NetworkManager/NetworkManager.conf"
-		ewarn
-		ewarn "After doing so, you can remove ${EROOT}etc/NetworkManager/nm-system-settings.conf"
-	fi
-
-	# The polkit rules file moved to /usr/share
-	old_rules="${EROOT}etc/polkit-1/rules.d/01-org.freedesktop.NetworkManager.settings.modify.system.rules"
-	if [[ -f "${old_rules}" ]]; then
-		case "$(md5sum ${old_rules})" in
-		  574d0cfa7e911b1f7792077003060240* )
-			# Automatically delete the old rules.d file if the user did not change it
-			elog
-			elog "Removing old ${old_rules} ..."
-			rm -f "${old_rules}" || eerror "Failed, please remove ${old_rules} manually"
-			;;
-		  * )
-			elog "The ${old_rules}"
-			elog "file moved to /usr/share/polkit-1/rules.d/ in >=networkmanager-0.9.4.0-r4"
-			elog "If you edited ${old_rules}"
-			elog "without changing its behavior, you may want to remove it."
-			;;
-		esac
-	fi
-
-	# ifnet plugin was disabled for systemd users with 0.9.8.6 version
-	# and for all people with 0.9.10.0-r1 (see ChangeLog for full explanations)
-	if use systemd; then
-		if ! version_is_at_least 0.9.8.6 ${REPLACING_VERSIONS}; then
-			ewarn "Ifnet plugin won't be used with systemd support enabled"
-			ewarn "as it is meant to be used with openRC and can cause collisions"
-			ewarn "(like bug #485658)."
-			ewarn "Because of this, you will likely need to reconfigure some of"
-			ewarn "your networks. To do this you can rely on Gnome control center,"
-			ewarn "nm-connection-editor or nmtui tools for example once updated"
-			ewarn "NetworkManager version is installed."
-		fi
-	else
-		if ! version_is_at_least 0.9.10.0-r1 ${REPLACING_VERSIONS}; then
-			ewarn "Ifnet plugin is now disabled because of it being unattended"
-			ewarn "and unmaintained for a long time, leading to some unfixed bugs"
-			ewarn "and new problems appearing. We will now use upstream 'keyfile'"
-			ewarn "plugin."
-			ewarn "Because of this, you will likely need to reconfigure some of"
-			ewarn "your networks. To do this you can rely on Gnome control center,"
-			ewarn "nm-connection-editor or nmtui tools for example once updated"
-			ewarn "NetworkManager version is installed."
-		fi
-	fi
-
-	# NM fallbacks to plugin specified at compile time (upstream bug #738611)
-	# but still show a warning to remember people to have cleaner config file
-	if [[ -e "${EROOT}etc/NetworkManager/NetworkManager.conf" ]]; then
-		if grep plugins "${EROOT}etc/NetworkManager/NetworkManager.conf" | grep -q ifnet; then
-			ewarn
-			ewarn "You seem to use 'ifnet' plugin in ${EROOT}etc/NetworkManager/NetworkManager.conf"
-			ewarn "Since it won't be used, you will need to stop setting ifnet plugin there."
-			ewarn
-		fi
-	fi
-
-	# NM shows lots of errors making nmcli neither unusable, bug #528748 upstream bug #690457
-	if grep -r "psk-flags=1" "${EROOT}"/etc/NetworkManager/; then
-		ewarn "You have psk-flags=1 setting in above files, you will need to"
-		ewarn "either reconfigure affected networks or, at least, set the flag"
-		ewarn "value to '0'."
-	fi
-}
diff --git a/net-misc/networkmanager/networkmanager-0.9.8.10-r1.ebuild b/net-misc/networkmanager/networkmanager-0.9.8.10-r1.ebuild
deleted file mode 100644
index 7e5d00c9c0b3..000000000000
--- a/net-misc/networkmanager/networkmanager-0.9.8.10-r1.ebuild
+++ /dev/null
@@ -1,252 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GNOME_ORG_MODULE="NetworkManager"
-VALA_MIN_API_VERSION="0.18"
-VALA_USE_DEPEND="vapigen"
-
-inherit bash-completion-r1 gnome.org linux-info systemd user readme.gentoo toolchain-funcs vala virtualx udev eutils
-
-DESCRIPTION="Universal network configuration daemon for laptops, desktops, servers and virtualization hosts"
-HOMEPAGE="https://projects.gnome.org/NetworkManager/"
-
-LICENSE="GPL-2+"
-SLOT="0" # add subslot if libnm-util.so.2 or libnm-glib.so.4 bumps soname version
-IUSE="avahi bluetooth connection-sharing consolekit dhclient +dhcpcd gnutls +introspection kernel_linux +nss +modemmanager +ppp resolvconf systemd test vala +wext +wifi" # wimax
-
-KEYWORDS="~alpha amd64 arm ~ia64 ppc ppc64 ~sparc x86"
-
-REQUIRED_USE="
-	modemmanager? ( ppp )
-	^^ ( nss gnutls )
-	^^ ( dhclient dhcpcd )
-"
-
-# gobject-introspection-0.10.3 is needed due to gnome bug 642300
-# wpa_supplicant-0.7.3-r3 is needed due to bug 359271
-# TODO: Qt support?
-COMMON_DEPEND="
-	>=sys-apps/dbus-1.2
-	>=dev-libs/dbus-glib-0.94
-	>=dev-libs/glib-2.30
-	>=dev-libs/libnl-3.2.7:3=
-	>=sys-auth/polkit-0.106
-	>=net-libs/libsoup-2.26:2.4=
-	virtual/libgudev:=
-	bluetooth? ( >=net-wireless/bluez-4.82 )
-	avahi? ( net-dns/avahi:=[autoipd] )
-	connection-sharing? (
-		net-dns/dnsmasq[dhcp]
-		net-firewall/iptables )
-	gnutls? (
-		dev-libs/libgcrypt:0=
-		net-libs/gnutls:= )
-	modemmanager? ( >=net-misc/modemmanager-0.7.991 )
-	nss? ( >=dev-libs/nss-3.11:= )
-	dhclient? ( =net-misc/dhcp-4*[client] )
-	dhcpcd? ( >=net-misc/dhcpcd-4.0.0_rc3 )
-	introspection? ( >=dev-libs/gobject-introspection-0.10.3 )
-	ppp? ( >=net-dialup/ppp-2.4.5[ipv6] )
-	resolvconf? ( net-dns/openresolv )
-	systemd? ( >=sys-apps/systemd-183:0= )
-	|| ( sys-power/upower sys-power/upower-pm-utils >=sys-apps/systemd-183 )
-"
-RDEPEND="${COMMON_DEPEND}
-	virtual/udev
-	consolekit? ( sys-auth/consolekit )
-	wifi? ( >=net-wireless/wpa_supplicant-0.7.3-r3[dbus] )
-"
-DEPEND="${COMMON_DEPEND}
-	dev-util/gtk-doc-am
-	>=dev-util/intltool-0.40
-	>=sys-devel/gettext-0.17
-	>=sys-kernel/linux-headers-2.6.29
-	virtual/pkgconfig
-	vala? ( $(vala_depend) )
-	test? (
-		dev-lang/python:2.7
-		dev-python/dbus-python[python_targets_python2_7]
-		dev-python/pygobject:2[python_targets_python2_7] )
-"
-
-sysfs_deprecated_check() {
-	ebegin "Checking for SYSFS_DEPRECATED support"
-
-	if { linux_chkconfig_present SYSFS_DEPRECATED_V2; }; then
-		eerror "Please disable SYSFS_DEPRECATED_V2 support in your kernel config and recompile your kernel"
-		eerror "or NetworkManager will not work correctly."
-		eerror "See https://bugs.gentoo.org/333639 for more info."
-		die "CONFIG_SYSFS_DEPRECATED_V2 support detected!"
-	fi
-	eend $?
-}
-
-pkg_pretend() {
-	if use kernel_linux; then
-		get_version
-		if linux_config_exists; then
-			sysfs_deprecated_check
-		else
-			ewarn "Was unable to determine your kernel .config"
-			ewarn "Please note that if CONFIG_SYSFS_DEPRECATED_V2 is set in your kernel .config, NetworkManager will not work correctly."
-			ewarn "See https://bugs.gentoo.org/333639 for more info."
-		fi
-
-	fi
-}
-
-pkg_setup() {
-	enewgroup plugdev
-}
-
-src_prepare() {
-	DOC_CONTENTS="To modify system network connections without needing to enter the
-		root password, add your user account to the 'plugdev' group."
-
-	# Bug #402085, https://bugzilla.gnome.org/show_bug.cgi?id=387832
-	epatch "${FILESDIR}/${PN}-0.9.8.4-pre-sleep.patch"
-
-	# https://www.mail-archive.com/networkmanager-list@gnome.org/msg24038.html
-	epatch "${FILESDIR}/${PN}-0.9.8.9-fix-crash-on-wifi-rescan.patch"
-
-	# Use python2.7 shebangs for test scripts
-	sed -e 's@\(^#!.*python\)@\12.7@' \
-		-i */tests/*.py || die
-
-	# Fix completiondir, avoid eautoreconf, bug #465100
-	sed -i "s|^completiondir =.*|completiondir = $(get_bashcompdir)|" \
-		cli/completion/Makefile.in || die "sed completiondir failed"
-
-	## Force use of /run, avoid eautoreconf
-	sed -e 's:$localstatedir/run/:/run/:' -i configure || die
-
-	use vala && vala_src_prepare
-
-	epatch_user # don't remove, users often want custom patches for NM
-}
-
-src_configure() {
-	# TODO: enable wimax when we have a libnl:3 compatible revision of it
-	# We are not ready for bluez5 yet
-	econf \
-		--enable-bluez4 \
-		--disable-more-warnings \
-		--disable-static \
-		--localstatedir=/var \
-		$(usex systemd '--disable-ifnet' '--enable-ifnet') \
-		--without-netconfig \
-		--with-dbus-sys-dir=/etc/dbus-1/system.d \
-		--with-udev-dir="$(get_udevdir)" \
-		--with-iptables=/sbin/iptables \
-		--enable-concheck \
-		--with-crypto=$(usex nss nss gnutls) \
-		--with-session-tracking=$(usex systemd systemd $(usex consolekit consolekit no)) \
-		--with-suspend-resume=$(usex systemd systemd upower) \
-		$(use_enable introspection) \
-		$(use_enable ppp) \
-		--disable-wimax \
-		$(use_with dhclient) \
-		$(use_with dhcpcd) \
-		$(use_with modemmanager modem-manager-1) \
-		$(use_with resolvconf) \
-		$(use_enable test tests) \
-		$(use_enable vala) \
-		$(use_with wext) \
-		"$(systemd_with_unitdir)"
-}
-
-src_test() {
-	# bug #????
-	cp libnm-util/tests/certs/test_ca_cert.pem src/settings/plugins/ifnet/tests/ || die
-	Xemake check
-}
-
-src_install() {
-	default
-
-	readme.gentoo_create_doc
-
-	# Gentoo init script
-	newinitd "${FILESDIR}/init.d.NetworkManager" NetworkManager
-
-	# /var/run/NetworkManager is used by some distros, but not by Gentoo
-	rmdir -v "${ED}/var/run/NetworkManager" || die "rmdir failed"
-
-	# Need to keep the /etc/NetworkManager/dispatched.d for dispatcher scripts
-	keepdir /etc/NetworkManager/dispatcher.d
-
-	# Provide openrc net dependency only when nm is connected
-	exeinto /etc/NetworkManager/dispatcher.d
-	newexe "${FILESDIR}/10-openrc-status-r4" 10-openrc-status
-	sed -e "s:@EPREFIX@:${EPREFIX}:g" \
-		-i "${ED}/etc/NetworkManager/dispatcher.d/10-openrc-status" || die
-
-	# Default conf.d file
-	newconfd "${FILESDIR}/conf.d.NetworkManager" NetworkManager
-
-	# Add keyfile plugin support
-	keepdir /etc/NetworkManager/system-connections
-	chmod 0600 "${ED}"/etc/NetworkManager/system-connections/.keep* # bug #383765
-
-	if ! use systemd; then
-		insinto /etc/NetworkManager
-		newins "${FILESDIR}/nm-system-settings.conf-ifnet" NetworkManager.conf
-	fi
-
-	# Allow users in plugdev group to modify system connections
-	insinto /usr/share/polkit-1/rules.d/
-	doins "${FILESDIR}/01-org.freedesktop.NetworkManager.settings.modify.system.rules"
-
-	prune_libtool_files --modules
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-
-	if [[ -e "${EROOT}etc/NetworkManager/nm-system-settings.conf" ]]; then
-		ewarn "The ${PN} system configuration file has moved to a new location."
-		ewarn "You must migrate your settings from ${EROOT}/etc/NetworkManager/nm-system-settings.conf"
-		ewarn "to ${EROOT}etc/NetworkManager/NetworkManager.conf"
-		ewarn
-		ewarn "After doing so, you can remove ${EROOT}etc/NetworkManager/nm-system-settings.conf"
-	fi
-
-	# The polkit rules file moved to /usr/share
-	old_rules="${EROOT}etc/polkit-1/rules.d/01-org.freedesktop.NetworkManager.settings.modify.system.rules"
-	if [[ -f "${old_rules}" ]]; then
-		case "$(md5sum ${old_rules})" in
-		  574d0cfa7e911b1f7792077003060240* )
-			# Automatically delete the old rules.d file if the user did not change it
-			elog
-			elog "Removing old ${old_rules} ..."
-			rm -f "${old_rules}" || eerror "Failed, please remove ${old_rules} manually"
-			;;
-		  * )
-			elog "The ${old_rules}"
-			elog "file moved to /usr/share/polkit-1/rules.d/ in >=networkmanager-0.9.4.0-r4"
-			elog "If you edited ${old_rules}"
-			elog "without changing its behavior, you may want to remove it."
-			;;
-		esac
-	fi
-
-	if use systemd; then
-		if [[ ${REPLACING_VERSIONS} < 0.9.8.6 ]]; then
-			ewarn "Ifnet plugin won't be used with systemd support enabled"
-			ewarn "as it is meant to be used with openRC and can cause collisions"
-			ewarn "(like bug #485658)."
-			ewarn "Because of this, you will likely need to reconfigure some of"
-			ewarn "your networks."
-		fi
-
-		if [[ -e "${EROOT}etc/NetworkManager/NetworkManager.conf" ]]; then
-			if grep -q plugins "${EROOT}etc/NetworkManager/NetworkManager.conf" | grep -q ifnet; then
-				ewarn "You seem to use 'ifnet' plugin in ${EROOT}etc/NetworkManager/NetworkManager.conf"
-				ewarn "Since it won't be used when running under Systemd, you will need to stop setting"
-				ewarn "ifnet plugin there to allow NetworkManager to work."
-			fi
-		fi
-	fi
-}
diff --git a/net-misc/networkmanager/networkmanager-1.0.0.ebuild b/net-misc/networkmanager/networkmanager-1.0.0.ebuild
deleted file mode 100644
index 6ffd8ce4e83d..000000000000
--- a/net-misc/networkmanager/networkmanager-1.0.0.ebuild
+++ /dev/null
@@ -1,305 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="no"
-GNOME_ORG_MODULE="NetworkManager"
-GNOME2_LA_PUNT="yes"
-VALA_MIN_API_VERSION="0.18"
-VALA_USE_DEPEND="vapigen"
-
-# Tests need python2, https://bugzilla.gnome.org/show_bug.cgi?id=739448
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools bash-completion-r1 eutils gnome2 linux-info multilib python-any-r1 systemd \
-	user readme.gentoo toolchain-funcs vala versionator virtualx udev
-
-DESCRIPTION="Universal network configuration daemon for laptops, desktops, servers and virtualization hosts"
-HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
-
-LICENSE="GPL-2+"
-SLOT="0" # add subslot if libnm-util.so.2 or libnm-glib.so.4 bumps soname version
-
-IUSE="bluetooth connection-sharing consolekit +dhclient dhcpcd gnutls +introspection \
-kernel_linux +nss +modemmanager ncurses +ppp resolvconf selinux systemd teamd test \
-vala +wext +wifi zeroconf" # wimax
-
-KEYWORDS="~alpha amd64 arm ~arm64 ppc ppc64 ~sparc x86"
-
-REQUIRED_USE="
-	modemmanager? ( ppp )
-	^^ ( nss gnutls )
-	^^ ( dhclient dhcpcd )
-"
-
-# gobject-introspection-0.10.3 is needed due to gnome bug 642300
-# wpa_supplicant-0.7.3-r3 is needed due to bug 359271
-# TODO: Qt support?
-COMMON_DEPEND="
-	>=sys-apps/dbus-1.2
-	>=dev-libs/dbus-glib-0.100
-	>=dev-libs/glib-2.32:2
-	>=dev-libs/libnl-3.2.8:3=
-	>=sys-auth/polkit-0.106
-	net-libs/libndp
-	>=net-libs/libsoup-2.26:2.4=
-	net-misc/iputils
-	sys-libs/readline:0
-	>=virtual/libgudev-165:=
-	bluetooth? ( >=net-wireless/bluez-5 )
-	connection-sharing? (
-		net-dns/dnsmasq[dhcp]
-		net-firewall/iptables )
-	gnutls? (
-		dev-libs/libgcrypt:0=
-		net-libs/gnutls:= )
-	modemmanager? ( >=net-misc/modemmanager-0.7.991 )
-	ncurses? ( >=dev-libs/newt-0.52.15 )
-	nss? ( >=dev-libs/nss-3.11:= )
-	dhclient? ( =net-misc/dhcp-4*[client] )
-	dhcpcd? ( >=net-misc/dhcpcd-4.0.0_rc3 )
-	introspection? ( >=dev-libs/gobject-introspection-0.10.3 )
-	ppp? ( >=net-dialup/ppp-2.4.5:=[ipv6] net-dialup/rp-pppoe )
-	resolvconf? ( net-dns/openresolv )
-	systemd? ( >=sys-apps/systemd-209:0= )
-	teamd? ( >=net-misc/libteam-1.9 )
-	zeroconf? ( net-dns/avahi:=[autoipd] )
-	|| ( sys-power/upower sys-power/upower-pm-utils >=sys-apps/systemd-209 )
-"
-RDEPEND="${COMMON_DEPEND}
-	consolekit? ( sys-auth/consolekit )
-	wifi? ( >=net-wireless/wpa_supplicant-0.7.3-r3[dbus] )
-"
-DEPEND="${COMMON_DEPEND}
-	dev-util/gdbus-codegen
-	dev-util/gtk-doc-am
-	>=dev-util/intltool-0.40
-	>=sys-devel/gettext-0.17
-	>=sys-kernel/linux-headers-2.6.29
-	virtual/pkgconfig
-	vala? ( $(vala_depend) )
-	test? (
-		$(python_gen_any_dep '
-			dev-python/dbus-python[${PYTHON_USEDEP}]
-			dev-python/pygobject:2[${PYTHON_USEDEP}]')
-	)
-"
-
-sysfs_deprecated_check() {
-	ebegin "Checking for SYSFS_DEPRECATED support"
-
-	if { linux_chkconfig_present SYSFS_DEPRECATED_V2; }; then
-		eerror "Please disable SYSFS_DEPRECATED_V2 support in your kernel config and recompile your kernel"
-		eerror "or NetworkManager will not work correctly."
-		eerror "See https://bugs.gentoo.org/333639 for more info."
-		die "CONFIG_SYSFS_DEPRECATED_V2 support detected!"
-	fi
-	eend $?
-}
-
-pkg_pretend() {
-	if use kernel_linux; then
-		get_version
-		if linux_config_exists; then
-			sysfs_deprecated_check
-		else
-			ewarn "Was unable to determine your kernel .config"
-			ewarn "Please note that if CONFIG_SYSFS_DEPRECATED_V2 is set in your kernel .config, NetworkManager will not work correctly."
-			ewarn "See https://bugs.gentoo.org/333639 for more info."
-		fi
-
-	fi
-}
-
-pkg_setup() {
-	enewgroup plugdev
-}
-
-src_prepare() {
-	DOC_CONTENTS="To modify system network connections without needing to enter the
-		root password, add your user account to the 'plugdev' group."
-
-	# Find arping in our paths, upstream bug #742576 (from 1.0 branch)
-	epatch "${FILESDIR}"/${PN}-1.0.0-find-helpers.patch
-
-	# Fix lto configure switch, upstream bug #742575 (from 1.0 branch)
-	epatch "${FILESDIR}"/${PN}-1.0.0-lto-switch.patch
-
-	# Fix build with /bin/sh != bash, see bug #536540, upstream bug #743480
-	epatch "${FILESDIR}/${PN}-1.0.0-remove-bashisms.patch"
-
-	# Force use of /run, avoid eautoreconf, upstream bug #737139
-	sed -e 's:$localstatedir/run/:/run/:' -i configure || die
-
-	use vala && vala_src_prepare
-
-	epatch_user # don't remove, users often want custom patches for NM
-
-	eautoreconf
-	gnome2_src_prepare
-}
-
-src_configure() {
-	local myconf
-
-	# Same hack as net-dialup/pptpd to get proper plugin dir for ppp, bug #519986
-	if use ppp; then
-		local PPPD_VER=`best_version net-dialup/ppp`
-		PPPD_VER=${PPPD_VER#*/*-} #reduce it to ${PV}-${PR}
-		PPPD_VER=${PPPD_VER%%[_-]*} # main version without beta/pre/patch/revision
-		myconf="${myconf} --with-pppd-plugin-dir=/usr/$(get_libdir)/pppd/${PPPD_VER}"
-	fi
-
-	# unit files directory needs to be passed only when systemd is enabled,
-	# otherwise systemd support is not disabled completely, bug #524534
-	use systemd && myconf="${myconf} "$(systemd_with_unitdir)""
-
-	# TODO: enable wimax when we have a libnl:3 compatible revision of it
-	# wimax will be removed, bug #522822
-	# ifnet plugin always disabled until someone volunteers to actively
-	# maintain and fix it
-	gnome2_src_configure \
-		--disable-more-warnings \
-		--disable-static \
-		--localstatedir=/var \
-		--disable-lto \
-		--disable-config-plugin-ibft \
-		--disable-ifnet \
-		--without-netconfig \
-		--with-dbus-sys-dir=/etc/dbus-1/system.d \
-		--with-udev-dir="$(get_udevdir)" \
-		--with-config-plugins-default=keyfile \
-		--with-iptables=/sbin/iptables \
-		--with-libsoup=yes \
-		--enable-concheck \
-		--with-crypto=$(usex nss nss gnutls) \
-		--with-session-tracking=$(usex systemd systemd $(usex consolekit consolekit no)) \
-		--with-suspend-resume=$(usex systemd systemd upower) \
-		$(use_enable bluetooth bluez5-dun) \
-		$(use_enable introspection) \
-		$(use_enable ppp) \
-		--disable-wimax \
-		$(use_with dhclient) \
-		$(use_with dhcpcd) \
-		$(use_with modemmanager modem-manager-1) \
-		$(use_with ncurses nmtui) \
-		$(use_with resolvconf) \
-		$(use_with selinux) \
-		$(use_enable teamd teamdctl) \
-		$(use_enable test tests) \
-		$(use_enable vala) \
-		--without-valgrind \
-		$(use_with wext) \
-		${myconf}
-}
-
-src_test() {
-	python_setup
-	Xemake check
-}
-
-src_install() {
-	# Install completions at proper place, bug #465100
-	gnome2_src_install completiondir="$(get_bashcompdir)"
-
-	readme.gentoo_create_doc
-
-	newinitd "${FILESDIR}/init.d.NetworkManager" NetworkManager
-	newconfd "${FILESDIR}/conf.d.NetworkManager" NetworkManager
-
-	# /var/run/NetworkManager is used by some distros, but not by Gentoo
-	rmdir -v "${ED}/var/run/NetworkManager" || die "rmdir failed"
-	rmdir -v "${ED}/var/run" || die "rmdir failed"
-
-	# Need to keep the /etc/NetworkManager/dispatched.d for dispatcher scripts
-	keepdir /etc/NetworkManager/dispatcher.d
-
-	# Provide openrc net dependency only when nm is connected
-	exeinto /etc/NetworkManager/dispatcher.d
-	newexe "${FILESDIR}/10-openrc-status-r4" 10-openrc-status
-	sed -e "s:@EPREFIX@:${EPREFIX}:g" \
-		-i "${ED}/etc/NetworkManager/dispatcher.d/10-openrc-status" || die
-
-	keepdir /etc/NetworkManager/system-connections
-	chmod 0600 "${ED}"/etc/NetworkManager/system-connections/.keep* # bug #383765
-
-	# Allow users in plugdev group to modify system connections
-	insinto /usr/share/polkit-1/rules.d/
-	doins "${FILESDIR}/01-org.freedesktop.NetworkManager.settings.modify.system.rules"
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	readme.gentoo_print_elog
-
-	if [[ -e "${EROOT}etc/NetworkManager/nm-system-settings.conf" ]]; then
-		ewarn "The ${PN} system configuration file has moved to a new location."
-		ewarn "You must migrate your settings from ${EROOT}/etc/NetworkManager/nm-system-settings.conf"
-		ewarn "to ${EROOT}etc/NetworkManager/NetworkManager.conf"
-		ewarn
-		ewarn "After doing so, you can remove ${EROOT}etc/NetworkManager/nm-system-settings.conf"
-	fi
-
-	# The polkit rules file moved to /usr/share
-	old_rules="${EROOT}etc/polkit-1/rules.d/01-org.freedesktop.NetworkManager.settings.modify.system.rules"
-	if [[ -f "${old_rules}" ]]; then
-		case "$(md5sum ${old_rules})" in
-		  574d0cfa7e911b1f7792077003060240* )
-			# Automatically delete the old rules.d file if the user did not change it
-			elog
-			elog "Removing old ${old_rules} ..."
-			rm -f "${old_rules}" || eerror "Failed, please remove ${old_rules} manually"
-			;;
-		  * )
-			elog "The ${old_rules}"
-			elog "file moved to /usr/share/polkit-1/rules.d/ in >=networkmanager-0.9.4.0-r4"
-			elog "If you edited ${old_rules}"
-			elog "without changing its behavior, you may want to remove it."
-			;;
-		esac
-	fi
-
-	# ifnet plugin was disabled for systemd users with 0.9.8.6 version
-	# and for all people with 0.9.10.0-r1 (see ChangeLog for full explanations)
-	if use systemd; then
-		if ! version_is_at_least 0.9.8.6 ${REPLACING_VERSIONS}; then
-			ewarn "Ifnet plugin won't be used with systemd support enabled"
-			ewarn "as it is meant to be used with openRC and can cause collisions"
-			ewarn "(like bug #485658)."
-			ewarn "Because of this, you will likely need to reconfigure some of"
-			ewarn "your networks. To do this you can rely on Gnome control center,"
-			ewarn "nm-connection-editor or nmtui tools for example once updated"
-			ewarn "NetworkManager version is installed."
-		fi
-	else
-		if ! version_is_at_least 0.9.10.0-r1 ${REPLACING_VERSIONS}; then
-			ewarn "Ifnet plugin is now disabled because of it being unattended"
-			ewarn "and unmaintained for a long time, leading to some unfixed bugs"
-			ewarn "and new problems appearing. We will now use upstream 'keyfile'"
-			ewarn "plugin."
-			ewarn "Because of this, you will likely need to reconfigure some of"
-			ewarn "your networks. To do this you can rely on Gnome control center,"
-			ewarn "nm-connection-editor or nmtui tools for example once updated"
-			ewarn "NetworkManager version is installed."
-		fi
-	fi
-
-	# NM fallbacks to plugin specified at compile time (upstream bug #738611)
-	# but still show a warning to remember people to have cleaner config file
-	if [[ -e "${EROOT}etc/NetworkManager/NetworkManager.conf" ]]; then
-		if grep plugins "${EROOT}etc/NetworkManager/NetworkManager.conf" | grep -q ifnet; then
-			ewarn
-			ewarn "You seem to use 'ifnet' plugin in ${EROOT}etc/NetworkManager/NetworkManager.conf"
-			ewarn "Since it won't be used, you will need to stop setting ifnet plugin there."
-			ewarn
-		fi
-	fi
-
-	# NM shows lots of errors making nmcli neither unusable, bug #528748 upstream bug #690457
-	if grep -r "psk-flags=1" "${EROOT}"/etc/NetworkManager/; then
-		ewarn "You have psk-flags=1 setting in above files, you will need to"
-		ewarn "either reconfigure affected networks or, at least, set the flag"
-		ewarn "value to '0'."
-	fi
-}
diff --git a/net-misc/networkmanager/networkmanager-1.0.2-r1.ebuild b/net-misc/networkmanager/networkmanager-1.0.2-r1.ebuild
index 7d17e3b2716b..f77872f7b98a 100644
--- a/net-misc/networkmanager/networkmanager-1.0.2-r1.ebuild
+++ b/net-misc/networkmanager/networkmanager-1.0.2-r1.ebuild
@@ -23,7 +23,7 @@ IUSE="bluetooth connection-sharing consolekit +dhclient dhcpcd gnutls +introspec
 kernel_linux +nss +modemmanager ncurses +ppp resolvconf selinux systemd teamd test \
 vala +wext +wifi zeroconf" # wimax
 
-KEYWORDS="~alpha amd64 arm ~arm64 ~ppc ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ppc ppc64 ~sparc x86"
 
 REQUIRED_USE="
 	modemmanager? ( ppp )
diff --git a/net-misc/networkmanager/networkmanager-1.0.2.ebuild b/net-misc/networkmanager/networkmanager-1.0.2.ebuild
deleted file mode 100644
index 0dd58e6074d2..000000000000
--- a/net-misc/networkmanager/networkmanager-1.0.2.ebuild
+++ /dev/null
@@ -1,292 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="no"
-GNOME_ORG_MODULE="NetworkManager"
-GNOME2_LA_PUNT="yes"
-VALA_MIN_API_VERSION="0.18"
-VALA_USE_DEPEND="vapigen"
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
-
-inherit bash-completion-r1 eutils gnome2 linux-info multilib python-any-r1 systemd \
-	user readme.gentoo toolchain-funcs vala versionator virtualx udev
-
-DESCRIPTION="Universal network configuration daemon for laptops, desktops, servers and virtualization hosts"
-HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
-
-LICENSE="GPL-2+"
-SLOT="0" # add subslot if libnm-util.so.2 or libnm-glib.so.4 bumps soname version
-
-IUSE="bluetooth connection-sharing consolekit +dhclient dhcpcd gnutls +introspection \
-kernel_linux +nss +modemmanager ncurses +ppp resolvconf selinux systemd teamd test \
-vala +wext +wifi zeroconf" # wimax
-
-KEYWORDS="~alpha amd64 arm ~arm64 ppc ppc64 ~sparc x86"
-
-REQUIRED_USE="
-	modemmanager? ( ppp )
-	^^ ( nss gnutls )
-	^^ ( dhclient dhcpcd )
-"
-
-# gobject-introspection-0.10.3 is needed due to gnome bug 642300
-# wpa_supplicant-0.7.3-r3 is needed due to bug 359271
-# TODO: Qt support?
-COMMON_DEPEND="
-	>=sys-apps/dbus-1.2
-	>=dev-libs/dbus-glib-0.100
-	>=dev-libs/glib-2.32:2
-	>=dev-libs/libnl-3.2.8:3=
-	>=sys-auth/polkit-0.106
-	net-libs/libndp
-	>=net-libs/libsoup-2.26:2.4=
-	net-misc/iputils
-	sys-libs/readline:0
-	>=virtual/libgudev-165:=
-	bluetooth? ( >=net-wireless/bluez-5 )
-	connection-sharing? (
-		net-dns/dnsmasq[dhcp]
-		net-firewall/iptables )
-	gnutls? (
-		dev-libs/libgcrypt:0=
-		net-libs/gnutls:= )
-	modemmanager? ( >=net-misc/modemmanager-0.7.991 )
-	ncurses? ( >=dev-libs/newt-0.52.15 )
-	nss? ( >=dev-libs/nss-3.11:= )
-	dhclient? ( >=net-misc/dhcp-4[client] )
-	dhcpcd? ( >=net-misc/dhcpcd-4.0.0_rc3 )
-	introspection? ( >=dev-libs/gobject-introspection-0.10.3:= )
-	ppp? ( >=net-dialup/ppp-2.4.5:=[ipv6] net-dialup/rp-pppoe )
-	resolvconf? ( net-dns/openresolv )
-	systemd? ( >=sys-apps/systemd-209:0= )
-	!systemd? ( || ( sys-power/upower sys-power/upower-pm-utils ) )
-	teamd? ( >=net-misc/libteam-1.9 )
-	zeroconf? ( net-dns/avahi:=[autoipd] )
-"
-RDEPEND="${COMMON_DEPEND}
-	consolekit? ( sys-auth/consolekit )
-	wifi? ( >=net-wireless/wpa_supplicant-0.7.3-r3[dbus] )
-"
-DEPEND="${COMMON_DEPEND}
-	dev-util/gdbus-codegen
-	dev-util/gtk-doc-am
-	>=dev-util/intltool-0.40
-	>=sys-devel/gettext-0.17
-	>=sys-kernel/linux-headers-2.6.29
-	virtual/pkgconfig
-	vala? ( $(vala_depend) )
-	test? (
-		$(python_gen_any_dep '
-			dev-python/dbus-python[${PYTHON_USEDEP}]
-			dev-python/pygobject:2[${PYTHON_USEDEP}]')
-	)
-"
-
-sysfs_deprecated_check() {
-	ebegin "Checking for SYSFS_DEPRECATED support"
-
-	if { linux_chkconfig_present SYSFS_DEPRECATED_V2; }; then
-		eerror "Please disable SYSFS_DEPRECATED_V2 support in your kernel config and recompile your kernel"
-		eerror "or NetworkManager will not work correctly."
-		eerror "See https://bugs.gentoo.org/333639 for more info."
-		die "CONFIG_SYSFS_DEPRECATED_V2 support detected!"
-	fi
-	eend $?
-}
-
-pkg_pretend() {
-	if use kernel_linux; then
-		get_version
-		if linux_config_exists; then
-			sysfs_deprecated_check
-		else
-			ewarn "Was unable to determine your kernel .config"
-			ewarn "Please note that if CONFIG_SYSFS_DEPRECATED_V2 is set in your kernel .config, NetworkManager will not work correctly."
-			ewarn "See https://bugs.gentoo.org/333639 for more info."
-		fi
-
-	fi
-}
-
-pkg_setup() {
-	enewgroup plugdev
-}
-
-src_prepare() {
-	DOC_CONTENTS="To modify system network connections without needing to enter the
-		root password, add your user account to the 'plugdev' group."
-
-	# Force use of /run, avoid eautoreconf, upstream bug #737139
-	sed -e 's:$localstatedir/run/:/run/:' -i configure || die
-
-	use vala && vala_src_prepare
-
-	epatch_user # don't remove, users often want custom patches for NM
-	gnome2_src_prepare
-}
-
-src_configure() {
-	local myconf
-
-	# Same hack as net-dialup/pptpd to get proper plugin dir for ppp, bug #519986
-	if use ppp; then
-		local PPPD_VER=`best_version net-dialup/ppp`
-		PPPD_VER=${PPPD_VER#*/*-} #reduce it to ${PV}-${PR}
-		PPPD_VER=${PPPD_VER%%[_-]*} # main version without beta/pre/patch/revision
-		myconf="${myconf} --with-pppd-plugin-dir=/usr/$(get_libdir)/pppd/${PPPD_VER}"
-	fi
-
-	# unit files directory needs to be passed only when systemd is enabled,
-	# otherwise systemd support is not disabled completely, bug #524534
-	use systemd && myconf="${myconf} "$(systemd_with_unitdir)""
-
-	# TODO: enable wimax when we have a libnl:3 compatible revision of it
-	# wimax will be removed, bug #522822
-	# ifnet plugin always disabled until someone volunteers to actively
-	# maintain and fix it
-	gnome2_src_configure \
-		--disable-more-warnings \
-		--disable-static \
-		--localstatedir=/var \
-		--disable-lto \
-		--disable-config-plugin-ibft \
-		--disable-ifnet \
-		--without-netconfig \
-		--with-dbus-sys-dir=/etc/dbus-1/system.d \
-		--with-udev-dir="$(get_udevdir)" \
-		--with-config-plugins-default=keyfile \
-		--with-iptables=/sbin/iptables \
-		--with-libsoup=yes \
-		--enable-concheck \
-		--with-crypto=$(usex nss nss gnutls) \
-		--with-session-tracking=$(usex systemd systemd $(usex consolekit consolekit no)) \
-		--with-suspend-resume=$(usex systemd systemd upower) \
-		$(use_enable bluetooth bluez5-dun) \
-		$(use_enable introspection) \
-		$(use_enable ppp) \
-		--disable-wimax \
-		$(use_with dhclient) \
-		$(use_with dhcpcd) \
-		$(use_with modemmanager modem-manager-1) \
-		$(use_with ncurses nmtui) \
-		$(use_with resolvconf) \
-		$(use_with selinux) \
-		$(use_enable teamd teamdctl) \
-		$(use_enable test tests) \
-		$(use_enable vala) \
-		--without-valgrind \
-		$(use_with wext) \
-		${myconf}
-}
-
-src_test() {
-	python_setup
-	Xemake check
-}
-
-src_install() {
-	# Install completions at proper place, bug #465100
-	gnome2_src_install completiondir="$(get_bashcompdir)"
-
-	! use systemd && readme.gentoo_create_doc
-
-	newinitd "${FILESDIR}/init.d.NetworkManager" NetworkManager
-	newconfd "${FILESDIR}/conf.d.NetworkManager" NetworkManager
-
-	# /var/run/NetworkManager is used by some distros, but not by Gentoo
-	rmdir -v "${ED}/var/run/NetworkManager" || die "rmdir failed"
-	rmdir -v "${ED}/var/run" || die "rmdir failed"
-
-	# Need to keep the /etc/NetworkManager/dispatched.d for dispatcher scripts
-	keepdir /etc/NetworkManager/dispatcher.d
-
-	# Provide openrc net dependency only when nm is connected
-	exeinto /etc/NetworkManager/dispatcher.d
-	newexe "${FILESDIR}/10-openrc-status-r4" 10-openrc-status
-	sed -e "s:@EPREFIX@:${EPREFIX}:g" \
-		-i "${ED}/etc/NetworkManager/dispatcher.d/10-openrc-status" || die
-
-	keepdir /etc/NetworkManager/system-connections
-	chmod 0600 "${ED}"/etc/NetworkManager/system-connections/.keep* # bug #383765
-
-	# Allow users in plugdev group to modify system connections
-	insinto /usr/share/polkit-1/rules.d/
-	doins "${FILESDIR}/01-org.freedesktop.NetworkManager.settings.modify.system.rules"
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	! use systemd && readme.gentoo_print_elog
-
-	if [[ -e "${EROOT}etc/NetworkManager/nm-system-settings.conf" ]]; then
-		ewarn "The ${PN} system configuration file has moved to a new location."
-		ewarn "You must migrate your settings from ${EROOT}/etc/NetworkManager/nm-system-settings.conf"
-		ewarn "to ${EROOT}etc/NetworkManager/NetworkManager.conf"
-		ewarn
-		ewarn "After doing so, you can remove ${EROOT}etc/NetworkManager/nm-system-settings.conf"
-	fi
-
-	# The polkit rules file moved to /usr/share
-	old_rules="${EROOT}etc/polkit-1/rules.d/01-org.freedesktop.NetworkManager.settings.modify.system.rules"
-	if [[ -f "${old_rules}" ]]; then
-		case "$(md5sum ${old_rules})" in
-		  574d0cfa7e911b1f7792077003060240* )
-			# Automatically delete the old rules.d file if the user did not change it
-			elog
-			elog "Removing old ${old_rules} ..."
-			rm -f "${old_rules}" || eerror "Failed, please remove ${old_rules} manually"
-			;;
-		  * )
-			elog "The ${old_rules}"
-			elog "file moved to /usr/share/polkit-1/rules.d/ in >=networkmanager-0.9.4.0-r4"
-			elog "If you edited ${old_rules}"
-			elog "without changing its behavior, you may want to remove it."
-			;;
-		esac
-	fi
-
-	# ifnet plugin was disabled for systemd users with 0.9.8.6 version
-	# and for all people with 0.9.10.0-r1 (see ChangeLog for full explanations)
-	if use systemd; then
-		if ! version_is_at_least 0.9.8.6 ${REPLACING_VERSIONS}; then
-			ewarn "Ifnet plugin won't be used with systemd support enabled"
-			ewarn "as it is meant to be used with openRC and can cause collisions"
-			ewarn "(like bug #485658)."
-			ewarn "Because of this, you will likely need to reconfigure some of"
-			ewarn "your networks. To do this you can rely on Gnome control center,"
-			ewarn "nm-connection-editor or nmtui tools for example once updated"
-			ewarn "NetworkManager version is installed."
-		fi
-	else
-		if ! version_is_at_least 0.9.10.0-r1 ${REPLACING_VERSIONS}; then
-			ewarn "Ifnet plugin is now disabled because of it being unattended"
-			ewarn "and unmaintained for a long time, leading to some unfixed bugs"
-			ewarn "and new problems appearing. We will now use upstream 'keyfile'"
-			ewarn "plugin."
-			ewarn "Because of this, you will likely need to reconfigure some of"
-			ewarn "your networks. To do this you can rely on Gnome control center,"
-			ewarn "nm-connection-editor or nmtui tools for example once updated"
-			ewarn "NetworkManager version is installed."
-		fi
-	fi
-
-	# NM fallbacks to plugin specified at compile time (upstream bug #738611)
-	# but still show a warning to remember people to have cleaner config file
-	if [[ -e "${EROOT}etc/NetworkManager/NetworkManager.conf" ]]; then
-		if grep plugins "${EROOT}etc/NetworkManager/NetworkManager.conf" | grep -q ifnet; then
-			ewarn
-			ewarn "You seem to use 'ifnet' plugin in ${EROOT}etc/NetworkManager/NetworkManager.conf"
-			ewarn "Since it won't be used, you will need to stop setting ifnet plugin there."
-			ewarn
-		fi
-	fi
-
-	# NM shows lots of errors making nmcli neither unusable, bug #528748 upstream bug #690457
-	if grep -r "psk-flags=1" "${EROOT}"/etc/NetworkManager/; then
-		ewarn "You have psk-flags=1 setting in above files, you will need to"
-		ewarn "either reconfigure affected networks or, at least, set the flag"
-		ewarn "value to '0'."
-	fi
-}
diff --git a/net-misc/networkmanager/networkmanager-1.0.4.ebuild b/net-misc/networkmanager/networkmanager-1.0.4.ebuild
deleted file mode 100644
index de67526801eb..000000000000
--- a/net-misc/networkmanager/networkmanager-1.0.4.ebuild
+++ /dev/null
@@ -1,296 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="no"
-GNOME_ORG_MODULE="NetworkManager"
-GNOME2_LA_PUNT="yes"
-VALA_USE_DEPEND="vapigen"
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
-
-inherit autotools bash-completion-r1 eutils gnome2 linux-info multilib python-any-r1 systemd \
-	user readme.gentoo toolchain-funcs vala versionator virtualx udev
-
-DESCRIPTION="Universal network configuration daemon for laptops, desktops, servers and virtualization hosts"
-HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
-
-LICENSE="GPL-2+"
-SLOT="0" # add subslot if libnm-util.so.2 or libnm-glib.so.4 bumps soname version
-
-IUSE="bluetooth connection-sharing consolekit +dhclient dhcpcd gnutls +introspection \
-kernel_linux +nss +modemmanager ncurses +ppp resolvconf selinux systemd teamd test \
-vala +wext +wifi zeroconf" # wimax
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
-
-REQUIRED_USE="
-	modemmanager? ( ppp )
-	wext? ( wifi )
-	^^ ( nss gnutls )
-	^^ ( dhclient dhcpcd )
-"
-
-# gobject-introspection-0.10.3 is needed due to gnome bug 642300
-# wpa_supplicant-0.7.3-r3 is needed due to bug 359271
-# TODO: Qt support?
-COMMON_DEPEND="
-	>=sys-apps/dbus-1.2
-	>=dev-libs/dbus-glib-0.100
-	>=dev-libs/glib-2.37.6:2
-	>=dev-libs/libnl-3.2.8:3=
-	>=sys-auth/polkit-0.106
-	net-libs/libndp
-	>=net-libs/libsoup-2.26:2.4=
-	net-misc/iputils
-	sys-libs/readline:0
-	>=virtual/libgudev-165:=
-	bluetooth? ( >=net-wireless/bluez-5 )
-	connection-sharing? (
-		net-dns/dnsmasq[dhcp]
-		net-firewall/iptables )
-	gnutls? (
-		dev-libs/libgcrypt:0=
-		net-libs/gnutls:= )
-	modemmanager? ( >=net-misc/modemmanager-0.7.991 )
-	ncurses? ( >=dev-libs/newt-0.52.15 )
-	nss? ( >=dev-libs/nss-3.11:= )
-	dhclient? ( >=net-misc/dhcp-4[client] )
-	dhcpcd? ( >=net-misc/dhcpcd-4.0.0_rc3 )
-	introspection? ( >=dev-libs/gobject-introspection-0.10.3:= )
-	ppp? ( >=net-dialup/ppp-2.4.5:=[ipv6] net-dialup/rp-pppoe )
-	resolvconf? ( net-dns/openresolv )
-	systemd? ( >=sys-apps/systemd-209:0= )
-	!systemd? ( || ( sys-power/upower sys-power/upower-pm-utils ) )
-	teamd? ( >=net-misc/libteam-1.9 )
-	zeroconf? ( net-dns/avahi:=[autoipd] )
-"
-RDEPEND="${COMMON_DEPEND}
-	consolekit? ( sys-auth/consolekit )
-	wifi? ( >=net-wireless/wpa_supplicant-0.7.3-r3[dbus] )
-"
-DEPEND="${COMMON_DEPEND}
-	dev-util/gdbus-codegen
-	dev-util/gtk-doc-am
-	>=dev-util/intltool-0.40
-	>=sys-devel/gettext-0.17
-	>=sys-kernel/linux-headers-2.6.29
-	virtual/pkgconfig
-	vala? ( $(vala_depend) )
-	test? (
-		$(python_gen_any_dep '
-			dev-python/dbus-python[${PYTHON_USEDEP}]
-			dev-python/pygobject:2[${PYTHON_USEDEP}]')
-	)
-"
-
-sysfs_deprecated_check() {
-	ebegin "Checking for SYSFS_DEPRECATED support"
-
-	if { linux_chkconfig_present SYSFS_DEPRECATED_V2; }; then
-		eerror "Please disable SYSFS_DEPRECATED_V2 support in your kernel config and recompile your kernel"
-		eerror "or NetworkManager will not work correctly."
-		eerror "See https://bugs.gentoo.org/333639 for more info."
-		die "CONFIG_SYSFS_DEPRECATED_V2 support detected!"
-	fi
-	eend $?
-}
-
-pkg_pretend() {
-	if use kernel_linux; then
-		get_version
-		if linux_config_exists; then
-			sysfs_deprecated_check
-		else
-			ewarn "Was unable to determine your kernel .config"
-			ewarn "Please note that if CONFIG_SYSFS_DEPRECATED_V2 is set in your kernel .config, NetworkManager will not work correctly."
-			ewarn "See https://bugs.gentoo.org/333639 for more info."
-		fi
-
-	fi
-}
-
-pkg_setup() {
-	enewgroup plugdev
-}
-
-src_prepare() {
-	DOC_CONTENTS="To modify system network connections without needing to enter the
-		root password, add your user account to the 'plugdev' group."
-
-	# Force use of /run, avoid eautoreconf, upstream bug #737139, fixed in 'master'
-	sed -e 's:$localstatedir/run/:/run/:' -i configure || die
-
-	use vala && vala_src_prepare
-
-	epatch_user # don't remove, users often want custom patches for NM
-
-	eautoreconf
-
-	gnome2_src_prepare
-}
-
-src_configure() {
-	local myconf
-
-	# Same hack as net-dialup/pptpd to get proper plugin dir for ppp, bug #519986
-	if use ppp; then
-		local PPPD_VER=`best_version net-dialup/ppp`
-		PPPD_VER=${PPPD_VER#*/*-} #reduce it to ${PV}-${PR}
-		PPPD_VER=${PPPD_VER%%[_-]*} # main version without beta/pre/patch/revision
-		myconf="${myconf} --with-pppd-plugin-dir=/usr/$(get_libdir)/pppd/${PPPD_VER}"
-	fi
-
-	# unit files directory needs to be passed only when systemd is enabled,
-	# otherwise systemd support is not disabled completely, bug #524534
-	use systemd && myconf="${myconf} "$(systemd_with_unitdir)""
-
-	# TODO: enable wimax when we have a libnl:3 compatible revision of it
-	# wimax will be removed, bug #522822
-	# ifnet plugin always disabled until someone volunteers to actively
-	# maintain and fix it
-	gnome2_src_configure \
-		--disable-more-warnings \
-		--disable-static \
-		--localstatedir=/var \
-		--disable-lto \
-		--disable-config-plugin-ibft \
-		--disable-ifnet \
-		--without-netconfig \
-		--with-dbus-sys-dir=/etc/dbus-1/system.d \
-		--with-udev-dir="$(get_udevdir)" \
-		--with-config-plugins-default=keyfile \
-		--with-iptables=/sbin/iptables \
-		--with-libsoup=yes \
-		--enable-concheck \
-		--with-crypto=$(usex nss nss gnutls) \
-		--with-session-tracking=$(usex systemd systemd $(usex consolekit consolekit no)) \
-		--with-suspend-resume=$(usex systemd systemd upower) \
-		$(use_enable bluetooth bluez5-dun) \
-		$(use_enable introspection) \
-		$(use_enable ppp) \
-		--disable-wimax \
-		$(use_with dhclient) \
-		$(use_with dhcpcd) \
-		$(use_with modemmanager modem-manager-1) \
-		$(use_with ncurses nmtui) \
-		$(use_with resolvconf) \
-		$(use_with selinux) \
-		$(use_enable teamd teamdctl) \
-		$(use_enable test tests) \
-		$(use_enable vala) \
-		--without-valgrind \
-		$(use_with wext) \
-		$(use_enable wifi) \
-		${myconf}
-}
-
-src_test() {
-	python_setup
-	Xemake check
-}
-
-src_install() {
-	# Install completions at proper place, bug #465100
-	gnome2_src_install completiondir="$(get_bashcompdir)"
-
-	! use systemd && readme.gentoo_create_doc
-
-	newinitd "${FILESDIR}/init.d.NetworkManager" NetworkManager
-	newconfd "${FILESDIR}/conf.d.NetworkManager" NetworkManager
-
-	# /var/run/NetworkManager is used by some distros, but not by Gentoo
-	rmdir -v "${ED}/var/run/NetworkManager" || die "rmdir failed"
-	rmdir -v "${ED}/var/run" || die "rmdir failed"
-
-	# Need to keep the /etc/NetworkManager/dispatched.d for dispatcher scripts
-	keepdir /etc/NetworkManager/dispatcher.d
-
-	# Provide openrc net dependency only when nm is connected
-	exeinto /etc/NetworkManager/dispatcher.d
-	newexe "${FILESDIR}/10-openrc-status-r4" 10-openrc-status
-	sed -e "s:@EPREFIX@:${EPREFIX}:g" \
-		-i "${ED}/etc/NetworkManager/dispatcher.d/10-openrc-status" || die
-
-	keepdir /etc/NetworkManager/system-connections
-	chmod 0600 "${ED}"/etc/NetworkManager/system-connections/.keep* # bug #383765
-
-	# Allow users in plugdev group to modify system connections
-	insinto /usr/share/polkit-1/rules.d/
-	doins "${FILESDIR}/01-org.freedesktop.NetworkManager.settings.modify.system.rules"
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	! use systemd && readme.gentoo_print_elog
-
-	if [[ -e "${EROOT}etc/NetworkManager/nm-system-settings.conf" ]]; then
-		ewarn "The ${PN} system configuration file has moved to a new location."
-		ewarn "You must migrate your settings from ${EROOT}/etc/NetworkManager/nm-system-settings.conf"
-		ewarn "to ${EROOT}etc/NetworkManager/NetworkManager.conf"
-		ewarn
-		ewarn "After doing so, you can remove ${EROOT}etc/NetworkManager/nm-system-settings.conf"
-	fi
-
-	# The polkit rules file moved to /usr/share
-	old_rules="${EROOT}etc/polkit-1/rules.d/01-org.freedesktop.NetworkManager.settings.modify.system.rules"
-	if [[ -f "${old_rules}" ]]; then
-		case "$(md5sum ${old_rules})" in
-		  574d0cfa7e911b1f7792077003060240* )
-			# Automatically delete the old rules.d file if the user did not change it
-			elog
-			elog "Removing old ${old_rules} ..."
-			rm -f "${old_rules}" || eerror "Failed, please remove ${old_rules} manually"
-			;;
-		  * )
-			elog "The ${old_rules}"
-			elog "file moved to /usr/share/polkit-1/rules.d/ in >=networkmanager-0.9.4.0-r4"
-			elog "If you edited ${old_rules}"
-			elog "without changing its behavior, you may want to remove it."
-			;;
-		esac
-	fi
-
-	# ifnet plugin was disabled for systemd users with 0.9.8.6 version
-	# and for all people with 0.9.10.0-r1 (see ChangeLog for full explanations)
-	if use systemd; then
-		if ! version_is_at_least 0.9.8.6 ${REPLACING_VERSIONS}; then
-			ewarn "Ifnet plugin won't be used with systemd support enabled"
-			ewarn "as it is meant to be used with openRC and can cause collisions"
-			ewarn "(like bug #485658)."
-			ewarn "Because of this, you will likely need to reconfigure some of"
-			ewarn "your networks. To do this you can rely on Gnome control center,"
-			ewarn "nm-connection-editor or nmtui tools for example once updated"
-			ewarn "NetworkManager version is installed."
-		fi
-	else
-		if ! version_is_at_least 0.9.10.0-r1 ${REPLACING_VERSIONS}; then
-			ewarn "Ifnet plugin is now disabled because of it being unattended"
-			ewarn "and unmaintained for a long time, leading to some unfixed bugs"
-			ewarn "and new problems appearing. We will now use upstream 'keyfile'"
-			ewarn "plugin."
-			ewarn "Because of this, you will likely need to reconfigure some of"
-			ewarn "your networks. To do this you can rely on Gnome control center,"
-			ewarn "nm-connection-editor or nmtui tools for example once updated"
-			ewarn "NetworkManager version is installed."
-		fi
-	fi
-
-	# NM fallbacks to plugin specified at compile time (upstream bug #738611)
-	# but still show a warning to remember people to have cleaner config file
-	if [[ -e "${EROOT}etc/NetworkManager/NetworkManager.conf" ]]; then
-		if grep plugins "${EROOT}etc/NetworkManager/NetworkManager.conf" | grep -q ifnet; then
-			ewarn
-			ewarn "You seem to use 'ifnet' plugin in ${EROOT}etc/NetworkManager/NetworkManager.conf"
-			ewarn "Since it won't be used, you will need to stop setting ifnet plugin there."
-			ewarn
-		fi
-	fi
-
-	# NM shows lots of errors making nmcli neither unusable, bug #528748 upstream bug #690457
-	if grep -r "psk-flags=1" "${EROOT}"/etc/NetworkManager/; then
-		ewarn "You have psk-flags=1 setting in above files, you will need to"
-		ewarn "either reconfigure affected networks or, at least, set the flag"
-		ewarn "value to '0'."
-	fi
-}
diff --git a/net-misc/networkmanager/networkmanager-1.0.6.ebuild b/net-misc/networkmanager/networkmanager-1.0.6.ebuild
new file mode 100644
index 000000000000..fd570b5a1536
--- /dev/null
+++ b/net-misc/networkmanager/networkmanager-1.0.6.ebuild
@@ -0,0 +1,345 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+GNOME_ORG_MODULE="NetworkManager"
+GNOME2_LA_PUNT="yes"
+VALA_USE_DEPEND="vapigen"
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+
+inherit autotools bash-completion-r1 eutils gnome2 linux-info multilib python-any-r1 systemd \
+	user readme.gentoo toolchain-funcs vala versionator virtualx udev multilib-minimal
+
+DESCRIPTION="Universal network configuration daemon for laptops, desktops, servers and virtualization hosts"
+HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
+
+LICENSE="GPL-2+"
+SLOT="0" # add subslot if libnm-util.so.2 or libnm-glib.so.4 bumps soname version
+
+IUSE="bluetooth connection-sharing consolekit +dhclient dhcpcd gnutls +introspection \
+kernel_linux +nss +modemmanager ncurses +ppp resolvconf selinux systemd teamd test \
+vala +wext +wifi zeroconf" # wimax
+
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+REQUIRED_USE="
+	modemmanager? ( ppp )
+	wext? ( wifi )
+	^^ ( nss gnutls )
+	^^ ( dhclient dhcpcd )
+"
+
+# gobject-introspection-0.10.3 is needed due to gnome bug 642300
+# wpa_supplicant-0.7.3-r3 is needed due to bug 359271
+# TODO: Qt support?
+COMMON_DEPEND="
+	>=sys-apps/dbus-1.2[${MULTILIB_USEDEP}]
+	>=dev-libs/dbus-glib-0.100[${MULTILIB_USEDEP}]
+	>=dev-libs/glib-2.37.6:2[${MULTILIB_USEDEP}]
+	>=dev-libs/libnl-3.2.8:3=
+	>=sys-auth/polkit-0.106
+	net-libs/libndp
+	>=net-libs/libsoup-2.26:2.4=
+	net-misc/iputils
+	sys-libs/readline:0
+	>=virtual/libgudev-165:=[${MULTILIB_USEDEP}]
+	bluetooth? ( >=net-wireless/bluez-5 )
+	connection-sharing? (
+		net-dns/dnsmasq[dhcp]
+		net-firewall/iptables )
+	gnutls? (
+		dev-libs/libgcrypt:0=[${MULTILIB_USEDEP}]
+		net-libs/gnutls:=[${MULTILIB_USEDEP}] )
+	modemmanager? ( >=net-misc/modemmanager-0.7.991 )
+	ncurses? ( >=dev-libs/newt-0.52.15 )
+	nss? ( >=dev-libs/nss-3.11:=[${MULTILIB_USEDEP}] )
+	dhclient? ( >=net-misc/dhcp-4[client] )
+	dhcpcd? ( >=net-misc/dhcpcd-4.0.0_rc3 )
+	introspection? ( >=dev-libs/gobject-introspection-0.10.3:= )
+	ppp? ( >=net-dialup/ppp-2.4.5:=[ipv6] net-dialup/rp-pppoe )
+	resolvconf? ( net-dns/openresolv )
+	systemd? ( >=sys-apps/systemd-209:0= )
+	!systemd? ( || ( sys-power/upower sys-power/upower-pm-utils ) )
+	teamd? ( >=net-misc/libteam-1.9 )
+	zeroconf? ( net-dns/avahi:=[autoipd] )
+"
+RDEPEND="${COMMON_DEPEND}
+	consolekit? ( sys-auth/consolekit )
+	wifi? ( >=net-wireless/wpa_supplicant-0.7.3-r3[dbus] )
+"
+DEPEND="${COMMON_DEPEND}
+	dev-util/gdbus-codegen
+	dev-util/gtk-doc-am
+	>=dev-util/intltool-0.40
+	>=sys-devel/gettext-0.17
+	>=sys-kernel/linux-headers-2.6.29
+	virtual/pkgconfig
+	vala? ( $(vala_depend) )
+	test? (
+		$(python_gen_any_dep '
+			dev-python/dbus-python[${PYTHON_USEDEP}]
+			dev-python/pygobject:2[${PYTHON_USEDEP}]')
+	)
+"
+
+sysfs_deprecated_check() {
+	ebegin "Checking for SYSFS_DEPRECATED support"
+
+	if { linux_chkconfig_present SYSFS_DEPRECATED_V2; }; then
+		eerror "Please disable SYSFS_DEPRECATED_V2 support in your kernel config and recompile your kernel"
+		eerror "or NetworkManager will not work correctly."
+		eerror "See https://bugs.gentoo.org/333639 for more info."
+		die "CONFIG_SYSFS_DEPRECATED_V2 support detected!"
+	fi
+	eend $?
+}
+
+pkg_pretend() {
+	if use kernel_linux; then
+		get_version
+		if linux_config_exists; then
+			sysfs_deprecated_check
+		else
+			ewarn "Was unable to determine your kernel .config"
+			ewarn "Please note that if CONFIG_SYSFS_DEPRECATED_V2 is set in your kernel .config, NetworkManager will not work correctly."
+			ewarn "See https://bugs.gentoo.org/333639 for more info."
+		fi
+
+	fi
+}
+
+pkg_setup() {
+	enewgroup plugdev
+}
+
+src_prepare() {
+	DOC_CONTENTS="To modify system network connections without needing to enter the
+		root password, add your user account to the 'plugdev' group."
+
+	# Force use of /run, avoid eautoreconf, upstream bug #737139, fixed in 'master'
+	sed -e 's:$localstatedir/run/:/run/:' -i configure || die
+
+	# Don't build examples, they are not needed and can cause build failure
+	sed -e '/^\s*examples\s*\\/d' -i Makefile.{am,in} || die
+
+	use vala && vala_src_prepare
+
+	epatch_user # don't remove, users often want custom patches for NM
+
+	eautoreconf
+
+	gnome2_src_prepare
+}
+
+multilib_src_configure() {
+	local myconf=()
+
+	# Same hack as net-dialup/pptpd to get proper plugin dir for ppp, bug #519986
+	if use ppp; then
+		local PPPD_VER=`best_version net-dialup/ppp`
+		PPPD_VER=${PPPD_VER#*/*-} #reduce it to ${PV}-${PR}
+		PPPD_VER=${PPPD_VER%%[_-]*} # main version without beta/pre/patch/revision
+		myconf+=( --with-pppd-plugin-dir=/usr/$(get_libdir)/pppd/${PPPD_VER} )
+	fi
+
+	# unit files directory needs to be passed only when systemd is enabled,
+	# otherwise systemd support is not disabled completely, bug #524534
+	use systemd && myconf+=( "$(systemd_with_unitdir)" )
+
+	if multilib_is_native_abi; then
+		# work-around man out-of-source brokenness, must be done before configure
+		mkdir man || die
+		find "${S}"/man -name '*.?' -exec ln -s {} man/ ';' || die
+	else
+		# libnl, libndp are only used for executables, not libraries
+		myconf+=( LIB{NL,NDP}_{CFLAGS,LIBS}=' ' )
+	fi
+
+	# TODO: enable wimax when we have a libnl:3 compatible revision of it
+	# wimax will be removed, bug #522822
+	# ifnet plugin always disabled until someone volunteers to actively
+	# maintain and fix it
+	ECONF_SOURCE=${S} \
+	gnome2_src_configure \
+		--disable-more-warnings \
+		--disable-static \
+		--localstatedir=/var \
+		--disable-lto \
+		--disable-config-plugin-ibft \
+		--disable-ifnet \
+		--without-netconfig \
+		--with-dbus-sys-dir=/etc/dbus-1/system.d \
+		--with-udev-dir="$(get_udevdir)" \
+		--with-config-plugins-default=keyfile \
+		--with-iptables=/sbin/iptables \
+		$(multilib_native_with libsoup) \
+		$(multilib_native_enable concheck) \
+		--with-crypto=$(usex nss nss gnutls) \
+		--with-session-tracking=$(multilib_native_usex systemd systemd $(multilib_native_usex consolekit consolekit no)) \
+		--with-suspend-resume=$(multilib_native_usex systemd systemd upower) \
+		$(multilib_native_use_enable bluetooth bluez5-dun) \
+		$(multilib_native_use_enable introspection) \
+		$(multilib_native_use_enable ppp) \
+		--disable-wimax \
+		$(use_with dhclient) \
+		$(use_with dhcpcd) \
+		$(multilib_native_use_with modemmanager modem-manager-1) \
+		$(multilib_native_use_with ncurses nmtui) \
+		$(multilib_native_use_with resolvconf) \
+		$(multilib_native_use_with selinux) \
+		$(multilib_native_use_enable teamd teamdctl) \
+		$(multilib_native_use_enable test tests) \
+		$(multilib_native_use_enable vala) \
+		--without-valgrind \
+		$(multilib_native_use_with wext) \
+		$(multilib_native_use_enable wifi) \
+		"${myconf[@]}"
+
+	# work-around gtk-doc out-of-source brokedness
+	if multilib_is_native_abi; then
+		local d
+		for d in api libnm libnm-util libnm-glib; do
+			ln -s "${S}"/docs/${d}/html docs/${d}/html || die
+		done
+	fi
+}
+
+multilib_src_compile() {
+	if multilib_is_native_abi; then
+		emake
+	else
+		emake all-am
+		emake -C include
+		emake -C introspection # generated headers, needed for libnm
+		emake -C libnm-core
+		emake -C libnm
+		emake -C libnm-util
+		emake -C libnm-glib
+	fi
+}
+
+multilib_src_test() {
+	if multilib_is_native_abi; then
+		python_setup
+		Xemake check
+	fi
+}
+
+multilib_src_install() {
+	if multilib_is_native_abi; then
+		# Install completions at proper place, bug #465100
+		gnome2_src_install completiondir="$(get_bashcompdir)"
+	else
+		emake DESTDIR="${D}" install-am
+		emake DESTDIR="${D}" install -C include
+		emake DESTDIR="${D}" install -C introspection
+		emake DESTDIR="${D}" install -C libnm-core
+		emake DESTDIR="${D}" install -C libnm
+		emake DESTDIR="${D}" install -C libnm-util
+		emake DESTDIR="${D}" install -C libnm-glib
+	fi
+}
+
+multilib_src_install_all() {
+	! use systemd && readme.gentoo_create_doc
+
+	newinitd "${FILESDIR}/init.d.NetworkManager" NetworkManager
+	newconfd "${FILESDIR}/conf.d.NetworkManager" NetworkManager
+
+	# /var/run/NetworkManager is used by some distros, but not by Gentoo
+	rmdir -v "${ED}/var/run/NetworkManager" || die "rmdir failed"
+	rmdir -v "${ED}/var/run" || die "rmdir failed"
+
+	# Need to keep the /etc/NetworkManager/dispatched.d for dispatcher scripts
+	keepdir /etc/NetworkManager/dispatcher.d
+
+	# Provide openrc net dependency only when nm is connected
+	exeinto /etc/NetworkManager/dispatcher.d
+	newexe "${FILESDIR}/10-openrc-status-r4" 10-openrc-status
+	sed -e "s:@EPREFIX@:${EPREFIX}:g" \
+		-i "${ED}/etc/NetworkManager/dispatcher.d/10-openrc-status" || die
+
+	keepdir /etc/NetworkManager/system-connections
+	chmod 0600 "${ED}"/etc/NetworkManager/system-connections/.keep* # bug #383765, upstream bug #754594
+
+	# Allow users in plugdev group to modify system connections
+	insinto /usr/share/polkit-1/rules.d/
+	doins "${FILESDIR}/01-org.freedesktop.NetworkManager.settings.modify.system.rules"
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+	! use systemd && readme.gentoo_print_elog
+
+	if [[ -e "${EROOT}etc/NetworkManager/nm-system-settings.conf" ]]; then
+		ewarn "The ${PN} system configuration file has moved to a new location."
+		ewarn "You must migrate your settings from ${EROOT}/etc/NetworkManager/nm-system-settings.conf"
+		ewarn "to ${EROOT}etc/NetworkManager/NetworkManager.conf"
+		ewarn
+		ewarn "After doing so, you can remove ${EROOT}etc/NetworkManager/nm-system-settings.conf"
+	fi
+
+	# The polkit rules file moved to /usr/share
+	old_rules="${EROOT}etc/polkit-1/rules.d/01-org.freedesktop.NetworkManager.settings.modify.system.rules"
+	if [[ -f "${old_rules}" ]]; then
+		case "$(md5sum ${old_rules})" in
+		  574d0cfa7e911b1f7792077003060240* )
+			# Automatically delete the old rules.d file if the user did not change it
+			elog
+			elog "Removing old ${old_rules} ..."
+			rm -f "${old_rules}" || eerror "Failed, please remove ${old_rules} manually"
+			;;
+		  * )
+			elog "The ${old_rules}"
+			elog "file moved to /usr/share/polkit-1/rules.d/ in >=networkmanager-0.9.4.0-r4"
+			elog "If you edited ${old_rules}"
+			elog "without changing its behavior, you may want to remove it."
+			;;
+		esac
+	fi
+
+	# ifnet plugin was disabled for systemd users with 0.9.8.6 version
+	# and for all people with 0.9.10.0-r1 (see ChangeLog for full explanations)
+	if use systemd; then
+		if ! version_is_at_least 0.9.8.6 ${REPLACING_VERSIONS}; then
+			ewarn "Ifnet plugin won't be used with systemd support enabled"
+			ewarn "as it is meant to be used with openRC and can cause collisions"
+			ewarn "(like bug #485658)."
+			ewarn "Because of this, you will likely need to reconfigure some of"
+			ewarn "your networks. To do this you can rely on Gnome control center,"
+			ewarn "nm-connection-editor or nmtui tools for example once updated"
+			ewarn "NetworkManager version is installed."
+		fi
+	else
+		if ! version_is_at_least 0.9.10.0-r1 ${REPLACING_VERSIONS}; then
+			ewarn "Ifnet plugin is now disabled because of it being unattended"
+			ewarn "and unmaintained for a long time, leading to some unfixed bugs"
+			ewarn "and new problems appearing. We will now use upstream 'keyfile'"
+			ewarn "plugin."
+			ewarn "Because of this, you will likely need to reconfigure some of"
+			ewarn "your networks. To do this you can rely on Gnome control center,"
+			ewarn "nm-connection-editor or nmtui tools for example once updated"
+			ewarn "NetworkManager version is installed."
+		fi
+	fi
+
+	# NM fallbacks to plugin specified at compile time (upstream bug #738611)
+	# but still show a warning to remember people to have cleaner config file
+	if [[ -e "${EROOT}etc/NetworkManager/NetworkManager.conf" ]]; then
+		if grep plugins "${EROOT}etc/NetworkManager/NetworkManager.conf" | grep -q ifnet; then
+			ewarn
+			ewarn "You seem to use 'ifnet' plugin in ${EROOT}etc/NetworkManager/NetworkManager.conf"
+			ewarn "Since it won't be used, you will need to stop setting ifnet plugin there."
+			ewarn
+		fi
+	fi
+
+	# NM shows lots of errors making nmcli neither unusable, bug #528748 upstream bug #690457
+	if grep -r "psk-flags=1" "${EROOT}"/etc/NetworkManager/; then
+		ewarn "You have psk-flags=1 setting in above files, you will need to"
+		ewarn "either reconfigure affected networks or, at least, set the flag"
+		ewarn "value to '0'."
+	fi
+}
diff --git a/net-misc/openvpn-auth-ldap/metadata.xml b/net-misc/openvpn-auth-ldap/metadata.xml
index 3e7867df9601..a95d24666619 100644
--- a/net-misc/openvpn-auth-ldap/metadata.xml
+++ b/net-misc/openvpn-auth-ldap/metadata.xml
@@ -7,5 +7,6 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="google-code">openvpn-auth-ldap</remote-id>
+		<remote-id type="github">threerings/openvpn-auth-ldap</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/net-misc/openvpn/openvpn-2.3.8.ebuild b/net-misc/openvpn/openvpn-2.3.8.ebuild
index 30418adf5994..436d9c7b06a9 100644
--- a/net-misc/openvpn/openvpn-2.3.8.ebuild
+++ b/net-misc/openvpn/openvpn-2.3.8.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="http://openvpn.net/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux"
 IUSE="examples down-root iproute2 +lzo pam passwordsave pkcs11 +plugins polarssl selinux socks +ssl static systemd userland_BSD"
 
 REQUIRED_USE="static? ( !plugins !pkcs11 )
diff --git a/net-misc/ps3mediaserver/metadata.xml b/net-misc/ps3mediaserver/metadata.xml
index b4d63de760df..3e5aa55ddaa5 100644
--- a/net-misc/ps3mediaserver/metadata.xml
+++ b/net-misc/ps3mediaserver/metadata.xml
@@ -16,5 +16,6 @@
 	<upstream>
 		<remote-id type="google-code">ps3mediaserver</remote-id>
 		<remote-id type="sourceforge">ps3mediaserver</remote-id>
+		<remote-id type="github">ps3mediaserver/ps3mediaserver</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/net-misc/rygel/rygel-0.26.1.ebuild b/net-misc/rygel/rygel-0.26.1.ebuild
index 9ec428c5da96..95a898d3a01d 100644
--- a/net-misc/rygel/rygel-0.26.1.ebuild
+++ b/net-misc/rygel/rygel-0.26.1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Rygel"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="X +introspection +sqlite tracker test transcode"
 
 # The deps for tracker? and transcode? are just the earliest available
diff --git a/net-misc/spice-gtk/spice-gtk-0.28.ebuild b/net-misc/spice-gtk/spice-gtk-0.28.ebuild
index 33656b080ca0..754d355e5e33 100644
--- a/net-misc/spice-gtk/spice-gtk-0.28.ebuild
+++ b/net-misc/spice-gtk/spice-gtk-0.28.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="http://spice-space.org http://gitorious.org/spice-gtk"
 LICENSE="LGPL-2.1"
 SLOT="0"
 SRC_URI="http://spice-space.org/download/gtk/${P}.tar.bz2"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="dbus gstreamer gtk3 +introspection lz4 policykit pulseaudio python sasl smartcard static-libs usbredir vala webdav"
 
 REQUIRED_USE="
diff --git a/net-misc/strongswan/Manifest b/net-misc/strongswan/Manifest
index 2edf21e4dc65..22c7ecdde17b 100644
--- a/net-misc/strongswan/Manifest
+++ b/net-misc/strongswan/Manifest
@@ -1 +1,2 @@
 DIST strongswan-5.3.2.tar.bz2 4320601 SHA256 a4a9bc8c4e42bdc4366a87a05a02bf9f425169a7ab0c6f4482d347e44acbf225 SHA512 60b17645c00769d497f4cea2229b41a217c29fe1109b58be256a0d4a6ccf4765348b9eb89466539c2528756344c2fa969f25ea1cd8856d56c5d55aa78e632e68 WHIRLPOOL e5ca686e25daf2ca9c42ab8a2fcb62635c7ef2c164313dc01265bb7718d9522d478b9be5ef63d52df27dc44654d455b7dc0a41c86312e0a4c2b25aa279f3a21e
+DIST strongswan-5.3.3.tar.bz2 4423437 SHA256 39d2e8f572a57a77dda8dd8bdaf2ee47ad3cefeb86bbb840d594aa75f00f33e2 SHA512 469b32635bb4c60af1fa5ee535bea5abcd91081c7d482baa861e3951e4aab00783620698b5eade82d9a77aea4ab60d2a00fbf7e9e8760feeffb67c517756169f WHIRLPOOL dafac5830ebc90a3ed04e34d227768f39d92d375200391082abedb4fcab43bc6dcdaeeb2028866eefefc2087a8b7ca61da287875e4b201952f4dda5cb904e5ea
diff --git a/net-misc/strongswan/strongswan-5.3.3.ebuild b/net-misc/strongswan/strongswan-5.3.3.ebuild
new file mode 100644
index 000000000000..d1830fa88ebc
--- /dev/null
+++ b/net-misc/strongswan/strongswan-5.3.3.ebuild
@@ -0,0 +1,302 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils linux-info systemd user
+
+DESCRIPTION="IPsec-based VPN solution focused on security and ease of use, supporting IKEv1/IKEv2 and MOBIKE"
+HOMEPAGE="http://www.strongswan.org/"
+SRC_URI="http://download.strongswan.org/${P}.tar.bz2"
+
+LICENSE="GPL-2 RSA DES"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+IUSE="+caps curl +constraints debug dhcp eap farp gcrypt +gmp ldap mysql networkmanager +non-root +openssl sqlite pam pkcs11"
+
+STRONGSWAN_PLUGINS_STD="led lookip systime-fix unity vici"
+STRONGSWAN_PLUGINS_OPT="blowfish ccm ctr gcm ha ipseckey ntru padlock rdrand unbound whitelist"
+for mod in $STRONGSWAN_PLUGINS_STD; do
+	IUSE="${IUSE} +strongswan_plugins_${mod}"
+done
+
+for mod in $STRONGSWAN_PLUGINS_OPT; do
+	IUSE="${IUSE} strongswan_plugins_${mod}"
+done
+
+COMMON_DEPEND="!net-misc/openswan
+	gmp? ( >=dev-libs/gmp-4.1.5 )
+	gcrypt? ( dev-libs/libgcrypt:0 )
+	caps? ( sys-libs/libcap )
+	curl? ( net-misc/curl )
+	ldap? ( net-nds/openldap )
+	openssl? ( >=dev-libs/openssl-0.9.8[-bindist] )
+	mysql? ( virtual/mysql )
+	sqlite? ( >=dev-db/sqlite-3.3.1 )
+	networkmanager? ( net-misc/networkmanager )
+	pam? ( sys-libs/pam )
+	strongswan_plugins_unbound? ( net-dns/unbound )"
+DEPEND="${COMMON_DEPEND}
+	virtual/linux-sources
+	sys-kernel/linux-headers"
+RDEPEND="${COMMON_DEPEND}
+	virtual/logger
+	sys-apps/iproute2
+	!net-misc/libreswan"
+
+UGID="ipsec"
+
+pkg_setup() {
+	linux-info_pkg_setup
+	elog "Linux kernel version: ${KV_FULL}"
+
+	if ! kernel_is -ge 2 6 16; then
+		eerror
+		eerror "This ebuild currently only supports ${PN} with the"
+		eerror "native Linux 2.6 IPsec stack on kernels >= 2.6.16."
+		eerror
+	fi
+
+	if kernel_is -lt 2 6 34; then
+		ewarn
+		ewarn "IMPORTANT KERNEL NOTES: Please read carefully..."
+		ewarn
+
+		if kernel_is -lt 2 6 29; then
+			ewarn "[ < 2.6.29 ] Due to a missing kernel feature, you have to"
+			ewarn "include all required IPv6 modules even if you just intend"
+			ewarn "to run on IPv4 only."
+			ewarn
+			ewarn "This has been fixed with kernels >= 2.6.29."
+			ewarn
+		fi
+
+		if kernel_is -lt 2 6 33; then
+			ewarn "[ < 2.6.33 ] Kernels prior to 2.6.33 include a non-standards"
+			ewarn "compliant implementation for SHA-2 HMAC support in ESP and"
+			ewarn "miss SHA384 and SHA512 HMAC support altogether."
+			ewarn
+			ewarn "If you need any of those features, please use kernel >= 2.6.33."
+			ewarn
+		fi
+
+		if kernel_is -lt 2 6 34; then
+			ewarn "[ < 2.6.34 ] Support for the AES-GMAC authentification-only"
+			ewarn "ESP cipher is only included in kernels >= 2.6.34."
+			ewarn
+			ewarn "If you need it, please use kernel >= 2.6.34."
+			ewarn
+		fi
+	fi
+
+	if use non-root; then
+		enewgroup ${UGID}
+		enewuser ${UGID} -1 -1 -1 ${UGID}
+	fi
+}
+
+src_prepare() {
+	epatch_user
+}
+
+src_configure() {
+	local myconf=""
+
+	if use non-root; then
+		myconf="${myconf} --with-user=${UGID} --with-group=${UGID}"
+	fi
+
+	# If a user has already enabled db support, those plugins will
+	# most likely be desired as well. Besides they don't impose new
+	# dependencies and come at no cost (except for space).
+	if use mysql || use sqlite; then
+		myconf="${myconf} --enable-attr-sql --enable-sql"
+	fi
+
+	# strongSwan builds and installs static libs by default which are
+	# useless to the user (and to strongSwan for that matter) because no
+	# header files or alike get installed... so disabling them is safe.
+	if use pam && use eap; then
+		myconf="${myconf} --enable-eap-gtc"
+	else
+		myconf="${myconf} --disable-eap-gtc"
+	fi
+
+	for mod in $STRONGSWAN_PLUGINS_STD; do
+		if use strongswan_plugins_${mod}; then
+			myconf+=" --enable-${mod}"
+		fi
+	done
+
+	for mod in $STRONGSWAN_PLUGINS_OPT; do
+		if use strongswan_plugins_${mod}; then
+			myconf+=" --enable-${mod}"
+		fi
+	done
+
+	econf \
+		--disable-static \
+		--enable-ikev1 \
+		--enable-ikev2 \
+		--enable-swanctl \
+		--enable-socket-dynamic \
+		$(use_with caps capabilities libcap) \
+		$(use_enable curl) \
+		$(use_enable constraints) \
+		$(use_enable ldap) \
+		$(use_enable debug leak-detective) \
+		$(use_enable dhcp) \
+		$(use_enable eap eap-sim) \
+		$(use_enable eap eap-sim-file) \
+		$(use_enable eap eap-simaka-sql) \
+		$(use_enable eap eap-simaka-pseudonym) \
+		$(use_enable eap eap-simaka-reauth) \
+		$(use_enable eap eap-identity) \
+		$(use_enable eap eap-md5) \
+		$(use_enable eap eap-aka) \
+		$(use_enable eap eap-aka-3gpp2) \
+		$(use_enable eap md4) \
+		$(use_enable eap eap-mschapv2) \
+		$(use_enable eap eap-radius) \
+		$(use_enable eap eap-tls) \
+		$(use_enable eap xauth-eap) \
+		$(use_enable farp) \
+		$(use_enable gmp) \
+		$(use_enable gcrypt) \
+		$(use_enable mysql) \
+		$(use_enable networkmanager nm) \
+		$(use_enable openssl) \
+		$(use_enable pam xauth-pam) \
+		$(use_enable pkcs11) \
+		$(use_enable sqlite) \
+		"$(systemd_with_unitdir)" \
+		${myconf}
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	doinitd "${FILESDIR}"/ipsec
+
+	local dir_ugid
+	if use non-root; then
+		fowners ${UGID}:${UGID} \
+			/etc/ipsec.conf \
+			/etc/strongswan.conf
+
+		dir_ugid="${UGID}"
+	else
+		dir_ugid="root"
+	fi
+
+	diropts -m 0750 -o ${dir_ugid} -g ${dir_ugid}
+	dodir /etc/ipsec.d \
+		/etc/ipsec.d/aacerts \
+		/etc/ipsec.d/acerts \
+		/etc/ipsec.d/cacerts \
+		/etc/ipsec.d/certs \
+		/etc/ipsec.d/crls \
+		/etc/ipsec.d/ocspcerts \
+		/etc/ipsec.d/private \
+		/etc/ipsec.d/reqs
+
+	dodoc NEWS README TODO || die
+
+	# shared libs are used only internally and there are no static libs,
+	# so it's safe to get rid of the .la files
+	find "${D}" -name '*.la' -delete || die "Failed to remove .la files."
+}
+
+pkg_preinst() {
+	has_version "<net-misc/strongswan-4.3.6-r1"
+	upgrade_from_leq_4_3_6=$(( !$? ))
+
+	has_version "<net-misc/strongswan-4.3.6-r1[-caps]"
+	previous_4_3_6_with_caps=$(( !$? ))
+}
+
+pkg_postinst() {
+	if ! use openssl && ! use gcrypt; then
+		elog
+		elog "${PN} has been compiled without both OpenSSL and libgcrypt support."
+		elog "Please note that this might effect availability and speed of some"
+		elog "cryptographic features. You are advised to enable the OpenSSL plugin."
+	elif ! use openssl; then
+		elog
+		elog "${PN} has been compiled without the OpenSSL plugin. This might effect"
+		elog "availability and speed of some cryptographic features. There will be"
+		elog "no support for Elliptic Curve Cryptography (Diffie-Hellman groups 19-21,"
+		elog "25, 26) and ECDSA."
+	fi
+
+	if [[ $upgrade_from_leq_4_3_6 == 1 ]]; then
+		chmod 0750 "${ROOT}"/etc/ipsec.d \
+			"${ROOT}"/etc/ipsec.d/aacerts \
+			"${ROOT}"/etc/ipsec.d/acerts \
+			"${ROOT}"/etc/ipsec.d/cacerts \
+			"${ROOT}"/etc/ipsec.d/certs \
+			"${ROOT}"/etc/ipsec.d/crls \
+			"${ROOT}"/etc/ipsec.d/ocspcerts \
+			"${ROOT}"/etc/ipsec.d/private \
+			"${ROOT}"/etc/ipsec.d/reqs
+
+		ewarn
+		ewarn "The default permissions for /etc/ipsec.d/* have been tightened for"
+		ewarn "security reasons. Your system installed directories have been"
+		ewarn "updated accordingly. Please check if necessary."
+		ewarn
+
+		if [[ $previous_4_3_6_with_caps == 1 ]]; then
+			if ! use non-root; then
+				ewarn
+				ewarn "IMPORTANT: You previously had ${PN} installed without root"
+				ewarn "privileges because it was implied by the 'caps' USE flag."
+				ewarn "This has been changed. If you want ${PN} with user privileges,"
+				ewarn "you have to re-emerge it with the 'non-root' USE flag enabled."
+				ewarn
+			fi
+		fi
+	fi
+	if ! use caps && ! use non-root; then
+		ewarn
+		ewarn "You have decided to run ${PN} with root privileges and built it"
+		ewarn "without support for POSIX capability dropping. It is generally"
+		ewarn "strongly suggested that you reconsider- especially if you intend"
+		ewarn "to run ${PN} as server with a public ip address."
+		ewarn
+		ewarn "You should re-emerge ${PN} with at least the 'caps' USE flag enabled."
+		ewarn
+	fi
+	if use non-root; then
+		elog
+		elog "${PN} has been installed without superuser privileges (USE=non-root)."
+		elog "This imposes several limitations mainly to the IKEv1 daemon 'pluto'"
+		elog "but also a few to the IKEv2 daemon 'charon'."
+		elog
+		elog "Please carefully read: http://wiki.strongswan.org/wiki/nonRoot"
+		elog
+		elog "pluto uses a helper script by default to insert/remove routing and"
+		elog "policy rules upon connection start/stop which requires superuser"
+		elog "privileges. charon in contrast does this internally and can do so"
+		elog "even with reduced (user) privileges."
+		elog
+		elog "Thus if you require IKEv1 (pluto) or need to specify a custom updown"
+		elog "script to pluto or charon which requires superuser privileges, you"
+		elog "can work around this limitation by using sudo to grant the"
+		elog "user \"ipsec\" the appropriate rights."
+		elog "For example (the default case):"
+		elog "/etc/sudoers:"
+		elog "  ipsec ALL=(ALL) NOPASSWD: SETENV: /usr/sbin/ipsec"
+		elog "Under the specific connection block in /etc/ipsec.conf:"
+		elog "  leftupdown=\"sudo -E ipsec _updown iptables\""
+		elog
+	fi
+	elog
+	elog "Make sure you have _all_ required kernel modules available including"
+	elog "the appropriate cryptographic algorithms. A list is available at:"
+	elog "  http://wiki.strongswan.org/projects/strongswan/wiki/KernelModules"
+	elog
+	elog "The up-to-date manual is available online at:"
+	elog "  http://wiki.strongswan.org/"
+	elog
+}
diff --git a/net-misc/vinagre/vinagre-3.16.1.ebuild b/net-misc/vinagre/vinagre-3.16.1.ebuild
index 1b4ba2972808..dfa5bd801a90 100644
--- a/net-misc/vinagre/vinagre-3.16.1.ebuild
+++ b/net-misc/vinagre/vinagre-3.16.1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Vinagre"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86"
 IUSE="rdp +ssh spice +telepathy zeroconf"
 
 # cairo used in vinagre-tab
diff --git a/net-misc/vino/vino-3.16.0.ebuild b/net-misc/vino/vino-3.16.0.ebuild
index 037b150630ab..08c7dd0148e6 100644
--- a/net-misc/vino/vino-3.16.0.ebuild
+++ b/net-misc/vino/vino-3.16.0.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Vino"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE="crypt libsecret ipv6 jpeg ssl +telepathy zeroconf +zlib"
 # bug #394611; tight encoding requires zlib encoding
 REQUIRED_USE="jpeg? ( zlib )"
diff --git a/net-misc/wicd/Manifest b/net-misc/wicd/Manifest
index 290c9f13a4c3..11e0f0e6610d 100644
--- a/net-misc/wicd/Manifest
+++ b/net-misc/wicd/Manifest
@@ -1,4 +1,3 @@
 DIST Icone-Wicd-Lucid.tar.gz 9015 SHA256 6e4e3483c6cff7398e6871dd3e4360e361e5c6e64007e8e1240fd1c259ac707e SHA512 0df0dbdf05b462264dca2dd9955454a82f688b0fbfa7c2ad70a424df57eb27b35561d37819fc88b5746cff8a54de5b7b43ec325d2f98a4a1a30e4d500e86d2f8 WHIRLPOOL 336f363092c9bac7523047b6052a856a699820147967820418c6ac1ca528c472d371c6c211c505c325b5eb001812042c01425b05e1dfdf2d4a528f96686c530a
-DIST wicd-1.7.2.4.tar.gz 439297 SHA256 dcfdfb5dbbb49dbb9b205fddf064d6b1a4e88f66f1cf40d12fb7fe0e0c7cdc97 SHA512 6dd8d4726c5f9c943d90305b7ed70573b42b5dae00de443209d9f526778e91ac01aabffa14447c47374b4d9986133aacfcc970735d1b5befa232da44d3190d7c WHIRLPOOL 59885a22dbf350e73a55fdbf7ea1c9b93a339edae116beb1c22c271762d90488ecdeb7952a4efc8241d362b5bafcaccf88053c4d5c41468cba0cd524cf2a5756
 DIST wicd-1.7.3.tar.gz 542341 SHA256 91e38857b1651d242ed7e3b3e3fd8b076b4d06a23eedb033310fae510ece8401 SHA512 3ff3f42cd228327641b584bf85ef785a7d490fa5a57d1aa695f9b4860dae086c240a60321832a0aeee2dfb23de70da1a9f6abce4f1b6ecab58455304407fd536 WHIRLPOOL 69a9042e77f78f6d0dabc73e0569023d5a6747b82e3c944aad51a74681765b1b439beef1a578fcba4f048dbba6cbeabe0aca54ea62076d7dacdcbc4100ef2025
 DIST wicd-mac4lin-icons.tar.xz 53136 SHA256 4c48c769c71f962415e3bd3573557e9288351afb867347f9a6f652883ae31011
diff --git a/net-misc/wicd/files/wicd-1.7.1-provide-net.patch b/net-misc/wicd/files/wicd-1.7.1-provide-net.patch
deleted file mode 100644
index f325bcbaa89d..000000000000
--- a/net-misc/wicd/files/wicd-1.7.1-provide-net.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -U 3 -dHrN wicd-1.7.1.orig/in/init=gentoo=wicd.in wicd-1.7.1/in/init=gentoo=wicd.in
---- wicd-1.7.1.orig/in/init=gentoo=wicd.in	2012-02-27 21:49:36.422873826 +0100
-+++ wicd-1.7.1/in/init=gentoo=wicd.in	2012-02-27 21:50:26.957127714 +0100
-@@ -10,6 +10,7 @@
- depend() {
- 	need dbus
- 	after hald
-+	provide net
- }
- 
- start() {
diff --git a/net-misc/wicd/files/wicd-1.7.1_beta2-init.patch b/net-misc/wicd/files/wicd-1.7.1_beta2-init.patch
deleted file mode 100644
index 6a736f9e2cdd..000000000000
--- a/net-misc/wicd/files/wicd-1.7.1_beta2-init.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- in/init=gentoo=wicd.in	2010-10-29 11:36:55.000000000 -0400
-+++ in/init=gentoo=wicd.in.new	2011-03-28 09:40:27.245339002 -0400
-@@ -15,7 +15,7 @@
- start() {
- 	ebegin "Starting wicd daemon"
- 	# fix Gentoo bug 296197
--	sed -i 's/^\[\]$//' /etc/wicd/wired-settings.conf
-+	[ -f /etc/wicd/wired-settings.conf ] && sed -i 's/^\[\]$//' /etc/wicd/wired-settings.conf
- 	"${WICD_DAEMON}" >/dev/null 2>&1
- 	eend $?
- }
diff --git a/net-misc/wicd/files/wicd-1.7.1_pre20111210-wpa-psk-hex-template.patch b/net-misc/wicd/files/wicd-1.7.1_pre20111210-wpa-psk-hex-template.patch
deleted file mode 100644
index 6736cb7b8d1b..000000000000
--- a/net-misc/wicd/files/wicd-1.7.1_pre20111210-wpa-psk-hex-template.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -U 3 -dHrN wicd.org/encryption/templates/active wicd/encryption/templates/active
---- wicd.org/encryption/templates/active	2011-12-05 16:22:49.584224158 +0100
-+++ wicd/encryption/templates/active	2011-12-05 16:16:10.736172566 +0100
-@@ -1,6 +1,7 @@
- wpa
- wpa-peap
- wpa-psk
-+wpa-psk-hex
- wpa2-leap
- wpa2-peap
- wep-hex
-diff -U 3 -dHrN wicd.org/encryption/templates/wpa-psk-hex wicd/encryption/templates/wpa-psk-hex
---- wicd.org/encryption/templates/wpa-psk-hex	1970-01-01 01:00:00.000000000 +0100
-+++ wicd/encryption/templates/wpa-psk-hex	2011-12-05 16:16:43.428012863 +0100
-@@ -0,0 +1,15 @@
-+name = WPA 1/2 (Preshared Hex Key)
-+author = Thomas Kahle
-+version = 1
-+require apsk *Preshared_Key
-+-----
-+ctrl_interface=/var/run/wpa_supplicant
-+network={
-+       ssid="$_ESSID"
-+       scan_ssid=$_SCAN
-+       proto=WPA RSN
-+       key_mgmt=WPA-PSK
-+       pairwise=CCMP TKIP
-+       group=CCMP TKIP
-+       psk=$_APSK
-+}
diff --git a/net-misc/wicd/files/wicd-1.7.2.4-fix-dbus-error.patch b/net-misc/wicd/files/wicd-1.7.2.4-fix-dbus-error.patch
deleted file mode 100644
index 2fddc9a2e55f..000000000000
--- a/net-misc/wicd/files/wicd-1.7.2.4-fix-dbus-error.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-=== modified file 'wicd/misc.py'
---- wicd/misc.py	2012-04-30 19:20:47 +0000
-+++ wicd/misc.py	2012-05-03 16:01:49 +0000
-@@ -430,7 +430,10 @@
-     """ Sanitize property names to be used in config-files. """
-     allowed = string.ascii_letters + '_' + string.digits
-     table = string.maketrans(allowed, ' ' * len(allowed))
--    return s.translate(None, table)
-+
-+    # s is a dbus.String -- since we don't allow unicode property keys,
-+    # make it simple.
-+    return str(s).translate(None, table)
- 
- def sanitize_escaped(s):
-     """ Sanitize double-escaped unicode strings. """
-
diff --git a/net-misc/wicd/files/wicd-1.7.2.4-second-urwid.patch b/net-misc/wicd/files/wicd-1.7.2.4-second-urwid.patch
deleted file mode 100644
index 9a0bae6c9625..000000000000
--- a/net-misc/wicd/files/wicd-1.7.2.4-second-urwid.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-=== modified file 'curses/curses_misc.py'
---- curses/curses_misc.py	2012-11-15 09:26:21 +0000
-+++ curses/curses_misc.py	2012-11-16 09:22:47 +0000
-@@ -352,7 +352,7 @@
-         if urwid.VERSION < (1, 1, 0):
-             self.focus = focus
-         else:
--            self.focus_position = focus
-+            self._w.focus_position = focus
- 
-         self.callback = callback
-         self.user_args = user_args
-@@ -368,7 +368,10 @@
-         if urwid.VERSION < (1, 1, 0):
-             self.focus = index
-         else:
--            self.focus_position = index
-+            try:
-+                self._w.focus_position = index
-+            except IndexError:
-+                pass
- 
-         # API changed between urwid 0.9.8.4 and 0.9.9
-         try:
-@@ -386,7 +389,7 @@
-         if urwid.VERSION < (1, 1, 0):
-             index = self.focus
-         else:
--            index = self.focus_position
-+            index = self._w.focus_position
- 
-         self.cbox = DynWrap(SelText([self.list[index]+self.DOWN_ARROW]),
-                 attrs=self.attrs,focus_attr=self.focus_attr)
-@@ -434,7 +437,7 @@
-             if urwid.VERSION < (1, 1, 0):
-                 return None, self.focus
-             else:
--                return None, self.focus_position
-+                return None, self._w.focus_position
- 
-     def get_sensitive(self):
-         return self.cbox.get_sensitive()
-
diff --git a/net-misc/wicd/files/wicd-1.7.2.4-urwid.patch b/net-misc/wicd/files/wicd-1.7.2.4-urwid.patch
deleted file mode 100644
index 63eba2ed48b6..000000000000
--- a/net-misc/wicd/files/wicd-1.7.2.4-urwid.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-=== modified file 'curses/curses_misc.py'
---- curses/curses_misc.py	2012-05-06 15:16:15 +0000
-+++ curses/curses_misc.py	2012-11-15 09:26:21 +0000
-@@ -349,7 +349,10 @@
-         # We need this to pick our keypresses
-         self.use_enter = use_enter
- 
--        self.focus = focus
-+        if urwid.VERSION < (1, 1, 0):
-+            self.focus = focus
-+        else:
-+            self.focus_position = focus
- 
-         self.callback = callback
-         self.user_args = user_args
-@@ -362,7 +365,11 @@
-         self.list = list
- 
-     def set_focus(self,index):
--        self.focus = index
-+        if urwid.VERSION < (1, 1, 0):
-+            self.focus = index
-+        else:
-+            self.focus_position = index
-+
-         # API changed between urwid 0.9.8.4 and 0.9.9
-         try:
-             self.cbox.set_w(SelText(self.list[index]+self.DOWN_ARROW))
-@@ -376,16 +383,21 @@
-     def build_combobox(self,parent,ui,row):
-         str,trash =  self.label.get_text()
- 
--        self.cbox = DynWrap(SelText([self.list[self.focus]+self.DOWN_ARROW]),
-+        if urwid.VERSION < (1, 1, 0):
-+            index = self.focus
-+        else:
-+            index = self.focus_position
-+
-+        self.cbox = DynWrap(SelText([self.list[index]+self.DOWN_ARROW]),
-                 attrs=self.attrs,focus_attr=self.focus_attr)
-         if str != '':
-             w = urwid.Columns([('fixed',len(str),self.label),self.cbox],
-                     dividechars=1)
--            self.overlay = self.ComboSpace(self.list,parent,ui,self.focus,
-+            self.overlay = self.ComboSpace(self.list,parent,ui,index,
-                     pos=(len(str)+1,row))
-         else:
-             w = urwid.Columns([self.cbox])
--            self.overlay = self.ComboSpace(self.list,parent,ui,self.focus,
-+            self.overlay = self.ComboSpace(self.list,parent,ui,index,
-                     pos=(0,row))
- 
-         self._w = w
-@@ -419,7 +431,10 @@
-         if self.overlay:
-             return self.overlay._listbox.get_focus()
-         else:
--            return None,self.focus
-+            if urwid.VERSION < (1, 1, 0):
-+                return None, self.focus
-+            else:
-+                return None, self.focus_position
- 
-     def get_sensitive(self):
-         return self.cbox.get_sensitive()
-
diff --git a/net-misc/wicd/wicd-1.7.2.4-r3.ebuild b/net-misc/wicd/wicd-1.7.2.4-r3.ebuild
deleted file mode 100644
index c9aca7b276d3..000000000000
--- a/net-misc/wicd/wicd-1.7.2.4-r3.ebuild
+++ /dev/null
@@ -1,142 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="ncurses?,xml"
-
-inherit eutils distutils-r1 linux-info readme.gentoo systemd
-
-DESCRIPTION="A lightweight wired and wireless network manager for Linux"
-HOMEPAGE="https://launchpad.net/wicd"
-SRC_URI="https://launchpad.net/wicd/1.7/${PV}/+download/${P}.tar.gz
-	mac4lin? ( https://dev.gentoo.org/~anarchy/dist/wicd-mac4lin-icons.tar.xz )
-	ambiance? ( http://freetimesblog.altervista.org/blog/wp-content/uploads/downloads/2010/05/Icone-Wicd-Lucid.tar.gz )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~mips ppc ppc64 x86"
-IUSE="doc X ambiance +gtk ioctl libnotify mac4lin ncurses nls +pm-utils"
-
-DEPEND="nls? ( dev-python/Babel )"
-RDEPEND="${PYTHON_DEPS}
-	dev-python/dbus-python[${PYTHON_USEDEP}]
-	X? (
-		gtk? ( dev-python/pygtk )
-		|| (
-			x11-misc/ktsuss
-			x11-libs/gksu
-			kde-apps/kdesu
-			)
-	)
-	|| (
-		net-misc/dhcpcd
-		net-misc/dhcp
-		net-misc/pump
-	)
-	net-wireless/wireless-tools
-	net-wireless/wpa_supplicant
-	|| (
-		sys-apps/net-tools
-		sys-apps/ethtool
-	)
-	!gtk? ( dev-python/pygobject:2[${PYTHON_USEDEP}] )
-	ioctl? ( dev-python/python-iwscan dev-python/python-wpactrl )
-	libnotify? ( dev-python/notify-python[${PYTHON_USEDEP}] )
-	ncurses? (
-		dev-python/urwid
-		dev-python/pygobject:2[${PYTHON_USEDEP}]
-	)
-	pm-utils? ( sys-power/pm-utils )
-	"
-
-src_prepare() {
-	CONFIG_CHECK="~CFG80211_WEXT"
-	local WARNING_CFG80211_WEXT="Wireless extensions have not been \
-	configured in your kernel.  Wicd will not work unless CFG80211_WEXT is set."
-	check_extra_config
-
-	# Fix bug 441966 (urwid-1.1.0 compatibility)
-	epatch "${FILESDIR}"/${P}-urwid.patch
-	epatch "${FILESDIR}"/${P}-second-urwid.patch
-	epatch "${FILESDIR}"/${PN}-1.7.1_beta2-init.patch
-	epatch "${FILESDIR}"/${PN}-init-sve-start.patch
-	# Add a template for hex psk's and wpa (Bug 306423)
-	epatch "${FILESDIR}"/${PN}-1.7.1_pre20111210-wpa-psk-hex-template.patch
-	# The Categories entry in the .desktop files is outdated
-	epatch "${FILESDIR}"/${P}-fix-desktop-categories.patch
-	# Fix bug 416579 (should be included in next release)
-	epatch "${FILESDIR}"/${P}-fix-dbus-error.patch
-	# get rid of opts variable to fix bug 381885
-	sed -i "/opts/d" "in/init=gentoo=wicd.in" || die
-	# Make init script provide net per bug 405775
-	epatch "${FILESDIR}"/${PN}-1.7.1-provide-net.patch
-	# Need to ensure that generated scripts use Python 2 at run time.
-	sed -e "s:self.python = '/usr/bin/python':self.python = '/usr/bin/python2':" \
-	  -i setup.py || die "sed failed"
-	# Fix misc helper scripts:
-	sed -e "s:/usr/bin/env python:/usr/bin/env python2:" \
-		-i wicd/suspend.py wicd/autoconnect.py wicd/monitor.py
-	if use nls; then
-	  # Asturian is faulty with PyBabel
-	  # (https://bugs.launchpad.net/wicd/+bug/928589)
-	  rm po/ast.po
-	  # zh_CN fails with newer PyBabel (Aug 2013)
-	  rm po/zh_CN.po
-	else
-	  # nuke translations
-	  rm po/*.po
-	fi
-
-	DOC_CONTENTS="To start wicd at boot with openRC, add
-		/etc/init.d/wicd to a runlevel and: (1) Remove all net.*
-		initscripts (except for net.lo) from all runlevels (2) Add these
-		scripts to the RC_PLUG_SERVICES line in /etc/rc.conf (For
-		example, rc_hotplug=\"!net.eth* !net.wlan*\")"
-}
-
-src_configure() {
-	local myconf
-	use gtk || myconf="${myconf} --no-install-gtk"
-	use libnotify || myconf="${myconf} --no-use-notifications"
-	use ncurses || myconf="${myconf} --no-install-ncurses"
-	use pm-utils || myconf="${myconf} --no-install-pmutils"
-	python_export_best
-	"${EPYTHON}" ./setup.py configure --no-install-docs \
-		--resume=/usr/share/wicd/scripts/ \
-		--suspend=/usr/share/wicd/scripts/ \
-		--verbose ${myconf}
-}
-
-src_install() {
-	distutils-r1_src_install
-	keepdir /var/lib/wicd/configurations
-	keepdir /etc/wicd/scripts/{postconnect,disconnect,preconnect}
-	keepdir /var/log/wicd
-	use nls || rm -rf "${D}"/usr/share/locale
-	systemd_dounit "${S}/other/wicd.service"
-
-	if use mac4lin; then
-		rm -rf "${D}"/usr/share/pixmaps/wicd || die "Failed to remove old icons"
-		mv "${WORKDIR}"/wicd "${D}"/usr/share/pixmaps/
-	fi
-	if use ambiance; then
-		# Overwrite tray icons with ambiance icon
-		rm "${WORKDIR}/Icone Wicd Lucid"/signal*
-		cp "${WORKDIR}/Icone Wicd Lucid"/*.png "${D}"/usr/share/pixmaps/wicd/
-	fi
-	readme.gentoo_src_install
-}
-
-pkg_postinst() {
-	# Maintainer's note: the consolekit use flag short circuits a dbus rule and
-	# allows the connection. Else, you need to be in the group.
-	if ! has_version sys-auth/consolekit; then
-		ewarn "Wicd-1.6 and newer requires your user to be in the 'users' group. If"
-		ewarn "you are not in that group, then modify /etc/dbus-1/system.d/wicd.conf"
-	fi
-
-	readme.gentoo_print_elog
-}
diff --git a/net-misc/wicd/wicd-1.7.3-r1.ebuild b/net-misc/wicd/wicd-1.7.3-r1.ebuild
deleted file mode 100644
index a5f950313580..000000000000
--- a/net-misc/wicd/wicd-1.7.3-r1.ebuild
+++ /dev/null
@@ -1,142 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="ncurses?,xml"
-
-inherit eutils distutils-r1 linux-info readme.gentoo systemd
-
-DESCRIPTION="A lightweight wired and wireless network manager for Linux"
-HOMEPAGE="https://launchpad.net/wicd"
-SRC_URI="https://launchpad.net/wicd/1.7/${PV}/+download/${P}.tar.gz
-	mac4lin? ( https://dev.gentoo.org/~anarchy/dist/wicd-mac4lin-icons.tar.xz )
-	ambiance? ( http://freetimesblog.altervista.org/blog/wp-content/uploads/downloads/2010/05/Icone-Wicd-Lucid.tar.gz )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86"
-IUSE="doc X ambiance +gtk ioctl libnotify mac4lin ncurses nls +pm-utils gnome-shell"
-
-DEPEND="nls? ( dev-python/Babel[${PYTHON_USEDEP}] )"
-RDEPEND="${PYTHON_DEPS}
-	dev-python/dbus-python[${PYTHON_USEDEP}]
-	X? (
-		gtk? ( dev-python/pygtk[${PYTHON_USEDEP}] )
-		|| (
-			x11-misc/ktsuss
-			x11-libs/gksu
-			kde-apps/kdesu
-			)
-	)
-	|| (
-		net-misc/dhcpcd
-		net-misc/dhcp
-		net-misc/pump
-	)
-	net-wireless/wireless-tools
-	net-wireless/wpa_supplicant
-	|| (
-		sys-apps/net-tools
-		sys-apps/ethtool
-	)
-	!gtk? ( dev-python/pygobject:2[${PYTHON_USEDEP}] )
-	ioctl? ( dev-python/python-iwscan[${PYTHON_USEDEP}]
-			 dev-python/python-wpactrl[${PYTHON_USEDEP}] )
-	libnotify? ( dev-python/notify-python[${PYTHON_USEDEP}] )
-	ncurses? (
-		dev-python/urwid[${PYTHON_USEDEP}]
-		dev-python/pygobject:2[${PYTHON_USEDEP}]
-	)
-	pm-utils? ( sys-power/pm-utils )
-	gnome-shell? ( gnome-base/gnome-shell )
-	"
-
-src_prepare() {
-	CONFIG_CHECK="~CFG80211_WEXT"
-	local WARNING_CFG80211_WEXT="Wireless extensions have not been \
-	configured in your kernel.  Wicd will not work unless CFG80211_WEXT is set."
-	check_extra_config
-
-	epatch "${FILESDIR}"/${PN}-init-sve-start.patch
-	# The Categories entry in the .desktop files is outdated
-	epatch "${FILESDIR}"/${PN}-1.7.2.4-fix-desktop-categories.patch
-	# Upstream bug https://bugs.launchpad.net/wicd/+bug/1412413
-	# Creates files -> give -p
-	epatch -p1 "${FILESDIR}"/${P}-add-missing-gnome-shell-extension.patch
-	# If LANG is undefined, build can fail (bug 537202)
-	epatch "${FILESDIR}"/${P}-undefined-LANG.patch
-	# Fix urwid compat again
-	epatch "${FILESDIR}"/${P}-urwid-1.3.0.patch
-	# get rid of opts variable to fix bug 381885
-	sed -i "/opts/d" "in/init=gentoo=wicd.in" || die
-	# Need to ensure that generated scripts use Python 2 at run time.
-	sed -e "s:self.python = '/usr/bin/python':self.python = '/usr/bin/python2':" \
-	  -i setup.py || die "sed failed"
-	# Fix misc helper scripts:
-	sed -e "s:/usr/bin/env python:/usr/bin/env python2:" \
-		-i wicd/suspend.py wicd/autoconnect.py wicd/monitor.py
-	if use nls; then
-	  # Asturian is faulty with PyBabel
-	  # (https://bugs.launchpad.net/wicd/+bug/928589)
-	  rm po/ast.po
-	  # zh_CN fails with newer PyBabel (Aug 2013)
-	  rm po/zh_CN.po
-	else
-	  # nuke translations
-	  rm po/*.po
-	fi
-
-	DOC_CONTENTS="To start wicd at boot with openRC, add
-		/etc/init.d/wicd to a runlevel and: (1) Remove all net.*
-		initscripts (except for net.lo) from all runlevels (2) Add these
-		scripts to the RC_PLUG_SERVICES line in /etc/rc.conf (For
-		example, rc_hotplug=\"!net.eth* !net.wlan*\")"
-}
-
-src_configure() {
-	local myconf
-	use gtk || myconf="${myconf} --no-install-gtk"
-	use libnotify || myconf="${myconf} --no-use-notifications"
-	use ncurses || myconf="${myconf} --no-install-ncurses"
-	use pm-utils || myconf="${myconf} --no-install-pmutils"
-	use gnome-shell || myconf="${myconf} --no-install-gnome-shell-extensions"
-	python_setup
-	"${EPYTHON}" ./setup.py configure --no-install-docs \
-		--resume=/usr/share/wicd/scripts/ \
-		--suspend=/usr/share/wicd/scripts/ \
-		--verbose ${myconf}
-}
-
-src_install() {
-	distutils-r1_src_install
-	keepdir /var/lib/wicd/configurations
-	keepdir /etc/wicd/scripts/{postconnect,disconnect,preconnect}
-	keepdir /var/log/wicd
-	use nls || rm -rf "${D}"/usr/share/locale
-	systemd_dounit "${S}/other/wicd.service"
-
-	if use mac4lin; then
-		rm -rf "${D}"/usr/share/pixmaps/wicd || die "Failed to remove old icons"
-		mv "${WORKDIR}"/wicd "${D}"/usr/share/pixmaps/
-	fi
-	if use ambiance; then
-		# Overwrite tray icons with ambiance icon
-		rm "${WORKDIR}/Icone Wicd Lucid"/signal*
-		cp "${WORKDIR}/Icone Wicd Lucid"/*.png "${D}"/usr/share/pixmaps/wicd/
-	fi
-	readme.gentoo_src_install
-}
-
-pkg_postinst() {
-	# Maintainer's note: the consolekit use flag short circuits a dbus rule and
-	# allows the connection. Else, you need to be in the group.
-	if ! has_version sys-auth/consolekit; then
-		ewarn "Wicd-1.6 and newer requires your user to be in the 'users' group. If"
-		ewarn "you are not in that group, then modify /etc/dbus-1/system.d/wicd.conf"
-	fi
-
-	readme.gentoo_print_elog
-}
diff --git a/net-misc/x2goserver/Manifest b/net-misc/x2goserver/Manifest
index e1e83f9ed7fe..a1416aa55877 100644
--- a/net-misc/x2goserver/Manifest
+++ b/net-misc/x2goserver/Manifest
@@ -1,6 +1,3 @@
 DIST x2goserver-4.0.1.12.tar.gz 78958 SHA256 447c5e7b47e6b2bc087731ed26c827020130cc8530ca020a03f7f3ecadc308cc SHA512 30ce6c20cf0bf67ee162cda5d0cbbfd994ac47aa140e3c4cd6118b594ed8fbf83dbc961f2323694206c705f647f32dba8a7fc7bde4ef22be2d4936642865a3d3 WHIRLPOOL 9d4887a1dd701d361311850a8e936d7f22ecf76e1b4ee78b11feca6ec25d02419221b0fb2e72c440394f81e63ffa73762b33bd58123e7bd441e32446ce40814e
-DIST x2goserver-4.0.1.15.tar.gz 76128 SHA256 46c0fc2303014db99b138a352a7f3df89c4f7cfabc11dc0aeea4cdc76253bdfb SHA512 ca806c39d2536e7962540733e85199fefea54e80695c6f1ca736cc1998b411524afa8d9cf29c26855fc3373105277daa4ddd69cbcd05c2bbecb01ca5172ba05c WHIRLPOOL b06ace09acf14a0b82b0b5b8f795823d7997c99a4a78bd120ecadedf3bbb8c0b6ad371e8bacf1c080e5d6b45d9760cef8c04f69b9a86a1b2dceb3ebaa450bde0
-DIST x2goserver-4.0.1.16.tar.gz 81836 SHA256 c13dde4f6755f6c42fdc32a5a6167a5e2765eb5077a43e74ffdb50a36be7f8f8 SHA512 f66da1e4b1b29021951f3ebdd93ff7be08b20b6322b7cbae66f5792336b54f23d39273fb9e4956dc6b01620488d7b869269a0fe1e7491147650f6232330236ea WHIRLPOOL c79db32e632a6db876529eed0cd1dc0bf13d0ec82c2f2939e595f9e0b9828a0cdf8553eedec483da413ca0cc041627093addb18682f6aa197e84d61001bced6a
-DIST x2goserver-4.0.1.17.tar.gz 82298 SHA256 364d4f3152a4b4a4b04742a125f5b1c6fd0c82ad9e17a8363d56d926998b213b SHA512 3ffcc8678a5ed380b7820042fa0f8c19d017777cd13e6eed84689636ae49aa0733b4ed4e496e37a64939bbc1fafead19671c919f713f86db5e47ce02e1a73cc1 WHIRLPOOL fddffe5e86f355f46cacd9158387b9859c0c8dfe6f32bf02a7e1bac3a1ea643127e0355d9813a1592bd4b19764861eee3f1d522653bdba11187442f039d9261d
 DIST x2goserver-4.0.1.18.tar.gz 82452 SHA256 4a1e7eb9cf309c126fdab1f97bd55cd036b0a02a04cda1d317b193d8ab9b0612 SHA512 e0f439301cbb2acc09e14a101bebbbac3e436383de51b7ae029117eaa95c6181045335c83125615e0f0ed191ae39d5abb120c1f6b20fa5b78fe94288248d6fd8 WHIRLPOOL fe0ad6b5a0a1a124d62ebcee152a84dd7b34ebe83f04440ff5dac471b1f5e19339dfa340631cd2df10398d38c4ed34c875a52337a394281b2976d9059d6f1bbd
 DIST x2goserver-4.0.1.19.tar.gz 89434 SHA256 3dd5c1464a7992a38760fd6b08f5f8d37646f939f4f7834a7cd96bf4950623cc SHA512 dbd054a6bf781d843a48fcea3449037b991aaa38a52705d48dd5fa8d7fe85c56d4ff31b9a10189a9043a3e5cc0c69475947aea5a5fb78e3c076c0e56079b747d WHIRLPOOL f44fadfda6e1ff165ff989f0c10116c8318f5915764b9bfc663e4658190934eb5155e17e072f131842a98cc02908366b0f91c7b0b9b9e73d4e2a729f00ba0d31
diff --git a/net-misc/x2goserver/x2goserver-4.0.1.12.ebuild b/net-misc/x2goserver/x2goserver-4.0.1.12.ebuild
index 9afea863698d..db55676150b0 100644
--- a/net-misc/x2goserver/x2goserver-4.0.1.12.ebuild
+++ b/net-misc/x2goserver/x2goserver-4.0.1.12.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -23,7 +23,7 @@ RDEPEND="dev-perl/Capture-Tiny
 	dev-perl/File-BaseDir
 	dev-perl/File-ReadBackwards
 	media-fonts/font-cursor-misc
-	media-fonts/font-misc-misc
+	media-fonts/font-misc-misc[nls]
 	net-misc/nx
 	net-misc/openssh
 	x11-apps/xauth
diff --git a/net-misc/x2goserver/x2goserver-4.0.1.15.ebuild b/net-misc/x2goserver/x2goserver-4.0.1.15.ebuild
deleted file mode 100644
index fa090b2b79b3..000000000000
--- a/net-misc/x2goserver/x2goserver-4.0.1.15.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-inherit eutils multilib systemd toolchain-funcs user
-
-DESCRIPTION="The X2Go server"
-HOMEPAGE="http://www.x2go.org"
-SRC_URI="http://code.x2go.org/releases/source/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+fuse postgres +sqlite"
-
-REQUIRED_USE="|| ( postgres sqlite )"
-
-DEPEND=""
-RDEPEND="dev-perl/Capture-Tiny
-	dev-perl/Config-Simple
-	dev-perl/File-BaseDir
-	dev-perl/File-ReadBackwards
-	media-fonts/font-cursor-misc
-	media-fonts/font-misc-misc
-	net-misc/nx
-	net-misc/openssh
-	x11-apps/xauth
-	x11-apps/xhost
-	x11-apps/xwininfo
-	fuse? ( sys-fs/sshfs-fuse )
-	postgres? ( dev-perl/DBD-Pg )
-	sqlite? ( dev-perl/DBD-SQLite )"
-
-pkg_setup() {
-	# Force the group creation, #479650
-	enewgroup x2gouser
-	enewgroup x2goprint
-	enewuser x2gouser -1 -1 /var/lib/x2go x2gouser
-	enewuser x2goprint -1 -1 /var/spool/x2goprint x2goprint
-}
-
-src_prepare() {
-	# Multilib clean
-	sed -e "/^LIBDIR=/s/lib/$(get_libdir)/" -i Makefile */Makefile || die "multilib sed failed"
-	# Skip man2html build
-	sed -e "s/build-indep: build_man2html/build-indep:/" -i Makefile */Makefile || die "man2html sed failed"
-	# Use nxagent directly
-	sed -i -e "/NX_TEMP=/s/x2goagent/nxagent/" x2goserver/bin/x2gostartagent || die "sed failed"
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" PREFIX=/usr
-}
-
-src_install() {
-	emake DESTDIR="${D}" PREFIX=/usr install
-
-	fowners root:x2goprint /usr/bin/x2goprint
-	fperms 2755 /usr/bin/x2goprint
-	fperms 0750 /etc/sudoers.d
-	fperms 0440 /etc/sudoers.d/x2goserver
-	dosym /usr/share/applications /etc/x2go/applications
-
-	newinitd "${FILESDIR}"/${PN}.init x2gocleansessions
-	systemd_dounit "${FILESDIR}"/x2gocleansessions.service
-}
-
-pkg_postinst() {
-	if use sqlite ; then
-		elog "To use sqlite and create the initial database, run:"
-		elog " # x2godbadmin --createdb"
-	fi
-	if use postgres ; then
-		elog "To use a PostgreSQL databse, more information is availabe here:"
-		elog "http://www.x2go.org/doku.php/wiki:advanced:multi-node:x2goserver-pgsql"
-	fi
-
-	elog "For password authentication, you need to enable PasswordAuthentication"
-	elog "in /etc/ssh/sshd_config (disabled by default in Gentoo)"
-	elog "An init script was installed for x2gocleansessions"
-}
diff --git a/net-misc/x2goserver/x2goserver-4.0.1.16.ebuild b/net-misc/x2goserver/x2goserver-4.0.1.16.ebuild
deleted file mode 100644
index cb09ae2abc15..000000000000
--- a/net-misc/x2goserver/x2goserver-4.0.1.16.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-inherit eutils multilib systemd toolchain-funcs user
-
-DESCRIPTION="The X2Go server"
-HOMEPAGE="http://www.x2go.org"
-SRC_URI="http://code.x2go.org/releases/source/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+fuse postgres +sqlite"
-
-REQUIRED_USE="|| ( postgres sqlite )"
-
-DEPEND=""
-RDEPEND="dev-perl/Capture-Tiny
-	dev-perl/Config-Simple
-	dev-perl/File-BaseDir
-	dev-perl/File-ReadBackwards
-	media-fonts/font-cursor-misc
-	media-fonts/font-misc-misc
-	>=net-misc/nx-3.5.0.25
-	net-misc/openssh
-	x11-apps/xauth
-	x11-apps/xhost
-	x11-apps/xwininfo
-	fuse? ( sys-fs/sshfs-fuse )
-	postgres? ( dev-perl/DBD-Pg )
-	sqlite? ( dev-perl/DBD-SQLite )"
-
-pkg_setup() {
-	# Force the group creation, #479650
-	enewgroup x2gouser
-	enewgroup x2goprint
-	enewuser x2gouser -1 -1 /var/lib/x2go x2gouser
-	enewuser x2goprint -1 -1 /var/spool/x2goprint x2goprint
-}
-
-src_prepare() {
-	# Multilib clean
-	sed -e "/^LIBDIR=/s/lib/$(get_libdir)/" -i Makefile */Makefile || die "multilib sed failed"
-	# Skip man2html build
-	sed -e "s/build-indep: build_man2html/build-indep:/" -i Makefile */Makefile || die "man2html sed failed"
-	# Use nxagent directly
-	sed -i -e "/NX_TEMP=/s/x2goagent/nxagent/" x2goserver/bin/x2gostartagent || die "sed failed"
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" PREFIX=/usr
-}
-
-src_install() {
-	emake DESTDIR="${D}" PREFIX=/usr install
-
-	fowners root:x2goprint /usr/bin/x2goprint
-	fperms 2755 /usr/bin/x2goprint
-	fperms 0750 /etc/sudoers.d
-	fperms 0440 /etc/sudoers.d/x2goserver
-	dosym /usr/share/applications /etc/x2go/applications
-
-	newinitd "${FILESDIR}"/${PN}.init x2gocleansessions
-	systemd_dounit "${FILESDIR}"/x2gocleansessions.service
-}
-
-pkg_postinst() {
-	if use sqlite ; then
-		elog "To use sqlite and create the initial database, run:"
-		elog " # x2godbadmin --createdb"
-	fi
-	if use postgres ; then
-		elog "To use a PostgreSQL databse, more information is availabe here:"
-		elog "http://www.x2go.org/doku.php/wiki:advanced:multi-node:x2goserver-pgsql"
-	fi
-
-	elog "For password authentication, you need to enable PasswordAuthentication"
-	elog "in /etc/ssh/sshd_config (disabled by default in Gentoo)"
-	elog "An init script was installed for x2gocleansessions"
-}
diff --git a/net-misc/x2goserver/x2goserver-4.0.1.17.ebuild b/net-misc/x2goserver/x2goserver-4.0.1.17.ebuild
deleted file mode 100644
index cb09ae2abc15..000000000000
--- a/net-misc/x2goserver/x2goserver-4.0.1.17.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-inherit eutils multilib systemd toolchain-funcs user
-
-DESCRIPTION="The X2Go server"
-HOMEPAGE="http://www.x2go.org"
-SRC_URI="http://code.x2go.org/releases/source/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+fuse postgres +sqlite"
-
-REQUIRED_USE="|| ( postgres sqlite )"
-
-DEPEND=""
-RDEPEND="dev-perl/Capture-Tiny
-	dev-perl/Config-Simple
-	dev-perl/File-BaseDir
-	dev-perl/File-ReadBackwards
-	media-fonts/font-cursor-misc
-	media-fonts/font-misc-misc
-	>=net-misc/nx-3.5.0.25
-	net-misc/openssh
-	x11-apps/xauth
-	x11-apps/xhost
-	x11-apps/xwininfo
-	fuse? ( sys-fs/sshfs-fuse )
-	postgres? ( dev-perl/DBD-Pg )
-	sqlite? ( dev-perl/DBD-SQLite )"
-
-pkg_setup() {
-	# Force the group creation, #479650
-	enewgroup x2gouser
-	enewgroup x2goprint
-	enewuser x2gouser -1 -1 /var/lib/x2go x2gouser
-	enewuser x2goprint -1 -1 /var/spool/x2goprint x2goprint
-}
-
-src_prepare() {
-	# Multilib clean
-	sed -e "/^LIBDIR=/s/lib/$(get_libdir)/" -i Makefile */Makefile || die "multilib sed failed"
-	# Skip man2html build
-	sed -e "s/build-indep: build_man2html/build-indep:/" -i Makefile */Makefile || die "man2html sed failed"
-	# Use nxagent directly
-	sed -i -e "/NX_TEMP=/s/x2goagent/nxagent/" x2goserver/bin/x2gostartagent || die "sed failed"
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" PREFIX=/usr
-}
-
-src_install() {
-	emake DESTDIR="${D}" PREFIX=/usr install
-
-	fowners root:x2goprint /usr/bin/x2goprint
-	fperms 2755 /usr/bin/x2goprint
-	fperms 0750 /etc/sudoers.d
-	fperms 0440 /etc/sudoers.d/x2goserver
-	dosym /usr/share/applications /etc/x2go/applications
-
-	newinitd "${FILESDIR}"/${PN}.init x2gocleansessions
-	systemd_dounit "${FILESDIR}"/x2gocleansessions.service
-}
-
-pkg_postinst() {
-	if use sqlite ; then
-		elog "To use sqlite and create the initial database, run:"
-		elog " # x2godbadmin --createdb"
-	fi
-	if use postgres ; then
-		elog "To use a PostgreSQL databse, more information is availabe here:"
-		elog "http://www.x2go.org/doku.php/wiki:advanced:multi-node:x2goserver-pgsql"
-	fi
-
-	elog "For password authentication, you need to enable PasswordAuthentication"
-	elog "in /etc/ssh/sshd_config (disabled by default in Gentoo)"
-	elog "An init script was installed for x2gocleansessions"
-}
diff --git a/net-misc/x2goserver/x2goserver-4.0.1.18-r1.ebuild b/net-misc/x2goserver/x2goserver-4.0.1.18-r1.ebuild
deleted file mode 100644
index 463eaf9c5391..000000000000
--- a/net-misc/x2goserver/x2goserver-4.0.1.18-r1.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-inherit eutils multilib systemd toolchain-funcs user
-
-DESCRIPTION="The X2Go server"
-HOMEPAGE="http://www.x2go.org"
-SRC_URI="http://code.x2go.org/releases/source/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+fuse postgres +sqlite"
-
-REQUIRED_USE="|| ( postgres sqlite )"
-
-DEPEND=""
-RDEPEND="dev-perl/Capture-Tiny
-	dev-perl/Config-Simple
-	dev-perl/File-BaseDir
-	dev-perl/File-ReadBackwards
-	media-fonts/font-cursor-misc
-	media-fonts/font-misc-misc
-	>=net-misc/nx-3.5.0.25
-	net-misc/openssh
-	x11-apps/xauth
-	x11-apps/xhost
-	x11-apps/xwininfo
-	fuse? ( sys-fs/sshfs-fuse )
-	postgres? ( dev-perl/DBD-Pg )
-	sqlite? ( dev-perl/DBD-SQLite )"
-
-pkg_setup() {
-	# Force the group creation, #479650
-	enewgroup x2gouser
-	enewgroup x2goprint
-	enewuser x2gouser -1 -1 /var/lib/x2go x2gouser
-	enewuser x2goprint -1 -1 /var/spool/x2goprint x2goprint
-}
-
-src_prepare() {
-	# Bug #524350
-	epatch "${FILESDIR}"/${P}-prevent_bash_failures_xsession.patch
-
-	# Multilib clean
-	sed -e "/^LIBDIR=/s/lib/$(get_libdir)/" -i Makefile */Makefile || die "multilib sed failed"
-	# Skip man2html build
-	sed -e "s/build-indep: build_man2html/build-indep:/" -i Makefile */Makefile || die "man2html sed failed"
-	# Use nxagent directly
-	sed -i -e "/NX_TEMP=/s/x2goagent/nxagent/" x2goserver/bin/x2gostartagent || die "sed failed"
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" PREFIX=/usr
-}
-
-src_install() {
-	emake DESTDIR="${D}" PREFIX=/usr install
-
-	fowners root:x2goprint /usr/bin/x2goprint
-	fperms 2755 /usr/bin/x2goprint
-	fperms 0750 /etc/sudoers.d
-	fperms 0440 /etc/sudoers.d/x2goserver
-	dosym /usr/share/applications /etc/x2go/applications
-
-	newinitd "${FILESDIR}"/${PN}.init x2gocleansessions
-	systemd_dounit "${FILESDIR}"/x2gocleansessions.service
-}
-
-pkg_postinst() {
-	if use sqlite ; then
-		elog "To use sqlite and create the initial database, run:"
-		elog " # x2godbadmin --createdb"
-	fi
-	if use postgres ; then
-		elog "To use a PostgreSQL databse, more information is availabe here:"
-		elog "http://www.x2go.org/doku.php/wiki:advanced:multi-node:x2goserver-pgsql"
-	fi
-
-	elog "For password authentication, you need to enable PasswordAuthentication"
-	elog "in /etc/ssh/sshd_config (disabled by default in Gentoo)"
-	elog "An init script was installed for x2gocleansessions"
-}
diff --git a/net-misc/x2goserver/x2goserver-4.0.1.18-r2.ebuild b/net-misc/x2goserver/x2goserver-4.0.1.18-r2.ebuild
index 9a23e81a01e4..c67ee794cd9a 100644
--- a/net-misc/x2goserver/x2goserver-4.0.1.18-r2.ebuild
+++ b/net-misc/x2goserver/x2goserver-4.0.1.18-r2.ebuild
@@ -22,7 +22,7 @@ RDEPEND="dev-perl/Capture-Tiny
 	dev-perl/File-BaseDir
 	dev-perl/File-ReadBackwards
 	media-fonts/font-cursor-misc
-	media-fonts/font-misc-misc
+	media-fonts/font-misc-misc[nls]
 	>=net-misc/nx-3.5.0.25
 	net-misc/openssh
 	x11-apps/xauth
diff --git a/net-misc/x2goserver/x2goserver-4.0.1.18.ebuild b/net-misc/x2goserver/x2goserver-4.0.1.18.ebuild
deleted file mode 100644
index cb09ae2abc15..000000000000
--- a/net-misc/x2goserver/x2goserver-4.0.1.18.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-inherit eutils multilib systemd toolchain-funcs user
-
-DESCRIPTION="The X2Go server"
-HOMEPAGE="http://www.x2go.org"
-SRC_URI="http://code.x2go.org/releases/source/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+fuse postgres +sqlite"
-
-REQUIRED_USE="|| ( postgres sqlite )"
-
-DEPEND=""
-RDEPEND="dev-perl/Capture-Tiny
-	dev-perl/Config-Simple
-	dev-perl/File-BaseDir
-	dev-perl/File-ReadBackwards
-	media-fonts/font-cursor-misc
-	media-fonts/font-misc-misc
-	>=net-misc/nx-3.5.0.25
-	net-misc/openssh
-	x11-apps/xauth
-	x11-apps/xhost
-	x11-apps/xwininfo
-	fuse? ( sys-fs/sshfs-fuse )
-	postgres? ( dev-perl/DBD-Pg )
-	sqlite? ( dev-perl/DBD-SQLite )"
-
-pkg_setup() {
-	# Force the group creation, #479650
-	enewgroup x2gouser
-	enewgroup x2goprint
-	enewuser x2gouser -1 -1 /var/lib/x2go x2gouser
-	enewuser x2goprint -1 -1 /var/spool/x2goprint x2goprint
-}
-
-src_prepare() {
-	# Multilib clean
-	sed -e "/^LIBDIR=/s/lib/$(get_libdir)/" -i Makefile */Makefile || die "multilib sed failed"
-	# Skip man2html build
-	sed -e "s/build-indep: build_man2html/build-indep:/" -i Makefile */Makefile || die "man2html sed failed"
-	# Use nxagent directly
-	sed -i -e "/NX_TEMP=/s/x2goagent/nxagent/" x2goserver/bin/x2gostartagent || die "sed failed"
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" PREFIX=/usr
-}
-
-src_install() {
-	emake DESTDIR="${D}" PREFIX=/usr install
-
-	fowners root:x2goprint /usr/bin/x2goprint
-	fperms 2755 /usr/bin/x2goprint
-	fperms 0750 /etc/sudoers.d
-	fperms 0440 /etc/sudoers.d/x2goserver
-	dosym /usr/share/applications /etc/x2go/applications
-
-	newinitd "${FILESDIR}"/${PN}.init x2gocleansessions
-	systemd_dounit "${FILESDIR}"/x2gocleansessions.service
-}
-
-pkg_postinst() {
-	if use sqlite ; then
-		elog "To use sqlite and create the initial database, run:"
-		elog " # x2godbadmin --createdb"
-	fi
-	if use postgres ; then
-		elog "To use a PostgreSQL databse, more information is availabe here:"
-		elog "http://www.x2go.org/doku.php/wiki:advanced:multi-node:x2goserver-pgsql"
-	fi
-
-	elog "For password authentication, you need to enable PasswordAuthentication"
-	elog "in /etc/ssh/sshd_config (disabled by default in Gentoo)"
-	elog "An init script was installed for x2gocleansessions"
-}
diff --git a/net-misc/x2goserver/x2goserver-4.0.1.19.ebuild b/net-misc/x2goserver/x2goserver-4.0.1.19.ebuild
index 827c64d8a68f..97d790c35a18 100644
--- a/net-misc/x2goserver/x2goserver-4.0.1.19.ebuild
+++ b/net-misc/x2goserver/x2goserver-4.0.1.19.ebuild
@@ -23,7 +23,7 @@ RDEPEND="dev-perl/Capture-Tiny
 	dev-perl/File-ReadBackwards
 	dev-perl/File-Which
 	media-fonts/font-cursor-misc
-	media-fonts/font-misc-misc
+	media-fonts/font-misc-misc[nls]
 	>=net-misc/nx-3.5.0.25
 	net-misc/openssh
 	x11-apps/xauth
diff --git a/net-misc/youtube-dl/Manifest b/net-misc/youtube-dl/Manifest
index 825bef46372d..e4862935d20d 100644
--- a/net-misc/youtube-dl/Manifest
+++ b/net-misc/youtube-dl/Manifest
@@ -1,3 +1,3 @@
 DIST youtube-dl-2015.04.03.tar.gz 1472296 SHA256 0521a15a24a9b620728a2f45ea9163ca74660ed443781b6e69b4e06d36d7bf59 SHA512 6b2c85cfa222a31f3462aab583fa98bb92544cd5fb0d395ca0b69a26c24ab174870d02264e058281f09305752d50aa5a06d0d747205499a530b275e3194fc6f9 WHIRLPOOL 391e06ea261f92e03a0b38618307f1c9d53a2dfb9f2062fe0cd3ded1ea0c411033a17ded581616032c74a9e4fb398a57e565bf847196a23a9f89433f861362ae
-DIST youtube-dl-2015.08.23.tar.gz 1715870 SHA256 774de06d23a87a37a040399101f716c86b17d21ff78971346263217d6862757e SHA512 83868d04b106539c546f1fd7555a0226acb42c33ed8c53e61415e76a9320329020c4c5f69292c7a4bb91d95b55cdbfe3abeb5bc8086b0f495ed1db44ff1d46f6 WHIRLPOOL dd55b82e6c96f698fa053d9fe9723aa19f2283f8580dcf7884ccf9fd697ee20152471ec0041c530741b2e9ff14e5ba7a0d5f2608685a38ab958e617d6a9bc5ad
-DIST youtube-dl-2015.08.28.tar.gz 1717348 SHA256 7763dc3869804696b1f1b66cb460d578d1af8de0a73046d449803bd3ac5f5045 SHA512 c55322d39077d7843004c0c873aaa4541c082b637a70fa214f7e1ad4f092db91b56d2014e9fef1cf55d4be19b815c20c7ca333e6a18b65943202957e3e68ac2a WHIRLPOOL bfa425702bebe7768c6672fd171dc1557211cca4b31985b811b7453c5e9e98914f53db67ae78dd4bb31796de7361ef96731760cfc7d8a67bb90a615e8410671f
+DIST youtube-dl-2015.09.03.tar.gz 1724479 SHA256 dfa0efc89412eb58d1cdf641a7747ad95dcd31d8d08b006334a2e603325eb273 SHA512 8c8163eb570bbc04089726aaa0ccc7cbcb79a6c8fb5036c929ba86042f1ca9fba422d8bc20c835cd94ede05ae30445f57299405dd6422b8f8199cf1fc59ffd8e WHIRLPOOL 2a41a5c34c3ef1adbf4a62e3abc9624696a623262f645176d42592c75ffeccf144c08d772077eb908efa02cba4abd7d7a2c53b6763fbebb927a0598e401b52ec
+DIST youtube-dl-2015.09.09.tar.gz 1729706 SHA256 fa2419fc47d0108b800c52dbe292fe1edf40259163035b57efb3b981e517511b SHA512 4f33be2afe7d0bcc91720555ca03d56f9c9cbc3280e36ae70afcc36ed931a1cb840580279e93e72bea9c1d4bbf275d8c557f1596cf8d2f3245969f8033495e08 WHIRLPOOL 42510a54291af9e195dca924385fd2e4a2cf30508b2792e2f77d0ac25cb59f84142c1321cca83c9079bc11207a8278fd1e15832263a020a7967aad6d10fbe6cc
diff --git a/net-misc/youtube-dl/youtube-dl-2015.08.23.ebuild b/net-misc/youtube-dl/youtube-dl-2015.09.03.ebuild
index db29af284def..db29af284def 100644
--- a/net-misc/youtube-dl/youtube-dl-2015.08.23.ebuild
+++ b/net-misc/youtube-dl/youtube-dl-2015.09.03.ebuild
diff --git a/net-misc/youtube-dl/youtube-dl-2015.08.28.ebuild b/net-misc/youtube-dl/youtube-dl-2015.09.09.ebuild
index db29af284def..db29af284def 100644
--- a/net-misc/youtube-dl/youtube-dl-2015.08.28.ebuild
+++ b/net-misc/youtube-dl/youtube-dl-2015.09.09.ebuild
diff --git a/net-nds/nsscache/metadata.xml b/net-nds/nsscache/metadata.xml
index 66627b6b4458..51774ad22374 100644
--- a/net-nds/nsscache/metadata.xml
+++ b/net-nds/nsscache/metadata.xml
@@ -10,5 +10,6 @@
 	</use>
 	<upstream>
 		<remote-id type="google-code">nsscache</remote-id>
+		<remote-id type="github">google/nsscache</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/net-nntp/pan/files/pan-0.139-get_pan_home.patch b/net-nntp/pan/files/pan-0.139-get_pan_home.patch
new file mode 100644
index 000000000000..6a2d5fc45143
--- /dev/null
+++ b/net-nntp/pan/files/pan-0.139-get_pan_home.patch
@@ -0,0 +1,41 @@
+From cef1d28d4a27fe383a74f4e5d0286aca3a28ff99 Mon Sep 17 00:00:00 2001
+From: Alexandre Rostovtsev <tetromino@gentoo.org>
+Date: Mon, 7 Sep 2015 13:21:22 -0400
+Subject: [PATCH] file::get_pan_home() : fix for g++-5 non-CoW std::string
+ semantics
+
+https://bugzilla.gnome.org/show_bug.cgi?id=754698
+---
+ pan/general/file-util.cc | 2 +-
+ pan/general/file-util.h  | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/pan/general/file-util.cc b/pan/general/file-util.cc
+index 4ea2e77..473e426 100644
+--- a/pan/general/file-util.cc
++++ b/pan/general/file-util.cc
+@@ -77,7 +77,7 @@ file :: print_file_info (std::ostream& os, const char* file)
+ ****
+ ***/
+ 
+-std::string
++const std::string &
+ file :: get_pan_home ()
+ {
+   static std::string pan_home;
+diff --git a/pan/general/file-util.h b/pan/general/file-util.h
+index 7c211a8..4b6d04f 100644
+--- a/pan/general/file-util.h
++++ b/pan/general/file-util.h
+@@ -59,7 +59,7 @@ namespace pan
+      * Returns the home pan directory, which falls back to $HOME/.pan2
+      * if the PAN_HOME environmental variable isn't set.
+      */
+-    std::string get_pan_home ();
++    const std::string & get_pan_home ();
+ 
+     /**
+ 	 * Returns an absolute filename of a file
+-- 
+2.5.1
+
diff --git a/net-nntp/pan/pan-0.139-r1.ebuild b/net-nntp/pan/pan-0.139-r1.ebuild
new file mode 100644
index 000000000000..382c8c2799d3
--- /dev/null
+++ b/net-nntp/pan/pan-0.139-r1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit eutils
+
+DESCRIPTION="A newsreader for GNOME"
+HOMEPAGE="http://pan.rebelbase.com/"
+SRC_URI="http://pan.rebelbase.com/download/releases/${PV}/source/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="dbus gnome-keyring libnotify spell ssl"
+
+RDEPEND=">=dev-libs/glib-2.26:2
+	>=x11-libs/gtk+-2.16:2
+	dev-libs/gmime:2.6
+	gnome-keyring? ( >=gnome-base/libgnome-keyring-3.2 )
+	libnotify? ( >=x11-libs/libnotify-0.4.1:0= )
+	spell? (
+		>=app-text/enchant-1.6
+		>=app-text/gtkspell-2.0.7:2 )
+	ssl? ( >=net-libs/gnutls-3:0= )"
+
+DEPEND="${RDEPEND}
+	app-text/gnome-doc-utils
+	>=dev-util/intltool-0.35.5
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+DOCS="AUTHORS ChangeLog NEWS README"
+
+src_prepare() {
+	# in next release
+	epatch "${FILESDIR}/${P}-pan.desktop.patch"
+
+	# g++-5 fix, https://bugzilla.gnome.org/show_bug.cgi?id=754698
+	epatch "${FILESDIR}"/${PN}-0.139-get_pan_home.patch
+
+	# upstream release was in 2012 - users may want to apply patches
+	epatch_user
+}
+
+src_configure() {
+	econf \
+		--without-gtk3 \
+		$(use_with dbus) \
+		$(use_enable gnome-keyring gkr) \
+		$(use_with spell gtkspell) \
+		$(use_enable libnotify) \
+		$(use_with ssl gnutls)
+}
diff --git a/net-print/cups-filters/Manifest b/net-print/cups-filters/Manifest
index c3467a29eefa..90278a4efc62 100644
--- a/net-print/cups-filters/Manifest
+++ b/net-print/cups-filters/Manifest
@@ -1,3 +1,4 @@
 DIST cups-filters-1.0.71.tar.xz 1339116 SHA256 3180aa209c383402822e568ccef8e1ca43f51e30b3af2039c34ebae919a69c1f SHA512 dc243e88d535c8d7e7fd53074b1093a46fc22742504efa09096d2b216846df875e4d914f25d2f726034692538cfdf1b713bc1ef44d199003a21e242b99f44a01 WHIRLPOOL 4afc7079594563f57af81501192cc0cba19db6cd5c10a9544339858a343e245b485e528fbf80eecd711341b23b8321bde817c49db7ddd2f0b801da2b4b9c580d
 DIST cups-filters-1.0.73.tar.xz 1351652 SHA256 84521dc5079e683144e95e22ffcdbc3d51c44f9d4079c5bcc7f7ff421e94ec75 SHA512 ae380403569640fab21c9a0914b894628bcc57b709d68c05b620ec425734436281fe752d99b83c114927110489e523ffdb676b723109094dc7ef6d53bc9e8f41 WHIRLPOOL 3c447ed182a73cab84349101f5846c0cf9784de0b50960bc689de3f4086becf392229d378cc5fa70857adc66191f67e564ed5b6f2c081a7184e62b788d1f80f9
 DIST cups-filters-1.0.74.tar.xz 1352328 SHA256 55e86080c3778d247d88bf6232947cb7c2057a6bce501c6e707800846f71119b SHA512 b7eac4915ee95524af37342bd3dcb4a430052f32360654df5c2cab9373c1c1993d51f5066b44936f5a0ed43b4f34ff22db54f65de1eff4361469577621496954 WHIRLPOOL 07da3a30af49b6ae73d308260b73ef4a67989fab9a2546bd40c75a921c51e058b2e7cab418d8e8e51def1dc414ba6d9c7924cddd1652b59fb160d07806b0454d
+DIST cups-filters-1.0.75.tar.xz 1352492 SHA256 7c69ecea306e33d940b698ef34230c126a1016a5a02c8b18faa466d1aa4c3073 SHA512 a385f4c3aeca8c9a8c9b577b4f90e3e4ceb4488795dd5215b36a6d34832b0719d08d4bd8f653bda6182e5433ee046bae00dd1ab46aa932e66480e3657225c15f WHIRLPOOL 4fcd637c445a7f9b18a8b29185e36169be766f743ff14f1601909110fdb40a4e42c6e58253d63162b263d2efd15f98de0e3731ad1afcb6c909a497c798a3b6d3
diff --git a/net-print/cups-filters/cups-filters-1.0.75.ebuild b/net-print/cups-filters/cups-filters-1.0.75.ebuild
new file mode 100644
index 000000000000..84982d880863
--- /dev/null
+++ b/net-print/cups-filters/cups-filters-1.0.75.ebuild
@@ -0,0 +1,120 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+GENTOO_DEPEND_ON_PERL=no
+
+inherit base eutils perl-module autotools systemd
+
+if [[ "${PV}" == "9999" ]] ; then
+	inherit bzr
+	EBZR_REPO_URI="http://bzr.linuxfoundation.org/openprinting/cups-filters"
+	KEYWORDS=""
+else
+	SRC_URI="http://www.openprinting.org/download/${PN}/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~m68k-mint"
+fi
+DESCRIPTION="Cups PDF filters"
+HOMEPAGE="http://www.linuxfoundation.org/collaborate/workgroups/openprinting/pdfasstandardprintjobformat"
+
+LICENSE="MIT GPL-2"
+SLOT="0"
+IUSE="dbus +foomatic jpeg perl png static-libs tiff zeroconf"
+
+RDEPEND="
+	>=app-text/ghostscript-gpl-9.09
+	app-text/poppler:=[cxx,jpeg?,lcms,tiff?,xpdf-headers(+)]
+	>=app-text/qpdf-3.0.2:=
+	media-libs/fontconfig
+	media-libs/freetype:2
+	media-libs/lcms:2
+	>=net-print/cups-1.7.3
+	!<=net-print/cups-1.5.9999
+	sys-devel/bc
+	sys-libs/zlib
+	dbus? ( sys-apps/dbus )
+	foomatic? ( !net-print/foomatic-filters )
+	jpeg? ( virtual/jpeg:0 )
+	perl? ( dev-lang/perl:= )
+	png? ( media-libs/libpng:0= )
+	tiff? ( media-libs/tiff:0 )
+	zeroconf? ( net-dns/avahi[dbus] )
+"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	base_src_prepare
+	sed -e "s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/" -i configure.ac || die
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
+		$(use_enable dbus) \
+		$(use_enable zeroconf avahi) \
+		$(use_enable static-libs static) \
+		--with-fontdir="fonts/conf.avail" \
+		--with-pdftops=pdftops \
+		--enable-imagefilters \
+		$(use_with jpeg) \
+		$(use_with png) \
+		$(use_with tiff) \
+		--with-rcdir=no \
+ 		--with-browseremoteprotocols=DNSSD,CUPS \
+		--without-php
+}
+
+src_compile() {
+	MAKEOPTS=-j1 default
+
+	if use perl; then
+		pushd "${S}/scripting/perl" > /dev/null
+		perl-module_src_configure
+		perl-module_src_compile
+		popd > /dev/null
+	fi
+}
+
+src_install() {
+	default
+
+	if use perl; then
+		pushd "${S}/scripting/perl" > /dev/null
+		perl-module_src_install
+		perl_delete_localpod
+		popd > /dev/null
+	fi
+
+	# workaround: some printer drivers still require pstoraster and pstopxl, bug #383831
+	dosym /usr/libexec/cups/filter/gstoraster /usr/libexec/cups/filter/pstoraster
+	dosym /usr/libexec/cups/filter/gstopxl /usr/libexec/cups/filter/pstopxl
+
+	prune_libtool_files --all
+
+	cp "${FILESDIR}"/cups-browsed.init.d "${T}"/cups-browsed || die
+
+	if ! use zeroconf ; then
+		sed -i -e 's:need cupsd avahi-daemon:need cupsd:g' "${T}"/cups-browsed || die
+		sed -i -e 's:cups\.service avahi-daemon\.service:cups.service:g' "${S}"/utils/cups-browsed.service || die
+	fi
+
+	if ! use foomatic ; then
+		# this needs an upstream solution / configure switch
+		rm -v "${ED}/usr/bin/foomatic-rip" || die
+		rm -v "${ED}/usr/libexec/cups/filter/foomatic-rip" || die
+		rm -v "${ED}/usr/share/man/man1/foomatic-rip.1" || die
+	fi
+
+	doinitd "${T}"/cups-browsed
+	systemd_dounit "${S}/utils/cups-browsed.service"
+}
+
+pkg_postinst() {
+	if ! use foomatic ; then
+		ewarn "You are disabling the foomatic code in cups-filters. Please do that ONLY if absolutely."
+		ewarn "necessary. net-print/foomatic-filters as replacement is deprecated and unmaintained."
+	fi
+}
diff --git a/net-print/epson-inkjet-printer-escpr/Manifest b/net-print/epson-inkjet-printer-escpr/Manifest
index e4128a1bd4cb..8e347bcdbcf6 100644
--- a/net-print/epson-inkjet-printer-escpr/Manifest
+++ b/net-print/epson-inkjet-printer-escpr/Manifest
@@ -1 +1,2 @@
 DIST epson-inkjet-printer-escpr-1.4.4-1lsb3.2.tar.gz 2432872 SHA256 bec7c51d11d96b6448bd96b5e9ac622786e3fc5024e13cae2fc248f8858db2f6 SHA512 7a3f1f880dba9048773d051cfe54ea2ee929d82a85efb496d4df4b84b33ed2f48bb6020892615d5d22da6b5671501b82df55cea6e11b35fea392392f115a6330 WHIRLPOOL 856bcffc4fe45c6bb15c7ecbe1c41e315ee68bf2c3c93697ac4f314324e2b3a0a8796ba741c04e962f1ca9148dbf38d529649ffd5d7ddaaa757666ea066e32a0
+DIST epson-inkjet-printer-escpr-1.5.2-1lsb3.2.tar.gz 2852564 SHA256 9229aa8a033e97e29b0671082d08e1c56ebbee4e5adb2f350f81181835f06be8 SHA512 680ffa68ea84830463bea1e6ffc4e1380ed60dc45689844afa15989177a8c3a2a67becd8a7b899b6ee6c8078de9b217563af06c70b1d42aefa7469327c0601af WHIRLPOOL 1abaf4954781c2734e13a79f7dfde26d27ddec45fd360fa1983d544fe49123ff92305b9b30fdd8482d0c2f5cb954d1e7472d9cd18804cd093c41f81669bf5970
diff --git a/net-print/epson-inkjet-printer-escpr/epson-inkjet-printer-escpr-1.5.2.ebuild b/net-print/epson-inkjet-printer-escpr/epson-inkjet-printer-escpr-1.5.2.ebuild
new file mode 100644
index 000000000000..b87f3543e8e5
--- /dev/null
+++ b/net-print/epson-inkjet-printer-escpr/epson-inkjet-printer-escpr-1.5.2.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils multilib
+
+DESCRIPTION="Epson Inkjet Printer Driver (ESC/P-R)"
+HOMEPAGE="http://www.epson.com/"
+SRC_URI="https://download3.ebz.epson.net/dsc/f/03/00/04/11/66/a0e858032ab0fd6a32c7fb3b7e447a0229e79141/epson-inkjet-printer-escpr-1.5.2-1lsb3.2.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND="net-print/cups"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	epatch "${FILESDIR}/1.5.2-warnings.patch"
+}
+
+src_configure() {
+	econf --disable-shared
+}
+
+src_install() {
+	default
+	rm -r "${ED%/}/usr/$(get_libdir)" || die
+}
diff --git a/net-print/epson-inkjet-printer-escpr/files/1.5.2-warnings.patch b/net-print/epson-inkjet-printer-escpr/files/1.5.2-warnings.patch
new file mode 100644
index 000000000000..e60606f972c5
--- /dev/null
+++ b/net-print/epson-inkjet-printer-escpr/files/1.5.2-warnings.patch
@@ -0,0 +1,32 @@
+--- a/lib/epson-escpr-api.h
++++ b/lib/epson-escpr-api.h
+@@ -98,6 +98,9 @@
+     /*** -------------------------------------------------------------------------------*/

+ extern EPS_ERR_CODE epsMakeMainteCmd     (EPS_INT32, EPS_UINT8*, EPS_UINT32*            );

+ 

++extern EPS_ERR_CODE SetupJobAttrib          (const EPS_JOB_ATTRIB*                      );

++extern EPS_ERR_CODE SendStartJob            (EPS_BOOL                                   );

++extern EPS_ERR_CODE PrintBand               (const EPS_UINT8*, EPS_UINT32, EPS_UINT32*  );

+ #ifdef __cplusplus

+ }

+ #endif

+--- a/src/filter.c
++++ b/src/filter.c
+@@ -38,6 +38,7 @@
+ #include "epson-escpr-api.h"
+ #include "epson-escpr-services.h"
+ #include "epson-escpr-mem.h"
++#include "epson-escpage.h"
+ 
+ #include "err.h"
+ #include "mem.h"
+--- a/src/mem.c
++++ b/src/mem.c
+@@ -23,6 +23,7 @@
+ #endif
+ 
+ #include <stdlib.h>
++#include "err.h"
+ #include "mem.h"
+ 
+ void *
diff --git a/net-voip/blink/Manifest b/net-voip/blink/Manifest
new file mode 100644
index 000000000000..17866a17d269
--- /dev/null
+++ b/net-voip/blink/Manifest
@@ -0,0 +1 @@
+DIST blink-1.4.1.tar.gz 1640252 SHA256 4e9fe9ccb62029085d551e82d7b1dd8e4d65ce15b35228e2a9a54c08ea1bec52 SHA512 9181eca2b9ee8b99a4c12ae8667b5988f86b1dda10afaf337b6b29dc2fa8733fc9737926014355c11a9913ebd5b406e2d241a4632bb19e4571ed7d318a15940b WHIRLPOOL 329589964e1ad575b1917661af874af1598b05110004ad07a86b1f7bb171eb797603c0c147359f1ad72c78e9af9f102c6a55e9053c1641b4d96b29017ad0f897
diff --git a/net-voip/blink/blink-1.4.1.ebuild b/net-voip/blink/blink-1.4.1.ebuild
new file mode 100644
index 000000000000..1ab78e46d697
--- /dev/null
+++ b/net-voip/blink/blink-1.4.1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils gnome2-utils distutils-r1
+
+DESCRIPTION="A state of the art, easy to use SIP client"
+HOMEPAGE="http://iCanBlink.com"
+SRC_URI="http://download.ag-projects.com/BlinkQt/blink-${PV}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE=""
+
+KEYWORDS="~amd64 ~x86"
+
+CDEPEND="net-libs/libvncserver"
+RDEPEND="${CDEPEND}
+	dev-python/lxml[${PYTHON_USEDEP}]
+	dev-python/PyQt4[webkit,${PYTHON_USEDEP}]
+	dev-python/python-application[${PYTHON_USEDEP}]
+	dev-python/python-cjson[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	dev-python/python-eventlib[${PYTHON_USEDEP}]
+	dev-python/python-sipsimple[${PYTHON_USEDEP}]
+	dev-python/twisted-core[${PYTHON_USEDEP}]
+	dev-python/zope-interface[${PYTHON_USEDEP}]
+"
+DEPEND="${CDEPEND}
+	dev-python/cython[${PYTHON_USEDEP}]"
+
+PATCHES=( "${FILESDIR}/${P}-data-path.patch" )
+
+src_install() {
+	distutils-r1_src_install
+
+	newicon -s 48 resources/icons/blink48.png blink.png
+	newicon -s 64 resources/icons/blink64.png blink.png
+	doicon -s 512 resources/icons/blink.png
+
+	make_desktop_entry ${PN} Blink
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/net-voip/blink/files/blink-1.4.1-data-path.patch b/net-voip/blink/files/blink-1.4.1-data-path.patch
new file mode 100644
index 000000000000..1add3ab55a23
--- /dev/null
+++ b/net-voip/blink/files/blink-1.4.1-data-path.patch
@@ -0,0 +1,19 @@
+From: Julian Ospald <hasufell@gentoo.org>
+Date: Tue Sep  8 10:10:18 UTC 2015
+Subject: Fix data path fallback
+
+Distutils installs into "/usr/share/blink", but
+blink was unable to find it on gentoo, probably due
+to python-exec magic.
+
+--- blink-1.4.1/blink/resources.py
++++ blink-1.4.1/blink/resources.py
+@@ -71,7 +71,7 @@
+             if os.path.exists(os.path.join(application_directory, 'resources', 'blink.ui')):
+                 cls._cached_directory = os.path.join(application_directory, 'resources').decode(sys.getfilesystemencoding())
+             else:
+-                cls._cached_directory = os.path.join(application_directory, 'share', 'blink').decode(sys.getfilesystemencoding())
++                cls._cached_directory = os.path.join(sys.prefix, 'share', 'blink').decode(sys.getfilesystemencoding())
+         return DirectoryContextManager(cls._cached_directory)
+ 
+     @classmethod
diff --git a/net-voip/blink/metadata.xml b/net-voip/blink/metadata.xml
new file mode 100644
index 000000000000..3a6254875166
--- /dev/null
+++ b/net-voip/blink/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>python</herd>
+	<maintainer>
+		<email>hasufell@gentoo.org</email>
+		<name>Julian Ospald</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/net-wireless/bluez/Manifest b/net-wireless/bluez/Manifest
index 08cbee844ad3..e8d35ba5b5e1 100644
--- a/net-wireless/bluez/Manifest
+++ b/net-wireless/bluez/Manifest
@@ -1,5 +1,5 @@
 DIST bluez-4.101-patches.tar.xz 12380 SHA256 ea4b837245080ebe904fe4f338cd3c8c1370e197cdfbcd42bd55430c940b5e13 SHA512 0ef3219ed923a0880b2fe7008c36c185ff631a8fe1b357cc3612888817d9a7eaa6624bd31ed00a8bbbb6739528cb777a0b9900a7db4930482d1cbc38417b89aa WHIRLPOOL b89729b2cb1ecd6c816210682605b275af396af056e85d9a8671192ede0470002c1f61931781f27ad988ce8bc137f69a6725008a5ea9fe743ae41bc2f5edc7e8
 DIST bluez-4.101.tar.xz 887236 SHA256 41f9578bef39b8c94a2d6ddeaa556afd22d136936d0f03100e422fe970a45a7d SHA512 c8a88fa6948e43c81687047856806c9dc576d3223371947b496f228dec2b2614d1c5a8ff587e9f26eec44843a50503c55861f9fa736fdba43b2364f663f0cb0d WHIRLPOOL 0c4f163e4f4d0ba8f7928f5330ac3fd5f204c299346c59e73b64ebb331b0887a2b01e8ed6f4e6ae91f826a0431df4f97fe3a0900fa6013ae66fd755aaa136196
 DIST bluez-5.25.tar.xz 1479312 SHA256 5ca62f3f45e2638a0f7a81658d6c8813ee01487436ae8e53e9fe395e23d1fd30 SHA512 2e13c552e771a9066c3170dfca43cca8a16b3afa3580b90ff065301e3a85d35ac47b145f5aa4db42001c466675994e9115d5c1909b7abe76c381114b7f4d872a WHIRLPOOL 28dfe9e7a6eb9a1cb81001f7183a26b3a3cf8d6383b4c6d17e0b851eeb87497e23c8262a07564cb1cc0fcec128627503ff266d17c86c7ebd8906b9c714dc5df1
-DIST bluez-5.32.tar.xz 1634844 SHA256 fe4f35e701cbec04478818adf014ed9bbd1f7d11e2603370f1b70a78106f57f7 SHA512 718d0e1132123b67acaf0cf91aaf0add1e56b5b79fbb3cc4a72299c6ae00bfab6e0096463969b6bc27fdbeb18d4b62823d59356f6ff661b0bbe2df8205775f28 WHIRLPOOL 9e45d2bc4f65f15a9f2fe01edb90411918d2787b1008859a08894a4330170901ecd02aa0d8c5ab8d0866c316272c4605b8ecb40a0d91596a059dbb16b34ed26d
 DIST bluez-5.33.tar.xz 1636808 SHA256 1801807a13506678cbfeb15c6a4b89ecb5739efe1067eb464da6641d731436d3 SHA512 6b91b7d232c2654985b4777162e14a750b2840ec8bea7f913fc22bb63c5b767f6e8a7c39645cc7d583f17c993bd772f836bf0ab491eb5c75950c08dd9291a3da WHIRLPOOL cf176fabc4689c6e0233005a95731977e177eefb84c1652cbb0ca70a6a484366c7f4c95f3086652a8e3f6ccc023f741cbf930844265cf7090685863dc38fc105
+DIST bluez-5.34.tar.xz 1640772 SHA256 e461ec2927f5491a202de4a180b2b42377f596b0ce372430d8204ae042d3b19c SHA512 9735c95dd2a7d4c51168aed622604efeaf820bc4c99615c4ab2a4b153cb650e0d82e24d09c96d7e1f15e3bc6aa61e83b49c90e8cff200d9b4d0b144a4e6138b8 WHIRLPOOL 2f4364a2a3feb7e9e23761ff1e3ac153772ab39403702b4f850e473153ec12f981fae7235ab14120d46d48007af751dd66d344b52e7d9dad1aef7b309c40605c
diff --git a/net-wireless/bluez/bluez-5.32.ebuild b/net-wireless/bluez/bluez-5.32.ebuild
deleted file mode 100644
index a82c3c070900..000000000000
--- a/net-wireless/bluez/bluez-5.32.ebuild
+++ /dev/null
@@ -1,209 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
-
-inherit autotools eutils multilib python-any-r1 readme.gentoo systemd udev user multilib-minimal
-
-DESCRIPTION="Bluetooth Tools and System Daemons for Linux"
-HOMEPAGE="http://www.bluez.org"
-SRC_URI="mirror://kernel/linux/bluetooth/${P}.tar.xz"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="0/3"
-KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~x86"
-IUSE="cups debug +obex +readline selinux systemd test +udev"
-
-CDEPEND="
-	>=dev-libs/glib-2.28:2
-	>=sys-apps/dbus-1.6:=
-	>=sys-apps/hwids-20121202.2
-	cups? ( net-print/cups:= )
-	obex? ( dev-libs/libical:= )
-	readline? ( sys-libs/readline:= )
-	systemd? ( sys-apps/systemd )
-	udev? ( >=virtual/udev-172 )
-	abi_x86_32? (
-		!<app-emulation/emul-linux-x86-soundlibs-20140406-r1
-		!app-emulation/emul-linux-x86-soundlibs[-abi_x86_32]
-	)
-"
-DEPEND="${CDEPEND}
-	app-arch/xz-utils
-	virtual/pkgconfig
-	test? (
-		$(python_gen_any_dep '
-			>=dev-python/dbus-python-1[${PYTHON_USEDEP}]
-			|| (
-				dev-python/pygobject:3[${PYTHON_USEDEP}]
-				dev-python/pygobject:2[${PYTHON_USEDEP}]
-			)
-		')
-	)
-"
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-bluetooth )
-"
-DOC_CONTENTS="
-	If you want to use rfcomm as a normal user, you need to add the user
-	to the uucp group.
-"
-
-pkg_setup() {
-	enewgroup plugdev
-	use test && python-any-r1_pkg_setup
-
-	if ! use udev; then
-		ewarn
-		ewarn "You are installing ${PN} with USE=-udev. This means various bluetooth"
-		ewarn "devices and adapters from Apple, Dell, Logitech etc. will not work,"
-		ewarn "and hid2hci will not be available."
-		ewarn
-	fi
-}
-
-src_prepare() {
-	# Use static group "plugdev" if there is no ConsoleKit (or systemd logind)
-	epatch "${FILESDIR}"/bluez-plugdev.patch
-
-	# Try both udevadm paths to cover udev/systemd vs. eudev locations (#539844)
-	# http://www.spinics.net/lists/linux-bluetooth/msg58739.html
-	epatch "${FILESDIR}"/bluez-udevadm-path.patch
-
-	# Fedora patches
-	# http://www.spinics.net/lists/linux-bluetooth/msg38490.html
-	epatch "${FILESDIR}"/0001-Allow-using-obexd-without-systemd-in-the-user-sessio.patch
-
-	# http://www.spinics.net/lists/linux-bluetooth/msg40136.html
-	epatch "${FILESDIR}"/0001-obex-Use-GLib-helper-function-to-manipulate-paths.patch
-
-	# http://www.spinics.net/lists/linux-bluetooth/msg41264.html
-	epatch "${FILESDIR}"/0002-autopair-Don-t-handle-the-iCade.patch
-
-	# ???
-	epatch "${FILESDIR}"/0004-agent-Assert-possible-infinite-loop.patch
-
-	# Ubuntu workaround for bug #501120
-	epatch "${FILESDIR}"/0001-work-around-Logitech-diNovo-Edge-keyboard-firmware-i.patch
-
-	if use cups; then
-		sed -i \
-			-e "s:cupsdir = \$(libdir)/cups:cupsdir = $(cups-config --serverbin):" \
-			Makefile.{in,tools} || die
-	fi
-
-	eautoreconf
-
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	local myconf=(
-		# readline is automagic when client is enabled
-		# --enable-client always needs readline, bug #504038
-		ac_cv_header_readline_readline_h=$(multilib_native_usex readline)
-	)
-
-	if ! multilib_is_native_abi; then
-		myconf+=(
-			# deps not used for the library
-			{DBUS,GLIB}_{CFLAGS,LIBS}=' '
-		)
-	fi
-
-	econf \
-		--localstatedir=/var \
-		--disable-android \
-		--enable-datafiles \
-		--enable-experimental \
-		--enable-optimization \
-		$(use_enable debug) \
-		--enable-pie \
-		--enable-threads \
-		--enable-library \
-		$(multilib_native_use_enable test) \
-		--enable-tools \
-		--enable-manpages \
-		--enable-monitor \
-		$(multilib_native_use_enable cups) \
-		$(multilib_native_use_enable obex) \
-		$(multilib_native_use_enable readline client) \
-		$(multilib_native_use_enable systemd) \
-		$(systemd_with_unitdir) \
-		$(multilib_native_use_enable udev) \
-		$(multilib_native_use_enable udev sixaxis)
-}
-
-multilib_src_compile() {
-	if multilib_is_native_abi; then
-		default
-	else
-		emake -f Makefile -f - libs \
-			<<<'libs: $(lib_LTLIBRARIES)'
-	fi
-}
-
-multilib_src_test() {
-	multilib_is_native_abi && default
-}
-
-multilib_src_install() {
-	if multilib_is_native_abi; then
-		emake DESTDIR="${D}" install
-
-		# Upstream doesn't install this, bug #524640
-		# http://permalink.gmane.org/gmane.linux.bluez.kernel/53115
-		# http://comments.gmane.org/gmane.linux.bluez.kernel/54564
-		# gatttool is only built with readline, bug #530776
-		use readline && dobin attrib/gatttool
-		dobin tools/hex2hcd
-
-		# Unittests are not that useful once installed
-		if use test ; then
-			rm -r "${ED}"/usr/$(get_libdir)/bluez/test || die
-		fi
-	else
-		emake DESTDIR="${D}" \
-			install-includeHEADERS \
-			install-libLTLIBRARIES \
-			install-pkgconfigDATA
-	fi
-}
-
-multilib_src_install_all() {
-	prune_libtool_files --modules
-
-	keepdir /var/lib/bluetooth
-
-	# Upstream don't want people to play with them
-	# But we keep installing them due to 'historical' reasons
-	insinto /etc/bluetooth
-	local d
-	for d in input network proximity; do
-		doins profiles/${d}/${d}.conf
-	done
-	doins src/main.conf
-	doins src/bluetooth.conf
-
-	newinitd "${FILESDIR}"/bluetooth-init.d-r3 bluetooth
-	newinitd "${FILESDIR}"/rfcomm-init.d-r2 rfcomm
-
-	einstalldocs
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-
-	use udev && udev_reload
-
-	has_version net-dialup/ppp || elog "To use dial up networking you must install net-dialup/ppp."
-
-	if ! has_version sys-auth/consolekit && ! has_version sys-apps/systemd; then
-		elog "Since you don't have sys-auth/consolekit neither sys-apps/systemd, you will"
-		elog "need to add the user to the plugdev group."
-	fi
-}
diff --git a/net-wireless/bluez/bluez-5.33.ebuild b/net-wireless/bluez/bluez-5.33.ebuild
index a82c3c070900..9ac86ba66558 100644
--- a/net-wireless/bluez/bluez-5.33.ebuild
+++ b/net-wireless/bluez/bluez-5.33.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://kernel/linux/bluetooth/${P}.tar.xz"
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="0/3"
-KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~hppa ~mips ppc ppc64 x86"
 IUSE="cups debug +obex +readline selinux systemd test +udev"
 
 CDEPEND="
diff --git a/net-wireless/bluez/bluez-5.34.ebuild b/net-wireless/bluez/bluez-5.34.ebuild
new file mode 100644
index 000000000000..49c03c124c1f
--- /dev/null
+++ b/net-wireless/bluez/bluez-5.34.ebuild
@@ -0,0 +1,205 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+
+inherit autotools eutils multilib python-any-r1 readme.gentoo systemd udev user multilib-minimal
+
+DESCRIPTION="Bluetooth Tools and System Daemons for Linux"
+HOMEPAGE="http://www.bluez.org"
+SRC_URI="mirror://kernel/linux/bluetooth/${P}.tar.xz"
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="0/3"
+KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~x86"
+IUSE="cups debug +obex +readline selinux systemd test +udev"
+
+CDEPEND="
+	>=dev-libs/glib-2.28:2
+	>=sys-apps/dbus-1.6:=
+	>=sys-apps/hwids-20121202.2
+	cups? ( net-print/cups:= )
+	obex? ( dev-libs/libical:= )
+	readline? ( sys-libs/readline:= )
+	systemd? ( sys-apps/systemd )
+	udev? ( >=virtual/udev-172 )
+	abi_x86_32? (
+		!<app-emulation/emul-linux-x86-soundlibs-20140406-r1
+		!app-emulation/emul-linux-x86-soundlibs[-abi_x86_32]
+	)
+"
+DEPEND="${CDEPEND}
+	app-arch/xz-utils
+	virtual/pkgconfig
+	test? (
+		$(python_gen_any_dep '
+			>=dev-python/dbus-python-1[${PYTHON_USEDEP}]
+			|| (
+				dev-python/pygobject:3[${PYTHON_USEDEP}]
+				dev-python/pygobject:2[${PYTHON_USEDEP}]
+			)
+		')
+	)
+"
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-bluetooth )
+"
+DOC_CONTENTS="
+	If you want to use rfcomm as a normal user, you need to add the user
+	to the uucp group.
+"
+
+pkg_setup() {
+	enewgroup plugdev
+	use test && python-any-r1_pkg_setup
+
+	if ! use udev; then
+		ewarn
+		ewarn "You are installing ${PN} with USE=-udev. This means various bluetooth"
+		ewarn "devices and adapters from Apple, Dell, Logitech etc. will not work,"
+		ewarn "and hid2hci will not be available."
+		ewarn
+	fi
+}
+
+src_prepare() {
+	# Use static group "plugdev" if there is no ConsoleKit (or systemd logind)
+	epatch "${FILESDIR}"/bluez-plugdev.patch
+
+	# Try both udevadm paths to cover udev/systemd vs. eudev locations (#539844)
+	# http://www.spinics.net/lists/linux-bluetooth/msg58739.html
+	epatch "${FILESDIR}"/bluez-udevadm-path.patch
+
+	# Fedora patches
+	# http://www.spinics.net/lists/linux-bluetooth/msg38490.html
+	epatch "${FILESDIR}"/0001-Allow-using-obexd-without-systemd-in-the-user-sessio.patch
+
+	# http://www.spinics.net/lists/linux-bluetooth/msg40136.html
+	epatch "${FILESDIR}"/0001-obex-Use-GLib-helper-function-to-manipulate-paths.patch
+
+	# http://www.spinics.net/lists/linux-bluetooth/msg41264.html
+	epatch "${FILESDIR}"/0002-autopair-Don-t-handle-the-iCade.patch
+
+	# ???
+	epatch "${FILESDIR}"/0004-agent-Assert-possible-infinite-loop.patch
+
+	if use cups; then
+		sed -i \
+			-e "s:cupsdir = \$(libdir)/cups:cupsdir = $(cups-config --serverbin):" \
+			Makefile.{in,tools} || die
+	fi
+
+	eautoreconf
+
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	local myconf=(
+		# readline is automagic when client is enabled
+		# --enable-client always needs readline, bug #504038
+		ac_cv_header_readline_readline_h=$(multilib_native_usex readline)
+	)
+
+	if ! multilib_is_native_abi; then
+		myconf+=(
+			# deps not used for the library
+			{DBUS,GLIB}_{CFLAGS,LIBS}=' '
+		)
+	fi
+
+	econf \
+		--localstatedir=/var \
+		--disable-android \
+		--enable-datafiles \
+		--enable-experimental \
+		--enable-optimization \
+		$(use_enable debug) \
+		--enable-pie \
+		--enable-threads \
+		--enable-library \
+		$(multilib_native_use_enable test) \
+		--enable-tools \
+		--enable-manpages \
+		--enable-monitor \
+		$(multilib_native_use_enable cups) \
+		$(multilib_native_use_enable obex) \
+		$(multilib_native_use_enable readline client) \
+		$(multilib_native_use_enable systemd) \
+		$(systemd_with_unitdir) \
+		$(multilib_native_use_enable udev) \
+		$(multilib_native_use_enable udev sixaxis)
+}
+
+multilib_src_compile() {
+	if multilib_is_native_abi; then
+		default
+	else
+		emake -f Makefile -f - libs \
+			<<<'libs: $(lib_LTLIBRARIES)'
+	fi
+}
+
+multilib_src_test() {
+	multilib_is_native_abi && default
+}
+
+multilib_src_install() {
+	if multilib_is_native_abi; then
+		emake DESTDIR="${D}" install
+
+		# Upstream doesn't install this, bug #524640
+		# http://permalink.gmane.org/gmane.linux.bluez.kernel/53115
+		# http://comments.gmane.org/gmane.linux.bluez.kernel/54564
+		# gatttool is only built with readline, bug #530776
+		use readline && dobin attrib/gatttool
+		dobin tools/hex2hcd
+
+		# Unittests are not that useful once installed
+		if use test ; then
+			rm -r "${ED}"/usr/$(get_libdir)/bluez/test || die
+		fi
+	else
+		emake DESTDIR="${D}" \
+			install-includeHEADERS \
+			install-libLTLIBRARIES \
+			install-pkgconfigDATA
+	fi
+}
+
+multilib_src_install_all() {
+	prune_libtool_files --modules
+
+	keepdir /var/lib/bluetooth
+
+	# Upstream don't want people to play with them
+	# But we keep installing them due to 'historical' reasons
+	insinto /etc/bluetooth
+	local d
+	for d in input network proximity; do
+		doins profiles/${d}/${d}.conf
+	done
+	doins src/main.conf
+
+	newinitd "${FILESDIR}"/bluetooth-init.d-r3 bluetooth
+	newinitd "${FILESDIR}"/rfcomm-init.d-r2 rfcomm
+
+	einstalldocs
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+
+	use udev && udev_reload
+
+	has_version net-dialup/ppp || elog "To use dial up networking you must install net-dialup/ppp."
+
+	if ! has_version sys-auth/consolekit && ! has_version sys-apps/systemd; then
+		elog "Since you don't have sys-auth/consolekit neither sys-apps/systemd, you will"
+		elog "need to add the user to the plugdev group."
+	fi
+}
diff --git a/net-wireless/gnome-bluetooth/gnome-bluetooth-3.16.1.ebuild b/net-wireless/gnome-bluetooth/gnome-bluetooth-3.16.1.ebuild
index c1d6505cfbf4..ea7a87c18d79 100644
--- a/net-wireless/gnome-bluetooth/gnome-bluetooth-3.16.1.ebuild
+++ b/net-wireless/gnome-bluetooth/gnome-bluetooth-3.16.1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/GnomeBluetooth"
 LICENSE="GPL-2+ LGPL-2.1+ FDL-1.1+"
 SLOT="2/13" # subslot = libgnome-bluetooth soname version
 IUSE="+introspection"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~x86"
 
 COMMON_DEPEND="
 	>=dev-libs/glib-2.38:2
diff --git a/net-wireless/kismet-ubertooth/Manifest b/net-wireless/kismet-ubertooth/Manifest
index 1ccd099852c6..22b1af36eae8 100644
--- a/net-wireless/kismet-ubertooth/Manifest
+++ b/net-wireless/kismet-ubertooth/Manifest
@@ -1,3 +1 @@
-DIST ubertooth-2012-10-R1.tar.xz 1677996 SHA256 e049d6f306c612d522c840ad296aa48b63c670665fac51425bcec2d6338ca1bd SHA512 51cf7debfe9ff2484924943484c54be38ad203d25390ddfeb242b06d1e27475763c6fdfe8706c85ed40f568c6502570289d2a04923d5e124c7b3d80359acbbd9 WHIRLPOOL dc30a1e9ad299c1c992cef1539dc5323133140d27544dbfadf44c379e9b70dddb5f5e9f097ef8e18f401a46a42da8ba359f7ae480ea821cd2a774da1e173dc6d
-DIST ubertooth-2014-04-R1.tar.xz 1762456 SHA256 0881b4bde755acea557851852bc830c100986801148ac1fcaf8ca898623edfaa SHA512 9cc415c7e7f4ce40703e7dcf916e8942325902ab3af470fb959de6bbe047a824ad62b41a09e95ead5a74a961674d2dd4d30e582db21e2ba47f648eb99462bf4a WHIRLPOOL 6c01402ebf004e782bbe4ad891c3b8ebee0040a5bfb6fcdeb2939a105646157b1786b90772a502b92e26a356a5674bafd6960ce83e3f81db819dd5575e6fc444
-DIST ubertooth-r534.tar.gz 2959832 SHA256 5e227872ee8c088fe2cdac936c4a30d1e12b8f7c6ac781c96004ad7528b44730 SHA512 b3e150b8f8a4335f65fd8b7b629316eae08cf0560269991af6632d48e360f17dd98742da975df33852760140cd5f4571f72f36d973fa5e6d8df47932561acfa6 WHIRLPOOL 7d7ea0db033b34cbf16f963ea42d05db9bf8f82f41d5d26dd6510a95ffe339dae3fef54f5cef5d71bfedb1e05531bf33998cbcabe88af611feeaecf1e22a7b10
+DIST ubertooth-2015-09-R2.tar.xz 1706712 SHA256 f2088c8c0e754df47dd8dbf604d5822bf5894b91e4505276c6f9e26b6a23b56d SHA512 240f6d682fe0addc05bb8ccf7eec931534449adfa9c1369b484aeac73d9bcaf75c211aeede21c6c219e363773ce3d63e4aa0ee6b662acc83409587bd7ac7e4da WHIRLPOOL 9fba78d1740efd342f3892ffc3cf914d1919ef1c7d282786a64afb72d6ed306dec3600363e3f85f2f70d9ccfba6b62f826a72942cb7c9316d151dd2718f79b09
diff --git a/net-wireless/kismet-ubertooth/kismet-ubertooth-0.0_p534-r1.ebuild b/net-wireless/kismet-ubertooth/kismet-ubertooth-0.0_p534-r1.ebuild
deleted file mode 100644
index bba3e9c89510..000000000000
--- a/net-wireless/kismet-ubertooth/kismet-ubertooth-0.0_p534-r1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-
-inherit eutils multilib
-
-DESCRIPTION="Provides basic bluetooth support in kismet"
-HOMEPAGE="http://ubertooth.sourceforge.net/"
-
-if [[ ${PV} == "9999" ]] ; then
-	ESVN_REPO_URI="https://ubertooth.svn.sourceforge.net/svnroot/ubertooth/trunk/host"
-	SRC_URI=""
-	inherit subversion
-	KEYWORDS=""
-else
-	MY_PV="${PV/p/r}"
-	MY_PV="${MY_PV/0.0_/}"
-	SRC_URI="mirror://sourceforge/ubertooth/ubertooth-${MY_PV}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~x86"
-	S="${WORKDIR}/ubertooth-${MY_PV}/host/"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND=">=net-wireless/kismet-2011.03.2-r1 \
-		>=net-libs/libbtbb-0.8 \
-		virtual/libusb:1"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-respect-cflags.patch
-}
-
-src_compile() {
-	if has_version =net-wireless/kismet-9999; then
-		cd "${S}/kismet/plugin-ubertooth-phyneutral" || die
-	else
-		cd "${S}/kismet/plugin-ubertooth" || die
-	fi
-	emake KIS_SRC_DIR="/usr/include/kismet/"
-}
-
-src_install() {
-	if has_version =net-wireless/kismet-9999; then
-		cd "${S}/kismet/plugin-ubertooth-phyneutral" || die
-	else
-		cd "${S}/kismet/plugin-ubertooth" || die
-	fi
-	emake DESTDIR="${ED}" LIBDIR="/$(get_libdir)" KIS_SRC_DIR="/usr/include/kismet/" install
-}
-
-pkg_postinst() {
-	ewarn "This package must be rebuilt every time kismet is rebuilt. Or else."
-}
diff --git a/net-wireless/kismet-ubertooth/kismet-ubertooth-0.0_p534.ebuild b/net-wireless/kismet-ubertooth/kismet-ubertooth-0.0_p534.ebuild
deleted file mode 100644
index b880389fbcc7..000000000000
--- a/net-wireless/kismet-ubertooth/kismet-ubertooth-0.0_p534.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-
-inherit eutils multilib
-
-DESCRIPTION="Provides basic bluetooth support in kismet"
-HOMEPAGE="http://ubertooth.sourceforge.net/"
-
-if [[ ${PV} == "9999" ]] ; then
-	ESVN_REPO_URI="https://ubertooth.svn.sourceforge.net/svnroot/ubertooth/trunk/host"
-	SRC_URI=""
-	inherit subversion
-	KEYWORDS=""
-else
-	MY_PV="${PV/p/r}"
-	MY_PV="${MY_PV/0.0_/}"
-	SRC_URI="mirror://sourceforge/ubertooth/ubertooth-${MY_PV}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~x86"
-	S="${WORKDIR}/ubertooth-${MY_PV}/host/"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND=">=net-wireless/kismet-2011.03.2-r1 \
-		>=net-libs/libbtbb-0.8 \
-		virtual/libusb:1"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-respect-cflags.patch
-}
-
-src_compile() {
-	if has_version =net-wireless/kismet-9999; then
-		cd "${S}/kismet/plugin-ubertooth-phyneutral" || die
-	else
-		cd "${S}/kismet/plugin-ubertooth" || die
-	fi
-	emake KIS_SRC_DIR="/usr/include/kismet/"
-}
-
-src_install() {
-	if has_version =net-wireless/kismet-9999; then
-		cd "${S}/kismet/plugin-ubertooth-phyneutral" || die
-	else
-		cd "${S}/kismet/plugin-ubertooth" || die
-	fi
-	emake DESTDIR="${ED}" LIBDIR="/usr/$(get_libdir)" KIS_SRC_DIR="/usr/include/kismet/" KIS_DEST_DIR="${D}/usr/" install
-}
-
-pkg_postinst() {
-	ewarn "This package must be rebuilt every time kismet is rebuilt. Or else."
-}
diff --git a/net-wireless/kismet-ubertooth/kismet-ubertooth-2012.10.1-r1.ebuild b/net-wireless/kismet-ubertooth/kismet-ubertooth-2012.10.1-r1.ebuild
deleted file mode 100644
index d6b342878055..000000000000
--- a/net-wireless/kismet-ubertooth/kismet-ubertooth-2012.10.1-r1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit multilib
-
-MY_PV=${PV/\./-}
-MY_PV=${MY_PV/./-R}
-S="${WORKDIR}/ubertooth-${MY_PV}"
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="git://ubertooth.git.sourceforge.net/gitroot/ubertooth/ubertooth"
-	SRC_URI=""
-	inherit git-2
-	KEYWORDS=""
-else
-	SRC_URI="mirror://sourceforge/ubertooth/ubertooth-${MY_PV}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-DESCRIPTION="Provides basic bluetooth support in kismet"
-HOMEPAGE="http://ubertooth.sourceforge.net/"
-
-LICENSE="GPL-2"
-SLOT="0/${PV}"
-IUSE=""
-
-DEPEND=">=net-wireless/kismet-2011.03.2-r1:= \
-	>=net-wireless/ubertooth-${PV} \
-	>=net-libs/libbtbb-${PV} \
-	virtual/libusb:1"
-RDEPEND="${DEPEND}"
-
-src_compile() {
-	if has_version =net-wireless/kismet-9999; then
-		cd "${S}/host/kismet/plugin-ubertooth-phyneutral" || die
-	else
-		cd "${S}/host/kismet/plugin-ubertooth" || die
-	fi
-	emake KIS_SRC_DIR="/usr/include/kismet/"
-}
-
-src_install() {
-	if has_version =net-wireless/kismet-9999; then
-		cd "${S}/host/kismet/plugin-ubertooth-phyneutral" || die
-	else
-		cd "${S}/host/kismet/plugin-ubertooth" || die
-	fi
-	emake DESTDIR="${ED}" LIBDIR="/$(get_libdir)" KIS_SRC_DIR="/usr/include/kismet/" install
-}
-
-pkg_postinst() {
-	ewarn "This package must be rebuilt every time kismet is rebuilt. Or else."
-}
diff --git a/net-wireless/kismet-ubertooth/kismet-ubertooth-2012.10.1-r2.ebuild b/net-wireless/kismet-ubertooth/kismet-ubertooth-2012.10.1-r2.ebuild
deleted file mode 100644
index a235d304b76f..000000000000
--- a/net-wireless/kismet-ubertooth/kismet-ubertooth-2012.10.1-r2.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit multilib
-
-MY_PV=${PV/\./-}
-MY_PV=${MY_PV/./-R}
-S="${WORKDIR}/ubertooth-${MY_PV}"
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="git://ubertooth.git.sourceforge.net/gitroot/ubertooth/ubertooth"
-	SRC_URI=""
-	inherit git-2
-	KEYWORDS=""
-else
-	SRC_URI="mirror://sourceforge/ubertooth/ubertooth-${MY_PV}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-DESCRIPTION="Provides basic bluetooth support in kismet"
-HOMEPAGE="http://ubertooth.sourceforge.net/"
-
-LICENSE="GPL-2"
-SLOT="0/${PV}"
-IUSE=""
-
-DEPEND=">=net-wireless/kismet-2011.03.2-r1:= \
-	>=net-wireless/ubertooth-${PV}:= \
-	>=net-libs/libbtbb-${PV}:= \
-	virtual/libusb:1"
-RDEPEND="${DEPEND}"
-
-src_compile() {
-	if has_version =net-wireless/kismet-9999; then
-		cd "${S}/host/kismet/plugin-ubertooth-phyneutral" || die
-	else
-		cd "${S}/host/kismet/plugin-ubertooth" || die
-	fi
-	emake KIS_SRC_DIR="/usr/include/kismet/"
-}
-
-src_install() {
-	if has_version =net-wireless/kismet-9999; then
-		cd "${S}/host/kismet/plugin-ubertooth-phyneutral" || die
-	else
-		cd "${S}/host/kismet/plugin-ubertooth" || die
-	fi
-	emake DESTDIR="${ED}" LIBDIR="/$(get_libdir)" KIS_SRC_DIR="/usr/include/kismet/" install
-}
-
-pkg_postinst() {
-	ewarn "This package must be rebuilt every time kismet is rebuilt. Or else."
-}
diff --git a/net-wireless/kismet-ubertooth/kismet-ubertooth-2012.10.1.ebuild b/net-wireless/kismet-ubertooth/kismet-ubertooth-2012.10.1.ebuild
deleted file mode 100644
index 4f6aa61d7e6d..000000000000
--- a/net-wireless/kismet-ubertooth/kismet-ubertooth-2012.10.1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-
-inherit multilib
-
-MY_PV=${PV/\./-}
-MY_PV=${MY_PV/./-R}
-S="${WORKDIR}/ubertooth-${MY_PV}"
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="git://ubertooth.git.sourceforge.net/gitroot/ubertooth/ubertooth"
-	SRC_URI=""
-	inherit git-2
-	KEYWORDS=""
-else
-	SRC_URI="mirror://sourceforge/ubertooth/ubertooth-${MY_PV}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-DESCRIPTION="Provides basic bluetooth support in kismet"
-HOMEPAGE="http://ubertooth.sourceforge.net/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND=">=net-wireless/kismet-2011.03.2-r1 \
-	>=net-wireless/ubertooth-${PV} \
-	>=net-libs/libbtbb-${PV} \
-	virtual/libusb:1"
-RDEPEND="${DEPEND}"
-
-src_compile() {
-	if has_version =net-wireless/kismet-9999; then
-		cd "${S}/host/kismet/plugin-ubertooth-phyneutral" || die
-	else
-		cd "${S}/host/kismet/plugin-ubertooth" || die
-	fi
-	emake KIS_SRC_DIR="/usr/include/kismet/"
-}
-
-src_install() {
-	if has_version =net-wireless/kismet-9999; then
-		cd "${S}/host/kismet/plugin-ubertooth-phyneutral" || die
-	else
-		cd "${S}/host/kismet/plugin-ubertooth" || die
-	fi
-	emake DESTDIR="${ED}" LIBDIR="/$(get_libdir)" KIS_SRC_DIR="/usr/include/kismet/" install
-}
-
-pkg_postinst() {
-	ewarn "This package must be rebuilt every time kismet is rebuilt. Or else."
-}
diff --git a/net-wireless/kismet-ubertooth/kismet-ubertooth-2014.04.1.ebuild b/net-wireless/kismet-ubertooth/kismet-ubertooth-2014.04.1.ebuild
deleted file mode 100644
index 1fd89429ed73..000000000000
--- a/net-wireless/kismet-ubertooth/kismet-ubertooth-2014.04.1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit multilib
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/greatscottgadgets/ubertooth.git"
-	inherit git-r3
-	KEYWORDS=""
-else
-	MY_PV=${PV/\./-}
-	MY_PV=${MY_PV/./-R}
-	S="${WORKDIR}/ubertooth-${MY_PV}"
-	SRC_URI="https://github.com/greatscottgadgets/ubertooth/releases/download/${MY_PV}/ubertooth-${MY_PV}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-DESCRIPTION="Provides basic bluetooth support in kismet"
-HOMEPAGE="http://ubertooth.sourceforge.net/"
-
-LICENSE="GPL-2"
-SLOT="0/${PV}"
-IUSE=""
-
-DEPEND=">=net-wireless/kismet-2011.03.2-r1:= \
-	>=net-wireless/ubertooth-2012.02.2:= \
-	>=net-libs/libbtbb-2012.02.2:= \
-	virtual/libusb:1"
-RDEPEND="${DEPEND}"
-
-src_compile() {
-	if has_version =net-wireless/kismet-9999; then
-		cd "${S}/host/kismet/plugin-ubertooth-phyneutral" || die
-	else
-		cd "${S}/host/kismet/plugin-ubertooth" || die
-	fi
-	emake KIS_SRC_DIR="/usr/include/kismet/"
-}
-
-src_install() {
-	if has_version =net-wireless/kismet-9999; then
-		cd "${S}/host/kismet/plugin-ubertooth-phyneutral" || die
-	else
-		cd "${S}/host/kismet/plugin-ubertooth" || die
-	fi
-	emake DESTDIR="${ED}" LIBDIR="/$(get_libdir)" KIS_SRC_DIR="/usr/include/kismet/" install
-}
-
-pkg_postinst() {
-	ewarn "This package must be rebuilt every time kismet is rebuilt. Or else."
-}
diff --git a/net-wireless/kismet-ubertooth/kismet-ubertooth-2015.09.2.ebuild b/net-wireless/kismet-ubertooth/kismet-ubertooth-2015.09.2.ebuild
new file mode 100644
index 000000000000..3c32ca25ce9a
--- /dev/null
+++ b/net-wireless/kismet-ubertooth/kismet-ubertooth-2015.09.2.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit multilib
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/greatscottgadgets/ubertooth.git"
+	inherit git-r3
+	KEYWORDS=""
+else
+	MY_PV=${PV/\./-}
+	MY_PV=${MY_PV/./-R}
+	S="${WORKDIR}/ubertooth-${MY_PV}"
+	SRC_URI="https://github.com/greatscottgadgets/ubertooth/releases/download/${MY_PV}/ubertooth-${MY_PV}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~x86"
+fi
+
+DESCRIPTION="Provides basic bluetooth support in kismet"
+HOMEPAGE="http://ubertooth.sourceforge.net/"
+
+LICENSE="GPL-2"
+SLOT="0/${PV}"
+IUSE=""
+
+DEPEND=">=net-wireless/kismet-2011.03.2-r1:= \
+	>=net-wireless/ubertooth-${PV}:= \
+	>=net-libs/libbtbb-${PV}:= \
+	virtual/libusb:1"
+RDEPEND="${DEPEND}"
+
+src_compile() {
+	if has_version =net-wireless/kismet-9999; then
+		cd "${S}/host/kismet/plugin-ubertooth-phyneutral" || die
+	else
+		cd "${S}/host/kismet/plugin-ubertooth" || die
+	fi
+	emake KIS_SRC_DIR="/usr/include/kismet/"
+}
+
+src_install() {
+	if has_version =net-wireless/kismet-9999; then
+		cd "${S}/host/kismet/plugin-ubertooth-phyneutral" || die
+	else
+		cd "${S}/host/kismet/plugin-ubertooth" || die
+	fi
+	emake DESTDIR="${ED}" LIBDIR="/$(get_libdir)" KIS_SRC_DIR="/usr/include/kismet/" install
+}
+
+pkg_postinst() {
+	ewarn "This package must be rebuilt every time kismet is rebuilt. Or else."
+}
diff --git a/net-wireless/kismet-ubertooth/kismet-ubertooth-9999.ebuild b/net-wireless/kismet-ubertooth/kismet-ubertooth-9999.ebuild
index af994f8b58e2..3c32ca25ce9a 100644
--- a/net-wireless/kismet-ubertooth/kismet-ubertooth-9999.ebuild
+++ b/net-wireless/kismet-ubertooth/kismet-ubertooth-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
diff --git a/net-wireless/lorcon/Manifest b/net-wireless/lorcon/Manifest
index 4583bee8ed57..168dbda44818 100644
--- a/net-wireless/lorcon/Manifest
+++ b/net-wireless/lorcon/Manifest
@@ -1,2 +1 @@
-DIST lorcon-0.0_p20130212.tar.xz 956024 SHA256 1266bbd53e483456aca3031a49ea47fe3bd004e3e109b86a61672c881801742b SHA512 d7c33d9e8b5678e0b8b9513b6a132ab1b13045503e884d077474745a4a9731fa609ba8dc9c35f344ad93b65eb0ddc038919a6349d32187b6c6c92a020155b34f WHIRLPOOL b5e6af7977fd742b34a0f394eb443cc1aca95f9c44177b7353e8a19e1593bca4ccf7e72cf1fc2f05eb4fc5d77303bb162440462957fcc37a7f8a69443f1f4df5
 DIST lorcon-0.0_p20150109.tar.xz 259788 SHA256 a853b9bf3f9eb4a8950b3428121fe637eab274f5f0fe2aca0a5c988127c709f4 SHA512 acbd88477317475ca8555d579a1483ea5e5d9eac0f86ef7bde2592e007025070ca56c6cd43e814560e28165ac7b40bd86f2703a466faeca1619b8373dc2b625b WHIRLPOOL 54e50e1e2fb5537779dde8ce264c55663dbe3615ae1276e3c6f9c6379b3dc5d6f1dd1ed22fe51628abefc0ac94f30ed7bf1157da71edab2d53b849d07b8dfbf6
diff --git a/net-wireless/lorcon/lorcon-0.0_p20130212-r1.ebuild b/net-wireless/lorcon/lorcon-0.0_p20130212-r1.ebuild
deleted file mode 100644
index 67a50d41acf7..000000000000
--- a/net-wireless/lorcon/lorcon-0.0_p20130212-r1.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-DISTUTILS_OPTIONAL=1
-
-USE_RUBY="ruby19"
-RUBY_OPTIONAL=yes
-
-inherit distutils-r1 ruby-ng
-
-DESCRIPTION="A generic library for injecting 802.11 frames"
-HOMEPAGE="http://802.11ninja.net/lorcon"
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://code.google.com/p/lorcon/"
-	inherit git-r3
-	KEYWORDS=""
-else
-	SRC_URI="https://dev.gentoo.org/~zerochaos/distfiles/${P}.tar.xz"
-	KEYWORDS="amd64 arm ppc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="python ruby"
-
-DEPEND="ruby? ( $(ruby_implementations_depend) )
-	python? ( ${PYTHON_DEPS} )
-	dev-libs/libnl
-	net-libs/libpcap"
-RDEPEND="${DEPEND}"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-S="${WORKDIR}"/${P}
-
-pkg_setup() {
-	use ruby && ruby-ng_pkg_setup
-}
-
-src_unpack() {
-	if [[ ${PV} == "9999" ]] ; then
-		git-r3_src_unpack
-		cp -R "${S}/" "${WORKDIR}/all"
-	fi
-	default_src_unpack
-	#ruby-ng_src_unpack doesn't seem to like mixing with git so we just copy things above
-	use ruby && ruby-ng_src_unpack
-}
-
-src_prepare() {
-	sed -i 's#<lorcon2/lorcon.h>#"../lorcon.h"#' pylorcon2/PyLorcon2.c
-	sed -i 's#find_library("orcon2", "lorcon_list_drivers", "lorcon2/lorcon.h") and ##' ruby-lorcon/extconf.rb
-	sed -i 's#<lorcon2/lorcon.h>#"../lorcon.h"#' ruby-lorcon/Lorcon2.h
-	use python && distutils-r1_src_prepare
-	use ruby && ruby-ng_src_prepare
-}
-
-src_configure() {
-	default_src_configure
-}
-
-src_compile() {
-	default_src_compile
-	use ruby && ruby-ng_src_compile
-	if use python; then
-		LDFLAGS+=" -L${S}/.libs/"
-		cd pylorcon2 || die
-		distutils-r1_src_compile
-	fi
-}
-
-src_install() {
-	emake DESTDIR="${ED}" install
-	use ruby && ruby-ng_src_install
-	if use python; then
-		cd pylorcon2 || die
-		distutils-r1_src_install
-	fi
-}
-
-src_test() {
-	:
-}
-
-each_ruby_compile() {
-	sed -i "s#-I/usr/include/lorcon2#-I${WORKDIR}/${P}/ruby-lorcon -L${WORKDIR}/${P}/.libs#" ruby-lorcon/extconf.rb
-	"${RUBY}" -C ruby-lorcon extconf.rb || die
-	sed -i 's#<lorcon2/lorcon.h>#"../lorcon.h"#' ruby-lorcon/Lorcon2.h
-	sed -i "s#-L\.#-L. -L${WORKDIR}/${P}/.libs -lorcon2 #g" ruby-lorcon/Makefile || die
-	emake -C ruby-lorcon
-}
-
-each_ruby_install() {
-	DESTDIR="${ED}" emake -C ruby-lorcon install
-}
diff --git a/net-wireless/lorcon/lorcon-0.0_p20150109.ebuild b/net-wireless/lorcon/lorcon-0.0_p20150109.ebuild
index 23c69114b360..145199d411fc 100644
--- a/net-wireless/lorcon/lorcon-0.0_p20150109.ebuild
+++ b/net-wireless/lorcon/lorcon-0.0_p20150109.ebuild
@@ -21,7 +21,7 @@ if [[ ${PV} == "9999" ]] ; then
 	KEYWORDS=""
 else
 	SRC_URI="https://dev.gentoo.org/~zerochaos/distfiles/${P}.tar.xz"
-	KEYWORDS="amd64 arm ~ppc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+	KEYWORDS="amd64 arm ppc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="GPL-2"
diff --git a/net-wireless/mfoc/metadata.xml b/net-wireless/mfoc/metadata.xml
index bfcb6974f1c4..1fb5c16ace5d 100644
--- a/net-wireless/mfoc/metadata.xml
+++ b/net-wireless/mfoc/metadata.xml
@@ -5,4 +5,7 @@
 		<email>mrueg@gentoo.org</email>
 		<name>Manuel Rüger</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">nfc-tools/mfoc</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/net-wireless/portapack-firmware/Manifest b/net-wireless/portapack-firmware/Manifest
index 8413aa9a22dc..e8d121008cfe 100644
--- a/net-wireless/portapack-firmware/Manifest
+++ b/net-wireless/portapack-firmware/Manifest
@@ -1 +1 @@
-DIST portapack-h1-firmware-20150722.tar.bz2 86962 SHA256 9692b9a4b3cc1fa1ed5192b594c21ef1fd14e0b7a3d9a61086e4660b14dd4698 SHA512 b5647f8ad5d954d91e087ce281585b0e9d5c0ba459fb16068ac93adfa130a50df0b3ac7111c742ac33bb9df5ab4fb30da55a265504e0c55e9b80726fd51da6c8 WHIRLPOOL 2c9c77b65678f06b083ca5f815b335f101facc64c96dd3d9cad2629f5969881a4ba6964b00696033621ae76a6b8c2db62198f1c8f0c9d23de90c45cf3e6aa82d
+DIST portapack-h1-firmware-20150904.tar.bz2 96233 SHA256 25d6f44e6afcf4284316cb04702ea24ab528b33e4c780f9a57f067365f391df2 SHA512 0b7633a422b4311f5c7b66d88498b8f33a8f3bd1e0f23d18b5ba59fc901798b8d3c65b039c98bdaa428692b5ed00b5275de34a30ea72825a766cbb8fe84c2a7b WHIRLPOOL 1a816707cbe3d91d8dff8a51b1838999b2de485c425555183a3caea8f760a059e813ce0d734e7c6e41a599b974ec1702766ca10d5a78caeab11ff90791c1e101
diff --git a/net-wireless/portapack-firmware/portapack-firmware-20150722.ebuild b/net-wireless/portapack-firmware/portapack-firmware-20150722.ebuild
deleted file mode 100644
index 1f9450476754..000000000000
--- a/net-wireless/portapack-firmware/portapack-firmware-20150722.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-DESCRIPTION="Firmware and scripts for controlling the Portapack from Sharebrained"
-HOMEPAGE="https://github.com/sharebrained/portapack-hackrf/releases"
-SRC_URI="https://github.com/sharebrained/portapack-hackrf/releases/download/20150722/portapack-h1-firmware-${PV}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-PDEPEND=">=net-wireless/hackrf-tools-2015.07.2-r1
-	=app-mobilephone/dfu-util-0.7"
-
-S="${WORKDIR}"
-
-src_install() {
-	insinto /usr/share/hackrf
-	newins portapack-h1-firmware.bin portapack-h1-firmware-${PV}.bin
-	ln -s portapack-h1-firmware-${PV}.bin "${ED}/usr/share/hackrf/portapack-h1-firmware.bin"
-
-	cat << EOF > switch_to_portapack
-#!/bin/sh
-printf "Hold down the HackRF's DFU button (the button closest to the antenna jack)\n"
-printf "then plug the HackRF into a USB port on your computer.\n"
-printf "After the HackRF is plugged in, you may release the DFU button.\n"
-printf "Press any key to continue or ^c to abort\n"
-read
-dfu-util --device 1fc9:000c --download /usr/share/hackrf/hackrf_one_usb_ram.dfu --reset
-sleep 2s
-hackrf_spiflash -w /usr/share/hackrf/portapack-h1-firmware.bin
-EOF
-	dobin switch_to_portapack
-	cat << EOF > switch_to_hackrf
-#!/bin/sh
-printf "Hold down the HackRF's DFU button (the button closest to the antenna jack)\n"
-printf "then plug the HackRF into a USB port on your computer.\n"
-printf "After the HackRF is plugged in, you may release the DFU button.\n"
-printf "Press any key to continue or ^c to abort\n"
-read
-dfu-util --device 1fc9:000c --download /usr/share/hackrf/hackrf_one_usb_ram.dfu --reset
-sleep 2s
-hackrf_spiflash -w /usr/share/hackrf/hackrf_one_usb_rom_to_ram.bin
-EOF
-	dobin switch_to_hackrf
-}
diff --git a/net-wireless/portapack-firmware/portapack-firmware-20150904.ebuild b/net-wireless/portapack-firmware/portapack-firmware-20150904.ebuild
new file mode 100644
index 000000000000..c27cf8634a30
--- /dev/null
+++ b/net-wireless/portapack-firmware/portapack-firmware-20150904.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+DESCRIPTION="Firmware and scripts for controlling the Portapack from Sharebrained"
+HOMEPAGE="https://github.com/sharebrained/portapack-hackrf/releases"
+SRC_URI="https://github.com/sharebrained/portapack-hackrf/releases/download/${PV}/portapack-h1-firmware-${PV}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+PDEPEND=">=net-wireless/hackrf-tools-2015.07.2-r1
+	=app-mobilephone/dfu-util-0.7"
+
+S="${WORKDIR}"
+
+src_install() {
+	insinto /usr/share/hackrf
+	newins portapack-h1-firmware.bin portapack-h1-firmware-${PV}.bin
+	ln -s portapack-h1-firmware-${PV}.bin "${ED}/usr/share/hackrf/portapack-h1-firmware.bin"
+
+	cat << EOF > switch_to_portapack
+#!/bin/sh
+printf "Hold down the HackRF's DFU button (the button closest to the antenna jack)\n"
+printf "then plug the HackRF into a USB port on your computer.\n"
+printf "After the HackRF is plugged in, you may release the DFU button.\n"
+printf "Press any key to continue or ^c to abort\n"
+read
+dfu-util --device 1fc9:000c --download /usr/share/hackrf/hackrf_one_usb_ram.dfu --reset
+sleep 2s
+hackrf_spiflash -w /usr/share/hackrf/portapack-h1-firmware.bin
+EOF
+	dobin switch_to_portapack
+	cat << EOF > switch_to_hackrf
+#!/bin/sh
+printf "Hold down the HackRF's DFU button (the button closest to the antenna jack)\n"
+printf "then plug the HackRF into a USB port on your computer.\n"
+printf "After the HackRF is plugged in, you may release the DFU button.\n"
+printf "Press any key to continue or ^c to abort\n"
+read
+dfu-util --device 1fc9:000c --download /usr/share/hackrf/hackrf_one_usb_ram.dfu --reset
+sleep 2s
+hackrf_spiflash -w /usr/share/hackrf/hackrf_one_usb_rom_to_ram.bin
+EOF
+	dobin switch_to_hackrf
+}
diff --git a/net-wireless/ubertooth/Manifest b/net-wireless/ubertooth/Manifest
index 2f20f68116a5..0c78e62c2b3c 100644
--- a/net-wireless/ubertooth/Manifest
+++ b/net-wireless/ubertooth/Manifest
@@ -1,2 +1,2 @@
-DIST ubertooth-2014-04-R1.tar.xz 1762456 SHA256 0881b4bde755acea557851852bc830c100986801148ac1fcaf8ca898623edfaa SHA512 9cc415c7e7f4ce40703e7dcf916e8942325902ab3af470fb959de6bbe047a824ad62b41a09e95ead5a74a961674d2dd4d30e582db21e2ba47f648eb99462bf4a WHIRLPOOL 6c01402ebf004e782bbe4ad891c3b8ebee0040a5bfb6fcdeb2939a105646157b1786b90772a502b92e26a356a5674bafd6960ce83e3f81db819dd5575e6fc444
-DIST ubertooth-r534.tar.gz 2959832 SHA256 5e227872ee8c088fe2cdac936c4a30d1e12b8f7c6ac781c96004ad7528b44730 SHA512 b3e150b8f8a4335f65fd8b7b629316eae08cf0560269991af6632d48e360f17dd98742da975df33852760140cd5f4571f72f36d973fa5e6d8df47932561acfa6 WHIRLPOOL 7d7ea0db033b34cbf16f963ea42d05db9bf8f82f41d5d26dd6510a95ffe339dae3fef54f5cef5d71bfedb1e05531bf33998cbcabe88af611feeaecf1e22a7b10
+DIST ubertooth-2015-09-R2.tar.xz 1706712 SHA256 f2088c8c0e754df47dd8dbf604d5822bf5894b91e4505276c6f9e26b6a23b56d SHA512 240f6d682fe0addc05bb8ccf7eec931534449adfa9c1369b484aeac73d9bcaf75c211aeede21c6c219e363773ce3d63e4aa0ee6b662acc83409587bd7ac7e4da WHIRLPOOL 9fba78d1740efd342f3892ffc3cf914d1919ef1c7d282786a64afb72d6ed306dec3600363e3f85f2f70d9ccfba6b62f826a72942cb7c9316d151dd2718f79b09
+DIST ubertooth_one_rx_only.dfu 32060 SHA256 fefc034ff19fa8b4b307d77c875bfeaa639e2aa0ecf8b8337e6424618480b1b5 SHA512 daeaeae90cb2aa591db2787466cbdc7365ce4e74ce5f7af4f61c9c1a22af93e846ea9230acca64f88a85a959d0db447b19da4dc4d213601db8dd1ad3d9978fa7 WHIRLPOOL 3069bf540c87d317e4f612b25ef4af10c3a9197ec9ead69082021442e0cc70d4b381488ba4bd509f75535a43f8f7b5fcebae313b96623513de846edb51cf63a0
diff --git a/net-wireless/ubertooth/metadata.xml b/net-wireless/ubertooth/metadata.xml
index 72fad34aa230..817cab78f2ca 100644
--- a/net-wireless/ubertooth/metadata.xml
+++ b/net-wireless/ubertooth/metadata.xml
@@ -9,10 +9,8 @@
 	</longdescription>
 	<use>
 		<flag name="bluez">use bluez to support clock following and scanning</flag>
-		<flag name="dfu">Install ubertooth-dfu (needed for read/write of firmware)</flag>
 		<flag name="pcap">Use libpcap for packet capture and read/write</flag>
 		<flag name="specan">Enable the ubertooth spectrum analyzer</flag>
-		<flag name="ubertooth0-firmware">Build/install ubertooth0-firmware</flag>
 		<flag name="ubertooth1-firmware">Build/install ubertooth1-firmware</flag>
 	</use>
 	<upstream>
diff --git a/net-wireless/ubertooth/ubertooth-0.0_p534.ebuild b/net-wireless/ubertooth/ubertooth-0.0_p534.ebuild
deleted file mode 100644
index a9d2161179b5..000000000000
--- a/net-wireless/ubertooth/ubertooth-0.0_p534.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-
-inherit multilib #flag-o-matic
-
-HOMEPAGE="http://ubertooth.sourceforge.net/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+dfu +specan ubertooth0-firmware +ubertooth1-firmware"
-REQUIRED_USE="ubertooth0-firmware? ( dfu )
-		ubertooth1-firmware? ( dfu )"
-DEPEND=""
-RDEPEND="specan? ( virtual/libusb:1 )
-	dfu? ( virtual/libusb:1 )
-	specan? ( >=dev-qt/qtgui-4.7.2:4
-	>=dev-python/pyside-1.0.2
-	>=dev-python/numpy-1.3 )
-	specan? ( >=dev-python/pyusb-1.0.0_alpha1 )
-	dfu? ( >=dev-python/pyusb-1.0.0_alpha1 )"
-
-if [[ ${PV} == "9999" ]] ; then
-	ESVN_REPO_URI="https://ubertooth.svn.sourceforge.net/svnroot/ubertooth/trunk/"
-	SRC_URI=""
-	inherit subversion
-	KEYWORDS=""
-	DEPEND="=net-libs/libbtbb-9999"
-	RDEPEND="${RDEPEND}
-		=net-libs/libbtbb-9999
-		ubertooth0-firmware? ( sys-devel/gcc-arm-embedded-bin )
-		ubertooth1-firmware? ( sys-devel/gcc-arm-embedded-bin )"
-else
-	MY_PV="${PV/p/r}"
-	MY_PV="${MY_PV/0.0_/}"
-	SRC_URI="mirror://sourceforge/${PN}/${PN}-${MY_PV}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-	S="${WORKDIR}/${PN}-${MY_PV}/"
-	DEPEND=">=net-libs/libbtbb-0.8"
-	RDEPEND="${RDEPEND}
-		>=net-libs/libbtbb-0.8"
-fi
-DESCRIPTION="An open source wireless development platform suitable for Bluetooth experimentation"
-
-src_compile() {
-	#sometimes needed to build, remove when a release is made after r534 if not needed
-	#filter-ldflags -Wl,--as-needed
-	cd "${S}/host/bluetooth_rxtx" || die
-	emake
-
-	if [[ ${PV} == "9999" ]] ; then
-		cd "${S}"/firmware/bluetooth_rxtx || die
-		if use ubertooth0-firmware; then
-			SVN_REV_NUM="-D'SVN_REV_NUM'=${ESVN_WC_REVISION}" DFU_TOOL=/usr/bin/ubertooth-dfu BOARD=UBERTOOTH_ZERO emake -j1
-			mv bluetooth_rxtx.bin bluetooth_rxtx_U0.bin || die
-			emake clean
-		fi
-		if use ubertooth1-firmware; then
-			SVN_REV_NUM="-D'SVN_REV_NUM'=${ESVN_WC_REVISION}" DFU_TOOL=/usr/bin/ubertooth-dfu emake -j1
-			mv bluetooth_rxtx.bin bluetooth_rxtx_U1.bin || die
-		fi
-	fi
-}
-
-src_install() {
-	cd host || die
-	dobin bluetooth_rxtx/ubertooth-dump bluetooth_rxtx/ubertooth-lap \
-		bluetooth_rxtx/ubertooth-btle bluetooth_rxtx/ubertooth-uap \
-		bluetooth_rxtx/ubertooth-hop bluetooth_rxtx/ubertooth-util
-
-	use specan && dobin bluetooth_rxtx/ubertooth-specan specan_ui/specan.py specan_ui/ubertooth-specan-ui
-
-	use dfu && dobin usb_dfu/ubertooth-dfu usb_dfu/dfu_suffix.py
-
-	insinto /lib/firmware
-	cd "${S}"
-	if [[ ${PV} == "9999" ]] ; then
-		use ubertooth0-firmware && doins firmware/bluetooth_rxtx/bluetooth_rxtx_U0.bin
-	        use ubertooth1-firmware && doins firmware/bluetooth_rxtx/bluetooth_rxtx_U1.bin
-	else
-		use ubertooth0-firmware && newins ubertooth-zero-firmware-bin/bluetooth_rxtx.bin bluetooth_rxtx_U0.bin
-	        use ubertooth1-firmware && newins ubertooth-one-firmware-bin/bluetooth_rxtx.bin bluetooth_rxtx_U1.bin
-	fi
-
-	insinto /lib/udev/rules.d/
-	doins "${FILESDIR}"/40-ubertooth.rules
-
-	elog "Everyone can read from the ubertooth, but to talk to it"
-	elog "your user needs to be in the usb group."
-}
diff --git a/net-wireless/ubertooth/ubertooth-2014.04.1-r1.ebuild b/net-wireless/ubertooth/ubertooth-2014.04.1-r1.ebuild
deleted file mode 100644
index c005f55d080d..000000000000
--- a/net-wireless/ubertooth/ubertooth-2014.04.1-r1.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-PYTHON_DEPEND="python? 2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.*"
-
-inherit multilib distutils cmake-utils
-
-HOMEPAGE="http://ubertooth.sourceforge.net/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+bluez +dfu +specan +python +ubertooth1-firmware +udev"
-REQUIRED_USE="dfu? ( python )
-		specan? ( python )
-		ubertooth1-firmware? ( dfu )
-		python? ( || ( dfu specan ) )"
-DEPEND="bluez? ( net-wireless/bluez:= )
-	>=net-libs/libbtbb-2014.02.2:=
-	net-libs/libpcap:="
-RDEPEND="${DEPEND}
-	specan? ( virtual/libusb:1
-		 >=dev-qt/qtgui-4.7.2:4
-		>=dev-python/pyside-1.0.2
-		>=dev-python/numpy-1.3
-		>=dev-python/pyusb-1.0.0_alpha1 )
-	dfu? ( virtual/libusb:1
-		>=dev-python/pyusb-1.0.0_alpha1 )
-	udev? ( virtual/udev )"
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/greatscottgadgets/ubertooth.git"
-	inherit git-r3
-	KEYWORDS=""
-	S="${WORKDIR}/${P}/host"
-else
-	MY_PV=${PV/\./-}
-	MY_PV=${MY_PV/./-R}
-	S="${WORKDIR}/${PN}-${MY_PV}/host"
-	SRC_URI="https://github.com/greatscottgadgets/${PN}/releases/download/${MY_PV}/${PN}-${MY_PV}.tar.xz"
-	#re-add arm keyword after making a lib-only target
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-DESCRIPTION="An open source wireless development platform suitable for Bluetooth experimentation"
-
-#readd firmware building, but do it right
-#USE="-fortran -mudflap -nls -openmp -multilib" crossdev --without-headers --genv 'EXTRA_ECONF="--with-mode=thumb --with-cpu=cortex-m3 --with-float=soft"' -s4 -t arm-cortexm3-eabi
-
-pkg_setup() {
-	if use python; then
-		python_pkg_setup;
-		DISTUTILS_SETUP_FILES=()
-		if use dfu; then
-			DISTUTILS_SETUP_FILES+=("${S}/python/usb_dfu|setup.py")
-			PYTHON_MODNAME="dfu"
-		fi
-		if use specan; then
-			DISTUTILS_SETUP_FILES+=("${S}/python/specan_ui|setup.py")
-			PYTHON_MODNAME+=" specan"
-		fi
-	fi
-}
-
-src_prepare() {
-	cmake-utils_src_prepare
-	use python && distutils_src_prepare
-}
-
-src_configure() {
-	mycmakeargs=(
-		$(cmake-utils_use_enable bluez USE_BLUEZ)
-		-DDISABLE_PYTHON=true
-	)
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-
-	use python && distutils_src_compile
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	insinto /usr/share/${PN}
-	cd "${WORKDIR}/${PN}-${MY_PV}" || die
-	if [[ ${PV} == "9999" ]] ; then
-		ewarn "Firmware isn't available for git releases, we assume you are already"
-		ewarn "on the latest and/or can build your own."
-	else
-	        use ubertooth1-firmware && newins ubertooth-one-firmware-bin/bluetooth_rxtx.dfu ${PN}-one-${PV}-bluetooth_rxtx.dfu
-	fi
-
-	if use udev; then
-		insinto /lib/udev/rules.d/
-		doins "${S}"/lib${PN}/40-${PN}.rules
-	fi
-
-	use python && distutils_src_install
-
-	elog "Everyone can read from the ubertooth, but to talk to it"
-	elog "your user needs to be in the usb group."
-}
-
-pkg_postinst() {
-	use python && distutils_pkg_postinst
-}
-
-pkg_postrm() {
-	use python && distutils_pkg_postrm
-}
diff --git a/net-wireless/ubertooth/ubertooth-2015.09.2.ebuild b/net-wireless/ubertooth/ubertooth-2015.09.2.ebuild
new file mode 100644
index 000000000000..efbfbb07c093
--- /dev/null
+++ b/net-wireless/ubertooth/ubertooth-2015.09.2.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+PYTHON_COMPAT=( python2_7 )
+DISTUTILS_OPTIONAL=1
+
+inherit multilib distutils-r1 cmake-utils udev
+
+HOMEPAGE="http://ubertooth.sourceforge.net/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="+bluez +specan +pcap +ubertooth1-firmware +udev"
+REQUIRED_USE="	specan? ( ${PYTHON_REQUIRED_USE} )"
+DEPEND="bluez? ( net-wireless/bluez:= )
+	>=net-libs/libbtbb-${PV}:=
+	pcap? ( net-libs/libbtbb[pcap] )
+	specan? ( ${PYTHON_DEPS} )
+	virtual/libusb:1="
+RDEPEND="${DEPEND}
+	specan? ( >=dev-qt/qtgui-4.7.2:4
+		>=dev-python/pyside-1.0.2[${PYTHON_USEDEP}]
+		>=dev-python/numpy-1.3[${PYTHON_USEDEP}] )
+	udev? ( virtual/udev )"
+
+MY_PV=${PV/\./-}
+MY_PV=${MY_PV/./-R}
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/greatscottgadgets/ubertooth.git"
+	inherit git-r3
+	KEYWORDS=""
+	S="${WORKDIR}/${P}/host"
+else
+	S="${WORKDIR}/${PN}-${MY_PV}/host"
+	SRC_URI="https://github.com/greatscottgadgets/${PN}/releases/download/${MY_PV}/${PN}-${MY_PV}.tar.xz
+		https://github.com/greatscottgadgets/${PN}/releases/download/${MY_PV}/${PN}_one_rx_only.dfu"
+	KEYWORDS="~amd64 ~arm ~x86"
+fi
+DESCRIPTION="An open source wireless development platform suitable for Bluetooth experimentation"
+
+#readd firmware building, but do it right
+#USE="-fortran -mudflap -nls -openmp -multilib" crossdev --without-headers --genv 'EXTRA_ECONF="--with-mode=thumb --with-cpu=cortex-m3 --with-float=soft"' -s4 -t arm-cortexm3-eabi
+
+src_prepare() {
+	cmake-utils_src_prepare
+	if use specan; then
+		pushd python/specan_ui || die
+		distutils-r1_src_prepare
+		popd
+	fi
+}
+
+src_configure() {
+	mycmakeargs=(
+		$(cmake-utils_use_enable bluez USE_BLUEZ)
+		$(cmake-utils_use pcap USE_PCAP)
+		$(cmake-utils_use_enable udev INSTALL_UDEV_RULES)
+		-DDISABLE_PYTHON=true
+	)
+	if use udev; then
+		mycmakeargs+=(
+			-DUDEV_RULES_GROUP=usb
+			-DUDEV_RULES_PATH="$(get_udevdir)/rules.d"
+		)
+	fi
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+
+	if use specan; then
+		pushd python/specan_ui || die
+		distutils-r1_src_compile
+		popd
+	fi
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	insinto /usr/share/${PN}
+	pushd "${WORKDIR}/${PN}-${MY_PV}" || die
+	if [[ ${PV} == "9999" ]] ; then
+		ewarn "Firmware isn't available for git releases, we assume you are already"
+		ewarn "on the latest and/or can build your own."
+	else
+	        use ubertooth1-firmware && newins ubertooth-one-firmware-bin/bluetooth_rxtx.dfu ${PN}-one-${PV}-bluetooth_rxtx.dfu
+	        use ubertooth1-firmware && newins "${DISTDIR}"/${PN}_one_rx_only.dfu ${PN}-one-${PV}-bluetooth_rx_only.dfu
+	fi
+	popd
+
+	if use specan; then
+		pushd python/specan_ui || die
+		distutils-r1_src_install
+		popd
+	fi
+
+	elog "Everyone can read from the ubertooth, but to talk to it"
+	elog "your user needs to be in the usb group."
+}
diff --git a/profiles/arch/alpha/package.use.mask b/profiles/arch/alpha/package.use.mask
index ab5e688a043b..18473cc6bd3f 100644
--- a/profiles/arch/alpha/package.use.mask
+++ b/profiles/arch/alpha/package.use.mask
@@ -2,6 +2,10 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
+# Alexandre Rostovtsev <tetromino@gentoo.org> (10 Sep 2015)
+# Requires wifi USE flag, which is masked for this arch
+net-misc/networkmanager wext
+
 # Tobias Klausmann <klausman@gentoo.org> (10 Aug 2015)
 # Opting out of the net-misc/ofono dep tree until we have a user request
 >=media-sound/pulseaudio-6.0 ofono-headset
diff --git a/profiles/arch/amd64/package.use.mask b/profiles/arch/amd64/package.use.mask
index fe26c7107a7a..8e6c778c5b83 100644
--- a/profiles/arch/amd64/package.use.mask
+++ b/profiles/arch/amd64/package.use.mask
@@ -18,6 +18,10 @@
 
 #--- END OF EXAMPLES ---
 
+# Mike Gilbert <floppym@gentoo.org> (05 Sep 2015)
+# sys-boot/gnu-efi is not supported on all archs.
+sys-apps/systemd -gnuefi
+
 # James Le Cuirot <chewi@gentoo.org> (28 Jul 2015)
 # JavaFX and the browser plugin are included on x64 Linux.
 dev-java/oracle-jdk-bin -javafx -nsplugin
diff --git a/profiles/arch/ia64/package.use.mask b/profiles/arch/ia64/package.use.mask
index 3403fd3c81b3..58512a2ca3ce 100644
--- a/profiles/arch/ia64/package.use.mask
+++ b/profiles/arch/ia64/package.use.mask
@@ -2,6 +2,18 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
+# Alexandre Rostovtsev <tetromino@gentoo.org> (10 Sep 2015)
+# Requires wifi USE flag, which is masked for this arch
+net-misc/networkmanager wext
+
+# Pacho Ramos <pacho@gentoo.org> (06 Sep 2015)
+# Missing keywords
+media-sound/pulseaudio ofono-headset
+
+# Mike Gilbert <floppym@gentoo.org> (05 Sep 2015)
+# sys-boot/gnu-efi is not supported on all archs.
+sys-apps/systemd -gnuefi
+
 # James Le Cuirot <chewi@gentoo.org> (11 Jul 2015)
 # Requires dev-java/fop but we don't support java on ia64.
 gnome-extra/libgda reports
@@ -269,3 +281,7 @@ dev-lisp/clisp hyperspec pari svm
 
 # missing keywords
 media-plugins/gst-plugins-meta dts dv lame libvisual modplug mms taglib vcd wavpack
+
+# Marius Brehler <marfbre@linux.sungazer.de> (13 Aug 2015)
+# missing keyword
+>=sci-misc/boinc-7.4.42-r1 X
diff --git a/profiles/arch/mips/package.use.mask b/profiles/arch/mips/package.use.mask
index 304e96eb5a02..9697e3c14c87 100644
--- a/profiles/arch/mips/package.use.mask
+++ b/profiles/arch/mips/package.use.mask
@@ -2,6 +2,14 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
+# Mike Frysinger <vapier@gentoo.org> (10 Sep 2015)
+# Requires matplotlib which requires a bit more.
+dev-python/numpydoc test
+
+# Anthony G. Basile <blueness@gentoo.org> (10 Sep 2015)
+# # seccomp code is currently broken, bug #560098
+app-misc/pax-utils seccomp
+
 # Mikle Kolyada <zlogene@gentoo.org> (12 Apr 2015)
 # GNOME Shell does not work on mips
 net-misc/wicd gnome-shell
diff --git a/profiles/arch/powerpc/package.use.stable.mask b/profiles/arch/powerpc/package.use.stable.mask
index d6f6fe131a10..fb3dae3960ed 100644
--- a/profiles/arch/powerpc/package.use.stable.mask
+++ b/profiles/arch/powerpc/package.use.stable.mask
@@ -22,6 +22,11 @@
 # Missing stable
 dev-libs/protobuf python
 
+# Pacho Ramos <pacho@gentoo.org> (06 Sep 2015)
+# webkit-gtk is going to stay in ~all but amd64/x86
+# that are the only arches upstream is taking care
+>=x11-libs/wxGTK-3.0.2.0-r1 webkit
+
 # Justin Lecher <jlec@gentoo.org> (21 Feb 2015)
 # Needs stable GNOME-3
 net-fs/netatalk tracker
diff --git a/profiles/arch/sparc/package.use.mask b/profiles/arch/sparc/package.use.mask
index 2c81a64d755f..8f43e620def6 100644
--- a/profiles/arch/sparc/package.use.mask
+++ b/profiles/arch/sparc/package.use.mask
@@ -2,6 +2,10 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
+# Alexandre Rostovtsev <tetromino@gentoo.org> (10 Sep 2015)
+# Requires wifi USE flag, which is masked for this arch
+net-misc/networkmanager wext
+
 # Bernard Cafarelli <voyageur@gentoo.org> (06 Aug 2015)
 # Dependencies missing keywords, bug #543604
 sys-devel/llvm ocaml
@@ -321,3 +325,7 @@ net-libs/ortp srtp
 # Ultrabug <ultrabug@gentoo.org) (05 Sept 2011)
 # missing keyword for net-libs/zeromq
 app-admin/rsyslog zeromq
+
+# Marius Brehler <marfbre@linux.sungazer.de> (13 Aug 2015)
+# missing keyword
+>=sci-misc/boinc-7.4.42-r1 X
diff --git a/profiles/arch/x86/package.use.mask b/profiles/arch/x86/package.use.mask
index de513c6f6097..c668421701d7 100644
--- a/profiles/arch/x86/package.use.mask
+++ b/profiles/arch/x86/package.use.mask
@@ -4,6 +4,10 @@
 
 # This file requires >=portage-2.1.1
 
+# Mike Gilbert <floppym@gentoo.org> (05 Sep 2015)
+# sys-boot/gnu-efi is not supported on all archs.
+sys-apps/systemd -gnuefi
+
 # Michael Palimaka <kensington@gentoo.org> (12 Aug 2015)
 # Unkeyworded dependencies
 kde-frameworks/kauth policykit
@@ -33,10 +37,6 @@ net-im/telepathy-connection-managers -steam
 # >x11-drivers/nvidia-drivers-346 on x86 has no UVM support (bug #534156)
 >x11-drivers/nvidia-drivers-346 uvm
 
-# Pacho Ramos <pacho@gentoo.org> (18 Jan 2015)
-# Missing keywords
-media-plugins/gst-plugins-meta vaapi
-
 # Tim Harder <radhermit@gentoo.org> (11 Oct 2014)
 # Unmask skype support for unstable keywords
 net-im/bitlbee -skype
diff --git a/profiles/base/make.defaults b/profiles/base/make.defaults
index 4fc07e1d0f82..7343f5b1c91f 100644
--- a/profiles/base/make.defaults
+++ b/profiles/base/make.defaults
@@ -101,9 +101,9 @@ NETBEANS="apisupport cnd groovy gsf harness ide identity j2ee java mobility nb p
 # Build kernel modules from linux-mod by default:
 USE="${USE} modules"
 
-# Manuel Rüger <mrueg@gentoo.org> (16 Mar 2014)
+# Manuel Rüger <mrueg@gentoo.org> (09 Sep 2015)
 # Default Ruby build targets
-RUBY_TARGETS="ruby19 ruby20"
+RUBY_TARGETS="ruby20 ruby21"
 
 # Samuli Suominen <ssuominen@gentoo.org> (03 Dec 2009)
 # Enable USE cxx by default so base-system and toolchain pkgs can start using USE cxx
@@ -138,4 +138,4 @@ UNINSTALL_IGNORE="/lib/modules/* /var/run /var/lock"
 
 # Andreas K. Hüttel <dilfridge@gentoo.org> (23 Aug 2013)
 # Make emerge messages default to English as per Council decision
-LC_MESSAGES=C
+LC_MESSAGES="C"
diff --git a/profiles/base/package.use b/profiles/base/package.use
index 2a6aa7c576e6..127361dbac49 100644
--- a/profiles/base/package.use
+++ b/profiles/base/package.use
@@ -6,6 +6,8 @@
 # Set here proper defaults to make the packages buildable by default, 
 # bugs #555930 and #472932
 media-sound/gnome-music python_single_target_python3_4
+gnome-extra/gnome-builder python_single_target_python3_4
+media-video/pitivi python_single_target_python3_4
 
 # Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> (27 Jul 2012)
 # Modular X: Build the Xorg X server by default
diff --git a/profiles/base/package.use.force b/profiles/base/package.use.force
index 264263cf752b..9ecd214b5486 100644
--- a/profiles/base/package.use.force
+++ b/profiles/base/package.use.force
@@ -2,6 +2,10 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
+# Lars Wendler <polynomial-c@gentoo.org> (11 Sep 2015)
+# Package fails to build with dbus USE flag being disabled (bug #560208)
+=x11-wm/afterstep-2.2.12 dbus
+
 # Gilles Dartiguelongue <eva@gentoo.org> (25 May 2015)
 # webkit fails to build with USE=wayland, bug #549228
 # https://bugs.webkit.org/show_bug.cgi?id=142879
diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index 743597254b3a..2eb04c83e1ff 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -5,6 +5,20 @@
 # This file requires >=portage-2.1.1
 # New entries go on top.
 
+# Fabian Groffen <grobian@gentoo.org> (08 Sep 2015)
+# GnuTLS support is currently broken/causes hang, bug #559834
+# http://dev.mutt.org/trac/ticket/3772
+>=mail-client/mutt-1.5.23-r8 gnutls
+
+# Jason Zaman <perfinion@gentoo.org> (06 Sep 2015)
+# This is for cgmanager which is linux only.
+# Unmasked in default/linux/package.use.mask.
+sys-auth/consolekit cgroups
+
+# Mike Gilbert <floppym@gentoo.org> (05 Sep 2015)
+# sys-boot/gnu-efi is not supported on all archs.
+sys-apps/systemd gnuefi
+
 # Manuel Rüger <mrueg@gentoo.org> (03 Sep 2015)
 # Mask USE=ruby for packages that solely rely on the soon to be deprecated
 # ruby 1.9
diff --git a/profiles/base/package.use.stable.mask b/profiles/base/package.use.stable.mask
index aa3d222e9d2b..8cdc84c0f94f 100644
--- a/profiles/base/package.use.stable.mask
+++ b/profiles/base/package.use.stable.mask
@@ -83,18 +83,10 @@ media-video/mpv libcaca
 # Not yet stabilized dependencies blocking sec bug 514886
 app-office/libreoffice firebird
 
-# Mike Gilbert <floppym@gentoo.org> (30 May 2014)
-# >=net-libs/gnutls-3.1.4 is not going stable any time soon.
-sys-apps/systemd ssl
-
 # Agostino Sarubbo <ago@gentoo.org> (31 Aug 2013)
 # Clang is not stable
 app-portage/eix clang
 
-# Pacho Ramos <pacho@gentoo.org> (17 Nov 2013)
-# Still needs gnutls-3
->=net-nntp/pan-0.139 ssl
-
 # Sergey Popov <pinkbyte@gentoo.org> (28 Oct 2013)
 # sys-cluster/cman is still in ~arch.
 sys-cluster/pacemaker cman
diff --git a/profiles/default/bsd/fbsd/amd64/10.1/clang/deprecated b/profiles/default/bsd/fbsd/amd64/10.1/clang/deprecated
new file mode 100644
index 000000000000..870b9ae15ffb
--- /dev/null
+++ b/profiles/default/bsd/fbsd/amd64/10.1/clang/deprecated
@@ -0,0 +1,4 @@
+default/bsd/fbsd/amd64/clang/10.2
+Please read carefully the wiki.
+Might be your environment is broken if you do not perform the correct procedure.
+https://wiki.gentoo.org/wiki/Gentoo_FreeBSD/Upgrade_Guide
diff --git a/profiles/default/bsd/fbsd/amd64/10.1/deprecated b/profiles/default/bsd/fbsd/amd64/10.1/deprecated
new file mode 100644
index 000000000000..767501722e55
--- /dev/null
+++ b/profiles/default/bsd/fbsd/amd64/10.1/deprecated
@@ -0,0 +1,4 @@
+default/bsd/fbsd/amd64/10.2
+Please read carefully the wiki.
+Might be your environment is broken if you do not perform the correct procedure.
+https://wiki.gentoo.org/wiki/Gentoo_FreeBSD/Upgrade_Guide
diff --git a/profiles/default/bsd/fbsd/x86/10.1/deprecated b/profiles/default/bsd/fbsd/x86/10.1/deprecated
new file mode 100644
index 000000000000..ff25d03b71ca
--- /dev/null
+++ b/profiles/default/bsd/fbsd/x86/10.1/deprecated
@@ -0,0 +1,4 @@
+default/bsd/fbsd/x86/10.2
+Please read carefully the wiki.
+Might be your environment is broken if you do not perform the correct procedure.
+https://wiki.gentoo.org/wiki/Gentoo_FreeBSD/Upgrade_Guide
diff --git a/profiles/default/linux/package.use.mask b/profiles/default/linux/package.use.mask
index bcccd3d85afa..cc70abdf5c1a 100644
--- a/profiles/default/linux/package.use.mask
+++ b/profiles/default/linux/package.use.mask
@@ -2,6 +2,10 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
+# Jason Zaman <perfinion@gentoo.org> (06 Sep 2015)
+# This is masked in base/package.use.mask as Linux only.
+sys-auth/consolekit -cgroups
+
 # Michael Palimaka <kensington@gentoo.org> (03 Sep 2015)
 # Native inotify support is preferred on linux.
 app-misc/strigi fam
diff --git a/profiles/default/linux/uclibc/mips/package.use.mask b/profiles/default/linux/uclibc/mips/package.use.mask
index a8154a2af06f..e06a9432e54d 100644
--- a/profiles/default/linux/uclibc/mips/package.use.mask
+++ b/profiles/default/linux/uclibc/mips/package.use.mask
@@ -2,6 +2,10 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
+# Anthony G. Basile <blueness@gentoo.org> (10 Sep 2015)
+# # seccomp code is currently broken, bug #560098
+app-misc/pax-utils seccomp
+
 # Matthias Maier <tamiko@gentoo.org> (24 Dec 2014)
 # sys-devel/clang is not keyworded on mips.
 app-doc/doxygen clang
diff --git a/profiles/desc/qemu_softmmu_targets.desc b/profiles/desc/qemu_softmmu_targets.desc
index e473b2072785..96c635c703ee 100644
--- a/profiles/desc/qemu_softmmu_targets.desc
+++ b/profiles/desc/qemu_softmmu_targets.desc
@@ -29,6 +29,7 @@ sh4eb - system emulation target
 sh4 - system emulation target
 sparc - system emulation target
 sparc64 - system emulation target
+tricore - system emulation target
 unicore32 - system emulation target
 x86_64 - system emulation target
 xtensaeb - system emulation target
diff --git a/profiles/desc/qemu_user_targets.desc b/profiles/desc/qemu_user_targets.desc
index b4afce03ee3d..3f9efd2ac74a 100644
--- a/profiles/desc/qemu_user_targets.desc
+++ b/profiles/desc/qemu_user_targets.desc
@@ -22,9 +22,10 @@ mipsn32 - MIPS N32 ABI userspace emulation target
 mipsn32el - MIPS N32 ABI LE userspace emulation target
 mips - userspace emulation target
 or32 - OpenRISC userspace emulation target
+ppc - PowerPC 32-bit big endian userspace emulation target
+ppc64 - PowerPC 64-bit big endian userspace emulation target
 ppc64abi32 - userspace emulation target
-ppc64 - userspace emulation target
-ppc - userspace emulation target
+ppc64le - PowerPC 64-bit little endian userspace emulation target
 s390x - userspace emulation target
 sh4eb - userspace emulation target
 sh4 - userspace emulation target
diff --git a/profiles/features/selinux/package.use.mask b/profiles/features/selinux/package.use.mask
index f3d42acdfe64..6d3a8f629683 100644
--- a/profiles/features/selinux/package.use.mask
+++ b/profiles/features/selinux/package.use.mask
@@ -19,6 +19,11 @@ app-portage/diffmask python_targets_pypy python_targets_pypy3
 # Please see: https://wiki.gentoo.org/wiki/SELinux/FAQ#Can_I_use_SELinux_with_SystemD.3F
 app-emulation/libvirt firewalld
 gnome-base/gdm systemd wayland
+net-firewall/fwknop firewalld
 sys-kernel/dracut dracut_modules_systemd
 www-servers/uwsgi uwsgi_plugins_systemd_logger
 x11-wm/mutter kms
+
+# Alex Brandt <alunduil@gentoo.org> (6 Sep 2015)
+# app-emulation/rkt[rkt_stage1_src] requires systemd which isn't available with selinux.
+app-emulation/rkt rkt_stage1_src
diff --git a/profiles/hardened/linux/musl/mips/package.use.mask b/profiles/hardened/linux/musl/mips/package.use.mask
new file mode 100644
index 000000000000..a63ed49af48c
--- /dev/null
+++ b/profiles/hardened/linux/musl/mips/package.use.mask
@@ -0,0 +1,7 @@
+# Copyright 1999-2015 Gentoo Foundation.
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+# Anthony G. Basile <blueness@gentoo.org> (10 Sep 2015)
+# seccomp code is currently broken, bug #560098
+app-misc/pax-utils seccomp
diff --git a/profiles/package.mask b/profiles/package.mask
index 95df78d6cb46..3812179ee337 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -30,6 +30,24 @@
 
 #--- END OF EXAMPLES ---
 
+# Michał Górny <mgorny@gentoo.org> (09 Sep 2015)
+# Package to be used with gentoo-x86 CVS, so pretty much defunct now.
+# Removal in 30 days. Bug #560056.
+app-portage/lightweight-cvs-toolkit
+
+# Lars Wendler <polynomial-c@gentoo.org> (09 Sep 2015)
+# Masked for testing
+>=net-fs/samba-4.3.0
+
+# Pawel Hajdan, Jr. <phajdan.jr@gentoo.org> (08 Sep 2015)
+# Dev channel releases are only for people who are developers or want more
+# experimental features and accept a more unstable release.
+>=www-client/chromium-47
+
+# Rick Farina <zerochaos@gentoo.org> (04 Sep 2015)
+# Ancient, please upgrade to ~arch version
+=net-analyzer/metasploit-2.7
+
 # Michael Palimaka <kensington@gentoo.org> (01 Sep 2015)
 # Fails to build (bug #559330). Dead upstream.
 # Masked for removal in 30 days.
@@ -62,10 +80,6 @@ app-emulation/kvm-kmod
 # last version does not compile. Bug #543644
 sys-devel/dragonegg
 
-# Andreas Sturmlechner <andreas.sturmlechner@gmail.com> (24 Aug 2015)
-# Masked until >=sys-auth/consolekit-0.9.2 gets unmasked
-=x11-misc/sddm-0.11.0-r2
-
 # Matt Turner <mattst88@gentoo.org> (22 Aug 2015)
 # nouveau has been in the kernel since 2.6.33
 # Masked for removal in 30 days.
@@ -177,10 +191,6 @@ kde-base/kdepim-strigi-analyzer
 # Upcoming, too young to go into testing unmasked
 dev-libs/iniparser:4
 
-# Matthew Thode <prometheanfire@gentoo.org> (04 Aug 2015)
-# removing old and never working horizon Bug #556710
-www-apps/horizon
-
 # Mikle Kolyada <zlogene@hemtoo.org> (04 Aug 2015)
 # Unmaintained since 2010. No longer available
 # on CPAN and nothing in the tree depends on it.
@@ -198,11 +208,6 @@ sys-apps/systemd-ui
 # and fix leftovers with 'haskell-updater' run.
 dev-haskell/deepseq
 
-# Pawel Hajdan, Jr. <phajdan.jr@gentoo.org> (28 Jul 2015)
-# Dev channel releases are only for people who are developers or want more
-# experimental features and accept a more unstable release.
->=www-client/chromium-46
-
 # Davide Pesavento <pesa@gentoo.org> (23 Jul 2015)
 # Standalone version of qtwebkit from the 2.3 upstream branch.
 # Needs revdep testing. Bug #388207.
@@ -287,10 +292,6 @@ app-emulation/emul-linux-x86-soundlibs
 app-emulation/emul-linux-x86-xlibs
 app-emulation/emul-linux-x86-jna
 
-# Lars Wendler <polynomial-c@gentoo.org> (8 Mar 2015)
-# Masked for testing
->=net-fs/samba-4.2.0
-
 # Justin Lecher <jlec@gentoo.org> (28 Feb 2015)
 # Unfixed security problems
 # CVE-2015-{0219,0220,0221,0222,5145}
@@ -369,13 +370,6 @@ www-apps/trac-downloads
 # Mask latest development version for testing
 =x11-misc/lightdm-1.15*
 
-# Samuli Suominen <ssuominen@gentoo.org> (05 Nov 2014)
-# ConsoleKit2 from github by Eric Koegel, auth of xfce4-power-manager
-# The ConsoleKit in freedesktop.org git won't be continued anymore,
-# making this the new official release
-# Masked for testing
->=sys-auth/consolekit-0.9.2
-
 # Mike Pagano <mpagano@gentoo.org> (16 Oct 2014)
 # A regression in kernels 3.17.0 lead to file system corruption
 # for affected systems. This has been fixed in >= 3.17.1
@@ -785,10 +779,6 @@ media-libs/shivavg
 # not needed anymore for Asterisk 1.6.
 net-misc/asterisk-spandsp_codec_g726
 
-# Doug Goldstein <cardoe@gentoo.org> (07 Jul 2010)
-# No actual Gentoo support yet. If you're interested, please see bug #295993
-net-misc/netcf
-
 # Mike Frysinger <vapier@gentoo.org> (07 Mar 2010)
 # Very old packages that people should have upgraded away from
 # long ago.  Courtesy mask ... time to upgrade.
diff --git a/profiles/updates/3Q-2015 b/profiles/updates/3Q-2015
index 9732d931e55e..0e387a443440 100644
--- a/profiles/updates/3Q-2015
+++ b/profiles/updates/3Q-2015
@@ -14,3 +14,7 @@ slotmove ~sys-libs/ncurses-6.0 5 0
 move kde-base/baloo-widgets kde-apps/baloo-widgets
 slotmove =kde-apps/kde-base-artwork-15.08.0 5 4
 move x11-drivers/radeon-ucode sys-firmware/radeon-ucode
+move dev-python/pyDeComp dev-python/pydecomp
+slotmove =dev-ruby/packetfu-1.1.9* 0 1.1.9
+slotmove =dev-ruby/packetfu-1.1.10* 0 1.1.10
+slotmove =dev-ruby/packetfu-1.1.11* 0 1.1.11
diff --git a/sci-astronomy/casacore/metadata.xml b/sci-astronomy/casacore/metadata.xml
index 3f17c8233202..ffd9290dad47 100644
--- a/sci-astronomy/casacore/metadata.xml
+++ b/sci-astronomy/casacore/metadata.xml
@@ -1,16 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci-astronomy</herd>
-<longdescription lang="en">
+  <herd>sci-astronomy</herd>
+  <longdescription lang="en">
   A set of libraries for the the Common Astronomy Software
   Applications for radioastronomy. This project contains C++ libraries
   which were the code of the discontinued AIPS++ package.
 </longdescription>
-<upstream>
-  <remote-id type="google-code">casacore</remote-id>
-</upstream>
-<use>
-  <flag name="data">Installs measures and data (pulls <pkg>sci-astronomy/casa-data</pkg>)</flag>
-</use>
+  <upstream>
+    <remote-id type="google-code">casacore</remote-id>
+    <remote-id type="github">casacore/casacore</remote-id>
+  </upstream>
+  <use>
+    <flag name="data">Installs measures and data (pulls <pkg>sci-astronomy/casa-data</pkg>)</flag>
+  </use>
 </pkgmetadata>
diff --git a/sci-biology/beast-mcmc/metadata.xml b/sci-biology/beast-mcmc/metadata.xml
index f17a827e3101..7764bf07c826 100644
--- a/sci-biology/beast-mcmc/metadata.xml
+++ b/sci-biology/beast-mcmc/metadata.xml
@@ -2,4 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>sci-biology</herd>
+  <upstream>
+    <remote-id type="github">beast-dev/beast-mcmc</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/sci-calculators/calculator/calculator-1.7.49.ebuild b/sci-calculators/calculator/calculator-1.7.49.ebuild
index fa3b92e281d8..a383a3eb6dae 100644
--- a/sci-calculators/calculator/calculator-1.7.49.ebuild
+++ b/sci-calculators/calculator/calculator-1.7.49.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="Scientific calculator based on the FOX Toolkit"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~hppa ppc ~ppc64 ~sparc x86"
 IUSE=""
 
 RDEPEND="~x11-libs/fox-${PV}
diff --git a/sci-chemistry/pdb-tools/metadata.xml b/sci-chemistry/pdb-tools/metadata.xml
index 13e9a3c93979..0d75122ff062 100644
--- a/sci-chemistry/pdb-tools/metadata.xml
+++ b/sci-chemistry/pdb-tools/metadata.xml
@@ -7,5 +7,6 @@
   </maintainer>
   <upstream>
     <remote-id type="google-code">pdb-tools</remote-id>
+    <remote-id type="github">harmslab/pdbtools</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/sci-chemistry/probe/probe-2.13.110909.ebuild b/sci-chemistry/probe/probe-2.13.110909.ebuild
index a841b16de30f..a3954e8eba75 100644
--- a/sci-chemistry/probe/probe-2.13.110909.ebuild
+++ b/sci-chemistry/probe/probe-2.13.110909.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://kinemage.biochem.duke.edu/downloads/software/probe/${MY_P}.src.z
 
 SLOT="0"
 LICENSE="richardson"
-KEYWORDS="amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="amd64 ppc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE=""
 
 RDEPEND=""
diff --git a/sci-electronics/gsmc/Manifest b/sci-electronics/gsmc/Manifest
index 965a659f3edc..2f13dd8d0401 100644
--- a/sci-electronics/gsmc/Manifest
+++ b/sci-electronics/gsmc/Manifest
@@ -1 +1 @@
-DIST gsmc-1.1.tar.gz 122726 RMD160 80406e224b485d24fe3d0505a8cb861f39b1fa31 SHA1 781f0c51ebe041419071703b8102e56536b47418 SHA256 3cd7fa7fb8712f878229e085ac8881bd829893da31dce96c3e98118798d63fda
+DIST gsmc-1.1.tar.gz 122726 SHA256 3cd7fa7fb8712f878229e085ac8881bd829893da31dce96c3e98118798d63fda SHA512 ea9db9e4917d82e0d9fa40318a971b63443611ab91b2321115d68fa4083de1879086e5c3392607347e3222fabb9efd5f8175ebb8cd122da479fac1ce7e2d9696 WHIRLPOOL bf49b49bcd8b7dd0f4f30b5f02ae913a821c83fd66e6c45c639d597e595aa950b581fc00ba62476406192a590ef0d9693a5ffa6da97e42c9216ee45ff257b55a
diff --git a/sci-electronics/gsmc/files/gsmc-1.1-autotools.patch b/sci-electronics/gsmc/files/gsmc-1.1-autotools.patch
index 94b0558d6b19..4418e31b115a 100644
--- a/sci-electronics/gsmc/files/gsmc-1.1-autotools.patch
+++ b/sci-electronics/gsmc/files/gsmc-1.1-autotools.patch
@@ -1,6 +1,6 @@
---- gsmc-1.1.orig/configure.ac	2011-01-12 18:14:55.633360421 -0200
-+++ gsmc-1.1/configure.ac	2011-01-12 19:58:12.617251642 -0200
-@@ -7,26 +7,13 @@
+--- configure.ac.orig	2015-09-07 16:25:35.000000000 +0200
++++ configure.ac	2015-09-07 16:26:30.000000000 +0200
+@@ -7,26 +7,17 @@
  AM_INIT_AUTOMAKE(gsmc, 1.0, ik5nax@amsat.org)
  
  # Checks for programs.
@@ -27,12 +27,16 @@
 -done
 +PKG_PROG_PKG_CONFIG
 +PKG_CHECK_MODULES([GTK], [gtk+-2.0])
++dnl Check for libm for floor
++AC_SEARCH_LIBS([floor], [m], [], [
++      AC_MSG_ERROR([unable to find the floor() function])
++])
  
  # Checks for header files.
  AC_HEADER_STDC
 
---- gsmc-1.1.orig/Makefile.am	2011-01-12 18:14:55.633360421 -0200
-+++ gsmc-1.1/Makefile.am	2011-01-12 20:37:21.034615478 -0200
+--- Makefile.am.orig	2011-01-12 18:14:55.633360421 -0200
++++ Makefile.am	2011-01-12 20:37:21.034615478 -0200
 @@ -2,8 +2,8 @@
       
  bin_PROGRAMS=gsmc
diff --git a/sci-electronics/gsmc/gsmc-1.1-r2.ebuild b/sci-electronics/gsmc/gsmc-1.1-r2.ebuild
new file mode 100644
index 000000000000..01fe3a6b0b8b
--- /dev/null
+++ b/sci-electronics/gsmc/gsmc-1.1-r2.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit autotools eutils
+
+DESCRIPTION="A GTK program for doing Smith Chart calculations"
+HOMEPAGE="http://www.qsl.net/ik5nax/"
+SRC_URI="http://www.qsl.net/ik5nax/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+CDEPEND="
+	dev-libs/glib:2
+	x11-libs/gtk+:2"
+DEPEND="${CDEPEND}
+	virtual/pkgconfig"
+RDEPEND="${CDEPEND}"
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-autotools.patch"
+	eautoreconf
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dodoc AUTHORS NEWS README TODO
+	insinto /usr/share/${PN}
+	doins example*
+}
diff --git a/sci-electronics/gtkwave/Manifest b/sci-electronics/gtkwave/Manifest
index 17cc3830cb48..0aa08389164f 100644
--- a/sci-electronics/gtkwave/Manifest
+++ b/sci-electronics/gtkwave/Manifest
@@ -3,3 +3,4 @@ DIST gtkwave-3.3.47.tar.gz 3832052 SHA256 b39c018f668070a0fdd3906c73a9add4ccbffd
 DIST gtkwave-3.3.59.tar.gz 4083000 SHA256 caba829abdbc4a4df7cc932695aed87037d656f62cd5831b531d13453034a984 SHA512 5def8eef767b292bc1e09dc7b5a7151b6f492b6e5b744e1b8e563ac3731073721fdce180b85bbc2c8dd7ecaf757a9a67bd3a809c55e522befa74d5d74f815b3d WHIRLPOOL 0b2b4ee8cc6d59eb335c805535b40439bd8034b62b693c9ceb7f868fcee97ed7a3075b00eb9ab36cbe9b475c5134c0d75a022da8bd99e77db34e48d91a241cfc
 DIST gtkwave-3.3.64.tar.gz 4090345 SHA256 dae956b3e55dc9b5d2bafe11fcf9b8606870d76f0719202fd04b678160d37115 SHA512 34150741942d2b82a5f937cf12b1793e04aea0444acaf4a4ba1c61e5bb70727d5990438833ee4d25fef81362929d0607ebd7fddb8fd178f437cafdf9c09e989f WHIRLPOOL 137eb908d004a1305d12b96b06d589525f82d69172d87434bb06fd5a8ff05e7bfc0f0d0746e9470337c636d5ce16e410d78b8b01d923bf3a4ed1030d71c89373
 DIST gtkwave-3.3.65.tar.gz 4092871 SHA256 64eb091e70c83bf03df14e01d338151e888fb4099c4695c2e6e40ce27d249bd5 SHA512 5aba36c9b9ff6353115ce5660b3dd61fba96ef2bc420483e194ad7a0d97b6f0a4453db20188c12af1c333ecbeee43f7ebe5b4bd166864a003995687a497a14ff WHIRLPOOL e5aac94e9c65aa1bedffa3febac38402f51c4c84237f39d703a9f1860a981dae308109935add36f4f0881ce7c491f2aaac0b52c54bc85ca025c9518d901df344
+DIST gtkwave-3.3.66.tar.gz 4093766 SHA256 04ce0851ebcf7ce07506c6e34af878ebf0c5a09495035a71e881fe6ff2abb99e SHA512 6c91efcbd240efceb770882eb0d1ccf5195b40207714432882fdaf35108e05860a5b00b7e922f95f537b01be335e8b4026e3ba6dcf02e235ff3b20f2082e7b81 WHIRLPOOL 6d4927d9b9e19f9ca128d9339b0e5c0ceec3b4ca2644ad38c861ff6f1896a5ba9a2c4c28b367413da6d255d6799748e7dfef0222ff3d6b3a4aa041661dee9d74
diff --git a/sci-electronics/gtkwave/gtkwave-3.3.66.ebuild b/sci-electronics/gtkwave/gtkwave-3.3.66.ebuild
new file mode 100644
index 000000000000..a83cf14427bf
--- /dev/null
+++ b/sci-electronics/gtkwave/gtkwave-3.3.66.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit eutils fdo-mime toolchain-funcs
+
+DESCRIPTION="A wave viewer for LXT, LXT2, VZT, GHW and standard Verilog VCD/EVCD files"
+HOMEPAGE="http://gtkwave.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+IUSE="doc examples fasttree fatlines judy lzma packed tcl"
+LICENSE="GPL-2 MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="dev-libs/glib:2
+	x11-libs/gtk+:2
+	x11-libs/pango
+	sys-libs/zlib
+	judy? ( dev-libs/judy )
+	tcl? ( dev-lang/tcl:0 dev-lang/tk:0 )
+	lzma? ( app-arch/xz-utils )"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	dev-util/gperf"
+
+AT_M4DIR="${S}"
+
+src_prepare(){
+	# do not install doc and examples by default
+	sed -i -e 's/doc examples//' Makefile.in || die
+}
+
+src_configure(){
+	econf --disable-local-libz \
+		--disable-local-libbz2 \
+		--disable-mime-update \
+		--enable-largefile \
+		$(use_enable packed struct-pack) \
+		$(use_enable fatlines) \
+		$(use_enable tcl) \
+		$(use_enable lzma xz) \
+		$(use_enable fasttree) \
+		$(use_enable judy)
+}
+
+src_compile() {
+	emake AR=$(tc-getAR)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dodoc ChangeLog README
+	if use doc ; then
+		insinto /usr/share/doc/${PF}
+		doins "doc/${PN}.odt"
+	fi
+	if use examples ; then
+		insinto /usr/share/doc/${PF}
+		doins -r examples
+	fi
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+}
diff --git a/sci-geosciences/geocode-glib/geocode-glib-3.16.2.ebuild b/sci-geosciences/geocode-glib/geocode-glib-3.16.2.ebuild
index 43bf1faf6c34..7be5a0a5a199 100644
--- a/sci-geosciences/geocode-glib/geocode-glib-3.16.2.ebuild
+++ b/sci-geosciences/geocode-glib/geocode-glib-3.16.2.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://git.gnome.org/browse/geocode-glib"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="+introspection test"
 
 RDEPEND="
diff --git a/sci-geosciences/gnome-maps/gnome-maps-3.16.2.ebuild b/sci-geosciences/gnome-maps/gnome-maps-3.16.2.ebuild
index 6229e9a3c7e0..fbb1ac309692 100644
--- a/sci-geosciences/gnome-maps/gnome-maps-3.16.2.ebuild
+++ b/sci-geosciences/gnome-maps/gnome-maps-3.16.2.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Maps"
 LICENSE="GPL-2+ LGPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0"
 SLOT="0"
 IUSE=""
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 RDEPEND="
 	>=app-misc/geoclue-0.12.99:2.0
@@ -26,12 +26,12 @@ RDEPEND="
 	media-libs/clutter:1.0[introspection]
 	media-libs/cogl:1.0[introspection]
 	>=media-libs/libchamplain-0.12.10-r1:0.12[gtk,introspection]
+	net-libs/libgfbgraph
 	net-libs/libsoup:2.4[introspection]
 	>=sci-geosciences/geocode-glib-3.15.2[introspection]
 	x11-libs/gdk-pixbuf:2[introspection]
 	>=x11-libs/gtk+-3.15.9:3[introspection]
 "
-
 DEPEND="${RDEPEND}
 	>=dev-util/intltool-0.40
 	virtual/pkgconfig
diff --git a/sci-geosciences/gnome-maps/metadata.xml b/sci-geosciences/gnome-maps/metadata.xml
index 6e0e2ecb48ca..da6fd63d0085 100644
--- a/sci-geosciences/gnome-maps/metadata.xml
+++ b/sci-geosciences/gnome-maps/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>gnome</herd>
+<herd>gnome</herd>
 </pkgmetadata>
diff --git a/sci-geosciences/qmapshack/metadata.xml b/sci-geosciences/qmapshack/metadata.xml
index b9960f615da4..e9f94a17a31f 100644
--- a/sci-geosciences/qmapshack/metadata.xml
+++ b/sci-geosciences/qmapshack/metadata.xml
@@ -1,15 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci</herd>
-<maintainer>
-  <email>grozin@gentoo.org</email>
-  <name>Andrey Grozin</name>
-</maintainer>
-<longdescription lang="en">
+  <herd>sci</herd>
+  <maintainer>
+    <email>grozin@gentoo.org</email>
+    <name>Andrey Grozin</name>
+  </maintainer>
+  <longdescription lang="en">
   Use QMapShack to plan your next outdoor trip or to visualize and archive
   all the GPS recordings of your past exciting adventures.
   QMapShack is the next generation of the famous QLandkarte GT application.
   And of course it's even better and easier to use.
 </longdescription>
+  <upstream>
+    <remote-id type="bitbucket">maproom/qmapshack</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/sci-libs/alglib/Manifest b/sci-libs/alglib/Manifest
index 76f161451943..fd1554a6f809 100644
--- a/sci-libs/alglib/Manifest
+++ b/sci-libs/alglib/Manifest
@@ -1,2 +1,3 @@
+DIST alglib-3.10.0.cpp.gpl.tgz 1991101 SHA256 26a6aa966da5bba01da1bebddc0acb0a8fc579f07d53a2cbcfa5dfcaf612aaeb SHA512 f02b3db5ab8dee841f27186b6693997c4e6876e75310b0a31a04593dbcb41d300920404e32e7aecb39c8dd15e54cfee05b725caa27397a67b453f6e64cd1ef5e WHIRLPOOL c0092a82404b060de0bc01d3cba731eac0a5a8f17cea736b784091cadf672883438fdd9c3ab37efa764b8e57fb9a1d7ca3eb7a842b863c22d9961307041e5d66
 DIST alglib-3.7.0.cpp.tgz 1518417 SHA256 62100afea6f3e54606031065d28b484ef82b3a96732265a23d8e0f17e34bd36c SHA512 055a292512eb6b5bdb667a2cfb8fda33237b17f1b900ba086e20a541af0f41bc85aef935c1357d780b45f3b1f2e6acddea23f19cdafa25a08f821aa391fec285 WHIRLPOOL 7dce3c5057c2b356b4f361304f2bfa6281671bb1f45204895864db0013ee18127f9cb4a64b311369debdf1adad4b4cb594514a7387adc6f9b9c21ccb4dc549f6
 DIST alglib-3.8.2.cpp.tgz 1674260 SHA256 c02944558849c8b22f32f8dea03ebf3b77a0aab9aa2518927d25f6bfe7cb06a2 SHA512 3d7b6e3b5a29f25aee476bdd69e583d7504a2e06d390822b4aa2792eeb500e08c13477176be348a9dd560bad358e423465c9086f0c7c12f73dc88024364aed50 WHIRLPOOL 8ec5a51448c00241428f3b6c6191e31f94ee09dc1d94417178a59887edb8b4e8cfd561983bc4b31686971ad27c43e957aa7c1232e500000a0ea84e763f08ddcf
diff --git a/sci-libs/alglib/alglib-3.10.0.ebuild b/sci-libs/alglib/alglib-3.10.0.ebuild
new file mode 100644
index 000000000000..f413e0b30487
--- /dev/null
+++ b/sci-libs/alglib/alglib-3.10.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit cmake-utils
+
+DESCRIPTION="Numerical analysis and data processing library"
+HOMEPAGE="http://www.alglib.net/"
+SRC_URI="http://www.alglib.net/translator/re/${P}.cpp.gpl.tgz"
+
+SLOT="0"
+LICENSE="GPL-2+"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+S="${WORKDIR}"/cpp/
+
+src_prepare() {
+	cp "${FILESDIR}"/CMakeLists.txt-3.8.2 CMakeLists.txt || die
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=( $(cmake-utils_use_build test) )
+	cmake-utils_src_configure
+}
diff --git a/sci-libs/armadillo/Manifest b/sci-libs/armadillo/Manifest
index 78ca0cf26496..e92d2f0ab6be 100644
--- a/sci-libs/armadillo/Manifest
+++ b/sci-libs/armadillo/Manifest
@@ -1,6 +1,5 @@
 DIST armadillo-3.4.4.tar.gz 3006964 SHA256 ef94e12556421fa62ba7734f8b18bb12c188f43dd6192d3648a28e8d154e6ba7 SHA512 78fbb107b220d283a2404483ee38720fd8259bbf675d8753d706cc3c3ba9678d47412d156f24a4b3cc95e20ce3c935167e2f7657806b5b8e8b7c95938c4b3f3f WHIRLPOOL 2a1b6426b695569c10b13d3df1183c615fdb4261497eea405e61316a838a5744477db7bfd8344f25d741e69899f64a19c801bd068d366175a2c9898369090093
 DIST armadillo-3.6.2.tar.gz 3016818 SHA256 04f64c632e619989616c7f219310a06cb1618b16274bdac05b4798d49eb4f149 SHA512 0c769caad012f7893cc8ebb46969179f1175edac638f98fd2a0898aed062f7456536eecd12c9720f77caf4859cd0049e00dd71c9f096458b5fd5ce9cea517c66 WHIRLPOOL 898c29f7d0a7b02658f8d95a528be7d321a7d15f95ada6a4296d9822ee873556a49ccaafcaca16cb25e4a05321fa91b9711d7790b0910464b653398fb6ce4738
 DIST armadillo-4.650.4.tar.gz 5408567 SHA256 ccc56580ec932ec9beade5679b07ecbed889e9b602866f673d1a05a7692b4bf8 SHA512 a548150ba5484fce35b0bc6023982939946f2f00b733dff2cd5b46101b1c344342061389cb4363cdaa04c5e3cca3278a40febe2ed705316552dd71f841c46037 WHIRLPOOL 331493d8b9c92b9e1908880c6f6510edb12e93193a9ceb77d0b8ce9d0bfb493dc48e590ea949d39c3c19f6fc3b05446b7e00525512e3055be0f907427c28f7d4
-DIST armadillo-5.100.2.tar.gz 5429961 SHA256 63150f12bf7c7c598ea55b7271d99fce349ff386a3dc2cae3904b244f6e35320 SHA512 2777b525bc62daddfb16eae7b74c29b6b695a7985c56d9dca727ae1e13aa4ea20ee85ea82233a5310b37c738838af07bb0fa7eea782e68e72cbe1cf46a0cc896 WHIRLPOOL df85a508875587651b187520b78900634402f2ca0fc2e64f43bd4a793e382e8cc6abd5b988267645bb02b3133d9aa99ab6d6ff5e200d1277093d4f7ce6e9d240
-DIST armadillo-5.200.2.tar.gz 5430682 SHA256 70c38fd94b4c0559ece1a7313cf85e08197a82dfda4daa5decd89b795bb73079 SHA512 034539d724fd1e4078a709cd616d280178fcfdcb1d3c3ca2f80f5f2ebc4b39b60f11e3bd22773be8a8fd61350a406a6f4056d56f88ed74964f438bed0d224f6f WHIRLPOOL 4d9fb5a5e6ee53db666b7a9b0e437cf18763ba46224ac8425c7aafac4d4c68dbceb272f929ba034c4f738539ea6b52ccc0fdef596e100a226b85239ebd12470b
 DIST armadillo-5.400.2.tar.gz 5440024 SHA256 d155f50bcdd716e52c5c59ccba88adbedfa406f92b76b9edb7a84bd737dbff84 SHA512 7950040d83faa837dfe968a184ebeb59df139300d6f0a80483f682ed7e26da459335d576f4cb146a66d9f95f8e0dd44f145dbe6ec935de6d77f08c2e646a5c6f WHIRLPOOL ea798c655961270e8b61d0041b4c68216239d0e1ab98dd1782c123aa6e4653b7b1a4d93e07a85593577a2aa027bfc0008d5c9f6fa76e31fa9e0338453adf09c1
+DIST armadillo-5.500.2.tar.gz 5442223 SHA256 a29d964fb879199a2ec06e67d0c33faa704bd493f48ff8d4abe3898baf735d19 SHA512 26d5819dd2349c85e6a1b6a42723ab7647b484afe3cc3896389a80a2d2e69ce2d9938a3e03fcb23019940297554e515dbd8ec154cbb1218fd6dd247661aa838f WHIRLPOOL 27b34795993342e78e2bddfb0b3f695b7c9b2c6c5d0370152d2475c777d6308ea7b05c1bc15a9425ee51cafcd3f7eb127e785fa4e348611bd2cc540b82315ab3
diff --git a/sci-libs/armadillo/armadillo-5.200.2.ebuild b/sci-libs/armadillo/armadillo-5.200.2.ebuild
deleted file mode 100644
index c785a401b00b..000000000000
--- a/sci-libs/armadillo/armadillo-5.200.2.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-CMAKE_IN_SOURCE_BUILD=1
-
-inherit cmake-utils toolchain-funcs multilib eutils
-
-DESCRIPTION="Streamlined C++ linear algebra library"
-HOMEPAGE="http://arma.sourceforge.net/"
-SRC_URI="mirror://sourceforge/arma/${P}.tar.gz"
-
-LICENSE="MPL-2.0"
-SLOT="0/5"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="arpack blas debug doc examples hdf5 lapack mkl superlu tbb test"
-REQUIRED_USE="test? ( lapack )"
-
-RDEPEND="
-	dev-libs/boost
-	arpack? ( sci-libs/arpack )
-	blas? ( virtual/blas )
-	lapack? ( virtual/lapack )
-	superlu? ( sci-libs/superlu )
-"
-DEPEND="${RDEPEND}
-	arpack? ( virtual/pkgconfig )
-	blas? ( virtual/pkgconfig )
-	hdf5? ( sci-libs/hdf5 )
-	lapack? ( virtual/pkgconfig )
-	mkl? ( sci-libs/mkl )
-	tbb? ( dev-cpp/tbb )"
-PDEPEND="${RDEPEND}
-	hdf5? ( sci-libs/hdf5 )
-	mkl? ( sci-libs/mkl )
-	tbb? ( dev-cpp/tbb )"
-
-src_prepare() {
-	# avoid the automagic cmake macros
-	sed -i -e '/ARMA_Find/d' CMakeLists.txt || die
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DINSTALL_LIB_DIR="${EPREFIX}/usr/$(get_libdir)"
-		$(cmake-utils_use debug ARMA_EXTRA_DEBUG)
-		$(cmake-utils_use mkl ARMA_USE_MKL_ALLOC)
-		$(cmake-utils_use tbb ARMA_USE_TBB_ALLOC)
-	)
-	if use arpack; then
-		mycmakeargs+=(
-			-DARPACK_FOUND=ON
-			-DARPACK_LIBRARY="$($(tc-getPKG_CONFIG) --libs arpack)"
-		)
-	fi
-#	if use atlas; then
-#		local c=atlas-cblas l=atlas-clapack
-#		$(tc-getPKG_CONFIG) --exists ${c}-threads && c+=-threads
-#		$(tc-getPKG_CONFIG) --exists ${l}-threads && l+=-threads
-#		mycmakeargs+=(
-#			-DCBLAS_FOUND=ON
-#			-DCBLAS_INCLUDE_DIR="$($(tc-getPKG_CONFIG) --cflags-only-I ${c} | sed 's/-I//')"
-#			-DCBLAS_LIBRARIES="$($(tc-getPKG_CONFIG) --libs ${c})"
-#			-DCLAPACK_FOUND=ON
-#			-DCLAPACK_INCLUDE_DIR="$($(tc-getPKG_CONFIG) --cflags-only-I ${l} | sed 's/-I//')"
-#			-DCLAPACK_LIBRARIES="$($(tc-getPKG_CONFIG) --libs ${l})"
-#		)
-#	fi
-	if use blas; then
-		mycmakeargs+=(
-			-DBLAS_FOUND=ON
-			-DBLAS_LIBRARIES="$($(tc-getPKG_CONFIG) --libs blas)"
-		)
-	fi
-	if use hdf5; then
-		mycmakeargs+=(
-			-DHDF5_FOUND=ON
-			-DHDF5_LIBRARIES="-lhdf5"
-		)
-	fi
-	if use lapack; then
-		mycmakeargs+=(
-			-DLAPACK_FOUND=ON
-			-DLAPACK_LIBRARIES="$($(tc-getPKG_CONFIG) --libs lapack)"
-		)
-	fi
-	if use superlu; then
-		mycmakeargs+=(
-			-DSuperLU_FOUND=ON
-			-DSuperLU_LIBRARIES="$($(tc-getPKG_CONFIG) --libs superlu)"
-		)
-	fi
-
-	cmake-utils_src_configure
-}
-
-src_test() {
-	pushd examples > /dev/null
-	emake \
-		CXXFLAGS="-I../include ${CXXFLAGS} -DARMA_USE_BLAS -DARMA_USE_LAPACK" \
-		EXTRA_LIB_FLAGS="-L.. $($(tc-getPKG_CONFIG) --libs blas lapack)"
-	LD_LIBRARY_PATH="..:${LD_LIBRARY_PATH}" ./example1 || die
-	LD_LIBRARY_PATH="..:${LD_LIBRARY_PATH}" ./example2 || die
-	emake clean
-	popd > /dev/null
-}
-
-src_install() {
-	cmake-utils_src_install
-	dodoc README.txt
-	use doc && dodoc *pdf && dohtml *html
-	if use examples; then
-		insinto /usr/share/examples/${PF}
-		doins -r examples/*
-	fi
-}
diff --git a/sci-libs/armadillo/armadillo-5.100.2.ebuild b/sci-libs/armadillo/armadillo-5.500.2.ebuild
index c785a401b00b..c785a401b00b 100644
--- a/sci-libs/armadillo/armadillo-5.100.2.ebuild
+++ b/sci-libs/armadillo/armadillo-5.500.2.ebuild
diff --git a/sci-libs/scikits_optimization/metadata.xml b/sci-libs/scikits_optimization/metadata.xml
index 8d8255f3901e..e36d27b1bd98 100644
--- a/sci-libs/scikits_optimization/metadata.xml
+++ b/sci-libs/scikits_optimization/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci</herd>
-<longdescription lang="en">
+  <herd>sci</herd>
+  <longdescription lang="en">
   A Python module for numerical optimization.
 </longdescription>
-<upstream>
-  <remote-id type="pypi">scikits.optimization</remote-id>
-</upstream>
+  <upstream>
+    <remote-id type="pypi">scikits.optimization</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/sci-libs/scikits_optimization/scikits_optimization-0.3.ebuild b/sci-libs/scikits_optimization/scikits_optimization-0.3.ebuild
index 7b91a527888a..16a089d477df 100644
--- a/sci-libs/scikits_optimization/scikits_optimization-0.3.ebuild
+++ b/sci-libs/scikits_optimization/scikits_optimization-0.3.ebuild
@@ -28,6 +28,5 @@ DEPEND="${RDEPEND}
 S="${WORKDIR}/${MY_P}"
 
 python_test() {
-	PYTHONPATH="${BUILD_DIR}/lib/" \
-		esetup.py test || die
+	esetup.py test
 }
diff --git a/sci-mathematics/rstudio/Manifest b/sci-mathematics/rstudio/Manifest
index 7bc3ab2cb9da..53840beaac79 100644
--- a/sci-mathematics/rstudio/Manifest
+++ b/sci-mathematics/rstudio/Manifest
@@ -19,6 +19,8 @@ DIST rstudio-0.98.932.tar.gz 15515025 SHA256 e4a69a2f746cb7cfcacd3811f15e41a9d15
 DIST rstudio-0.98.953.tar.gz 15518231 SHA256 944f5882a0d61f551cd6f6cbe7882b5a5ea5be12d2c6d5ec9e79cee65869dbb7 SHA512 38a17d1abf91f4e775c4d735152fe6c8030b2df771bd7333fb3c9408fe14ac0b6180d7eaad7ac09ce2d50e5dcaa5a3b828909b30f507fd7c35fe27f7bd96866c WHIRLPOOL e2135f425b48b952282d8c44bd121517098521715c70537a6ac1a3be1732928666c5cb40fbc20b9f394a606e0e116723190790a202cbf62986ffbca528646058
 DIST rstudio-0.99.473.tar.gz 16993092 SHA256 a402995251393d50fa70e2e02188a8b32dc34e067f2f8461f087bf71f643585c SHA512 5615840501f7629e82100fee78c35b8d4dc78d78932d65c2e91a6472bc94726389566f5853a99e3d0631fd260e59acea5a40acf82f72709741b89a1ed3c901af WHIRLPOOL 809549c76efee8b29452584ab4295bcbbf533f8100c8caf4dd3b4a3c8843dc54a0d8f3178a6aecab5c188f2498a74daa6c6677fc6d43bd7dd861487c557e48df
 DIST rstudio-0.99.482.tar.gz 16992873 SHA256 1185d6ce5d3872e134f3255668d8f082370c760f06ec409c7b84c0936f52c4bf SHA512 bdb845cceae851d27323448a3570621bcb2aba7742e9e1669c88f3ebeaaade8c8371eb38f2ad348d7e2b740778c34f73e59013502ae3cebafba84e5d249c3e52 WHIRLPOOL 743440227c8d7e56000b1ff0b1a12def50e006b4f34d2067587274e2bae0eda42656787fc0cf6c51ffdbfcca08fc6eab0d042891bd77e4446b6fe26c6d19cc05
+DIST rstudio-0.99.483.tar.gz 16993049 SHA256 85ce1a2f40690e4ed0338b153a1b3279ce9564396d8c6d6201a0ad39297d4a9a SHA512 7d9cc8b471a4d799f286193da5f6f950f85e82949ede0f1ffe3626a429a49204878fb731250e5f54164a48e1d6e9cbb19a04a38ff83e35fd46c0ba05ef78a9bc WHIRLPOOL 0c5c1d86b0bafe9d5ca02397793f902b4dca7edc3f507a472b8b235f91965d8a769a7873cc87d834fbb121792b52eb6908018ce6579acdf3d285b6ec986abc20
+DIST rstudio-0.99.484.tar.gz 16993033 SHA256 8ca4abccb9b554713077cf1057ac13abadfd7606f22ac3386b2a88a38ae8a427 SHA512 407f50747bca749ef2c512e727cbe062abdd99c1eb76af09761e6bdfb4208f30117e1ee55b485447f64f6cf249bc939ef1fb4f8ce0199595e241a3cc617b4b8b WHIRLPOOL 8cc16553ea2703f005908c69803b64da4172092cb0b3ff9015e7ec354340fcd1cfa82a218ac890adffafe3565ead94bee6f7bd239b1c56ee38cbeb5896f556b0
 DIST selenium-java-2.37.0.zip 24625928 SHA256 0eebba65d8edb01c1f46e462907c58f5d6e1cb0ddf63660a9985c8432bdffbb7 SHA512 68624e82dbc751a25c50fad72702a98eb30d77fd4337d2a969f8e06bcc49e5f8c835cd27ec53772f3375014ddde1d5636936e966b75f3594a9f86aa18ba4e779 WHIRLPOOL eb6659aae26f3c78b6f998546b23d0636c9d00ed8a7f985db1463ac4bd483ccb3e643d84e2ca0f59e0636a8de79eb552ff1d68eb6f9c06907029f7552d8f7777
 DIST selenium-server-standalone-2.37.0.jar 34730734 SHA256 97bc8c699037fb6e99ba7af570fb60dbb1b7ce30cde2448287a44ef65b13023e SHA512 b215446d42d2d1f69664349b6ae6dc53a532d3624c91254f0f4183d0ad764648792e5cc1126a55a1e60d9687d55200fed01d6d2f46cc3d853b1fa6ee38111018 WHIRLPOOL 20640591534f31f24825a9ed139589b182e8b60d86541bf0be104d3cc0280983f6566bd0459f2253ac3875b48a2798b205bac8f815a119fff6db625ce9bbc29e
 DIST shinyapps-0.98.1000.tar.gz 910095 SHA256 b95c512ae0a0fb4335878d9cfcf9073e2cb3ccfed73543abe27ea8878ed36d57 SHA512 3162317c4c20cfc1497e952a8235867084d629ae88407e6c465b3e208adb1dc97abfe6b9922e0374ddf4c8e38a76e112942bd312c54a66f74e6f2a3fe4c0a07c WHIRLPOOL ecc2bce78387cb42e9989163d8fca29220e66f085acde3323417058aebb624dafa8c0e1873c7d79e67324cbd5aad250ef9fcdbbc8f659d64482233b95d898a15
diff --git a/sci-mathematics/rstudio/rstudio-0.99.483.ebuild b/sci-mathematics/rstudio/rstudio-0.99.483.ebuild
new file mode 100644
index 000000000000..3682c5ca0fd0
--- /dev/null
+++ b/sci-mathematics/rstudio/rstudio-0.99.483.ebuild
@@ -0,0 +1,238 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils user cmake-utils gnome2-utils pam versionator fdo-mime java-pkg-2 pax-utils
+
+# TODO
+# * package gin and gwt
+# * use dict from tree, linguas
+# * do src_test (use junit from tree?)
+
+# update from scripts in dependencies/common
+# egrep '(GWT_SDK_VER=|GIN_VER=|SELENIUM_VER=|CHROMEDRIVER_VER=)' dependencies/common/install-gwt
+GWT_VER=2.7.0
+GIN_VER=1.5
+SELENIUM_VER=2.37.0
+CHROMEDRIVER_VER=2.7
+# grep 'PANDOC_VERSION=' dependencies/common/update-pandoc
+PANDOC_VER=1.13.1
+# ls dependencies/common/*.tar.gz
+PACKRAT_VER=0.98.1000
+RMARKDOWN_VER=0.98.1000
+SHINYAPPS_VER=0.98.1000
+RSCONNECT_VER=0.4.1.4_fcac892a69817febd7b655b189bf57193260cda0
+
+DESCRIPTION="IDE for the R language"
+HOMEPAGE="http://www.rstudio.org
+	https://github.com/rstudio/rstudio/"
+SRC_URI="https://github.com/rstudio/rstudio/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	https://s3.amazonaws.com/rstudio-buildtools/gin-${GIN_VER}.zip
+	https://s3.amazonaws.com/rstudio-buildtools/gwt-${GWT_VER}.zip
+	https://s3.amazonaws.com/rstudio-buildtools/selenium-java-${SELENIUM_VER}.zip
+	https://s3.amazonaws.com/rstudio-buildtools/selenium-server-standalone-${SELENIUM_VER}.jar
+	https://s3.amazonaws.com/rstudio-buildtools/chromedriver-linux
+	https://s3.amazonaws.com/rstudio-dictionaries/core-dictionaries.zip
+	https://dev.gentoo.org/~gienah/distfiles/packrat-${PACKRAT_VER}.tar.gz
+	https://dev.gentoo.org/~gienah/distfiles/rmarkdown-${RMARKDOWN_VER}.tar.gz
+	https://dev.gentoo.org/~gienah/distfiles/shinyapps-${SHINYAPPS_VER}.tar.gz
+	https://dev.gentoo.org/~gienah/distfiles/rsconnect_${RSCONNECT_VER}.tar.gz
+"
+
+LICENSE="AGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="dedicated server"
+
+QT_VER=5.4
+QT_SLOT=5
+RDEPEND="
+	app-text/pandoc
+	dev-haskell/pandoc-citeproc
+	>=dev-lang/R-2.11.1
+	>=dev-libs/boost-1.50:=
+	>=dev-libs/mathjax-2.3
+	dev-libs/openssl:0
+	sys-apps/util-linux
+	>=sys-devel/clang-3.5.0
+	sys-libs/zlib
+	|| ( =virtual/jre-1.7*:= =virtual/jre-1.8*:= )
+	x11-libs/pango
+	!dedicated? (
+		>=dev-qt/qtcore-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtdeclarative-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtdbus-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtgui-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtnetwork-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtopengl-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtpositioning-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtprintsupport-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtsingleapplication-2.6.1_p20150629[qt5]
+		>=dev-qt/qtsensors-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtsql-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtsvg-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtwebkit-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtwidgets-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtxml-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtxmlpatterns-${QT_VER}:${QT_SLOT}
+		server? ( virtual/pam )
+	)
+	dedicated? ( virtual/pam )"
+DEPEND="${RDEPEND}
+	app-arch/unzip
+	dev-java/ant-core
+	|| ( =virtual/jdk-1.7*:= =virtual/jdk-1.8*:= )
+	virtual/pkgconfig"
+#	test? ( dev-java/junit:4 )
+
+src_unpack() {
+	unpack ${P}.tar.gz gwt-${GWT_VER}.zip
+	cd "${S}" || die
+	mkdir -p src/gwt/lib/{gin,gwt} \
+		dependencies/common/dictionaries \
+		src/gwt/lib/selenium/${SELENIUM_VER} \
+		src/gwt/lib/selenium/chromedriver/${CHROMEDRIVER_VER} || die
+	mv ../gwt-${GWT_VER} src/gwt/lib/gwt/${GWT_VER} || die
+	unzip -qd src/gwt/lib/gin/${GIN_VER} \
+		"${DISTDIR}"/gin-${GIN_VER}.zip || die
+	unzip -qd dependencies/common/dictionaries \
+		"${DISTDIR}"/core-dictionaries.zip || die
+	unzip -qd src/gwt/lib/selenium/${SELENIUM_VER} \
+		"${DISTDIR}"/selenium-java-${SELENIUM_VER}.zip || die
+	cp "${DISTDIR}"/selenium-server-standalone-${SELENIUM_VER}.jar \
+		src/gwt/lib/selenium/${SELENIUM_VER}/ || die
+	cp "${DISTDIR}"/chromedriver-linux \
+		src/gwt/lib/selenium/chromedriver/${CHROMEDRIVER_VER}/ || die
+	cd dependencies/common || die
+	unpack packrat-${PACKRAT_VER}.tar.gz
+	unpack rmarkdown-${RMARKDOWN_VER}.tar.gz
+	unpack shinyapps-${SHINYAPPS_VER}.tar.gz
+	unpack rsconnect_${RSCONNECT_VER}.tar.gz
+	cp "${DISTDIR}"/rmarkdown-${RMARKDOWN_VER}.tar.gz \
+		. || die
+	cp "${DISTDIR}"/packrat-${PACKRAT_VER}.tar.gz \
+		. || die
+	cp "${DISTDIR}"/shinyapps-${SHINYAPPS_VER}.tar.gz \
+		. || die
+	cp "${DISTDIR}"/rsconnect_${RSCONNECT_VER}.tar.gz \
+		. || die
+}
+
+src_prepare() {
+	java-pkg-2_src_prepare
+
+	find . -name .gitignore -delete || die
+
+	epatch "${FILESDIR}"/${PN}-0.98.490-prefs.patch \
+		"${FILESDIR}"/${PN}-0.99.473-paths.patch \
+		"${FILESDIR}"/${PN}-0.99.473-clang-pandoc.patch \
+		"${FILESDIR}"/${PN}-0.98.490-linker_flags.patch \
+		"${FILESDIR}"/${PN}-0.98.1091-boost-1.57.patch \
+		"${FILESDIR}"/${PN}-0.99.473-qtsingleapplication.patch
+
+	# Adding -DDISTRO_SHARE=... to append-flags breaks cmake so using
+	# this sed hack for now. ~RMH
+	sed -i \
+		-e "s|DISTRO_SHARE|\"share/${PN}\"|g" \
+		src/cpp/server/ServerOptions.cpp \
+		src/cpp/session/SessionOptions.cpp || die
+
+	# use mathjax from system
+	ln -sf "${EPREFIX}"/usr/share/mathjax dependencies/common/mathjax-23 || die
+
+	# make sure icons and mime stuff are with prefix
+	sed -i \
+		-e "s:/usr:${EPREFIX}/usr:g" \
+		CMakeGlobals.txt src/cpp/desktop/CMakeLists.txt || die
+
+	# On Gentoo the rstudio-server configuration file is /etc/conf.d/rstudio-server.conf
+	sed -e "s@/etc/rstudio/rserver.conf@${EROOT}etc/conf.d/rstudio-server.conf@" \
+		-i src/cpp/server/ServerOptions.cpp \
+		|| die
+
+	# Set the rsession.conf file location for Gentoo prefix
+	sed -e "s@/etc/rstudio/rsession.conf@${EROOT}etc/rstudio/rsession.conf@" \
+		-i src/cpp/session/SessionOptions.cpp \
+		|| die
+
+	# dev-qt/qtsingleapplication-2.6.1_p20150629 does not provide a cmake module.
+	# It provides a library that has its version number appended to the end,
+	# which is difficult to handle in cmake, as find_library does not support
+	# searching for wildcard library names. So I find the library name from the
+	# qmake spec, and then sed this into the patched src/cpp/desktop/CMakeLists.txt.
+	rm -rf "${S}"/src/cpp/desktop/3rdparty || die
+	local s=$(grep '\-lQt$${QT_MAJOR_VERSION}Solutions_SingleApplication' \
+				   "${EROOT}"/usr/lib64/qt5/mkspecs/features/qtsingleapplication.prf \
+					 | sed -e 's@\$\${QT_MAJOR_VERSION}@5@' \
+						   -e 's@LIBS \*= -l@@')
+	sed -e "s@Qt5Solutions_SingleApplication-2.6@${s}@g" \
+		-i "${S}"/src/cpp/desktop/CMakeLists.txt \
+		|| die
+
+	# Avoid some of the oracle-jdk-bin-1.8.0.60 sandbox violations F: mkdir S: deny
+	# P: /root/.oracle_jre_usage.
+	sed -e 's@\(\s*\)\(</classpath>\)@\1\2\n\1\<jvmarg value="-Duser.home=${env.T}"/>@g' \
+		-i "${S}"/src/gwt/build.xml \
+		|| die
+}
+
+src_configure() {
+	export RSTUDIO_VERSION_MAJOR=$(get_version_component_range 1)
+	export RSTUDIO_VERSION_MINOR=$(get_version_component_range 2)
+	export RSTUDIO_VERSION_PATCH=$(get_version_component_range 3)
+
+	local mycmakeargs=(
+		-DDISTRO_SHARE=share/${PN}
+		$(cmake-utils_use !dedicated RSTUDIO_INSTALL_FREEDESKTOP)
+		-DRSTUDIO_TARGET=$(usex dedicated "Server" "$(usex server "Development" "Desktop")")
+		-DQT_QMAKE_EXECUTABLE="${EROOT}"usr/lib64/qt5/bin/qmake
+		)
+
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	# Avoid the rest of the oracle-jdk-bin-1.8.0.60 sandbox violations F: mkdir S: deny
+	# P: /root/.oracle_jre_usage.
+	export ANT_OPTS="-Duser.home=${T}"
+	cmake-utils_src_compile
+}
+
+src_install() {
+	export ANT_OPTS="-Duser.home=${T}"
+	cmake-utils_src_install
+	pax-mark m "${ED}usr/bin/rstudio"
+	doconfd "${FILESDIR}"/rstudio-server.conf
+	dodir /etc/rstudio
+	insinto /etc/rstudio
+	doins "${FILESDIR}"/rsession.conf
+	dosym /etc/conf.d/rstudio-server.conf /etc/rstudio/rserver.conf
+	if use dedicated || use server; then
+		dopamd src/cpp/server/extras/pam/rstudio
+		newinitd "${FILESDIR}"/rstudio-server.initd rstudio-server
+	fi
+}
+
+pkg_preinst() {
+	use dedicated || gnome2_icon_savelist
+	java-pkg-2_pkg_preinst
+}
+
+pkg_postinst() {
+	use dedicated || { fdo-mime_desktop_database_update
+		fdo-mime_mime_database_update
+		gnome2_icon_cache_update ;}
+
+	if use dedicated || use server; then
+		enewgroup rstudio-server
+		enewuser rstudio-server -1 -1 -1 rstudio-server
+	fi
+}
+
+pkg_postrm() {
+	use dedicated || { fdo-mime_desktop_database_update
+		fdo-mime_mime_database_update
+		gnome2_icon_cache_update ;}
+}
diff --git a/sci-mathematics/rstudio/rstudio-0.99.484.ebuild b/sci-mathematics/rstudio/rstudio-0.99.484.ebuild
new file mode 100644
index 000000000000..3682c5ca0fd0
--- /dev/null
+++ b/sci-mathematics/rstudio/rstudio-0.99.484.ebuild
@@ -0,0 +1,238 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils user cmake-utils gnome2-utils pam versionator fdo-mime java-pkg-2 pax-utils
+
+# TODO
+# * package gin and gwt
+# * use dict from tree, linguas
+# * do src_test (use junit from tree?)
+
+# update from scripts in dependencies/common
+# egrep '(GWT_SDK_VER=|GIN_VER=|SELENIUM_VER=|CHROMEDRIVER_VER=)' dependencies/common/install-gwt
+GWT_VER=2.7.0
+GIN_VER=1.5
+SELENIUM_VER=2.37.0
+CHROMEDRIVER_VER=2.7
+# grep 'PANDOC_VERSION=' dependencies/common/update-pandoc
+PANDOC_VER=1.13.1
+# ls dependencies/common/*.tar.gz
+PACKRAT_VER=0.98.1000
+RMARKDOWN_VER=0.98.1000
+SHINYAPPS_VER=0.98.1000
+RSCONNECT_VER=0.4.1.4_fcac892a69817febd7b655b189bf57193260cda0
+
+DESCRIPTION="IDE for the R language"
+HOMEPAGE="http://www.rstudio.org
+	https://github.com/rstudio/rstudio/"
+SRC_URI="https://github.com/rstudio/rstudio/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	https://s3.amazonaws.com/rstudio-buildtools/gin-${GIN_VER}.zip
+	https://s3.amazonaws.com/rstudio-buildtools/gwt-${GWT_VER}.zip
+	https://s3.amazonaws.com/rstudio-buildtools/selenium-java-${SELENIUM_VER}.zip
+	https://s3.amazonaws.com/rstudio-buildtools/selenium-server-standalone-${SELENIUM_VER}.jar
+	https://s3.amazonaws.com/rstudio-buildtools/chromedriver-linux
+	https://s3.amazonaws.com/rstudio-dictionaries/core-dictionaries.zip
+	https://dev.gentoo.org/~gienah/distfiles/packrat-${PACKRAT_VER}.tar.gz
+	https://dev.gentoo.org/~gienah/distfiles/rmarkdown-${RMARKDOWN_VER}.tar.gz
+	https://dev.gentoo.org/~gienah/distfiles/shinyapps-${SHINYAPPS_VER}.tar.gz
+	https://dev.gentoo.org/~gienah/distfiles/rsconnect_${RSCONNECT_VER}.tar.gz
+"
+
+LICENSE="AGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="dedicated server"
+
+QT_VER=5.4
+QT_SLOT=5
+RDEPEND="
+	app-text/pandoc
+	dev-haskell/pandoc-citeproc
+	>=dev-lang/R-2.11.1
+	>=dev-libs/boost-1.50:=
+	>=dev-libs/mathjax-2.3
+	dev-libs/openssl:0
+	sys-apps/util-linux
+	>=sys-devel/clang-3.5.0
+	sys-libs/zlib
+	|| ( =virtual/jre-1.7*:= =virtual/jre-1.8*:= )
+	x11-libs/pango
+	!dedicated? (
+		>=dev-qt/qtcore-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtdeclarative-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtdbus-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtgui-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtnetwork-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtopengl-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtpositioning-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtprintsupport-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtsingleapplication-2.6.1_p20150629[qt5]
+		>=dev-qt/qtsensors-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtsql-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtsvg-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtwebkit-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtwidgets-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtxml-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtxmlpatterns-${QT_VER}:${QT_SLOT}
+		server? ( virtual/pam )
+	)
+	dedicated? ( virtual/pam )"
+DEPEND="${RDEPEND}
+	app-arch/unzip
+	dev-java/ant-core
+	|| ( =virtual/jdk-1.7*:= =virtual/jdk-1.8*:= )
+	virtual/pkgconfig"
+#	test? ( dev-java/junit:4 )
+
+src_unpack() {
+	unpack ${P}.tar.gz gwt-${GWT_VER}.zip
+	cd "${S}" || die
+	mkdir -p src/gwt/lib/{gin,gwt} \
+		dependencies/common/dictionaries \
+		src/gwt/lib/selenium/${SELENIUM_VER} \
+		src/gwt/lib/selenium/chromedriver/${CHROMEDRIVER_VER} || die
+	mv ../gwt-${GWT_VER} src/gwt/lib/gwt/${GWT_VER} || die
+	unzip -qd src/gwt/lib/gin/${GIN_VER} \
+		"${DISTDIR}"/gin-${GIN_VER}.zip || die
+	unzip -qd dependencies/common/dictionaries \
+		"${DISTDIR}"/core-dictionaries.zip || die
+	unzip -qd src/gwt/lib/selenium/${SELENIUM_VER} \
+		"${DISTDIR}"/selenium-java-${SELENIUM_VER}.zip || die
+	cp "${DISTDIR}"/selenium-server-standalone-${SELENIUM_VER}.jar \
+		src/gwt/lib/selenium/${SELENIUM_VER}/ || die
+	cp "${DISTDIR}"/chromedriver-linux \
+		src/gwt/lib/selenium/chromedriver/${CHROMEDRIVER_VER}/ || die
+	cd dependencies/common || die
+	unpack packrat-${PACKRAT_VER}.tar.gz
+	unpack rmarkdown-${RMARKDOWN_VER}.tar.gz
+	unpack shinyapps-${SHINYAPPS_VER}.tar.gz
+	unpack rsconnect_${RSCONNECT_VER}.tar.gz
+	cp "${DISTDIR}"/rmarkdown-${RMARKDOWN_VER}.tar.gz \
+		. || die
+	cp "${DISTDIR}"/packrat-${PACKRAT_VER}.tar.gz \
+		. || die
+	cp "${DISTDIR}"/shinyapps-${SHINYAPPS_VER}.tar.gz \
+		. || die
+	cp "${DISTDIR}"/rsconnect_${RSCONNECT_VER}.tar.gz \
+		. || die
+}
+
+src_prepare() {
+	java-pkg-2_src_prepare
+
+	find . -name .gitignore -delete || die
+
+	epatch "${FILESDIR}"/${PN}-0.98.490-prefs.patch \
+		"${FILESDIR}"/${PN}-0.99.473-paths.patch \
+		"${FILESDIR}"/${PN}-0.99.473-clang-pandoc.patch \
+		"${FILESDIR}"/${PN}-0.98.490-linker_flags.patch \
+		"${FILESDIR}"/${PN}-0.98.1091-boost-1.57.patch \
+		"${FILESDIR}"/${PN}-0.99.473-qtsingleapplication.patch
+
+	# Adding -DDISTRO_SHARE=... to append-flags breaks cmake so using
+	# this sed hack for now. ~RMH
+	sed -i \
+		-e "s|DISTRO_SHARE|\"share/${PN}\"|g" \
+		src/cpp/server/ServerOptions.cpp \
+		src/cpp/session/SessionOptions.cpp || die
+
+	# use mathjax from system
+	ln -sf "${EPREFIX}"/usr/share/mathjax dependencies/common/mathjax-23 || die
+
+	# make sure icons and mime stuff are with prefix
+	sed -i \
+		-e "s:/usr:${EPREFIX}/usr:g" \
+		CMakeGlobals.txt src/cpp/desktop/CMakeLists.txt || die
+
+	# On Gentoo the rstudio-server configuration file is /etc/conf.d/rstudio-server.conf
+	sed -e "s@/etc/rstudio/rserver.conf@${EROOT}etc/conf.d/rstudio-server.conf@" \
+		-i src/cpp/server/ServerOptions.cpp \
+		|| die
+
+	# Set the rsession.conf file location for Gentoo prefix
+	sed -e "s@/etc/rstudio/rsession.conf@${EROOT}etc/rstudio/rsession.conf@" \
+		-i src/cpp/session/SessionOptions.cpp \
+		|| die
+
+	# dev-qt/qtsingleapplication-2.6.1_p20150629 does not provide a cmake module.
+	# It provides a library that has its version number appended to the end,
+	# which is difficult to handle in cmake, as find_library does not support
+	# searching for wildcard library names. So I find the library name from the
+	# qmake spec, and then sed this into the patched src/cpp/desktop/CMakeLists.txt.
+	rm -rf "${S}"/src/cpp/desktop/3rdparty || die
+	local s=$(grep '\-lQt$${QT_MAJOR_VERSION}Solutions_SingleApplication' \
+				   "${EROOT}"/usr/lib64/qt5/mkspecs/features/qtsingleapplication.prf \
+					 | sed -e 's@\$\${QT_MAJOR_VERSION}@5@' \
+						   -e 's@LIBS \*= -l@@')
+	sed -e "s@Qt5Solutions_SingleApplication-2.6@${s}@g" \
+		-i "${S}"/src/cpp/desktop/CMakeLists.txt \
+		|| die
+
+	# Avoid some of the oracle-jdk-bin-1.8.0.60 sandbox violations F: mkdir S: deny
+	# P: /root/.oracle_jre_usage.
+	sed -e 's@\(\s*\)\(</classpath>\)@\1\2\n\1\<jvmarg value="-Duser.home=${env.T}"/>@g' \
+		-i "${S}"/src/gwt/build.xml \
+		|| die
+}
+
+src_configure() {
+	export RSTUDIO_VERSION_MAJOR=$(get_version_component_range 1)
+	export RSTUDIO_VERSION_MINOR=$(get_version_component_range 2)
+	export RSTUDIO_VERSION_PATCH=$(get_version_component_range 3)
+
+	local mycmakeargs=(
+		-DDISTRO_SHARE=share/${PN}
+		$(cmake-utils_use !dedicated RSTUDIO_INSTALL_FREEDESKTOP)
+		-DRSTUDIO_TARGET=$(usex dedicated "Server" "$(usex server "Development" "Desktop")")
+		-DQT_QMAKE_EXECUTABLE="${EROOT}"usr/lib64/qt5/bin/qmake
+		)
+
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	# Avoid the rest of the oracle-jdk-bin-1.8.0.60 sandbox violations F: mkdir S: deny
+	# P: /root/.oracle_jre_usage.
+	export ANT_OPTS="-Duser.home=${T}"
+	cmake-utils_src_compile
+}
+
+src_install() {
+	export ANT_OPTS="-Duser.home=${T}"
+	cmake-utils_src_install
+	pax-mark m "${ED}usr/bin/rstudio"
+	doconfd "${FILESDIR}"/rstudio-server.conf
+	dodir /etc/rstudio
+	insinto /etc/rstudio
+	doins "${FILESDIR}"/rsession.conf
+	dosym /etc/conf.d/rstudio-server.conf /etc/rstudio/rserver.conf
+	if use dedicated || use server; then
+		dopamd src/cpp/server/extras/pam/rstudio
+		newinitd "${FILESDIR}"/rstudio-server.initd rstudio-server
+	fi
+}
+
+pkg_preinst() {
+	use dedicated || gnome2_icon_savelist
+	java-pkg-2_pkg_preinst
+}
+
+pkg_postinst() {
+	use dedicated || { fdo-mime_desktop_database_update
+		fdo-mime_mime_database_update
+		gnome2_icon_cache_update ;}
+
+	if use dedicated || use server; then
+		enewgroup rstudio-server
+		enewuser rstudio-server -1 -1 -1 rstudio-server
+	fi
+}
+
+pkg_postrm() {
+	use dedicated || { fdo-mime_desktop_database_update
+		fdo-mime_mime_database_update
+		gnome2_icon_cache_update ;}
+}
diff --git a/sci-misc/boinc/boinc-7.4.42-r1.ebuild b/sci-misc/boinc/boinc-7.4.42-r1.ebuild
new file mode 100644
index 000000000000..40a8b1660034
--- /dev/null
+++ b/sci-misc/boinc/boinc-7.4.42-r1.ebuild
@@ -0,0 +1,141 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+#WANT_AUTOMAKE="1.11"
+
+AUTOTOOLS_AUTORECONF=true
+
+inherit autotools-utils eutils flag-o-matic systemd user versionator wxwidgets
+
+MY_PV=$(get_version_component_range 1-2)
+
+DESCRIPTION="The Berkeley Open Infrastructure for Network Computing"
+HOMEPAGE="http://boinc.ssl.berkeley.edu/"
+SRC_URI="https://github.com/BOINC/boinc/archive/client_release/${MY_PV}/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="X cuda static-libs"
+
+RDEPEND="
+	!sci-misc/boinc-bin
+	!app-admin/quickswitch
+	>=app-misc/ca-certificates-20080809
+	dev-libs/openssl:0=
+	net-misc/curl[ssl,-gnutls(-),-nss(-),curl_ssl_openssl(+)]
+	sys-apps/util-linux
+	sys-libs/zlib
+	cuda? (
+		>=dev-util/nvidia-cuda-toolkit-2.1
+		>=x11-drivers/nvidia-drivers-180.22
+	)
+	X? (
+		dev-db/sqlite:3
+		media-libs/freeglut
+		sys-libs/glibc:2.2
+		virtual/jpeg:0=
+		x11-libs/gtk+:2
+		>=x11-libs/libnotify-0.7
+		x11-libs/wxGTK:3.0[X,opengl,webkit]
+	)
+"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	app-text/docbook-xml-dtd:4.4
+	app-text/docbook2X
+"
+
+S="${WORKDIR}/${PN}-client_release-${MY_PV}-${PV}"
+
+AUTOTOOLS_IN_SOURCE_BUILD=1
+
+src_prepare() {
+	# prevent bad changes in compile flags, bug 286701
+	sed -i -e "s:BOINC_SET_COMPILE_FLAGS::" configure.ac || die "sed failed"
+
+	autotools-utils_src_prepare
+}
+
+src_configure() {
+	local myeconfargs=(
+		--disable-server
+		--enable-client
+		--enable-dynamic-client-linkage
+		--disable-static
+		--enable-unicode
+		--with-ssl
+		$(use_with X x)
+		$(use_enable X manager)
+	)
+
+	# look for wxGTK
+	if use X; then
+		WX_GTK_VER="3.0"
+		need-wxwidgets unicode
+		myeconfargs+=(--with-wx-config="${WX_CONFIG}")
+	else
+		myeconfargs+=(--without-wxdir)
+	fi
+
+	autotools-utils_src_configure
+}
+
+src_install() {
+	autotools-utils_src_install
+
+	keepdir /var/lib/${PN}
+
+	if use X; then
+		newicon "${S}"/packages/generic/sea/${PN}mgr.48x48.png ${PN}.png
+		make_desktop_entry boincmgr "${PN}" "${PN}" "Math;Science" "Path=/var/lib/${PN}"
+	fi
+
+	# cleanup cruft
+	rm -rf "${ED}"/etc
+
+	newinitd "${FILESDIR}"/${PN}.init ${PN}
+	newconfd "${FILESDIR}"/${PN}.conf ${PN}
+	systemd_dounit "${FILESDIR}"/${PN}.service
+}
+
+pkg_preinst() {
+	enewgroup ${PN}
+	# note this works only for first install so we have to
+	# elog user about the need of being in video group
+	local groups="${PN}"
+	if use cuda; then
+		group+=",video"
+	fi
+	enewuser ${PN} -1 -1 /var/lib/${PN} "${groups}"
+}
+
+pkg_postinst() {
+	echo
+	elog "You are using the source compiled version of boinc."
+	use X && elog "The graphical manager can be found at /usr/bin/boincmgr"
+	elog
+	elog "You need to attach to a project to do anything useful with boinc."
+	elog "You can do this by running /etc/init.d/boinc attach"
+	elog "The howto for configuration is located at:"
+	elog "http://boinc.berkeley.edu/wiki/Anonymous_platform"
+	elog
+	# Add warning about the new password for the client, bug 121896.
+	if use X; then
+		elog "If you need to use the graphical manager the password is in:"
+		elog "/var/lib/boinc/gui_rpc_auth.cfg"
+		elog "Where /var/lib/ is default RUNTIMEDIR, that can be changed in:"
+		elog "/etc/conf.d/boinc"
+		elog "You should change this password to something more memorable (can be even blank)."
+		elog "Remember to launch init script before using manager. Or changing the password."
+		elog
+	fi
+	if use cuda; then
+		elog "To be able to use CUDA you should add boinc user to video group."
+		elog "Run as root:"
+		elog "gpasswd -a boinc video"
+	fi
+}
diff --git a/sci-misc/boinc/boinc-7.4.42.ebuild b/sci-misc/boinc/boinc-7.4.42.ebuild
deleted file mode 100644
index 2cfff07888ef..000000000000
--- a/sci-misc/boinc/boinc-7.4.42.ebuild
+++ /dev/null
@@ -1,141 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-#WANT_AUTOMAKE="1.11"
-
-AUTOTOOLS_AUTORECONF=true
-
-inherit autotools-utils eutils flag-o-matic systemd user versionator wxwidgets
-
-MY_PV=$(get_version_component_range 1-2)
-
-DESCRIPTION="The Berkeley Open Infrastructure for Network Computing"
-HOMEPAGE="http://boinc.ssl.berkeley.edu/"
-SRC_URI="https://github.com/BOINC/boinc/archive/client_release/${MY_PV}/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="X cuda static-libs"
-
-RDEPEND="
-	!sci-misc/boinc-bin
-	!app-admin/quickswitch
-	>=app-misc/ca-certificates-20080809
-	dev-libs/openssl:0=
-	net-misc/curl[ssl,-gnutls(-),-nss(-),curl_ssl_openssl(+)]
-	sys-apps/util-linux
-	sys-libs/zlib
-	cuda? (
-		>=dev-util/nvidia-cuda-toolkit-2.1
-		>=x11-drivers/nvidia-drivers-180.22
-	)
-	X? (
-		dev-db/sqlite:3
-		media-libs/freeglut
-		sys-libs/glibc:2.2
-		virtual/jpeg:0=
-		x11-libs/gtk+:2
-		>=x11-libs/libnotify-0.7
-		x11-libs/wxGTK:2.8[X,opengl]
-	)
-"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	app-text/docbook-xml-dtd:4.4
-	app-text/docbook2X
-"
-
-S="${WORKDIR}/${PN}-client_release-${MY_PV}-${PV}"
-
-AUTOTOOLS_IN_SOURCE_BUILD=1
-
-src_prepare() {
-	# prevent bad changes in compile flags, bug 286701
-	sed -i -e "s:BOINC_SET_COMPILE_FLAGS::" configure.ac || die "sed failed"
-
-	autotools-utils_src_prepare
-}
-
-src_configure() {
-	local myeconfargs=(
-		--disable-server
-		--enable-client
-		--enable-dynamic-client-linkage
-		--disable-static
-		--enable-unicode
-		--with-ssl
-		$(use_with X x)
-		$(use_enable X manager)
-	)
-
-	# look for wxGTK
-	if use X; then
-		WX_GTK_VER="2.8"
-		need-wxwidgets unicode
-		myeconfargs+=(--with-wx-config="${WX_CONFIG}")
-	else
-		myeconfargs+=(--without-wxdir)
-	fi
-
-	autotools-utils_src_configure
-}
-
-src_install() {
-	autotools-utils_src_install
-
-	keepdir /var/lib/${PN}
-
-	if use X; then
-		newicon "${S}"/packages/generic/sea/${PN}mgr.48x48.png ${PN}.png
-		make_desktop_entry boincmgr "${PN}" "${PN}" "Math;Science" "Path=/var/lib/${PN}"
-	fi
-
-	# cleanup cruft
-	rm -rf "${ED}"/etc
-
-	newinitd "${FILESDIR}"/${PN}.init ${PN}
-	newconfd "${FILESDIR}"/${PN}.conf ${PN}
-	systemd_dounit "${FILESDIR}"/${PN}.service
-}
-
-pkg_preinst() {
-	enewgroup ${PN}
-	# note this works only for first install so we have to
-	# elog user about the need of being in video group
-	local groups="${PN}"
-	if use cuda; then
-		group+=",video"
-	fi
-	enewuser ${PN} -1 -1 /var/lib/${PN} "${groups}"
-}
-
-pkg_postinst() {
-	echo
-	elog "You are using the source compiled version of boinc."
-	use X && elog "The graphical manager can be found at /usr/bin/boincmgr"
-	elog
-	elog "You need to attach to a project to do anything useful with boinc."
-	elog "You can do this by running /etc/init.d/boinc attach"
-	elog "The howto for configuration is located at:"
-	elog "http://boinc.berkeley.edu/wiki/Anonymous_platform"
-	elog
-	# Add warning about the new password for the client, bug 121896.
-	if use X; then
-		elog "If you need to use the graphical manager the password is in:"
-		elog "/var/lib/boinc/gui_rpc_auth.cfg"
-		elog "Where /var/lib/ is default RUNTIMEDIR, that can be changed in:"
-		elog "/etc/conf.d/boinc"
-		elog "You should change this password to something more memorable (can be even blank)."
-		elog "Remember to launch init script before using manager. Or changing the password."
-		elog
-	fi
-	if use cuda; then
-		elog "To be able to use CUDA you should add boinc user to video group."
-		elog "Run as root:"
-		elog "gpasswd -a boinc video"
-	fi
-}
diff --git a/sci-physics/lammps/Manifest b/sci-physics/lammps/Manifest
index c6d633a0fc35..3e01977d55c7 100644
--- a/sci-physics/lammps/Manifest
+++ b/sci-physics/lammps/Manifest
@@ -8,3 +8,4 @@ DIST lammps-21Jul15.tar.gz 66715434 SHA256 2e24a7b6131a35ef83cec08f4dc9f7cc5188c
 DIST lammps-22Jul15.tar.gz 67275212 SHA256 b75cdf8ead17f20433737c203c8d29c0cc3e157c9b3d175093467873aea0b869 SHA512 f6e5eaf3ca8bcd25a580a4608e0aec0021f2ed5eb23cf9ccd0a707cb8bc320568504ccffc25cccb5acfe2fc3515c58f8afc8936aea63acb3062bdc897a5eb2ee WHIRLPOOL 13c09e1045a0bdabe15e2125ccef0ea622cb12fcce63d8441b7f9843b8f1a3f7aa0c13908a2e215c1fdba8a579a17a5833111b5cf31a2471bf66e781ef281c59
 DIST lammps-24Jul15.tar.gz 67180142 SHA256 bd183f7b073e1ca86656a8f6ea99195123ce3c7829c872ca45216da4132ff96d SHA512 e285a1f326658bd23f32ecf9409d9f0bf16ed635656bbcee0d84da58e1c008363c7815001bcaa5b7701d99b3318a56240b021447e94754607c2ceb178e377122 WHIRLPOOL 003237f8e9a7caec98aa1f8f0c5e03c0cda6d60f20460e32c4eea3c92707e349f4e1a71510f1290b6e6aeac1621951080f904b1bb2224c8eb9e25067206d2b1b
 DIST lammps-29Aug15.tar.gz 87253305 SHA256 fff69b47c40936d4ccd90a8443ce5bb1bcf4cb449ae06a5822c1b11a2ab2dd67 SHA512 991c56608a3288ebdcd2fb0857c595d42047b5ed0780b6d4ddb98388627499727b6c04fe0eff3e7221238dba2a8601f0b4b4067b5aa5ec2f356b4ee13f6c129c WHIRLPOOL 88da74fa65aeb187330439417512d516fe8adf4a5df4be48fdafafa198e8c4d657ecce7f04f749d77cb2f8a7881ac47f4604cf6bc8eb3ca8b2cbc7988d866a87
+DIST lammps-4Sep15.tar.gz 87259558 SHA256 8652c801e4ce8b6b7d42a6c71f76b68a6e741dc8efb8d7d3dad36b624fe8f150 SHA512 ee730c8bd96e14931192a68c12e4ebde301cc3525b20816d051059f155b70c6edcea7dc2ed911e0b89685d751cd5a74b4bb5eedd6c16a042a2191bf8a9665fc9 WHIRLPOOL 271ac0d74e03d3e3e118a8b2385d98ce3f566ead67f1c329a219c265f886dc267b11be17c2caa52749ebac212bbc7456fba2d0d6ec69cd25815316e601b3360a
diff --git a/sci-physics/lammps/files/lammps-python3-r1.patch b/sci-physics/lammps/files/lammps-python3-r1.patch
new file mode 100644
index 000000000000..2dc2bd744fa9
--- /dev/null
+++ b/sci-physics/lammps/files/lammps-python3-r1.patch
@@ -0,0 +1,11 @@
+--- lammps-4Sep15-orig/python/lammps.py	2015-09-02 14:41:38.000000000 -0600
++++ lammps-4Sep15/python/lammps.py	2015-09-08 05:59:16.000000000 -0600
+@@ -33,7 +33,7 @@
+     except:
+       type,value,tb = sys.exc_info()
+       traceback.print_exception(type,value,tb)
+-      raise OSError,"Could not load LAMMPS dynamic library from %s" % modpath
++      raise OSError("Could not load LAMMPS dynamic library from %s" % modpath)
+ 
+     # if no ptr provided, create an instance of LAMMPS
+     #   don't know how to pass an MPI communicator from PyPar
diff --git a/sci-physics/lammps/lammps-20150904.ebuild b/sci-physics/lammps/lammps-20150904.ebuild
new file mode 100644
index 000000000000..5400e87baefb
--- /dev/null
+++ b/sci-physics/lammps/lammps-20150904.ebuild
@@ -0,0 +1,267 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_3} )
+
+inherit eutils flag-o-matic fortran-2 multilib python-r1
+
+convert_month() {
+	case $1 in
+		01) echo Jan
+			;;
+		02) echo Feb
+			;;
+		03) echo Mar
+			;;
+		04) echo Apr
+			;;
+		05) echo May
+			;;
+		06) echo Jun
+			;;
+		07) echo Jul
+			;;
+		08) echo Aug
+			;;
+		09) echo Sep
+			;;
+		10) echo Oct
+			;;
+		11) echo Nov
+			;;
+		12) echo Dec
+			;;
+		*)  echo unknown
+			;;
+	esac
+}
+
+MY_P=${PN}-$((10#${PV:6:2}))$(convert_month ${PV:4:2})${PV:2:2}
+
+DESCRIPTION="Large-scale Atomic/Molecular Massively Parallel Simulator"
+HOMEPAGE="http://lammps.sandia.gov/"
+SRC_URI="http://lammps.sandia.gov/tars/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc examples gzip lammps-memalign mpi python static-libs"
+
+DEPEND="
+	mpi? (
+		virtual/blas
+		virtual/lapack
+		virtual/mpi
+	)
+	gzip? ( app-arch/gzip )
+	sci-libs/voro++
+	python? ( ${PYTHON_DEPS} )
+	"
+RDEPEND="${DEPEND}"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+S="${WORKDIR}/${MY_P}"
+
+lmp_emake() {
+	local LAMMPS_INCLUDEFLAGS
+	LAMMPS_INCLUDEFLAGS="$(usex gzip '-DLAMMPS_GZIP' '')"
+	LAMMPS_INCLUDEFLAGS+="$(usex lammps-memalign ' -DLAMMPS_MEMALIGN=64' '')"
+
+	# The lammps makefile uses CC to indicate the C++ compiler.
+	emake \
+		ARCHIVE=$(tc-getAR) \
+		CC=$(usex mpi "mpic++" "$(tc-getCXX)") \
+		F90=$(usex mpi "mpif90" "$(tc-getFC)") \
+		LINK=$(usex mpi "mpic++" "$(tc-getCXX)") \
+		CCFLAGS="${CXXFLAGS}" \
+		F90FLAGS="${FCFLAGS}" \
+		LINKFLAGS="${LDFLAGS}" \
+		LMP_INC="${LAMMPS_INCLUDEFLAGS}" \
+		MPI_INC=$(usex mpi "" "-I../STUBS") \
+		MPI_PATH=$(usex mpi "" "-L../STUBS") \
+		MPI_LIB=$(usex mpi "" "-lmpi_stubs") \
+		user-atc_SYSLIB="$(usex mpi "$($(tc-getPKG_CONFIG) --libs blas) $($(tc-getPKG_CONFIG) --libs lapack)" '')"\
+		"$@"
+}
+
+lmp_activate_packages() {
+	# Build packages
+	lmp_emake -C src yes-asphere
+	lmp_emake -C src yes-body
+	lmp_emake -C src yes-class2
+	lmp_emake -C src yes-colloid
+	lmp_emake -C src yes-coreshell
+	lmp_emake -C src yes-dipole
+	lmp_emake -C src yes-fld
+	#lmp_emake -C src yes-gpu
+	lmp_emake -C src yes-granular
+	# Need OpenKIM external dependency.
+	#lmp_emake -C src yes-kim
+	# Need Kokkos external dependency.
+	#lmp_emake -C src yes-kokkos
+	lmp_emake -C src yes-kspace
+	lmp_emake -C src yes-manybody
+	lmp_emake -C src yes-mc
+	lmp_emake -C src yes-meam
+	lmp_emake -C src yes-misc
+	lmp_emake -C src yes-molecule
+	#lmp_emake -C src yes-mpiio
+	lmp_emake -C src yes-opt
+	lmp_emake -C src yes-peri
+	lmp_emake -C src yes-poems
+	lmp_emake -C src yes-qeq
+	lmp_emake -C src yes-reax
+	lmp_emake -C src yes-replica
+	lmp_emake -C src yes-rigid
+	lmp_emake -C src yes-shock
+	lmp_emake -C src yes-snap
+	lmp_emake -C src yes-srd
+	lmp_emake -C src yes-voronoi
+	lmp_emake -C src yes-xtc
+
+	if use mpi; then
+		lmp_emake -C src yes-user-atc
+	fi
+	lmp_emake -C src yes-user-eff
+	lmp_emake -C src yes-user-fep
+	use mpi && lmp_emake -C src yes-user-lb
+	lmp_emake -C src yes-user-phonon
+	lmp_emake -C src yes-user-sph
+}
+
+lmp_build_packages() {
+	lmp_emake -C lib/meam -j1 -f Makefile.gfortran
+	lmp_emake -C lib/poems -f Makefile.g++
+	lmp_emake -C lib/reax -j1 -f Makefile.gfortran
+	use mpi && lmp_emake -C lib/atc -f Makefile.g++
+}
+
+lmp_clean_packages() {
+	lmp_emake -C lib/meam -f Makefile.gfortran clean
+	lmp_emake -C lib/poems -f Makefile.g++ clean
+	lmp_emake -C lib/reax -f Makefile.gfortran clean
+	use mpi && lmp_emake -C lib/atc -f Makefile.g++ clean
+}
+
+src_prepare() {
+	# Fix inconsistent use of SHFLAGS.
+	sed -i \
+		-e 's:voronoi_SYSINC\s\+=.*$:voronoi_SYSINC = -I/usr/include/voro++:' \
+		-e 's:voronoi_SYSPATH\s\+=.*$:voronoi_SYSPATH =:' \
+		lib/voronoi/Makefile.lammps || die
+
+	# Fix missing .so name.
+	sed -i \
+		-e 's:SHLIBFLAGS\s\+=\s\+:SHLIBFLAGS = -Wl,-soname,liblammps.so.0 :' \
+		src/MAKE/Makefile.serial || die
+
+	# Fix makefile in tools.
+	sed -i \
+		-e 's:g++:$(CXX) $(CXXFLAGS):' \
+		-e 's:gcc:$(CC) $(CCFLAGS):' \
+		-e 's:ifort:$(FC) $(FCFLAGS):' \
+		tools/Makefile || die
+
+	# Patch python.
+	epatch "${FILESDIR}/lammps-python3-r1.patch"
+	epatch "${FILESDIR}/python-shebang.patch"
+}
+
+src_compile() {
+	# Fix atc...
+	append-cxxflags -I../../src
+
+	# Acticate packages.
+	elog "Activating lammps packages..."
+	lmp_activate_packages
+
+	# Compile stubs for serial version.
+	use mpi || lmp_emake -C src mpi-stubs
+
+	elog "Building packages..."
+	lmp_build_packages
+
+	if use static-libs; then
+		# Build static library.
+		elog "Building static library..."
+		lmp_emake -C src mode=lib serial
+	fi
+
+	# Clean out packages (that's not done by the build system with the clean
+	# target), so we can rebuild the packages with -fPIC.
+	elog "Cleaning packages..."
+	lmp_clean_packages
+
+	# The build system does not rebuild the packages with -fPIC, adding flag
+	# manually.
+	append-cxxflags -fPIC
+	append-fflags -fPIC
+
+	# Compile stubs for serial version.
+	use mpi || lmp_emake -C src mpi-stubs
+
+	elog "Building packages..."
+	lmp_build_packages
+
+	# Build shared library.
+	elog "Building shared library..."
+	lmp_emake -C src mode=shlib serial
+
+	# Compile main executable. The shared library is always built, and
+	# mode=shexe is simply a way to re-use the object files built in the
+	# "shlib" step when linking the executable. The executable is not actually
+	# using the shared library. If we have built the static library, then we
+	# link that into the executable.
+	elog "Linking executable..."
+	if use static-libs; then
+		lmp_emake -C src mode=exe serial
+	else
+		lmp_emake -C src mode=shexe serial
+	fi
+
+	# Compile tools.
+	elog "Building tools..."
+	lmp_emake -C tools binary2txt chain data2xmovie micelle2d
+}
+
+src_install() {
+	use static-libs && newlib.a src/liblammps_serial.a liblammps.a
+	newlib.so src/liblammps_serial.so liblammps.so.0.0.0
+	dosym liblammps.so.0.0.0 /usr/$(get_libdir)/liblammps.so
+	dosym liblammps.so.0.0.0 /usr/$(get_libdir)/liblammps.so.0
+	newbin src/lmp_serial lmp
+	dobin tools/binary2txt
+	dobin tools/chain
+	dobin tools/data2xmovie
+	dobin tools/micelle2d
+	# Don't forget to add header files of optional packages as they are added
+	# to this ebuild. There may also be .mod files from Fortran based
+	# packages.
+	insinto "/usr/include/${PN}"
+	doins -r src/*.h lib/meam/*.mod
+
+	local LAMMPS_POTENTIALS="usr/share/${PN}/potentials"
+	insinto "/${LAMMPS_POTENTIALS}"
+	doins potentials/*
+	echo "LAMMPS_POTENTIALS=${EROOT}${LAMMPS_POTENTIALS}" > 99lammps
+	doenvd 99lammps
+
+	# Install python script.
+	use python && python_foreach_impl python_domodule python/lammps.py
+
+	if use examples; then
+		local LAMMPS_EXAMPLES="/usr/share/${PN}/examples"
+		insinto "${LAMMPS_EXAMPLES}"
+		doins -r examples/*
+	fi
+
+	dodoc README
+	if use doc; then
+		dodoc doc/Manual.pdf
+		dohtml -r doc/*
+	fi
+}
diff --git a/sec-policy/selinux-abrt/Manifest b/sec-policy/selinux-abrt/Manifest
index 8327a635be01..91d204b0021a 100644
--- a/sec-policy/selinux-abrt/Manifest
+++ b/sec-policy/selinux-abrt/Manifest
@@ -9,5 +9,6 @@ DIST patchbundle-selinux-base-policy-2.20141203-r5.tar.bz2 274136 SHA256 c23d17c
 DIST patchbundle-selinux-base-policy-2.20141203-r6.tar.bz2 293231 SHA256 b686dcc517b97834f66d967afdcc724cb43b5c6dbf9f34043a91cdeda2625cc7 SHA512 a2c486cbe4a1d21ff3fd01bef25ecf5a633a4072646c67cfccf3f7187d95f3d9e3b482a46ba17c55c40a8e7c0dee56e9cf9ddc9f414d3e4511443b62f60d03e9 WHIRLPOOL 3d708e287e3f9b873be647b0327eab6675a8702ee1cffb56e36934cada306e5ccc64397a083dad9e59de37a067e628cacbf896ae99012d5a209e42fd7cd8a4c6
 DIST patchbundle-selinux-base-policy-2.20141203-r7.tar.bz2 295833 SHA256 ba2219b3efc747be65f94c4d8ac3cd6ee530c82c848fa41935a114184678622a SHA512 8e32d9dbfb2f0f3f50200543aadb51ed9834ccd5cdf30bf8e4d9e6d0b645ce44ffaf80f7aa9385e9c9095d9a383b3a348a92356cb5386c06544ab082a9a468c7 WHIRLPOOL 1648ee1be71e45fcf5a264816ce7edc7bab19bd28a68703923eb2d6068f1f0469ae593855231d31f88baecbf29e7cece2d6beeed20b7c04231a6c90e90d35910
 DIST patchbundle-selinux-base-policy-2.20141203-r8.tar.bz2 297919 SHA256 77539eb3d78105f8789cd8205d2698bd27e2abf100163bdd162cda860fd15120 SHA512 2f8a19e1e4bb65f32b480275f49099aed3ae9df543c7de862b3bbd93e81b89cd96dadac3d091e28673d09a6885db8c5656b3a77d0080775c110b04f2753de7a6 WHIRLPOOL 79cb7e620eb8e838192dc557c7a9ce7e713227d783cc8b63792825559b2145cad70d0af6f99948c1527557bc363feffd846c73893682b4a14fc7d08b9e20c649
+DIST patchbundle-selinux-base-policy-2.20141203-r9.tar.bz2 299602 SHA256 e8518004942a6c57170a609683e22b1410c93a2a195829c41dc8fbc703d941b5 SHA512 ce6484fbca1d2d074e50d1a3953392bd3ce0a4617df98fbac37747b469b4f160a9331586dfe1c3ddccb1ccbee24876a2f05ab49e37c8492a48baf83c2d01d140 WHIRLPOOL 1fd7b956e98e95a64c3a713a944d4531259bd156a7feabf6a89c4b5f33ac846377730eede97889e85183be086f282ebd18e860214f6ca3f01b40f2323470ee04
 DIST refpolicy-2.20140311.tar.bz2 664416 SHA256 f69437db95548c78a5dec44c236397146b144153149009ea554d2e536e5436f7 SHA512 50bacee82ed41ac8b8007ecc33bf51d22303cc2ddd27cfb72cb5520dab5f8e255186e34b89cec492c7a2d4220b200814bdede9b46c19f987a3d3d65a1c9b749a WHIRLPOOL e07480beba6ab1f02ad36b7d0c50c4a71cb39a8ec78bf8d1dc3c82bb9dd1d69d9169d7c937165ea15f60ce1147f256d46644f944107a3a8a800d5bad70d4c255
 DIST refpolicy-2.20141203.tar.bz2 680243 SHA256 f438209c430d8a2d4ddcbe4bdd3edb46f6af7dc4913637af0b73c635e40c1522 SHA512 682e4280c5799e4c12ec7594afc1389f67be35055748d2e0dbdc3419159a16c96d4946ca6178daee8370515951f8653b2e452efe8c962b8d7f9bc192f0b15a0c WHIRLPOOL 74bca232534e7af9051bb1ab9f77c1ff6c425781cf4561f781d6e9a40cc5ca0d9add540249ea5493e8782a9372aea296ead6c165c6c440ae1509eb319d151ee5
diff --git a/sec-policy/selinux-abrt/selinux-abrt-2.20141203-r8.ebuild b/sec-policy/selinux-abrt/selinux-abrt-2.20141203-r8.ebuild
index 7a8e2e206aba..d870f9f85308 100644
--- a/sec-policy/selinux-abrt/selinux-abrt-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-abrt/selinux-abrt-2.20141203-r8.ebuild
@@ -13,5 +13,5 @@ DESCRIPTION="SELinux policy for abrt"
 if [[ $PV == 9999* ]] ; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-abrt/selinux-abrt-2.20141203-r9.ebuild b/sec-policy/selinux-abrt/selinux-abrt-2.20141203-r9.ebuild
new file mode 100644
index 000000000000..7a8e2e206aba
--- /dev/null
+++ b/sec-policy/selinux-abrt/selinux-abrt-2.20141203-r9.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI="5"
+
+IUSE=""
+MODS="abrt"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for abrt"
+
+if [[ $PV == 9999* ]] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
diff --git a/sec-policy/selinux-accountsd/Manifest b/sec-policy/selinux-accountsd/Manifest
index 8327a635be01..91d204b0021a 100644
--- a/sec-policy/selinux-accountsd/Manifest
+++ b/sec-policy/selinux-accountsd/Manifest
@@ -9,5 +9,6 @@ DIST patchbundle-selinux-base-policy-2.20141203-r5.tar.bz2 274136 SHA256 c23d17c
 DIST patchbundle-selinux-base-policy-2.20141203-r6.tar.bz2 293231 SHA256 b686dcc517b97834f66d967afdcc724cb43b5c6dbf9f34043a91cdeda2625cc7 SHA512 a2c486cbe4a1d21ff3fd01bef25ecf5a633a4072646c67cfccf3f7187d95f3d9e3b482a46ba17c55c40a8e7c0dee56e9cf9ddc9f414d3e4511443b62f60d03e9 WHIRLPOOL 3d708e287e3f9b873be647b0327eab6675a8702ee1cffb56e36934cada306e5ccc64397a083dad9e59de37a067e628cacbf896ae99012d5a209e42fd7cd8a4c6
 DIST patchbundle-selinux-base-policy-2.20141203-r7.tar.bz2 295833 SHA256 ba2219b3efc747be65f94c4d8ac3cd6ee530c82c848fa41935a114184678622a SHA512 8e32d9dbfb2f0f3f50200543aadb51ed9834ccd5cdf30bf8e4d9e6d0b645ce44ffaf80f7aa9385e9c9095d9a383b3a348a92356cb5386c06544ab082a9a468c7 WHIRLPOOL 1648ee1be71e45fcf5a264816ce7edc7bab19bd28a68703923eb2d6068f1f0469ae593855231d31f88baecbf29e7cece2d6beeed20b7c04231a6c90e90d35910
 DIST patchbundle-selinux-base-policy-2.20141203-r8.tar.bz2 297919 SHA256 77539eb3d78105f8789cd8205d2698bd27e2abf100163bdd162cda860fd15120 SHA512 2f8a19e1e4bb65f32b480275f49099aed3ae9df543c7de862b3bbd93e81b89cd96dadac3d091e28673d09a6885db8c5656b3a77d0080775c110b04f2753de7a6 WHIRLPOOL 79cb7e620eb8e838192dc557c7a9ce7e713227d783cc8b63792825559b2145cad70d0af6f99948c1527557bc363feffd846c73893682b4a14fc7d08b9e20c649
+DIST patchbundle-selinux-base-policy-2.20141203-r9.tar.bz2 299602 SHA256 e8518004942a6c57170a609683e22b1410c93a2a195829c41dc8fbc703d941b5 SHA512 ce6484fbca1d2d074e50d1a3953392bd3ce0a4617df98fbac37747b469b4f160a9331586dfe1c3ddccb1ccbee24876a2f05ab49e37c8492a48baf83c2d01d140 WHIRLPOOL 1fd7b956e98e95a64c3a713a944d4531259bd156a7feabf6a89c4b5f33ac846377730eede97889e85183be086f282ebd18e860214f6ca3f01b40f2323470ee04
 DIST refpolicy-2.20140311.tar.bz2 664416 SHA256 f69437db95548c78a5dec44c236397146b144153149009ea554d2e536e5436f7 SHA512 50bacee82ed41ac8b8007ecc33bf51d22303cc2ddd27cfb72cb5520dab5f8e255186e34b89cec492c7a2d4220b200814bdede9b46c19f987a3d3d65a1c9b749a WHIRLPOOL e07480beba6ab1f02ad36b7d0c50c4a71cb39a8ec78bf8d1dc3c82bb9dd1d69d9169d7c937165ea15f60ce1147f256d46644f944107a3a8a800d5bad70d4c255
 DIST refpolicy-2.20141203.tar.bz2 680243 SHA256 f438209c430d8a2d4ddcbe4bdd3edb46f6af7dc4913637af0b73c635e40c1522 SHA512 682e4280c5799e4c12ec7594afc1389f67be35055748d2e0dbdc3419159a16c96d4946ca6178daee8370515951f8653b2e452efe8c962b8d7f9bc192f0b15a0c WHIRLPOOL 74bca232534e7af9051bb1ab9f77c1ff6c425781cf4561f781d6e9a40cc5ca0d9add540249ea5493e8782a9372aea296ead6c165c6c440ae1509eb319d151ee5
diff --git a/sec-policy/selinux-accountsd/selinux-accountsd-2.20141203-r8.ebuild b/sec-policy/selinux-accountsd/selinux-accountsd-2.20141203-r8.ebuild
index a23ce2fa2d67..425c5a48ad70 100644
--- a/sec-policy/selinux-accountsd/selinux-accountsd-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-accountsd/selinux-accountsd-2.20141203-r8.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="SELinux policy for accountsd"
 if [[ $PV == 9999* ]] ; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-accountsd/selinux-accountsd-2.20141203-r9.ebuild b/sec-policy/selinux-accountsd/selinux-accountsd-2.20141203-r9.ebuild
new file mode 100644
index 000000000000..a23ce2fa2d67
--- /dev/null
+++ b/sec-policy/selinux-accountsd/selinux-accountsd-2.20141203-r9.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI="5"
+
+IUSE=""
+MODS="accountsd"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for accountsd"
+
+if [[ $PV == 9999* ]] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DEPEND="${DEPEND}
+	sec-policy/selinux-dbus
+"
+RDEPEND="${RDEPEND}
+	sec-policy/selinux-dbus
+"
diff --git a/sec-policy/selinux-acct/Manifest b/sec-policy/selinux-acct/Manifest
index 8327a635be01..91d204b0021a 100644
--- a/sec-policy/selinux-acct/Manifest
+++ b/sec-policy/selinux-acct/Manifest
@@ -9,5 +9,6 @@ DIST patchbundle-selinux-base-policy-2.20141203-r5.tar.bz2 274136 SHA256 c23d17c
 DIST patchbundle-selinux-base-policy-2.20141203-r6.tar.bz2 293231 SHA256 b686dcc517b97834f66d967afdcc724cb43b5c6dbf9f34043a91cdeda2625cc7 SHA512 a2c486cbe4a1d21ff3fd01bef25ecf5a633a4072646c67cfccf3f7187d95f3d9e3b482a46ba17c55c40a8e7c0dee56e9cf9ddc9f414d3e4511443b62f60d03e9 WHIRLPOOL 3d708e287e3f9b873be647b0327eab6675a8702ee1cffb56e36934cada306e5ccc64397a083dad9e59de37a067e628cacbf896ae99012d5a209e42fd7cd8a4c6
 DIST patchbundle-selinux-base-policy-2.20141203-r7.tar.bz2 295833 SHA256 ba2219b3efc747be65f94c4d8ac3cd6ee530c82c848fa41935a114184678622a SHA512 8e32d9dbfb2f0f3f50200543aadb51ed9834ccd5cdf30bf8e4d9e6d0b645ce44ffaf80f7aa9385e9c9095d9a383b3a348a92356cb5386c06544ab082a9a468c7 WHIRLPOOL 1648ee1be71e45fcf5a264816ce7edc7bab19bd28a68703923eb2d6068f1f0469ae593855231d31f88baecbf29e7cece2d6beeed20b7c04231a6c90e90d35910
 DIST patchbundle-selinux-base-policy-2.20141203-r8.tar.bz2 297919 SHA256 77539eb3d78105f8789cd8205d2698bd27e2abf100163bdd162cda860fd15120 SHA512 2f8a19e1e4bb65f32b480275f49099aed3ae9df543c7de862b3bbd93e81b89cd96dadac3d091e28673d09a6885db8c5656b3a77d0080775c110b04f2753de7a6 WHIRLPOOL 79cb7e620eb8e838192dc557c7a9ce7e713227d783cc8b63792825559b2145cad70d0af6f99948c1527557bc363feffd846c73893682b4a14fc7d08b9e20c649
+DIST patchbundle-selinux-base-policy-2.20141203-r9.tar.bz2 299602 SHA256 e8518004942a6c57170a609683e22b1410c93a2a195829c41dc8fbc703d941b5 SHA512 ce6484fbca1d2d074e50d1a3953392bd3ce0a4617df98fbac37747b469b4f160a9331586dfe1c3ddccb1ccbee24876a2f05ab49e37c8492a48baf83c2d01d140 WHIRLPOOL 1fd7b956e98e95a64c3a713a944d4531259bd156a7feabf6a89c4b5f33ac846377730eede97889e85183be086f282ebd18e860214f6ca3f01b40f2323470ee04
 DIST refpolicy-2.20140311.tar.bz2 664416 SHA256 f69437db95548c78a5dec44c236397146b144153149009ea554d2e536e5436f7 SHA512 50bacee82ed41ac8b8007ecc33bf51d22303cc2ddd27cfb72cb5520dab5f8e255186e34b89cec492c7a2d4220b200814bdede9b46c19f987a3d3d65a1c9b749a WHIRLPOOL e07480beba6ab1f02ad36b7d0c50c4a71cb39a8ec78bf8d1dc3c82bb9dd1d69d9169d7c937165ea15f60ce1147f256d46644f944107a3a8a800d5bad70d4c255
 DIST refpolicy-2.20141203.tar.bz2 680243 SHA256 f438209c430d8a2d4ddcbe4bdd3edb46f6af7dc4913637af0b73c635e40c1522 SHA512 682e4280c5799e4c12ec7594afc1389f67be35055748d2e0dbdc3419159a16c96d4946ca6178daee8370515951f8653b2e452efe8c962b8d7f9bc192f0b15a0c WHIRLPOOL 74bca232534e7af9051bb1ab9f77c1ff6c425781cf4561f781d6e9a40cc5ca0d9add540249ea5493e8782a9372aea296ead6c165c6c440ae1509eb319d151ee5
diff --git a/sec-policy/selinux-acct/selinux-acct-2.20141203-r8.ebuild b/sec-policy/selinux-acct/selinux-acct-2.20141203-r8.ebuild
index a6af4bd679d3..236e134bd523 100644
--- a/sec-policy/selinux-acct/selinux-acct-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-acct/selinux-acct-2.20141203-r8.ebuild
@@ -13,5 +13,5 @@ DESCRIPTION="SELinux policy for acct"
 if [[ $PV == 9999* ]] ; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-acct/selinux-acct-2.20141203-r9.ebuild b/sec-policy/selinux-acct/selinux-acct-2.20141203-r9.ebuild
new file mode 100644
index 000000000000..a6af4bd679d3
--- /dev/null
+++ b/sec-policy/selinux-acct/selinux-acct-2.20141203-r9.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI="5"
+
+IUSE=""
+MODS="acct"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for acct"
+
+if [[ $PV == 9999* ]] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
diff --git a/sec-policy/selinux-ada/Manifest b/sec-policy/selinux-ada/Manifest
index 8327a635be01..91d204b0021a 100644
--- a/sec-policy/selinux-ada/Manifest
+++ b/sec-policy/selinux-ada/Manifest
@@ -9,5 +9,6 @@ DIST patchbundle-selinux-base-policy-2.20141203-r5.tar.bz2 274136 SHA256 c23d17c
 DIST patchbundle-selinux-base-policy-2.20141203-r6.tar.bz2 293231 SHA256 b686dcc517b97834f66d967afdcc724cb43b5c6dbf9f34043a91cdeda2625cc7 SHA512 a2c486cbe4a1d21ff3fd01bef25ecf5a633a4072646c67cfccf3f7187d95f3d9e3b482a46ba17c55c40a8e7c0dee56e9cf9ddc9f414d3e4511443b62f60d03e9 WHIRLPOOL 3d708e287e3f9b873be647b0327eab6675a8702ee1cffb56e36934cada306e5ccc64397a083dad9e59de37a067e628cacbf896ae99012d5a209e42fd7cd8a4c6
 DIST patchbundle-selinux-base-policy-2.20141203-r7.tar.bz2 295833 SHA256 ba2219b3efc747be65f94c4d8ac3cd6ee530c82c848fa41935a114184678622a SHA512 8e32d9dbfb2f0f3f50200543aadb51ed9834ccd5cdf30bf8e4d9e6d0b645ce44ffaf80f7aa9385e9c9095d9a383b3a348a92356cb5386c06544ab082a9a468c7 WHIRLPOOL 1648ee1be71e45fcf5a264816ce7edc7bab19bd28a68703923eb2d6068f1f0469ae593855231d31f88baecbf29e7cece2d6beeed20b7c04231a6c90e90d35910
 DIST patchbundle-selinux-base-policy-2.20141203-r8.tar.bz2 297919 SHA256 77539eb3d78105f8789cd8205d2698bd27e2abf100163bdd162cda860fd15120 SHA512 2f8a19e1e4bb65f32b480275f49099aed3ae9df543c7de862b3bbd93e81b89cd96dadac3d091e28673d09a6885db8c5656b3a77d0080775c110b04f2753de7a6 WHIRLPOOL 79cb7e620eb8e838192dc557c7a9ce7e713227d783cc8b63792825559b2145cad70d0af6f99948c1527557bc363feffd846c73893682b4a14fc7d08b9e20c649
+DIST patchbundle-selinux-base-policy-2.20141203-r9.tar.bz2 299602 SHA256 e8518004942a6c57170a609683e22b1410c93a2a195829c41dc8fbc703d941b5 SHA512 ce6484fbca1d2d074e50d1a3953392bd3ce0a4617df98fbac37747b469b4f160a9331586dfe1c3ddccb1ccbee24876a2f05ab49e37c8492a48baf83c2d01d140 WHIRLPOOL 1fd7b956e98e95a64c3a713a944d4531259bd156a7feabf6a89c4b5f33ac846377730eede97889e85183be086f282ebd18e860214f6ca3f01b40f2323470ee04
 DIST refpolicy-2.20140311.tar.bz2 664416 SHA256 f69437db95548c78a5dec44c236397146b144153149009ea554d2e536e5436f7 SHA512 50bacee82ed41ac8b8007ecc33bf51d22303cc2ddd27cfb72cb5520dab5f8e255186e34b89cec492c7a2d4220b200814bdede9b46c19f987a3d3d65a1c9b749a WHIRLPOOL e07480beba6ab1f02ad36b7d0c50c4a71cb39a8ec78bf8d1dc3c82bb9dd1d69d9169d7c937165ea15f60ce1147f256d46644f944107a3a8a800d5bad70d4c255
 DIST refpolicy-2.20141203.tar.bz2 680243 SHA256 f438209c430d8a2d4ddcbe4bdd3edb46f6af7dc4913637af0b73c635e40c1522 SHA512 682e4280c5799e4c12ec7594afc1389f67be35055748d2e0dbdc3419159a16c96d4946ca6178daee8370515951f8653b2e452efe8c962b8d7f9bc192f0b15a0c WHIRLPOOL 74bca232534e7af9051bb1ab9f77c1ff6c425781cf4561f781d6e9a40cc5ca0d9add540249ea5493e8782a9372aea296ead6c165c6c440ae1509eb319d151ee5
diff --git a/sec-policy/selinux-ada/selinux-ada-2.20141203-r8.ebuild b/sec-policy/selinux-ada/selinux-ada-2.20141203-r8.ebuild
index 2fb9bc56bdc5..9727174906b9 100644
--- a/sec-policy/selinux-ada/selinux-ada-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-ada/selinux-ada-2.20141203-r8.ebuild
@@ -13,5 +13,5 @@ DESCRIPTION="SELinux policy for ada"
 if [[ $PV == 9999* ]] ; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-ada/selinux-ada-2.20141203-r9.ebuild b/sec-policy/selinux-ada/selinux-ada-2.20141203-r9.ebuild
new file mode 100644
index 000000000000..2fb9bc56bdc5
--- /dev/null
+++ b/sec-policy/selinux-ada/selinux-ada-2.20141203-r9.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI="5"
+
+IUSE=""
+MODS="ada"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for ada"
+
+if [[ $PV == 9999* ]] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
diff --git a/sec-policy/selinux-afs/Manifest b/sec-policy/selinux-afs/Manifest
index 8327a635be01..91d204b0021a 100644
--- a/sec-policy/selinux-afs/Manifest
+++ b/sec-policy/selinux-afs/Manifest
@@ -9,5 +9,6 @@ DIST patchbundle-selinux-base-policy-2.20141203-r5.tar.bz2 274136 SHA256 c23d17c
 DIST patchbundle-selinux-base-policy-2.20141203-r6.tar.bz2 293231 SHA256 b686dcc517b97834f66d967afdcc724cb43b5c6dbf9f34043a91cdeda2625cc7 SHA512 a2c486cbe4a1d21ff3fd01bef25ecf5a633a4072646c67cfccf3f7187d95f3d9e3b482a46ba17c55c40a8e7c0dee56e9cf9ddc9f414d3e4511443b62f60d03e9 WHIRLPOOL 3d708e287e3f9b873be647b0327eab6675a8702ee1cffb56e36934cada306e5ccc64397a083dad9e59de37a067e628cacbf896ae99012d5a209e42fd7cd8a4c6
 DIST patchbundle-selinux-base-policy-2.20141203-r7.tar.bz2 295833 SHA256 ba2219b3efc747be65f94c4d8ac3cd6ee530c82c848fa41935a114184678622a SHA512 8e32d9dbfb2f0f3f50200543aadb51ed9834ccd5cdf30bf8e4d9e6d0b645ce44ffaf80f7aa9385e9c9095d9a383b3a348a92356cb5386c06544ab082a9a468c7 WHIRLPOOL 1648ee1be71e45fcf5a264816ce7edc7bab19bd28a68703923eb2d6068f1f0469ae593855231d31f88baecbf29e7cece2d6beeed20b7c04231a6c90e90d35910
 DIST patchbundle-selinux-base-policy-2.20141203-r8.tar.bz2 297919 SHA256 77539eb3d78105f8789cd8205d2698bd27e2abf100163bdd162cda860fd15120 SHA512 2f8a19e1e4bb65f32b480275f49099aed3ae9df543c7de862b3bbd93e81b89cd96dadac3d091e28673d09a6885db8c5656b3a77d0080775c110b04f2753de7a6 WHIRLPOOL 79cb7e620eb8e838192dc557c7a9ce7e713227d783cc8b63792825559b2145cad70d0af6f99948c1527557bc363feffd846c73893682b4a14fc7d08b9e20c649
+DIST patchbundle-selinux-base-policy-2.20141203-r9.tar.bz2 299602 SHA256 e8518004942a6c57170a609683e22b1410c93a2a195829c41dc8fbc703d941b5 SHA512 ce6484fbca1d2d074e50d1a3953392bd3ce0a4617df98fbac37747b469b4f160a9331586dfe1c3ddccb1ccbee24876a2f05ab49e37c8492a48baf83c2d01d140 WHIRLPOOL 1fd7b956e98e95a64c3a713a944d4531259bd156a7feabf6a89c4b5f33ac846377730eede97889e85183be086f282ebd18e860214f6ca3f01b40f2323470ee04
 DIST refpolicy-2.20140311.tar.bz2 664416 SHA256 f69437db95548c78a5dec44c236397146b144153149009ea554d2e536e5436f7 SHA512 50bacee82ed41ac8b8007ecc33bf51d22303cc2ddd27cfb72cb5520dab5f8e255186e34b89cec492c7a2d4220b200814bdede9b46c19f987a3d3d65a1c9b749a WHIRLPOOL e07480beba6ab1f02ad36b7d0c50c4a71cb39a8ec78bf8d1dc3c82bb9dd1d69d9169d7c937165ea15f60ce1147f256d46644f944107a3a8a800d5bad70d4c255
 DIST refpolicy-2.20141203.tar.bz2 680243 SHA256 f438209c430d8a2d4ddcbe4bdd3edb46f6af7dc4913637af0b73c635e40c1522 SHA512 682e4280c5799e4c12ec7594afc1389f67be35055748d2e0dbdc3419159a16c96d4946ca6178daee8370515951f8653b2e452efe8c962b8d7f9bc192f0b15a0c WHIRLPOOL 74bca232534e7af9051bb1ab9f77c1ff6c425781cf4561f781d6e9a40cc5ca0d9add540249ea5493e8782a9372aea296ead6c165c6c440ae1509eb319d151ee5
diff --git a/sec-policy/selinux-afs/selinux-afs-2.20141203-r8.ebuild b/sec-policy/selinux-afs/selinux-afs-2.20141203-r8.ebuild
index a85b1067ff39..90cb62870388 100644
--- a/sec-policy/selinux-afs/selinux-afs-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-afs/selinux-afs-2.20141203-r8.ebuild
@@ -13,5 +13,5 @@ DESCRIPTION="SELinux policy for afs"
 if [[ $PV == 9999* ]] ; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-afs/selinux-afs-2.20141203-r9.ebuild b/sec-policy/selinux-afs/selinux-afs-2.20141203-r9.ebuild
new file mode 100644
index 000000000000..a85b1067ff39
--- /dev/null
+++ b/sec-policy/selinux-afs/selinux-afs-2.20141203-r9.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI="5"
+
+IUSE=""
+MODS="afs"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for afs"
+
+if [[ $PV == 9999* ]] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
diff --git a/sec-policy/selinux-aide/Manifest b/sec-policy/selinux-aide/Manifest
index 8327a635be01..91d204b0021a 100644
--- a/sec-policy/selinux-aide/Manifest
+++ b/sec-policy/selinux-aide/Manifest
@@ -9,5 +9,6 @@ DIST patchbundle-selinux-base-policy-2.20141203-r5.tar.bz2 274136 SHA256 c23d17c
 DIST patchbundle-selinux-base-policy-2.20141203-r6.tar.bz2 293231 SHA256 b686dcc517b97834f66d967afdcc724cb43b5c6dbf9f34043a91cdeda2625cc7 SHA512 a2c486cbe4a1d21ff3fd01bef25ecf5a633a4072646c67cfccf3f7187d95f3d9e3b482a46ba17c55c40a8e7c0dee56e9cf9ddc9f414d3e4511443b62f60d03e9 WHIRLPOOL 3d708e287e3f9b873be647b0327eab6675a8702ee1cffb56e36934cada306e5ccc64397a083dad9e59de37a067e628cacbf896ae99012d5a209e42fd7cd8a4c6
 DIST patchbundle-selinux-base-policy-2.20141203-r7.tar.bz2 295833 SHA256 ba2219b3efc747be65f94c4d8ac3cd6ee530c82c848fa41935a114184678622a SHA512 8e32d9dbfb2f0f3f50200543aadb51ed9834ccd5cdf30bf8e4d9e6d0b645ce44ffaf80f7aa9385e9c9095d9a383b3a348a92356cb5386c06544ab082a9a468c7 WHIRLPOOL 1648ee1be71e45fcf5a264816ce7edc7bab19bd28a68703923eb2d6068f1f0469ae593855231d31f88baecbf29e7cece2d6beeed20b7c04231a6c90e90d35910
 DIST patchbundle-selinux-base-policy-2.20141203-r8.tar.bz2 297919 SHA256 77539eb3d78105f8789cd8205d2698bd27e2abf100163bdd162cda860fd15120 SHA512 2f8a19e1e4bb65f32b480275f49099aed3ae9df543c7de862b3bbd93e81b89cd96dadac3d091e28673d09a6885db8c5656b3a77d0080775c110b04f2753de7a6 WHIRLPOOL 79cb7e620eb8e838192dc557c7a9ce7e713227d783cc8b63792825559b2145cad70d0af6f99948c1527557bc363feffd846c73893682b4a14fc7d08b9e20c649
+DIST patchbundle-selinux-base-policy-2.20141203-r9.tar.bz2 299602 SHA256 e8518004942a6c57170a609683e22b1410c93a2a195829c41dc8fbc703d941b5 SHA512 ce6484fbca1d2d074e50d1a3953392bd3ce0a4617df98fbac37747b469b4f160a9331586dfe1c3ddccb1ccbee24876a2f05ab49e37c8492a48baf83c2d01d140 WHIRLPOOL 1fd7b956e98e95a64c3a713a944d4531259bd156a7feabf6a89c4b5f33ac846377730eede97889e85183be086f282ebd18e860214f6ca3f01b40f2323470ee04
 DIST refpolicy-2.20140311.tar.bz2 664416 SHA256 f69437db95548c78a5dec44c236397146b144153149009ea554d2e536e5436f7 SHA512 50bacee82ed41ac8b8007ecc33bf51d22303cc2ddd27cfb72cb5520dab5f8e255186e34b89cec492c7a2d4220b200814bdede9b46c19f987a3d3d65a1c9b749a WHIRLPOOL e07480beba6ab1f02ad36b7d0c50c4a71cb39a8ec78bf8d1dc3c82bb9dd1d69d9169d7c937165ea15f60ce1147f256d46644f944107a3a8a800d5bad70d4c255
 DIST refpolicy-2.20141203.tar.bz2 680243 SHA256 f438209c430d8a2d4ddcbe4bdd3edb46f6af7dc4913637af0b73c635e40c1522 SHA512 682e4280c5799e4c12ec7594afc1389f67be35055748d2e0dbdc3419159a16c96d4946ca6178daee8370515951f8653b2e452efe8c962b8d7f9bc192f0b15a0c WHIRLPOOL 74bca232534e7af9051bb1ab9f77c1ff6c425781cf4561f781d6e9a40cc5ca0d9add540249ea5493e8782a9372aea296ead6c165c6c440ae1509eb319d151ee5
diff --git a/sec-policy/selinux-aide/selinux-aide-2.20141203-r8.ebuild b/sec-policy/selinux-aide/selinux-aide-2.20141203-r8.ebuild
index 577bf38526f8..3d1f762da5eb 100644
--- a/sec-policy/selinux-aide/selinux-aide-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-aide/selinux-aide-2.20141203-r8.ebuild
@@ -13,5 +13,5 @@ DESCRIPTION="SELinux policy for aide"
 if [[ $PV == 9999* ]] ; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-aide/selinux-aide-2.20141203-r9.ebuild b/sec-policy/selinux-aide/selinux-aide-2.20141203-r9.ebuild
new file mode 100644
index 000000000000..577bf38526f8
--- /dev/null
+++ b/sec-policy/selinux-aide/selinux-aide-2.20141203-r9.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI="5"
+
+IUSE=""
+MODS="aide"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for aide"
+
+if [[ $PV == 9999* ]] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
diff --git a/sec-policy/selinux-alsa/Manifest b/sec-policy/selinux-alsa/Manifest
index 8327a635be01..91d204b0021a 100644
--- a/sec-policy/selinux-alsa/Manifest
+++ b/sec-policy/selinux-alsa/Manifest
@@ -9,5 +9,6 @@ DIST patchbundle-selinux-base-policy-2.20141203-r5.tar.bz2 274136 SHA256 c23d17c
 DIST patchbundle-selinux-base-policy-2.20141203-r6.tar.bz2 293231 SHA256 b686dcc517b97834f66d967afdcc724cb43b5c6dbf9f34043a91cdeda2625cc7 SHA512 a2c486cbe4a1d21ff3fd01bef25ecf5a633a4072646c67cfccf3f7187d95f3d9e3b482a46ba17c55c40a8e7c0dee56e9cf9ddc9f414d3e4511443b62f60d03e9 WHIRLPOOL 3d708e287e3f9b873be647b0327eab6675a8702ee1cffb56e36934cada306e5ccc64397a083dad9e59de37a067e628cacbf896ae99012d5a209e42fd7cd8a4c6
 DIST patchbundle-selinux-base-policy-2.20141203-r7.tar.bz2 295833 SHA256 ba2219b3efc747be65f94c4d8ac3cd6ee530c82c848fa41935a114184678622a SHA512 8e32d9dbfb2f0f3f50200543aadb51ed9834ccd5cdf30bf8e4d9e6d0b645ce44ffaf80f7aa9385e9c9095d9a383b3a348a92356cb5386c06544ab082a9a468c7 WHIRLPOOL 1648ee1be71e45fcf5a264816ce7edc7bab19bd28a68703923eb2d6068f1f0469ae593855231d31f88baecbf29e7cece2d6beeed20b7c04231a6c90e90d35910
 DIST patchbundle-selinux-base-policy-2.20141203-r8.tar.bz2 297919 SHA256 77539eb3d78105f8789cd8205d2698bd27e2abf100163bdd162cda860fd15120 SHA512 2f8a19e1e4bb65f32b480275f49099aed3ae9df543c7de862b3bbd93e81b89cd96dadac3d091e28673d09a6885db8c5656b3a77d0080775c110b04f2753de7a6 WHIRLPOOL 79cb7e620eb8e838192dc557c7a9ce7e713227d783cc8b63792825559b2145cad70d0af6f99948c1527557bc363feffd846c73893682b4a14fc7d08b9e20c649
+DIST patchbundle-selinux-base-policy-2.20141203-r9.tar.bz2 299602 SHA256 e8518004942a6c57170a609683e22b1410c93a2a195829c41dc8fbc703d941b5 SHA512 ce6484fbca1d2d074e50d1a3953392bd3ce0a4617df98fbac37747b469b4f160a9331586dfe1c3ddccb1ccbee24876a2f05ab49e37c8492a48baf83c2d01d140 WHIRLPOOL 1fd7b956e98e95a64c3a713a944d4531259bd156a7feabf6a89c4b5f33ac846377730eede97889e85183be086f282ebd18e860214f6ca3f01b40f2323470ee04
 DIST refpolicy-2.20140311.tar.bz2 664416 SHA256 f69437db95548c78a5dec44c236397146b144153149009ea554d2e536e5436f7 SHA512 50bacee82ed41ac8b8007ecc33bf51d22303cc2ddd27cfb72cb5520dab5f8e255186e34b89cec492c7a2d4220b200814bdede9b46c19f987a3d3d65a1c9b749a WHIRLPOOL e07480beba6ab1f02ad36b7d0c50c4a71cb39a8ec78bf8d1dc3c82bb9dd1d69d9169d7c937165ea15f60ce1147f256d46644f944107a3a8a800d5bad70d4c255
 DIST refpolicy-2.20141203.tar.bz2 680243 SHA256 f438209c430d8a2d4ddcbe4bdd3edb46f6af7dc4913637af0b73c635e40c1522 SHA512 682e4280c5799e4c12ec7594afc1389f67be35055748d2e0dbdc3419159a16c96d4946ca6178daee8370515951f8653b2e452efe8c962b8d7f9bc192f0b15a0c WHIRLPOOL 74bca232534e7af9051bb1ab9f77c1ff6c425781cf4561f781d6e9a40cc5ca0d9add540249ea5493e8782a9372aea296ead6c165c6c440ae1509eb319d151ee5
diff --git a/sec-policy/selinux-alsa/selinux-alsa-2.20141203-r8.ebuild b/sec-policy/selinux-alsa/selinux-alsa-2.20141203-r8.ebuild
index c660049b5eb5..37a1b3796e5c 100644
--- a/sec-policy/selinux-alsa/selinux-alsa-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-alsa/selinux-alsa-2.20141203-r8.ebuild
@@ -13,5 +13,5 @@ DESCRIPTION="SELinux policy for alsa"
 if [[ $PV == 9999* ]] ; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-alsa/selinux-alsa-2.20141203-r9.ebuild b/sec-policy/selinux-alsa/selinux-alsa-2.20141203-r9.ebuild
new file mode 100644
index 000000000000..c660049b5eb5
--- /dev/null
+++ b/sec-policy/selinux-alsa/selinux-alsa-2.20141203-r9.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI="5"
+
+IUSE=""
+MODS="alsa"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for alsa"
+
+if [[ $PV == 9999* ]] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
diff --git a/sec-policy/selinux-amanda/Manifest b/sec-policy/selinux-amanda/Manifest
index 8327a635be01..91d204b0021a 100644
--- a/sec-policy/selinux-amanda/Manifest
+++ b/sec-policy/selinux-amanda/Manifest
@@ -9,5 +9,6 @@ DIST patchbundle-selinux-base-policy-2.20141203-r5.tar.bz2 274136 SHA256 c23d17c
 DIST patchbundle-selinux-base-policy-2.20141203-r6.tar.bz2 293231 SHA256 b686dcc517b97834f66d967afdcc724cb43b5c6dbf9f34043a91cdeda2625cc7 SHA512 a2c486cbe4a1d21ff3fd01bef25ecf5a633a4072646c67cfccf3f7187d95f3d9e3b482a46ba17c55c40a8e7c0dee56e9cf9ddc9f414d3e4511443b62f60d03e9 WHIRLPOOL 3d708e287e3f9b873be647b0327eab6675a8702ee1cffb56e36934cada306e5ccc64397a083dad9e59de37a067e628cacbf896ae99012d5a209e42fd7cd8a4c6
 DIST patchbundle-selinux-base-policy-2.20141203-r7.tar.bz2 295833 SHA256 ba2219b3efc747be65f94c4d8ac3cd6ee530c82c848fa41935a114184678622a SHA512 8e32d9dbfb2f0f3f50200543aadb51ed9834ccd5cdf30bf8e4d9e6d0b645ce44ffaf80f7aa9385e9c9095d9a383b3a348a92356cb5386c06544ab082a9a468c7 WHIRLPOOL 1648ee1be71e45fcf5a264816ce7edc7bab19bd28a68703923eb2d6068f1f0469ae593855231d31f88baecbf29e7cece2d6beeed20b7c04231a6c90e90d35910
 DIST patchbundle-selinux-base-policy-2.20141203-r8.tar.bz2 297919 SHA256 77539eb3d78105f8789cd8205d2698bd27e2abf100163bdd162cda860fd15120 SHA512 2f8a19e1e4bb65f32b480275f49099aed3ae9df543c7de862b3bbd93e81b89cd96dadac3d091e28673d09a6885db8c5656b3a77d0080775c110b04f2753de7a6 WHIRLPOOL 79cb7e620eb8e838192dc557c7a9ce7e713227d783cc8b63792825559b2145cad70d0af6f99948c1527557bc363feffd846c73893682b4a14fc7d08b9e20c649
+DIST patchbundle-selinux-base-policy-2.20141203-r9.tar.bz2 299602 SHA256 e8518004942a6c57170a609683e22b1410c93a2a195829c41dc8fbc703d941b5 SHA512 ce6484fbca1d2d074e50d1a3953392bd3ce0a4617df98fbac37747b469b4f160a9331586dfe1c3ddccb1ccbee24876a2f05ab49e37c8492a48baf83c2d01d140 WHIRLPOOL 1fd7b956e98e95a64c3a713a944d4531259bd156a7feabf6a89c4b5f33ac846377730eede97889e85183be086f282ebd18e860214f6ca3f01b40f2323470ee04
 DIST refpolicy-2.20140311.tar.bz2 664416 SHA256 f69437db95548c78a5dec44c236397146b144153149009ea554d2e536e5436f7 SHA512 50bacee82ed41ac8b8007ecc33bf51d22303cc2ddd27cfb72cb5520dab5f8e255186e34b89cec492c7a2d4220b200814bdede9b46c19f987a3d3d65a1c9b749a WHIRLPOOL e07480beba6ab1f02ad36b7d0c50c4a71cb39a8ec78bf8d1dc3c82bb9dd1d69d9169d7c937165ea15f60ce1147f256d46644f944107a3a8a800d5bad70d4c255
 DIST refpolicy-2.20141203.tar.bz2 680243 SHA256 f438209c430d8a2d4ddcbe4bdd3edb46f6af7dc4913637af0b73c635e40c1522 SHA512 682e4280c5799e4c12ec7594afc1389f67be35055748d2e0dbdc3419159a16c96d4946ca6178daee8370515951f8653b2e452efe8c962b8d7f9bc192f0b15a0c WHIRLPOOL 74bca232534e7af9051bb1ab9f77c1ff6c425781cf4561f781d6e9a40cc5ca0d9add540249ea5493e8782a9372aea296ead6c165c6c440ae1509eb319d151ee5
diff --git a/sec-policy/selinux-amanda/selinux-amanda-2.20141203-r8.ebuild b/sec-policy/selinux-amanda/selinux-amanda-2.20141203-r8.ebuild
index 8a16d377d1ed..84b1daef572a 100644
--- a/sec-policy/selinux-amanda/selinux-amanda-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-amanda/selinux-amanda-2.20141203-r8.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="SELinux policy for amanda"
 if [[ $PV == 9999* ]] ; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-inetd
diff --git a/sec-policy/selinux-amanda/selinux-amanda-2.20141203-r9.ebuild b/sec-policy/selinux-amanda/selinux-amanda-2.20141203-r9.ebuild
new file mode 100644
index 000000000000..8a16d377d1ed
--- /dev/null
+++ b/sec-policy/selinux-amanda/selinux-amanda-2.20141203-r9.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI="5"
+
+IUSE=""
+MODS="amanda"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for amanda"
+
+if [[ $PV == 9999* ]] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
+DEPEND="${DEPEND}
+	sec-policy/selinux-inetd
+"
+RDEPEND="${RDEPEND}
+	sec-policy/selinux-inetd
+"
diff --git a/sec-policy/selinux-amavis/Manifest b/sec-policy/selinux-amavis/Manifest
index 8327a635be01..91d204b0021a 100644
--- a/sec-policy/selinux-amavis/Manifest
+++ b/sec-policy/selinux-amavis/Manifest
@@ -9,5 +9,6 @@ DIST patchbundle-selinux-base-policy-2.20141203-r5.tar.bz2 274136 SHA256 c23d17c
 DIST patchbundle-selinux-base-policy-2.20141203-r6.tar.bz2 293231 SHA256 b686dcc517b97834f66d967afdcc724cb43b5c6dbf9f34043a91cdeda2625cc7 SHA512 a2c486cbe4a1d21ff3fd01bef25ecf5a633a4072646c67cfccf3f7187d95f3d9e3b482a46ba17c55c40a8e7c0dee56e9cf9ddc9f414d3e4511443b62f60d03e9 WHIRLPOOL 3d708e287e3f9b873be647b0327eab6675a8702ee1cffb56e36934cada306e5ccc64397a083dad9e59de37a067e628cacbf896ae99012d5a209e42fd7cd8a4c6
 DIST patchbundle-selinux-base-policy-2.20141203-r7.tar.bz2 295833 SHA256 ba2219b3efc747be65f94c4d8ac3cd6ee530c82c848fa41935a114184678622a SHA512 8e32d9dbfb2f0f3f50200543aadb51ed9834ccd5cdf30bf8e4d9e6d0b645ce44ffaf80f7aa9385e9c9095d9a383b3a348a92356cb5386c06544ab082a9a468c7 WHIRLPOOL 1648ee1be71e45fcf5a264816ce7edc7bab19bd28a68703923eb2d6068f1f0469ae593855231d31f88baecbf29e7cece2d6beeed20b7c04231a6c90e90d35910
 DIST patchbundle-selinux-base-policy-2.20141203-r8.tar.bz2 297919 SHA256 77539eb3d78105f8789cd8205d2698bd27e2abf100163bdd162cda860fd15120 SHA512 2f8a19e1e4bb65f32b480275f49099aed3ae9df543c7de862b3bbd93e81b89cd96dadac3d091e28673d09a6885db8c5656b3a77d0080775c110b04f2753de7a6 WHIRLPOOL 79cb7e620eb8e838192dc557c7a9ce7e713227d783cc8b63792825559b2145cad70d0af6f99948c1527557bc363feffd846c73893682b4a14fc7d08b9e20c649
+DIST patchbundle-selinux-base-policy-2.20141203-r9.tar.bz2 299602 SHA256 e8518004942a6c57170a609683e22b1410c93a2a195829c41dc8fbc703d941b5 SHA512 ce6484fbca1d2d074e50d1a3953392bd3ce0a4617df98fbac37747b469b4f160a9331586dfe1c3ddccb1ccbee24876a2f05ab49e37c8492a48baf83c2d01d140 WHIRLPOOL 1fd7b956e98e95a64c3a713a944d4531259bd156a7feabf6a89c4b5f33ac846377730eede97889e85183be086f282ebd18e860214f6ca3f01b40f2323470ee04
 DIST refpolicy-2.20140311.tar.bz2 664416 SHA256 f69437db95548c78a5dec44c236397146b144153149009ea554d2e536e5436f7 SHA512 50bacee82ed41ac8b8007ecc33bf51d22303cc2ddd27cfb72cb5520dab5f8e255186e34b89cec492c7a2d4220b200814bdede9b46c19f987a3d3d65a1c9b749a WHIRLPOOL e07480beba6ab1f02ad36b7d0c50c4a71cb39a8ec78bf8d1dc3c82bb9dd1d69d9169d7c937165ea15f60ce1147f256d46644f944107a3a8a800d5bad70d4c255
 DIST refpolicy-2.20141203.tar.bz2 680243 SHA256 f438209c430d8a2d4ddcbe4bdd3edb46f6af7dc4913637af0b73c635e40c1522 SHA512 682e4280c5799e4c12ec7594afc1389f67be35055748d2e0dbdc3419159a16c96d4946ca6178daee8370515951f8653b2e452efe8c962b8d7f9bc192f0b15a0c WHIRLPOOL 74bca232534e7af9051bb1ab9f77c1ff6c425781cf4561f781d6e9a40cc5ca0d9add540249ea5493e8782a9372aea296ead6c165c6c440ae1509eb319d151ee5
diff --git a/sec-policy/selinux-amavis/selinux-amavis-2.20141203-r8.ebuild b/sec-policy/selinux-amavis/selinux-amavis-2.20141203-r8.ebuild
index 4dea763b6932..90a2274a0e7e 100644
--- a/sec-policy/selinux-amavis/selinux-amavis-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-amavis/selinux-amavis-2.20141203-r8.ebuild
@@ -13,5 +13,5 @@ DESCRIPTION="SELinux policy for amavis"
 if [[ $PV == 9999* ]] ; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-amavis/selinux-amavis-2.20141203-r9.ebuild b/sec-policy/selinux-amavis/selinux-amavis-2.20141203-r9.ebuild
new file mode 100644
index 000000000000..4dea763b6932
--- /dev/null
+++ b/sec-policy/selinux-amavis/selinux-amavis-2.20141203-r9.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI="5"
+
+IUSE=""
+MODS="amavis"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for amavis"
+
+if [[ $PV == 9999* ]] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
diff --git a/sec-policy/selinux-android/Manifest b/sec-policy/selinux-android/Manifest
index f5839e89f7b1..99929d4c391a 100644
--- a/sec-policy/selinux-android/Manifest
+++ b/sec-policy/selinux-android/Manifest
@@ -7,5 +7,6 @@ DIST patchbundle-selinux-base-policy-2.20141203-r5.tar.bz2 274136 SHA256 c23d17c
 DIST patchbundle-selinux-base-policy-2.20141203-r6.tar.bz2 293231 SHA256 b686dcc517b97834f66d967afdcc724cb43b5c6dbf9f34043a91cdeda2625cc7 SHA512 a2c486cbe4a1d21ff3fd01bef25ecf5a633a4072646c67cfccf3f7187d95f3d9e3b482a46ba17c55c40a8e7c0dee56e9cf9ddc9f414d3e4511443b62f60d03e9 WHIRLPOOL 3d708e287e3f9b873be647b0327eab6675a8702ee1cffb56e36934cada306e5ccc64397a083dad9e59de37a067e628cacbf896ae99012d5a209e42fd7cd8a4c6
 DIST patchbundle-selinux-base-policy-2.20141203-r7.tar.bz2 295833 SHA256 ba2219b3efc747be65f94c4d8ac3cd6ee530c82c848fa41935a114184678622a SHA512 8e32d9dbfb2f0f3f50200543aadb51ed9834ccd5cdf30bf8e4d9e6d0b645ce44ffaf80f7aa9385e9c9095d9a383b3a348a92356cb5386c06544ab082a9a468c7 WHIRLPOOL 1648ee1be71e45fcf5a264816ce7edc7bab19bd28a68703923eb2d6068f1f0469ae593855231d31f88baecbf29e7cece2d6beeed20b7c04231a6c90e90d35910
 DIST patchbundle-selinux-base-policy-2.20141203-r8.tar.bz2 297919 SHA256 77539eb3d78105f8789cd8205d2698bd27e2abf100163bdd162cda860fd15120 SHA512 2f8a19e1e4bb65f32b480275f49099aed3ae9df543c7de862b3bbd93e81b89cd96dadac3d091e28673d09a6885db8c5656b3a77d0080775c110b04f2753de7a6 WHIRLPOOL 79cb7e620eb8e838192dc557c7a9ce7e713227d783cc8b63792825559b2145cad70d0af6f99948c1527557bc363feffd846c73893682b4a14fc7d08b9e20c649
+DIST patchbundle-selinux-base-policy-2.20141203-r9.tar.bz2 299602 SHA256 e8518004942a6c57170a609683e22b1410c93a2a195829c41dc8fbc703d941b5 SHA512 ce6484fbca1d2d074e50d1a3953392bd3ce0a4617df98fbac37747b469b4f160a9331586dfe1c3ddccb1ccbee24876a2f05ab49e37c8492a48baf83c2d01d140 WHIRLPOOL 1fd7b956e98e95a64c3a713a944d4531259bd156a7feabf6a89c4b5f33ac846377730eede97889e85183be086f282ebd18e860214f6ca3f01b40f2323470ee04
 DIST refpolicy-2.20140311.tar.bz2 664416 SHA256 f69437db95548c78a5dec44c236397146b144153149009ea554d2e536e5436f7 SHA512 50bacee82ed41ac8b8007ecc33bf51d22303cc2ddd27cfb72cb5520dab5f8e255186e34b89cec492c7a2d4220b200814bdede9b46c19f987a3d3d65a1c9b749a WHIRLPOOL e07480beba6ab1f02ad36b7d0c50c4a71cb39a8ec78bf8d1dc3c82bb9dd1d69d9169d7c937165ea15f60ce1147f256d46644f944107a3a8a800d5bad70d4c255
 DIST refpolicy-2.20141203.tar.bz2 680243 SHA256 f438209c430d8a2d4ddcbe4bdd3edb46f6af7dc4913637af0b73c635e40c1522 SHA512 682e4280c5799e4c12ec7594afc1389f67be35055748d2e0dbdc3419159a16c96d4946ca6178daee8370515951f8653b2e452efe8c962b8d7f9bc192f0b15a0c WHIRLPOOL 74bca232534e7af9051bb1ab9f77c1ff6c425781cf4561f781d6e9a40cc5ca0d9add540249ea5493e8782a9372aea296ead6c165c6c440ae1509eb319d151ee5
diff --git a/sec-policy/selinux-android/selinux-android-2.20141203-r8.ebuild b/sec-policy/selinux-android/selinux-android-2.20141203-r8.ebuild
index 23db988d0013..fa35be339094 100644
--- a/sec-policy/selinux-android/selinux-android-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-android/selinux-android-2.20141203-r8.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="SELinux policy for android"
 if [[ $PV == 9999* ]] ; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-android/selinux-android-2.20141203-r9.ebuild b/sec-policy/selinux-android/selinux-android-2.20141203-r9.ebuild
new file mode 100644
index 000000000000..23db988d0013
--- /dev/null
+++ b/sec-policy/selinux-android/selinux-android-2.20141203-r9.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI="5"
+
+IUSE=""
+MODS="android"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for android"
+
+if [[ $PV == 9999* ]] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DEPEND="${DEPEND}
+	sec-policy/selinux-java
+	sec-policy/selinux-xserver
+"
+RDEPEND="${RDEPEND}
+	sec-policy/selinux-java
+	sec-policy/selinux-xserver
+"
diff --git a/sec-policy/selinux-apache/Manifest b/sec-policy/selinux-apache/Manifest
index 8327a635be01..91d204b0021a 100644
--- a/sec-policy/selinux-apache/Manifest
+++ b/sec-policy/selinux-apache/Manifest
@@ -9,5 +9,6 @@ DIST patchbundle-selinux-base-policy-2.20141203-r5.tar.bz2 274136 SHA256 c23d17c
 DIST patchbundle-selinux-base-policy-2.20141203-r6.tar.bz2 293231 SHA256 b686dcc517b97834f66d967afdcc724cb43b5c6dbf9f34043a91cdeda2625cc7 SHA512 a2c486cbe4a1d21ff3fd01bef25ecf5a633a4072646c67cfccf3f7187d95f3d9e3b482a46ba17c55c40a8e7c0dee56e9cf9ddc9f414d3e4511443b62f60d03e9 WHIRLPOOL 3d708e287e3f9b873be647b0327eab6675a8702ee1cffb56e36934cada306e5ccc64397a083dad9e59de37a067e628cacbf896ae99012d5a209e42fd7cd8a4c6
 DIST patchbundle-selinux-base-policy-2.20141203-r7.tar.bz2 295833 SHA256 ba2219b3efc747be65f94c4d8ac3cd6ee530c82c848fa41935a114184678622a SHA512 8e32d9dbfb2f0f3f50200543aadb51ed9834ccd5cdf30bf8e4d9e6d0b645ce44ffaf80f7aa9385e9c9095d9a383b3a348a92356cb5386c06544ab082a9a468c7 WHIRLPOOL 1648ee1be71e45fcf5a264816ce7edc7bab19bd28a68703923eb2d6068f1f0469ae593855231d31f88baecbf29e7cece2d6beeed20b7c04231a6c90e90d35910
 DIST patchbundle-selinux-base-policy-2.20141203-r8.tar.bz2 297919 SHA256 77539eb3d78105f8789cd8205d2698bd27e2abf100163bdd162cda860fd15120 SHA512 2f8a19e1e4bb65f32b480275f49099aed3ae9df543c7de862b3bbd93e81b89cd96dadac3d091e28673d09a6885db8c5656b3a77d0080775c110b04f2753de7a6 WHIRLPOOL 79cb7e620eb8e838192dc557c7a9ce7e713227d783cc8b63792825559b2145cad70d0af6f99948c1527557bc363feffd846c73893682b4a14fc7d08b9e20c649
+DIST patchbundle-selinux-base-policy-2.20141203-r9.tar.bz2 299602 SHA256 e8518004942a6c57170a609683e22b1410c93a2a195829c41dc8fbc703d941b5 SHA512 ce6484fbca1d2d074e50d1a3953392bd3ce0a4617df98fbac37747b469b4f160a9331586dfe1c3ddccb1ccbee24876a2f05ab49e37c8492a48baf83c2d01d140 WHIRLPOOL 1fd7b956e98e95a64c3a713a944d4531259bd156a7feabf6a89c4b5f33ac846377730eede97889e85183be086f282ebd18e860214f6ca3f01b40f2323470ee04
 DIST refpolicy-2.20140311.tar.bz2 664416 SHA256 f69437db95548c78a5dec44c236397146b144153149009ea554d2e536e5436f7 SHA512 50bacee82ed41ac8b8007ecc33bf51d22303cc2ddd27cfb72cb5520dab5f8e255186e34b89cec492c7a2d4220b200814bdede9b46c19f987a3d3d65a1c9b749a WHIRLPOOL e07480beba6ab1f02ad36b7d0c50c4a71cb39a8ec78bf8d1dc3c82bb9dd1d69d9169d7c937165ea15f60ce1147f256d46644f944107a3a8a800d5bad70d4c255
 DIST refpolicy-2.20141203.tar.bz2 680243 SHA256 f438209c430d8a2d4ddcbe4bdd3edb46f6af7dc4913637af0b73c635e40c1522 SHA512 682e4280c5799e4c12ec7594afc1389f67be35055748d2e0dbdc3419159a16c96d4946ca6178daee8370515951f8653b2e452efe8c962b8d7f9bc192f0b15a0c WHIRLPOOL 74bca232534e7af9051bb1ab9f77c1ff6c425781cf4561f781d6e9a40cc5ca0d9add540249ea5493e8782a9372aea296ead6c165c6c440ae1509eb319d151ee5
diff --git a/sec-policy/selinux-apache/selinux-apache-2.20141203-r8.ebuild b/sec-policy/selinux-apache/selinux-apache-2.20141203-r8.ebuild
index b0bcf737220d..fcf4600da640 100644
--- a/sec-policy/selinux-apache/selinux-apache-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-apache/selinux-apache-2.20141203-r8.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="SELinux policy for apache"
 if [[ $PV == 9999* ]] ; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-kerberos
diff --git a/sec-policy/selinux-apache/selinux-apache-2.20141203-r9.ebuild b/sec-policy/selinux-apache/selinux-apache-2.20141203-r9.ebuild
new file mode 100644
index 000000000000..b0bcf737220d
--- /dev/null
+++ b/sec-policy/selinux-apache/selinux-apache-2.20141203-r9.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI="5"
+
+IUSE=""
+MODS="apache"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for apache"
+
+if [[ $PV == 9999* ]] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
+DEPEND="${DEPEND}
+	sec-policy/selinux-kerberos
+"
+RDEPEND="${RDEPEND}
+	sec-policy/selinux-kerberos
+"
diff --git a/sec-policy/selinux-apcupsd/Manifest b/sec-policy/selinux-apcupsd/Manifest
index 8327a635be01..91d204b0021a 100644
--- a/sec-policy/selinux-apcupsd/Manifest
+++ b/sec-policy/selinux-apcupsd/Manifest
@@ -9,5 +9,6 @@ DIST patchbundle-selinux-base-policy-2.20141203-r5.tar.bz2 274136 SHA256 c23d17c
 DIST patchbundle-selinux-base-policy-2.20141203-r6.tar.bz2 293231 SHA256 b686dcc517b97834f66d967afdcc724cb43b5c6dbf9f34043a91cdeda2625cc7 SHA512 a2c486cbe4a1d21ff3fd01bef25ecf5a633a4072646c67cfccf3f7187d95f3d9e3b482a46ba17c55c40a8e7c0dee56e9cf9ddc9f414d3e4511443b62f60d03e9 WHIRLPOOL 3d708e287e3f9b873be647b0327eab6675a8702ee1cffb56e36934cada306e5ccc64397a083dad9e59de37a067e628cacbf896ae99012d5a209e42fd7cd8a4c6
 DIST patchbundle-selinux-base-policy-2.20141203-r7.tar.bz2 295833 SHA256 ba2219b3efc747be65f94c4d8ac3cd6ee530c82c848fa41935a114184678622a SHA512 8e32d9dbfb2f0f3f50200543aadb51ed9834ccd5cdf30bf8e4d9e6d0b645ce44ffaf80f7aa9385e9c9095d9a383b3a348a92356cb5386c06544ab082a9a468c7 WHIRLPOOL 1648ee1be71e45fcf5a264816ce7edc7bab19bd28a68703923eb2d6068f1f0469ae593855231d31f88baecbf29e7cece2d6beeed20b7c04231a6c90e90d35910
 DIST patchbundle-selinux-base-policy-2.20141203-r8.tar.bz2 297919 SHA256 77539eb3d78105f8789cd8205d2698bd27e2abf100163bdd162cda860fd15120 SHA512 2f8a19e1e4bb65f32b480275f49099aed3ae9df543c7de862b3bbd93e81b89cd96dadac3d091e28673d09a6885db8c5656b3a77d0080775c110b04f2753de7a6 WHIRLPOOL 79cb7e620eb8e838192dc557c7a9ce7e713227d783cc8b63792825559b2145cad70d0af6f99948c1527557bc363feffd846c73893682b4a14fc7d08b9e20c649
+DIST patchbundle-selinux-base-policy-2.20141203-r9.tar.bz2 299602 SHA256 e8518004942a6c57170a609683e22b1410c93a2a195829c41dc8fbc703d941b5 SHA512 ce6484fbca1d2d074e50d1a3953392bd3ce0a4617df98fbac37747b469b4f160a9331586dfe1c3ddccb1ccbee24876a2f05ab49e37c8492a48baf83c2d01d140 WHIRLPOOL 1fd7b956e98e95a64c3a713a944d4531259bd156a7feabf6a89c4b5f33ac846377730eede97889e85183be086f282ebd18e860214f6ca3f01b40f2323470ee04
 DIST refpolicy-2.20140311.tar.bz2 664416 SHA256 f69437db95548c78a5dec44c236397146b144153149009ea554d2e536e5436f7 SHA512 50bacee82ed41ac8b8007ecc33bf51d22303cc2ddd27cfb72cb5520dab5f8e255186e34b89cec492c7a2d4220b200814bdede9b46c19f987a3d3d65a1c9b749a WHIRLPOOL e07480beba6ab1f02ad36b7d0c50c4a71cb39a8ec78bf8d1dc3c82bb9dd1d69d9169d7c937165ea15f60ce1147f256d46644f944107a3a8a800d5bad70d4c255
 DIST refpolicy-2.20141203.tar.bz2 680243 SHA256 f438209c430d8a2d4ddcbe4bdd3edb46f6af7dc4913637af0b73c635e40c1522 SHA512 682e4280c5799e4c12ec7594afc1389f67be35055748d2e0dbdc3419159a16c96d4946ca6178daee8370515951f8653b2e452efe8c962b8d7f9bc192f0b15a0c WHIRLPOOL 74bca232534e7af9051bb1ab9f77c1ff6c425781cf4561f781d6e9a40cc5ca0d9add540249ea5493e8782a9372aea296ead6c165c6c440ae1509eb319d151ee5
diff --git a/sec-policy/selinux-apcupsd/selinux-apcupsd-2.20141203-r8.ebuild b/sec-policy/selinux-apcupsd/selinux-apcupsd-2.20141203-r8.ebuild
index d463c48b4ea1..1ec3970ce8c6 100644
--- a/sec-policy/selinux-apcupsd/selinux-apcupsd-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-apcupsd/selinux-apcupsd-2.20141203-r8.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="SELinux policy for apcupsd"
 if [[ $PV == 9999* ]] ; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-apache
diff --git a/sec-policy/selinux-apcupsd/selinux-apcupsd-2.20141203-r9.ebuild b/sec-policy/selinux-apcupsd/selinux-apcupsd-2.20141203-r9.ebuild
new file mode 100644
index 000000000000..d463c48b4ea1
--- /dev/null
+++ b/sec-policy/selinux-apcupsd/selinux-apcupsd-2.20141203-r9.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI="5"
+
+IUSE=""
+MODS="apcupsd"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for apcupsd"
+
+if [[ $PV == 9999* ]] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
+DEPEND="${DEPEND}
+	sec-policy/selinux-apache
+"
+RDEPEND="${RDEPEND}
+	sec-policy/selinux-apache
+"
diff --git a/sec-policy/selinux-apm/Manifest b/sec-policy/selinux-apm/Manifest
index 8327a635be01..91d204b0021a 100644
--- a/sec-policy/selinux-apm/Manifest
+++ b/sec-policy/selinux-apm/Manifest
@@ -9,5 +9,6 @@ DIST patchbundle-selinux-base-policy-2.20141203-r5.tar.bz2 274136 SHA256 c23d17c
 DIST patchbundle-selinux-base-policy-2.20141203-r6.tar.bz2 293231 SHA256 b686dcc517b97834f66d967afdcc724cb43b5c6dbf9f34043a91cdeda2625cc7 SHA512 a2c486cbe4a1d21ff3fd01bef25ecf5a633a4072646c67cfccf3f7187d95f3d9e3b482a46ba17c55c40a8e7c0dee56e9cf9ddc9f414d3e4511443b62f60d03e9 WHIRLPOOL 3d708e287e3f9b873be647b0327eab6675a8702ee1cffb56e36934cada306e5ccc64397a083dad9e59de37a067e628cacbf896ae99012d5a209e42fd7cd8a4c6
 DIST patchbundle-selinux-base-policy-2.20141203-r7.tar.bz2 295833 SHA256 ba2219b3efc747be65f94c4d8ac3cd6ee530c82c848fa41935a114184678622a SHA512 8e32d9dbfb2f0f3f50200543aadb51ed9834ccd5cdf30bf8e4d9e6d0b645ce44ffaf80f7aa9385e9c9095d9a383b3a348a92356cb5386c06544ab082a9a468c7 WHIRLPOOL 1648ee1be71e45fcf5a264816ce7edc7bab19bd28a68703923eb2d6068f1f0469ae593855231d31f88baecbf29e7cece2d6beeed20b7c04231a6c90e90d35910
 DIST patchbundle-selinux-base-policy-2.20141203-r8.tar.bz2 297919 SHA256 77539eb3d78105f8789cd8205d2698bd27e2abf100163bdd162cda860fd15120 SHA512 2f8a19e1e4bb65f32b480275f49099aed3ae9df543c7de862b3bbd93e81b89cd96dadac3d091e28673d09a6885db8c5656b3a77d0080775c110b04f2753de7a6 WHIRLPOOL 79cb7e620eb8e838192dc557c7a9ce7e713227d783cc8b63792825559b2145cad70d0af6f99948c1527557bc363feffd846c73893682b4a14fc7d08b9e20c649
+DIST patchbundle-selinux-base-policy-2.20141203-r9.tar.bz2 299602 SHA256 e8518004942a6c57170a609683e22b1410c93a2a195829c41dc8fbc703d941b5 SHA512 ce6484fbca1d2d074e50d1a3953392bd3ce0a4617df98fbac37747b469b4f160a9331586dfe1c3ddccb1ccbee24876a2f05ab49e37c8492a48baf83c2d01d140 WHIRLPOOL 1fd7b956e98e95a64c3a713a944d4531259bd156a7feabf6a89c4b5f33ac846377730eede97889e85183be086f282ebd18e860214f6ca3f01b40f2323470ee04
 DIST refpolicy-2.20140311.tar.bz2 664416 SHA256 f69437db95548c78a5dec44c236397146b144153149009ea554d2e536e5436f7 SHA512 50bacee82ed41ac8b8007ecc33bf51d22303cc2ddd27cfb72cb5520dab5f8e255186e34b89cec492c7a2d4220b200814bdede9b46c19f987a3d3d65a1c9b749a WHIRLPOOL e07480beba6ab1f02ad36b7d0c50c4a71cb39a8ec78bf8d1dc3c82bb9dd1d69d9169d7c937165ea15f60ce1147f256d46644f944107a3a8a800d5bad70d4c255
 DIST refpolicy-2.20141203.tar.bz2 680243 SHA256 f438209c430d8a2d4ddcbe4bdd3edb46f6af7dc4913637af0b73c635e40c1522 SHA512 682e4280c5799e4c12ec7594afc1389f67be35055748d2e0dbdc3419159a16c96d4946ca6178daee8370515951f8653b2e452efe8c962b8d7f9bc192f0b15a0c WHIRLPOOL 74bca232534e7af9051bb1ab9f77c1ff6c425781cf4561f781d6e9a40cc5ca0d9add540249ea5493e8782a9372aea296ead6c165c6c440ae1509eb319d151ee5
diff --git a/sec-policy/selinux-apm/selinux-apm-2.20141203-r8.ebuild b/sec-policy/selinux-apm/selinux-apm-2.20141203-r8.ebuild
index 509bc2021aa7..6d87a909e2bb 100644
--- a/sec-policy/selinux-apm/selinux-apm-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-apm/selinux-apm-2.20141203-r8.ebuild
@@ -13,5 +13,5 @@ DESCRIPTION="SELinux policy for apm"
 if [[ $PV == 9999* ]] ; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-apm/selinux-apm-2.20141203-r9.ebuild b/sec-policy/selinux-apm/selinux-apm-2.20141203-r9.ebuild
new file mode 100644
index 000000000000..509bc2021aa7
--- /dev/null
+++ b/sec-policy/selinux-apm/selinux-apm-2.20141203-r9.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI="5"
+
+IUSE=""
+MODS="apm"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for apm"
+
+if [[ $PV == 9999* ]] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
diff --git a/sec-policy/selinux-arpwatch/Manifest b/sec-policy/selinux-arpwatch/Manifest
index 8327a635be01..91d204b0021a 100644
--- a/sec-policy/selinux-arpwatch/Manifest
+++ b/sec-policy/selinux-arpwatch/Manifest
@@ -9,5 +9,6 @@ DIST patchbundle-selinux-base-policy-2.20141203-r5.tar.bz2 274136 SHA256 c23d17c
 DIST patchbundle-selinux-base-policy-2.20141203-r6.tar.bz2 293231 SHA256 b686dcc517b97834f66d967afdcc724cb43b5c6dbf9f34043a91cdeda2625cc7 SHA512 a2c486cbe4a1d21ff3fd01bef25ecf5a633a4072646c67cfccf3f7187d95f3d9e3b482a46ba17c55c40a8e7c0dee56e9cf9ddc9f414d3e4511443b62f60d03e9 WHIRLPOOL 3d708e287e3f9b873be647b0327eab6675a8702ee1cffb56e36934cada306e5ccc64397a083dad9e59de37a067e628cacbf896ae99012d5a209e42fd7cd8a4c6
 DIST patchbundle-selinux-base-policy-2.20141203-r7.tar.bz2 295833 SHA256 ba2219b3efc747be65f94c4d8ac3cd6ee530c82c848fa41935a114184678622a SHA512 8e32d9dbfb2f0f3f50200543aadb51ed9834ccd5cdf30bf8e4d9e6d0b645ce44ffaf80f7aa9385e9c9095d9a383b3a348a92356cb5386c06544ab082a9a468c7 WHIRLPOOL 1648ee1be71e45fcf5a264816ce7edc7bab19bd28a68703923eb2d6068f1f0469ae593855231d31f88baecbf29e7cece2d6beeed20b7c04231a6c90e90d35910
 DIST patchbundle-selinux-base-policy-2.20141203-r8.tar.bz2 297919 SHA256 77539eb3d78105f8789cd8205d2698bd27e2abf100163bdd162cda860fd15120 SHA512 2f8a19e1e4bb65f32b480275f49099aed3ae9df543c7de862b3bbd93e81b89cd96dadac3d091e28673d09a6885db8c5656b3a77d0080775c110b04f2753de7a6 WHIRLPOOL 79cb7e620eb8e838192dc557c7a9ce7e713227d783cc8b63792825559b2145cad70d0af6f99948c1527557bc363feffd846c73893682b4a14fc7d08b9e20c649
+DIST patchbundle-selinux-base-policy-2.20141203-r9.tar.bz2 299602 SHA256 e8518004942a6c57170a609683e22b1410c93a2a195829c41dc8fbc703d941b5 SHA512 ce6484fbca1d2d074e50d1a3953392bd3ce0a4617df98fbac37747b469b4f160a9331586dfe1c3ddccb1ccbee24876a2f05ab49e37c8492a48baf83c2d01d140 WHIRLPOOL 1fd7b956e98e95a64c3a713a944d4531259bd156a7feabf6a89c4b5f33ac846377730eede97889e85183be086f282ebd18e860214f6ca3f01b40f2323470ee04
 DIST refpolicy-2.20140311.tar.bz2 664416 SHA256 f69437db95548c78a5dec44c236397146b144153149009ea554d2e536e5436f7 SHA512 50bacee82ed41ac8b8007ecc33bf51d22303cc2ddd27cfb72cb5520dab5f8e255186e34b89cec492c7a2d4220b200814bdede9b46c19f987a3d3d65a1c9b749a WHIRLPOOL e07480beba6ab1f02ad36b7d0c50c4a71cb39a8ec78bf8d1dc3c82bb9dd1d69d9169d7c937165ea15f60ce1147f256d46644f944107a3a8a800d5bad70d4c255
 DIST refpolicy-2.20141203.tar.bz2 680243 SHA256 f438209c430d8a2d4ddcbe4bdd3edb46f6af7dc4913637af0b73c635e40c1522 SHA512 682e4280c5799e4c12ec7594afc1389f67be35055748d2e0dbdc3419159a16c96d4946ca6178daee8370515951f8653b2e452efe8c962b8d7f9bc192f0b15a0c WHIRLPOOL 74bca232534e7af9051bb1ab9f77c1ff6c425781cf4561f781d6e9a40cc5ca0d9add540249ea5493e8782a9372aea296ead6c165c6c440ae1509eb319d151ee5
diff --git a/sec-policy/selinux-arpwatch/selinux-arpwatch-2.20141203-r8.ebuild b/sec-policy/selinux-arpwatch/selinux-arpwatch-2.20141203-r8.ebuild
index b0fa448ee61c..d4383285c03b 100644
--- a/sec-policy/selinux-arpwatch/selinux-arpwatch-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-arpwatch/selinux-arpwatch-2.20141203-r8.ebuild
@@ -13,5 +13,5 @@ DESCRIPTION="SELinux policy for arpwatch"
 if [[ $PV == 9999* ]] ; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-arpwatch/selinux-arpwatch-2.20141203-r9.ebuild b/sec-policy/selinux-arpwatch/selinux-arpwatch-2.20141203-r9.ebuild
new file mode 100644
index 000000000000..b0fa448ee61c
--- /dev/null
+++ b/sec-policy/selinux-arpwatch/selinux-arpwatch-2.20141203-r9.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI="5"
+
+IUSE=""
+MODS="arpwatch"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for arpwatch"
+
+if [[ $PV == 9999* ]] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
diff --git a/sec-policy/selinux-asterisk/Manifest b/sec-policy/selinux-asterisk/Manifest
index 8327a635be01..91d204b0021a 100644
--- a/sec-policy/selinux-asterisk/Manifest
+++ b/sec-policy/selinux-asterisk/Manifest
@@ -9,5 +9,6 @@ DIST patchbundle-selinux-base-policy-2.20141203-r5.tar.bz2 274136 SHA256 c23d17c
 DIST patchbundle-selinux-base-policy-2.20141203-r6.tar.bz2 293231 SHA256 b686dcc517b97834f66d967afdcc724cb43b5c6dbf9f34043a91cdeda2625cc7 SHA512 a2c486cbe4a1d21ff3fd01bef25ecf5a633a4072646c67cfccf3f7187d95f3d9e3b482a46ba17c55c40a8e7c0dee56e9cf9ddc9f414d3e4511443b62f60d03e9 WHIRLPOOL 3d708e287e3f9b873be647b0327eab6675a8702ee1cffb56e36934cada306e5ccc64397a083dad9e59de37a067e628cacbf896ae99012d5a209e42fd7cd8a4c6
 DIST patchbundle-selinux-base-policy-2.20141203-r7.tar.bz2 295833 SHA256 ba2219b3efc747be65f94c4d8ac3cd6ee530c82c848fa41935a114184678622a SHA512 8e32d9dbfb2f0f3f50200543aadb51ed9834ccd5cdf30bf8e4d9e6d0b645ce44ffaf80f7aa9385e9c9095d9a383b3a348a92356cb5386c06544ab082a9a468c7 WHIRLPOOL 1648ee1be71e45fcf5a264816ce7edc7bab19bd28a68703923eb2d6068f1f0469ae593855231d31f88baecbf29e7cece2d6beeed20b7c04231a6c90e90d35910
 DIST patchbundle-selinux-base-policy-2.20141203-r8.tar.bz2 297919 SHA256 77539eb3d78105f8789cd8205d2698bd27e2abf100163bdd162cda860fd15120 SHA512 2f8a19e1e4bb65f32b480275f49099aed3ae9df543c7de862b3bbd93e81b89cd96dadac3d091e28673d09a6885db8c5656b3a77d0080775c110b04f2753de7a6 WHIRLPOOL 79cb7e620eb8e838192dc557c7a9ce7e713227d783cc8b63792825559b2145cad70d0af6f99948c1527557bc363feffd846c73893682b4a14fc7d08b9e20c649
+DIST patchbundle-selinux-base-policy-2.20141203-r9.tar.bz2 299602 SHA256 e8518004942a6c57170a609683e22b1410c93a2a195829c41dc8fbc703d941b5 SHA512 ce6484fbca1d2d074e50d1a3953392bd3ce0a4617df98fbac37747b469b4f160a9331586dfe1c3ddccb1ccbee24876a2f05ab49e37c8492a48baf83c2d01d140 WHIRLPOOL 1fd7b956e98e95a64c3a713a944d4531259bd156a7feabf6a89c4b5f33ac846377730eede97889e85183be086f282ebd18e860214f6ca3f01b40f2323470ee04
 DIST refpolicy-2.20140311.tar.bz2 664416 SHA256 f69437db95548c78a5dec44c236397146b144153149009ea554d2e536e5436f7 SHA512 50bacee82ed41ac8b8007ecc33bf51d22303cc2ddd27cfb72cb5520dab5f8e255186e34b89cec492c7a2d4220b200814bdede9b46c19f987a3d3d65a1c9b749a WHIRLPOOL e07480beba6ab1f02ad36b7d0c50c4a71cb39a8ec78bf8d1dc3c82bb9dd1d69d9169d7c937165ea15f60ce1147f256d46644f944107a3a8a800d5bad70d4c255
 DIST refpolicy-2.20141203.tar.bz2 680243 SHA256 f438209c430d8a2d4ddcbe4bdd3edb46f6af7dc4913637af0b73c635e40c1522 SHA512 682e4280c5799e4c12ec7594afc1389f67be35055748d2e0dbdc3419159a16c96d4946ca6178daee8370515951f8653b2e452efe8c962b8d7f9bc192f0b15a0c WHIRLPOOL 74bca232534e7af9051bb1ab9f77c1ff6c425781cf4561f781d6e9a40cc5ca0d9add540249ea5493e8782a9372aea296ead6c165c6c440ae1509eb319d151ee5
diff --git a/sec-policy/selinux-asterisk/selinux-asterisk-2.20141203-r8.ebuild b/sec-policy/selinux-asterisk/selinux-asterisk-2.20141203-r8.ebuild
index a4fa7528a1d9..8936841ee645 100644
--- a/sec-policy/selinux-asterisk/selinux-asterisk-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-asterisk/selinux-asterisk-2.20141203-r8.ebuild
@@ -13,5 +13,5 @@ DESCRIPTION="SELinux policy for asterisk"
 if [[ $PV == 9999* ]] ; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-asterisk/selinux-asterisk-2.20141203-r9.ebuild b/sec-policy/selinux-asterisk/selinux-asterisk-2.20141203-r9.ebuild
new file mode 100644
index 000000000000..a4fa7528a1d9
--- /dev/null
+++ b/sec-policy/selinux-asterisk/selinux-asterisk-2.20141203-r9.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI="5"
+
+IUSE=""
+MODS="asterisk"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for asterisk"
+
+if [[ $PV == 9999* ]] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
diff --git a/sec-policy/selinux-at/Manifest b/sec-policy/selinux-at/Manifest
index 8327a635be01..91d204b0021a 100644
--- a/sec-policy/selinux-at/Manifest
+++ b/sec-policy/selinux-at/Manifest
@@ -9,5 +9,6 @@ DIST patchbundle-selinux-base-policy-2.20141203-r5.tar.bz2 274136 SHA256 c23d17c
 DIST patchbundle-selinux-base-policy-2.20141203-r6.tar.bz2 293231 SHA256 b686dcc517b97834f66d967afdcc724cb43b5c6dbf9f34043a91cdeda2625cc7 SHA512 a2c486cbe4a1d21ff3fd01bef25ecf5a633a4072646c67cfccf3f7187d95f3d9e3b482a46ba17c55c40a8e7c0dee56e9cf9ddc9f414d3e4511443b62f60d03e9 WHIRLPOOL 3d708e287e3f9b873be647b0327eab6675a8702ee1cffb56e36934cada306e5ccc64397a083dad9e59de37a067e628cacbf896ae99012d5a209e42fd7cd8a4c6
 DIST patchbundle-selinux-base-policy-2.20141203-r7.tar.bz2 295833 SHA256 ba2219b3efc747be65f94c4d8ac3cd6ee530c82c848fa41935a114184678622a SHA512 8e32d9dbfb2f0f3f50200543aadb51ed9834ccd5cdf30bf8e4d9e6d0b645ce44ffaf80f7aa9385e9c9095d9a383b3a348a92356cb5386c06544ab082a9a468c7 WHIRLPOOL 1648ee1be71e45fcf5a264816ce7edc7bab19bd28a68703923eb2d6068f1f0469ae593855231d31f88baecbf29e7cece2d6beeed20b7c04231a6c90e90d35910
 DIST patchbundle-selinux-base-policy-2.20141203-r8.tar.bz2 297919 SHA256 77539eb3d78105f8789cd8205d2698bd27e2abf100163bdd162cda860fd15120 SHA512 2f8a19e1e4bb65f32b480275f49099aed3ae9df543c7de862b3bbd93e81b89cd96dadac3d091e28673d09a6885db8c5656b3a77d0080775c110b04f2753de7a6 WHIRLPOOL 79cb7e620eb8e838192dc557c7a9ce7e713227d783cc8b63792825559b2145cad70d0af6f99948c1527557bc363feffd846c73893682b4a14fc7d08b9e20c649
+DIST patchbundle-selinux-base-policy-2.20141203-r9.tar.bz2 299602 SHA256 e8518004942a6c57170a609683e22b1410c93a2a195829c41dc8fbc703d941b5 SHA512 ce6484fbca1d2d074e50d1a3953392bd3ce0a4617df98fbac37747b469b4f160a9331586dfe1c3ddccb1ccbee24876a2f05ab49e37c8492a48baf83c2d01d140 WHIRLPOOL 1fd7b956e98e95a64c3a713a944d4531259bd156a7feabf6a89c4b5f33ac846377730eede97889e85183be086f282ebd18e860214f6ca3f01b40f2323470ee04
 DIST refpolicy-2.20140311.tar.bz2 664416 SHA256 f69437db95548c78a5dec44c236397146b144153149009ea554d2e536e5436f7 SHA512 50bacee82ed41ac8b8007ecc33bf51d22303cc2ddd27cfb72cb5520dab5f8e255186e34b89cec492c7a2d4220b200814bdede9b46c19f987a3d3d65a1c9b749a WHIRLPOOL e07480beba6ab1f02ad36b7d0c50c4a71cb39a8ec78bf8d1dc3c82bb9dd1d69d9169d7c937165ea15f60ce1147f256d46644f944107a3a8a800d5bad70d4c255
 DIST refpolicy-2.20141203.tar.bz2 680243 SHA256 f438209c430d8a2d4ddcbe4bdd3edb46f6af7dc4913637af0b73c635e40c1522 SHA512 682e4280c5799e4c12ec7594afc1389f67be35055748d2e0dbdc3419159a16c96d4946ca6178daee8370515951f8653b2e452efe8c962b8d7f9bc192f0b15a0c WHIRLPOOL 74bca232534e7af9051bb1ab9f77c1ff6c425781cf4561f781d6e9a40cc5ca0d9add540249ea5493e8782a9372aea296ead6c165c6c440ae1509eb319d151ee5
diff --git a/sec-policy/selinux-at/selinux-at-2.20141203-r8.ebuild b/sec-policy/selinux-at/selinux-at-2.20141203-r8.ebuild
index 7c2c7802e001..067814b627ab 100644
--- a/sec-policy/selinux-at/selinux-at-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-at/selinux-at-2.20141203-r8.ebuild
@@ -13,5 +13,5 @@ DESCRIPTION="SELinux policy for at"
 if [[ $PV == 9999* ]] ; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-at/selinux-at-2.20141203-r9.ebuild b/sec-policy/selinux-at/selinux-at-2.20141203-r9.ebuild
new file mode 100644
index 000000000000..7c2c7802e001
--- /dev/null
+++ b/sec-policy/selinux-at/selinux-at-2.20141203-r9.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI="5"
+
+IUSE=""
+MODS="at"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for at"
+
+if [[ $PV == 9999* ]] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
diff --git a/sec-policy/selinux-automount/Manifest b/sec-policy/selinux-automount/Manifest
index 8327a635be01..91d204b0021a 100644
--- a/sec-policy/selinux-automount/Manifest
+++ b/sec-policy/selinux-automount/Manifest
@@ -9,5 +9,6 @@ DIST patchbundle-selinux-base-policy-2.20141203-r5.tar.bz2 274136 SHA256 c23d17c
 DIST patchbundle-selinux-base-policy-2.20141203-r6.tar.bz2 293231 SHA256 b686dcc517b97834f66d967afdcc724cb43b5c6dbf9f34043a91cdeda2625cc7 SHA512 a2c486cbe4a1d21ff3fd01bef25ecf5a633a4072646c67cfccf3f7187d95f3d9e3b482a46ba17c55c40a8e7c0dee56e9cf9ddc9f414d3e4511443b62f60d03e9 WHIRLPOOL 3d708e287e3f9b873be647b0327eab6675a8702ee1cffb56e36934cada306e5ccc64397a083dad9e59de37a067e628cacbf896ae99012d5a209e42fd7cd8a4c6
 DIST patchbundle-selinux-base-policy-2.20141203-r7.tar.bz2 295833 SHA256 ba2219b3efc747be65f94c4d8ac3cd6ee530c82c848fa41935a114184678622a SHA512 8e32d9dbfb2f0f3f50200543aadb51ed9834ccd5cdf30bf8e4d9e6d0b645ce44ffaf80f7aa9385e9c9095d9a383b3a348a92356cb5386c06544ab082a9a468c7 WHIRLPOOL 1648ee1be71e45fcf5a264816ce7edc7bab19bd28a68703923eb2d6068f1f0469ae593855231d31f88baecbf29e7cece2d6beeed20b7c04231a6c90e90d35910
 DIST patchbundle-selinux-base-policy-2.20141203-r8.tar.bz2 297919 SHA256 77539eb3d78105f8789cd8205d2698bd27e2abf100163bdd162cda860fd15120 SHA512 2f8a19e1e4bb65f32b480275f49099aed3ae9df543c7de862b3bbd93e81b89cd96dadac3d091e28673d09a6885db8c5656b3a77d0080775c110b04f2753de7a6 WHIRLPOOL 79cb7e620eb8e838192dc557c7a9ce7e713227d783cc8b63792825559b2145cad70d0af6f99948c1527557bc363feffd846c73893682b4a14fc7d08b9e20c649
+DIST patchbundle-selinux-base-policy-2.20141203-r9.tar.bz2 299602 SHA256 e8518004942a6c57170a609683e22b1410c93a2a195829c41dc8fbc703d941b5 SHA512 ce6484fbca1d2d074e50d1a3953392bd3ce0a4617df98fbac37747b469b4f160a9331586dfe1c3ddccb1ccbee24876a2f05ab49e37c8492a48baf83c2d01d140 WHIRLPOOL 1fd7b956e98e95a64c3a713a944d4531259bd156a7feabf6a89c4b5f33ac846377730eede97889e85183be086f282ebd18e860214f6ca3f01b40f2323470ee04
 DIST refpolicy-2.20140311.tar.bz2 664416 SHA256 f69437db95548c78a5dec44c236397146b144153149009ea554d2e536e5436f7 SHA512 50bacee82ed41ac8b8007ecc33bf51d22303cc2ddd27cfb72cb5520dab5f8e255186e34b89cec492c7a2d4220b200814bdede9b46c19f987a3d3d65a1c9b749a WHIRLPOOL e07480beba6ab1f02ad36b7d0c50c4a71cb39a8ec78bf8d1dc3c82bb9dd1d69d9169d7c937165ea15f60ce1147f256d46644f944107a3a8a800d5bad70d4c255
 DIST refpolicy-2.20141203.tar.bz2 680243 SHA256 f438209c430d8a2d4ddcbe4bdd3edb46f6af7dc4913637af0b73c635e40c1522 SHA512 682e4280c5799e4c12ec7594afc1389f67be35055748d2e0dbdc3419159a16c96d4946ca6178daee8370515951f8653b2e452efe8c962b8d7f9bc192f0b15a0c WHIRLPOOL 74bca232534e7af9051bb1ab9f77c1ff6c425781cf4561f781d6e9a40cc5ca0d9add540249ea5493e8782a9372aea296ead6c165c6c440ae1509eb319d151ee5
diff --git a/sec-policy/selinux-automount/selinux-automount-2.20141203-r8.ebuild b/sec-policy/selinux-automount/selinux-automount-2.20141203-r8.ebuild
index f10a3b2a0c2e..54d281a8003f 100644
--- a/sec-policy/selinux-automount/selinux-automount-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-automount/selinux-automount-2.20141203-r8.ebuild
@@ -13,5 +13,5 @@ DESCRIPTION="SELinux policy for automount"
 if [[ $PV == 9999* ]] ; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-automount/selinux-automount-2.20141203-r9.ebuild b/sec-policy/selinux-automount/selinux-automount-2.20141203-r9.ebuild
new file mode 100644
index 000000000000..f10a3b2a0c2e
--- /dev/null
+++ b/sec-policy/selinux-automount/selinux-automount-2.20141203-r9.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI="5"
+
+IUSE=""
+MODS="automount"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for automount"
+
+if [[ $PV == 9999* ]] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
diff --git a/sec-policy/selinux-avahi/Manifest b/sec-policy/selinux-avahi/Manifest
index 8327a635be01..91d204b0021a 100644
--- a/sec-policy/selinux-avahi/Manifest
+++ b/sec-policy/selinux-avahi/Manifest
@@ -9,5 +9,6 @@ DIST patchbundle-selinux-base-policy-2.20141203-r5.tar.bz2 274136 SHA256 c23d17c
 DIST patchbundle-selinux-base-policy-2.20141203-r6.tar.bz2 293231 SHA256 b686dcc517b97834f66d967afdcc724cb43b5c6dbf9f34043a91cdeda2625cc7 SHA512 a2c486cbe4a1d21ff3fd01bef25ecf5a633a4072646c67cfccf3f7187d95f3d9e3b482a46ba17c55c40a8e7c0dee56e9cf9ddc9f414d3e4511443b62f60d03e9 WHIRLPOOL 3d708e287e3f9b873be647b0327eab6675a8702ee1cffb56e36934cada306e5ccc64397a083dad9e59de37a067e628cacbf896ae99012d5a209e42fd7cd8a4c6
 DIST patchbundle-selinux-base-policy-2.20141203-r7.tar.bz2 295833 SHA256 ba2219b3efc747be65f94c4d8ac3cd6ee530c82c848fa41935a114184678622a SHA512 8e32d9dbfb2f0f3f50200543aadb51ed9834ccd5cdf30bf8e4d9e6d0b645ce44ffaf80f7aa9385e9c9095d9a383b3a348a92356cb5386c06544ab082a9a468c7 WHIRLPOOL 1648ee1be71e45fcf5a264816ce7edc7bab19bd28a68703923eb2d6068f1f0469ae593855231d31f88baecbf29e7cece2d6beeed20b7c04231a6c90e90d35910
 DIST patchbundle-selinux-base-policy-2.20141203-r8.tar.bz2 297919 SHA256 77539eb3d78105f8789cd8205d2698bd27e2abf100163bdd162cda860fd15120 SHA512 2f8a19e1e4bb65f32b480275f49099aed3ae9df543c7de862b3bbd93e81b89cd96dadac3d091e28673d09a6885db8c5656b3a77d0080775c110b04f2753de7a6 WHIRLPOOL 79cb7e620eb8e838192dc557c7a9ce7e713227d783cc8b63792825559b2145cad70d0af6f99948c1527557bc363feffd846c73893682b4a14fc7d08b9e20c649
+DIST patchbundle-selinux-base-policy-2.20141203-r9.tar.bz2 299602 SHA256 e8518004942a6c57170a609683e22b1410c93a2a195829c41dc8fbc703d941b5 SHA512 ce6484fbca1d2d074e50d1a3953392bd3ce0a4617df98fbac37747b469b4f160a9331586dfe1c3ddccb1ccbee24876a2f05ab49e37c8492a48baf83c2d01d140 WHIRLPOOL 1fd7b956e98e95a64c3a713a944d4531259bd156a7feabf6a89c4b5f33ac846377730eede97889e85183be086f282ebd18e860214f6ca3f01b40f2323470ee04
 DIST refpolicy-2.20140311.tar.bz2 664416 SHA256 f69437db95548c78a5dec44c236397146b144153149009ea554d2e536e5436f7 SHA512 50bacee82ed41ac8b8007ecc33bf51d22303cc2ddd27cfb72cb5520dab5f8e255186e34b89cec492c7a2d4220b200814bdede9b46c19f987a3d3d65a1c9b749a WHIRLPOOL e07480beba6ab1f02ad36b7d0c50c4a71cb39a8ec78bf8d1dc3c82bb9dd1d69d9169d7c937165ea15f60ce1147f256d46644f944107a3a8a800d5bad70d4c255
 DIST refpolicy-2.20141203.tar.bz2 680243 SHA256 f438209c430d8a2d4ddcbe4bdd3edb46f6af7dc4913637af0b73c635e40c1522 SHA512 682e4280c5799e4c12ec7594afc1389f67be35055748d2e0dbdc3419159a16c96d4946ca6178daee8370515951f8653b2e452efe8c962b8d7f9bc192f0b15a0c WHIRLPOOL 74bca232534e7af9051bb1ab9f77c1ff6c425781cf4561f781d6e9a40cc5ca0d9add540249ea5493e8782a9372aea296ead6c165c6c440ae1509eb319d151ee5
diff --git a/sec-policy/selinux-avahi/selinux-avahi-2.20141203-r8.ebuild b/sec-policy/selinux-avahi/selinux-avahi-2.20141203-r8.ebuild
index f5fe9ecab6ec..a573b0e9216e 100644
--- a/sec-policy/selinux-avahi/selinux-avahi-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-avahi/selinux-avahi-2.20141203-r8.ebuild
@@ -13,5 +13,5 @@ DESCRIPTION="SELinux policy for avahi"
 if [[ $PV == 9999* ]] ; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-avahi/selinux-avahi-2.20141203-r9.ebuild b/sec-policy/selinux-avahi/selinux-avahi-2.20141203-r9.ebuild
new file mode 100644
index 000000000000..f5fe9ecab6ec
--- /dev/null
+++ b/sec-policy/selinux-avahi/selinux-avahi-2.20141203-r9.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI="5"
+
+IUSE=""
+MODS="avahi"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for avahi"
+
+if [[ $PV == 9999* ]] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
diff --git a/sec-policy/selinux-awstats/Manifest b/sec-policy/selinux-awstats/Manifest
index 8327a635be01..91d204b0021a 100644
--- a/sec-policy/selinux-awstats/Manifest
+++ b/sec-policy/selinux-awstats/Manifest
@@ -9,5 +9,6 @@ DIST patchbundle-selinux-base-policy-2.20141203-r5.tar.bz2 274136 SHA256 c23d17c
 DIST patchbundle-selinux-base-policy-2.20141203-r6.tar.bz2 293231 SHA256 b686dcc517b97834f66d967afdcc724cb43b5c6dbf9f34043a91cdeda2625cc7 SHA512 a2c486cbe4a1d21ff3fd01bef25ecf5a633a4072646c67cfccf3f7187d95f3d9e3b482a46ba17c55c40a8e7c0dee56e9cf9ddc9f414d3e4511443b62f60d03e9 WHIRLPOOL 3d708e287e3f9b873be647b0327eab6675a8702ee1cffb56e36934cada306e5ccc64397a083dad9e59de37a067e628cacbf896ae99012d5a209e42fd7cd8a4c6
 DIST patchbundle-selinux-base-policy-2.20141203-r7.tar.bz2 295833 SHA256 ba2219b3efc747be65f94c4d8ac3cd6ee530c82c848fa41935a114184678622a SHA512 8e32d9dbfb2f0f3f50200543aadb51ed9834ccd5cdf30bf8e4d9e6d0b645ce44ffaf80f7aa9385e9c9095d9a383b3a348a92356cb5386c06544ab082a9a468c7 WHIRLPOOL 1648ee1be71e45fcf5a264816ce7edc7bab19bd28a68703923eb2d6068f1f0469ae593855231d31f88baecbf29e7cece2d6beeed20b7c04231a6c90e90d35910
 DIST patchbundle-selinux-base-policy-2.20141203-r8.tar.bz2 297919 SHA256 77539eb3d78105f8789cd8205d2698bd27e2abf100163bdd162cda860fd15120 SHA512 2f8a19e1e4bb65f32b480275f49099aed3ae9df543c7de862b3bbd93e81b89cd96dadac3d091e28673d09a6885db8c5656b3a77d0080775c110b04f2753de7a6 WHIRLPOOL 79cb7e620eb8e838192dc557c7a9ce7e713227d783cc8b63792825559b2145cad70d0af6f99948c1527557bc363feffd846c73893682b4a14fc7d08b9e20c649
+DIST patchbundle-selinux-base-policy-2.20141203-r9.tar.bz2 299602 SHA256 e8518004942a6c57170a609683e22b1410c93a2a195829c41dc8fbc703d941b5 SHA512 ce6484fbca1d2d074e50d1a3953392bd3ce0a4617df98fbac37747b469b4f160a9331586dfe1c3ddccb1ccbee24876a2f05ab49e37c8492a48baf83c2d01d140 WHIRLPOOL 1fd7b956e98e95a64c3a713a944d4531259bd156a7feabf6a89c4b5f33ac846377730eede97889e85183be086f282ebd18e860214f6ca3f01b40f2323470ee04
 DIST refpolicy-2.20140311.tar.bz2 664416 SHA256 f69437db95548c78a5dec44c236397146b144153149009ea554d2e536e5436f7 SHA512 50bacee82ed41ac8b8007ecc33bf51d22303cc2ddd27cfb72cb5520dab5f8e255186e34b89cec492c7a2d4220b200814bdede9b46c19f987a3d3d65a1c9b749a WHIRLPOOL e07480beba6ab1f02ad36b7d0c50c4a71cb39a8ec78bf8d1dc3c82bb9dd1d69d9169d7c937165ea15f60ce1147f256d46644f944107a3a8a800d5bad70d4c255
 DIST refpolicy-2.20141203.tar.bz2 680243 SHA256 f438209c430d8a2d4ddcbe4bdd3edb46f6af7dc4913637af0b73c635e40c1522 SHA512 682e4280c5799e4c12ec7594afc1389f67be35055748d2e0dbdc3419159a16c96d4946ca6178daee8370515951f8653b2e452efe8c962b8d7f9bc192f0b15a0c WHIRLPOOL 74bca232534e7af9051bb1ab9f77c1ff6c425781cf4561f781d6e9a40cc5ca0d9add540249ea5493e8782a9372aea296ead6c165c6c440ae1509eb319d151ee5
diff --git a/sec-policy/selinux-awstats/selinux-awstats-2.20141203-r8.ebuild b/sec-policy/selinux-awstats/selinux-awstats-2.20141203-r8.ebuild
index 41bd29179faa..9f8d76aa8f1a 100644
--- a/sec-policy/selinux-awstats/selinux-awstats-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-awstats/selinux-awstats-2.20141203-r8.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="SELinux policy for awstats"
 if [[ $PV == 9999* ]] ; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-apache
diff --git a/sec-policy/selinux-awstats/selinux-awstats-2.20141203-r9.ebuild b/sec-policy/selinux-awstats/selinux-awstats-2.20141203-r9.ebuild
new file mode 100644
index 000000000000..41bd29179faa
--- /dev/null
+++ b/sec-policy/selinux-awstats/selinux-awstats-2.20141203-r9.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI="5"
+
+IUSE=""
+MODS="awstats"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for awstats"
+
+if [[ $PV == 9999* ]] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
+DEPEND="${DEPEND}
+	sec-policy/selinux-apache
+"
+RDEPEND="${RDEPEND}
+	sec-policy/selinux-apache
+"
diff --git a/sec-policy/selinux-backup/Manifest b/sec-policy/selinux-backup/Manifest
index 8327a635be01..91d204b0021a 100644
--- a/sec-policy/selinux-backup/Manifest
+++ b/sec-policy/selinux-backup/Manifest
@@ -9,5 +9,6 @@ DIST patchbundle-selinux-base-policy-2.20141203-r5.tar.bz2 274136 SHA256 c23d17c
 DIST patchbundle-selinux-base-policy-2.20141203-r6.tar.bz2 293231 SHA256 b686dcc517b97834f66d967afdcc724cb43b5c6dbf9f34043a91cdeda2625cc7 SHA512 a2c486cbe4a1d21ff3fd01bef25ecf5a633a4072646c67cfccf3f7187d95f3d9e3b482a46ba17c55c40a8e7c0dee56e9cf9ddc9f414d3e4511443b62f60d03e9 WHIRLPOOL 3d708e287e3f9b873be647b0327eab6675a8702ee1cffb56e36934cada306e5ccc64397a083dad9e59de37a067e628cacbf896ae99012d5a209e42fd7cd8a4c6
 DIST patchbundle-selinux-base-policy-2.20141203-r7.tar.bz2 295833 SHA256 ba2219b3efc747be65f94c4d8ac3cd6ee530c82c848fa41935a114184678622a SHA512 8e32d9dbfb2f0f3f50200543aadb51ed9834ccd5cdf30bf8e4d9e6d0b645ce44ffaf80f7aa9385e9c9095d9a383b3a348a92356cb5386c06544ab082a9a468c7 WHIRLPOOL 1648ee1be71e45fcf5a264816ce7edc7bab19bd28a68703923eb2d6068f1f0469ae593855231d31f88baecbf29e7cece2d6beeed20b7c04231a6c90e90d35910
 DIST patchbundle-selinux-base-policy-2.20141203-r8.tar.bz2 297919 SHA256 77539eb3d78105f8789cd8205d2698bd27e2abf100163bdd162cda860fd15120 SHA512 2f8a19e1e4bb65f32b480275f49099aed3ae9df543c7de862b3bbd93e81b89cd96dadac3d091e28673d09a6885db8c5656b3a77d0080775c110b04f2753de7a6 WHIRLPOOL 79cb7e620eb8e838192dc557c7a9ce7e713227d783cc8b63792825559b2145cad70d0af6f99948c1527557bc363feffd846c73893682b4a14fc7d08b9e20c649
+DIST patchbundle-selinux-base-policy-2.20141203-r9.tar.bz2 299602 SHA256 e8518004942a6c57170a609683e22b1410c93a2a195829c41dc8fbc703d941b5 SHA512 ce6484fbca1d2d074e50d1a3953392bd3ce0a4617df98fbac37747b469b4f160a9331586dfe1c3ddccb1ccbee24876a2f05ab49e37c8492a48baf83c2d01d140 WHIRLPOOL 1fd7b956e98e95a64c3a713a944d4531259bd156a7feabf6a89c4b5f33ac846377730eede97889e85183be086f282ebd18e860214f6ca3f01b40f2323470ee04
 DIST refpolicy-2.20140311.tar.bz2 664416 SHA256 f69437db95548c78a5dec44c236397146b144153149009ea554d2e536e5436f7 SHA512 50bacee82ed41ac8b8007ecc33bf51d22303cc2ddd27cfb72cb5520dab5f8e255186e34b89cec492c7a2d4220b200814bdede9b46c19f987a3d3d65a1c9b749a WHIRLPOOL e07480beba6ab1f02ad36b7d0c50c4a71cb39a8ec78bf8d1dc3c82bb9dd1d69d9169d7c937165ea15f60ce1147f256d46644f944107a3a8a800d5bad70d4c255
 DIST refpolicy-2.20141203.tar.bz2 680243 SHA256 f438209c430d8a2d4ddcbe4bdd3edb46f6af7dc4913637af0b73c635e40c1522 SHA512 682e4280c5799e4c12ec7594afc1389f67be35055748d2e0dbdc3419159a16c96d4946ca6178daee8370515951f8653b2e452efe8c962b8d7f9bc192f0b15a0c WHIRLPOOL 74bca232534e7af9051bb1ab9f77c1ff6c425781cf4561f781d6e9a40cc5ca0d9add540249ea5493e8782a9372aea296ead6c165c6c440ae1509eb319d151ee5
diff --git a/sec-policy/selinux-backup/selinux-backup-2.20141203-r8.ebuild b/sec-policy/selinux-backup/selinux-backup-2.20141203-r8.ebuild
index fcb4ec0d6e75..1a8ab1a76b7b 100644
--- a/sec-policy/selinux-backup/selinux-backup-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-backup/selinux-backup-2.20141203-r8.ebuild
@@ -13,5 +13,5 @@ DESCRIPTION="SELinux policy for generic backup apps"
 if [[ $PV == 9999* ]] ; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-backup/selinux-backup-2.20141203-r9.ebuild b/sec-policy/selinux-backup/selinux-backup-2.20141203-r9.ebuild
new file mode 100644
index 000000000000..fcb4ec0d6e75
--- /dev/null
+++ b/sec-policy/selinux-backup/selinux-backup-2.20141203-r9.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI="5"
+
+IUSE=""
+MODS="backup"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for generic backup apps"
+
+if [[ $PV == 9999* ]] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
diff --git a/sec-policy/selinux-bacula/Manifest b/sec-policy/selinux-bacula/Manifest
index 8327a635be01..91d204b0021a 100644
--- a/sec-policy/selinux-bacula/Manifest
+++ b/sec-policy/selinux-bacula/Manifest
@@ -9,5 +9,6 @@ DIST patchbundle-selinux-base-policy-2.20141203-r5.tar.bz2 274136 SHA256 c23d17c
 DIST patchbundle-selinux-base-policy-2.20141203-r6.tar.bz2 293231 SHA256 b686dcc517b97834f66d967afdcc724cb43b5c6dbf9f34043a91cdeda2625cc7 SHA512 a2c486cbe4a1d21ff3fd01bef25ecf5a633a4072646c67cfccf3f7187d95f3d9e3b482a46ba17c55c40a8e7c0dee56e9cf9ddc9f414d3e4511443b62f60d03e9 WHIRLPOOL 3d708e287e3f9b873be647b0327eab6675a8702ee1cffb56e36934cada306e5ccc64397a083dad9e59de37a067e628cacbf896ae99012d5a209e42fd7cd8a4c6
 DIST patchbundle-selinux-base-policy-2.20141203-r7.tar.bz2 295833 SHA256 ba2219b3efc747be65f94c4d8ac3cd6ee530c82c848fa41935a114184678622a SHA512 8e32d9dbfb2f0f3f50200543aadb51ed9834ccd5cdf30bf8e4d9e6d0b645ce44ffaf80f7aa9385e9c9095d9a383b3a348a92356cb5386c06544ab082a9a468c7 WHIRLPOOL 1648ee1be71e45fcf5a264816ce7edc7bab19bd28a68703923eb2d6068f1f0469ae593855231d31f88baecbf29e7cece2d6beeed20b7c04231a6c90e90d35910
 DIST patchbundle-selinux-base-policy-2.20141203-r8.tar.bz2 297919 SHA256 77539eb3d78105f8789cd8205d2698bd27e2abf100163bdd162cda860fd15120 SHA512 2f8a19e1e4bb65f32b480275f49099aed3ae9df543c7de862b3bbd93e81b89cd96dadac3d091e28673d09a6885db8c5656b3a77d0080775c110b04f2753de7a6 WHIRLPOOL 79cb7e620eb8e838192dc557c7a9ce7e713227d783cc8b63792825559b2145cad70d0af6f99948c1527557bc363feffd846c73893682b4a14fc7d08b9e20c649
+DIST patchbundle-selinux-base-policy-2.20141203-r9.tar.bz2 299602 SHA256 e8518004942a6c57170a609683e22b1410c93a2a195829c41dc8fbc703d941b5 SHA512 ce6484fbca1d2d074e50d1a3953392bd3ce0a4617df98fbac37747b469b4f160a9331586dfe1c3ddccb1ccbee24876a2f05ab49e37c8492a48baf83c2d01d140 WHIRLPOOL 1fd7b956e98e95a64c3a713a944d4531259bd156a7feabf6a89c4b5f33ac846377730eede97889e85183be086f282ebd18e860214f6ca3f01b40f2323470ee04
 DIST refpolicy-2.20140311.tar.bz2 664416 SHA256 f69437db95548c78a5dec44c236397146b144153149009ea554d2e536e5436f7 SHA512 50bacee82ed41ac8b8007ecc33bf51d22303cc2ddd27cfb72cb5520dab5f8e255186e34b89cec492c7a2d4220b200814bdede9b46c19f987a3d3d65a1c9b749a WHIRLPOOL e07480beba6ab1f02ad36b7d0c50c4a71cb39a8ec78bf8d1dc3c82bb9dd1d69d9169d7c937165ea15f60ce1147f256d46644f944107a3a8a800d5bad70d4c255
 DIST refpolicy-2.20141203.tar.bz2 680243 SHA256 f438209c430d8a2d4ddcbe4bdd3edb46f6af7dc4913637af0b73c635e40c1522 SHA512 682e4280c5799e4c12ec7594afc1389f67be35055748d2e0dbdc3419159a16c96d4946ca6178daee8370515951f8653b2e452efe8c962b8d7f9bc192f0b15a0c WHIRLPOOL 74bca232534e7af9051bb1ab9f77c1ff6c425781cf4561f781d6e9a40cc5ca0d9add540249ea5493e8782a9372aea296ead6c165c6c440ae1509eb319d151ee5
diff --git a/sec-policy/selinux-bacula/selinux-bacula-2.20141203-r8.ebuild b/sec-policy/selinux-bacula/selinux-bacula-2.20141203-r8.ebuild
index b2e99e5e2f83..c64e4a4b089a 100644
--- a/sec-policy/selinux-bacula/selinux-bacula-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-bacula/selinux-bacula-2.20141203-r8.ebuild
@@ -13,5 +13,5 @@ DESCRIPTION="SELinux policy for bacula"
 if [[ $PV == 9999* ]] ; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-bacula/selinux-bacula-2.20141203-r9.ebuild b/sec-policy/selinux-bacula/selinux-bacula-2.20141203-r9.ebuild
new file mode 100644
index 000000000000..b2e99e5e2f83
--- /dev/null
+++ b/sec-policy/selinux-bacula/selinux-bacula-2.20141203-r9.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI="5"
+
+IUSE=""
+MODS="bacula"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for bacula"
+
+if [[ $PV == 9999* ]] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
diff --git a/sec-policy/selinux-base-policy/Manifest b/sec-policy/selinux-base-policy/Manifest
index 8327a635be01..91d204b0021a 100644
--- a/sec-policy/selinux-base-policy/Manifest
+++ b/sec-policy/selinux-base-policy/Manifest
@@ -9,5 +9,6 @@ DIST patchbundle-selinux-base-policy-2.20141203-r5.tar.bz2 274136 SHA256 c23d17c
 DIST patchbundle-selinux-base-policy-2.20141203-r6.tar.bz2 293231 SHA256 b686dcc517b97834f66d967afdcc724cb43b5c6dbf9f34043a91cdeda2625cc7 SHA512 a2c486cbe4a1d21ff3fd01bef25ecf5a633a4072646c67cfccf3f7187d95f3d9e3b482a46ba17c55c40a8e7c0dee56e9cf9ddc9f414d3e4511443b62f60d03e9 WHIRLPOOL 3d708e287e3f9b873be647b0327eab6675a8702ee1cffb56e36934cada306e5ccc64397a083dad9e59de37a067e628cacbf896ae99012d5a209e42fd7cd8a4c6
 DIST patchbundle-selinux-base-policy-2.20141203-r7.tar.bz2 295833 SHA256 ba2219b3efc747be65f94c4d8ac3cd6ee530c82c848fa41935a114184678622a SHA512 8e32d9dbfb2f0f3f50200543aadb51ed9834ccd5cdf30bf8e4d9e6d0b645ce44ffaf80f7aa9385e9c9095d9a383b3a348a92356cb5386c06544ab082a9a468c7 WHIRLPOOL 1648ee1be71e45fcf5a264816ce7edc7bab19bd28a68703923eb2d6068f1f0469ae593855231d31f88baecbf29e7cece2d6beeed20b7c04231a6c90e90d35910
 DIST patchbundle-selinux-base-policy-2.20141203-r8.tar.bz2 297919 SHA256 77539eb3d78105f8789cd8205d2698bd27e2abf100163bdd162cda860fd15120 SHA512 2f8a19e1e4bb65f32b480275f49099aed3ae9df543c7de862b3bbd93e81b89cd96dadac3d091e28673d09a6885db8c5656b3a77d0080775c110b04f2753de7a6 WHIRLPOOL 79cb7e620eb8e838192dc557c7a9ce7e713227d783cc8b63792825559b2145cad70d0af6f99948c1527557bc363feffd846c73893682b4a14fc7d08b9e20c649
+DIST patchbundle-selinux-base-policy-2.20141203-r9.tar.bz2 299602 SHA256 e8518004942a6c57170a609683e22b1410c93a2a195829c41dc8fbc703d941b5 SHA512 ce6484fbca1d2d074e50d1a3953392bd3ce0a4617df98fbac37747b469b4f160a9331586dfe1c3ddccb1ccbee24876a2f05ab49e37c8492a48baf83c2d01d140 WHIRLPOOL 1fd7b956e98e95a64c3a713a944d4531259bd156a7feabf6a89c4b5f33ac846377730eede97889e85183be086f282ebd18e860214f6ca3f01b40f2323470ee04
 DIST refpolicy-2.20140311.tar.bz2 664416 SHA256 f69437db95548c78a5dec44c236397146b144153149009ea554d2e536e5436f7 SHA512 50bacee82ed41ac8b8007ecc33bf51d22303cc2ddd27cfb72cb5520dab5f8e255186e34b89cec492c7a2d4220b200814bdede9b46c19f987a3d3d65a1c9b749a WHIRLPOOL e07480beba6ab1f02ad36b7d0c50c4a71cb39a8ec78bf8d1dc3c82bb9dd1d69d9169d7c937165ea15f60ce1147f256d46644f944107a3a8a800d5bad70d4c255
 DIST refpolicy-2.20141203.tar.bz2 680243 SHA256 f438209c430d8a2d4ddcbe4bdd3edb46f6af7dc4913637af0b73c635e40c1522 SHA512 682e4280c5799e4c12ec7594afc1389f67be35055748d2e0dbdc3419159a16c96d4946ca6178daee8370515951f8653b2e452efe8c962b8d7f9bc192f0b15a0c WHIRLPOOL 74bca232534e7af9051bb1ab9f77c1ff6c425781cf4561f781d6e9a40cc5ca0d9add540249ea5493e8782a9372aea296ead6c165c6c440ae1509eb319d151ee5
diff --git a/sec-policy/selinux-base-policy/selinux-base-policy-2.20141203-r8.ebuild b/sec-policy/selinux-base-policy/selinux-base-policy-2.20141203-r8.ebuild
index a23b7c25de15..170cd876629e 100644
--- a/sec-policy/selinux-base-policy/selinux-base-policy-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-base-policy/selinux-base-policy-2.20141203-r8.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == 9999* ]]; then
 else
 	SRC_URI="https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-${PV}.tar.bz2
 			https://dev.gentoo.org/~swift/patches/${PN}/patchbundle-${PN}-${PVR}.tar.bz2"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 
 HOMEPAGE="https://www.gentoo.org/proj/en/hardened/selinux/"
diff --git a/sec-policy/selinux-base-policy/selinux-base-policy-2.20141203-r9.ebuild b/sec-policy/selinux-base-policy/selinux-base-policy-2.20141203-r9.ebuild
new file mode 100644
index 000000000000..a23b7c25de15
--- /dev/null
+++ b/sec-policy/selinux-base-policy/selinux-base-policy-2.20141203-r9.ebuild
@@ -0,0 +1,143 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI="5"
+
+inherit eutils
+
+if [[ ${PV} == 9999* ]]; then
+	EGIT_REPO_URI="${SELINUX_GIT_REPO:-git://anongit.gentoo.org/proj/hardened-refpolicy.git https://anongit.gentoo.org/git/proj/hardened-refpolicy.git}"
+	EGIT_BRANCH="${SELINUX_GIT_BRANCH:-master}"
+	EGIT_CHECKOUT_DIR="${WORKDIR}/refpolicy"
+
+	inherit git-r3
+
+	KEYWORDS=""
+else
+	SRC_URI="https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-${PV}.tar.bz2
+			https://dev.gentoo.org/~swift/patches/${PN}/patchbundle-${PN}-${PVR}.tar.bz2"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+HOMEPAGE="https://www.gentoo.org/proj/en/hardened/selinux/"
+DESCRIPTION="SELinux policy for core modules"
+
+IUSE="+unconfined"
+
+RDEPEND="=sec-policy/selinux-base-${PVR}"
+PDEPEND="unconfined? ( sec-policy/selinux-unconfined )"
+DEPEND=""
+
+MODS="application authlogin bootloader clock consoletype cron dmesg fstools getty hostname hotplug init iptables libraries locallogin logging lvm miscfiles modutils mount mta netutils nscd portage raid rsync selinuxutil setrans ssh staff storage su sysadm sysnetwork tmpfiles udev userdomain usermanage unprivuser xdg"
+LICENSE="GPL-2"
+SLOT="0"
+S="${WORKDIR}/"
+
+# Code entirely copied from selinux-eclass (cannot inherit due to dependency on
+# itself), when reworked reinclude it. Only postinstall (where -b base.pp is
+# added) needs to remain then.
+
+pkg_pretend() {
+	for i in ${POLICY_TYPES}; do
+		if [[ "${i}" == "targeted" ]] && ! use unconfined; then
+			die "If you use POLICY_TYPES=targeted, then USE=unconfined is mandatory."
+		fi
+	done
+}
+
+src_prepare() {
+	local modfiles
+
+	if [[ ${PV} != 9999* ]]; then
+		# Patch the source with the base patchbundle
+		cd "${S}"
+		EPATCH_MULTI_MSG="Applying SELinux policy updates ... " \
+		EPATCH_SUFFIX="patch" \
+		EPATCH_SOURCE="${WORKDIR}" \
+		EPATCH_FORCE="yes" \
+		epatch
+	fi
+
+	# Apply the additional patches refered to by the module ebuild.
+	# But first some magic to differentiate between bash arrays and strings
+	if [[ "$(declare -p POLICY_PATCH 2>/dev/null 2>&1)" == "declare -a"* ]];
+	then
+		cd "${S}/refpolicy/policy/modules"
+		for POLPATCH in "${POLICY_PATCH[@]}";
+		do
+			epatch "${POLPATCH}"
+		done
+	else
+		if [[ -n ${POLICY_PATCH} ]];
+		then
+			cd "${S}/refpolicy/policy/modules"
+			for POLPATCH in ${POLICY_PATCH};
+			do
+				epatch "${POLPATCH}"
+			done
+		fi
+	fi
+
+	# Calling user patches
+	epatch_user
+
+	# Collect only those files needed for this particular module
+	for i in ${MODS}; do
+		modfiles="$(find ${S}/refpolicy/policy/modules -iname $i.te) $modfiles"
+		modfiles="$(find ${S}/refpolicy/policy/modules -iname $i.fc) $modfiles"
+	done
+
+	for i in ${POLICY_TYPES}; do
+		mkdir "${S}"/${i} || die "Failed to create directory ${S}/${i}"
+		cp "${S}"/refpolicy/doc/Makefile.example "${S}"/${i}/Makefile \
+			|| die "Failed to copy Makefile.example to ${S}/${i}/Makefile"
+
+		cp ${modfiles} "${S}"/${i} \
+			|| die "Failed to copy the module files to ${S}/${i}"
+	done
+}
+
+src_compile() {
+	for i in ${POLICY_TYPES}; do
+		emake NAME=$i -C "${S}"/${i} || die "${i} compile failed"
+	done
+}
+
+src_install() {
+	local BASEDIR="/usr/share/selinux"
+
+	for i in ${POLICY_TYPES}; do
+		for j in ${MODS}; do
+			einfo "Installing ${i} ${j} policy package"
+			insinto ${BASEDIR}/${i}
+			doins "${S}"/${i}/${j}.pp || die "Failed to add ${j}.pp to ${i}"
+		done
+	done
+}
+
+pkg_postinst() {
+	# Override the command from the eclass, we need to load in base as well here
+	local COMMAND
+	for i in ${MODS}; do
+		COMMAND="-i ${i}.pp ${COMMAND}"
+	done
+
+	for i in ${POLICY_TYPES}; do
+		einfo "Inserting the following modules, with base, into the $i module store: ${MODS}"
+
+		cd /usr/share/selinux/${i} || die "Could not enter /usr/share/selinux/${i}"
+
+		semodule -s ${i} -b base.pp ${COMMAND} || die "Failed to load in base and modules ${MODS} in the $i policy store"
+	done
+
+	# Relabel depending packages
+	local PKGSET="";
+	if [ -x /usr/bin/qdepends ] ; then
+		PKGSET=$(/usr/bin/qdepends -Cq -r -Q ${CATEGORY}/${PN} | grep -v 'sec-policy/selinux-');
+	elif [ -x /usr/bin/equery ] ; then
+		PKGSET=$(/usr/bin/equery -Cq depends ${CATEGORY}/${PN} | grep -v 'sec-policy/selinux-');
+	fi
+	if [ -n "${PKGSET}" ] ; then
+		rlpkg ${PKGSET};
+	fi
+}
diff --git a/sec-policy/selinux-base/Manifest b/sec-policy/selinux-base/Manifest
index 8327a635be01..91d204b0021a 100644
--- a/sec-policy/selinux-base/Manifest
+++ b/sec-policy/selinux-base/Manifest
@@ -9,5 +9,6 @@ DIST patchbundle-selinux-base-policy-2.20141203-r5.tar.bz2 274136 SHA256 c23d17c
 DIST patchbundle-selinux-base-policy-2.20141203-r6.tar.bz2 293231 SHA256 b686dcc517b97834f66d967afdcc724cb43b5c6dbf9f34043a91cdeda2625cc7 SHA512 a2c486cbe4a1d21ff3fd01bef25ecf5a633a4072646c67cfccf3f7187d95f3d9e3b482a46ba17c55c40a8e7c0dee56e9cf9ddc9f414d3e4511443b62f60d03e9 WHIRLPOOL 3d708e287e3f9b873be647b0327eab6675a8702ee1cffb56e36934cada306e5ccc64397a083dad9e59de37a067e628cacbf896ae99012d5a209e42fd7cd8a4c6
 DIST patchbundle-selinux-base-policy-2.20141203-r7.tar.bz2 295833 SHA256 ba2219b3efc747be65f94c4d8ac3cd6ee530c82c848fa41935a114184678622a SHA512 8e32d9dbfb2f0f3f50200543aadb51ed9834ccd5cdf30bf8e4d9e6d0b645ce44ffaf80f7aa9385e9c9095d9a383b3a348a92356cb5386c06544ab082a9a468c7 WHIRLPOOL 1648ee1be71e45fcf5a264816ce7edc7bab19bd28a68703923eb2d6068f1f0469ae593855231d31f88baecbf29e7cece2d6beeed20b7c04231a6c90e90d35910
 DIST patchbundle-selinux-base-policy-2.20141203-r8.tar.bz2 297919 SHA256 77539eb3d78105f8789cd8205d2698bd27e2abf100163bdd162cda860fd15120 SHA512 2f8a19e1e4bb65f32b480275f49099aed3ae9df543c7de862b3bbd93e81b89cd96dadac3d091e28673d09a6885db8c5656b3a77d0080775c110b04f2753de7a6 WHIRLPOOL 79cb7e620eb8e838192dc557c7a9ce7e713227d783cc8b63792825559b2145cad70d0af6f99948c1527557bc363feffd846c73893682b4a14fc7d08b9e20c649
+DIST patchbundle-selinux-base-policy-2.20141203-r9.tar.bz2 299602 SHA256 e8518004942a6c57170a609683e22b1410c93a2a195829c41dc8fbc703d941b5 SHA512 ce6484fbca1d2d074e50d1a3953392bd3ce0a4617df98fbac37747b469b4f160a9331586dfe1c3ddccb1ccbee24876a2f05ab49e37c8492a48baf83c2d01d140 WHIRLPOOL 1fd7b956e98e95a64c3a713a944d4531259bd156a7feabf6a89c4b5f33ac846377730eede97889e85183be086f282ebd18e860214f6ca3f01b40f2323470ee04
 DIST refpolicy-2.20140311.tar.bz2 664416 SHA256 f69437db95548c78a5dec44c236397146b144153149009ea554d2e536e5436f7 SHA512 50bacee82ed41ac8b8007ecc33bf51d22303cc2ddd27cfb72cb5520dab5f8e255186e34b89cec492c7a2d4220b200814bdede9b46c19f987a3d3d65a1c9b749a WHIRLPOOL e07480beba6ab1f02ad36b7d0c50c4a71cb39a8ec78bf8d1dc3c82bb9dd1d69d9169d7c937165ea15f60ce1147f256d46644f944107a3a8a800d5bad70d4c255
 DIST refpolicy-2.20141203.tar.bz2 680243 SHA256 f438209c430d8a2d4ddcbe4bdd3edb46f6af7dc4913637af0b73c635e40c1522 SHA512 682e4280c5799e4c12ec7594afc1389f67be35055748d2e0dbdc3419159a16c96d4946ca6178daee8370515951f8653b2e452efe8c962b8d7f9bc192f0b15a0c WHIRLPOOL 74bca232534e7af9051bb1ab9f77c1ff6c425781cf4561f781d6e9a40cc5ca0d9add540249ea5493e8782a9372aea296ead6c165c6c440ae1509eb319d151ee5
diff --git a/sec-policy/selinux-base/files/selinux.conf b/sec-policy/selinux-base/files/selinux.conf
new file mode 100644
index 000000000000..77d379e81251
--- /dev/null
+++ b/sec-policy/selinux-base/files/selinux.conf
@@ -0,0 +1,4 @@
+# Rebuild all selinux policy modules
+[selinux-rebuild]
+class = portage.sets.dbapi.OwnerSet
+files = /usr/share/selinux/
diff --git a/sec-policy/selinux-base/selinux-base-2.20141203-r8.ebuild b/sec-policy/selinux-base/selinux-base-2.20141203-r8.ebuild
index 8eacaee71c4d..035bf3d05f45 100644
--- a/sec-policy/selinux-base/selinux-base-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-base/selinux-base-2.20141203-r8.ebuild
@@ -17,7 +17,7 @@ else
 	SRC_URI="https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-${PV}.tar.bz2
 			https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-${PVR}.tar.bz2"
 
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 
 IUSE="+peer_perms +open_perms +ubac +unconfined doc"
diff --git a/sec-policy/selinux-base/selinux-base-2.20141203-r9.ebuild b/sec-policy/selinux-base/selinux-base-2.20141203-r9.ebuild
new file mode 100644
index 000000000000..8eacaee71c4d
--- /dev/null
+++ b/sec-policy/selinux-base/selinux-base-2.20141203-r9.ebuild
@@ -0,0 +1,170 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI="5"
+
+inherit eutils
+
+if [[ ${PV} == 9999* ]]; then
+	EGIT_REPO_URI="${SELINUX_GIT_REPO:-git://anongit.gentoo.org/proj/hardened-refpolicy.git https://anongit.gentoo.org/git/proj/hardened-refpolicy.git}"
+	EGIT_BRANCH="${SELINUX_GIT_BRANCH:-master}"
+	EGIT_CHECKOUT_DIR="${WORKDIR}/refpolicy"
+
+	inherit git-r3
+
+	KEYWORDS=""
+else
+	SRC_URI="https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files/refpolicy-${PV}.tar.bz2
+			https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-${PVR}.tar.bz2"
+
+	KEYWORDS="~amd64 ~x86"
+fi
+
+IUSE="+peer_perms +open_perms +ubac +unconfined doc"
+
+DESCRIPTION="Gentoo base policy for SELinux"
+HOMEPAGE="https://www.gentoo.org/proj/en/hardened/selinux/"
+LICENSE="GPL-2"
+SLOT="0"
+
+RDEPEND=">=sys-apps/policycoreutils-2.3
+	virtual/udev
+	!<=sec-policy/selinux-base-policy-2.20120725"
+DEPEND="${RDEPEND}
+	sys-devel/m4
+	>=sys-apps/checkpolicy-2.3"
+
+S=${WORKDIR}/
+
+#src_unpack() {
+#	git-2_src_unpack
+#}
+
+src_prepare() {
+	if [[ ${PV} != 9999* ]]; then
+		# Apply the gentoo patches to the policy. These patches are only necessary
+		# for base policies, or for interface changes on modules.
+		EPATCH_MULTI_MSG="Applying SELinux policy updates ... " \
+		EPATCH_SUFFIX="patch" \
+		EPATCH_SOURCE="${WORKDIR}" \
+		EPATCH_FORCE="yes" \
+		epatch
+	fi
+
+	cd "${S}/refpolicy"
+	make bare
+
+	epatch_user
+}
+
+src_configure() {
+	[ -z "${POLICY_TYPES}" ] && local POLICY_TYPES="targeted strict mls mcs"
+
+	# Update the SELinux refpolicy capabilities based on the users' USE flags.
+
+	if ! use peer_perms; then
+		sed -i -e '/network_peer_controls/d' \
+			"${S}/refpolicy/policy/policy_capabilities"
+	fi
+
+	if ! use open_perms; then
+		sed -i -e '/open_perms/d' \
+			"${S}/refpolicy/policy/policy_capabilities"
+	fi
+
+	if ! use ubac; then
+		sed -i -e '/^UBAC/s/y/n/' "${S}/refpolicy/build.conf" \
+			|| die "Failed to disable User Based Access Control"
+	fi
+
+	echo "DISTRO = gentoo" >> "${S}/refpolicy/build.conf"
+
+	# Prepare initial configuration
+	cd "${S}/refpolicy";
+	make conf || die "Make conf failed"
+
+	# Setup the policies based on the types delivered by the end user.
+	# These types can be "targeted", "strict", "mcs" and "mls".
+	for i in ${POLICY_TYPES}; do
+		cp -a "${S}/refpolicy" "${S}/${i}"
+		cd "${S}/${i}";
+
+		#cp "${FILESDIR}/modules-2.20120215.conf" "${S}/${i}/policy/modules.conf"
+		sed -i -e "/= module/d" "${S}/${i}/policy/modules.conf"
+
+		sed -i -e '/^QUIET/s/n/y/' -e "/^NAME/s/refpolicy/$i/" \
+			"${S}/${i}/build.conf" || die "build.conf setup failed."
+
+		if [[ "${i}" == "mls" ]] || [[ "${i}" == "mcs" ]];
+		then
+			# MCS/MLS require additional settings
+			sed -i -e "/^TYPE/s/standard/${i}/" "${S}/${i}/build.conf" \
+				|| die "failed to set type to mls"
+		fi
+
+		if [ "${i}" == "targeted" ]; then
+			sed -i -e '/root/d' -e 's/user_u/unconfined_u/' \
+			"${S}/${i}/config/appconfig-standard/seusers" \
+			|| die "targeted seusers setup failed."
+		fi
+
+		if [ "${i}" != "targeted" ] && [ "${i}" != "strict" ] && use unconfined; then
+			sed -i -e '/root/d' -e 's/user_u/unconfined_u/' \
+			"${S}/${i}/config/appconfig-${i}/seusers" \
+			|| die "policy seusers setup failed."
+		fi
+	done
+}
+
+src_compile() {
+	[ -z "${POLICY_TYPES}" ] && local POLICY_TYPES="targeted strict mls mcs"
+
+	for i in ${POLICY_TYPES}; do
+		cd "${S}/${i}"
+		emake base || die "${i} compile failed"
+		if use doc; then
+			make html || die
+		fi
+	done
+}
+
+src_install() {
+	[ -z "${POLICY_TYPES}" ] && local POLICY_TYPES="targeted strict mls mcs"
+
+	for i in ${POLICY_TYPES}; do
+		cd "${S}/${i}"
+
+		make DESTDIR="${D}" install \
+			|| die "${i} install failed."
+
+		make DESTDIR="${D}" install-headers \
+			|| die "${i} headers install failed."
+
+		echo "run_init_t" > "${D}/etc/selinux/${i}/contexts/run_init_type"
+
+		echo "textrel_shlib_t" >> "${D}/etc/selinux/${i}/contexts/customizable_types"
+
+		# libsemanage won't make this on its own
+		keepdir "/etc/selinux/${i}/policy"
+
+		if use doc; then
+			dohtml doc/html/*;
+		fi
+
+		insinto /usr/share/selinux/devel;
+		doins doc/policy.xml;
+
+	done
+
+	dodoc doc/Makefile.example doc/example.{te,fc,if}
+
+	doman man/man8/*.8;
+
+	insinto /etc/selinux
+	doins "${FILESDIR}/config"
+}
+
+pkg_preinst() {
+	has_version "<${CATEGORY}/${PN}-2.20101213-r13"
+	previous_less_than_r13=$?
+}
diff --git a/sec-policy/selinux-base/selinux-base-9999.ebuild b/sec-policy/selinux-base/selinux-base-9999.ebuild
index 8eacaee71c4d..c67def266af6 100644
--- a/sec-policy/selinux-base/selinux-base-9999.ebuild
+++ b/sec-policy/selinux-base/selinux-base-9999.ebuild
@@ -162,9 +162,7 @@ src_install() {
 
 	insinto /etc/selinux
 	doins "${FILESDIR}/config"
-}
 
-pkg_preinst() {
-	has_version "<${CATEGORY}/${PN}-2.20101213-r13"
-	previous_less_than_r13=$?
+	insinto /usr/share/portage/config/sets
+	doins "${FILESDIR}/selinux.conf" || die "failed to install selinux-rebuild portage set"
 }
diff --git a/sec-policy/selinux-bind/Manifest b/sec-policy/selinux-bind/Manifest
index 8327a635be01..91d204b0021a 100644
--- a/sec-policy/selinux-bind/Manifest
+++ b/sec-policy/selinux-bind/Manifest
@@ -9,5 +9,6 @@ DIST patchbundle-selinux-base-policy-2.20141203-r5.tar.bz2 274136 SHA256 c23d17c
 DIST patchbundle-selinux-base-policy-2.20141203-r6.tar.bz2 293231 SHA256 b686dcc517b97834f66d967afdcc724cb43b5c6dbf9f34043a91cdeda2625cc7 SHA512 a2c486cbe4a1d21ff3fd01bef25ecf5a633a4072646c67cfccf3f7187d95f3d9e3b482a46ba17c55c40a8e7c0dee56e9cf9ddc9f414d3e4511443b62f60d03e9 WHIRLPOOL 3d708e287e3f9b873be647b0327eab6675a8702ee1cffb56e36934cada306e5ccc64397a083dad9e59de37a067e628cacbf896ae99012d5a209e42fd7cd8a4c6
 DIST patchbundle-selinux-base-policy-2.20141203-r7.tar.bz2 295833 SHA256 ba2219b3efc747be65f94c4d8ac3cd6ee530c82c848fa41935a114184678622a SHA512 8e32d9dbfb2f0f3f50200543aadb51ed9834ccd5cdf30bf8e4d9e6d0b645ce44ffaf80f7aa9385e9c9095d9a383b3a348a92356cb5386c06544ab082a9a468c7 WHIRLPOOL 1648ee1be71e45fcf5a264816ce7edc7bab19bd28a68703923eb2d6068f1f0469ae593855231d31f88baecbf29e7cece2d6beeed20b7c04231a6c90e90d35910
 DIST patchbundle-selinux-base-policy-2.20141203-r8.tar.bz2 297919 SHA256 77539eb3d78105f8789cd8205d2698bd27e2abf100163bdd162cda860fd15120 SHA512 2f8a19e1e4bb65f32b480275f49099aed3ae9df543c7de862b3bbd93e81b89cd96dadac3d091e28673d09a6885db8c5656b3a77d0080775c110b04f2753de7a6 WHIRLPOOL 79cb7e620eb8e838192dc557c7a9ce7e713227d783cc8b63792825559b2145cad70d0af6f99948c1527557bc363feffd846c73893682b4a14fc7d08b9e20c649
+DIST patchbundle-selinux-base-policy-2.20141203-r9.tar.bz2 299602 SHA256 e8518004942a6c57170a609683e22b1410c93a2a195829c41dc8fbc703d941b5 SHA512 ce6484fbca1d2d074e50d1a3953392bd3ce0a4617df98fbac37747b469b4f160a9331586dfe1c3ddccb1ccbee24876a2f05ab49e37c8492a48baf83c2d01d140 WHIRLPOOL 1fd7b956e98e95a64c3a713a944d4531259bd156a7feabf6a89c4b5f33ac846377730eede97889e85183be086f282ebd18e860214f6ca3f01b40f2323470ee04
 DIST refpolicy-2.20140311.tar.bz2 664416 SHA256 f69437db95548c78a5dec44c236397146b144153149009ea554d2e536e5436f7 SHA512 50bacee82ed41ac8b8007ecc33bf51d22303cc2ddd27cfb72cb5520dab5f8e255186e34b89cec492c7a2d4220b200814bdede9b46c19f987a3d3d65a1c9b749a WHIRLPOOL e07480beba6ab1f02ad36b7d0c50c4a71cb39a8ec78bf8d1dc3c82bb9dd1d69d9169d7c937165ea15f60ce1147f256d46644f944107a3a8a800d5bad70d4c255
 DIST refpolicy-2.20141203.tar.bz2 680243 SHA256 f438209c430d8a2d4ddcbe4bdd3edb46f6af7dc4913637af0b73c635e40c1522 SHA512 682e4280c5799e4c12ec7594afc1389f67be35055748d2e0dbdc3419159a16c96d4946ca6178daee8370515951f8653b2e452efe8c962b8d7f9bc192f0b15a0c WHIRLPOOL 74bca232534e7af9051bb1ab9f77c1ff6c425781cf4561f781d6e9a40cc5ca0d9add540249ea5493e8782a9372aea296ead6c165c6c440ae1509eb319d151ee5
diff --git a/sec-policy/selinux-bind/selinux-bind-2.20141203-r8.ebuild b/sec-policy/selinux-bind/selinux-bind-2.20141203-r8.ebuild
index ad8292844d2b..d5347a4aa1bd 100644
--- a/sec-policy/selinux-bind/selinux-bind-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-bind/selinux-bind-2.20141203-r8.ebuild
@@ -13,5 +13,5 @@ DESCRIPTION="SELinux policy for bind"
 if [[ $PV == 9999* ]] ; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-bind/selinux-bind-2.20141203-r9.ebuild b/sec-policy/selinux-bind/selinux-bind-2.20141203-r9.ebuild
new file mode 100644
index 000000000000..ad8292844d2b
--- /dev/null
+++ b/sec-policy/selinux-bind/selinux-bind-2.20141203-r9.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI="5"
+
+IUSE=""
+MODS="bind"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for bind"
+
+if [[ $PV == 9999* ]] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
diff --git a/sec-policy/selinux-bitcoin/Manifest b/sec-policy/selinux-bitcoin/Manifest
index c9e3e9860602..c48a29184380 100644
--- a/sec-policy/selinux-bitcoin/Manifest
+++ b/sec-policy/selinux-bitcoin/Manifest
@@ -5,4 +5,5 @@ DIST patchbundle-selinux-base-policy-2.20141203-r5.tar.bz2 274136 SHA256 c23d17c
 DIST patchbundle-selinux-base-policy-2.20141203-r6.tar.bz2 293231 SHA256 b686dcc517b97834f66d967afdcc724cb43b5c6dbf9f34043a91cdeda2625cc7 SHA512 a2c486cbe4a1d21ff3fd01bef25ecf5a633a4072646c67cfccf3f7187d95f3d9e3b482a46ba17c55c40a8e7c0dee56e9cf9ddc9f414d3e4511443b62f60d03e9 WHIRLPOOL 3d708e287e3f9b873be647b0327eab6675a8702ee1cffb56e36934cada306e5ccc64397a083dad9e59de37a067e628cacbf896ae99012d5a209e42fd7cd8a4c6
 DIST patchbundle-selinux-base-policy-2.20141203-r7.tar.bz2 295833 SHA256 ba2219b3efc747be65f94c4d8ac3cd6ee530c82c848fa41935a114184678622a SHA512 8e32d9dbfb2f0f3f50200543aadb51ed9834ccd5cdf30bf8e4d9e6d0b645ce44ffaf80f7aa9385e9c9095d9a383b3a348a92356cb5386c06544ab082a9a468c7 WHIRLPOOL 1648ee1be71e45fcf5a264816ce7edc7bab19bd28a68703923eb2d6068f1f0469ae593855231d31f88baecbf29e7cece2d6beeed20b7c04231a6c90e90d35910
 DIST patchbundle-selinux-base-policy-2.20141203-r8.tar.bz2 297919 SHA256 77539eb3d78105f8789cd8205d2698bd27e2abf100163bdd162cda860fd15120 SHA512 2f8a19e1e4bb65f32b480275f49099aed3ae9df543c7de862b3bbd93e81b89cd96dadac3d091e28673d09a6885db8c5656b3a77d0080775c110b04f2753de7a6 WHIRLPOOL 79cb7e620eb8e838192dc557c7a9ce7e713227d783cc8b63792825559b2145cad70d0af6f99948c1527557bc363feffd846c73893682b4a14fc7d08b9e20c649
+DIST patchbundle-selinux-base-policy-2.20141203-r9.tar.bz2 299602 SHA256 e8518004942a6c57170a609683e22b1410c93a2a195829c41dc8fbc703d941b5 SHA512 ce6484fbca1d2d074e50d1a3953392bd3ce0a4617df98fbac37747b469b4f160a9331586dfe1c3ddccb1ccbee24876a2f05ab49e37c8492a48baf83c2d01d140 WHIRLPOOL 1fd7b956e98e95a64c3a713a944d4531259bd156a7feabf6a89c4b5f33ac846377730eede97889e85183be086f282ebd18e860214f6ca3f01b40f2323470ee04
 DIST refpolicy-2.20141203.tar.bz2 680243 SHA256 f438209c430d8a2d4ddcbe4bdd3edb46f6af7dc4913637af0b73c635e40c1522 SHA512 682e4280c5799e4c12ec7594afc1389f67be35055748d2e0dbdc3419159a16c96d4946ca6178daee8370515951f8653b2e452efe8c962b8d7f9bc192f0b15a0c WHIRLPOOL 74bca232534e7af9051bb1ab9f77c1ff6c425781cf4561f781d6e9a40cc5ca0d9add540249ea5493e8782a9372aea296ead6c165c6c440ae1509eb319d151ee5
diff --git a/sec-policy/selinux-bitcoin/selinux-bitcoin-2.20141203-r8.ebuild b/sec-policy/selinux-bitcoin/selinux-bitcoin-2.20141203-r8.ebuild
index 730b6a9688a1..fc6fc780d39f 100644
--- a/sec-policy/selinux-bitcoin/selinux-bitcoin-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-bitcoin/selinux-bitcoin-2.20141203-r8.ebuild
@@ -13,5 +13,5 @@ DESCRIPTION="SELinux policy for bitcoin"
 if [[ $PV == 9999* ]] ; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-bitcoin/selinux-bitcoin-2.20141203-r9.ebuild b/sec-policy/selinux-bitcoin/selinux-bitcoin-2.20141203-r9.ebuild
new file mode 100644
index 000000000000..730b6a9688a1
--- /dev/null
+++ b/sec-policy/selinux-bitcoin/selinux-bitcoin-2.20141203-r9.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI="5"
+
+IUSE=""
+MODS="bitcoin"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for bitcoin"
+
+if [[ $PV == 9999* ]] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
diff --git a/sec-policy/selinux-bitlbee/Manifest b/sec-policy/selinux-bitlbee/Manifest
index 8327a635be01..91d204b0021a 100644
--- a/sec-policy/selinux-bitlbee/Manifest
+++ b/sec-policy/selinux-bitlbee/Manifest
@@ -9,5 +9,6 @@ DIST patchbundle-selinux-base-policy-2.20141203-r5.tar.bz2 274136 SHA256 c23d17c
 DIST patchbundle-selinux-base-policy-2.20141203-r6.tar.bz2 293231 SHA256 b686dcc517b97834f66d967afdcc724cb43b5c6dbf9f34043a91cdeda2625cc7 SHA512 a2c486cbe4a1d21ff3fd01bef25ecf5a633a4072646c67cfccf3f7187d95f3d9e3b482a46ba17c55c40a8e7c0dee56e9cf9ddc9f414d3e4511443b62f60d03e9 WHIRLPOOL 3d708e287e3f9b873be647b0327eab6675a8702ee1cffb56e36934cada306e5ccc64397a083dad9e59de37a067e628cacbf896ae99012d5a209e42fd7cd8a4c6
 DIST patchbundle-selinux-base-policy-2.20141203-r7.tar.bz2 295833 SHA256 ba2219b3efc747be65f94c4d8ac3cd6ee530c82c848fa41935a114184678622a SHA512 8e32d9dbfb2f0f3f50200543aadb51ed9834ccd5cdf30bf8e4d9e6d0b645ce44ffaf80f7aa9385e9c9095d9a383b3a348a92356cb5386c06544ab082a9a468c7 WHIRLPOOL 1648ee1be71e45fcf5a264816ce7edc7bab19bd28a68703923eb2d6068f1f0469ae593855231d31f88baecbf29e7cece2d6beeed20b7c04231a6c90e90d35910
 DIST patchbundle-selinux-base-policy-2.20141203-r8.tar.bz2 297919 SHA256 77539eb3d78105f8789cd8205d2698bd27e2abf100163bdd162cda860fd15120 SHA512 2f8a19e1e4bb65f32b480275f49099aed3ae9df543c7de862b3bbd93e81b89cd96dadac3d091e28673d09a6885db8c5656b3a77d0080775c110b04f2753de7a6 WHIRLPOOL 79cb7e620eb8e838192dc557c7a9ce7e713227d783cc8b63792825559b2145cad70d0af6f99948c1527557bc363feffd846c73893682b4a14fc7d08b9e20c649
+DIST patchbundle-selinux-base-policy-2.20141203-r9.tar.bz2 299602 SHA256 e8518004942a6c57170a609683e22b1410c93a2a195829c41dc8fbc703d941b5 SHA512 ce6484fbca1d2d074e50d1a3953392bd3ce0a4617df98fbac37747b469b4f160a9331586dfe1c3ddccb1ccbee24876a2f05ab49e37c8492a48baf83c2d01d140 WHIRLPOOL 1fd7b956e98e95a64c3a713a944d4531259bd156a7feabf6a89c4b5f33ac846377730eede97889e85183be086f282ebd18e860214f6ca3f01b40f2323470ee04
 DIST refpolicy-2.20140311.tar.bz2 664416 SHA256 f69437db95548c78a5dec44c236397146b144153149009ea554d2e536e5436f7 SHA512 50bacee82ed41ac8b8007ecc33bf51d22303cc2ddd27cfb72cb5520dab5f8e255186e34b89cec492c7a2d4220b200814bdede9b46c19f987a3d3d65a1c9b749a WHIRLPOOL e07480beba6ab1f02ad36b7d0c50c4a71cb39a8ec78bf8d1dc3c82bb9dd1d69d9169d7c937165ea15f60ce1147f256d46644f944107a3a8a800d5bad70d4c255
 DIST refpolicy-2.20141203.tar.bz2 680243 SHA256 f438209c430d8a2d4ddcbe4bdd3edb46f6af7dc4913637af0b73c635e40c1522 SHA512 682e4280c5799e4c12ec7594afc1389f67be35055748d2e0dbdc3419159a16c96d4946ca6178daee8370515951f8653b2e452efe8c962b8d7f9bc192f0b15a0c WHIRLPOOL 74bca232534e7af9051bb1ab9f77c1ff6c425781cf4561f781d6e9a40cc5ca0d9add540249ea5493e8782a9372aea296ead6c165c6c440ae1509eb319d151ee5
diff --git a/sec-policy/selinux-bitlbee/selinux-bitlbee-2.20141203-r8.ebuild b/sec-policy/selinux-bitlbee/selinux-bitlbee-2.20141203-r8.ebuild
index 079ec07d6e9e..5cf2619873fd 100644
--- a/sec-policy/selinux-bitlbee/selinux-bitlbee-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-bitlbee/selinux-bitlbee-2.20141203-r8.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="SELinux policy for bitlbee"
 if [[ $PV == 9999* ]] ; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-bitlbee/selinux-bitlbee-2.20141203-r9.ebuild b/sec-policy/selinux-bitlbee/selinux-bitlbee-2.20141203-r9.ebuild
new file mode 100644
index 000000000000..079ec07d6e9e
--- /dev/null
+++ b/sec-policy/selinux-bitlbee/selinux-bitlbee-2.20141203-r9.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI="5"
+
+IUSE=""
+MODS="bitlbee"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for bitlbee"
+
+if [[ $PV == 9999* ]] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DEPEND="${DEPEND}
+	sec-policy/selinux-inetd
+"
+RDEPEND="${RDEPEND}
+	sec-policy/selinux-inetd
+"
diff --git a/sec-policy/selinux-bluetooth/Manifest b/sec-policy/selinux-bluetooth/Manifest
index 8327a635be01..91d204b0021a 100644
--- a/sec-policy/selinux-bluetooth/Manifest
+++ b/sec-policy/selinux-bluetooth/Manifest
@@ -9,5 +9,6 @@ DIST patchbundle-selinux-base-policy-2.20141203-r5.tar.bz2 274136 SHA256 c23d17c
 DIST patchbundle-selinux-base-policy-2.20141203-r6.tar.bz2 293231 SHA256 b686dcc517b97834f66d967afdcc724cb43b5c6dbf9f34043a91cdeda2625cc7 SHA512 a2c486cbe4a1d21ff3fd01bef25ecf5a633a4072646c67cfccf3f7187d95f3d9e3b482a46ba17c55c40a8e7c0dee56e9cf9ddc9f414d3e4511443b62f60d03e9 WHIRLPOOL 3d708e287e3f9b873be647b0327eab6675a8702ee1cffb56e36934cada306e5ccc64397a083dad9e59de37a067e628cacbf896ae99012d5a209e42fd7cd8a4c6
 DIST patchbundle-selinux-base-policy-2.20141203-r7.tar.bz2 295833 SHA256 ba2219b3efc747be65f94c4d8ac3cd6ee530c82c848fa41935a114184678622a SHA512 8e32d9dbfb2f0f3f50200543aadb51ed9834ccd5cdf30bf8e4d9e6d0b645ce44ffaf80f7aa9385e9c9095d9a383b3a348a92356cb5386c06544ab082a9a468c7 WHIRLPOOL 1648ee1be71e45fcf5a264816ce7edc7bab19bd28a68703923eb2d6068f1f0469ae593855231d31f88baecbf29e7cece2d6beeed20b7c04231a6c90e90d35910
 DIST patchbundle-selinux-base-policy-2.20141203-r8.tar.bz2 297919 SHA256 77539eb3d78105f8789cd8205d2698bd27e2abf100163bdd162cda860fd15120 SHA512 2f8a19e1e4bb65f32b480275f49099aed3ae9df543c7de862b3bbd93e81b89cd96dadac3d091e28673d09a6885db8c5656b3a77d0080775c110b04f2753de7a6 WHIRLPOOL 79cb7e620eb8e838192dc557c7a9ce7e713227d783cc8b63792825559b2145cad70d0af6f99948c1527557bc363feffd846c73893682b4a14fc7d08b9e20c649
+DIST patchbundle-selinux-base-policy-2.20141203-r9.tar.bz2 299602 SHA256 e8518004942a6c57170a609683e22b1410c93a2a195829c41dc8fbc703d941b5 SHA512 ce6484fbca1d2d074e50d1a3953392bd3ce0a4617df98fbac37747b469b4f160a9331586dfe1c3ddccb1ccbee24876a2f05ab49e37c8492a48baf83c2d01d140 WHIRLPOOL 1fd7b956e98e95a64c3a713a944d4531259bd156a7feabf6a89c4b5f33ac846377730eede97889e85183be086f282ebd18e860214f6ca3f01b40f2323470ee04
 DIST refpolicy-2.20140311.tar.bz2 664416 SHA256 f69437db95548c78a5dec44c236397146b144153149009ea554d2e536e5436f7 SHA512 50bacee82ed41ac8b8007ecc33bf51d22303cc2ddd27cfb72cb5520dab5f8e255186e34b89cec492c7a2d4220b200814bdede9b46c19f987a3d3d65a1c9b749a WHIRLPOOL e07480beba6ab1f02ad36b7d0c50c4a71cb39a8ec78bf8d1dc3c82bb9dd1d69d9169d7c937165ea15f60ce1147f256d46644f944107a3a8a800d5bad70d4c255
 DIST refpolicy-2.20141203.tar.bz2 680243 SHA256 f438209c430d8a2d4ddcbe4bdd3edb46f6af7dc4913637af0b73c635e40c1522 SHA512 682e4280c5799e4c12ec7594afc1389f67be35055748d2e0dbdc3419159a16c96d4946ca6178daee8370515951f8653b2e452efe8c962b8d7f9bc192f0b15a0c WHIRLPOOL 74bca232534e7af9051bb1ab9f77c1ff6c425781cf4561f781d6e9a40cc5ca0d9add540249ea5493e8782a9372aea296ead6c165c6c440ae1509eb319d151ee5
diff --git a/sec-policy/selinux-bluetooth/selinux-bluetooth-2.20141203-r8.ebuild b/sec-policy/selinux-bluetooth/selinux-bluetooth-2.20141203-r8.ebuild
index d654599a76fe..e408a3271662 100644
--- a/sec-policy/selinux-bluetooth/selinux-bluetooth-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-bluetooth/selinux-bluetooth-2.20141203-r8.ebuild
@@ -13,5 +13,5 @@ DESCRIPTION="SELinux policy for bluetooth"
 if [[ $PV == 9999* ]] ; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-bluetooth/selinux-bluetooth-2.20141203-r9.ebuild b/sec-policy/selinux-bluetooth/selinux-bluetooth-2.20141203-r9.ebuild
new file mode 100644
index 000000000000..d654599a76fe
--- /dev/null
+++ b/sec-policy/selinux-bluetooth/selinux-bluetooth-2.20141203-r9.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI="5"
+
+IUSE=""
+MODS="bluetooth"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for bluetooth"
+
+if [[ $PV == 9999* ]] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
diff --git a/sec-policy/selinux-brctl/Manifest b/sec-policy/selinux-brctl/Manifest
index 8327a635be01..91d204b0021a 100644
--- a/sec-policy/selinux-brctl/Manifest
+++ b/sec-policy/selinux-brctl/Manifest
@@ -9,5 +9,6 @@ DIST patchbundle-selinux-base-policy-2.20141203-r5.tar.bz2 274136 SHA256 c23d17c
 DIST patchbundle-selinux-base-policy-2.20141203-r6.tar.bz2 293231 SHA256 b686dcc517b97834f66d967afdcc724cb43b5c6dbf9f34043a91cdeda2625cc7 SHA512 a2c486cbe4a1d21ff3fd01bef25ecf5a633a4072646c67cfccf3f7187d95f3d9e3b482a46ba17c55c40a8e7c0dee56e9cf9ddc9f414d3e4511443b62f60d03e9 WHIRLPOOL 3d708e287e3f9b873be647b0327eab6675a8702ee1cffb56e36934cada306e5ccc64397a083dad9e59de37a067e628cacbf896ae99012d5a209e42fd7cd8a4c6
 DIST patchbundle-selinux-base-policy-2.20141203-r7.tar.bz2 295833 SHA256 ba2219b3efc747be65f94c4d8ac3cd6ee530c82c848fa41935a114184678622a SHA512 8e32d9dbfb2f0f3f50200543aadb51ed9834ccd5cdf30bf8e4d9e6d0b645ce44ffaf80f7aa9385e9c9095d9a383b3a348a92356cb5386c06544ab082a9a468c7 WHIRLPOOL 1648ee1be71e45fcf5a264816ce7edc7bab19bd28a68703923eb2d6068f1f0469ae593855231d31f88baecbf29e7cece2d6beeed20b7c04231a6c90e90d35910
 DIST patchbundle-selinux-base-policy-2.20141203-r8.tar.bz2 297919 SHA256 77539eb3d78105f8789cd8205d2698bd27e2abf100163bdd162cda860fd15120 SHA512 2f8a19e1e4bb65f32b480275f49099aed3ae9df543c7de862b3bbd93e81b89cd96dadac3d091e28673d09a6885db8c5656b3a77d0080775c110b04f2753de7a6 WHIRLPOOL 79cb7e620eb8e838192dc557c7a9ce7e713227d783cc8b63792825559b2145cad70d0af6f99948c1527557bc363feffd846c73893682b4a14fc7d08b9e20c649
+DIST patchbundle-selinux-base-policy-2.20141203-r9.tar.bz2 299602 SHA256 e8518004942a6c57170a609683e22b1410c93a2a195829c41dc8fbc703d941b5 SHA512 ce6484fbca1d2d074e50d1a3953392bd3ce0a4617df98fbac37747b469b4f160a9331586dfe1c3ddccb1ccbee24876a2f05ab49e37c8492a48baf83c2d01d140 WHIRLPOOL 1fd7b956e98e95a64c3a713a944d4531259bd156a7feabf6a89c4b5f33ac846377730eede97889e85183be086f282ebd18e860214f6ca3f01b40f2323470ee04
 DIST refpolicy-2.20140311.tar.bz2 664416 SHA256 f69437db95548c78a5dec44c236397146b144153149009ea554d2e536e5436f7 SHA512 50bacee82ed41ac8b8007ecc33bf51d22303cc2ddd27cfb72cb5520dab5f8e255186e34b89cec492c7a2d4220b200814bdede9b46c19f987a3d3d65a1c9b749a WHIRLPOOL e07480beba6ab1f02ad36b7d0c50c4a71cb39a8ec78bf8d1dc3c82bb9dd1d69d9169d7c937165ea15f60ce1147f256d46644f944107a3a8a800d5bad70d4c255
 DIST refpolicy-2.20141203.tar.bz2 680243 SHA256 f438209c430d8a2d4ddcbe4bdd3edb46f6af7dc4913637af0b73c635e40c1522 SHA512 682e4280c5799e4c12ec7594afc1389f67be35055748d2e0dbdc3419159a16c96d4946ca6178daee8370515951f8653b2e452efe8c962b8d7f9bc192f0b15a0c WHIRLPOOL 74bca232534e7af9051bb1ab9f77c1ff6c425781cf4561f781d6e9a40cc5ca0d9add540249ea5493e8782a9372aea296ead6c165c6c440ae1509eb319d151ee5
diff --git a/sec-policy/selinux-brctl/selinux-brctl-2.20141203-r8.ebuild b/sec-policy/selinux-brctl/selinux-brctl-2.20141203-r8.ebuild
index 2a2da441a874..086befe83548 100644
--- a/sec-policy/selinux-brctl/selinux-brctl-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-brctl/selinux-brctl-2.20141203-r8.ebuild
@@ -13,5 +13,5 @@ DESCRIPTION="SELinux policy for brctl"
 if [[ $PV == 9999* ]] ; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-brctl/selinux-brctl-2.20141203-r9.ebuild b/sec-policy/selinux-brctl/selinux-brctl-2.20141203-r9.ebuild
new file mode 100644
index 000000000000..2a2da441a874
--- /dev/null
+++ b/sec-policy/selinux-brctl/selinux-brctl-2.20141203-r9.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI="5"
+
+IUSE=""
+MODS="brctl"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for brctl"
+
+if [[ $PV == 9999* ]] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
diff --git a/sec-policy/selinux-cachefilesd/Manifest b/sec-policy/selinux-cachefilesd/Manifest
index 8327a635be01..91d204b0021a 100644
--- a/sec-policy/selinux-cachefilesd/Manifest
+++ b/sec-policy/selinux-cachefilesd/Manifest
@@ -9,5 +9,6 @@ DIST patchbundle-selinux-base-policy-2.20141203-r5.tar.bz2 274136 SHA256 c23d17c
 DIST patchbundle-selinux-base-policy-2.20141203-r6.tar.bz2 293231 SHA256 b686dcc517b97834f66d967afdcc724cb43b5c6dbf9f34043a91cdeda2625cc7 SHA512 a2c486cbe4a1d21ff3fd01bef25ecf5a633a4072646c67cfccf3f7187d95f3d9e3b482a46ba17c55c40a8e7c0dee56e9cf9ddc9f414d3e4511443b62f60d03e9 WHIRLPOOL 3d708e287e3f9b873be647b0327eab6675a8702ee1cffb56e36934cada306e5ccc64397a083dad9e59de37a067e628cacbf896ae99012d5a209e42fd7cd8a4c6
 DIST patchbundle-selinux-base-policy-2.20141203-r7.tar.bz2 295833 SHA256 ba2219b3efc747be65f94c4d8ac3cd6ee530c82c848fa41935a114184678622a SHA512 8e32d9dbfb2f0f3f50200543aadb51ed9834ccd5cdf30bf8e4d9e6d0b645ce44ffaf80f7aa9385e9c9095d9a383b3a348a92356cb5386c06544ab082a9a468c7 WHIRLPOOL 1648ee1be71e45fcf5a264816ce7edc7bab19bd28a68703923eb2d6068f1f0469ae593855231d31f88baecbf29e7cece2d6beeed20b7c04231a6c90e90d35910
 DIST patchbundle-selinux-base-policy-2.20141203-r8.tar.bz2 297919 SHA256 77539eb3d78105f8789cd8205d2698bd27e2abf100163bdd162cda860fd15120 SHA512 2f8a19e1e4bb65f32b480275f49099aed3ae9df543c7de862b3bbd93e81b89cd96dadac3d091e28673d09a6885db8c5656b3a77d0080775c110b04f2753de7a6 WHIRLPOOL 79cb7e620eb8e838192dc557c7a9ce7e713227d783cc8b63792825559b2145cad70d0af6f99948c1527557bc363feffd846c73893682b4a14fc7d08b9e20c649
+DIST patchbundle-selinux-base-policy-2.20141203-r9.tar.bz2 299602 SHA256 e8518004942a6c57170a609683e22b1410c93a2a195829c41dc8fbc703d941b5 SHA512 ce6484fbca1d2d074e50d1a3953392bd3ce0a4617df98fbac37747b469b4f160a9331586dfe1c3ddccb1ccbee24876a2f05ab49e37c8492a48baf83c2d01d140 WHIRLPOOL 1fd7b956e98e95a64c3a713a944d4531259bd156a7feabf6a89c4b5f33ac846377730eede97889e85183be086f282ebd18e860214f6ca3f01b40f2323470ee04
 DIST refpolicy-2.20140311.tar.bz2 664416 SHA256 f69437db95548c78a5dec44c236397146b144153149009ea554d2e536e5436f7 SHA512 50bacee82ed41ac8b8007ecc33bf51d22303cc2ddd27cfb72cb5520dab5f8e255186e34b89cec492c7a2d4220b200814bdede9b46c19f987a3d3d65a1c9b749a WHIRLPOOL e07480beba6ab1f02ad36b7d0c50c4a71cb39a8ec78bf8d1dc3c82bb9dd1d69d9169d7c937165ea15f60ce1147f256d46644f944107a3a8a800d5bad70d4c255
 DIST refpolicy-2.20141203.tar.bz2 680243 SHA256 f438209c430d8a2d4ddcbe4bdd3edb46f6af7dc4913637af0b73c635e40c1522 SHA512 682e4280c5799e4c12ec7594afc1389f67be35055748d2e0dbdc3419159a16c96d4946ca6178daee8370515951f8653b2e452efe8c962b8d7f9bc192f0b15a0c WHIRLPOOL 74bca232534e7af9051bb1ab9f77c1ff6c425781cf4561f781d6e9a40cc5ca0d9add540249ea5493e8782a9372aea296ead6c165c6c440ae1509eb319d151ee5
diff --git a/sec-policy/selinux-cachefilesd/selinux-cachefilesd-2.20141203-r8.ebuild b/sec-policy/selinux-cachefilesd/selinux-cachefilesd-2.20141203-r8.ebuild
index 42da13b7eb79..29ec40fa3bab 100644
--- a/sec-policy/selinux-cachefilesd/selinux-cachefilesd-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-cachefilesd/selinux-cachefilesd-2.20141203-r8.ebuild
@@ -13,5 +13,5 @@ DESCRIPTION="SELinux policy for cachefilesd"
 if [[ $PV == 9999* ]] ; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-cachefilesd/selinux-cachefilesd-2.20141203-r9.ebuild b/sec-policy/selinux-cachefilesd/selinux-cachefilesd-2.20141203-r9.ebuild
new file mode 100644
index 000000000000..42da13b7eb79
--- /dev/null
+++ b/sec-policy/selinux-cachefilesd/selinux-cachefilesd-2.20141203-r9.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI="5"
+
+IUSE=""
+MODS="cachefilesd"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for cachefilesd"
+
+if [[ $PV == 9999* ]] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
diff --git a/sec-policy/selinux-calamaris/Manifest b/sec-policy/selinux-calamaris/Manifest
index 8327a635be01..91d204b0021a 100644
--- a/sec-policy/selinux-calamaris/Manifest
+++ b/sec-policy/selinux-calamaris/Manifest
@@ -9,5 +9,6 @@ DIST patchbundle-selinux-base-policy-2.20141203-r5.tar.bz2 274136 SHA256 c23d17c
 DIST patchbundle-selinux-base-policy-2.20141203-r6.tar.bz2 293231 SHA256 b686dcc517b97834f66d967afdcc724cb43b5c6dbf9f34043a91cdeda2625cc7 SHA512 a2c486cbe4a1d21ff3fd01bef25ecf5a633a4072646c67cfccf3f7187d95f3d9e3b482a46ba17c55c40a8e7c0dee56e9cf9ddc9f414d3e4511443b62f60d03e9 WHIRLPOOL 3d708e287e3f9b873be647b0327eab6675a8702ee1cffb56e36934cada306e5ccc64397a083dad9e59de37a067e628cacbf896ae99012d5a209e42fd7cd8a4c6
 DIST patchbundle-selinux-base-policy-2.20141203-r7.tar.bz2 295833 SHA256 ba2219b3efc747be65f94c4d8ac3cd6ee530c82c848fa41935a114184678622a SHA512 8e32d9dbfb2f0f3f50200543aadb51ed9834ccd5cdf30bf8e4d9e6d0b645ce44ffaf80f7aa9385e9c9095d9a383b3a348a92356cb5386c06544ab082a9a468c7 WHIRLPOOL 1648ee1be71e45fcf5a264816ce7edc7bab19bd28a68703923eb2d6068f1f0469ae593855231d31f88baecbf29e7cece2d6beeed20b7c04231a6c90e90d35910
 DIST patchbundle-selinux-base-policy-2.20141203-r8.tar.bz2 297919 SHA256 77539eb3d78105f8789cd8205d2698bd27e2abf100163bdd162cda860fd15120 SHA512 2f8a19e1e4bb65f32b480275f49099aed3ae9df543c7de862b3bbd93e81b89cd96dadac3d091e28673d09a6885db8c5656b3a77d0080775c110b04f2753de7a6 WHIRLPOOL 79cb7e620eb8e838192dc557c7a9ce7e713227d783cc8b63792825559b2145cad70d0af6f99948c1527557bc363feffd846c73893682b4a14fc7d08b9e20c649
+DIST patchbundle-selinux-base-policy-2.20141203-r9.tar.bz2 299602 SHA256 e8518004942a6c57170a609683e22b1410c93a2a195829c41dc8fbc703d941b5 SHA512 ce6484fbca1d2d074e50d1a3953392bd3ce0a4617df98fbac37747b469b4f160a9331586dfe1c3ddccb1ccbee24876a2f05ab49e37c8492a48baf83c2d01d140 WHIRLPOOL 1fd7b956e98e95a64c3a713a944d4531259bd156a7feabf6a89c4b5f33ac846377730eede97889e85183be086f282ebd18e860214f6ca3f01b40f2323470ee04
 DIST refpolicy-2.20140311.tar.bz2 664416 SHA256 f69437db95548c78a5dec44c236397146b144153149009ea554d2e536e5436f7 SHA512 50bacee82ed41ac8b8007ecc33bf51d22303cc2ddd27cfb72cb5520dab5f8e255186e34b89cec492c7a2d4220b200814bdede9b46c19f987a3d3d65a1c9b749a WHIRLPOOL e07480beba6ab1f02ad36b7d0c50c4a71cb39a8ec78bf8d1dc3c82bb9dd1d69d9169d7c937165ea15f60ce1147f256d46644f944107a3a8a800d5bad70d4c255
 DIST refpolicy-2.20141203.tar.bz2 680243 SHA256 f438209c430d8a2d4ddcbe4bdd3edb46f6af7dc4913637af0b73c635e40c1522 SHA512 682e4280c5799e4c12ec7594afc1389f67be35055748d2e0dbdc3419159a16c96d4946ca6178daee8370515951f8653b2e452efe8c962b8d7f9bc192f0b15a0c WHIRLPOOL 74bca232534e7af9051bb1ab9f77c1ff6c425781cf4561f781d6e9a40cc5ca0d9add540249ea5493e8782a9372aea296ead6c165c6c440ae1509eb319d151ee5
diff --git a/sec-policy/selinux-calamaris/selinux-calamaris-2.20141203-r8.ebuild b/sec-policy/selinux-calamaris/selinux-calamaris-2.20141203-r8.ebuild
index b29b07e69586..b065dfc25cde 100644
--- a/sec-policy/selinux-calamaris/selinux-calamaris-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-calamaris/selinux-calamaris-2.20141203-r8.ebuild
@@ -13,5 +13,5 @@ DESCRIPTION="SELinux policy for calamaris"
 if [[ $PV == 9999* ]] ; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-calamaris/selinux-calamaris-2.20141203-r9.ebuild b/sec-policy/selinux-calamaris/selinux-calamaris-2.20141203-r9.ebuild
new file mode 100644
index 000000000000..b29b07e69586
--- /dev/null
+++ b/sec-policy/selinux-calamaris/selinux-calamaris-2.20141203-r9.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI="5"
+
+IUSE=""
+MODS="calamaris"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for calamaris"
+
+if [[ $PV == 9999* ]] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
diff --git a/sec-policy/selinux-canna/Manifest b/sec-policy/selinux-canna/Manifest
index 8327a635be01..91d204b0021a 100644
--- a/sec-policy/selinux-canna/Manifest
+++ b/sec-policy/selinux-canna/Manifest
@@ -9,5 +9,6 @@ DIST patchbundle-selinux-base-policy-2.20141203-r5.tar.bz2 274136 SHA256 c23d17c
 DIST patchbundle-selinux-base-policy-2.20141203-r6.tar.bz2 293231 SHA256 b686dcc517b97834f66d967afdcc724cb43b5c6dbf9f34043a91cdeda2625cc7 SHA512 a2c486cbe4a1d21ff3fd01bef25ecf5a633a4072646c67cfccf3f7187d95f3d9e3b482a46ba17c55c40a8e7c0dee56e9cf9ddc9f414d3e4511443b62f60d03e9 WHIRLPOOL 3d708e287e3f9b873be647b0327eab6675a8702ee1cffb56e36934cada306e5ccc64397a083dad9e59de37a067e628cacbf896ae99012d5a209e42fd7cd8a4c6
 DIST patchbundle-selinux-base-policy-2.20141203-r7.tar.bz2 295833 SHA256 ba2219b3efc747be65f94c4d8ac3cd6ee530c82c848fa41935a114184678622a SHA512 8e32d9dbfb2f0f3f50200543aadb51ed9834ccd5cdf30bf8e4d9e6d0b645ce44ffaf80f7aa9385e9c9095d9a383b3a348a92356cb5386c06544ab082a9a468c7 WHIRLPOOL 1648ee1be71e45fcf5a264816ce7edc7bab19bd28a68703923eb2d6068f1f0469ae593855231d31f88baecbf29e7cece2d6beeed20b7c04231a6c90e90d35910
 DIST patchbundle-selinux-base-policy-2.20141203-r8.tar.bz2 297919 SHA256 77539eb3d78105f8789cd8205d2698bd27e2abf100163bdd162cda860fd15120 SHA512 2f8a19e1e4bb65f32b480275f49099aed3ae9df543c7de862b3bbd93e81b89cd96dadac3d091e28673d09a6885db8c5656b3a77d0080775c110b04f2753de7a6 WHIRLPOOL 79cb7e620eb8e838192dc557c7a9ce7e713227d783cc8b63792825559b2145cad70d0af6f99948c1527557bc363feffd846c73893682b4a14fc7d08b9e20c649
+DIST patchbundle-selinux-base-policy-2.20141203-r9.tar.bz2 299602 SHA256 e8518004942a6c57170a609683e22b1410c93a2a195829c41dc8fbc703d941b5 SHA512 ce6484fbca1d2d074e50d1a3953392bd3ce0a4617df98fbac37747b469b4f160a9331586dfe1c3ddccb1ccbee24876a2f05ab49e37c8492a48baf83c2d01d140 WHIRLPOOL 1fd7b956e98e95a64c3a713a944d4531259bd156a7feabf6a89c4b5f33ac846377730eede97889e85183be086f282ebd18e860214f6ca3f01b40f2323470ee04
 DIST refpolicy-2.20140311.tar.bz2 664416 SHA256 f69437db95548c78a5dec44c236397146b144153149009ea554d2e536e5436f7 SHA512 50bacee82ed41ac8b8007ecc33bf51d22303cc2ddd27cfb72cb5520dab5f8e255186e34b89cec492c7a2d4220b200814bdede9b46c19f987a3d3d65a1c9b749a WHIRLPOOL e07480beba6ab1f02ad36b7d0c50c4a71cb39a8ec78bf8d1dc3c82bb9dd1d69d9169d7c937165ea15f60ce1147f256d46644f944107a3a8a800d5bad70d4c255
 DIST refpolicy-2.20141203.tar.bz2 680243 SHA256 f438209c430d8a2d4ddcbe4bdd3edb46f6af7dc4913637af0b73c635e40c1522 SHA512 682e4280c5799e4c12ec7594afc1389f67be35055748d2e0dbdc3419159a16c96d4946ca6178daee8370515951f8653b2e452efe8c962b8d7f9bc192f0b15a0c WHIRLPOOL 74bca232534e7af9051bb1ab9f77c1ff6c425781cf4561f781d6e9a40cc5ca0d9add540249ea5493e8782a9372aea296ead6c165c6c440ae1509eb319d151ee5
diff --git a/sec-policy/selinux-canna/selinux-canna-2.20141203-r8.ebuild b/sec-policy/selinux-canna/selinux-canna-2.20141203-r8.ebuild
index b9f3d2a8bfeb..888a0e8d15c8 100644
--- a/sec-policy/selinux-canna/selinux-canna-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-canna/selinux-canna-2.20141203-r8.ebuild
@@ -13,5 +13,5 @@ DESCRIPTION="SELinux policy for canna"
 if [[ $PV == 9999* ]] ; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-canna/selinux-canna-2.20141203-r9.ebuild b/sec-policy/selinux-canna/selinux-canna-2.20141203-r9.ebuild
new file mode 100644
index 000000000000..b9f3d2a8bfeb
--- /dev/null
+++ b/sec-policy/selinux-canna/selinux-canna-2.20141203-r9.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI="5"
+
+IUSE=""
+MODS="canna"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for canna"
+
+if [[ $PV == 9999* ]] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
diff --git a/sec-policy/selinux-ccs/Manifest b/sec-policy/selinux-ccs/Manifest
index 8327a635be01..91d204b0021a 100644
--- a/sec-policy/selinux-ccs/Manifest
+++ b/sec-policy/selinux-ccs/Manifest
@@ -9,5 +9,6 @@ DIST patchbundle-selinux-base-policy-2.20141203-r5.tar.bz2 274136 SHA256 c23d17c
 DIST patchbundle-selinux-base-policy-2.20141203-r6.tar.bz2 293231 SHA256 b686dcc517b97834f66d967afdcc724cb43b5c6dbf9f34043a91cdeda2625cc7 SHA512 a2c486cbe4a1d21ff3fd01bef25ecf5a633a4072646c67cfccf3f7187d95f3d9e3b482a46ba17c55c40a8e7c0dee56e9cf9ddc9f414d3e4511443b62f60d03e9 WHIRLPOOL 3d708e287e3f9b873be647b0327eab6675a8702ee1cffb56e36934cada306e5ccc64397a083dad9e59de37a067e628cacbf896ae99012d5a209e42fd7cd8a4c6
 DIST patchbundle-selinux-base-policy-2.20141203-r7.tar.bz2 295833 SHA256 ba2219b3efc747be65f94c4d8ac3cd6ee530c82c848fa41935a114184678622a SHA512 8e32d9dbfb2f0f3f50200543aadb51ed9834ccd5cdf30bf8e4d9e6d0b645ce44ffaf80f7aa9385e9c9095d9a383b3a348a92356cb5386c06544ab082a9a468c7 WHIRLPOOL 1648ee1be71e45fcf5a264816ce7edc7bab19bd28a68703923eb2d6068f1f0469ae593855231d31f88baecbf29e7cece2d6beeed20b7c04231a6c90e90d35910
 DIST patchbundle-selinux-base-policy-2.20141203-r8.tar.bz2 297919 SHA256 77539eb3d78105f8789cd8205d2698bd27e2abf100163bdd162cda860fd15120 SHA512 2f8a19e1e4bb65f32b480275f49099aed3ae9df543c7de862b3bbd93e81b89cd96dadac3d091e28673d09a6885db8c5656b3a77d0080775c110b04f2753de7a6 WHIRLPOOL 79cb7e620eb8e838192dc557c7a9ce7e713227d783cc8b63792825559b2145cad70d0af6f99948c1527557bc363feffd846c73893682b4a14fc7d08b9e20c649
+DIST patchbundle-selinux-base-policy-2.20141203-r9.tar.bz2 299602 SHA256 e8518004942a6c57170a609683e22b1410c93a2a195829c41dc8fbc703d941b5 SHA512 ce6484fbca1d2d074e50d1a3953392bd3ce0a4617df98fbac37747b469b4f160a9331586dfe1c3ddccb1ccbee24876a2f05ab49e37c8492a48baf83c2d01d140 WHIRLPOOL 1fd7b956e98e95a64c3a713a944d4531259bd156a7feabf6a89c4b5f33ac846377730eede97889e85183be086f282ebd18e860214f6ca3f01b40f2323470ee04
 DIST refpolicy-2.20140311.tar.bz2 664416 SHA256 f69437db95548c78a5dec44c236397146b144153149009ea554d2e536e5436f7 SHA512 50bacee82ed41ac8b8007ecc33bf51d22303cc2ddd27cfb72cb5520dab5f8e255186e34b89cec492c7a2d4220b200814bdede9b46c19f987a3d3d65a1c9b749a WHIRLPOOL e07480beba6ab1f02ad36b7d0c50c4a71cb39a8ec78bf8d1dc3c82bb9dd1d69d9169d7c937165ea15f60ce1147f256d46644f944107a3a8a800d5bad70d4c255
 DIST refpolicy-2.20141203.tar.bz2 680243 SHA256 f438209c430d8a2d4ddcbe4bdd3edb46f6af7dc4913637af0b73c635e40c1522 SHA512 682e4280c5799e4c12ec7594afc1389f67be35055748d2e0dbdc3419159a16c96d4946ca6178daee8370515951f8653b2e452efe8c962b8d7f9bc192f0b15a0c WHIRLPOOL 74bca232534e7af9051bb1ab9f77c1ff6c425781cf4561f781d6e9a40cc5ca0d9add540249ea5493e8782a9372aea296ead6c165c6c440ae1509eb319d151ee5
diff --git a/sec-policy/selinux-ccs/selinux-ccs-2.20141203-r8.ebuild b/sec-policy/selinux-ccs/selinux-ccs-2.20141203-r8.ebuild
index 640f3334d71e..b90f3c734804 100644
--- a/sec-policy/selinux-ccs/selinux-ccs-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-ccs/selinux-ccs-2.20141203-r8.ebuild
@@ -13,5 +13,5 @@ DESCRIPTION="SELinux policy for ccs"
 if [[ $PV == 9999* ]] ; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-ccs/selinux-ccs-2.20141203-r9.ebuild b/sec-policy/selinux-ccs/selinux-ccs-2.20141203-r9.ebuild
new file mode 100644
index 000000000000..640f3334d71e
--- /dev/null
+++ b/sec-policy/selinux-ccs/selinux-ccs-2.20141203-r9.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI="5"
+
+IUSE=""
+MODS="ccs"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for ccs"
+
+if [[ $PV == 9999* ]] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
diff --git a/sec-policy/selinux-cdrecord/Manifest b/sec-policy/selinux-cdrecord/Manifest
index 8327a635be01..91d204b0021a 100644
--- a/sec-policy/selinux-cdrecord/Manifest
+++ b/sec-policy/selinux-cdrecord/Manifest
@@ -9,5 +9,6 @@ DIST patchbundle-selinux-base-policy-2.20141203-r5.tar.bz2 274136 SHA256 c23d17c
 DIST patchbundle-selinux-base-policy-2.20141203-r6.tar.bz2 293231 SHA256 b686dcc517b97834f66d967afdcc724cb43b5c6dbf9f34043a91cdeda2625cc7 SHA512 a2c486cbe4a1d21ff3fd01bef25ecf5a633a4072646c67cfccf3f7187d95f3d9e3b482a46ba17c55c40a8e7c0dee56e9cf9ddc9f414d3e4511443b62f60d03e9 WHIRLPOOL 3d708e287e3f9b873be647b0327eab6675a8702ee1cffb56e36934cada306e5ccc64397a083dad9e59de37a067e628cacbf896ae99012d5a209e42fd7cd8a4c6
 DIST patchbundle-selinux-base-policy-2.20141203-r7.tar.bz2 295833 SHA256 ba2219b3efc747be65f94c4d8ac3cd6ee530c82c848fa41935a114184678622a SHA512 8e32d9dbfb2f0f3f50200543aadb51ed9834ccd5cdf30bf8e4d9e6d0b645ce44ffaf80f7aa9385e9c9095d9a383b3a348a92356cb5386c06544ab082a9a468c7 WHIRLPOOL 1648ee1be71e45fcf5a264816ce7edc7bab19bd28a68703923eb2d6068f1f0469ae593855231d31f88baecbf29e7cece2d6beeed20b7c04231a6c90e90d35910
 DIST patchbundle-selinux-base-policy-2.20141203-r8.tar.bz2 297919 SHA256 77539eb3d78105f8789cd8205d2698bd27e2abf100163bdd162cda860fd15120 SHA512 2f8a19e1e4bb65f32b480275f49099aed3ae9df543c7de862b3bbd93e81b89cd96dadac3d091e28673d09a6885db8c5656b3a77d0080775c110b04f2753de7a6 WHIRLPOOL 79cb7e620eb8e838192dc557c7a9ce7e713227d783cc8b63792825559b2145cad70d0af6f99948c1527557bc363feffd846c73893682b4a14fc7d08b9e20c649
+DIST patchbundle-selinux-base-policy-2.20141203-r9.tar.bz2 299602 SHA256 e8518004942a6c57170a609683e22b1410c93a2a195829c41dc8fbc703d941b5 SHA512 ce6484fbca1d2d074e50d1a3953392bd3ce0a4617df98fbac37747b469b4f160a9331586dfe1c3ddccb1ccbee24876a2f05ab49e37c8492a48baf83c2d01d140 WHIRLPOOL 1fd7b956e98e95a64c3a713a944d4531259bd156a7feabf6a89c4b5f33ac846377730eede97889e85183be086f282ebd18e860214f6ca3f01b40f2323470ee04
 DIST refpolicy-2.20140311.tar.bz2 664416 SHA256 f69437db95548c78a5dec44c236397146b144153149009ea554d2e536e5436f7 SHA512 50bacee82ed41ac8b8007ecc33bf51d22303cc2ddd27cfb72cb5520dab5f8e255186e34b89cec492c7a2d4220b200814bdede9b46c19f987a3d3d65a1c9b749a WHIRLPOOL e07480beba6ab1f02ad36b7d0c50c4a71cb39a8ec78bf8d1dc3c82bb9dd1d69d9169d7c937165ea15f60ce1147f256d46644f944107a3a8a800d5bad70d4c255
 DIST refpolicy-2.20141203.tar.bz2 680243 SHA256 f438209c430d8a2d4ddcbe4bdd3edb46f6af7dc4913637af0b73c635e40c1522 SHA512 682e4280c5799e4c12ec7594afc1389f67be35055748d2e0dbdc3419159a16c96d4946ca6178daee8370515951f8653b2e452efe8c962b8d7f9bc192f0b15a0c WHIRLPOOL 74bca232534e7af9051bb1ab9f77c1ff6c425781cf4561f781d6e9a40cc5ca0d9add540249ea5493e8782a9372aea296ead6c165c6c440ae1509eb319d151ee5
diff --git a/sec-policy/selinux-cdrecord/selinux-cdrecord-2.20141203-r8.ebuild b/sec-policy/selinux-cdrecord/selinux-cdrecord-2.20141203-r8.ebuild
index 95dc675b2111..34446ca6449c 100644
--- a/sec-policy/selinux-cdrecord/selinux-cdrecord-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-cdrecord/selinux-cdrecord-2.20141203-r8.ebuild
@@ -13,5 +13,5 @@ DESCRIPTION="SELinux policy for cdrecord"
 if [[ $PV == 9999* ]] ; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-cdrecord/selinux-cdrecord-2.20141203-r9.ebuild b/sec-policy/selinux-cdrecord/selinux-cdrecord-2.20141203-r9.ebuild
new file mode 100644
index 000000000000..95dc675b2111
--- /dev/null
+++ b/sec-policy/selinux-cdrecord/selinux-cdrecord-2.20141203-r9.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI="5"
+
+IUSE=""
+MODS="cdrecord"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for cdrecord"
+
+if [[ $PV == 9999* ]] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
diff --git a/sec-policy/selinux-ceph/Manifest b/sec-policy/selinux-ceph/Manifest
index 557ae6e25780..673f22620a6d 100644
--- a/sec-policy/selinux-ceph/Manifest
+++ b/sec-policy/selinux-ceph/Manifest
@@ -1,2 +1,3 @@
 DIST patchbundle-selinux-base-policy-2.20141203-r8.tar.bz2 297919 SHA256 77539eb3d78105f8789cd8205d2698bd27e2abf100163bdd162cda860fd15120 SHA512 2f8a19e1e4bb65f32b480275f49099aed3ae9df543c7de862b3bbd93e81b89cd96dadac3d091e28673d09a6885db8c5656b3a77d0080775c110b04f2753de7a6 WHIRLPOOL 79cb7e620eb8e838192dc557c7a9ce7e713227d783cc8b63792825559b2145cad70d0af6f99948c1527557bc363feffd846c73893682b4a14fc7d08b9e20c649
+DIST patchbundle-selinux-base-policy-2.20141203-r9.tar.bz2 299602 SHA256 e8518004942a6c57170a609683e22b1410c93a2a195829c41dc8fbc703d941b5 SHA512 ce6484fbca1d2d074e50d1a3953392bd3ce0a4617df98fbac37747b469b4f160a9331586dfe1c3ddccb1ccbee24876a2f05ab49e37c8492a48baf83c2d01d140 WHIRLPOOL 1fd7b956e98e95a64c3a713a944d4531259bd156a7feabf6a89c4b5f33ac846377730eede97889e85183be086f282ebd18e860214f6ca3f01b40f2323470ee04
 DIST refpolicy-2.20141203.tar.bz2 680243 SHA256 f438209c430d8a2d4ddcbe4bdd3edb46f6af7dc4913637af0b73c635e40c1522 SHA512 682e4280c5799e4c12ec7594afc1389f67be35055748d2e0dbdc3419159a16c96d4946ca6178daee8370515951f8653b2e452efe8c962b8d7f9bc192f0b15a0c WHIRLPOOL 74bca232534e7af9051bb1ab9f77c1ff6c425781cf4561f781d6e9a40cc5ca0d9add540249ea5493e8782a9372aea296ead6c165c6c440ae1509eb319d151ee5
diff --git a/sec-policy/selinux-ceph/selinux-ceph-2.20141203-r8.ebuild b/sec-policy/selinux-ceph/selinux-ceph-2.20141203-r8.ebuild
index 1968c0bc474a..8b3b213a4195 100644
--- a/sec-policy/selinux-ceph/selinux-ceph-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-ceph/selinux-ceph-2.20141203-r8.ebuild
@@ -13,5 +13,5 @@ DESCRIPTION="SELinux policy for ceph"
 if [[ $PV == 9999* ]] ; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-ceph/selinux-ceph-2.20141203-r9.ebuild b/sec-policy/selinux-ceph/selinux-ceph-2.20141203-r9.ebuild
new file mode 100644
index 000000000000..1968c0bc474a
--- /dev/null
+++ b/sec-policy/selinux-ceph/selinux-ceph-2.20141203-r9.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI="5"
+
+IUSE=""
+MODS="ceph"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for ceph"
+
+if [[ $PV == 9999* ]] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
diff --git a/sec-policy/selinux-cgmanager/Manifest b/sec-policy/selinux-cgmanager/Manifest
new file mode 100644
index 000000000000..8c79c9abb37b
--- /dev/null
+++ b/sec-policy/selinux-cgmanager/Manifest
@@ -0,0 +1,2 @@
+DIST patchbundle-selinux-base-policy-2.20141203-r9.tar.bz2 299602 SHA256 e8518004942a6c57170a609683e22b1410c93a2a195829c41dc8fbc703d941b5 SHA512 ce6484fbca1d2d074e50d1a3953392bd3ce0a4617df98fbac37747b469b4f160a9331586dfe1c3ddccb1ccbee24876a2f05ab49e37c8492a48baf83c2d01d140 WHIRLPOOL 1fd7b956e98e95a64c3a713a944d4531259bd156a7feabf6a89c4b5f33ac846377730eede97889e85183be086f282ebd18e860214f6ca3f01b40f2323470ee04
+DIST refpolicy-2.20141203.tar.bz2 680243 SHA256 f438209c430d8a2d4ddcbe4bdd3edb46f6af7dc4913637af0b73c635e40c1522 SHA512 682e4280c5799e4c12ec7594afc1389f67be35055748d2e0dbdc3419159a16c96d4946ca6178daee8370515951f8653b2e452efe8c962b8d7f9bc192f0b15a0c WHIRLPOOL 74bca232534e7af9051bb1ab9f77c1ff6c425781cf4561f781d6e9a40cc5ca0d9add540249ea5493e8782a9372aea296ead6c165c6c440ae1509eb319d151ee5
diff --git a/sec-policy/selinux-cgmanager/selinux-cgmanager-2.20141203-r9.ebuild b/sec-policy/selinux-cgmanager/selinux-cgmanager-2.20141203-r9.ebuild
new file mode 100644
index 000000000000..3e3a90031e02
--- /dev/null
+++ b/sec-policy/selinux-cgmanager/selinux-cgmanager-2.20141203-r9.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI="5"
+
+IUSE=""
+MODS="subsonic"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for cgmanager"
+
+if [[ $PV == 9999* ]] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
diff --git a/sec-policy/selinux-cgroup/Manifest b/sec-policy/selinux-cgroup/Manifest
index 8327a635be01..91d204b0021a 100644
--- a/sec-policy/selinux-cgroup/Manifest
+++ b/sec-policy/selinux-cgroup/Manifest
@@ -9,5 +9,6 @@ DIST patchbundle-selinux-base-policy-2.20141203-r5.tar.bz2 274136 SHA256 c23d17c
 DIST patchbundle-selinux-base-policy-2.20141203-r6.tar.bz2 293231 SHA256 b686dcc517b97834f66d967afdcc724cb43b5c6dbf9f34043a91cdeda2625cc7 SHA512 a2c486cbe4a1d21ff3fd01bef25ecf5a633a4072646c67cfccf3f7187d95f3d9e3b482a46ba17c55c40a8e7c0dee56e9cf9ddc9f414d3e4511443b62f60d03e9 WHIRLPOOL 3d708e287e3f9b873be647b0327eab6675a8702ee1cffb56e36934cada306e5ccc64397a083dad9e59de37a067e628cacbf896ae99012d5a209e42fd7cd8a4c6
 DIST patchbundle-selinux-base-policy-2.20141203-r7.tar.bz2 295833 SHA256 ba2219b3efc747be65f94c4d8ac3cd6ee530c82c848fa41935a114184678622a SHA512 8e32d9dbfb2f0f3f50200543aadb51ed9834ccd5cdf30bf8e4d9e6d0b645ce44ffaf80f7aa9385e9c9095d9a383b3a348a92356cb5386c06544ab082a9a468c7 WHIRLPOOL 1648ee1be71e45fcf5a264816ce7edc7bab19bd28a68703923eb2d6068f1f0469ae593855231d31f88baecbf29e7cece2d6beeed20b7c04231a6c90e90d35910
 DIST patchbundle-selinux-base-policy-2.20141203-r8.tar.bz2 297919 SHA256 77539eb3d78105f8789cd8205d2698bd27e2abf100163bdd162cda860fd15120 SHA512 2f8a19e1e4bb65f32b480275f49099aed3ae9df543c7de862b3bbd93e81b89cd96dadac3d091e28673d09a6885db8c5656b3a77d0080775c110b04f2753de7a6 WHIRLPOOL 79cb7e620eb8e838192dc557c7a9ce7e713227d783cc8b63792825559b2145cad70d0af6f99948c1527557bc363feffd846c73893682b4a14fc7d08b9e20c649
+DIST patchbundle-selinux-base-policy-2.20141203-r9.tar.bz2 299602 SHA256 e8518004942a6c57170a609683e22b1410c93a2a195829c41dc8fbc703d941b5 SHA512 ce6484fbca1d2d074e50d1a3953392bd3ce0a4617df98fbac37747b469b4f160a9331586dfe1c3ddccb1ccbee24876a2f05ab49e37c8492a48baf83c2d01d140 WHIRLPOOL 1fd7b956e98e95a64c3a713a944d4531259bd156a7feabf6a89c4b5f33ac846377730eede97889e85183be086f282ebd18e860214f6ca3f01b40f2323470ee04
 DIST refpolicy-2.20140311.tar.bz2 664416 SHA256 f69437db95548c78a5dec44c236397146b144153149009ea554d2e536e5436f7 SHA512 50bacee82ed41ac8b8007ecc33bf51d22303cc2ddd27cfb72cb5520dab5f8e255186e34b89cec492c7a2d4220b200814bdede9b46c19f987a3d3d65a1c9b749a WHIRLPOOL e07480beba6ab1f02ad36b7d0c50c4a71cb39a8ec78bf8d1dc3c82bb9dd1d69d9169d7c937165ea15f60ce1147f256d46644f944107a3a8a800d5bad70d4c255
 DIST refpolicy-2.20141203.tar.bz2 680243 SHA256 f438209c430d8a2d4ddcbe4bdd3edb46f6af7dc4913637af0b73c635e40c1522 SHA512 682e4280c5799e4c12ec7594afc1389f67be35055748d2e0dbdc3419159a16c96d4946ca6178daee8370515951f8653b2e452efe8c962b8d7f9bc192f0b15a0c WHIRLPOOL 74bca232534e7af9051bb1ab9f77c1ff6c425781cf4561f781d6e9a40cc5ca0d9add540249ea5493e8782a9372aea296ead6c165c6c440ae1509eb319d151ee5
diff --git a/sec-policy/selinux-cgroup/selinux-cgroup-2.20141203-r8.ebuild b/sec-policy/selinux-cgroup/selinux-cgroup-2.20141203-r8.ebuild
index e549cbd6566d..9c1f240d11d5 100644
--- a/sec-policy/selinux-cgroup/selinux-cgroup-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-cgroup/selinux-cgroup-2.20141203-r8.ebuild
@@ -13,5 +13,5 @@ DESCRIPTION="SELinux policy for cgroup"
 if [[ $PV == 9999* ]] ; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-cgroup/selinux-cgroup-2.20141203-r9.ebuild b/sec-policy/selinux-cgroup/selinux-cgroup-2.20141203-r9.ebuild
new file mode 100644
index 000000000000..e549cbd6566d
--- /dev/null
+++ b/sec-policy/selinux-cgroup/selinux-cgroup-2.20141203-r9.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI="5"
+
+IUSE=""
+MODS="cgroup"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for cgroup"
+
+if [[ $PV == 9999* ]] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
diff --git a/sec-policy/selinux-chromium/Manifest b/sec-policy/selinux-chromium/Manifest
index 8327a635be01..91d204b0021a 100644
--- a/sec-policy/selinux-chromium/Manifest
+++ b/sec-policy/selinux-chromium/Manifest
@@ -9,5 +9,6 @@ DIST patchbundle-selinux-base-policy-2.20141203-r5.tar.bz2 274136 SHA256 c23d17c
 DIST patchbundle-selinux-base-policy-2.20141203-r6.tar.bz2 293231 SHA256 b686dcc517b97834f66d967afdcc724cb43b5c6dbf9f34043a91cdeda2625cc7 SHA512 a2c486cbe4a1d21ff3fd01bef25ecf5a633a4072646c67cfccf3f7187d95f3d9e3b482a46ba17c55c40a8e7c0dee56e9cf9ddc9f414d3e4511443b62f60d03e9 WHIRLPOOL 3d708e287e3f9b873be647b0327eab6675a8702ee1cffb56e36934cada306e5ccc64397a083dad9e59de37a067e628cacbf896ae99012d5a209e42fd7cd8a4c6
 DIST patchbundle-selinux-base-policy-2.20141203-r7.tar.bz2 295833 SHA256 ba2219b3efc747be65f94c4d8ac3cd6ee530c82c848fa41935a114184678622a SHA512 8e32d9dbfb2f0f3f50200543aadb51ed9834ccd5cdf30bf8e4d9e6d0b645ce44ffaf80f7aa9385e9c9095d9a383b3a348a92356cb5386c06544ab082a9a468c7 WHIRLPOOL 1648ee1be71e45fcf5a264816ce7edc7bab19bd28a68703923eb2d6068f1f0469ae593855231d31f88baecbf29e7cece2d6beeed20b7c04231a6c90e90d35910
 DIST patchbundle-selinux-base-policy-2.20141203-r8.tar.bz2 297919 SHA256 77539eb3d78105f8789cd8205d2698bd27e2abf100163bdd162cda860fd15120 SHA512 2f8a19e1e4bb65f32b480275f49099aed3ae9df543c7de862b3bbd93e81b89cd96dadac3d091e28673d09a6885db8c5656b3a77d0080775c110b04f2753de7a6 WHIRLPOOL 79cb7e620eb8e838192dc557c7a9ce7e713227d783cc8b63792825559b2145cad70d0af6f99948c1527557bc363feffd846c73893682b4a14fc7d08b9e20c649
+DIST patchbundle-selinux-base-policy-2.20141203-r9.tar.bz2 299602 SHA256 e8518004942a6c57170a609683e22b1410c93a2a195829c41dc8fbc703d941b5 SHA512 ce6484fbca1d2d074e50d1a3953392bd3ce0a4617df98fbac37747b469b4f160a9331586dfe1c3ddccb1ccbee24876a2f05ab49e37c8492a48baf83c2d01d140 WHIRLPOOL 1fd7b956e98e95a64c3a713a944d4531259bd156a7feabf6a89c4b5f33ac846377730eede97889e85183be086f282ebd18e860214f6ca3f01b40f2323470ee04
 DIST refpolicy-2.20140311.tar.bz2 664416 SHA256 f69437db95548c78a5dec44c236397146b144153149009ea554d2e536e5436f7 SHA512 50bacee82ed41ac8b8007ecc33bf51d22303cc2ddd27cfb72cb5520dab5f8e255186e34b89cec492c7a2d4220b200814bdede9b46c19f987a3d3d65a1c9b749a WHIRLPOOL e07480beba6ab1f02ad36b7d0c50c4a71cb39a8ec78bf8d1dc3c82bb9dd1d69d9169d7c937165ea15f60ce1147f256d46644f944107a3a8a800d5bad70d4c255
 DIST refpolicy-2.20141203.tar.bz2 680243 SHA256 f438209c430d8a2d4ddcbe4bdd3edb46f6af7dc4913637af0b73c635e40c1522 SHA512 682e4280c5799e4c12ec7594afc1389f67be35055748d2e0dbdc3419159a16c96d4946ca6178daee8370515951f8653b2e452efe8c962b8d7f9bc192f0b15a0c WHIRLPOOL 74bca232534e7af9051bb1ab9f77c1ff6c425781cf4561f781d6e9a40cc5ca0d9add540249ea5493e8782a9372aea296ead6c165c6c440ae1509eb319d151ee5
diff --git a/sec-policy/selinux-chromium/selinux-chromium-2.20141203-r8.ebuild b/sec-policy/selinux-chromium/selinux-chromium-2.20141203-r8.ebuild
index ceacf4543a43..fecdba3811d7 100644
--- a/sec-policy/selinux-chromium/selinux-chromium-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-chromium/selinux-chromium-2.20141203-r8.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="SELinux policy for chromium"
 if [[ $PV == 9999* ]] ; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-chromium/selinux-chromium-2.20141203-r9.ebuild b/sec-policy/selinux-chromium/selinux-chromium-2.20141203-r9.ebuild
new file mode 100644
index 000000000000..ceacf4543a43
--- /dev/null
+++ b/sec-policy/selinux-chromium/selinux-chromium-2.20141203-r9.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI="5"
+
+IUSE="alsa"
+MODS="chromium"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for chromium"
+
+if [[ $PV == 9999* ]] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DEPEND="${DEPEND}
+	sec-policy/selinux-xserver
+"
+RDEPEND="${RDEPEND}
+	sec-policy/selinux-xserver
+"
diff --git a/sec-policy/selinux-chronyd/Manifest b/sec-policy/selinux-chronyd/Manifest
index 8327a635be01..91d204b0021a 100644
--- a/sec-policy/selinux-chronyd/Manifest
+++ b/sec-policy/selinux-chronyd/Manifest
@@ -9,5 +9,6 @@ DIST patchbundle-selinux-base-policy-2.20141203-r5.tar.bz2 274136 SHA256 c23d17c
 DIST patchbundle-selinux-base-policy-2.20141203-r6.tar.bz2 293231 SHA256 b686dcc517b97834f66d967afdcc724cb43b5c6dbf9f34043a91cdeda2625cc7 SHA512 a2c486cbe4a1d21ff3fd01bef25ecf5a633a4072646c67cfccf3f7187d95f3d9e3b482a46ba17c55c40a8e7c0dee56e9cf9ddc9f414d3e4511443b62f60d03e9 WHIRLPOOL 3d708e287e3f9b873be647b0327eab6675a8702ee1cffb56e36934cada306e5ccc64397a083dad9e59de37a067e628cacbf896ae99012d5a209e42fd7cd8a4c6
 DIST patchbundle-selinux-base-policy-2.20141203-r7.tar.bz2 295833 SHA256 ba2219b3efc747be65f94c4d8ac3cd6ee530c82c848fa41935a114184678622a SHA512 8e32d9dbfb2f0f3f50200543aadb51ed9834ccd5cdf30bf8e4d9e6d0b645ce44ffaf80f7aa9385e9c9095d9a383b3a348a92356cb5386c06544ab082a9a468c7 WHIRLPOOL 1648ee1be71e45fcf5a264816ce7edc7bab19bd28a68703923eb2d6068f1f0469ae593855231d31f88baecbf29e7cece2d6beeed20b7c04231a6c90e90d35910
 DIST patchbundle-selinux-base-policy-2.20141203-r8.tar.bz2 297919 SHA256 77539eb3d78105f8789cd8205d2698bd27e2abf100163bdd162cda860fd15120 SHA512 2f8a19e1e4bb65f32b480275f49099aed3ae9df543c7de862b3bbd93e81b89cd96dadac3d091e28673d09a6885db8c5656b3a77d0080775c110b04f2753de7a6 WHIRLPOOL 79cb7e620eb8e838192dc557c7a9ce7e713227d783cc8b63792825559b2145cad70d0af6f99948c1527557bc363feffd846c73893682b4a14fc7d08b9e20c649
+DIST patchbundle-selinux-base-policy-2.20141203-r9.tar.bz2 299602 SHA256 e8518004942a6c57170a609683e22b1410c93a2a195829c41dc8fbc703d941b5 SHA512 ce6484fbca1d2d074e50d1a3953392bd3ce0a4617df98fbac37747b469b4f160a9331586dfe1c3ddccb1ccbee24876a2f05ab49e37c8492a48baf83c2d01d140 WHIRLPOOL 1fd7b956e98e95a64c3a713a944d4531259bd156a7feabf6a89c4b5f33ac846377730eede97889e85183be086f282ebd18e860214f6ca3f01b40f2323470ee04
 DIST refpolicy-2.20140311.tar.bz2 664416 SHA256 f69437db95548c78a5dec44c236397146b144153149009ea554d2e536e5436f7 SHA512 50bacee82ed41ac8b8007ecc33bf51d22303cc2ddd27cfb72cb5520dab5f8e255186e34b89cec492c7a2d4220b200814bdede9b46c19f987a3d3d65a1c9b749a WHIRLPOOL e07480beba6ab1f02ad36b7d0c50c4a71cb39a8ec78bf8d1dc3c82bb9dd1d69d9169d7c937165ea15f60ce1147f256d46644f944107a3a8a800d5bad70d4c255
 DIST refpolicy-2.20141203.tar.bz2 680243 SHA256 f438209c430d8a2d4ddcbe4bdd3edb46f6af7dc4913637af0b73c635e40c1522 SHA512 682e4280c5799e4c12ec7594afc1389f67be35055748d2e0dbdc3419159a16c96d4946ca6178daee8370515951f8653b2e452efe8c962b8d7f9bc192f0b15a0c WHIRLPOOL 74bca232534e7af9051bb1ab9f77c1ff6c425781cf4561f781d6e9a40cc5ca0d9add540249ea5493e8782a9372aea296ead6c165c6c440ae1509eb319d151ee5
diff --git a/sec-policy/selinux-chronyd/selinux-chronyd-2.20141203-r8.ebuild b/sec-policy/selinux-chronyd/selinux-chronyd-2.20141203-r8.ebuild
index 3aca05f2c924..1f0eff9e0f4a 100644
--- a/sec-policy/selinux-chronyd/selinux-chronyd-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-chronyd/selinux-chronyd-2.20141203-r8.ebuild
@@ -13,5 +13,5 @@ DESCRIPTION="SELinux policy for chronyd"
 if [[ $PV == 9999* ]] ; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-chronyd/selinux-chronyd-2.20141203-r9.ebuild b/sec-policy/selinux-chronyd/selinux-chronyd-2.20141203-r9.ebuild
new file mode 100644
index 000000000000..3aca05f2c924
--- /dev/null
+++ b/sec-policy/selinux-chronyd/selinux-chronyd-2.20141203-r9.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI="5"
+
+IUSE=""
+MODS="chronyd"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for chronyd"
+
+if [[ $PV == 9999* ]] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
diff --git a/sec-policy/selinux-clamav/Manifest b/sec-policy/selinux-clamav/Manifest
index 8327a635be01..91d204b0021a 100644
--- a/sec-policy/selinux-clamav/Manifest
+++ b/sec-policy/selinux-clamav/Manifest
@@ -9,5 +9,6 @@ DIST patchbundle-selinux-base-policy-2.20141203-r5.tar.bz2 274136 SHA256 c23d17c
 DIST patchbundle-selinux-base-policy-2.20141203-r6.tar.bz2 293231 SHA256 b686dcc517b97834f66d967afdcc724cb43b5c6dbf9f34043a91cdeda2625cc7 SHA512 a2c486cbe4a1d21ff3fd01bef25ecf5a633a4072646c67cfccf3f7187d95f3d9e3b482a46ba17c55c40a8e7c0dee56e9cf9ddc9f414d3e4511443b62f60d03e9 WHIRLPOOL 3d708e287e3f9b873be647b0327eab6675a8702ee1cffb56e36934cada306e5ccc64397a083dad9e59de37a067e628cacbf896ae99012d5a209e42fd7cd8a4c6
 DIST patchbundle-selinux-base-policy-2.20141203-r7.tar.bz2 295833 SHA256 ba2219b3efc747be65f94c4d8ac3cd6ee530c82c848fa41935a114184678622a SHA512 8e32d9dbfb2f0f3f50200543aadb51ed9834ccd5cdf30bf8e4d9e6d0b645ce44ffaf80f7aa9385e9c9095d9a383b3a348a92356cb5386c06544ab082a9a468c7 WHIRLPOOL 1648ee1be71e45fcf5a264816ce7edc7bab19bd28a68703923eb2d6068f1f0469ae593855231d31f88baecbf29e7cece2d6beeed20b7c04231a6c90e90d35910
 DIST patchbundle-selinux-base-policy-2.20141203-r8.tar.bz2 297919 SHA256 77539eb3d78105f8789cd8205d2698bd27e2abf100163bdd162cda860fd15120 SHA512 2f8a19e1e4bb65f32b480275f49099aed3ae9df543c7de862b3bbd93e81b89cd96dadac3d091e28673d09a6885db8c5656b3a77d0080775c110b04f2753de7a6 WHIRLPOOL 79cb7e620eb8e838192dc557c7a9ce7e713227d783cc8b63792825559b2145cad70d0af6f99948c1527557bc363feffd846c73893682b4a14fc7d08b9e20c649
+DIST patchbundle-selinux-base-policy-2.20141203-r9.tar.bz2 299602 SHA256 e8518004942a6c57170a609683e22b1410c93a2a195829c41dc8fbc703d941b5 SHA512 ce6484fbca1d2d074e50d1a3953392bd3ce0a4617df98fbac37747b469b4f160a9331586dfe1c3ddccb1ccbee24876a2f05ab49e37c8492a48baf83c2d01d140 WHIRLPOOL 1fd7b956e98e95a64c3a713a944d4531259bd156a7feabf6a89c4b5f33ac846377730eede97889e85183be086f282ebd18e860214f6ca3f01b40f2323470ee04
 DIST refpolicy-2.20140311.tar.bz2 664416 SHA256 f69437db95548c78a5dec44c236397146b144153149009ea554d2e536e5436f7 SHA512 50bacee82ed41ac8b8007ecc33bf51d22303cc2ddd27cfb72cb5520dab5f8e255186e34b89cec492c7a2d4220b200814bdede9b46c19f987a3d3d65a1c9b749a WHIRLPOOL e07480beba6ab1f02ad36b7d0c50c4a71cb39a8ec78bf8d1dc3c82bb9dd1d69d9169d7c937165ea15f60ce1147f256d46644f944107a3a8a800d5bad70d4c255
 DIST refpolicy-2.20141203.tar.bz2 680243 SHA256 f438209c430d8a2d4ddcbe4bdd3edb46f6af7dc4913637af0b73c635e40c1522 SHA512 682e4280c5799e4c12ec7594afc1389f67be35055748d2e0dbdc3419159a16c96d4946ca6178daee8370515951f8653b2e452efe8c962b8d7f9bc192f0b15a0c WHIRLPOOL 74bca232534e7af9051bb1ab9f77c1ff6c425781cf4561f781d6e9a40cc5ca0d9add540249ea5493e8782a9372aea296ead6c165c6c440ae1509eb319d151ee5
diff --git a/sec-policy/selinux-clamav/selinux-clamav-2.20141203-r8.ebuild b/sec-policy/selinux-clamav/selinux-clamav-2.20141203-r8.ebuild
index 4c5b12496f52..24a38288ebf0 100644
--- a/sec-policy/selinux-clamav/selinux-clamav-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-clamav/selinux-clamav-2.20141203-r8.ebuild
@@ -13,5 +13,5 @@ DESCRIPTION="SELinux policy for clamav"
 if [[ $PV == 9999* ]] ; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-clamav/selinux-clamav-2.20141203-r9.ebuild b/sec-policy/selinux-clamav/selinux-clamav-2.20141203-r9.ebuild
new file mode 100644
index 000000000000..4c5b12496f52
--- /dev/null
+++ b/sec-policy/selinux-clamav/selinux-clamav-2.20141203-r9.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI="5"
+
+IUSE=""
+MODS="clamav"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for clamav"
+
+if [[ $PV == 9999* ]] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
diff --git a/sec-policy/selinux-clockspeed/Manifest b/sec-policy/selinux-clockspeed/Manifest
index 8327a635be01..91d204b0021a 100644
--- a/sec-policy/selinux-clockspeed/Manifest
+++ b/sec-policy/selinux-clockspeed/Manifest
@@ -9,5 +9,6 @@ DIST patchbundle-selinux-base-policy-2.20141203-r5.tar.bz2 274136 SHA256 c23d17c
 DIST patchbundle-selinux-base-policy-2.20141203-r6.tar.bz2 293231 SHA256 b686dcc517b97834f66d967afdcc724cb43b5c6dbf9f34043a91cdeda2625cc7 SHA512 a2c486cbe4a1d21ff3fd01bef25ecf5a633a4072646c67cfccf3f7187d95f3d9e3b482a46ba17c55c40a8e7c0dee56e9cf9ddc9f414d3e4511443b62f60d03e9 WHIRLPOOL 3d708e287e3f9b873be647b0327eab6675a8702ee1cffb56e36934cada306e5ccc64397a083dad9e59de37a067e628cacbf896ae99012d5a209e42fd7cd8a4c6
 DIST patchbundle-selinux-base-policy-2.20141203-r7.tar.bz2 295833 SHA256 ba2219b3efc747be65f94c4d8ac3cd6ee530c82c848fa41935a114184678622a SHA512 8e32d9dbfb2f0f3f50200543aadb51ed9834ccd5cdf30bf8e4d9e6d0b645ce44ffaf80f7aa9385e9c9095d9a383b3a348a92356cb5386c06544ab082a9a468c7 WHIRLPOOL 1648ee1be71e45fcf5a264816ce7edc7bab19bd28a68703923eb2d6068f1f0469ae593855231d31f88baecbf29e7cece2d6beeed20b7c04231a6c90e90d35910
 DIST patchbundle-selinux-base-policy-2.20141203-r8.tar.bz2 297919 SHA256 77539eb3d78105f8789cd8205d2698bd27e2abf100163bdd162cda860fd15120 SHA512 2f8a19e1e4bb65f32b480275f49099aed3ae9df543c7de862b3bbd93e81b89cd96dadac3d091e28673d09a6885db8c5656b3a77d0080775c110b04f2753de7a6 WHIRLPOOL 79cb7e620eb8e838192dc557c7a9ce7e713227d783cc8b63792825559b2145cad70d0af6f99948c1527557bc363feffd846c73893682b4a14fc7d08b9e20c649
+DIST patchbundle-selinux-base-policy-2.20141203-r9.tar.bz2 299602 SHA256 e8518004942a6c57170a609683e22b1410c93a2a195829c41dc8fbc703d941b5 SHA512 ce6484fbca1d2d074e50d1a3953392bd3ce0a4617df98fbac37747b469b4f160a9331586dfe1c3ddccb1ccbee24876a2f05ab49e37c8492a48baf83c2d01d140 WHIRLPOOL 1fd7b956e98e95a64c3a713a944d4531259bd156a7feabf6a89c4b5f33ac846377730eede97889e85183be086f282ebd18e860214f6ca3f01b40f2323470ee04
 DIST refpolicy-2.20140311.tar.bz2 664416 SHA256 f69437db95548c78a5dec44c236397146b144153149009ea554d2e536e5436f7 SHA512 50bacee82ed41ac8b8007ecc33bf51d22303cc2ddd27cfb72cb5520dab5f8e255186e34b89cec492c7a2d4220b200814bdede9b46c19f987a3d3d65a1c9b749a WHIRLPOOL e07480beba6ab1f02ad36b7d0c50c4a71cb39a8ec78bf8d1dc3c82bb9dd1d69d9169d7c937165ea15f60ce1147f256d46644f944107a3a8a800d5bad70d4c255
 DIST refpolicy-2.20141203.tar.bz2 680243 SHA256 f438209c430d8a2d4ddcbe4bdd3edb46f6af7dc4913637af0b73c635e40c1522 SHA512 682e4280c5799e4c12ec7594afc1389f67be35055748d2e0dbdc3419159a16c96d4946ca6178daee8370515951f8653b2e452efe8c962b8d7f9bc192f0b15a0c WHIRLPOOL 74bca232534e7af9051bb1ab9f77c1ff6c425781cf4561f781d6e9a40cc5ca0d9add540249ea5493e8782a9372aea296ead6c165c6c440ae1509eb319d151ee5
diff --git a/sec-policy/selinux-clockspeed/selinux-clockspeed-2.20141203-r8.ebuild b/sec-policy/selinux-clockspeed/selinux-clockspeed-2.20141203-r8.ebuild
index bb13958a0fa6..a5f8904cb5aa 100644
--- a/sec-policy/selinux-clockspeed/selinux-clockspeed-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-clockspeed/selinux-clockspeed-2.20141203-r8.ebuild
@@ -13,5 +13,5 @@ DESCRIPTION="SELinux policy for clockspeed"
 if [[ $PV == 9999* ]] ; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-clockspeed/selinux-clockspeed-2.20141203-r9.ebuild b/sec-policy/selinux-clockspeed/selinux-clockspeed-2.20141203-r9.ebuild
new file mode 100644
index 000000000000..bb13958a0fa6
--- /dev/null
+++ b/sec-policy/selinux-clockspeed/selinux-clockspeed-2.20141203-r9.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI="5"
+
+IUSE=""
+MODS="clockspeed"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for clockspeed"
+
+if [[ $PV == 9999* ]] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
diff --git a/sec-policy/selinux-collectd/Manifest b/sec-policy/selinux-collectd/Manifest
index 8327a635be01..91d204b0021a 100644
--- a/sec-policy/selinux-collectd/Manifest
+++ b/sec-policy/selinux-collectd/Manifest
@@ -9,5 +9,6 @@ DIST patchbundle-selinux-base-policy-2.20141203-r5.tar.bz2 274136 SHA256 c23d17c
 DIST patchbundle-selinux-base-policy-2.20141203-r6.tar.bz2 293231 SHA256 b686dcc517b97834f66d967afdcc724cb43b5c6dbf9f34043a91cdeda2625cc7 SHA512 a2c486cbe4a1d21ff3fd01bef25ecf5a633a4072646c67cfccf3f7187d95f3d9e3b482a46ba17c55c40a8e7c0dee56e9cf9ddc9f414d3e4511443b62f60d03e9 WHIRLPOOL 3d708e287e3f9b873be647b0327eab6675a8702ee1cffb56e36934cada306e5ccc64397a083dad9e59de37a067e628cacbf896ae99012d5a209e42fd7cd8a4c6
 DIST patchbundle-selinux-base-policy-2.20141203-r7.tar.bz2 295833 SHA256 ba2219b3efc747be65f94c4d8ac3cd6ee530c82c848fa41935a114184678622a SHA512 8e32d9dbfb2f0f3f50200543aadb51ed9834ccd5cdf30bf8e4d9e6d0b645ce44ffaf80f7aa9385e9c9095d9a383b3a348a92356cb5386c06544ab082a9a468c7 WHIRLPOOL 1648ee1be71e45fcf5a264816ce7edc7bab19bd28a68703923eb2d6068f1f0469ae593855231d31f88baecbf29e7cece2d6beeed20b7c04231a6c90e90d35910
 DIST patchbundle-selinux-base-policy-2.20141203-r8.tar.bz2 297919 SHA256 77539eb3d78105f8789cd8205d2698bd27e2abf100163bdd162cda860fd15120 SHA512 2f8a19e1e4bb65f32b480275f49099aed3ae9df543c7de862b3bbd93e81b89cd96dadac3d091e28673d09a6885db8c5656b3a77d0080775c110b04f2753de7a6 WHIRLPOOL 79cb7e620eb8e838192dc557c7a9ce7e713227d783cc8b63792825559b2145cad70d0af6f99948c1527557bc363feffd846c73893682b4a14fc7d08b9e20c649
+DIST patchbundle-selinux-base-policy-2.20141203-r9.tar.bz2 299602 SHA256 e8518004942a6c57170a609683e22b1410c93a2a195829c41dc8fbc703d941b5 SHA512 ce6484fbca1d2d074e50d1a3953392bd3ce0a4617df98fbac37747b469b4f160a9331586dfe1c3ddccb1ccbee24876a2f05ab49e37c8492a48baf83c2d01d140 WHIRLPOOL 1fd7b956e98e95a64c3a713a944d4531259bd156a7feabf6a89c4b5f33ac846377730eede97889e85183be086f282ebd18e860214f6ca3f01b40f2323470ee04
 DIST refpolicy-2.20140311.tar.bz2 664416 SHA256 f69437db95548c78a5dec44c236397146b144153149009ea554d2e536e5436f7 SHA512 50bacee82ed41ac8b8007ecc33bf51d22303cc2ddd27cfb72cb5520dab5f8e255186e34b89cec492c7a2d4220b200814bdede9b46c19f987a3d3d65a1c9b749a WHIRLPOOL e07480beba6ab1f02ad36b7d0c50c4a71cb39a8ec78bf8d1dc3c82bb9dd1d69d9169d7c937165ea15f60ce1147f256d46644f944107a3a8a800d5bad70d4c255
 DIST refpolicy-2.20141203.tar.bz2 680243 SHA256 f438209c430d8a2d4ddcbe4bdd3edb46f6af7dc4913637af0b73c635e40c1522 SHA512 682e4280c5799e4c12ec7594afc1389f67be35055748d2e0dbdc3419159a16c96d4946ca6178daee8370515951f8653b2e452efe8c962b8d7f9bc192f0b15a0c WHIRLPOOL 74bca232534e7af9051bb1ab9f77c1ff6c425781cf4561f781d6e9a40cc5ca0d9add540249ea5493e8782a9372aea296ead6c165c6c440ae1509eb319d151ee5
diff --git a/sec-policy/selinux-collectd/selinux-collectd-2.20141203-r8.ebuild b/sec-policy/selinux-collectd/selinux-collectd-2.20141203-r8.ebuild
index e627daefc922..bcc5e0d50a93 100644
--- a/sec-policy/selinux-collectd/selinux-collectd-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-collectd/selinux-collectd-2.20141203-r8.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="SELinux policy for collectd"
 if [[ $PV == 9999* ]] ; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-collectd/selinux-collectd-2.20141203-r9.ebuild b/sec-policy/selinux-collectd/selinux-collectd-2.20141203-r9.ebuild
new file mode 100644
index 000000000000..e627daefc922
--- /dev/null
+++ b/sec-policy/selinux-collectd/selinux-collectd-2.20141203-r9.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI="5"
+
+IUSE=""
+MODS="collectd"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for collectd"
+
+if [[ $PV == 9999* ]] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DEPEND="${DEPEND}
+	sec-policy/selinux-apache
+"
+
+RDEPEND="${RDEPEND}
+	sec-policy/selinux-apache
+"
diff --git a/sec-policy/selinux-consolekit/Manifest b/sec-policy/selinux-consolekit/Manifest
index 8327a635be01..91d204b0021a 100644
--- a/sec-policy/selinux-consolekit/Manifest
+++ b/sec-policy/selinux-consolekit/Manifest
@@ -9,5 +9,6 @@ DIST patchbundle-selinux-base-policy-2.20141203-r5.tar.bz2 274136 SHA256 c23d17c
 DIST patchbundle-selinux-base-policy-2.20141203-r6.tar.bz2 293231 SHA256 b686dcc517b97834f66d967afdcc724cb43b5c6dbf9f34043a91cdeda2625cc7 SHA512 a2c486cbe4a1d21ff3fd01bef25ecf5a633a4072646c67cfccf3f7187d95f3d9e3b482a46ba17c55c40a8e7c0dee56e9cf9ddc9f414d3e4511443b62f60d03e9 WHIRLPOOL 3d708e287e3f9b873be647b0327eab6675a8702ee1cffb56e36934cada306e5ccc64397a083dad9e59de37a067e628cacbf896ae99012d5a209e42fd7cd8a4c6
 DIST patchbundle-selinux-base-policy-2.20141203-r7.tar.bz2 295833 SHA256 ba2219b3efc747be65f94c4d8ac3cd6ee530c82c848fa41935a114184678622a SHA512 8e32d9dbfb2f0f3f50200543aadb51ed9834ccd5cdf30bf8e4d9e6d0b645ce44ffaf80f7aa9385e9c9095d9a383b3a348a92356cb5386c06544ab082a9a468c7 WHIRLPOOL 1648ee1be71e45fcf5a264816ce7edc7bab19bd28a68703923eb2d6068f1f0469ae593855231d31f88baecbf29e7cece2d6beeed20b7c04231a6c90e90d35910
 DIST patchbundle-selinux-base-policy-2.20141203-r8.tar.bz2 297919 SHA256 77539eb3d78105f8789cd8205d2698bd27e2abf100163bdd162cda860fd15120 SHA512 2f8a19e1e4bb65f32b480275f49099aed3ae9df543c7de862b3bbd93e81b89cd96dadac3d091e28673d09a6885db8c5656b3a77d0080775c110b04f2753de7a6 WHIRLPOOL 79cb7e620eb8e838192dc557c7a9ce7e713227d783cc8b63792825559b2145cad70d0af6f99948c1527557bc363feffd846c73893682b4a14fc7d08b9e20c649
+DIST patchbundle-selinux-base-policy-2.20141203-r9.tar.bz2 299602 SHA256 e8518004942a6c57170a609683e22b1410c93a2a195829c41dc8fbc703d941b5 SHA512 ce6484fbca1d2d074e50d1a3953392bd3ce0a4617df98fbac37747b469b4f160a9331586dfe1c3ddccb1ccbee24876a2f05ab49e37c8492a48baf83c2d01d140 WHIRLPOOL 1fd7b956e98e95a64c3a713a944d4531259bd156a7feabf6a89c4b5f33ac846377730eede97889e85183be086f282ebd18e860214f6ca3f01b40f2323470ee04
 DIST refpolicy-2.20140311.tar.bz2 664416 SHA256 f69437db95548c78a5dec44c236397146b144153149009ea554d2e536e5436f7 SHA512 50bacee82ed41ac8b8007ecc33bf51d22303cc2ddd27cfb72cb5520dab5f8e255186e34b89cec492c7a2d4220b200814bdede9b46c19f987a3d3d65a1c9b749a WHIRLPOOL e07480beba6ab1f02ad36b7d0c50c4a71cb39a8ec78bf8d1dc3c82bb9dd1d69d9169d7c937165ea15f60ce1147f256d46644f944107a3a8a800d5bad70d4c255
 DIST refpolicy-2.20141203.tar.bz2 680243 SHA256 f438209c430d8a2d4ddcbe4bdd3edb46f6af7dc4913637af0b73c635e40c1522 SHA512 682e4280c5799e4c12ec7594afc1389f67be35055748d2e0dbdc3419159a16c96d4946ca6178daee8370515951f8653b2e452efe8c962b8d7f9bc192f0b15a0c WHIRLPOOL 74bca232534e7af9051bb1ab9f77c1ff6c425781cf4561f781d6e9a40cc5ca0d9add540249ea5493e8782a9372aea296ead6c165c6c440ae1509eb319d151ee5
diff --git a/sec-policy/selinux-consolekit/selinux-consolekit-2.20141203-r8.ebuild b/sec-policy/selinux-consolekit/selinux-consolekit-2.20141203-r8.ebuild
index a3954b73492a..df1c21df7cb2 100644
--- a/sec-policy/selinux-consolekit/selinux-consolekit-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-consolekit/selinux-consolekit-2.20141203-r8.ebuild
@@ -13,5 +13,5 @@ DESCRIPTION="SELinux policy for consolekit"
 if [[ $PV == 9999* ]] ; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-consolekit/selinux-consolekit-2.20141203-r9.ebuild b/sec-policy/selinux-consolekit/selinux-consolekit-2.20141203-r9.ebuild
new file mode 100644
index 000000000000..a3954b73492a
--- /dev/null
+++ b/sec-policy/selinux-consolekit/selinux-consolekit-2.20141203-r9.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI="5"
+
+IUSE=""
+MODS="consolekit"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for consolekit"
+
+if [[ $PV == 9999* ]] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
diff --git a/sec-policy/selinux-corosync/Manifest b/sec-policy/selinux-corosync/Manifest
index 8327a635be01..91d204b0021a 100644
--- a/sec-policy/selinux-corosync/Manifest
+++ b/sec-policy/selinux-corosync/Manifest
@@ -9,5 +9,6 @@ DIST patchbundle-selinux-base-policy-2.20141203-r5.tar.bz2 274136 SHA256 c23d17c
 DIST patchbundle-selinux-base-policy-2.20141203-r6.tar.bz2 293231 SHA256 b686dcc517b97834f66d967afdcc724cb43b5c6dbf9f34043a91cdeda2625cc7 SHA512 a2c486cbe4a1d21ff3fd01bef25ecf5a633a4072646c67cfccf3f7187d95f3d9e3b482a46ba17c55c40a8e7c0dee56e9cf9ddc9f414d3e4511443b62f60d03e9 WHIRLPOOL 3d708e287e3f9b873be647b0327eab6675a8702ee1cffb56e36934cada306e5ccc64397a083dad9e59de37a067e628cacbf896ae99012d5a209e42fd7cd8a4c6
 DIST patchbundle-selinux-base-policy-2.20141203-r7.tar.bz2 295833 SHA256 ba2219b3efc747be65f94c4d8ac3cd6ee530c82c848fa41935a114184678622a SHA512 8e32d9dbfb2f0f3f50200543aadb51ed9834ccd5cdf30bf8e4d9e6d0b645ce44ffaf80f7aa9385e9c9095d9a383b3a348a92356cb5386c06544ab082a9a468c7 WHIRLPOOL 1648ee1be71e45fcf5a264816ce7edc7bab19bd28a68703923eb2d6068f1f0469ae593855231d31f88baecbf29e7cece2d6beeed20b7c04231a6c90e90d35910
 DIST patchbundle-selinux-base-policy-2.20141203-r8.tar.bz2 297919 SHA256 77539eb3d78105f8789cd8205d2698bd27e2abf100163bdd162cda860fd15120 SHA512 2f8a19e1e4bb65f32b480275f49099aed3ae9df543c7de862b3bbd93e81b89cd96dadac3d091e28673d09a6885db8c5656b3a77d0080775c110b04f2753de7a6 WHIRLPOOL 79cb7e620eb8e838192dc557c7a9ce7e713227d783cc8b63792825559b2145cad70d0af6f99948c1527557bc363feffd846c73893682b4a14fc7d08b9e20c649
+DIST patchbundle-selinux-base-policy-2.20141203-r9.tar.bz2 299602 SHA256 e8518004942a6c57170a609683e22b1410c93a2a195829c41dc8fbc703d941b5 SHA512 ce6484fbca1d2d074e50d1a3953392bd3ce0a4617df98fbac37747b469b4f160a9331586dfe1c3ddccb1ccbee24876a2f05ab49e37c8492a48baf83c2d01d140 WHIRLPOOL 1fd7b956e98e95a64c3a713a944d4531259bd156a7feabf6a89c4b5f33ac846377730eede97889e85183be086f282ebd18e860214f6ca3f01b40f2323470ee04
 DIST refpolicy-2.20140311.tar.bz2 664416 SHA256 f69437db95548c78a5dec44c236397146b144153149009ea554d2e536e5436f7 SHA512 50bacee82ed41ac8b8007ecc33bf51d22303cc2ddd27cfb72cb5520dab5f8e255186e34b89cec492c7a2d4220b200814bdede9b46c19f987a3d3d65a1c9b749a WHIRLPOOL e07480beba6ab1f02ad36b7d0c50c4a71cb39a8ec78bf8d1dc3c82bb9dd1d69d9169d7c937165ea15f60ce1147f256d46644f944107a3a8a800d5bad70d4c255
 DIST refpolicy-2.20141203.tar.bz2 680243 SHA256 f438209c430d8a2d4ddcbe4bdd3edb46f6af7dc4913637af0b73c635e40c1522 SHA512 682e4280c5799e4c12ec7594afc1389f67be35055748d2e0dbdc3419159a16c96d4946ca6178daee8370515951f8653b2e452efe8c962b8d7f9bc192f0b15a0c WHIRLPOOL 74bca232534e7af9051bb1ab9f77c1ff6c425781cf4561f781d6e9a40cc5ca0d9add540249ea5493e8782a9372aea296ead6c165c6c440ae1509eb319d151ee5
diff --git a/sec-policy/selinux-corosync/selinux-corosync-2.20141203-r8.ebuild b/sec-policy/selinux-corosync/selinux-corosync-2.20141203-r8.ebuild
index 15fa0c50a8a1..0986796b417d 100644
--- a/sec-policy/selinux-corosync/selinux-corosync-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-corosync/selinux-corosync-2.20141203-r8.ebuild
@@ -13,5 +13,5 @@ DESCRIPTION="SELinux policy for corosync"
 if [[ $PV == 9999* ]] ; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-corosync/selinux-corosync-2.20141203-r9.ebuild b/sec-policy/selinux-corosync/selinux-corosync-2.20141203-r9.ebuild
new file mode 100644
index 000000000000..15fa0c50a8a1
--- /dev/null
+++ b/sec-policy/selinux-corosync/selinux-corosync-2.20141203-r9.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI="5"
+
+IUSE=""
+MODS="corosync"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for corosync"
+
+if [[ $PV == 9999* ]] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
diff --git a/sec-policy/selinux-couchdb/Manifest b/sec-policy/selinux-couchdb/Manifest
index 8327a635be01..91d204b0021a 100644
--- a/sec-policy/selinux-couchdb/Manifest
+++ b/sec-policy/selinux-couchdb/Manifest
@@ -9,5 +9,6 @@ DIST patchbundle-selinux-base-policy-2.20141203-r5.tar.bz2 274136 SHA256 c23d17c
 DIST patchbundle-selinux-base-policy-2.20141203-r6.tar.bz2 293231 SHA256 b686dcc517b97834f66d967afdcc724cb43b5c6dbf9f34043a91cdeda2625cc7 SHA512 a2c486cbe4a1d21ff3fd01bef25ecf5a633a4072646c67cfccf3f7187d95f3d9e3b482a46ba17c55c40a8e7c0dee56e9cf9ddc9f414d3e4511443b62f60d03e9 WHIRLPOOL 3d708e287e3f9b873be647b0327eab6675a8702ee1cffb56e36934cada306e5ccc64397a083dad9e59de37a067e628cacbf896ae99012d5a209e42fd7cd8a4c6
 DIST patchbundle-selinux-base-policy-2.20141203-r7.tar.bz2 295833 SHA256 ba2219b3efc747be65f94c4d8ac3cd6ee530c82c848fa41935a114184678622a SHA512 8e32d9dbfb2f0f3f50200543aadb51ed9834ccd5cdf30bf8e4d9e6d0b645ce44ffaf80f7aa9385e9c9095d9a383b3a348a92356cb5386c06544ab082a9a468c7 WHIRLPOOL 1648ee1be71e45fcf5a264816ce7edc7bab19bd28a68703923eb2d6068f1f0469ae593855231d31f88baecbf29e7cece2d6beeed20b7c04231a6c90e90d35910
 DIST patchbundle-selinux-base-policy-2.20141203-r8.tar.bz2 297919 SHA256 77539eb3d78105f8789cd8205d2698bd27e2abf100163bdd162cda860fd15120 SHA512 2f8a19e1e4bb65f32b480275f49099aed3ae9df543c7de862b3bbd93e81b89cd96dadac3d091e28673d09a6885db8c5656b3a77d0080775c110b04f2753de7a6 WHIRLPOOL 79cb7e620eb8e838192dc557c7a9ce7e713227d783cc8b63792825559b2145cad70d0af6f99948c1527557bc363feffd846c73893682b4a14fc7d08b9e20c649
+DIST patchbundle-selinux-base-policy-2.20141203-r9.tar.bz2 299602 SHA256 e8518004942a6c57170a609683e22b1410c93a2a195829c41dc8fbc703d941b5 SHA512 ce6484fbca1d2d074e50d1a3953392bd3ce0a4617df98fbac37747b469b4f160a9331586dfe1c3ddccb1ccbee24876a2f05ab49e37c8492a48baf83c2d01d140 WHIRLPOOL 1fd7b956e98e95a64c3a713a944d4531259bd156a7feabf6a89c4b5f33ac846377730eede97889e85183be086f282ebd18e860214f6ca3f01b40f2323470ee04
 DIST refpolicy-2.20140311.tar.bz2 664416 SHA256 f69437db95548c78a5dec44c236397146b144153149009ea554d2e536e5436f7 SHA512 50bacee82ed41ac8b8007ecc33bf51d22303cc2ddd27cfb72cb5520dab5f8e255186e34b89cec492c7a2d4220b200814bdede9b46c19f987a3d3d65a1c9b749a WHIRLPOOL e07480beba6ab1f02ad36b7d0c50c4a71cb39a8ec78bf8d1dc3c82bb9dd1d69d9169d7c937165ea15f60ce1147f256d46644f944107a3a8a800d5bad70d4c255
 DIST refpolicy-2.20141203.tar.bz2 680243 SHA256 f438209c430d8a2d4ddcbe4bdd3edb46f6af7dc4913637af0b73c635e40c1522 SHA512 682e4280c5799e4c12ec7594afc1389f67be35055748d2e0dbdc3419159a16c96d4946ca6178daee8370515951f8653b2e452efe8c962b8d7f9bc192f0b15a0c WHIRLPOOL 74bca232534e7af9051bb1ab9f77c1ff6c425781cf4561f781d6e9a40cc5ca0d9add540249ea5493e8782a9372aea296ead6c165c6c440ae1509eb319d151ee5
diff --git a/sec-policy/selinux-couchdb/selinux-couchdb-2.20141203-r8.ebuild b/sec-policy/selinux-couchdb/selinux-couchdb-2.20141203-r8.ebuild
index 202e6febb4a7..ad84d595056b 100644
--- a/sec-policy/selinux-couchdb/selinux-couchdb-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-couchdb/selinux-couchdb-2.20141203-r8.ebuild
@@ -13,5 +13,5 @@ DESCRIPTION="SELinux policy for couchdb"
 if [[ $PV == 9999* ]] ; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-couchdb/selinux-couchdb-2.20141203-r9.ebuild b/sec-policy/selinux-couchdb/selinux-couchdb-2.20141203-r9.ebuild
new file mode 100644
index 000000000000..202e6febb4a7
--- /dev/null
+++ b/sec-policy/selinux-couchdb/selinux-couchdb-2.20141203-r9.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI="5"
+
+IUSE=""
+MODS="couchdb"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for couchdb"
+
+if [[ $PV == 9999* ]] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
diff --git a/sec-policy/selinux-courier/Manifest b/sec-policy/selinux-courier/Manifest
index 8327a635be01..91d204b0021a 100644
--- a/sec-policy/selinux-courier/Manifest
+++ b/sec-policy/selinux-courier/Manifest
@@ -9,5 +9,6 @@ DIST patchbundle-selinux-base-policy-2.20141203-r5.tar.bz2 274136 SHA256 c23d17c
 DIST patchbundle-selinux-base-policy-2.20141203-r6.tar.bz2 293231 SHA256 b686dcc517b97834f66d967afdcc724cb43b5c6dbf9f34043a91cdeda2625cc7 SHA512 a2c486cbe4a1d21ff3fd01bef25ecf5a633a4072646c67cfccf3f7187d95f3d9e3b482a46ba17c55c40a8e7c0dee56e9cf9ddc9f414d3e4511443b62f60d03e9 WHIRLPOOL 3d708e287e3f9b873be647b0327eab6675a8702ee1cffb56e36934cada306e5ccc64397a083dad9e59de37a067e628cacbf896ae99012d5a209e42fd7cd8a4c6
 DIST patchbundle-selinux-base-policy-2.20141203-r7.tar.bz2 295833 SHA256 ba2219b3efc747be65f94c4d8ac3cd6ee530c82c848fa41935a114184678622a SHA512 8e32d9dbfb2f0f3f50200543aadb51ed9834ccd5cdf30bf8e4d9e6d0b645ce44ffaf80f7aa9385e9c9095d9a383b3a348a92356cb5386c06544ab082a9a468c7 WHIRLPOOL 1648ee1be71e45fcf5a264816ce7edc7bab19bd28a68703923eb2d6068f1f0469ae593855231d31f88baecbf29e7cece2d6beeed20b7c04231a6c90e90d35910
 DIST patchbundle-selinux-base-policy-2.20141203-r8.tar.bz2 297919 SHA256 77539eb3d78105f8789cd8205d2698bd27e2abf100163bdd162cda860fd15120 SHA512 2f8a19e1e4bb65f32b480275f49099aed3ae9df543c7de862b3bbd93e81b89cd96dadac3d091e28673d09a6885db8c5656b3a77d0080775c110b04f2753de7a6 WHIRLPOOL 79cb7e620eb8e838192dc557c7a9ce7e713227d783cc8b63792825559b2145cad70d0af6f99948c1527557bc363feffd846c73893682b4a14fc7d08b9e20c649
+DIST patchbundle-selinux-base-policy-2.20141203-r9.tar.bz2 299602 SHA256 e8518004942a6c57170a609683e22b1410c93a2a195829c41dc8fbc703d941b5 SHA512 ce6484fbca1d2d074e50d1a3953392bd3ce0a4617df98fbac37747b469b4f160a9331586dfe1c3ddccb1ccbee24876a2f05ab49e37c8492a48baf83c2d01d140 WHIRLPOOL 1fd7b956e98e95a64c3a713a944d4531259bd156a7feabf6a89c4b5f33ac846377730eede97889e85183be086f282ebd18e860214f6ca3f01b40f2323470ee04
 DIST refpolicy-2.20140311.tar.bz2 664416 SHA256 f69437db95548c78a5dec44c236397146b144153149009ea554d2e536e5436f7 SHA512 50bacee82ed41ac8b8007ecc33bf51d22303cc2ddd27cfb72cb5520dab5f8e255186e34b89cec492c7a2d4220b200814bdede9b46c19f987a3d3d65a1c9b749a WHIRLPOOL e07480beba6ab1f02ad36b7d0c50c4a71cb39a8ec78bf8d1dc3c82bb9dd1d69d9169d7c937165ea15f60ce1147f256d46644f944107a3a8a800d5bad70d4c255
 DIST refpolicy-2.20141203.tar.bz2 680243 SHA256 f438209c430d8a2d4ddcbe4bdd3edb46f6af7dc4913637af0b73c635e40c1522 SHA512 682e4280c5799e4c12ec7594afc1389f67be35055748d2e0dbdc3419159a16c96d4946ca6178daee8370515951f8653b2e452efe8c962b8d7f9bc192f0b15a0c WHIRLPOOL 74bca232534e7af9051bb1ab9f77c1ff6c425781cf4561f781d6e9a40cc5ca0d9add540249ea5493e8782a9372aea296ead6c165c6c440ae1509eb319d151ee5
diff --git a/sec-policy/selinux-courier/selinux-courier-2.20141203-r8.ebuild b/sec-policy/selinux-courier/selinux-courier-2.20141203-r8.ebuild
index c147576391a0..9acc6c4c9898 100644
--- a/sec-policy/selinux-courier/selinux-courier-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-courier/selinux-courier-2.20141203-r8.ebuild
@@ -13,5 +13,5 @@ DESCRIPTION="SELinux policy for courier"
 if [[ $PV == 9999* ]] ; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-courier/selinux-courier-2.20141203-r9.ebuild b/sec-policy/selinux-courier/selinux-courier-2.20141203-r9.ebuild
new file mode 100644
index 000000000000..c147576391a0
--- /dev/null
+++ b/sec-policy/selinux-courier/selinux-courier-2.20141203-r9.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI="5"
+
+IUSE=""
+MODS="courier"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for courier"
+
+if [[ $PV == 9999* ]] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
diff --git a/sec-policy/selinux-cpucontrol/Manifest b/sec-policy/selinux-cpucontrol/Manifest
index 8327a635be01..91d204b0021a 100644
--- a/sec-policy/selinux-cpucontrol/Manifest
+++ b/sec-policy/selinux-cpucontrol/Manifest
@@ -9,5 +9,6 @@ DIST patchbundle-selinux-base-policy-2.20141203-r5.tar.bz2 274136 SHA256 c23d17c
 DIST patchbundle-selinux-base-policy-2.20141203-r6.tar.bz2 293231 SHA256 b686dcc517b97834f66d967afdcc724cb43b5c6dbf9f34043a91cdeda2625cc7 SHA512 a2c486cbe4a1d21ff3fd01bef25ecf5a633a4072646c67cfccf3f7187d95f3d9e3b482a46ba17c55c40a8e7c0dee56e9cf9ddc9f414d3e4511443b62f60d03e9 WHIRLPOOL 3d708e287e3f9b873be647b0327eab6675a8702ee1cffb56e36934cada306e5ccc64397a083dad9e59de37a067e628cacbf896ae99012d5a209e42fd7cd8a4c6
 DIST patchbundle-selinux-base-policy-2.20141203-r7.tar.bz2 295833 SHA256 ba2219b3efc747be65f94c4d8ac3cd6ee530c82c848fa41935a114184678622a SHA512 8e32d9dbfb2f0f3f50200543aadb51ed9834ccd5cdf30bf8e4d9e6d0b645ce44ffaf80f7aa9385e9c9095d9a383b3a348a92356cb5386c06544ab082a9a468c7 WHIRLPOOL 1648ee1be71e45fcf5a264816ce7edc7bab19bd28a68703923eb2d6068f1f0469ae593855231d31f88baecbf29e7cece2d6beeed20b7c04231a6c90e90d35910
 DIST patchbundle-selinux-base-policy-2.20141203-r8.tar.bz2 297919 SHA256 77539eb3d78105f8789cd8205d2698bd27e2abf100163bdd162cda860fd15120 SHA512 2f8a19e1e4bb65f32b480275f49099aed3ae9df543c7de862b3bbd93e81b89cd96dadac3d091e28673d09a6885db8c5656b3a77d0080775c110b04f2753de7a6 WHIRLPOOL 79cb7e620eb8e838192dc557c7a9ce7e713227d783cc8b63792825559b2145cad70d0af6f99948c1527557bc363feffd846c73893682b4a14fc7d08b9e20c649
+DIST patchbundle-selinux-base-policy-2.20141203-r9.tar.bz2 299602 SHA256 e8518004942a6c57170a609683e22b1410c93a2a195829c41dc8fbc703d941b5 SHA512 ce6484fbca1d2d074e50d1a3953392bd3ce0a4617df98fbac37747b469b4f160a9331586dfe1c3ddccb1ccbee24876a2f05ab49e37c8492a48baf83c2d01d140 WHIRLPOOL 1fd7b956e98e95a64c3a713a944d4531259bd156a7feabf6a89c4b5f33ac846377730eede97889e85183be086f282ebd18e860214f6ca3f01b40f2323470ee04
 DIST refpolicy-2.20140311.tar.bz2 664416 SHA256 f69437db95548c78a5dec44c236397146b144153149009ea554d2e536e5436f7 SHA512 50bacee82ed41ac8b8007ecc33bf51d22303cc2ddd27cfb72cb5520dab5f8e255186e34b89cec492c7a2d4220b200814bdede9b46c19f987a3d3d65a1c9b749a WHIRLPOOL e07480beba6ab1f02ad36b7d0c50c4a71cb39a8ec78bf8d1dc3c82bb9dd1d69d9169d7c937165ea15f60ce1147f256d46644f944107a3a8a800d5bad70d4c255
 DIST refpolicy-2.20141203.tar.bz2 680243 SHA256 f438209c430d8a2d4ddcbe4bdd3edb46f6af7dc4913637af0b73c635e40c1522 SHA512 682e4280c5799e4c12ec7594afc1389f67be35055748d2e0dbdc3419159a16c96d4946ca6178daee8370515951f8653b2e452efe8c962b8d7f9bc192f0b15a0c WHIRLPOOL 74bca232534e7af9051bb1ab9f77c1ff6c425781cf4561f781d6e9a40cc5ca0d9add540249ea5493e8782a9372aea296ead6c165c6c440ae1509eb319d151ee5
diff --git a/sec-policy/selinux-cpucontrol/selinux-cpucontrol-2.20141203-r8.ebuild b/sec-policy/selinux-cpucontrol/selinux-cpucontrol-2.20141203-r8.ebuild
index f4f506fa0d5e..be127e1b5e60 100644
--- a/sec-policy/selinux-cpucontrol/selinux-cpucontrol-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-cpucontrol/selinux-cpucontrol-2.20141203-r8.ebuild
@@ -13,5 +13,5 @@ DESCRIPTION="SELinux policy for cpucontrol"
 if [[ $PV == 9999* ]] ; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-cpucontrol/selinux-cpucontrol-2.20141203-r9.ebuild b/sec-policy/selinux-cpucontrol/selinux-cpucontrol-2.20141203-r9.ebuild
new file mode 100644
index 000000000000..f4f506fa0d5e
--- /dev/null
+++ b/sec-policy/selinux-cpucontrol/selinux-cpucontrol-2.20141203-r9.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI="5"
+
+IUSE=""
+MODS="cpucontrol"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for cpucontrol"
+
+if [[ $PV == 9999* ]] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
diff --git a/sec-policy/selinux-cpufreqselector/Manifest b/sec-policy/selinux-cpufreqselector/Manifest
index 8327a635be01..91d204b0021a 100644
--- a/sec-policy/selinux-cpufreqselector/Manifest
+++ b/sec-policy/selinux-cpufreqselector/Manifest
@@ -9,5 +9,6 @@ DIST patchbundle-selinux-base-policy-2.20141203-r5.tar.bz2 274136 SHA256 c23d17c
 DIST patchbundle-selinux-base-policy-2.20141203-r6.tar.bz2 293231 SHA256 b686dcc517b97834f66d967afdcc724cb43b5c6dbf9f34043a91cdeda2625cc7 SHA512 a2c486cbe4a1d21ff3fd01bef25ecf5a633a4072646c67cfccf3f7187d95f3d9e3b482a46ba17c55c40a8e7c0dee56e9cf9ddc9f414d3e4511443b62f60d03e9 WHIRLPOOL 3d708e287e3f9b873be647b0327eab6675a8702ee1cffb56e36934cada306e5ccc64397a083dad9e59de37a067e628cacbf896ae99012d5a209e42fd7cd8a4c6
 DIST patchbundle-selinux-base-policy-2.20141203-r7.tar.bz2 295833 SHA256 ba2219b3efc747be65f94c4d8ac3cd6ee530c82c848fa41935a114184678622a SHA512 8e32d9dbfb2f0f3f50200543aadb51ed9834ccd5cdf30bf8e4d9e6d0b645ce44ffaf80f7aa9385e9c9095d9a383b3a348a92356cb5386c06544ab082a9a468c7 WHIRLPOOL 1648ee1be71e45fcf5a264816ce7edc7bab19bd28a68703923eb2d6068f1f0469ae593855231d31f88baecbf29e7cece2d6beeed20b7c04231a6c90e90d35910
 DIST patchbundle-selinux-base-policy-2.20141203-r8.tar.bz2 297919 SHA256 77539eb3d78105f8789cd8205d2698bd27e2abf100163bdd162cda860fd15120 SHA512 2f8a19e1e4bb65f32b480275f49099aed3ae9df543c7de862b3bbd93e81b89cd96dadac3d091e28673d09a6885db8c5656b3a77d0080775c110b04f2753de7a6 WHIRLPOOL 79cb7e620eb8e838192dc557c7a9ce7e713227d783cc8b63792825559b2145cad70d0af6f99948c1527557bc363feffd846c73893682b4a14fc7d08b9e20c649
+DIST patchbundle-selinux-base-policy-2.20141203-r9.tar.bz2 299602 SHA256 e8518004942a6c57170a609683e22b1410c93a2a195829c41dc8fbc703d941b5 SHA512 ce6484fbca1d2d074e50d1a3953392bd3ce0a4617df98fbac37747b469b4f160a9331586dfe1c3ddccb1ccbee24876a2f05ab49e37c8492a48baf83c2d01d140 WHIRLPOOL 1fd7b956e98e95a64c3a713a944d4531259bd156a7feabf6a89c4b5f33ac846377730eede97889e85183be086f282ebd18e860214f6ca3f01b40f2323470ee04
 DIST refpolicy-2.20140311.tar.bz2 664416 SHA256 f69437db95548c78a5dec44c236397146b144153149009ea554d2e536e5436f7 SHA512 50bacee82ed41ac8b8007ecc33bf51d22303cc2ddd27cfb72cb5520dab5f8e255186e34b89cec492c7a2d4220b200814bdede9b46c19f987a3d3d65a1c9b749a WHIRLPOOL e07480beba6ab1f02ad36b7d0c50c4a71cb39a8ec78bf8d1dc3c82bb9dd1d69d9169d7c937165ea15f60ce1147f256d46644f944107a3a8a800d5bad70d4c255
 DIST refpolicy-2.20141203.tar.bz2 680243 SHA256 f438209c430d8a2d4ddcbe4bdd3edb46f6af7dc4913637af0b73c635e40c1522 SHA512 682e4280c5799e4c12ec7594afc1389f67be35055748d2e0dbdc3419159a16c96d4946ca6178daee8370515951f8653b2e452efe8c962b8d7f9bc192f0b15a0c WHIRLPOOL 74bca232534e7af9051bb1ab9f77c1ff6c425781cf4561f781d6e9a40cc5ca0d9add540249ea5493e8782a9372aea296ead6c165c6c440ae1509eb319d151ee5
diff --git a/sec-policy/selinux-cpufreqselector/selinux-cpufreqselector-2.20141203-r8.ebuild b/sec-policy/selinux-cpufreqselector/selinux-cpufreqselector-2.20141203-r8.ebuild
index a20d621edfa1..f0fccaf1d342 100644
--- a/sec-policy/selinux-cpufreqselector/selinux-cpufreqselector-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-cpufreqselector/selinux-cpufreqselector-2.20141203-r8.ebuild
@@ -13,5 +13,5 @@ DESCRIPTION="SELinux policy for cpufreqselector"
 if [[ $PV == 9999* ]] ; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-cpufreqselector/selinux-cpufreqselector-2.20141203-r9.ebuild b/sec-policy/selinux-cpufreqselector/selinux-cpufreqselector-2.20141203-r9.ebuild
new file mode 100644
index 000000000000..a20d621edfa1
--- /dev/null
+++ b/sec-policy/selinux-cpufreqselector/selinux-cpufreqselector-2.20141203-r9.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI="5"
+
+IUSE=""
+MODS="cpufreqselector"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for cpufreqselector"
+
+if [[ $PV == 9999* ]] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
diff --git a/sec-policy/selinux-cups/Manifest b/sec-policy/selinux-cups/Manifest
index 8327a635be01..91d204b0021a 100644
--- a/sec-policy/selinux-cups/Manifest
+++ b/sec-policy/selinux-cups/Manifest
@@ -9,5 +9,6 @@ DIST patchbundle-selinux-base-policy-2.20141203-r5.tar.bz2 274136 SHA256 c23d17c
 DIST patchbundle-selinux-base-policy-2.20141203-r6.tar.bz2 293231 SHA256 b686dcc517b97834f66d967afdcc724cb43b5c6dbf9f34043a91cdeda2625cc7 SHA512 a2c486cbe4a1d21ff3fd01bef25ecf5a633a4072646c67cfccf3f7187d95f3d9e3b482a46ba17c55c40a8e7c0dee56e9cf9ddc9f414d3e4511443b62f60d03e9 WHIRLPOOL 3d708e287e3f9b873be647b0327eab6675a8702ee1cffb56e36934cada306e5ccc64397a083dad9e59de37a067e628cacbf896ae99012d5a209e42fd7cd8a4c6
 DIST patchbundle-selinux-base-policy-2.20141203-r7.tar.bz2 295833 SHA256 ba2219b3efc747be65f94c4d8ac3cd6ee530c82c848fa41935a114184678622a SHA512 8e32d9dbfb2f0f3f50200543aadb51ed9834ccd5cdf30bf8e4d9e6d0b645ce44ffaf80f7aa9385e9c9095d9a383b3a348a92356cb5386c06544ab082a9a468c7 WHIRLPOOL 1648ee1be71e45fcf5a264816ce7edc7bab19bd28a68703923eb2d6068f1f0469ae593855231d31f88baecbf29e7cece2d6beeed20b7c04231a6c90e90d35910
 DIST patchbundle-selinux-base-policy-2.20141203-r8.tar.bz2 297919 SHA256 77539eb3d78105f8789cd8205d2698bd27e2abf100163bdd162cda860fd15120 SHA512 2f8a19e1e4bb65f32b480275f49099aed3ae9df543c7de862b3bbd93e81b89cd96dadac3d091e28673d09a6885db8c5656b3a77d0080775c110b04f2753de7a6 WHIRLPOOL 79cb7e620eb8e838192dc557c7a9ce7e713227d783cc8b63792825559b2145cad70d0af6f99948c1527557bc363feffd846c73893682b4a14fc7d08b9e20c649
+DIST patchbundle-selinux-base-policy-2.20141203-r9.tar.bz2 299602 SHA256 e8518004942a6c57170a609683e22b1410c93a2a195829c41dc8fbc703d941b5 SHA512 ce6484fbca1d2d074e50d1a3953392bd3ce0a4617df98fbac37747b469b4f160a9331586dfe1c3ddccb1ccbee24876a2f05ab49e37c8492a48baf83c2d01d140 WHIRLPOOL 1fd7b956e98e95a64c3a713a944d4531259bd156a7feabf6a89c4b5f33ac846377730eede97889e85183be086f282ebd18e860214f6ca3f01b40f2323470ee04
 DIST refpolicy-2.20140311.tar.bz2 664416 SHA256 f69437db95548c78a5dec44c236397146b144153149009ea554d2e536e5436f7 SHA512 50bacee82ed41ac8b8007ecc33bf51d22303cc2ddd27cfb72cb5520dab5f8e255186e34b89cec492c7a2d4220b200814bdede9b46c19f987a3d3d65a1c9b749a WHIRLPOOL e07480beba6ab1f02ad36b7d0c50c4a71cb39a8ec78bf8d1dc3c82bb9dd1d69d9169d7c937165ea15f60ce1147f256d46644f944107a3a8a800d5bad70d4c255
 DIST refpolicy-2.20141203.tar.bz2 680243 SHA256 f438209c430d8a2d4ddcbe4bdd3edb46f6af7dc4913637af0b73c635e40c1522 SHA512 682e4280c5799e4c12ec7594afc1389f67be35055748d2e0dbdc3419159a16c96d4946ca6178daee8370515951f8653b2e452efe8c962b8d7f9bc192f0b15a0c WHIRLPOOL 74bca232534e7af9051bb1ab9f77c1ff6c425781cf4561f781d6e9a40cc5ca0d9add540249ea5493e8782a9372aea296ead6c165c6c440ae1509eb319d151ee5
diff --git a/sec-policy/selinux-cups/selinux-cups-2.20141203-r8.ebuild b/sec-policy/selinux-cups/selinux-cups-2.20141203-r8.ebuild
index 790f440b5665..04e7c606274c 100644
--- a/sec-policy/selinux-cups/selinux-cups-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-cups/selinux-cups-2.20141203-r8.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="SELinux policy for cups"
 if [[ $PV == 9999* ]] ; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-lpd
diff --git a/sec-policy/selinux-cups/selinux-cups-2.20141203-r9.ebuild b/sec-policy/selinux-cups/selinux-cups-2.20141203-r9.ebuild
new file mode 100644
index 000000000000..790f440b5665
--- /dev/null
+++ b/sec-policy/selinux-cups/selinux-cups-2.20141203-r9.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI="5"
+
+IUSE=""
+MODS="cups"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for cups"
+
+if [[ $PV == 9999* ]] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
+DEPEND="${DEPEND}
+	sec-policy/selinux-lpd
+"
+RDEPEND="${RDEPEND}
+	sec-policy/selinux-lpd
+"
diff --git a/sec-policy/selinux-cvs/Manifest b/sec-policy/selinux-cvs/Manifest
index 8327a635be01..91d204b0021a 100644
--- a/sec-policy/selinux-cvs/Manifest
+++ b/sec-policy/selinux-cvs/Manifest
@@ -9,5 +9,6 @@ DIST patchbundle-selinux-base-policy-2.20141203-r5.tar.bz2 274136 SHA256 c23d17c
 DIST patchbundle-selinux-base-policy-2.20141203-r6.tar.bz2 293231 SHA256 b686dcc517b97834f66d967afdcc724cb43b5c6dbf9f34043a91cdeda2625cc7 SHA512 a2c486cbe4a1d21ff3fd01bef25ecf5a633a4072646c67cfccf3f7187d95f3d9e3b482a46ba17c55c40a8e7c0dee56e9cf9ddc9f414d3e4511443b62f60d03e9 WHIRLPOOL 3d708e287e3f9b873be647b0327eab6675a8702ee1cffb56e36934cada306e5ccc64397a083dad9e59de37a067e628cacbf896ae99012d5a209e42fd7cd8a4c6
 DIST patchbundle-selinux-base-policy-2.20141203-r7.tar.bz2 295833 SHA256 ba2219b3efc747be65f94c4d8ac3cd6ee530c82c848fa41935a114184678622a SHA512 8e32d9dbfb2f0f3f50200543aadb51ed9834ccd5cdf30bf8e4d9e6d0b645ce44ffaf80f7aa9385e9c9095d9a383b3a348a92356cb5386c06544ab082a9a468c7 WHIRLPOOL 1648ee1be71e45fcf5a264816ce7edc7bab19bd28a68703923eb2d6068f1f0469ae593855231d31f88baecbf29e7cece2d6beeed20b7c04231a6c90e90d35910
 DIST patchbundle-selinux-base-policy-2.20141203-r8.tar.bz2 297919 SHA256 77539eb3d78105f8789cd8205d2698bd27e2abf100163bdd162cda860fd15120 SHA512 2f8a19e1e4bb65f32b480275f49099aed3ae9df543c7de862b3bbd93e81b89cd96dadac3d091e28673d09a6885db8c5656b3a77d0080775c110b04f2753de7a6 WHIRLPOOL 79cb7e620eb8e838192dc557c7a9ce7e713227d783cc8b63792825559b2145cad70d0af6f99948c1527557bc363feffd846c73893682b4a14fc7d08b9e20c649
+DIST patchbundle-selinux-base-policy-2.20141203-r9.tar.bz2 299602 SHA256 e8518004942a6c57170a609683e22b1410c93a2a195829c41dc8fbc703d941b5 SHA512 ce6484fbca1d2d074e50d1a3953392bd3ce0a4617df98fbac37747b469b4f160a9331586dfe1c3ddccb1ccbee24876a2f05ab49e37c8492a48baf83c2d01d140 WHIRLPOOL 1fd7b956e98e95a64c3a713a944d4531259bd156a7feabf6a89c4b5f33ac846377730eede97889e85183be086f282ebd18e860214f6ca3f01b40f2323470ee04
 DIST refpolicy-2.20140311.tar.bz2 664416 SHA256 f69437db95548c78a5dec44c236397146b144153149009ea554d2e536e5436f7 SHA512 50bacee82ed41ac8b8007ecc33bf51d22303cc2ddd27cfb72cb5520dab5f8e255186e34b89cec492c7a2d4220b200814bdede9b46c19f987a3d3d65a1c9b749a WHIRLPOOL e07480beba6ab1f02ad36b7d0c50c4a71cb39a8ec78bf8d1dc3c82bb9dd1d69d9169d7c937165ea15f60ce1147f256d46644f944107a3a8a800d5bad70d4c255
 DIST refpolicy-2.20141203.tar.bz2 680243 SHA256 f438209c430d8a2d4ddcbe4bdd3edb46f6af7dc4913637af0b73c635e40c1522 SHA512 682e4280c5799e4c12ec7594afc1389f67be35055748d2e0dbdc3419159a16c96d4946ca6178daee8370515951f8653b2e452efe8c962b8d7f9bc192f0b15a0c WHIRLPOOL 74bca232534e7af9051bb1ab9f77c1ff6c425781cf4561f781d6e9a40cc5ca0d9add540249ea5493e8782a9372aea296ead6c165c6c440ae1509eb319d151ee5
diff --git a/sec-policy/selinux-cvs/selinux-cvs-2.20141203-r8.ebuild b/sec-policy/selinux-cvs/selinux-cvs-2.20141203-r8.ebuild
index b6bc80760d38..3042d4ad1823 100644
--- a/sec-policy/selinux-cvs/selinux-cvs-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-cvs/selinux-cvs-2.20141203-r8.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="SELinux policy for cvs"
 if [[ $PV == 9999* ]] ; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-apache
diff --git a/sec-policy/selinux-cvs/selinux-cvs-2.20141203-r9.ebuild b/sec-policy/selinux-cvs/selinux-cvs-2.20141203-r9.ebuild
new file mode 100644
index 000000000000..b6bc80760d38
--- /dev/null
+++ b/sec-policy/selinux-cvs/selinux-cvs-2.20141203-r9.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI="5"
+
+IUSE=""
+MODS="cvs"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for cvs"
+
+if [[ $PV == 9999* ]] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
+DEPEND="${DEPEND}
+	sec-policy/selinux-apache
+	sec-policy/selinux-inetd
+"
+RDEPEND="${RDEPEND}
+	sec-policy/selinux-apache
+	sec-policy/selinux-inetd
+"
diff --git a/sec-policy/selinux-cyphesis/Manifest b/sec-policy/selinux-cyphesis/Manifest
index 8327a635be01..91d204b0021a 100644
--- a/sec-policy/selinux-cyphesis/Manifest
+++ b/sec-policy/selinux-cyphesis/Manifest
@@ -9,5 +9,6 @@ DIST patchbundle-selinux-base-policy-2.20141203-r5.tar.bz2 274136 SHA256 c23d17c
 DIST patchbundle-selinux-base-policy-2.20141203-r6.tar.bz2 293231 SHA256 b686dcc517b97834f66d967afdcc724cb43b5c6dbf9f34043a91cdeda2625cc7 SHA512 a2c486cbe4a1d21ff3fd01bef25ecf5a633a4072646c67cfccf3f7187d95f3d9e3b482a46ba17c55c40a8e7c0dee56e9cf9ddc9f414d3e4511443b62f60d03e9 WHIRLPOOL 3d708e287e3f9b873be647b0327eab6675a8702ee1cffb56e36934cada306e5ccc64397a083dad9e59de37a067e628cacbf896ae99012d5a209e42fd7cd8a4c6
 DIST patchbundle-selinux-base-policy-2.20141203-r7.tar.bz2 295833 SHA256 ba2219b3efc747be65f94c4d8ac3cd6ee530c82c848fa41935a114184678622a SHA512 8e32d9dbfb2f0f3f50200543aadb51ed9834ccd5cdf30bf8e4d9e6d0b645ce44ffaf80f7aa9385e9c9095d9a383b3a348a92356cb5386c06544ab082a9a468c7 WHIRLPOOL 1648ee1be71e45fcf5a264816ce7edc7bab19bd28a68703923eb2d6068f1f0469ae593855231d31f88baecbf29e7cece2d6beeed20b7c04231a6c90e90d35910
 DIST patchbundle-selinux-base-policy-2.20141203-r8.tar.bz2 297919 SHA256 77539eb3d78105f8789cd8205d2698bd27e2abf100163bdd162cda860fd15120 SHA512 2f8a19e1e4bb65f32b480275f49099aed3ae9df543c7de862b3bbd93e81b89cd96dadac3d091e28673d09a6885db8c5656b3a77d0080775c110b04f2753de7a6 WHIRLPOOL 79cb7e620eb8e838192dc557c7a9ce7e713227d783cc8b63792825559b2145cad70d0af6f99948c1527557bc363feffd846c73893682b4a14fc7d08b9e20c649
+DIST patchbundle-selinux-base-policy-2.20141203-r9.tar.bz2 299602 SHA256 e8518004942a6c57170a609683e22b1410c93a2a195829c41dc8fbc703d941b5 SHA512 ce6484fbca1d2d074e50d1a3953392bd3ce0a4617df98fbac37747b469b4f160a9331586dfe1c3ddccb1ccbee24876a2f05ab49e37c8492a48baf83c2d01d140 WHIRLPOOL 1fd7b956e98e95a64c3a713a944d4531259bd156a7feabf6a89c4b5f33ac846377730eede97889e85183be086f282ebd18e860214f6ca3f01b40f2323470ee04
 DIST refpolicy-2.20140311.tar.bz2 664416 SHA256 f69437db95548c78a5dec44c236397146b144153149009ea554d2e536e5436f7 SHA512 50bacee82ed41ac8b8007ecc33bf51d22303cc2ddd27cfb72cb5520dab5f8e255186e34b89cec492c7a2d4220b200814bdede9b46c19f987a3d3d65a1c9b749a WHIRLPOOL e07480beba6ab1f02ad36b7d0c50c4a71cb39a8ec78bf8d1dc3c82bb9dd1d69d9169d7c937165ea15f60ce1147f256d46644f944107a3a8a800d5bad70d4c255
 DIST refpolicy-2.20141203.tar.bz2 680243 SHA256 f438209c430d8a2d4ddcbe4bdd3edb46f6af7dc4913637af0b73c635e40c1522 SHA512 682e4280c5799e4c12ec7594afc1389f67be35055748d2e0dbdc3419159a16c96d4946ca6178daee8370515951f8653b2e452efe8c962b8d7f9bc192f0b15a0c WHIRLPOOL 74bca232534e7af9051bb1ab9f77c1ff6c425781cf4561f781d6e9a40cc5ca0d9add540249ea5493e8782a9372aea296ead6c165c6c440ae1509eb319d151ee5
diff --git a/sec-policy/selinux-cyphesis/selinux-cyphesis-2.20141203-r8.ebuild b/sec-policy/selinux-cyphesis/selinux-cyphesis-2.20141203-r8.ebuild
index 165510ae05a1..96db5dce05ec 100644
--- a/sec-policy/selinux-cyphesis/selinux-cyphesis-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-cyphesis/selinux-cyphesis-2.20141203-r8.ebuild
@@ -13,5 +13,5 @@ DESCRIPTION="SELinux policy for cyphesis"
 if [[ $PV == 9999* ]] ; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-cyphesis/selinux-cyphesis-2.20141203-r9.ebuild b/sec-policy/selinux-cyphesis/selinux-cyphesis-2.20141203-r9.ebuild
new file mode 100644
index 000000000000..165510ae05a1
--- /dev/null
+++ b/sec-policy/selinux-cyphesis/selinux-cyphesis-2.20141203-r9.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI="5"
+
+IUSE=""
+MODS="cyphesis"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for cyphesis"
+
+if [[ $PV == 9999* ]] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
diff --git a/sec-policy/selinux-daemontools/Manifest b/sec-policy/selinux-daemontools/Manifest
index 8327a635be01..91d204b0021a 100644
--- a/sec-policy/selinux-daemontools/Manifest
+++ b/sec-policy/selinux-daemontools/Manifest
@@ -9,5 +9,6 @@ DIST patchbundle-selinux-base-policy-2.20141203-r5.tar.bz2 274136 SHA256 c23d17c
 DIST patchbundle-selinux-base-policy-2.20141203-r6.tar.bz2 293231 SHA256 b686dcc517b97834f66d967afdcc724cb43b5c6dbf9f34043a91cdeda2625cc7 SHA512 a2c486cbe4a1d21ff3fd01bef25ecf5a633a4072646c67cfccf3f7187d95f3d9e3b482a46ba17c55c40a8e7c0dee56e9cf9ddc9f414d3e4511443b62f60d03e9 WHIRLPOOL 3d708e287e3f9b873be647b0327eab6675a8702ee1cffb56e36934cada306e5ccc64397a083dad9e59de37a067e628cacbf896ae99012d5a209e42fd7cd8a4c6
 DIST patchbundle-selinux-base-policy-2.20141203-r7.tar.bz2 295833 SHA256 ba2219b3efc747be65f94c4d8ac3cd6ee530c82c848fa41935a114184678622a SHA512 8e32d9dbfb2f0f3f50200543aadb51ed9834ccd5cdf30bf8e4d9e6d0b645ce44ffaf80f7aa9385e9c9095d9a383b3a348a92356cb5386c06544ab082a9a468c7 WHIRLPOOL 1648ee1be71e45fcf5a264816ce7edc7bab19bd28a68703923eb2d6068f1f0469ae593855231d31f88baecbf29e7cece2d6beeed20b7c04231a6c90e90d35910
 DIST patchbundle-selinux-base-policy-2.20141203-r8.tar.bz2 297919 SHA256 77539eb3d78105f8789cd8205d2698bd27e2abf100163bdd162cda860fd15120 SHA512 2f8a19e1e4bb65f32b480275f49099aed3ae9df543c7de862b3bbd93e81b89cd96dadac3d091e28673d09a6885db8c5656b3a77d0080775c110b04f2753de7a6 WHIRLPOOL 79cb7e620eb8e838192dc557c7a9ce7e713227d783cc8b63792825559b2145cad70d0af6f99948c1527557bc363feffd846c73893682b4a14fc7d08b9e20c649
+DIST patchbundle-selinux-base-policy-2.20141203-r9.tar.bz2 299602 SHA256 e8518004942a6c57170a609683e22b1410c93a2a195829c41dc8fbc703d941b5 SHA512 ce6484fbca1d2d074e50d1a3953392bd3ce0a4617df98fbac37747b469b4f160a9331586dfe1c3ddccb1ccbee24876a2f05ab49e37c8492a48baf83c2d01d140 WHIRLPOOL 1fd7b956e98e95a64c3a713a944d4531259bd156a7feabf6a89c4b5f33ac846377730eede97889e85183be086f282ebd18e860214f6ca3f01b40f2323470ee04
 DIST refpolicy-2.20140311.tar.bz2 664416 SHA256 f69437db95548c78a5dec44c236397146b144153149009ea554d2e536e5436f7 SHA512 50bacee82ed41ac8b8007ecc33bf51d22303cc2ddd27cfb72cb5520dab5f8e255186e34b89cec492c7a2d4220b200814bdede9b46c19f987a3d3d65a1c9b749a WHIRLPOOL e07480beba6ab1f02ad36b7d0c50c4a71cb39a8ec78bf8d1dc3c82bb9dd1d69d9169d7c937165ea15f60ce1147f256d46644f944107a3a8a800d5bad70d4c255
 DIST refpolicy-2.20141203.tar.bz2 680243 SHA256 f438209c430d8a2d4ddcbe4bdd3edb46f6af7dc4913637af0b73c635e40c1522 SHA512 682e4280c5799e4c12ec7594afc1389f67be35055748d2e0dbdc3419159a16c96d4946ca6178daee8370515951f8653b2e452efe8c962b8d7f9bc192f0b15a0c WHIRLPOOL 74bca232534e7af9051bb1ab9f77c1ff6c425781cf4561f781d6e9a40cc5ca0d9add540249ea5493e8782a9372aea296ead6c165c6c440ae1509eb319d151ee5
diff --git a/sec-policy/selinux-daemontools/selinux-daemontools-2.20141203-r8.ebuild b/sec-policy/selinux-daemontools/selinux-daemontools-2.20141203-r8.ebuild
index 1d09ffa66917..9c9eaca8a425 100644
--- a/sec-policy/selinux-daemontools/selinux-daemontools-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-daemontools/selinux-daemontools-2.20141203-r8.ebuild
@@ -13,5 +13,5 @@ DESCRIPTION="SELinux policy for daemontools"
 if [[ $PV == 9999* ]] ; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-daemontools/selinux-daemontools-2.20141203-r9.ebuild b/sec-policy/selinux-daemontools/selinux-daemontools-2.20141203-r9.ebuild
new file mode 100644
index 000000000000..1d09ffa66917
--- /dev/null
+++ b/sec-policy/selinux-daemontools/selinux-daemontools-2.20141203-r9.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI="5"
+
+IUSE=""
+MODS="daemontools"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for daemontools"
+
+if [[ $PV == 9999* ]] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
diff --git a/sec-policy/selinux-dante/Manifest b/sec-policy/selinux-dante/Manifest
index 8327a635be01..91d204b0021a 100644
--- a/sec-policy/selinux-dante/Manifest
+++ b/sec-policy/selinux-dante/Manifest
@@ -9,5 +9,6 @@ DIST patchbundle-selinux-base-policy-2.20141203-r5.tar.bz2 274136 SHA256 c23d17c
 DIST patchbundle-selinux-base-policy-2.20141203-r6.tar.bz2 293231 SHA256 b686dcc517b97834f66d967afdcc724cb43b5c6dbf9f34043a91cdeda2625cc7 SHA512 a2c486cbe4a1d21ff3fd01bef25ecf5a633a4072646c67cfccf3f7187d95f3d9e3b482a46ba17c55c40a8e7c0dee56e9cf9ddc9f414d3e4511443b62f60d03e9 WHIRLPOOL 3d708e287e3f9b873be647b0327eab6675a8702ee1cffb56e36934cada306e5ccc64397a083dad9e59de37a067e628cacbf896ae99012d5a209e42fd7cd8a4c6
 DIST patchbundle-selinux-base-policy-2.20141203-r7.tar.bz2 295833 SHA256 ba2219b3efc747be65f94c4d8ac3cd6ee530c82c848fa41935a114184678622a SHA512 8e32d9dbfb2f0f3f50200543aadb51ed9834ccd5cdf30bf8e4d9e6d0b645ce44ffaf80f7aa9385e9c9095d9a383b3a348a92356cb5386c06544ab082a9a468c7 WHIRLPOOL 1648ee1be71e45fcf5a264816ce7edc7bab19bd28a68703923eb2d6068f1f0469ae593855231d31f88baecbf29e7cece2d6beeed20b7c04231a6c90e90d35910
 DIST patchbundle-selinux-base-policy-2.20141203-r8.tar.bz2 297919 SHA256 77539eb3d78105f8789cd8205d2698bd27e2abf100163bdd162cda860fd15120 SHA512 2f8a19e1e4bb65f32b480275f49099aed3ae9df543c7de862b3bbd93e81b89cd96dadac3d091e28673d09a6885db8c5656b3a77d0080775c110b04f2753de7a6 WHIRLPOOL 79cb7e620eb8e838192dc557c7a9ce7e713227d783cc8b63792825559b2145cad70d0af6f99948c1527557bc363feffd846c73893682b4a14fc7d08b9e20c649
+DIST patchbundle-selinux-base-policy-2.20141203-r9.tar.bz2 299602 SHA256 e8518004942a6c57170a609683e22b1410c93a2a195829c41dc8fbc703d941b5 SHA512 ce6484fbca1d2d074e50d1a3953392bd3ce0a4617df98fbac37747b469b4f160a9331586dfe1c3ddccb1ccbee24876a2f05ab49e37c8492a48baf83c2d01d140 WHIRLPOOL 1fd7b956e98e95a64c3a713a944d4531259bd156a7feabf6a89c4b5f33ac846377730eede97889e85183be086f282ebd18e860214f6ca3f01b40f2323470ee04
 DIST refpolicy-2.20140311.tar.bz2 664416 SHA256 f69437db95548c78a5dec44c236397146b144153149009ea554d2e536e5436f7 SHA512 50bacee82ed41ac8b8007ecc33bf51d22303cc2ddd27cfb72cb5520dab5f8e255186e34b89cec492c7a2d4220b200814bdede9b46c19f987a3d3d65a1c9b749a WHIRLPOOL e07480beba6ab1f02ad36b7d0c50c4a71cb39a8ec78bf8d1dc3c82bb9dd1d69d9169d7c937165ea15f60ce1147f256d46644f944107a3a8a800d5bad70d4c255
 DIST refpolicy-2.20141203.tar.bz2 680243 SHA256 f438209c430d8a2d4ddcbe4bdd3edb46f6af7dc4913637af0b73c635e40c1522 SHA512 682e4280c5799e4c12ec7594afc1389f67be35055748d2e0dbdc3419159a16c96d4946ca6178daee8370515951f8653b2e452efe8c962b8d7f9bc192f0b15a0c WHIRLPOOL 74bca232534e7af9051bb1ab9f77c1ff6c425781cf4561f781d6e9a40cc5ca0d9add540249ea5493e8782a9372aea296ead6c165c6c440ae1509eb319d151ee5
diff --git a/sec-policy/selinux-dante/selinux-dante-2.20141203-r8.ebuild b/sec-policy/selinux-dante/selinux-dante-2.20141203-r8.ebuild
index 488c20466024..b49548110451 100644
--- a/sec-policy/selinux-dante/selinux-dante-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-dante/selinux-dante-2.20141203-r8.ebuild
@@ -13,5 +13,5 @@ DESCRIPTION="SELinux policy for dante"
 if [[ $PV == 9999* ]] ; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-dante/selinux-dante-2.20141203-r9.ebuild b/sec-policy/selinux-dante/selinux-dante-2.20141203-r9.ebuild
new file mode 100644
index 000000000000..488c20466024
--- /dev/null
+++ b/sec-policy/selinux-dante/selinux-dante-2.20141203-r9.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI="5"
+
+IUSE=""
+MODS="dante"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for dante"
+
+if [[ $PV == 9999* ]] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
diff --git a/sec-policy/selinux-dbadm/Manifest b/sec-policy/selinux-dbadm/Manifest
index 8327a635be01..91d204b0021a 100644
--- a/sec-policy/selinux-dbadm/Manifest
+++ b/sec-policy/selinux-dbadm/Manifest
@@ -9,5 +9,6 @@ DIST patchbundle-selinux-base-policy-2.20141203-r5.tar.bz2 274136 SHA256 c23d17c
 DIST patchbundle-selinux-base-policy-2.20141203-r6.tar.bz2 293231 SHA256 b686dcc517b97834f66d967afdcc724cb43b5c6dbf9f34043a91cdeda2625cc7 SHA512 a2c486cbe4a1d21ff3fd01bef25ecf5a633a4072646c67cfccf3f7187d95f3d9e3b482a46ba17c55c40a8e7c0dee56e9cf9ddc9f414d3e4511443b62f60d03e9 WHIRLPOOL 3d708e287e3f9b873be647b0327eab6675a8702ee1cffb56e36934cada306e5ccc64397a083dad9e59de37a067e628cacbf896ae99012d5a209e42fd7cd8a4c6
 DIST patchbundle-selinux-base-policy-2.20141203-r7.tar.bz2 295833 SHA256 ba2219b3efc747be65f94c4d8ac3cd6ee530c82c848fa41935a114184678622a SHA512 8e32d9dbfb2f0f3f50200543aadb51ed9834ccd5cdf30bf8e4d9e6d0b645ce44ffaf80f7aa9385e9c9095d9a383b3a348a92356cb5386c06544ab082a9a468c7 WHIRLPOOL 1648ee1be71e45fcf5a264816ce7edc7bab19bd28a68703923eb2d6068f1f0469ae593855231d31f88baecbf29e7cece2d6beeed20b7c04231a6c90e90d35910
 DIST patchbundle-selinux-base-policy-2.20141203-r8.tar.bz2 297919 SHA256 77539eb3d78105f8789cd8205d2698bd27e2abf100163bdd162cda860fd15120 SHA512 2f8a19e1e4bb65f32b480275f49099aed3ae9df543c7de862b3bbd93e81b89cd96dadac3d091e28673d09a6885db8c5656b3a77d0080775c110b04f2753de7a6 WHIRLPOOL 79cb7e620eb8e838192dc557c7a9ce7e713227d783cc8b63792825559b2145cad70d0af6f99948c1527557bc363feffd846c73893682b4a14fc7d08b9e20c649
+DIST patchbundle-selinux-base-policy-2.20141203-r9.tar.bz2 299602 SHA256 e8518004942a6c57170a609683e22b1410c93a2a195829c41dc8fbc703d941b5 SHA512 ce6484fbca1d2d074e50d1a3953392bd3ce0a4617df98fbac37747b469b4f160a9331586dfe1c3ddccb1ccbee24876a2f05ab49e37c8492a48baf83c2d01d140 WHIRLPOOL 1fd7b956e98e95a64c3a713a944d4531259bd156a7feabf6a89c4b5f33ac846377730eede97889e85183be086f282ebd18e860214f6ca3f01b40f2323470ee04
 DIST refpolicy-2.20140311.tar.bz2 664416 SHA256 f69437db95548c78a5dec44c236397146b144153149009ea554d2e536e5436f7 SHA512 50bacee82ed41ac8b8007ecc33bf51d22303cc2ddd27cfb72cb5520dab5f8e255186e34b89cec492c7a2d4220b200814bdede9b46c19f987a3d3d65a1c9b749a WHIRLPOOL e07480beba6ab1f02ad36b7d0c50c4a71cb39a8ec78bf8d1dc3c82bb9dd1d69d9169d7c937165ea15f60ce1147f256d46644f944107a3a8a800d5bad70d4c255
 DIST refpolicy-2.20141203.tar.bz2 680243 SHA256 f438209c430d8a2d4ddcbe4bdd3edb46f6af7dc4913637af0b73c635e40c1522 SHA512 682e4280c5799e4c12ec7594afc1389f67be35055748d2e0dbdc3419159a16c96d4946ca6178daee8370515951f8653b2e452efe8c962b8d7f9bc192f0b15a0c WHIRLPOOL 74bca232534e7af9051bb1ab9f77c1ff6c425781cf4561f781d6e9a40cc5ca0d9add540249ea5493e8782a9372aea296ead6c165c6c440ae1509eb319d151ee5
diff --git a/sec-policy/selinux-dbadm/selinux-dbadm-2.20141203-r8.ebuild b/sec-policy/selinux-dbadm/selinux-dbadm-2.20141203-r8.ebuild
index 57969a45189e..a2ad8f80e734 100644
--- a/sec-policy/selinux-dbadm/selinux-dbadm-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-dbadm/selinux-dbadm-2.20141203-r8.ebuild
@@ -13,5 +13,5 @@ DESCRIPTION="SELinux policy for dbadm"
 if [[ $PV == 9999* ]] ; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-dbadm/selinux-dbadm-2.20141203-r9.ebuild b/sec-policy/selinux-dbadm/selinux-dbadm-2.20141203-r9.ebuild
new file mode 100644
index 000000000000..57969a45189e
--- /dev/null
+++ b/sec-policy/selinux-dbadm/selinux-dbadm-2.20141203-r9.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI="5"
+
+IUSE=""
+MODS="dbadm"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for dbadm"
+
+if [[ $PV == 9999* ]] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
diff --git a/sec-policy/selinux-dbskk/Manifest b/sec-policy/selinux-dbskk/Manifest
index 8327a635be01..91d204b0021a 100644
--- a/sec-policy/selinux-dbskk/Manifest
+++ b/sec-policy/selinux-dbskk/Manifest
@@ -9,5 +9,6 @@ DIST patchbundle-selinux-base-policy-2.20141203-r5.tar.bz2 274136 SHA256 c23d17c
 DIST patchbundle-selinux-base-policy-2.20141203-r6.tar.bz2 293231 SHA256 b686dcc517b97834f66d967afdcc724cb43b5c6dbf9f34043a91cdeda2625cc7 SHA512 a2c486cbe4a1d21ff3fd01bef25ecf5a633a4072646c67cfccf3f7187d95f3d9e3b482a46ba17c55c40a8e7c0dee56e9cf9ddc9f414d3e4511443b62f60d03e9 WHIRLPOOL 3d708e287e3f9b873be647b0327eab6675a8702ee1cffb56e36934cada306e5ccc64397a083dad9e59de37a067e628cacbf896ae99012d5a209e42fd7cd8a4c6
 DIST patchbundle-selinux-base-policy-2.20141203-r7.tar.bz2 295833 SHA256 ba2219b3efc747be65f94c4d8ac3cd6ee530c82c848fa41935a114184678622a SHA512 8e32d9dbfb2f0f3f50200543aadb51ed9834ccd5cdf30bf8e4d9e6d0b645ce44ffaf80f7aa9385e9c9095d9a383b3a348a92356cb5386c06544ab082a9a468c7 WHIRLPOOL 1648ee1be71e45fcf5a264816ce7edc7bab19bd28a68703923eb2d6068f1f0469ae593855231d31f88baecbf29e7cece2d6beeed20b7c04231a6c90e90d35910
 DIST patchbundle-selinux-base-policy-2.20141203-r8.tar.bz2 297919 SHA256 77539eb3d78105f8789cd8205d2698bd27e2abf100163bdd162cda860fd15120 SHA512 2f8a19e1e4bb65f32b480275f49099aed3ae9df543c7de862b3bbd93e81b89cd96dadac3d091e28673d09a6885db8c5656b3a77d0080775c110b04f2753de7a6 WHIRLPOOL 79cb7e620eb8e838192dc557c7a9ce7e713227d783cc8b63792825559b2145cad70d0af6f99948c1527557bc363feffd846c73893682b4a14fc7d08b9e20c649
+DIST patchbundle-selinux-base-policy-2.20141203-r9.tar.bz2 299602 SHA256 e8518004942a6c57170a609683e22b1410c93a2a195829c41dc8fbc703d941b5 SHA512 ce6484fbca1d2d074e50d1a3953392bd3ce0a4617df98fbac37747b469b4f160a9331586dfe1c3ddccb1ccbee24876a2f05ab49e37c8492a48baf83c2d01d140 WHIRLPOOL 1fd7b956e98e95a64c3a713a944d4531259bd156a7feabf6a89c4b5f33ac846377730eede97889e85183be086f282ebd18e860214f6ca3f01b40f2323470ee04
 DIST refpolicy-2.20140311.tar.bz2 664416 SHA256 f69437db95548c78a5dec44c236397146b144153149009ea554d2e536e5436f7 SHA512 50bacee82ed41ac8b8007ecc33bf51d22303cc2ddd27cfb72cb5520dab5f8e255186e34b89cec492c7a2d4220b200814bdede9b46c19f987a3d3d65a1c9b749a WHIRLPOOL e07480beba6ab1f02ad36b7d0c50c4a71cb39a8ec78bf8d1dc3c82bb9dd1d69d9169d7c937165ea15f60ce1147f256d46644f944107a3a8a800d5bad70d4c255
 DIST refpolicy-2.20141203.tar.bz2 680243 SHA256 f438209c430d8a2d4ddcbe4bdd3edb46f6af7dc4913637af0b73c635e40c1522 SHA512 682e4280c5799e4c12ec7594afc1389f67be35055748d2e0dbdc3419159a16c96d4946ca6178daee8370515951f8653b2e452efe8c962b8d7f9bc192f0b15a0c WHIRLPOOL 74bca232534e7af9051bb1ab9f77c1ff6c425781cf4561f781d6e9a40cc5ca0d9add540249ea5493e8782a9372aea296ead6c165c6c440ae1509eb319d151ee5
diff --git a/sec-policy/selinux-dbskk/selinux-dbskk-2.20141203-r8.ebuild b/sec-policy/selinux-dbskk/selinux-dbskk-2.20141203-r8.ebuild
index 77987f1a1517..3169bc921ff6 100644
--- a/sec-policy/selinux-dbskk/selinux-dbskk-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-dbskk/selinux-dbskk-2.20141203-r8.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="SELinux policy for dbskk"
 if [[ $PV == 9999* ]] ; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-inetd
diff --git a/sec-policy/selinux-dbskk/selinux-dbskk-2.20141203-r9.ebuild b/sec-policy/selinux-dbskk/selinux-dbskk-2.20141203-r9.ebuild
new file mode 100644
index 000000000000..77987f1a1517
--- /dev/null
+++ b/sec-policy/selinux-dbskk/selinux-dbskk-2.20141203-r9.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI="5"
+
+IUSE=""
+MODS="dbskk"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for dbskk"
+
+if [[ $PV == 9999* ]] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
+DEPEND="${DEPEND}
+	sec-policy/selinux-inetd
+"
+RDEPEND="${RDEPEND}
+	sec-policy/selinux-inetd
+"
diff --git a/sec-policy/selinux-dbus/Manifest b/sec-policy/selinux-dbus/Manifest
index 8327a635be01..91d204b0021a 100644
--- a/sec-policy/selinux-dbus/Manifest
+++ b/sec-policy/selinux-dbus/Manifest
@@ -9,5 +9,6 @@ DIST patchbundle-selinux-base-policy-2.20141203-r5.tar.bz2 274136 SHA256 c23d17c
 DIST patchbundle-selinux-base-policy-2.20141203-r6.tar.bz2 293231 SHA256 b686dcc517b97834f66d967afdcc724cb43b5c6dbf9f34043a91cdeda2625cc7 SHA512 a2c486cbe4a1d21ff3fd01bef25ecf5a633a4072646c67cfccf3f7187d95f3d9e3b482a46ba17c55c40a8e7c0dee56e9cf9ddc9f414d3e4511443b62f60d03e9 WHIRLPOOL 3d708e287e3f9b873be647b0327eab6675a8702ee1cffb56e36934cada306e5ccc64397a083dad9e59de37a067e628cacbf896ae99012d5a209e42fd7cd8a4c6
 DIST patchbundle-selinux-base-policy-2.20141203-r7.tar.bz2 295833 SHA256 ba2219b3efc747be65f94c4d8ac3cd6ee530c82c848fa41935a114184678622a SHA512 8e32d9dbfb2f0f3f50200543aadb51ed9834ccd5cdf30bf8e4d9e6d0b645ce44ffaf80f7aa9385e9c9095d9a383b3a348a92356cb5386c06544ab082a9a468c7 WHIRLPOOL 1648ee1be71e45fcf5a264816ce7edc7bab19bd28a68703923eb2d6068f1f0469ae593855231d31f88baecbf29e7cece2d6beeed20b7c04231a6c90e90d35910
 DIST patchbundle-selinux-base-policy-2.20141203-r8.tar.bz2 297919 SHA256 77539eb3d78105f8789cd8205d2698bd27e2abf100163bdd162cda860fd15120 SHA512 2f8a19e1e4bb65f32b480275f49099aed3ae9df543c7de862b3bbd93e81b89cd96dadac3d091e28673d09a6885db8c5656b3a77d0080775c110b04f2753de7a6 WHIRLPOOL 79cb7e620eb8e838192dc557c7a9ce7e713227d783cc8b63792825559b2145cad70d0af6f99948c1527557bc363feffd846c73893682b4a14fc7d08b9e20c649
+DIST patchbundle-selinux-base-policy-2.20141203-r9.tar.bz2 299602 SHA256 e8518004942a6c57170a609683e22b1410c93a2a195829c41dc8fbc703d941b5 SHA512 ce6484fbca1d2d074e50d1a3953392bd3ce0a4617df98fbac37747b469b4f160a9331586dfe1c3ddccb1ccbee24876a2f05ab49e37c8492a48baf83c2d01d140 WHIRLPOOL 1fd7b956e98e95a64c3a713a944d4531259bd156a7feabf6a89c4b5f33ac846377730eede97889e85183be086f282ebd18e860214f6ca3f01b40f2323470ee04
 DIST refpolicy-2.20140311.tar.bz2 664416 SHA256 f69437db95548c78a5dec44c236397146b144153149009ea554d2e536e5436f7 SHA512 50bacee82ed41ac8b8007ecc33bf51d22303cc2ddd27cfb72cb5520dab5f8e255186e34b89cec492c7a2d4220b200814bdede9b46c19f987a3d3d65a1c9b749a WHIRLPOOL e07480beba6ab1f02ad36b7d0c50c4a71cb39a8ec78bf8d1dc3c82bb9dd1d69d9169d7c937165ea15f60ce1147f256d46644f944107a3a8a800d5bad70d4c255
 DIST refpolicy-2.20141203.tar.bz2 680243 SHA256 f438209c430d8a2d4ddcbe4bdd3edb46f6af7dc4913637af0b73c635e40c1522 SHA512 682e4280c5799e4c12ec7594afc1389f67be35055748d2e0dbdc3419159a16c96d4946ca6178daee8370515951f8653b2e452efe8c962b8d7f9bc192f0b15a0c WHIRLPOOL 74bca232534e7af9051bb1ab9f77c1ff6c425781cf4561f781d6e9a40cc5ca0d9add540249ea5493e8782a9372aea296ead6c165c6c440ae1509eb319d151ee5
diff --git a/sec-policy/selinux-dbus/selinux-dbus-2.20141203-r8.ebuild b/sec-policy/selinux-dbus/selinux-dbus-2.20141203-r8.ebuild
index 2039d8f93327..ea08574b0027 100644
--- a/sec-policy/selinux-dbus/selinux-dbus-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-dbus/selinux-dbus-2.20141203-r8.ebuild
@@ -13,5 +13,5 @@ DESCRIPTION="SELinux policy for dbus"
 if [[ $PV == 9999* ]] ; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-dbus/selinux-dbus-2.20141203-r9.ebuild b/sec-policy/selinux-dbus/selinux-dbus-2.20141203-r9.ebuild
new file mode 100644
index 000000000000..2039d8f93327
--- /dev/null
+++ b/sec-policy/selinux-dbus/selinux-dbus-2.20141203-r9.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI="5"
+
+IUSE=""
+MODS="dbus"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for dbus"
+
+if [[ $PV == 9999* ]] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
diff --git a/sec-policy/selinux-dcc/Manifest b/sec-policy/selinux-dcc/Manifest
index 8327a635be01..91d204b0021a 100644
--- a/sec-policy/selinux-dcc/Manifest
+++ b/sec-policy/selinux-dcc/Manifest
@@ -9,5 +9,6 @@ DIST patchbundle-selinux-base-policy-2.20141203-r5.tar.bz2 274136 SHA256 c23d17c
 DIST patchbundle-selinux-base-policy-2.20141203-r6.tar.bz2 293231 SHA256 b686dcc517b97834f66d967afdcc724cb43b5c6dbf9f34043a91cdeda2625cc7 SHA512 a2c486cbe4a1d21ff3fd01bef25ecf5a633a4072646c67cfccf3f7187d95f3d9e3b482a46ba17c55c40a8e7c0dee56e9cf9ddc9f414d3e4511443b62f60d03e9 WHIRLPOOL 3d708e287e3f9b873be647b0327eab6675a8702ee1cffb56e36934cada306e5ccc64397a083dad9e59de37a067e628cacbf896ae99012d5a209e42fd7cd8a4c6
 DIST patchbundle-selinux-base-policy-2.20141203-r7.tar.bz2 295833 SHA256 ba2219b3efc747be65f94c4d8ac3cd6ee530c82c848fa41935a114184678622a SHA512 8e32d9dbfb2f0f3f50200543aadb51ed9834ccd5cdf30bf8e4d9e6d0b645ce44ffaf80f7aa9385e9c9095d9a383b3a348a92356cb5386c06544ab082a9a468c7 WHIRLPOOL 1648ee1be71e45fcf5a264816ce7edc7bab19bd28a68703923eb2d6068f1f0469ae593855231d31f88baecbf29e7cece2d6beeed20b7c04231a6c90e90d35910
 DIST patchbundle-selinux-base-policy-2.20141203-r8.tar.bz2 297919 SHA256 77539eb3d78105f8789cd8205d2698bd27e2abf100163bdd162cda860fd15120 SHA512 2f8a19e1e4bb65f32b480275f49099aed3ae9df543c7de862b3bbd93e81b89cd96dadac3d091e28673d09a6885db8c5656b3a77d0080775c110b04f2753de7a6 WHIRLPOOL 79cb7e620eb8e838192dc557c7a9ce7e713227d783cc8b63792825559b2145cad70d0af6f99948c1527557bc363feffd846c73893682b4a14fc7d08b9e20c649
+DIST patchbundle-selinux-base-policy-2.20141203-r9.tar.bz2 299602 SHA256 e8518004942a6c57170a609683e22b1410c93a2a195829c41dc8fbc703d941b5 SHA512 ce6484fbca1d2d074e50d1a3953392bd3ce0a4617df98fbac37747b469b4f160a9331586dfe1c3ddccb1ccbee24876a2f05ab49e37c8492a48baf83c2d01d140 WHIRLPOOL 1fd7b956e98e95a64c3a713a944d4531259bd156a7feabf6a89c4b5f33ac846377730eede97889e85183be086f282ebd18e860214f6ca3f01b40f2323470ee04
 DIST refpolicy-2.20140311.tar.bz2 664416 SHA256 f69437db95548c78a5dec44c236397146b144153149009ea554d2e536e5436f7 SHA512 50bacee82ed41ac8b8007ecc33bf51d22303cc2ddd27cfb72cb5520dab5f8e255186e34b89cec492c7a2d4220b200814bdede9b46c19f987a3d3d65a1c9b749a WHIRLPOOL e07480beba6ab1f02ad36b7d0c50c4a71cb39a8ec78bf8d1dc3c82bb9dd1d69d9169d7c937165ea15f60ce1147f256d46644f944107a3a8a800d5bad70d4c255
 DIST refpolicy-2.20141203.tar.bz2 680243 SHA256 f438209c430d8a2d4ddcbe4bdd3edb46f6af7dc4913637af0b73c635e40c1522 SHA512 682e4280c5799e4c12ec7594afc1389f67be35055748d2e0dbdc3419159a16c96d4946ca6178daee8370515951f8653b2e452efe8c962b8d7f9bc192f0b15a0c WHIRLPOOL 74bca232534e7af9051bb1ab9f77c1ff6c425781cf4561f781d6e9a40cc5ca0d9add540249ea5493e8782a9372aea296ead6c165c6c440ae1509eb319d151ee5
diff --git a/sec-policy/selinux-dcc/selinux-dcc-2.20141203-r8.ebuild b/sec-policy/selinux-dcc/selinux-dcc-2.20141203-r8.ebuild
index 97dcc2a50608..b354b1a46ce5 100644
--- a/sec-policy/selinux-dcc/selinux-dcc-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-dcc/selinux-dcc-2.20141203-r8.ebuild
@@ -13,5 +13,5 @@ DESCRIPTION="SELinux policy for dcc"
 if [[ $PV == 9999* ]] ; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-dcc/selinux-dcc-2.20141203-r9.ebuild b/sec-policy/selinux-dcc/selinux-dcc-2.20141203-r9.ebuild
new file mode 100644
index 000000000000..97dcc2a50608
--- /dev/null
+++ b/sec-policy/selinux-dcc/selinux-dcc-2.20141203-r9.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI="5"
+
+IUSE=""
+MODS="dcc"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for dcc"
+
+if [[ $PV == 9999* ]] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
diff --git a/sec-policy/selinux-ddclient/Manifest b/sec-policy/selinux-ddclient/Manifest
index 8327a635be01..91d204b0021a 100644
--- a/sec-policy/selinux-ddclient/Manifest
+++ b/sec-policy/selinux-ddclient/Manifest
@@ -9,5 +9,6 @@ DIST patchbundle-selinux-base-policy-2.20141203-r5.tar.bz2 274136 SHA256 c23d17c
 DIST patchbundle-selinux-base-policy-2.20141203-r6.tar.bz2 293231 SHA256 b686dcc517b97834f66d967afdcc724cb43b5c6dbf9f34043a91cdeda2625cc7 SHA512 a2c486cbe4a1d21ff3fd01bef25ecf5a633a4072646c67cfccf3f7187d95f3d9e3b482a46ba17c55c40a8e7c0dee56e9cf9ddc9f414d3e4511443b62f60d03e9 WHIRLPOOL 3d708e287e3f9b873be647b0327eab6675a8702ee1cffb56e36934cada306e5ccc64397a083dad9e59de37a067e628cacbf896ae99012d5a209e42fd7cd8a4c6
 DIST patchbundle-selinux-base-policy-2.20141203-r7.tar.bz2 295833 SHA256 ba2219b3efc747be65f94c4d8ac3cd6ee530c82c848fa41935a114184678622a SHA512 8e32d9dbfb2f0f3f50200543aadb51ed9834ccd5cdf30bf8e4d9e6d0b645ce44ffaf80f7aa9385e9c9095d9a383b3a348a92356cb5386c06544ab082a9a468c7 WHIRLPOOL 1648ee1be71e45fcf5a264816ce7edc7bab19bd28a68703923eb2d6068f1f0469ae593855231d31f88baecbf29e7cece2d6beeed20b7c04231a6c90e90d35910
 DIST patchbundle-selinux-base-policy-2.20141203-r8.tar.bz2 297919 SHA256 77539eb3d78105f8789cd8205d2698bd27e2abf100163bdd162cda860fd15120 SHA512 2f8a19e1e4bb65f32b480275f49099aed3ae9df543c7de862b3bbd93e81b89cd96dadac3d091e28673d09a6885db8c5656b3a77d0080775c110b04f2753de7a6 WHIRLPOOL 79cb7e620eb8e838192dc557c7a9ce7e713227d783cc8b63792825559b2145cad70d0af6f99948c1527557bc363feffd846c73893682b4a14fc7d08b9e20c649
+DIST patchbundle-selinux-base-policy-2.20141203-r9.tar.bz2 299602 SHA256 e8518004942a6c57170a609683e22b1410c93a2a195829c41dc8fbc703d941b5 SHA512 ce6484fbca1d2d074e50d1a3953392bd3ce0a4617df98fbac37747b469b4f160a9331586dfe1c3ddccb1ccbee24876a2f05ab49e37c8492a48baf83c2d01d140 WHIRLPOOL 1fd7b956e98e95a64c3a713a944d4531259bd156a7feabf6a89c4b5f33ac846377730eede97889e85183be086f282ebd18e860214f6ca3f01b40f2323470ee04
 DIST refpolicy-2.20140311.tar.bz2 664416 SHA256 f69437db95548c78a5dec44c236397146b144153149009ea554d2e536e5436f7 SHA512 50bacee82ed41ac8b8007ecc33bf51d22303cc2ddd27cfb72cb5520dab5f8e255186e34b89cec492c7a2d4220b200814bdede9b46c19f987a3d3d65a1c9b749a WHIRLPOOL e07480beba6ab1f02ad36b7d0c50c4a71cb39a8ec78bf8d1dc3c82bb9dd1d69d9169d7c937165ea15f60ce1147f256d46644f944107a3a8a800d5bad70d4c255
 DIST refpolicy-2.20141203.tar.bz2 680243 SHA256 f438209c430d8a2d4ddcbe4bdd3edb46f6af7dc4913637af0b73c635e40c1522 SHA512 682e4280c5799e4c12ec7594afc1389f67be35055748d2e0dbdc3419159a16c96d4946ca6178daee8370515951f8653b2e452efe8c962b8d7f9bc192f0b15a0c WHIRLPOOL 74bca232534e7af9051bb1ab9f77c1ff6c425781cf4561f781d6e9a40cc5ca0d9add540249ea5493e8782a9372aea296ead6c165c6c440ae1509eb319d151ee5
diff --git a/sec-policy/selinux-ddclient/selinux-ddclient-2.20141203-r8.ebuild b/sec-policy/selinux-ddclient/selinux-ddclient-2.20141203-r8.ebuild
index 1a6aec0329c6..d6f67fb89973 100644
--- a/sec-policy/selinux-ddclient/selinux-ddclient-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-ddclient/selinux-ddclient-2.20141203-r8.ebuild
@@ -13,5 +13,5 @@ DESCRIPTION="SELinux policy for ddclient"
 if [[ $PV == 9999* ]] ; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-ddclient/selinux-ddclient-2.20141203-r9.ebuild b/sec-policy/selinux-ddclient/selinux-ddclient-2.20141203-r9.ebuild
new file mode 100644
index 000000000000..1a6aec0329c6
--- /dev/null
+++ b/sec-policy/selinux-ddclient/selinux-ddclient-2.20141203-r9.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI="5"
+
+IUSE=""
+MODS="ddclient"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for ddclient"
+
+if [[ $PV == 9999* ]] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
diff --git a/sec-policy/selinux-ddcprobe/Manifest b/sec-policy/selinux-ddcprobe/Manifest
index 8327a635be01..91d204b0021a 100644
--- a/sec-policy/selinux-ddcprobe/Manifest
+++ b/sec-policy/selinux-ddcprobe/Manifest
@@ -9,5 +9,6 @@ DIST patchbundle-selinux-base-policy-2.20141203-r5.tar.bz2 274136 SHA256 c23d17c
 DIST patchbundle-selinux-base-policy-2.20141203-r6.tar.bz2 293231 SHA256 b686dcc517b97834f66d967afdcc724cb43b5c6dbf9f34043a91cdeda2625cc7 SHA512 a2c486cbe4a1d21ff3fd01bef25ecf5a633a4072646c67cfccf3f7187d95f3d9e3b482a46ba17c55c40a8e7c0dee56e9cf9ddc9f414d3e4511443b62f60d03e9 WHIRLPOOL 3d708e287e3f9b873be647b0327eab6675a8702ee1cffb56e36934cada306e5ccc64397a083dad9e59de37a067e628cacbf896ae99012d5a209e42fd7cd8a4c6
 DIST patchbundle-selinux-base-policy-2.20141203-r7.tar.bz2 295833 SHA256 ba2219b3efc747be65f94c4d8ac3cd6ee530c82c848fa41935a114184678622a SHA512 8e32d9dbfb2f0f3f50200543aadb51ed9834ccd5cdf30bf8e4d9e6d0b645ce44ffaf80f7aa9385e9c9095d9a383b3a348a92356cb5386c06544ab082a9a468c7 WHIRLPOOL 1648ee1be71e45fcf5a264816ce7edc7bab19bd28a68703923eb2d6068f1f0469ae593855231d31f88baecbf29e7cece2d6beeed20b7c04231a6c90e90d35910
 DIST patchbundle-selinux-base-policy-2.20141203-r8.tar.bz2 297919 SHA256 77539eb3d78105f8789cd8205d2698bd27e2abf100163bdd162cda860fd15120 SHA512 2f8a19e1e4bb65f32b480275f49099aed3ae9df543c7de862b3bbd93e81b89cd96dadac3d091e28673d09a6885db8c5656b3a77d0080775c110b04f2753de7a6 WHIRLPOOL 79cb7e620eb8e838192dc557c7a9ce7e713227d783cc8b63792825559b2145cad70d0af6f99948c1527557bc363feffd846c73893682b4a14fc7d08b9e20c649
+DIST patchbundle-selinux-base-policy-2.20141203-r9.tar.bz2 299602 SHA256 e8518004942a6c57170a609683e22b1410c93a2a195829c41dc8fbc703d941b5 SHA512 ce6484fbca1d2d074e50d1a3953392bd3ce0a4617df98fbac37747b469b4f160a9331586dfe1c3ddccb1ccbee24876a2f05ab49e37c8492a48baf83c2d01d140 WHIRLPOOL 1fd7b956e98e95a64c3a713a944d4531259bd156a7feabf6a89c4b5f33ac846377730eede97889e85183be086f282ebd18e860214f6ca3f01b40f2323470ee04
 DIST refpolicy-2.20140311.tar.bz2 664416 SHA256 f69437db95548c78a5dec44c236397146b144153149009ea554d2e536e5436f7 SHA512 50bacee82ed41ac8b8007ecc33bf51d22303cc2ddd27cfb72cb5520dab5f8e255186e34b89cec492c7a2d4220b200814bdede9b46c19f987a3d3d65a1c9b749a WHIRLPOOL e07480beba6ab1f02ad36b7d0c50c4a71cb39a8ec78bf8d1dc3c82bb9dd1d69d9169d7c937165ea15f60ce1147f256d46644f944107a3a8a800d5bad70d4c255
 DIST refpolicy-2.20141203.tar.bz2 680243 SHA256 f438209c430d8a2d4ddcbe4bdd3edb46f6af7dc4913637af0b73c635e40c1522 SHA512 682e4280c5799e4c12ec7594afc1389f67be35055748d2e0dbdc3419159a16c96d4946ca6178daee8370515951f8653b2e452efe8c962b8d7f9bc192f0b15a0c WHIRLPOOL 74bca232534e7af9051bb1ab9f77c1ff6c425781cf4561f781d6e9a40cc5ca0d9add540249ea5493e8782a9372aea296ead6c165c6c440ae1509eb319d151ee5
diff --git a/sec-policy/selinux-ddcprobe/selinux-ddcprobe-2.20141203-r8.ebuild b/sec-policy/selinux-ddcprobe/selinux-ddcprobe-2.20141203-r8.ebuild
index adf31d4c0d9e..cc013c89345f 100644
--- a/sec-policy/selinux-ddcprobe/selinux-ddcprobe-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-ddcprobe/selinux-ddcprobe-2.20141203-r8.ebuild
@@ -13,5 +13,5 @@ DESCRIPTION="SELinux policy for ddcprobe"
 if [[ $PV == 9999* ]] ; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-ddcprobe/selinux-ddcprobe-2.20141203-r9.ebuild b/sec-policy/selinux-ddcprobe/selinux-ddcprobe-2.20141203-r9.ebuild
new file mode 100644
index 000000000000..adf31d4c0d9e
--- /dev/null
+++ b/sec-policy/selinux-ddcprobe/selinux-ddcprobe-2.20141203-r9.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI="5"
+
+IUSE=""
+MODS="ddcprobe"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for ddcprobe"
+
+if [[ $PV == 9999* ]] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
diff --git a/sec-policy/selinux-denyhosts/Manifest b/sec-policy/selinux-denyhosts/Manifest
index 8327a635be01..91d204b0021a 100644
--- a/sec-policy/selinux-denyhosts/Manifest
+++ b/sec-policy/selinux-denyhosts/Manifest
@@ -9,5 +9,6 @@ DIST patchbundle-selinux-base-policy-2.20141203-r5.tar.bz2 274136 SHA256 c23d17c
 DIST patchbundle-selinux-base-policy-2.20141203-r6.tar.bz2 293231 SHA256 b686dcc517b97834f66d967afdcc724cb43b5c6dbf9f34043a91cdeda2625cc7 SHA512 a2c486cbe4a1d21ff3fd01bef25ecf5a633a4072646c67cfccf3f7187d95f3d9e3b482a46ba17c55c40a8e7c0dee56e9cf9ddc9f414d3e4511443b62f60d03e9 WHIRLPOOL 3d708e287e3f9b873be647b0327eab6675a8702ee1cffb56e36934cada306e5ccc64397a083dad9e59de37a067e628cacbf896ae99012d5a209e42fd7cd8a4c6
 DIST patchbundle-selinux-base-policy-2.20141203-r7.tar.bz2 295833 SHA256 ba2219b3efc747be65f94c4d8ac3cd6ee530c82c848fa41935a114184678622a SHA512 8e32d9dbfb2f0f3f50200543aadb51ed9834ccd5cdf30bf8e4d9e6d0b645ce44ffaf80f7aa9385e9c9095d9a383b3a348a92356cb5386c06544ab082a9a468c7 WHIRLPOOL 1648ee1be71e45fcf5a264816ce7edc7bab19bd28a68703923eb2d6068f1f0469ae593855231d31f88baecbf29e7cece2d6beeed20b7c04231a6c90e90d35910
 DIST patchbundle-selinux-base-policy-2.20141203-r8.tar.bz2 297919 SHA256 77539eb3d78105f8789cd8205d2698bd27e2abf100163bdd162cda860fd15120 SHA512 2f8a19e1e4bb65f32b480275f49099aed3ae9df543c7de862b3bbd93e81b89cd96dadac3d091e28673d09a6885db8c5656b3a77d0080775c110b04f2753de7a6 WHIRLPOOL 79cb7e620eb8e838192dc557c7a9ce7e713227d783cc8b63792825559b2145cad70d0af6f99948c1527557bc363feffd846c73893682b4a14fc7d08b9e20c649
+DIST patchbundle-selinux-base-policy-2.20141203-r9.tar.bz2 299602 SHA256 e8518004942a6c57170a609683e22b1410c93a2a195829c41dc8fbc703d941b5 SHA512 ce6484fbca1d2d074e50d1a3953392bd3ce0a4617df98fbac37747b469b4f160a9331586dfe1c3ddccb1ccbee24876a2f05ab49e37c8492a48baf83c2d01d140 WHIRLPOOL 1fd7b956e98e95a64c3a713a944d4531259bd156a7feabf6a89c4b5f33ac846377730eede97889e85183be086f282ebd18e860214f6ca3f01b40f2323470ee04
 DIST refpolicy-2.20140311.tar.bz2 664416 SHA256 f69437db95548c78a5dec44c236397146b144153149009ea554d2e536e5436f7 SHA512 50bacee82ed41ac8b8007ecc33bf51d22303cc2ddd27cfb72cb5520dab5f8e255186e34b89cec492c7a2d4220b200814bdede9b46c19f987a3d3d65a1c9b749a WHIRLPOOL e07480beba6ab1f02ad36b7d0c50c4a71cb39a8ec78bf8d1dc3c82bb9dd1d69d9169d7c937165ea15f60ce1147f256d46644f944107a3a8a800d5bad70d4c255
 DIST refpolicy-2.20141203.tar.bz2 680243 SHA256 f438209c430d8a2d4ddcbe4bdd3edb46f6af7dc4913637af0b73c635e40c1522 SHA512 682e4280c5799e4c12ec7594afc1389f67be35055748d2e0dbdc3419159a16c96d4946ca6178daee8370515951f8653b2e452efe8c962b8d7f9bc192f0b15a0c WHIRLPOOL 74bca232534e7af9051bb1ab9f77c1ff6c425781cf4561f781d6e9a40cc5ca0d9add540249ea5493e8782a9372aea296ead6c165c6c440ae1509eb319d151ee5
diff --git a/sec-policy/selinux-denyhosts/selinux-denyhosts-2.20141203-r8.ebuild b/sec-policy/selinux-denyhosts/selinux-denyhosts-2.20141203-r8.ebuild
index 5615093335ca..c051a0431d0a 100644
--- a/sec-policy/selinux-denyhosts/selinux-denyhosts-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-denyhosts/selinux-denyhosts-2.20141203-r8.ebuild
@@ -13,5 +13,5 @@ DESCRIPTION="SELinux policy for denyhosts"
 if [[ $PV == 9999* ]] ; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-denyhosts/selinux-denyhosts-2.20141203-r9.ebuild b/sec-policy/selinux-denyhosts/selinux-denyhosts-2.20141203-r9.ebuild
new file mode 100644
index 000000000000..5615093335ca
--- /dev/null
+++ b/sec-policy/selinux-denyhosts/selinux-denyhosts-2.20141203-r9.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI="5"
+
+IUSE=""
+MODS="denyhosts"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for denyhosts"
+
+if [[ $PV == 9999* ]] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
diff --git a/sec-policy/selinux-devicekit/Manifest b/sec-policy/selinux-devicekit/Manifest
index 8327a635be01..91d204b0021a 100644
--- a/sec-policy/selinux-devicekit/Manifest
+++ b/sec-policy/selinux-devicekit/Manifest
@@ -9,5 +9,6 @@ DIST patchbundle-selinux-base-policy-2.20141203-r5.tar.bz2 274136 SHA256 c23d17c
 DIST patchbundle-selinux-base-policy-2.20141203-r6.tar.bz2 293231 SHA256 b686dcc517b97834f66d967afdcc724cb43b5c6dbf9f34043a91cdeda2625cc7 SHA512 a2c486cbe4a1d21ff3fd01bef25ecf5a633a4072646c67cfccf3f7187d95f3d9e3b482a46ba17c55c40a8e7c0dee56e9cf9ddc9f414d3e4511443b62f60d03e9 WHIRLPOOL 3d708e287e3f9b873be647b0327eab6675a8702ee1cffb56e36934cada306e5ccc64397a083dad9e59de37a067e628cacbf896ae99012d5a209e42fd7cd8a4c6
 DIST patchbundle-selinux-base-policy-2.20141203-r7.tar.bz2 295833 SHA256 ba2219b3efc747be65f94c4d8ac3cd6ee530c82c848fa41935a114184678622a SHA512 8e32d9dbfb2f0f3f50200543aadb51ed9834ccd5cdf30bf8e4d9e6d0b645ce44ffaf80f7aa9385e9c9095d9a383b3a348a92356cb5386c06544ab082a9a468c7 WHIRLPOOL 1648ee1be71e45fcf5a264816ce7edc7bab19bd28a68703923eb2d6068f1f0469ae593855231d31f88baecbf29e7cece2d6beeed20b7c04231a6c90e90d35910
 DIST patchbundle-selinux-base-policy-2.20141203-r8.tar.bz2 297919 SHA256 77539eb3d78105f8789cd8205d2698bd27e2abf100163bdd162cda860fd15120 SHA512 2f8a19e1e4bb65f32b480275f49099aed3ae9df543c7de862b3bbd93e81b89cd96dadac3d091e28673d09a6885db8c5656b3a77d0080775c110b04f2753de7a6 WHIRLPOOL 79cb7e620eb8e838192dc557c7a9ce7e713227d783cc8b63792825559b2145cad70d0af6f99948c1527557bc363feffd846c73893682b4a14fc7d08b9e20c649
+DIST patchbundle-selinux-base-policy-2.20141203-r9.tar.bz2 299602 SHA256 e8518004942a6c57170a609683e22b1410c93a2a195829c41dc8fbc703d941b5 SHA512 ce6484fbca1d2d074e50d1a3953392bd3ce0a4617df98fbac37747b469b4f160a9331586dfe1c3ddccb1ccbee24876a2f05ab49e37c8492a48baf83c2d01d140 WHIRLPOOL 1fd7b956e98e95a64c3a713a944d4531259bd156a7feabf6a89c4b5f33ac846377730eede97889e85183be086f282ebd18e860214f6ca3f01b40f2323470ee04
 DIST refpolicy-2.20140311.tar.bz2 664416 SHA256 f69437db95548c78a5dec44c236397146b144153149009ea554d2e536e5436f7 SHA512 50bacee82ed41ac8b8007ecc33bf51d22303cc2ddd27cfb72cb5520dab5f8e255186e34b89cec492c7a2d4220b200814bdede9b46c19f987a3d3d65a1c9b749a WHIRLPOOL e07480beba6ab1f02ad36b7d0c50c4a71cb39a8ec78bf8d1dc3c82bb9dd1d69d9169d7c937165ea15f60ce1147f256d46644f944107a3a8a800d5bad70d4c255
 DIST refpolicy-2.20141203.tar.bz2 680243 SHA256 f438209c430d8a2d4ddcbe4bdd3edb46f6af7dc4913637af0b73c635e40c1522 SHA512 682e4280c5799e4c12ec7594afc1389f67be35055748d2e0dbdc3419159a16c96d4946ca6178daee8370515951f8653b2e452efe8c962b8d7f9bc192f0b15a0c WHIRLPOOL 74bca232534e7af9051bb1ab9f77c1ff6c425781cf4561f781d6e9a40cc5ca0d9add540249ea5493e8782a9372aea296ead6c165c6c440ae1509eb319d151ee5
diff --git a/sec-policy/selinux-devicekit/selinux-devicekit-2.20141203-r8.ebuild b/sec-policy/selinux-devicekit/selinux-devicekit-2.20141203-r8.ebuild
index 9e1647b89961..13b385c4446d 100644
--- a/sec-policy/selinux-devicekit/selinux-devicekit-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-devicekit/selinux-devicekit-2.20141203-r8.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="SELinux policy for devicekit"
 if [[ $PV == 9999* ]] ; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-devicekit/selinux-devicekit-2.20141203-r9.ebuild b/sec-policy/selinux-devicekit/selinux-devicekit-2.20141203-r9.ebuild
new file mode 100644
index 000000000000..9e1647b89961
--- /dev/null
+++ b/sec-policy/selinux-devicekit/selinux-devicekit-2.20141203-r9.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI="5"
+
+IUSE=""
+MODS="devicekit"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for devicekit"
+
+if [[ $PV == 9999* ]] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DEPEND="${DEPEND}
+	sec-policy/selinux-dbus
+"
+RDEPEND="${RDEPEND}
+	sec-policy/selinux-dbus
+"
diff --git a/sec-policy/selinux-dhcp/Manifest b/sec-policy/selinux-dhcp/Manifest
index 8327a635be01..91d204b0021a 100644
--- a/sec-policy/selinux-dhcp/Manifest
+++ b/sec-policy/selinux-dhcp/Manifest
@@ -9,5 +9,6 @@ DIST patchbundle-selinux-base-policy-2.20141203-r5.tar.bz2 274136 SHA256 c23d17c
 DIST patchbundle-selinux-base-policy-2.20141203-r6.tar.bz2 293231 SHA256 b686dcc517b97834f66d967afdcc724cb43b5c6dbf9f34043a91cdeda2625cc7 SHA512 a2c486cbe4a1d21ff3fd01bef25ecf5a633a4072646c67cfccf3f7187d95f3d9e3b482a46ba17c55c40a8e7c0dee56e9cf9ddc9f414d3e4511443b62f60d03e9 WHIRLPOOL 3d708e287e3f9b873be647b0327eab6675a8702ee1cffb56e36934cada306e5ccc64397a083dad9e59de37a067e628cacbf896ae99012d5a209e42fd7cd8a4c6
 DIST patchbundle-selinux-base-policy-2.20141203-r7.tar.bz2 295833 SHA256 ba2219b3efc747be65f94c4d8ac3cd6ee530c82c848fa41935a114184678622a SHA512 8e32d9dbfb2f0f3f50200543aadb51ed9834ccd5cdf30bf8e4d9e6d0b645ce44ffaf80f7aa9385e9c9095d9a383b3a348a92356cb5386c06544ab082a9a468c7 WHIRLPOOL 1648ee1be71e45fcf5a264816ce7edc7bab19bd28a68703923eb2d6068f1f0469ae593855231d31f88baecbf29e7cece2d6beeed20b7c04231a6c90e90d35910
 DIST patchbundle-selinux-base-policy-2.20141203-r8.tar.bz2 297919 SHA256 77539eb3d78105f8789cd8205d2698bd27e2abf100163bdd162cda860fd15120 SHA512 2f8a19e1e4bb65f32b480275f49099aed3ae9df543c7de862b3bbd93e81b89cd96dadac3d091e28673d09a6885db8c5656b3a77d0080775c110b04f2753de7a6 WHIRLPOOL 79cb7e620eb8e838192dc557c7a9ce7e713227d783cc8b63792825559b2145cad70d0af6f99948c1527557bc363feffd846c73893682b4a14fc7d08b9e20c649
+DIST patchbundle-selinux-base-policy-2.20141203-r9.tar.bz2 299602 SHA256 e8518004942a6c57170a609683e22b1410c93a2a195829c41dc8fbc703d941b5 SHA512 ce6484fbca1d2d074e50d1a3953392bd3ce0a4617df98fbac37747b469b4f160a9331586dfe1c3ddccb1ccbee24876a2f05ab49e37c8492a48baf83c2d01d140 WHIRLPOOL 1fd7b956e98e95a64c3a713a944d4531259bd156a7feabf6a89c4b5f33ac846377730eede97889e85183be086f282ebd18e860214f6ca3f01b40f2323470ee04
 DIST refpolicy-2.20140311.tar.bz2 664416 SHA256 f69437db95548c78a5dec44c236397146b144153149009ea554d2e536e5436f7 SHA512 50bacee82ed41ac8b8007ecc33bf51d22303cc2ddd27cfb72cb5520dab5f8e255186e34b89cec492c7a2d4220b200814bdede9b46c19f987a3d3d65a1c9b749a WHIRLPOOL e07480beba6ab1f02ad36b7d0c50c4a71cb39a8ec78bf8d1dc3c82bb9dd1d69d9169d7c937165ea15f60ce1147f256d46644f944107a3a8a800d5bad70d4c255
 DIST refpolicy-2.20141203.tar.bz2 680243 SHA256 f438209c430d8a2d4ddcbe4bdd3edb46f6af7dc4913637af0b73c635e40c1522 SHA512 682e4280c5799e4c12ec7594afc1389f67be35055748d2e0dbdc3419159a16c96d4946ca6178daee8370515951f8653b2e452efe8c962b8d7f9bc192f0b15a0c WHIRLPOOL 74bca232534e7af9051bb1ab9f77c1ff6c425781cf4561f781d6e9a40cc5ca0d9add540249ea5493e8782a9372aea296ead6c165c6c440ae1509eb319d151ee5
diff --git a/sec-policy/selinux-dhcp/selinux-dhcp-2.20141203-r8.ebuild b/sec-policy/selinux-dhcp/selinux-dhcp-2.20141203-r8.ebuild
index 6db4a25b25ae..fb37426bb5f1 100644
--- a/sec-policy/selinux-dhcp/selinux-dhcp-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-dhcp/selinux-dhcp-2.20141203-r8.ebuild
@@ -13,5 +13,5 @@ DESCRIPTION="SELinux policy for dhcp"
 if [[ $PV == 9999* ]] ; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-dhcp/selinux-dhcp-2.20141203-r9.ebuild b/sec-policy/selinux-dhcp/selinux-dhcp-2.20141203-r9.ebuild
new file mode 100644
index 000000000000..6db4a25b25ae
--- /dev/null
+++ b/sec-policy/selinux-dhcp/selinux-dhcp-2.20141203-r9.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI="5"
+
+IUSE=""
+MODS="dhcp"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for dhcp"
+
+if [[ $PV == 9999* ]] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
diff --git a/sec-policy/selinux-dictd/Manifest b/sec-policy/selinux-dictd/Manifest
index 8327a635be01..91d204b0021a 100644
--- a/sec-policy/selinux-dictd/Manifest
+++ b/sec-policy/selinux-dictd/Manifest
@@ -9,5 +9,6 @@ DIST patchbundle-selinux-base-policy-2.20141203-r5.tar.bz2 274136 SHA256 c23d17c
 DIST patchbundle-selinux-base-policy-2.20141203-r6.tar.bz2 293231 SHA256 b686dcc517b97834f66d967afdcc724cb43b5c6dbf9f34043a91cdeda2625cc7 SHA512 a2c486cbe4a1d21ff3fd01bef25ecf5a633a4072646c67cfccf3f7187d95f3d9e3b482a46ba17c55c40a8e7c0dee56e9cf9ddc9f414d3e4511443b62f60d03e9 WHIRLPOOL 3d708e287e3f9b873be647b0327eab6675a8702ee1cffb56e36934cada306e5ccc64397a083dad9e59de37a067e628cacbf896ae99012d5a209e42fd7cd8a4c6
 DIST patchbundle-selinux-base-policy-2.20141203-r7.tar.bz2 295833 SHA256 ba2219b3efc747be65f94c4d8ac3cd6ee530c82c848fa41935a114184678622a SHA512 8e32d9dbfb2f0f3f50200543aadb51ed9834ccd5cdf30bf8e4d9e6d0b645ce44ffaf80f7aa9385e9c9095d9a383b3a348a92356cb5386c06544ab082a9a468c7 WHIRLPOOL 1648ee1be71e45fcf5a264816ce7edc7bab19bd28a68703923eb2d6068f1f0469ae593855231d31f88baecbf29e7cece2d6beeed20b7c04231a6c90e90d35910
 DIST patchbundle-selinux-base-policy-2.20141203-r8.tar.bz2 297919 SHA256 77539eb3d78105f8789cd8205d2698bd27e2abf100163bdd162cda860fd15120 SHA512 2f8a19e1e4bb65f32b480275f49099aed3ae9df543c7de862b3bbd93e81b89cd96dadac3d091e28673d09a6885db8c5656b3a77d0080775c110b04f2753de7a6 WHIRLPOOL 79cb7e620eb8e838192dc557c7a9ce7e713227d783cc8b63792825559b2145cad70d0af6f99948c1527557bc363feffd846c73893682b4a14fc7d08b9e20c649
+DIST patchbundle-selinux-base-policy-2.20141203-r9.tar.bz2 299602 SHA256 e8518004942a6c57170a609683e22b1410c93a2a195829c41dc8fbc703d941b5 SHA512 ce6484fbca1d2d074e50d1a3953392bd3ce0a4617df98fbac37747b469b4f160a9331586dfe1c3ddccb1ccbee24876a2f05ab49e37c8492a48baf83c2d01d140 WHIRLPOOL 1fd7b956e98e95a64c3a713a944d4531259bd156a7feabf6a89c4b5f33ac846377730eede97889e85183be086f282ebd18e860214f6ca3f01b40f2323470ee04
 DIST refpolicy-2.20140311.tar.bz2 664416 SHA256 f69437db95548c78a5dec44c236397146b144153149009ea554d2e536e5436f7 SHA512 50bacee82ed41ac8b8007ecc33bf51d22303cc2ddd27cfb72cb5520dab5f8e255186e34b89cec492c7a2d4220b200814bdede9b46c19f987a3d3d65a1c9b749a WHIRLPOOL e07480beba6ab1f02ad36b7d0c50c4a71cb39a8ec78bf8d1dc3c82bb9dd1d69d9169d7c937165ea15f60ce1147f256d46644f944107a3a8a800d5bad70d4c255
 DIST refpolicy-2.20141203.tar.bz2 680243 SHA256 f438209c430d8a2d4ddcbe4bdd3edb46f6af7dc4913637af0b73c635e40c1522 SHA512 682e4280c5799e4c12ec7594afc1389f67be35055748d2e0dbdc3419159a16c96d4946ca6178daee8370515951f8653b2e452efe8c962b8d7f9bc192f0b15a0c WHIRLPOOL 74bca232534e7af9051bb1ab9f77c1ff6c425781cf4561f781d6e9a40cc5ca0d9add540249ea5493e8782a9372aea296ead6c165c6c440ae1509eb319d151ee5
diff --git a/sec-policy/selinux-dictd/selinux-dictd-2.20141203-r8.ebuild b/sec-policy/selinux-dictd/selinux-dictd-2.20141203-r8.ebuild
index 362cb532cc95..0c824a17e78b 100644
--- a/sec-policy/selinux-dictd/selinux-dictd-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-dictd/selinux-dictd-2.20141203-r8.ebuild
@@ -13,5 +13,5 @@ DESCRIPTION="SELinux policy for dictd"
 if [[ $PV == 9999* ]] ; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-dictd/selinux-dictd-2.20141203-r9.ebuild b/sec-policy/selinux-dictd/selinux-dictd-2.20141203-r9.ebuild
new file mode 100644
index 000000000000..362cb532cc95
--- /dev/null
+++ b/sec-policy/selinux-dictd/selinux-dictd-2.20141203-r9.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI="5"
+
+IUSE=""
+MODS="dictd"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for dictd"
+
+if [[ $PV == 9999* ]] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
diff --git a/sec-policy/selinux-dirsrv/Manifest b/sec-policy/selinux-dirsrv/Manifest
index 8327a635be01..91d204b0021a 100644
--- a/sec-policy/selinux-dirsrv/Manifest
+++ b/sec-policy/selinux-dirsrv/Manifest
@@ -9,5 +9,6 @@ DIST patchbundle-selinux-base-policy-2.20141203-r5.tar.bz2 274136 SHA256 c23d17c
 DIST patchbundle-selinux-base-policy-2.20141203-r6.tar.bz2 293231 SHA256 b686dcc517b97834f66d967afdcc724cb43b5c6dbf9f34043a91cdeda2625cc7 SHA512 a2c486cbe4a1d21ff3fd01bef25ecf5a633a4072646c67cfccf3f7187d95f3d9e3b482a46ba17c55c40a8e7c0dee56e9cf9ddc9f414d3e4511443b62f60d03e9 WHIRLPOOL 3d708e287e3f9b873be647b0327eab6675a8702ee1cffb56e36934cada306e5ccc64397a083dad9e59de37a067e628cacbf896ae99012d5a209e42fd7cd8a4c6
 DIST patchbundle-selinux-base-policy-2.20141203-r7.tar.bz2 295833 SHA256 ba2219b3efc747be65f94c4d8ac3cd6ee530c82c848fa41935a114184678622a SHA512 8e32d9dbfb2f0f3f50200543aadb51ed9834ccd5cdf30bf8e4d9e6d0b645ce44ffaf80f7aa9385e9c9095d9a383b3a348a92356cb5386c06544ab082a9a468c7 WHIRLPOOL 1648ee1be71e45fcf5a264816ce7edc7bab19bd28a68703923eb2d6068f1f0469ae593855231d31f88baecbf29e7cece2d6beeed20b7c04231a6c90e90d35910
 DIST patchbundle-selinux-base-policy-2.20141203-r8.tar.bz2 297919 SHA256 77539eb3d78105f8789cd8205d2698bd27e2abf100163bdd162cda860fd15120 SHA512 2f8a19e1e4bb65f32b480275f49099aed3ae9df543c7de862b3bbd93e81b89cd96dadac3d091e28673d09a6885db8c5656b3a77d0080775c110b04f2753de7a6 WHIRLPOOL 79cb7e620eb8e838192dc557c7a9ce7e713227d783cc8b63792825559b2145cad70d0af6f99948c1527557bc363feffd846c73893682b4a14fc7d08b9e20c649
+DIST patchbundle-selinux-base-policy-2.20141203-r9.tar.bz2 299602 SHA256 e8518004942a6c57170a609683e22b1410c93a2a195829c41dc8fbc703d941b5 SHA512 ce6484fbca1d2d074e50d1a3953392bd3ce0a4617df98fbac37747b469b4f160a9331586dfe1c3ddccb1ccbee24876a2f05ab49e37c8492a48baf83c2d01d140 WHIRLPOOL 1fd7b956e98e95a64c3a713a944d4531259bd156a7feabf6a89c4b5f33ac846377730eede97889e85183be086f282ebd18e860214f6ca3f01b40f2323470ee04
 DIST refpolicy-2.20140311.tar.bz2 664416 SHA256 f69437db95548c78a5dec44c236397146b144153149009ea554d2e536e5436f7 SHA512 50bacee82ed41ac8b8007ecc33bf51d22303cc2ddd27cfb72cb5520dab5f8e255186e34b89cec492c7a2d4220b200814bdede9b46c19f987a3d3d65a1c9b749a WHIRLPOOL e07480beba6ab1f02ad36b7d0c50c4a71cb39a8ec78bf8d1dc3c82bb9dd1d69d9169d7c937165ea15f60ce1147f256d46644f944107a3a8a800d5bad70d4c255
 DIST refpolicy-2.20141203.tar.bz2 680243 SHA256 f438209c430d8a2d4ddcbe4bdd3edb46f6af7dc4913637af0b73c635e40c1522 SHA512 682e4280c5799e4c12ec7594afc1389f67be35055748d2e0dbdc3419159a16c96d4946ca6178daee8370515951f8653b2e452efe8c962b8d7f9bc192f0b15a0c WHIRLPOOL 74bca232534e7af9051bb1ab9f77c1ff6c425781cf4561f781d6e9a40cc5ca0d9add540249ea5493e8782a9372aea296ead6c165c6c440ae1509eb319d151ee5
diff --git a/sec-policy/selinux-dirsrv/selinux-dirsrv-2.20141203-r8.ebuild b/sec-policy/selinux-dirsrv/selinux-dirsrv-2.20141203-r8.ebuild
index 680addf16668..9144b3aab17d 100644
--- a/sec-policy/selinux-dirsrv/selinux-dirsrv-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-dirsrv/selinux-dirsrv-2.20141203-r8.ebuild
@@ -13,5 +13,5 @@ DESCRIPTION="SELinux policy for dirsrv"
 if [[ $PV == 9999* ]] ; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-dirsrv/selinux-dirsrv-2.20141203-r9.ebuild b/sec-policy/selinux-dirsrv/selinux-dirsrv-2.20141203-r9.ebuild
new file mode 100644
index 000000000000..680addf16668
--- /dev/null
+++ b/sec-policy/selinux-dirsrv/selinux-dirsrv-2.20141203-r9.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI="5"
+
+IUSE=""
+MODS="dirsrv"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for dirsrv"
+
+if [[ $PV == 9999* ]] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
diff --git a/sec-policy/selinux-distcc/Manifest b/sec-policy/selinux-distcc/Manifest
index 8327a635be01..91d204b0021a 100644
--- a/sec-policy/selinux-distcc/Manifest
+++ b/sec-policy/selinux-distcc/Manifest
@@ -9,5 +9,6 @@ DIST patchbundle-selinux-base-policy-2.20141203-r5.tar.bz2 274136 SHA256 c23d17c
 DIST patchbundle-selinux-base-policy-2.20141203-r6.tar.bz2 293231 SHA256 b686dcc517b97834f66d967afdcc724cb43b5c6dbf9f34043a91cdeda2625cc7 SHA512 a2c486cbe4a1d21ff3fd01bef25ecf5a633a4072646c67cfccf3f7187d95f3d9e3b482a46ba17c55c40a8e7c0dee56e9cf9ddc9f414d3e4511443b62f60d03e9 WHIRLPOOL 3d708e287e3f9b873be647b0327eab6675a8702ee1cffb56e36934cada306e5ccc64397a083dad9e59de37a067e628cacbf896ae99012d5a209e42fd7cd8a4c6
 DIST patchbundle-selinux-base-policy-2.20141203-r7.tar.bz2 295833 SHA256 ba2219b3efc747be65f94c4d8ac3cd6ee530c82c848fa41935a114184678622a SHA512 8e32d9dbfb2f0f3f50200543aadb51ed9834ccd5cdf30bf8e4d9e6d0b645ce44ffaf80f7aa9385e9c9095d9a383b3a348a92356cb5386c06544ab082a9a468c7 WHIRLPOOL 1648ee1be71e45fcf5a264816ce7edc7bab19bd28a68703923eb2d6068f1f0469ae593855231d31f88baecbf29e7cece2d6beeed20b7c04231a6c90e90d35910
 DIST patchbundle-selinux-base-policy-2.20141203-r8.tar.bz2 297919 SHA256 77539eb3d78105f8789cd8205d2698bd27e2abf100163bdd162cda860fd15120 SHA512 2f8a19e1e4bb65f32b480275f49099aed3ae9df543c7de862b3bbd93e81b89cd96dadac3d091e28673d09a6885db8c5656b3a77d0080775c110b04f2753de7a6 WHIRLPOOL 79cb7e620eb8e838192dc557c7a9ce7e713227d783cc8b63792825559b2145cad70d0af6f99948c1527557bc363feffd846c73893682b4a14fc7d08b9e20c649
+DIST patchbundle-selinux-base-policy-2.20141203-r9.tar.bz2 299602 SHA256 e8518004942a6c57170a609683e22b1410c93a2a195829c41dc8fbc703d941b5 SHA512 ce6484fbca1d2d074e50d1a3953392bd3ce0a4617df98fbac37747b469b4f160a9331586dfe1c3ddccb1ccbee24876a2f05ab49e37c8492a48baf83c2d01d140 WHIRLPOOL 1fd7b956e98e95a64c3a713a944d4531259bd156a7feabf6a89c4b5f33ac846377730eede97889e85183be086f282ebd18e860214f6ca3f01b40f2323470ee04
 DIST refpolicy-2.20140311.tar.bz2 664416 SHA256 f69437db95548c78a5dec44c236397146b144153149009ea554d2e536e5436f7 SHA512 50bacee82ed41ac8b8007ecc33bf51d22303cc2ddd27cfb72cb5520dab5f8e255186e34b89cec492c7a2d4220b200814bdede9b46c19f987a3d3d65a1c9b749a WHIRLPOOL e07480beba6ab1f02ad36b7d0c50c4a71cb39a8ec78bf8d1dc3c82bb9dd1d69d9169d7c937165ea15f60ce1147f256d46644f944107a3a8a800d5bad70d4c255
 DIST refpolicy-2.20141203.tar.bz2 680243 SHA256 f438209c430d8a2d4ddcbe4bdd3edb46f6af7dc4913637af0b73c635e40c1522 SHA512 682e4280c5799e4c12ec7594afc1389f67be35055748d2e0dbdc3419159a16c96d4946ca6178daee8370515951f8653b2e452efe8c962b8d7f9bc192f0b15a0c WHIRLPOOL 74bca232534e7af9051bb1ab9f77c1ff6c425781cf4561f781d6e9a40cc5ca0d9add540249ea5493e8782a9372aea296ead6c165c6c440ae1509eb319d151ee5
diff --git a/sec-policy/selinux-distcc/selinux-distcc-2.20141203-r8.ebuild b/sec-policy/selinux-distcc/selinux-distcc-2.20141203-r8.ebuild
index bb427c7a1900..20ed50cb4074 100644
--- a/sec-policy/selinux-distcc/selinux-distcc-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-distcc/selinux-distcc-2.20141203-r8.ebuild
@@ -13,5 +13,5 @@ DESCRIPTION="SELinux policy for distcc"
 if [[ $PV == 9999* ]] ; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-distcc/selinux-distcc-2.20141203-r9.ebuild b/sec-policy/selinux-distcc/selinux-distcc-2.20141203-r9.ebuild
new file mode 100644
index 000000000000..bb427c7a1900
--- /dev/null
+++ b/sec-policy/selinux-distcc/selinux-distcc-2.20141203-r9.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI="5"
+
+IUSE=""
+MODS="distcc"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for distcc"
+
+if [[ $PV == 9999* ]] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
diff --git a/sec-policy/selinux-djbdns/Manifest b/sec-policy/selinux-djbdns/Manifest
index 8327a635be01..91d204b0021a 100644
--- a/sec-policy/selinux-djbdns/Manifest
+++ b/sec-policy/selinux-djbdns/Manifest
@@ -9,5 +9,6 @@ DIST patchbundle-selinux-base-policy-2.20141203-r5.tar.bz2 274136 SHA256 c23d17c
 DIST patchbundle-selinux-base-policy-2.20141203-r6.tar.bz2 293231 SHA256 b686dcc517b97834f66d967afdcc724cb43b5c6dbf9f34043a91cdeda2625cc7 SHA512 a2c486cbe4a1d21ff3fd01bef25ecf5a633a4072646c67cfccf3f7187d95f3d9e3b482a46ba17c55c40a8e7c0dee56e9cf9ddc9f414d3e4511443b62f60d03e9 WHIRLPOOL 3d708e287e3f9b873be647b0327eab6675a8702ee1cffb56e36934cada306e5ccc64397a083dad9e59de37a067e628cacbf896ae99012d5a209e42fd7cd8a4c6
 DIST patchbundle-selinux-base-policy-2.20141203-r7.tar.bz2 295833 SHA256 ba2219b3efc747be65f94c4d8ac3cd6ee530c82c848fa41935a114184678622a SHA512 8e32d9dbfb2f0f3f50200543aadb51ed9834ccd5cdf30bf8e4d9e6d0b645ce44ffaf80f7aa9385e9c9095d9a383b3a348a92356cb5386c06544ab082a9a468c7 WHIRLPOOL 1648ee1be71e45fcf5a264816ce7edc7bab19bd28a68703923eb2d6068f1f0469ae593855231d31f88baecbf29e7cece2d6beeed20b7c04231a6c90e90d35910
 DIST patchbundle-selinux-base-policy-2.20141203-r8.tar.bz2 297919 SHA256 77539eb3d78105f8789cd8205d2698bd27e2abf100163bdd162cda860fd15120 SHA512 2f8a19e1e4bb65f32b480275f49099aed3ae9df543c7de862b3bbd93e81b89cd96dadac3d091e28673d09a6885db8c5656b3a77d0080775c110b04f2753de7a6 WHIRLPOOL 79cb7e620eb8e838192dc557c7a9ce7e713227d783cc8b63792825559b2145cad70d0af6f99948c1527557bc363feffd846c73893682b4a14fc7d08b9e20c649
+DIST patchbundle-selinux-base-policy-2.20141203-r9.tar.bz2 299602 SHA256 e8518004942a6c57170a609683e22b1410c93a2a195829c41dc8fbc703d941b5 SHA512 ce6484fbca1d2d074e50d1a3953392bd3ce0a4617df98fbac37747b469b4f160a9331586dfe1c3ddccb1ccbee24876a2f05ab49e37c8492a48baf83c2d01d140 WHIRLPOOL 1fd7b956e98e95a64c3a713a944d4531259bd156a7feabf6a89c4b5f33ac846377730eede97889e85183be086f282ebd18e860214f6ca3f01b40f2323470ee04
 DIST refpolicy-2.20140311.tar.bz2 664416 SHA256 f69437db95548c78a5dec44c236397146b144153149009ea554d2e536e5436f7 SHA512 50bacee82ed41ac8b8007ecc33bf51d22303cc2ddd27cfb72cb5520dab5f8e255186e34b89cec492c7a2d4220b200814bdede9b46c19f987a3d3d65a1c9b749a WHIRLPOOL e07480beba6ab1f02ad36b7d0c50c4a71cb39a8ec78bf8d1dc3c82bb9dd1d69d9169d7c937165ea15f60ce1147f256d46644f944107a3a8a800d5bad70d4c255
 DIST refpolicy-2.20141203.tar.bz2 680243 SHA256 f438209c430d8a2d4ddcbe4bdd3edb46f6af7dc4913637af0b73c635e40c1522 SHA512 682e4280c5799e4c12ec7594afc1389f67be35055748d2e0dbdc3419159a16c96d4946ca6178daee8370515951f8653b2e452efe8c962b8d7f9bc192f0b15a0c WHIRLPOOL 74bca232534e7af9051bb1ab9f77c1ff6c425781cf4561f781d6e9a40cc5ca0d9add540249ea5493e8782a9372aea296ead6c165c6c440ae1509eb319d151ee5
diff --git a/sec-policy/selinux-djbdns/selinux-djbdns-2.20141203-r8.ebuild b/sec-policy/selinux-djbdns/selinux-djbdns-2.20141203-r8.ebuild
index 5b70fa29059c..419dcfd2ff2a 100644
--- a/sec-policy/selinux-djbdns/selinux-djbdns-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-djbdns/selinux-djbdns-2.20141203-r8.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="SELinux policy for djbdns"
 if [[ $PV == 9999* ]] ; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-daemontools
diff --git a/sec-policy/selinux-djbdns/selinux-djbdns-2.20141203-r9.ebuild b/sec-policy/selinux-djbdns/selinux-djbdns-2.20141203-r9.ebuild
new file mode 100644
index 000000000000..5b70fa29059c
--- /dev/null
+++ b/sec-policy/selinux-djbdns/selinux-djbdns-2.20141203-r9.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI="5"
+
+IUSE=""
+MODS="djbdns"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for djbdns"
+
+if [[ $PV == 9999* ]] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
+DEPEND="${DEPEND}
+	sec-policy/selinux-daemontools
+	sec-policy/selinux-ucspitcp
+"
+RDEPEND="${RDEPEND}
+	sec-policy/selinux-daemontools
+	sec-policy/selinux-ucspitcp
+"
diff --git a/sec-policy/selinux-dkim/Manifest b/sec-policy/selinux-dkim/Manifest
index 8327a635be01..91d204b0021a 100644
--- a/sec-policy/selinux-dkim/Manifest
+++ b/sec-policy/selinux-dkim/Manifest
@@ -9,5 +9,6 @@ DIST patchbundle-selinux-base-policy-2.20141203-r5.tar.bz2 274136 SHA256 c23d17c
 DIST patchbundle-selinux-base-policy-2.20141203-r6.tar.bz2 293231 SHA256 b686dcc517b97834f66d967afdcc724cb43b5c6dbf9f34043a91cdeda2625cc7 SHA512 a2c486cbe4a1d21ff3fd01bef25ecf5a633a4072646c67cfccf3f7187d95f3d9e3b482a46ba17c55c40a8e7c0dee56e9cf9ddc9f414d3e4511443b62f60d03e9 WHIRLPOOL 3d708e287e3f9b873be647b0327eab6675a8702ee1cffb56e36934cada306e5ccc64397a083dad9e59de37a067e628cacbf896ae99012d5a209e42fd7cd8a4c6
 DIST patchbundle-selinux-base-policy-2.20141203-r7.tar.bz2 295833 SHA256 ba2219b3efc747be65f94c4d8ac3cd6ee530c82c848fa41935a114184678622a SHA512 8e32d9dbfb2f0f3f50200543aadb51ed9834ccd5cdf30bf8e4d9e6d0b645ce44ffaf80f7aa9385e9c9095d9a383b3a348a92356cb5386c06544ab082a9a468c7 WHIRLPOOL 1648ee1be71e45fcf5a264816ce7edc7bab19bd28a68703923eb2d6068f1f0469ae593855231d31f88baecbf29e7cece2d6beeed20b7c04231a6c90e90d35910
 DIST patchbundle-selinux-base-policy-2.20141203-r8.tar.bz2 297919 SHA256 77539eb3d78105f8789cd8205d2698bd27e2abf100163bdd162cda860fd15120 SHA512 2f8a19e1e4bb65f32b480275f49099aed3ae9df543c7de862b3bbd93e81b89cd96dadac3d091e28673d09a6885db8c5656b3a77d0080775c110b04f2753de7a6 WHIRLPOOL 79cb7e620eb8e838192dc557c7a9ce7e713227d783cc8b63792825559b2145cad70d0af6f99948c1527557bc363feffd846c73893682b4a14fc7d08b9e20c649
+DIST patchbundle-selinux-base-policy-2.20141203-r9.tar.bz2 299602 SHA256 e8518004942a6c57170a609683e22b1410c93a2a195829c41dc8fbc703d941b5 SHA512 ce6484fbca1d2d074e50d1a3953392bd3ce0a4617df98fbac37747b469b4f160a9331586dfe1c3ddccb1ccbee24876a2f05ab49e37c8492a48baf83c2d01d140 WHIRLPOOL 1fd7b956e98e95a64c3a713a944d4531259bd156a7feabf6a89c4b5f33ac846377730eede97889e85183be086f282ebd18e860214f6ca3f01b40f2323470ee04
 DIST refpolicy-2.20140311.tar.bz2 664416 SHA256 f69437db95548c78a5dec44c236397146b144153149009ea554d2e536e5436f7 SHA512 50bacee82ed41ac8b8007ecc33bf51d22303cc2ddd27cfb72cb5520dab5f8e255186e34b89cec492c7a2d4220b200814bdede9b46c19f987a3d3d65a1c9b749a WHIRLPOOL e07480beba6ab1f02ad36b7d0c50c4a71cb39a8ec78bf8d1dc3c82bb9dd1d69d9169d7c937165ea15f60ce1147f256d46644f944107a3a8a800d5bad70d4c255
 DIST refpolicy-2.20141203.tar.bz2 680243 SHA256 f438209c430d8a2d4ddcbe4bdd3edb46f6af7dc4913637af0b73c635e40c1522 SHA512 682e4280c5799e4c12ec7594afc1389f67be35055748d2e0dbdc3419159a16c96d4946ca6178daee8370515951f8653b2e452efe8c962b8d7f9bc192f0b15a0c WHIRLPOOL 74bca232534e7af9051bb1ab9f77c1ff6c425781cf4561f781d6e9a40cc5ca0d9add540249ea5493e8782a9372aea296ead6c165c6c440ae1509eb319d151ee5
diff --git a/sec-policy/selinux-dkim/selinux-dkim-2.20141203-r8.ebuild b/sec-policy/selinux-dkim/selinux-dkim-2.20141203-r8.ebuild
index 7d6a35c36c26..27b839b52b57 100644
--- a/sec-policy/selinux-dkim/selinux-dkim-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-dkim/selinux-dkim-2.20141203-r8.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="SELinux policy for dkim"
 if [[ $PV == 9999* ]] ; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-dkim/selinux-dkim-2.20141203-r9.ebuild b/sec-policy/selinux-dkim/selinux-dkim-2.20141203-r9.ebuild
new file mode 100644
index 000000000000..7d6a35c36c26
--- /dev/null
+++ b/sec-policy/selinux-dkim/selinux-dkim-2.20141203-r9.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI="5"
+
+IUSE=""
+MODS="dkim"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for dkim"
+
+if [[ $PV == 9999* ]] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DEPEND="${DEPEND}
+	sec-policy/selinux-milter
+"
+RDEPEND="${RDEPEND}
+	sec-policy/selinux-milter
+"
diff --git a/sec-policy/selinux-dmidecode/Manifest b/sec-policy/selinux-dmidecode/Manifest
index 8327a635be01..91d204b0021a 100644
--- a/sec-policy/selinux-dmidecode/Manifest
+++ b/sec-policy/selinux-dmidecode/Manifest
@@ -9,5 +9,6 @@ DIST patchbundle-selinux-base-policy-2.20141203-r5.tar.bz2 274136 SHA256 c23d17c
 DIST patchbundle-selinux-base-policy-2.20141203-r6.tar.bz2 293231 SHA256 b686dcc517b97834f66d967afdcc724cb43b5c6dbf9f34043a91cdeda2625cc7 SHA512 a2c486cbe4a1d21ff3fd01bef25ecf5a633a4072646c67cfccf3f7187d95f3d9e3b482a46ba17c55c40a8e7c0dee56e9cf9ddc9f414d3e4511443b62f60d03e9 WHIRLPOOL 3d708e287e3f9b873be647b0327eab6675a8702ee1cffb56e36934cada306e5ccc64397a083dad9e59de37a067e628cacbf896ae99012d5a209e42fd7cd8a4c6
 DIST patchbundle-selinux-base-policy-2.20141203-r7.tar.bz2 295833 SHA256 ba2219b3efc747be65f94c4d8ac3cd6ee530c82c848fa41935a114184678622a SHA512 8e32d9dbfb2f0f3f50200543aadb51ed9834ccd5cdf30bf8e4d9e6d0b645ce44ffaf80f7aa9385e9c9095d9a383b3a348a92356cb5386c06544ab082a9a468c7 WHIRLPOOL 1648ee1be71e45fcf5a264816ce7edc7bab19bd28a68703923eb2d6068f1f0469ae593855231d31f88baecbf29e7cece2d6beeed20b7c04231a6c90e90d35910
 DIST patchbundle-selinux-base-policy-2.20141203-r8.tar.bz2 297919 SHA256 77539eb3d78105f8789cd8205d2698bd27e2abf100163bdd162cda860fd15120 SHA512 2f8a19e1e4bb65f32b480275f49099aed3ae9df543c7de862b3bbd93e81b89cd96dadac3d091e28673d09a6885db8c5656b3a77d0080775c110b04f2753de7a6 WHIRLPOOL 79cb7e620eb8e838192dc557c7a9ce7e713227d783cc8b63792825559b2145cad70d0af6f99948c1527557bc363feffd846c73893682b4a14fc7d08b9e20c649
+DIST patchbundle-selinux-base-policy-2.20141203-r9.tar.bz2 299602 SHA256 e8518004942a6c57170a609683e22b1410c93a2a195829c41dc8fbc703d941b5 SHA512 ce6484fbca1d2d074e50d1a3953392bd3ce0a4617df98fbac37747b469b4f160a9331586dfe1c3ddccb1ccbee24876a2f05ab49e37c8492a48baf83c2d01d140 WHIRLPOOL 1fd7b956e98e95a64c3a713a944d4531259bd156a7feabf6a89c4b5f33ac846377730eede97889e85183be086f282ebd18e860214f6ca3f01b40f2323470ee04
 DIST refpolicy-2.20140311.tar.bz2 664416 SHA256 f69437db95548c78a5dec44c236397146b144153149009ea554d2e536e5436f7 SHA512 50bacee82ed41ac8b8007ecc33bf51d22303cc2ddd27cfb72cb5520dab5f8e255186e34b89cec492c7a2d4220b200814bdede9b46c19f987a3d3d65a1c9b749a WHIRLPOOL e07480beba6ab1f02ad36b7d0c50c4a71cb39a8ec78bf8d1dc3c82bb9dd1d69d9169d7c937165ea15f60ce1147f256d46644f944107a3a8a800d5bad70d4c255
 DIST refpolicy-2.20141203.tar.bz2 680243 SHA256 f438209c430d8a2d4ddcbe4bdd3edb46f6af7dc4913637af0b73c635e40c1522 SHA512 682e4280c5799e4c12ec7594afc1389f67be35055748d2e0dbdc3419159a16c96d4946ca6178daee8370515951f8653b2e452efe8c962b8d7f9bc192f0b15a0c WHIRLPOOL 74bca232534e7af9051bb1ab9f77c1ff6c425781cf4561f781d6e9a40cc5ca0d9add540249ea5493e8782a9372aea296ead6c165c6c440ae1509eb319d151ee5
diff --git a/sec-policy/selinux-dmidecode/selinux-dmidecode-2.20141203-r8.ebuild b/sec-policy/selinux-dmidecode/selinux-dmidecode-2.20141203-r8.ebuild
index 0b73c518fbde..6750201e9200 100644
--- a/sec-policy/selinux-dmidecode/selinux-dmidecode-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-dmidecode/selinux-dmidecode-2.20141203-r8.ebuild
@@ -13,5 +13,5 @@ DESCRIPTION="SELinux policy for dmidecode"
 if [[ $PV == 9999* ]] ; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-dmidecode/selinux-dmidecode-2.20141203-r9.ebuild b/sec-policy/selinux-dmidecode/selinux-dmidecode-2.20141203-r9.ebuild
new file mode 100644
index 000000000000..0b73c518fbde
--- /dev/null
+++ b/sec-policy/selinux-dmidecode/selinux-dmidecode-2.20141203-r9.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI="5"
+
+IUSE=""
+MODS="dmidecode"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for dmidecode"
+
+if [[ $PV == 9999* ]] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
diff --git a/sec-policy/selinux-dnsmasq/Manifest b/sec-policy/selinux-dnsmasq/Manifest
index 8327a635be01..91d204b0021a 100644
--- a/sec-policy/selinux-dnsmasq/Manifest
+++ b/sec-policy/selinux-dnsmasq/Manifest
@@ -9,5 +9,6 @@ DIST patchbundle-selinux-base-policy-2.20141203-r5.tar.bz2 274136 SHA256 c23d17c
 DIST patchbundle-selinux-base-policy-2.20141203-r6.tar.bz2 293231 SHA256 b686dcc517b97834f66d967afdcc724cb43b5c6dbf9f34043a91cdeda2625cc7 SHA512 a2c486cbe4a1d21ff3fd01bef25ecf5a633a4072646c67cfccf3f7187d95f3d9e3b482a46ba17c55c40a8e7c0dee56e9cf9ddc9f414d3e4511443b62f60d03e9 WHIRLPOOL 3d708e287e3f9b873be647b0327eab6675a8702ee1cffb56e36934cada306e5ccc64397a083dad9e59de37a067e628cacbf896ae99012d5a209e42fd7cd8a4c6
 DIST patchbundle-selinux-base-policy-2.20141203-r7.tar.bz2 295833 SHA256 ba2219b3efc747be65f94c4d8ac3cd6ee530c82c848fa41935a114184678622a SHA512 8e32d9dbfb2f0f3f50200543aadb51ed9834ccd5cdf30bf8e4d9e6d0b645ce44ffaf80f7aa9385e9c9095d9a383b3a348a92356cb5386c06544ab082a9a468c7 WHIRLPOOL 1648ee1be71e45fcf5a264816ce7edc7bab19bd28a68703923eb2d6068f1f0469ae593855231d31f88baecbf29e7cece2d6beeed20b7c04231a6c90e90d35910
 DIST patchbundle-selinux-base-policy-2.20141203-r8.tar.bz2 297919 SHA256 77539eb3d78105f8789cd8205d2698bd27e2abf100163bdd162cda860fd15120 SHA512 2f8a19e1e4bb65f32b480275f49099aed3ae9df543c7de862b3bbd93e81b89cd96dadac3d091e28673d09a6885db8c5656b3a77d0080775c110b04f2753de7a6 WHIRLPOOL 79cb7e620eb8e838192dc557c7a9ce7e713227d783cc8b63792825559b2145cad70d0af6f99948c1527557bc363feffd846c73893682b4a14fc7d08b9e20c649
+DIST patchbundle-selinux-base-policy-2.20141203-r9.tar.bz2 299602 SHA256 e8518004942a6c57170a609683e22b1410c93a2a195829c41dc8fbc703d941b5 SHA512 ce6484fbca1d2d074e50d1a3953392bd3ce0a4617df98fbac37747b469b4f160a9331586dfe1c3ddccb1ccbee24876a2f05ab49e37c8492a48baf83c2d01d140 WHIRLPOOL 1fd7b956e98e95a64c3a713a944d4531259bd156a7feabf6a89c4b5f33ac846377730eede97889e85183be086f282ebd18e860214f6ca3f01b40f2323470ee04
 DIST refpolicy-2.20140311.tar.bz2 664416 SHA256 f69437db95548c78a5dec44c236397146b144153149009ea554d2e536e5436f7 SHA512 50bacee82ed41ac8b8007ecc33bf51d22303cc2ddd27cfb72cb5520dab5f8e255186e34b89cec492c7a2d4220b200814bdede9b46c19f987a3d3d65a1c9b749a WHIRLPOOL e07480beba6ab1f02ad36b7d0c50c4a71cb39a8ec78bf8d1dc3c82bb9dd1d69d9169d7c937165ea15f60ce1147f256d46644f944107a3a8a800d5bad70d4c255
 DIST refpolicy-2.20141203.tar.bz2 680243 SHA256 f438209c430d8a2d4ddcbe4bdd3edb46f6af7dc4913637af0b73c635e40c1522 SHA512 682e4280c5799e4c12ec7594afc1389f67be35055748d2e0dbdc3419159a16c96d4946ca6178daee8370515951f8653b2e452efe8c962b8d7f9bc192f0b15a0c WHIRLPOOL 74bca232534e7af9051bb1ab9f77c1ff6c425781cf4561f781d6e9a40cc5ca0d9add540249ea5493e8782a9372aea296ead6c165c6c440ae1509eb319d151ee5
diff --git a/sec-policy/selinux-dnsmasq/selinux-dnsmasq-2.20141203-r8.ebuild b/sec-policy/selinux-dnsmasq/selinux-dnsmasq-2.20141203-r8.ebuild
index 30a9424f9f2f..df33341961e2 100644
--- a/sec-policy/selinux-dnsmasq/selinux-dnsmasq-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-dnsmasq/selinux-dnsmasq-2.20141203-r8.ebuild
@@ -13,5 +13,5 @@ DESCRIPTION="SELinux policy for dnsmasq"
 if [[ $PV == 9999* ]] ; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-dnsmasq/selinux-dnsmasq-2.20141203-r9.ebuild b/sec-policy/selinux-dnsmasq/selinux-dnsmasq-2.20141203-r9.ebuild
new file mode 100644
index 000000000000..30a9424f9f2f
--- /dev/null
+++ b/sec-policy/selinux-dnsmasq/selinux-dnsmasq-2.20141203-r9.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI="5"
+
+IUSE=""
+MODS="dnsmasq"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for dnsmasq"
+
+if [[ $PV == 9999* ]] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
diff --git a/sec-policy/selinux-dovecot/Manifest b/sec-policy/selinux-dovecot/Manifest
index 8327a635be01..91d204b0021a 100644
--- a/sec-policy/selinux-dovecot/Manifest
+++ b/sec-policy/selinux-dovecot/Manifest
@@ -9,5 +9,6 @@ DIST patchbundle-selinux-base-policy-2.20141203-r5.tar.bz2 274136 SHA256 c23d17c
 DIST patchbundle-selinux-base-policy-2.20141203-r6.tar.bz2 293231 SHA256 b686dcc517b97834f66d967afdcc724cb43b5c6dbf9f34043a91cdeda2625cc7 SHA512 a2c486cbe4a1d21ff3fd01bef25ecf5a633a4072646c67cfccf3f7187d95f3d9e3b482a46ba17c55c40a8e7c0dee56e9cf9ddc9f414d3e4511443b62f60d03e9 WHIRLPOOL 3d708e287e3f9b873be647b0327eab6675a8702ee1cffb56e36934cada306e5ccc64397a083dad9e59de37a067e628cacbf896ae99012d5a209e42fd7cd8a4c6
 DIST patchbundle-selinux-base-policy-2.20141203-r7.tar.bz2 295833 SHA256 ba2219b3efc747be65f94c4d8ac3cd6ee530c82c848fa41935a114184678622a SHA512 8e32d9dbfb2f0f3f50200543aadb51ed9834ccd5cdf30bf8e4d9e6d0b645ce44ffaf80f7aa9385e9c9095d9a383b3a348a92356cb5386c06544ab082a9a468c7 WHIRLPOOL 1648ee1be71e45fcf5a264816ce7edc7bab19bd28a68703923eb2d6068f1f0469ae593855231d31f88baecbf29e7cece2d6beeed20b7c04231a6c90e90d35910
 DIST patchbundle-selinux-base-policy-2.20141203-r8.tar.bz2 297919 SHA256 77539eb3d78105f8789cd8205d2698bd27e2abf100163bdd162cda860fd15120 SHA512 2f8a19e1e4bb65f32b480275f49099aed3ae9df543c7de862b3bbd93e81b89cd96dadac3d091e28673d09a6885db8c5656b3a77d0080775c110b04f2753de7a6 WHIRLPOOL 79cb7e620eb8e838192dc557c7a9ce7e713227d783cc8b63792825559b2145cad70d0af6f99948c1527557bc363feffd846c73893682b4a14fc7d08b9e20c649
+DIST patchbundle-selinux-base-policy-2.20141203-r9.tar.bz2 299602 SHA256 e8518004942a6c57170a609683e22b1410c93a2a195829c41dc8fbc703d941b5 SHA512 ce6484fbca1d2d074e50d1a3953392bd3ce0a4617df98fbac37747b469b4f160a9331586dfe1c3ddccb1ccbee24876a2f05ab49e37c8492a48baf83c2d01d140 WHIRLPOOL 1fd7b956e98e95a64c3a713a944d4531259bd156a7feabf6a89c4b5f33ac846377730eede97889e85183be086f282ebd18e860214f6ca3f01b40f2323470ee04
 DIST refpolicy-2.20140311.tar.bz2 664416 SHA256 f69437db95548c78a5dec44c236397146b144153149009ea554d2e536e5436f7 SHA512 50bacee82ed41ac8b8007ecc33bf51d22303cc2ddd27cfb72cb5520dab5f8e255186e34b89cec492c7a2d4220b200814bdede9b46c19f987a3d3d65a1c9b749a WHIRLPOOL e07480beba6ab1f02ad36b7d0c50c4a71cb39a8ec78bf8d1dc3c82bb9dd1d69d9169d7c937165ea15f60ce1147f256d46644f944107a3a8a800d5bad70d4c255
 DIST refpolicy-2.20141203.tar.bz2 680243 SHA256 f438209c430d8a2d4ddcbe4bdd3edb46f6af7dc4913637af0b73c635e40c1522 SHA512 682e4280c5799e4c12ec7594afc1389f67be35055748d2e0dbdc3419159a16c96d4946ca6178daee8370515951f8653b2e452efe8c962b8d7f9bc192f0b15a0c WHIRLPOOL 74bca232534e7af9051bb1ab9f77c1ff6c425781cf4561f781d6e9a40cc5ca0d9add540249ea5493e8782a9372aea296ead6c165c6c440ae1509eb319d151ee5
diff --git a/sec-policy/selinux-dovecot/selinux-dovecot-2.20141203-r8.ebuild b/sec-policy/selinux-dovecot/selinux-dovecot-2.20141203-r8.ebuild
index eb2e8313aa7d..d75a271b0562 100644
--- a/sec-policy/selinux-dovecot/selinux-dovecot-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-dovecot/selinux-dovecot-2.20141203-r8.ebuild
@@ -13,5 +13,5 @@ DESCRIPTION="SELinux policy for dovecot"
 if [[ $PV == 9999* ]] ; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-dovecot/selinux-dovecot-2.20141203-r9.ebuild b/sec-policy/selinux-dovecot/selinux-dovecot-2.20141203-r9.ebuild
new file mode 100644
index 000000000000..eb2e8313aa7d
--- /dev/null
+++ b/sec-policy/selinux-dovecot/selinux-dovecot-2.20141203-r9.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI="5"
+
+IUSE=""
+MODS="dovecot"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for dovecot"
+
+if [[ $PV == 9999* ]] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
diff --git a/sec-policy/selinux-dpkg/Manifest b/sec-policy/selinux-dpkg/Manifest
index 8327a635be01..91d204b0021a 100644
--- a/sec-policy/selinux-dpkg/Manifest
+++ b/sec-policy/selinux-dpkg/Manifest
@@ -9,5 +9,6 @@ DIST patchbundle-selinux-base-policy-2.20141203-r5.tar.bz2 274136 SHA256 c23d17c
 DIST patchbundle-selinux-base-policy-2.20141203-r6.tar.bz2 293231 SHA256 b686dcc517b97834f66d967afdcc724cb43b5c6dbf9f34043a91cdeda2625cc7 SHA512 a2c486cbe4a1d21ff3fd01bef25ecf5a633a4072646c67cfccf3f7187d95f3d9e3b482a46ba17c55c40a8e7c0dee56e9cf9ddc9f414d3e4511443b62f60d03e9 WHIRLPOOL 3d708e287e3f9b873be647b0327eab6675a8702ee1cffb56e36934cada306e5ccc64397a083dad9e59de37a067e628cacbf896ae99012d5a209e42fd7cd8a4c6
 DIST patchbundle-selinux-base-policy-2.20141203-r7.tar.bz2 295833 SHA256 ba2219b3efc747be65f94c4d8ac3cd6ee530c82c848fa41935a114184678622a SHA512 8e32d9dbfb2f0f3f50200543aadb51ed9834ccd5cdf30bf8e4d9e6d0b645ce44ffaf80f7aa9385e9c9095d9a383b3a348a92356cb5386c06544ab082a9a468c7 WHIRLPOOL 1648ee1be71e45fcf5a264816ce7edc7bab19bd28a68703923eb2d6068f1f0469ae593855231d31f88baecbf29e7cece2d6beeed20b7c04231a6c90e90d35910
 DIST patchbundle-selinux-base-policy-2.20141203-r8.tar.bz2 297919 SHA256 77539eb3d78105f8789cd8205d2698bd27e2abf100163bdd162cda860fd15120 SHA512 2f8a19e1e4bb65f32b480275f49099aed3ae9df543c7de862b3bbd93e81b89cd96dadac3d091e28673d09a6885db8c5656b3a77d0080775c110b04f2753de7a6 WHIRLPOOL 79cb7e620eb8e838192dc557c7a9ce7e713227d783cc8b63792825559b2145cad70d0af6f99948c1527557bc363feffd846c73893682b4a14fc7d08b9e20c649
+DIST patchbundle-selinux-base-policy-2.20141203-r9.tar.bz2 299602 SHA256 e8518004942a6c57170a609683e22b1410c93a2a195829c41dc8fbc703d941b5 SHA512 ce6484fbca1d2d074e50d1a3953392bd3ce0a4617df98fbac37747b469b4f160a9331586dfe1c3ddccb1ccbee24876a2f05ab49e37c8492a48baf83c2d01d140 WHIRLPOOL 1fd7b956e98e95a64c3a713a944d4531259bd156a7feabf6a89c4b5f33ac846377730eede97889e85183be086f282ebd18e860214f6ca3f01b40f2323470ee04
 DIST refpolicy-2.20140311.tar.bz2 664416 SHA256 f69437db95548c78a5dec44c236397146b144153149009ea554d2e536e5436f7 SHA512 50bacee82ed41ac8b8007ecc33bf51d22303cc2ddd27cfb72cb5520dab5f8e255186e34b89cec492c7a2d4220b200814bdede9b46c19f987a3d3d65a1c9b749a WHIRLPOOL e07480beba6ab1f02ad36b7d0c50c4a71cb39a8ec78bf8d1dc3c82bb9dd1d69d9169d7c937165ea15f60ce1147f256d46644f944107a3a8a800d5bad70d4c255
 DIST refpolicy-2.20141203.tar.bz2 680243 SHA256 f438209c430d8a2d4ddcbe4bdd3edb46f6af7dc4913637af0b73c635e40c1522 SHA512 682e4280c5799e4c12ec7594afc1389f67be35055748d2e0dbdc3419159a16c96d4946ca6178daee8370515951f8653b2e452efe8c962b8d7f9bc192f0b15a0c WHIRLPOOL 74bca232534e7af9051bb1ab9f77c1ff6c425781cf4561f781d6e9a40cc5ca0d9add540249ea5493e8782a9372aea296ead6c165c6c440ae1509eb319d151ee5
diff --git a/sec-policy/selinux-dpkg/selinux-dpkg-2.20141203-r8.ebuild b/sec-policy/selinux-dpkg/selinux-dpkg-2.20141203-r8.ebuild
index fc62269b995b..6fa16c49af3c 100644
--- a/sec-policy/selinux-dpkg/selinux-dpkg-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-dpkg/selinux-dpkg-2.20141203-r8.ebuild
@@ -13,5 +13,5 @@ DESCRIPTION="SELinux policy for dpkg"
 if [[ $PV == 9999* ]] ; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-dpkg/selinux-dpkg-2.20141203-r9.ebuild b/sec-policy/selinux-dpkg/selinux-dpkg-2.20141203-r9.ebuild
new file mode 100644
index 000000000000..fc62269b995b
--- /dev/null
+++ b/sec-policy/selinux-dpkg/selinux-dpkg-2.20141203-r9.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI="5"
+
+IUSE=""
+MODS="dpkg"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for dpkg"
+
+if [[ $PV == 9999* ]] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
diff --git a/sec-policy/selinux-dracut/Manifest b/sec-policy/selinux-dracut/Manifest
index 8327a635be01..91d204b0021a 100644
--- a/sec-policy/selinux-dracut/Manifest
+++ b/sec-policy/selinux-dracut/Manifest
@@ -9,5 +9,6 @@ DIST patchbundle-selinux-base-policy-2.20141203-r5.tar.bz2 274136 SHA256 c23d17c
 DIST patchbundle-selinux-base-policy-2.20141203-r6.tar.bz2 293231 SHA256 b686dcc517b97834f66d967afdcc724cb43b5c6dbf9f34043a91cdeda2625cc7 SHA512 a2c486cbe4a1d21ff3fd01bef25ecf5a633a4072646c67cfccf3f7187d95f3d9e3b482a46ba17c55c40a8e7c0dee56e9cf9ddc9f414d3e4511443b62f60d03e9 WHIRLPOOL 3d708e287e3f9b873be647b0327eab6675a8702ee1cffb56e36934cada306e5ccc64397a083dad9e59de37a067e628cacbf896ae99012d5a209e42fd7cd8a4c6
 DIST patchbundle-selinux-base-policy-2.20141203-r7.tar.bz2 295833 SHA256 ba2219b3efc747be65f94c4d8ac3cd6ee530c82c848fa41935a114184678622a SHA512 8e32d9dbfb2f0f3f50200543aadb51ed9834ccd5cdf30bf8e4d9e6d0b645ce44ffaf80f7aa9385e9c9095d9a383b3a348a92356cb5386c06544ab082a9a468c7 WHIRLPOOL 1648ee1be71e45fcf5a264816ce7edc7bab19bd28a68703923eb2d6068f1f0469ae593855231d31f88baecbf29e7cece2d6beeed20b7c04231a6c90e90d35910
 DIST patchbundle-selinux-base-policy-2.20141203-r8.tar.bz2 297919 SHA256 77539eb3d78105f8789cd8205d2698bd27e2abf100163bdd162cda860fd15120 SHA512 2f8a19e1e4bb65f32b480275f49099aed3ae9df543c7de862b3bbd93e81b89cd96dadac3d091e28673d09a6885db8c5656b3a77d0080775c110b04f2753de7a6 WHIRLPOOL 79cb7e620eb8e838192dc557c7a9ce7e713227d783cc8b63792825559b2145cad70d0af6f99948c1527557bc363feffd846c73893682b4a14fc7d08b9e20c649
+DIST patchbundle-selinux-base-policy-2.20141203-r9.tar.bz2 299602 SHA256 e8518004942a6c57170a609683e22b1410c93a2a195829c41dc8fbc703d941b5 SHA512 ce6484fbca1d2d074e50d1a3953392bd3ce0a4617df98fbac37747b469b4f160a9331586dfe1c3ddccb1ccbee24876a2f05ab49e37c8492a48baf83c2d01d140 WHIRLPOOL 1fd7b956e98e95a64c3a713a944d4531259bd156a7feabf6a89c4b5f33ac846377730eede97889e85183be086f282ebd18e860214f6ca3f01b40f2323470ee04
 DIST refpolicy-2.20140311.tar.bz2 664416 SHA256 f69437db95548c78a5dec44c236397146b144153149009ea554d2e536e5436f7 SHA512 50bacee82ed41ac8b8007ecc33bf51d22303cc2ddd27cfb72cb5520dab5f8e255186e34b89cec492c7a2d4220b200814bdede9b46c19f987a3d3d65a1c9b749a WHIRLPOOL e07480beba6ab1f02ad36b7d0c50c4a71cb39a8ec78bf8d1dc3c82bb9dd1d69d9169d7c937165ea15f60ce1147f256d46644f944107a3a8a800d5bad70d4c255
 DIST refpolicy-2.20141203.tar.bz2 680243 SHA256 f438209c430d8a2d4ddcbe4bdd3edb46f6af7dc4913637af0b73c635e40c1522 SHA512 682e4280c5799e4c12ec7594afc1389f67be35055748d2e0dbdc3419159a16c96d4946ca6178daee8370515951f8653b2e452efe8c962b8d7f9bc192f0b15a0c WHIRLPOOL 74bca232534e7af9051bb1ab9f77c1ff6c425781cf4561f781d6e9a40cc5ca0d9add540249ea5493e8782a9372aea296ead6c165c6c440ae1509eb319d151ee5
diff --git a/sec-policy/selinux-dracut/selinux-dracut-2.20141203-r8.ebuild b/sec-policy/selinux-dracut/selinux-dracut-2.20141203-r8.ebuild
index 09d582f28fca..68772bfcf576 100644
--- a/sec-policy/selinux-dracut/selinux-dracut-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-dracut/selinux-dracut-2.20141203-r8.ebuild
@@ -13,5 +13,5 @@ DESCRIPTION="SELinux policy for dracut"
 if [[ $PV == 9999* ]] ; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-dracut/selinux-dracut-2.20141203-r9.ebuild b/sec-policy/selinux-dracut/selinux-dracut-2.20141203-r9.ebuild
new file mode 100644
index 000000000000..09d582f28fca
--- /dev/null
+++ b/sec-policy/selinux-dracut/selinux-dracut-2.20141203-r9.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI="5"
+
+IUSE=""
+MODS="dracut"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for dracut"
+
+if [[ $PV == 9999* ]] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
diff --git a/sec-policy/selinux-dropbox/Manifest b/sec-policy/selinux-dropbox/Manifest
index 8327a635be01..91d204b0021a 100644
--- a/sec-policy/selinux-dropbox/Manifest
+++ b/sec-policy/selinux-dropbox/Manifest
@@ -9,5 +9,6 @@ DIST patchbundle-selinux-base-policy-2.20141203-r5.tar.bz2 274136 SHA256 c23d17c
 DIST patchbundle-selinux-base-policy-2.20141203-r6.tar.bz2 293231 SHA256 b686dcc517b97834f66d967afdcc724cb43b5c6dbf9f34043a91cdeda2625cc7 SHA512 a2c486cbe4a1d21ff3fd01bef25ecf5a633a4072646c67cfccf3f7187d95f3d9e3b482a46ba17c55c40a8e7c0dee56e9cf9ddc9f414d3e4511443b62f60d03e9 WHIRLPOOL 3d708e287e3f9b873be647b0327eab6675a8702ee1cffb56e36934cada306e5ccc64397a083dad9e59de37a067e628cacbf896ae99012d5a209e42fd7cd8a4c6
 DIST patchbundle-selinux-base-policy-2.20141203-r7.tar.bz2 295833 SHA256 ba2219b3efc747be65f94c4d8ac3cd6ee530c82c848fa41935a114184678622a SHA512 8e32d9dbfb2f0f3f50200543aadb51ed9834ccd5cdf30bf8e4d9e6d0b645ce44ffaf80f7aa9385e9c9095d9a383b3a348a92356cb5386c06544ab082a9a468c7 WHIRLPOOL 1648ee1be71e45fcf5a264816ce7edc7bab19bd28a68703923eb2d6068f1f0469ae593855231d31f88baecbf29e7cece2d6beeed20b7c04231a6c90e90d35910
 DIST patchbundle-selinux-base-policy-2.20141203-r8.tar.bz2 297919 SHA256 77539eb3d78105f8789cd8205d2698bd27e2abf100163bdd162cda860fd15120 SHA512 2f8a19e1e4bb65f32b480275f49099aed3ae9df543c7de862b3bbd93e81b89cd96dadac3d091e28673d09a6885db8c5656b3a77d0080775c110b04f2753de7a6 WHIRLPOOL 79cb7e620eb8e838192dc557c7a9ce7e713227d783cc8b63792825559b2145cad70d0af6f99948c1527557bc363feffd846c73893682b4a14fc7d08b9e20c649
+DIST patchbundle-selinux-base-policy-2.20141203-r9.tar.bz2 299602 SHA256 e8518004942a6c57170a609683e22b1410c93a2a195829c41dc8fbc703d941b5 SHA512 ce6484fbca1d2d074e50d1a3953392bd3ce0a4617df98fbac37747b469b4f160a9331586dfe1c3ddccb1ccbee24876a2f05ab49e37c8492a48baf83c2d01d140 WHIRLPOOL 1fd7b956e98e95a64c3a713a944d4531259bd156a7feabf6a89c4b5f33ac846377730eede97889e85183be086f282ebd18e860214f6ca3f01b40f2323470ee04
 DIST refpolicy-2.20140311.tar.bz2 664416 SHA256 f69437db95548c78a5dec44c236397146b144153149009ea554d2e536e5436f7 SHA512 50bacee82ed41ac8b8007ecc33bf51d22303cc2ddd27cfb72cb5520dab5f8e255186e34b89cec492c7a2d4220b200814bdede9b46c19f987a3d3d65a1c9b749a WHIRLPOOL e07480beba6ab1f02ad36b7d0c50c4a71cb39a8ec78bf8d1dc3c82bb9dd1d69d9169d7c937165ea15f60ce1147f256d46644f944107a3a8a800d5bad70d4c255
 DIST refpolicy-2.20141203.tar.bz2 680243 SHA256 f438209c430d8a2d4ddcbe4bdd3edb46f6af7dc4913637af0b73c635e40c1522 SHA512 682e4280c5799e4c12ec7594afc1389f67be35055748d2e0dbdc3419159a16c96d4946ca6178daee8370515951f8653b2e452efe8c962b8d7f9bc192f0b15a0c WHIRLPOOL 74bca232534e7af9051bb1ab9f77c1ff6c425781cf4561f781d6e9a40cc5ca0d9add540249ea5493e8782a9372aea296ead6c165c6c440ae1509eb319d151ee5
diff --git a/sec-policy/selinux-dropbox/selinux-dropbox-2.20141203-r8.ebuild b/sec-policy/selinux-dropbox/selinux-dropbox-2.20141203-r8.ebuild
index 863b5feb3e2d..785045937fc1 100644
--- a/sec-policy/selinux-dropbox/selinux-dropbox-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-dropbox/selinux-dropbox-2.20141203-r8.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="SELinux policy for dropbox"
 if [[ $PV == 9999* ]] ; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-xserver
diff --git a/sec-policy/selinux-dropbox/selinux-dropbox-2.20141203-r9.ebuild b/sec-policy/selinux-dropbox/selinux-dropbox-2.20141203-r9.ebuild
new file mode 100644
index 000000000000..863b5feb3e2d
--- /dev/null
+++ b/sec-policy/selinux-dropbox/selinux-dropbox-2.20141203-r9.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI="5"
+
+IUSE=""
+MODS="dropbox"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for dropbox"
+
+if [[ $PV == 9999* ]] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
+DEPEND="${DEPEND}
+	sec-policy/selinux-xserver
+	sec-policy/selinux-dbus
+"
+RDEPEND="${RDEPEND}
+	sec-policy/selinux-xserver
+	sec-policy/selinux-dbus
+"
diff --git a/sec-policy/selinux-entropyd/Manifest b/sec-policy/selinux-entropyd/Manifest
index 8327a635be01..91d204b0021a 100644
--- a/sec-policy/selinux-entropyd/Manifest
+++ b/sec-policy/selinux-entropyd/Manifest
@@ -9,5 +9,6 @@ DIST patchbundle-selinux-base-policy-2.20141203-r5.tar.bz2 274136 SHA256 c23d17c
 DIST patchbundle-selinux-base-policy-2.20141203-r6.tar.bz2 293231 SHA256 b686dcc517b97834f66d967afdcc724cb43b5c6dbf9f34043a91cdeda2625cc7 SHA512 a2c486cbe4a1d21ff3fd01bef25ecf5a633a4072646c67cfccf3f7187d95f3d9e3b482a46ba17c55c40a8e7c0dee56e9cf9ddc9f414d3e4511443b62f60d03e9 WHIRLPOOL 3d708e287e3f9b873be647b0327eab6675a8702ee1cffb56e36934cada306e5ccc64397a083dad9e59de37a067e628cacbf896ae99012d5a209e42fd7cd8a4c6
 DIST patchbundle-selinux-base-policy-2.20141203-r7.tar.bz2 295833 SHA256 ba2219b3efc747be65f94c4d8ac3cd6ee530c82c848fa41935a114184678622a SHA512 8e32d9dbfb2f0f3f50200543aadb51ed9834ccd5cdf30bf8e4d9e6d0b645ce44ffaf80f7aa9385e9c9095d9a383b3a348a92356cb5386c06544ab082a9a468c7 WHIRLPOOL 1648ee1be71e45fcf5a264816ce7edc7bab19bd28a68703923eb2d6068f1f0469ae593855231d31f88baecbf29e7cece2d6beeed20b7c04231a6c90e90d35910
 DIST patchbundle-selinux-base-policy-2.20141203-r8.tar.bz2 297919 SHA256 77539eb3d78105f8789cd8205d2698bd27e2abf100163bdd162cda860fd15120 SHA512 2f8a19e1e4bb65f32b480275f49099aed3ae9df543c7de862b3bbd93e81b89cd96dadac3d091e28673d09a6885db8c5656b3a77d0080775c110b04f2753de7a6 WHIRLPOOL 79cb7e620eb8e838192dc557c7a9ce7e713227d783cc8b63792825559b2145cad70d0af6f99948c1527557bc363feffd846c73893682b4a14fc7d08b9e20c649
+DIST patchbundle-selinux-base-policy-2.20141203-r9.tar.bz2 299602 SHA256 e8518004942a6c57170a609683e22b1410c93a2a195829c41dc8fbc703d941b5 SHA512 ce6484fbca1d2d074e50d1a3953392bd3ce0a4617df98fbac37747b469b4f160a9331586dfe1c3ddccb1ccbee24876a2f05ab49e37c8492a48baf83c2d01d140 WHIRLPOOL 1fd7b956e98e95a64c3a713a944d4531259bd156a7feabf6a89c4b5f33ac846377730eede97889e85183be086f282ebd18e860214f6ca3f01b40f2323470ee04
 DIST refpolicy-2.20140311.tar.bz2 664416 SHA256 f69437db95548c78a5dec44c236397146b144153149009ea554d2e536e5436f7 SHA512 50bacee82ed41ac8b8007ecc33bf51d22303cc2ddd27cfb72cb5520dab5f8e255186e34b89cec492c7a2d4220b200814bdede9b46c19f987a3d3d65a1c9b749a WHIRLPOOL e07480beba6ab1f02ad36b7d0c50c4a71cb39a8ec78bf8d1dc3c82bb9dd1d69d9169d7c937165ea15f60ce1147f256d46644f944107a3a8a800d5bad70d4c255
 DIST refpolicy-2.20141203.tar.bz2 680243 SHA256 f438209c430d8a2d4ddcbe4bdd3edb46f6af7dc4913637af0b73c635e40c1522 SHA512 682e4280c5799e4c12ec7594afc1389f67be35055748d2e0dbdc3419159a16c96d4946ca6178daee8370515951f8653b2e452efe8c962b8d7f9bc192f0b15a0c WHIRLPOOL 74bca232534e7af9051bb1ab9f77c1ff6c425781cf4561f781d6e9a40cc5ca0d9add540249ea5493e8782a9372aea296ead6c165c6c440ae1509eb319d151ee5
diff --git a/sec-policy/selinux-entropyd/selinux-entropyd-2.20141203-r8.ebuild b/sec-policy/selinux-entropyd/selinux-entropyd-2.20141203-r8.ebuild
index 61202f068b0e..07aa4712f1ad 100644
--- a/sec-policy/selinux-entropyd/selinux-entropyd-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-entropyd/selinux-entropyd-2.20141203-r8.ebuild
@@ -13,5 +13,5 @@ DESCRIPTION="SELinux policy for entropyd"
 if [[ $PV == 9999* ]] ; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-entropyd/selinux-entropyd-2.20141203-r9.ebuild b/sec-policy/selinux-entropyd/selinux-entropyd-2.20141203-r9.ebuild
new file mode 100644
index 000000000000..61202f068b0e
--- /dev/null
+++ b/sec-policy/selinux-entropyd/selinux-entropyd-2.20141203-r9.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI="5"
+
+IUSE=""
+MODS="entropyd"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for entropyd"
+
+if [[ $PV == 9999* ]] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
diff --git a/sec-policy/selinux-evolution/Manifest b/sec-policy/selinux-evolution/Manifest
index 8327a635be01..91d204b0021a 100644
--- a/sec-policy/selinux-evolution/Manifest
+++ b/sec-policy/selinux-evolution/Manifest
@@ -9,5 +9,6 @@ DIST patchbundle-selinux-base-policy-2.20141203-r5.tar.bz2 274136 SHA256 c23d17c
 DIST patchbundle-selinux-base-policy-2.20141203-r6.tar.bz2 293231 SHA256 b686dcc517b97834f66d967afdcc724cb43b5c6dbf9f34043a91cdeda2625cc7 SHA512 a2c486cbe4a1d21ff3fd01bef25ecf5a633a4072646c67cfccf3f7187d95f3d9e3b482a46ba17c55c40a8e7c0dee56e9cf9ddc9f414d3e4511443b62f60d03e9 WHIRLPOOL 3d708e287e3f9b873be647b0327eab6675a8702ee1cffb56e36934cada306e5ccc64397a083dad9e59de37a067e628cacbf896ae99012d5a209e42fd7cd8a4c6
 DIST patchbundle-selinux-base-policy-2.20141203-r7.tar.bz2 295833 SHA256 ba2219b3efc747be65f94c4d8ac3cd6ee530c82c848fa41935a114184678622a SHA512 8e32d9dbfb2f0f3f50200543aadb51ed9834ccd5cdf30bf8e4d9e6d0b645ce44ffaf80f7aa9385e9c9095d9a383b3a348a92356cb5386c06544ab082a9a468c7 WHIRLPOOL 1648ee1be71e45fcf5a264816ce7edc7bab19bd28a68703923eb2d6068f1f0469ae593855231d31f88baecbf29e7cece2d6beeed20b7c04231a6c90e90d35910
 DIST patchbundle-selinux-base-policy-2.20141203-r8.tar.bz2 297919 SHA256 77539eb3d78105f8789cd8205d2698bd27e2abf100163bdd162cda860fd15120 SHA512 2f8a19e1e4bb65f32b480275f49099aed3ae9df543c7de862b3bbd93e81b89cd96dadac3d091e28673d09a6885db8c5656b3a77d0080775c110b04f2753de7a6 WHIRLPOOL 79cb7e620eb8e838192dc557c7a9ce7e713227d783cc8b63792825559b2145cad70d0af6f99948c1527557bc363feffd846c73893682b4a14fc7d08b9e20c649
+DIST patchbundle-selinux-base-policy-2.20141203-r9.tar.bz2 299602 SHA256 e8518004942a6c57170a609683e22b1410c93a2a195829c41dc8fbc703d941b5 SHA512 ce6484fbca1d2d074e50d1a3953392bd3ce0a4617df98fbac37747b469b4f160a9331586dfe1c3ddccb1ccbee24876a2f05ab49e37c8492a48baf83c2d01d140 WHIRLPOOL 1fd7b956e98e95a64c3a713a944d4531259bd156a7feabf6a89c4b5f33ac846377730eede97889e85183be086f282ebd18e860214f6ca3f01b40f2323470ee04
 DIST refpolicy-2.20140311.tar.bz2 664416 SHA256 f69437db95548c78a5dec44c236397146b144153149009ea554d2e536e5436f7 SHA512 50bacee82ed41ac8b8007ecc33bf51d22303cc2ddd27cfb72cb5520dab5f8e255186e34b89cec492c7a2d4220b200814bdede9b46c19f987a3d3d65a1c9b749a WHIRLPOOL e07480beba6ab1f02ad36b7d0c50c4a71cb39a8ec78bf8d1dc3c82bb9dd1d69d9169d7c937165ea15f60ce1147f256d46644f944107a3a8a800d5bad70d4c255
 DIST refpolicy-2.20141203.tar.bz2 680243 SHA256 f438209c430d8a2d4ddcbe4bdd3edb46f6af7dc4913637af0b73c635e40c1522 SHA512 682e4280c5799e4c12ec7594afc1389f67be35055748d2e0dbdc3419159a16c96d4946ca6178daee8370515951f8653b2e452efe8c962b8d7f9bc192f0b15a0c WHIRLPOOL 74bca232534e7af9051bb1ab9f77c1ff6c425781cf4561f781d6e9a40cc5ca0d9add540249ea5493e8782a9372aea296ead6c165c6c440ae1509eb319d151ee5
diff --git a/sec-policy/selinux-evolution/selinux-evolution-2.20141203-r8.ebuild b/sec-policy/selinux-evolution/selinux-evolution-2.20141203-r8.ebuild
index 4e1f8f6e8882..aebb5cd0af44 100644
--- a/sec-policy/selinux-evolution/selinux-evolution-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-evolution/selinux-evolution-2.20141203-r8.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="SELinux policy for evolution"
 if [[ $PV == 9999* ]] ; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-xserver
diff --git a/sec-policy/selinux-evolution/selinux-evolution-2.20141203-r9.ebuild b/sec-policy/selinux-evolution/selinux-evolution-2.20141203-r9.ebuild
new file mode 100644
index 000000000000..4e1f8f6e8882
--- /dev/null
+++ b/sec-policy/selinux-evolution/selinux-evolution-2.20141203-r9.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI="5"
+
+IUSE=""
+MODS="evolution"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for evolution"
+
+if [[ $PV == 9999* ]] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
+DEPEND="${DEPEND}
+	sec-policy/selinux-xserver
+"
+RDEPEND="${RDEPEND}
+	sec-policy/selinux-xserver
+"
diff --git a/sec-policy/selinux-exim/Manifest b/sec-policy/selinux-exim/Manifest
index 8327a635be01..91d204b0021a 100644
--- a/sec-policy/selinux-exim/Manifest
+++ b/sec-policy/selinux-exim/Manifest
@@ -9,5 +9,6 @@ DIST patchbundle-selinux-base-policy-2.20141203-r5.tar.bz2 274136 SHA256 c23d17c
 DIST patchbundle-selinux-base-policy-2.20141203-r6.tar.bz2 293231 SHA256 b686dcc517b97834f66d967afdcc724cb43b5c6dbf9f34043a91cdeda2625cc7 SHA512 a2c486cbe4a1d21ff3fd01bef25ecf5a633a4072646c67cfccf3f7187d95f3d9e3b482a46ba17c55c40a8e7c0dee56e9cf9ddc9f414d3e4511443b62f60d03e9 WHIRLPOOL 3d708e287e3f9b873be647b0327eab6675a8702ee1cffb56e36934cada306e5ccc64397a083dad9e59de37a067e628cacbf896ae99012d5a209e42fd7cd8a4c6
 DIST patchbundle-selinux-base-policy-2.20141203-r7.tar.bz2 295833 SHA256 ba2219b3efc747be65f94c4d8ac3cd6ee530c82c848fa41935a114184678622a SHA512 8e32d9dbfb2f0f3f50200543aadb51ed9834ccd5cdf30bf8e4d9e6d0b645ce44ffaf80f7aa9385e9c9095d9a383b3a348a92356cb5386c06544ab082a9a468c7 WHIRLPOOL 1648ee1be71e45fcf5a264816ce7edc7bab19bd28a68703923eb2d6068f1f0469ae593855231d31f88baecbf29e7cece2d6beeed20b7c04231a6c90e90d35910
 DIST patchbundle-selinux-base-policy-2.20141203-r8.tar.bz2 297919 SHA256 77539eb3d78105f8789cd8205d2698bd27e2abf100163bdd162cda860fd15120 SHA512 2f8a19e1e4bb65f32b480275f49099aed3ae9df543c7de862b3bbd93e81b89cd96dadac3d091e28673d09a6885db8c5656b3a77d0080775c110b04f2753de7a6 WHIRLPOOL 79cb7e620eb8e838192dc557c7a9ce7e713227d783cc8b63792825559b2145cad70d0af6f99948c1527557bc363feffd846c73893682b4a14fc7d08b9e20c649
+DIST patchbundle-selinux-base-policy-2.20141203-r9.tar.bz2 299602 SHA256 e8518004942a6c57170a609683e22b1410c93a2a195829c41dc8fbc703d941b5 SHA512 ce6484fbca1d2d074e50d1a3953392bd3ce0a4617df98fbac37747b469b4f160a9331586dfe1c3ddccb1ccbee24876a2f05ab49e37c8492a48baf83c2d01d140 WHIRLPOOL 1fd7b956e98e95a64c3a713a944d4531259bd156a7feabf6a89c4b5f33ac846377730eede97889e85183be086f282ebd18e860214f6ca3f01b40f2323470ee04
 DIST refpolicy-2.20140311.tar.bz2 664416 SHA256 f69437db95548c78a5dec44c236397146b144153149009ea554d2e536e5436f7 SHA512 50bacee82ed41ac8b8007ecc33bf51d22303cc2ddd27cfb72cb5520dab5f8e255186e34b89cec492c7a2d4220b200814bdede9b46c19f987a3d3d65a1c9b749a WHIRLPOOL e07480beba6ab1f02ad36b7d0c50c4a71cb39a8ec78bf8d1dc3c82bb9dd1d69d9169d7c937165ea15f60ce1147f256d46644f944107a3a8a800d5bad70d4c255
 DIST refpolicy-2.20141203.tar.bz2 680243 SHA256 f438209c430d8a2d4ddcbe4bdd3edb46f6af7dc4913637af0b73c635e40c1522 SHA512 682e4280c5799e4c12ec7594afc1389f67be35055748d2e0dbdc3419159a16c96d4946ca6178daee8370515951f8653b2e452efe8c962b8d7f9bc192f0b15a0c WHIRLPOOL 74bca232534e7af9051bb1ab9f77c1ff6c425781cf4561f781d6e9a40cc5ca0d9add540249ea5493e8782a9372aea296ead6c165c6c440ae1509eb319d151ee5
diff --git a/sec-policy/selinux-exim/selinux-exim-2.20141203-r8.ebuild b/sec-policy/selinux-exim/selinux-exim-2.20141203-r8.ebuild
index 08e981929d23..237a9f436365 100644
--- a/sec-policy/selinux-exim/selinux-exim-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-exim/selinux-exim-2.20141203-r8.ebuild
@@ -13,5 +13,5 @@ DESCRIPTION="SELinux policy for exim"
 if [[ $PV == 9999* ]] ; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-exim/selinux-exim-2.20141203-r9.ebuild b/sec-policy/selinux-exim/selinux-exim-2.20141203-r9.ebuild
new file mode 100644
index 000000000000..08e981929d23
--- /dev/null
+++ b/sec-policy/selinux-exim/selinux-exim-2.20141203-r9.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI="5"
+
+IUSE=""
+MODS="exim"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for exim"
+
+if [[ $PV == 9999* ]] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
diff --git a/sec-policy/selinux-fail2ban/Manifest b/sec-policy/selinux-fail2ban/Manifest
index 8327a635be01..91d204b0021a 100644
--- a/sec-policy/selinux-fail2ban/Manifest
+++ b/sec-policy/selinux-fail2ban/Manifest
@@ -9,5 +9,6 @@ DIST patchbundle-selinux-base-policy-2.20141203-r5.tar.bz2 274136 SHA256 c23d17c
 DIST patchbundle-selinux-base-policy-2.20141203-r6.tar.bz2 293231 SHA256 b686dcc517b97834f66d967afdcc724cb43b5c6dbf9f34043a91cdeda2625cc7 SHA512 a2c486cbe4a1d21ff3fd01bef25ecf5a633a4072646c67cfccf3f7187d95f3d9e3b482a46ba17c55c40a8e7c0dee56e9cf9ddc9f414d3e4511443b62f60d03e9 WHIRLPOOL 3d708e287e3f9b873be647b0327eab6675a8702ee1cffb56e36934cada306e5ccc64397a083dad9e59de37a067e628cacbf896ae99012d5a209e42fd7cd8a4c6
 DIST patchbundle-selinux-base-policy-2.20141203-r7.tar.bz2 295833 SHA256 ba2219b3efc747be65f94c4d8ac3cd6ee530c82c848fa41935a114184678622a SHA512 8e32d9dbfb2f0f3f50200543aadb51ed9834ccd5cdf30bf8e4d9e6d0b645ce44ffaf80f7aa9385e9c9095d9a383b3a348a92356cb5386c06544ab082a9a468c7 WHIRLPOOL 1648ee1be71e45fcf5a264816ce7edc7bab19bd28a68703923eb2d6068f1f0469ae593855231d31f88baecbf29e7cece2d6beeed20b7c04231a6c90e90d35910
 DIST patchbundle-selinux-base-policy-2.20141203-r8.tar.bz2 297919 SHA256 77539eb3d78105f8789cd8205d2698bd27e2abf100163bdd162cda860fd15120 SHA512 2f8a19e1e4bb65f32b480275f49099aed3ae9df543c7de862b3bbd93e81b89cd96dadac3d091e28673d09a6885db8c5656b3a77d0080775c110b04f2753de7a6 WHIRLPOOL 79cb7e620eb8e838192dc557c7a9ce7e713227d783cc8b63792825559b2145cad70d0af6f99948c1527557bc363feffd846c73893682b4a14fc7d08b9e20c649
+DIST patchbundle-selinux-base-policy-2.20141203-r9.tar.bz2 299602 SHA256 e8518004942a6c57170a609683e22b1410c93a2a195829c41dc8fbc703d941b5 SHA512 ce6484fbca1d2d074e50d1a3953392bd3ce0a4617df98fbac37747b469b4f160a9331586dfe1c3ddccb1ccbee24876a2f05ab49e37c8492a48baf83c2d01d140 WHIRLPOOL 1fd7b956e98e95a64c3a713a944d4531259bd156a7feabf6a89c4b5f33ac846377730eede97889e85183be086f282ebd18e860214f6ca3f01b40f2323470ee04
 DIST refpolicy-2.20140311.tar.bz2 664416 SHA256 f69437db95548c78a5dec44c236397146b144153149009ea554d2e536e5436f7 SHA512 50bacee82ed41ac8b8007ecc33bf51d22303cc2ddd27cfb72cb5520dab5f8e255186e34b89cec492c7a2d4220b200814bdede9b46c19f987a3d3d65a1c9b749a WHIRLPOOL e07480beba6ab1f02ad36b7d0c50c4a71cb39a8ec78bf8d1dc3c82bb9dd1d69d9169d7c937165ea15f60ce1147f256d46644f944107a3a8a800d5bad70d4c255
 DIST refpolicy-2.20141203.tar.bz2 680243 SHA256 f438209c430d8a2d4ddcbe4bdd3edb46f6af7dc4913637af0b73c635e40c1522 SHA512 682e4280c5799e4c12ec7594afc1389f67be35055748d2e0dbdc3419159a16c96d4946ca6178daee8370515951f8653b2e452efe8c962b8d7f9bc192f0b15a0c WHIRLPOOL 74bca232534e7af9051bb1ab9f77c1ff6c425781cf4561f781d6e9a40cc5ca0d9add540249ea5493e8782a9372aea296ead6c165c6c440ae1509eb319d151ee5
diff --git a/sec-policy/selinux-fail2ban/selinux-fail2ban-2.20141203-r8.ebuild b/sec-policy/selinux-fail2ban/selinux-fail2ban-2.20141203-r8.ebuild
index 9d2f3caf7169..2dd3dfc05ec7 100644
--- a/sec-policy/selinux-fail2ban/selinux-fail2ban-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-fail2ban/selinux-fail2ban-2.20141203-r8.ebuild
@@ -13,5 +13,5 @@ DESCRIPTION="SELinux policy for fail2ban"
 if [[ $PV == 9999* ]] ; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-fail2ban/selinux-fail2ban-2.20141203-r9.ebuild b/sec-policy/selinux-fail2ban/selinux-fail2ban-2.20141203-r9.ebuild
new file mode 100644
index 000000000000..9d2f3caf7169
--- /dev/null
+++ b/sec-policy/selinux-fail2ban/selinux-fail2ban-2.20141203-r9.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI="5"
+
+IUSE=""
+MODS="fail2ban"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for fail2ban"
+
+if [[ $PV == 9999* ]] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
diff --git a/sec-policy/selinux-fetchmail/Manifest b/sec-policy/selinux-fetchmail/Manifest
index 8327a635be01..91d204b0021a 100644
--- a/sec-policy/selinux-fetchmail/Manifest
+++ b/sec-policy/selinux-fetchmail/Manifest
@@ -9,5 +9,6 @@ DIST patchbundle-selinux-base-policy-2.20141203-r5.tar.bz2 274136 SHA256 c23d17c
 DIST patchbundle-selinux-base-policy-2.20141203-r6.tar.bz2 293231 SHA256 b686dcc517b97834f66d967afdcc724cb43b5c6dbf9f34043a91cdeda2625cc7 SHA512 a2c486cbe4a1d21ff3fd01bef25ecf5a633a4072646c67cfccf3f7187d95f3d9e3b482a46ba17c55c40a8e7c0dee56e9cf9ddc9f414d3e4511443b62f60d03e9 WHIRLPOOL 3d708e287e3f9b873be647b0327eab6675a8702ee1cffb56e36934cada306e5ccc64397a083dad9e59de37a067e628cacbf896ae99012d5a209e42fd7cd8a4c6
 DIST patchbundle-selinux-base-policy-2.20141203-r7.tar.bz2 295833 SHA256 ba2219b3efc747be65f94c4d8ac3cd6ee530c82c848fa41935a114184678622a SHA512 8e32d9dbfb2f0f3f50200543aadb51ed9834ccd5cdf30bf8e4d9e6d0b645ce44ffaf80f7aa9385e9c9095d9a383b3a348a92356cb5386c06544ab082a9a468c7 WHIRLPOOL 1648ee1be71e45fcf5a264816ce7edc7bab19bd28a68703923eb2d6068f1f0469ae593855231d31f88baecbf29e7cece2d6beeed20b7c04231a6c90e90d35910
 DIST patchbundle-selinux-base-policy-2.20141203-r8.tar.bz2 297919 SHA256 77539eb3d78105f8789cd8205d2698bd27e2abf100163bdd162cda860fd15120 SHA512 2f8a19e1e4bb65f32b480275f49099aed3ae9df543c7de862b3bbd93e81b89cd96dadac3d091e28673d09a6885db8c5656b3a77d0080775c110b04f2753de7a6 WHIRLPOOL 79cb7e620eb8e838192dc557c7a9ce7e713227d783cc8b63792825559b2145cad70d0af6f99948c1527557bc363feffd846c73893682b4a14fc7d08b9e20c649
+DIST patchbundle-selinux-base-policy-2.20141203-r9.tar.bz2 299602 SHA256 e8518004942a6c57170a609683e22b1410c93a2a195829c41dc8fbc703d941b5 SHA512 ce6484fbca1d2d074e50d1a3953392bd3ce0a4617df98fbac37747b469b4f160a9331586dfe1c3ddccb1ccbee24876a2f05ab49e37c8492a48baf83c2d01d140 WHIRLPOOL 1fd7b956e98e95a64c3a713a944d4531259bd156a7feabf6a89c4b5f33ac846377730eede97889e85183be086f282ebd18e860214f6ca3f01b40f2323470ee04
 DIST refpolicy-2.20140311.tar.bz2 664416 SHA256 f69437db95548c78a5dec44c236397146b144153149009ea554d2e536e5436f7 SHA512 50bacee82ed41ac8b8007ecc33bf51d22303cc2ddd27cfb72cb5520dab5f8e255186e34b89cec492c7a2d4220b200814bdede9b46c19f987a3d3d65a1c9b749a WHIRLPOOL e07480beba6ab1f02ad36b7d0c50c4a71cb39a8ec78bf8d1dc3c82bb9dd1d69d9169d7c937165ea15f60ce1147f256d46644f944107a3a8a800d5bad70d4c255
 DIST refpolicy-2.20141203.tar.bz2 680243 SHA256 f438209c430d8a2d4ddcbe4bdd3edb46f6af7dc4913637af0b73c635e40c1522 SHA512 682e4280c5799e4c12ec7594afc1389f67be35055748d2e0dbdc3419159a16c96d4946ca6178daee8370515951f8653b2e452efe8c962b8d7f9bc192f0b15a0c WHIRLPOOL 74bca232534e7af9051bb1ab9f77c1ff6c425781cf4561f781d6e9a40cc5ca0d9add540249ea5493e8782a9372aea296ead6c165c6c440ae1509eb319d151ee5
diff --git a/sec-policy/selinux-fetchmail/selinux-fetchmail-2.20141203-r8.ebuild b/sec-policy/selinux-fetchmail/selinux-fetchmail-2.20141203-r8.ebuild
index a0251ddcdd5c..fc6502f4cb35 100644
--- a/sec-policy/selinux-fetchmail/selinux-fetchmail-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-fetchmail/selinux-fetchmail-2.20141203-r8.ebuild
@@ -13,5 +13,5 @@ DESCRIPTION="SELinux policy for fetchmail"
 if [[ $PV == 9999* ]] ; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-fetchmail/selinux-fetchmail-2.20141203-r9.ebuild b/sec-policy/selinux-fetchmail/selinux-fetchmail-2.20141203-r9.ebuild
new file mode 100644
index 000000000000..a0251ddcdd5c
--- /dev/null
+++ b/sec-policy/selinux-fetchmail/selinux-fetchmail-2.20141203-r9.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI="5"
+
+IUSE=""
+MODS="fetchmail"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for fetchmail"
+
+if [[ $PV == 9999* ]] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
diff --git a/sec-policy/selinux-finger/Manifest b/sec-policy/selinux-finger/Manifest
index 8327a635be01..91d204b0021a 100644
--- a/sec-policy/selinux-finger/Manifest
+++ b/sec-policy/selinux-finger/Manifest
@@ -9,5 +9,6 @@ DIST patchbundle-selinux-base-policy-2.20141203-r5.tar.bz2 274136 SHA256 c23d17c
 DIST patchbundle-selinux-base-policy-2.20141203-r6.tar.bz2 293231 SHA256 b686dcc517b97834f66d967afdcc724cb43b5c6dbf9f34043a91cdeda2625cc7 SHA512 a2c486cbe4a1d21ff3fd01bef25ecf5a633a4072646c67cfccf3f7187d95f3d9e3b482a46ba17c55c40a8e7c0dee56e9cf9ddc9f414d3e4511443b62f60d03e9 WHIRLPOOL 3d708e287e3f9b873be647b0327eab6675a8702ee1cffb56e36934cada306e5ccc64397a083dad9e59de37a067e628cacbf896ae99012d5a209e42fd7cd8a4c6
 DIST patchbundle-selinux-base-policy-2.20141203-r7.tar.bz2 295833 SHA256 ba2219b3efc747be65f94c4d8ac3cd6ee530c82c848fa41935a114184678622a SHA512 8e32d9dbfb2f0f3f50200543aadb51ed9834ccd5cdf30bf8e4d9e6d0b645ce44ffaf80f7aa9385e9c9095d9a383b3a348a92356cb5386c06544ab082a9a468c7 WHIRLPOOL 1648ee1be71e45fcf5a264816ce7edc7bab19bd28a68703923eb2d6068f1f0469ae593855231d31f88baecbf29e7cece2d6beeed20b7c04231a6c90e90d35910
 DIST patchbundle-selinux-base-policy-2.20141203-r8.tar.bz2 297919 SHA256 77539eb3d78105f8789cd8205d2698bd27e2abf100163bdd162cda860fd15120 SHA512 2f8a19e1e4bb65f32b480275f49099aed3ae9df543c7de862b3bbd93e81b89cd96dadac3d091e28673d09a6885db8c5656b3a77d0080775c110b04f2753de7a6 WHIRLPOOL 79cb7e620eb8e838192dc557c7a9ce7e713227d783cc8b63792825559b2145cad70d0af6f99948c1527557bc363feffd846c73893682b4a14fc7d08b9e20c649
+DIST patchbundle-selinux-base-policy-2.20141203-r9.tar.bz2 299602 SHA256 e8518004942a6c57170a609683e22b1410c93a2a195829c41dc8fbc703d941b5 SHA512 ce6484fbca1d2d074e50d1a3953392bd3ce0a4617df98fbac37747b469b4f160a9331586dfe1c3ddccb1ccbee24876a2f05ab49e37c8492a48baf83c2d01d140 WHIRLPOOL 1fd7b956e98e95a64c3a713a944d4531259bd156a7feabf6a89c4b5f33ac846377730eede97889e85183be086f282ebd18e860214f6ca3f01b40f2323470ee04
 DIST refpolicy-2.20140311.tar.bz2 664416 SHA256 f69437db95548c78a5dec44c236397146b144153149009ea554d2e536e5436f7 SHA512 50bacee82ed41ac8b8007ecc33bf51d22303cc2ddd27cfb72cb5520dab5f8e255186e34b89cec492c7a2d4220b200814bdede9b46c19f987a3d3d65a1c9b749a WHIRLPOOL e07480beba6ab1f02ad36b7d0c50c4a71cb39a8ec78bf8d1dc3c82bb9dd1d69d9169d7c937165ea15f60ce1147f256d46644f944107a3a8a800d5bad70d4c255
 DIST refpolicy-2.20141203.tar.bz2 680243 SHA256 f438209c430d8a2d4ddcbe4bdd3edb46f6af7dc4913637af0b73c635e40c1522 SHA512 682e4280c5799e4c12ec7594afc1389f67be35055748d2e0dbdc3419159a16c96d4946ca6178daee8370515951f8653b2e452efe8c962b8d7f9bc192f0b15a0c WHIRLPOOL 74bca232534e7af9051bb1ab9f77c1ff6c425781cf4561f781d6e9a40cc5ca0d9add540249ea5493e8782a9372aea296ead6c165c6c440ae1509eb319d151ee5
diff --git a/sec-policy/selinux-finger/selinux-finger-2.20141203-r8.ebuild b/sec-policy/selinux-finger/selinux-finger-2.20141203-r8.ebuild
index b3d6ec848229..422910c68496 100644
--- a/sec-policy/selinux-finger/selinux-finger-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-finger/selinux-finger-2.20141203-r8.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="SELinux policy for finger"
 if [[ $PV == 9999* ]] ; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-finger/selinux-finger-2.20141203-r9.ebuild b/sec-policy/selinux-finger/selinux-finger-2.20141203-r9.ebuild
new file mode 100644
index 000000000000..b3d6ec848229
--- /dev/null
+++ b/sec-policy/selinux-finger/selinux-finger-2.20141203-r9.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI="5"
+
+IUSE=""
+MODS="finger"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for finger"
+
+if [[ $PV == 9999* ]] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DEPEND="${DEPEND}
+	sec-policy/selinux-inetd
+"
+RDEPEND="${RDEPEND}
+	sec-policy/selinux-inetd
+"
diff --git a/sec-policy/selinux-flash/Manifest b/sec-policy/selinux-flash/Manifest
index 8327a635be01..91d204b0021a 100644
--- a/sec-policy/selinux-flash/Manifest
+++ b/sec-policy/selinux-flash/Manifest
@@ -9,5 +9,6 @@ DIST patchbundle-selinux-base-policy-2.20141203-r5.tar.bz2 274136 SHA256 c23d17c
 DIST patchbundle-selinux-base-policy-2.20141203-r6.tar.bz2 293231 SHA256 b686dcc517b97834f66d967afdcc724cb43b5c6dbf9f34043a91cdeda2625cc7 SHA512 a2c486cbe4a1d21ff3fd01bef25ecf5a633a4072646c67cfccf3f7187d95f3d9e3b482a46ba17c55c40a8e7c0dee56e9cf9ddc9f414d3e4511443b62f60d03e9 WHIRLPOOL 3d708e287e3f9b873be647b0327eab6675a8702ee1cffb56e36934cada306e5ccc64397a083dad9e59de37a067e628cacbf896ae99012d5a209e42fd7cd8a4c6
 DIST patchbundle-selinux-base-policy-2.20141203-r7.tar.bz2 295833 SHA256 ba2219b3efc747be65f94c4d8ac3cd6ee530c82c848fa41935a114184678622a SHA512 8e32d9dbfb2f0f3f50200543aadb51ed9834ccd5cdf30bf8e4d9e6d0b645ce44ffaf80f7aa9385e9c9095d9a383b3a348a92356cb5386c06544ab082a9a468c7 WHIRLPOOL 1648ee1be71e45fcf5a264816ce7edc7bab19bd28a68703923eb2d6068f1f0469ae593855231d31f88baecbf29e7cece2d6beeed20b7c04231a6c90e90d35910
 DIST patchbundle-selinux-base-policy-2.20141203-r8.tar.bz2 297919 SHA256 77539eb3d78105f8789cd8205d2698bd27e2abf100163bdd162cda860fd15120 SHA512 2f8a19e1e4bb65f32b480275f49099aed3ae9df543c7de862b3bbd93e81b89cd96dadac3d091e28673d09a6885db8c5656b3a77d0080775c110b04f2753de7a6 WHIRLPOOL 79cb7e620eb8e838192dc557c7a9ce7e713227d783cc8b63792825559b2145cad70d0af6f99948c1527557bc363feffd846c73893682b4a14fc7d08b9e20c649
+DIST patchbundle-selinux-base-policy-2.20141203-r9.tar.bz2 299602 SHA256 e8518004942a6c57170a609683e22b1410c93a2a195829c41dc8fbc703d941b5 SHA512 ce6484fbca1d2d074e50d1a3953392bd3ce0a4617df98fbac37747b469b4f160a9331586dfe1c3ddccb1ccbee24876a2f05ab49e37c8492a48baf83c2d01d140 WHIRLPOOL 1fd7b956e98e95a64c3a713a944d4531259bd156a7feabf6a89c4b5f33ac846377730eede97889e85183be086f282ebd18e860214f6ca3f01b40f2323470ee04
 DIST refpolicy-2.20140311.tar.bz2 664416 SHA256 f69437db95548c78a5dec44c236397146b144153149009ea554d2e536e5436f7 SHA512 50bacee82ed41ac8b8007ecc33bf51d22303cc2ddd27cfb72cb5520dab5f8e255186e34b89cec492c7a2d4220b200814bdede9b46c19f987a3d3d65a1c9b749a WHIRLPOOL e07480beba6ab1f02ad36b7d0c50c4a71cb39a8ec78bf8d1dc3c82bb9dd1d69d9169d7c937165ea15f60ce1147f256d46644f944107a3a8a800d5bad70d4c255
 DIST refpolicy-2.20141203.tar.bz2 680243 SHA256 f438209c430d8a2d4ddcbe4bdd3edb46f6af7dc4913637af0b73c635e40c1522 SHA512 682e4280c5799e4c12ec7594afc1389f67be35055748d2e0dbdc3419159a16c96d4946ca6178daee8370515951f8653b2e452efe8c962b8d7f9bc192f0b15a0c WHIRLPOOL 74bca232534e7af9051bb1ab9f77c1ff6c425781cf4561f781d6e9a40cc5ca0d9add540249ea5493e8782a9372aea296ead6c165c6c440ae1509eb319d151ee5
diff --git a/sec-policy/selinux-flash/selinux-flash-2.20141203-r8.ebuild b/sec-policy/selinux-flash/selinux-flash-2.20141203-r8.ebuild
index 61748b82b0e3..d4cc2a7a0ae3 100644
--- a/sec-policy/selinux-flash/selinux-flash-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-flash/selinux-flash-2.20141203-r8.ebuild
@@ -13,5 +13,5 @@ DESCRIPTION="SELinux policy for flash"
 if [[ $PV == 9999* ]] ; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-flash/selinux-flash-2.20141203-r9.ebuild b/sec-policy/selinux-flash/selinux-flash-2.20141203-r9.ebuild
new file mode 100644
index 000000000000..61748b82b0e3
--- /dev/null
+++ b/sec-policy/selinux-flash/selinux-flash-2.20141203-r9.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI="5"
+
+IUSE=""
+MODS="flash"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for flash"
+
+if [[ $PV == 9999* ]] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
diff --git a/sec-policy/selinux-fprintd/Manifest b/sec-policy/selinux-fprintd/Manifest
index 8327a635be01..91d204b0021a 100644
--- a/sec-policy/selinux-fprintd/Manifest
+++ b/sec-policy/selinux-fprintd/Manifest
@@ -9,5 +9,6 @@ DIST patchbundle-selinux-base-policy-2.20141203-r5.tar.bz2 274136 SHA256 c23d17c
 DIST patchbundle-selinux-base-policy-2.20141203-r6.tar.bz2 293231 SHA256 b686dcc517b97834f66d967afdcc724cb43b5c6dbf9f34043a91cdeda2625cc7 SHA512 a2c486cbe4a1d21ff3fd01bef25ecf5a633a4072646c67cfccf3f7187d95f3d9e3b482a46ba17c55c40a8e7c0dee56e9cf9ddc9f414d3e4511443b62f60d03e9 WHIRLPOOL 3d708e287e3f9b873be647b0327eab6675a8702ee1cffb56e36934cada306e5ccc64397a083dad9e59de37a067e628cacbf896ae99012d5a209e42fd7cd8a4c6
 DIST patchbundle-selinux-base-policy-2.20141203-r7.tar.bz2 295833 SHA256 ba2219b3efc747be65f94c4d8ac3cd6ee530c82c848fa41935a114184678622a SHA512 8e32d9dbfb2f0f3f50200543aadb51ed9834ccd5cdf30bf8e4d9e6d0b645ce44ffaf80f7aa9385e9c9095d9a383b3a348a92356cb5386c06544ab082a9a468c7 WHIRLPOOL 1648ee1be71e45fcf5a264816ce7edc7bab19bd28a68703923eb2d6068f1f0469ae593855231d31f88baecbf29e7cece2d6beeed20b7c04231a6c90e90d35910
 DIST patchbundle-selinux-base-policy-2.20141203-r8.tar.bz2 297919 SHA256 77539eb3d78105f8789cd8205d2698bd27e2abf100163bdd162cda860fd15120 SHA512 2f8a19e1e4bb65f32b480275f49099aed3ae9df543c7de862b3bbd93e81b89cd96dadac3d091e28673d09a6885db8c5656b3a77d0080775c110b04f2753de7a6 WHIRLPOOL 79cb7e620eb8e838192dc557c7a9ce7e713227d783cc8b63792825559b2145cad70d0af6f99948c1527557bc363feffd846c73893682b4a14fc7d08b9e20c649
+DIST patchbundle-selinux-base-policy-2.20141203-r9.tar.bz2 299602 SHA256 e8518004942a6c57170a609683e22b1410c93a2a195829c41dc8fbc703d941b5 SHA512 ce6484fbca1d2d074e50d1a3953392bd3ce0a4617df98fbac37747b469b4f160a9331586dfe1c3ddccb1ccbee24876a2f05ab49e37c8492a48baf83c2d01d140 WHIRLPOOL 1fd7b956e98e95a64c3a713a944d4531259bd156a7feabf6a89c4b5f33ac846377730eede97889e85183be086f282ebd18e860214f6ca3f01b40f2323470ee04
 DIST refpolicy-2.20140311.tar.bz2 664416 SHA256 f69437db95548c78a5dec44c236397146b144153149009ea554d2e536e5436f7 SHA512 50bacee82ed41ac8b8007ecc33bf51d22303cc2ddd27cfb72cb5520dab5f8e255186e34b89cec492c7a2d4220b200814bdede9b46c19f987a3d3d65a1c9b749a WHIRLPOOL e07480beba6ab1f02ad36b7d0c50c4a71cb39a8ec78bf8d1dc3c82bb9dd1d69d9169d7c937165ea15f60ce1147f256d46644f944107a3a8a800d5bad70d4c255
 DIST refpolicy-2.20141203.tar.bz2 680243 SHA256 f438209c430d8a2d4ddcbe4bdd3edb46f6af7dc4913637af0b73c635e40c1522 SHA512 682e4280c5799e4c12ec7594afc1389f67be35055748d2e0dbdc3419159a16c96d4946ca6178daee8370515951f8653b2e452efe8c962b8d7f9bc192f0b15a0c WHIRLPOOL 74bca232534e7af9051bb1ab9f77c1ff6c425781cf4561f781d6e9a40cc5ca0d9add540249ea5493e8782a9372aea296ead6c165c6c440ae1509eb319d151ee5
diff --git a/sec-policy/selinux-fprintd/selinux-fprintd-2.20141203-r8.ebuild b/sec-policy/selinux-fprintd/selinux-fprintd-2.20141203-r8.ebuild
index 441050ccd677..8fb9bf1e9cce 100644
--- a/sec-policy/selinux-fprintd/selinux-fprintd-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-fprintd/selinux-fprintd-2.20141203-r8.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="SELinux policy for fprintd"
 if [[ $PV == 9999* ]] ; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-dbus
diff --git a/sec-policy/selinux-fprintd/selinux-fprintd-2.20141203-r9.ebuild b/sec-policy/selinux-fprintd/selinux-fprintd-2.20141203-r9.ebuild
new file mode 100644
index 000000000000..441050ccd677
--- /dev/null
+++ b/sec-policy/selinux-fprintd/selinux-fprintd-2.20141203-r9.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI="5"
+
+IUSE=""
+MODS="fprintd"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for fprintd"
+
+if [[ $PV == 9999* ]] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
+DEPEND="${DEPEND}
+	sec-policy/selinux-dbus
+"
+RDEPEND="${RDEPEND}
+	sec-policy/selinux-dbus
+"
diff --git a/sec-policy/selinux-ftp/Manifest b/sec-policy/selinux-ftp/Manifest
index 8327a635be01..91d204b0021a 100644
--- a/sec-policy/selinux-ftp/Manifest
+++ b/sec-policy/selinux-ftp/Manifest
@@ -9,5 +9,6 @@ DIST patchbundle-selinux-base-policy-2.20141203-r5.tar.bz2 274136 SHA256 c23d17c
 DIST patchbundle-selinux-base-policy-2.20141203-r6.tar.bz2 293231 SHA256 b686dcc517b97834f66d967afdcc724cb43b5c6dbf9f34043a91cdeda2625cc7 SHA512 a2c486cbe4a1d21ff3fd01bef25ecf5a633a4072646c67cfccf3f7187d95f3d9e3b482a46ba17c55c40a8e7c0dee56e9cf9ddc9f414d3e4511443b62f60d03e9 WHIRLPOOL 3d708e287e3f9b873be647b0327eab6675a8702ee1cffb56e36934cada306e5ccc64397a083dad9e59de37a067e628cacbf896ae99012d5a209e42fd7cd8a4c6
 DIST patchbundle-selinux-base-policy-2.20141203-r7.tar.bz2 295833 SHA256 ba2219b3efc747be65f94c4d8ac3cd6ee530c82c848fa41935a114184678622a SHA512 8e32d9dbfb2f0f3f50200543aadb51ed9834ccd5cdf30bf8e4d9e6d0b645ce44ffaf80f7aa9385e9c9095d9a383b3a348a92356cb5386c06544ab082a9a468c7 WHIRLPOOL 1648ee1be71e45fcf5a264816ce7edc7bab19bd28a68703923eb2d6068f1f0469ae593855231d31f88baecbf29e7cece2d6beeed20b7c04231a6c90e90d35910
 DIST patchbundle-selinux-base-policy-2.20141203-r8.tar.bz2 297919 SHA256 77539eb3d78105f8789cd8205d2698bd27e2abf100163bdd162cda860fd15120 SHA512 2f8a19e1e4bb65f32b480275f49099aed3ae9df543c7de862b3bbd93e81b89cd96dadac3d091e28673d09a6885db8c5656b3a77d0080775c110b04f2753de7a6 WHIRLPOOL 79cb7e620eb8e838192dc557c7a9ce7e713227d783cc8b63792825559b2145cad70d0af6f99948c1527557bc363feffd846c73893682b4a14fc7d08b9e20c649
+DIST patchbundle-selinux-base-policy-2.20141203-r9.tar.bz2 299602 SHA256 e8518004942a6c57170a609683e22b1410c93a2a195829c41dc8fbc703d941b5 SHA512 ce6484fbca1d2d074e50d1a3953392bd3ce0a4617df98fbac37747b469b4f160a9331586dfe1c3ddccb1ccbee24876a2f05ab49e37c8492a48baf83c2d01d140 WHIRLPOOL 1fd7b956e98e95a64c3a713a944d4531259bd156a7feabf6a89c4b5f33ac846377730eede97889e85183be086f282ebd18e860214f6ca3f01b40f2323470ee04
 DIST refpolicy-2.20140311.tar.bz2 664416 SHA256 f69437db95548c78a5dec44c236397146b144153149009ea554d2e536e5436f7 SHA512 50bacee82ed41ac8b8007ecc33bf51d22303cc2ddd27cfb72cb5520dab5f8e255186e34b89cec492c7a2d4220b200814bdede9b46c19f987a3d3d65a1c9b749a WHIRLPOOL e07480beba6ab1f02ad36b7d0c50c4a71cb39a8ec78bf8d1dc3c82bb9dd1d69d9169d7c937165ea15f60ce1147f256d46644f944107a3a8a800d5bad70d4c255
 DIST refpolicy-2.20141203.tar.bz2 680243 SHA256 f438209c430d8a2d4ddcbe4bdd3edb46f6af7dc4913637af0b73c635e40c1522 SHA512 682e4280c5799e4c12ec7594afc1389f67be35055748d2e0dbdc3419159a16c96d4946ca6178daee8370515951f8653b2e452efe8c962b8d7f9bc192f0b15a0c WHIRLPOOL 74bca232534e7af9051bb1ab9f77c1ff6c425781cf4561f781d6e9a40cc5ca0d9add540249ea5493e8782a9372aea296ead6c165c6c440ae1509eb319d151ee5
diff --git a/sec-policy/selinux-ftp/selinux-ftp-2.20141203-r8.ebuild b/sec-policy/selinux-ftp/selinux-ftp-2.20141203-r8.ebuild
index 00c6b4c5a3b1..412aac4125b6 100644
--- a/sec-policy/selinux-ftp/selinux-ftp-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-ftp/selinux-ftp-2.20141203-r8.ebuild
@@ -13,5 +13,5 @@ DESCRIPTION="SELinux policy for ftp"
 if [[ $PV == 9999* ]] ; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-ftp/selinux-ftp-2.20141203-r9.ebuild b/sec-policy/selinux-ftp/selinux-ftp-2.20141203-r9.ebuild
new file mode 100644
index 000000000000..00c6b4c5a3b1
--- /dev/null
+++ b/sec-policy/selinux-ftp/selinux-ftp-2.20141203-r9.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI="5"
+
+IUSE=""
+MODS="ftp"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for ftp"
+
+if [[ $PV == 9999* ]] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
diff --git a/sec-policy/selinux-games/Manifest b/sec-policy/selinux-games/Manifest
index 8327a635be01..91d204b0021a 100644
--- a/sec-policy/selinux-games/Manifest
+++ b/sec-policy/selinux-games/Manifest
@@ -9,5 +9,6 @@ DIST patchbundle-selinux-base-policy-2.20141203-r5.tar.bz2 274136 SHA256 c23d17c
 DIST patchbundle-selinux-base-policy-2.20141203-r6.tar.bz2 293231 SHA256 b686dcc517b97834f66d967afdcc724cb43b5c6dbf9f34043a91cdeda2625cc7 SHA512 a2c486cbe4a1d21ff3fd01bef25ecf5a633a4072646c67cfccf3f7187d95f3d9e3b482a46ba17c55c40a8e7c0dee56e9cf9ddc9f414d3e4511443b62f60d03e9 WHIRLPOOL 3d708e287e3f9b873be647b0327eab6675a8702ee1cffb56e36934cada306e5ccc64397a083dad9e59de37a067e628cacbf896ae99012d5a209e42fd7cd8a4c6
 DIST patchbundle-selinux-base-policy-2.20141203-r7.tar.bz2 295833 SHA256 ba2219b3efc747be65f94c4d8ac3cd6ee530c82c848fa41935a114184678622a SHA512 8e32d9dbfb2f0f3f50200543aadb51ed9834ccd5cdf30bf8e4d9e6d0b645ce44ffaf80f7aa9385e9c9095d9a383b3a348a92356cb5386c06544ab082a9a468c7 WHIRLPOOL 1648ee1be71e45fcf5a264816ce7edc7bab19bd28a68703923eb2d6068f1f0469ae593855231d31f88baecbf29e7cece2d6beeed20b7c04231a6c90e90d35910
 DIST patchbundle-selinux-base-policy-2.20141203-r8.tar.bz2 297919 SHA256 77539eb3d78105f8789cd8205d2698bd27e2abf100163bdd162cda860fd15120 SHA512 2f8a19e1e4bb65f32b480275f49099aed3ae9df543c7de862b3bbd93e81b89cd96dadac3d091e28673d09a6885db8c5656b3a77d0080775c110b04f2753de7a6 WHIRLPOOL 79cb7e620eb8e838192dc557c7a9ce7e713227d783cc8b63792825559b2145cad70d0af6f99948c1527557bc363feffd846c73893682b4a14fc7d08b9e20c649
+DIST patchbundle-selinux-base-policy-2.20141203-r9.tar.bz2 299602 SHA256 e8518004942a6c57170a609683e22b1410c93a2a195829c41dc8fbc703d941b5 SHA512 ce6484fbca1d2d074e50d1a3953392bd3ce0a4617df98fbac37747b469b4f160a9331586dfe1c3ddccb1ccbee24876a2f05ab49e37c8492a48baf83c2d01d140 WHIRLPOOL 1fd7b956e98e95a64c3a713a944d4531259bd156a7feabf6a89c4b5f33ac846377730eede97889e85183be086f282ebd18e860214f6ca3f01b40f2323470ee04
 DIST refpolicy-2.20140311.tar.bz2 664416 SHA256 f69437db95548c78a5dec44c236397146b144153149009ea554d2e536e5436f7 SHA512 50bacee82ed41ac8b8007ecc33bf51d22303cc2ddd27cfb72cb5520dab5f8e255186e34b89cec492c7a2d4220b200814bdede9b46c19f987a3d3d65a1c9b749a WHIRLPOOL e07480beba6ab1f02ad36b7d0c50c4a71cb39a8ec78bf8d1dc3c82bb9dd1d69d9169d7c937165ea15f60ce1147f256d46644f944107a3a8a800d5bad70d4c255
 DIST refpolicy-2.20141203.tar.bz2 680243 SHA256 f438209c430d8a2d4ddcbe4bdd3edb46f6af7dc4913637af0b73c635e40c1522 SHA512 682e4280c5799e4c12ec7594afc1389f67be35055748d2e0dbdc3419159a16c96d4946ca6178daee8370515951f8653b2e452efe8c962b8d7f9bc192f0b15a0c WHIRLPOOL 74bca232534e7af9051bb1ab9f77c1ff6c425781cf4561f781d6e9a40cc5ca0d9add540249ea5493e8782a9372aea296ead6c165c6c440ae1509eb319d151ee5
diff --git a/sec-policy/selinux-games/selinux-games-2.20141203-r8.ebuild b/sec-policy/selinux-games/selinux-games-2.20141203-r8.ebuild
index bbabfa8db513..947966dbd17d 100644
--- a/sec-policy/selinux-games/selinux-games-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-games/selinux-games-2.20141203-r8.ebuild
@@ -13,5 +13,5 @@ DESCRIPTION="SELinux policy for games"
 if [[ $PV == 9999* ]] ; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-games/selinux-games-2.20141203-r9.ebuild b/sec-policy/selinux-games/selinux-games-2.20141203-r9.ebuild
new file mode 100644
index 000000000000..bbabfa8db513
--- /dev/null
+++ b/sec-policy/selinux-games/selinux-games-2.20141203-r9.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI="5"
+
+IUSE=""
+MODS="games"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for games"
+
+if [[ $PV == 9999* ]] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
diff --git a/sec-policy/selinux-gatekeeper/Manifest b/sec-policy/selinux-gatekeeper/Manifest
index 8327a635be01..91d204b0021a 100644
--- a/sec-policy/selinux-gatekeeper/Manifest
+++ b/sec-policy/selinux-gatekeeper/Manifest
@@ -9,5 +9,6 @@ DIST patchbundle-selinux-base-policy-2.20141203-r5.tar.bz2 274136 SHA256 c23d17c
 DIST patchbundle-selinux-base-policy-2.20141203-r6.tar.bz2 293231 SHA256 b686dcc517b97834f66d967afdcc724cb43b5c6dbf9f34043a91cdeda2625cc7 SHA512 a2c486cbe4a1d21ff3fd01bef25ecf5a633a4072646c67cfccf3f7187d95f3d9e3b482a46ba17c55c40a8e7c0dee56e9cf9ddc9f414d3e4511443b62f60d03e9 WHIRLPOOL 3d708e287e3f9b873be647b0327eab6675a8702ee1cffb56e36934cada306e5ccc64397a083dad9e59de37a067e628cacbf896ae99012d5a209e42fd7cd8a4c6
 DIST patchbundle-selinux-base-policy-2.20141203-r7.tar.bz2 295833 SHA256 ba2219b3efc747be65f94c4d8ac3cd6ee530c82c848fa41935a114184678622a SHA512 8e32d9dbfb2f0f3f50200543aadb51ed9834ccd5cdf30bf8e4d9e6d0b645ce44ffaf80f7aa9385e9c9095d9a383b3a348a92356cb5386c06544ab082a9a468c7 WHIRLPOOL 1648ee1be71e45fcf5a264816ce7edc7bab19bd28a68703923eb2d6068f1f0469ae593855231d31f88baecbf29e7cece2d6beeed20b7c04231a6c90e90d35910
 DIST patchbundle-selinux-base-policy-2.20141203-r8.tar.bz2 297919 SHA256 77539eb3d78105f8789cd8205d2698bd27e2abf100163bdd162cda860fd15120 SHA512 2f8a19e1e4bb65f32b480275f49099aed3ae9df543c7de862b3bbd93e81b89cd96dadac3d091e28673d09a6885db8c5656b3a77d0080775c110b04f2753de7a6 WHIRLPOOL 79cb7e620eb8e838192dc557c7a9ce7e713227d783cc8b63792825559b2145cad70d0af6f99948c1527557bc363feffd846c73893682b4a14fc7d08b9e20c649
+DIST patchbundle-selinux-base-policy-2.20141203-r9.tar.bz2 299602 SHA256 e8518004942a6c57170a609683e22b1410c93a2a195829c41dc8fbc703d941b5 SHA512 ce6484fbca1d2d074e50d1a3953392bd3ce0a4617df98fbac37747b469b4f160a9331586dfe1c3ddccb1ccbee24876a2f05ab49e37c8492a48baf83c2d01d140 WHIRLPOOL 1fd7b956e98e95a64c3a713a944d4531259bd156a7feabf6a89c4b5f33ac846377730eede97889e85183be086f282ebd18e860214f6ca3f01b40f2323470ee04
 DIST refpolicy-2.20140311.tar.bz2 664416 SHA256 f69437db95548c78a5dec44c236397146b144153149009ea554d2e536e5436f7 SHA512 50bacee82ed41ac8b8007ecc33bf51d22303cc2ddd27cfb72cb5520dab5f8e255186e34b89cec492c7a2d4220b200814bdede9b46c19f987a3d3d65a1c9b749a WHIRLPOOL e07480beba6ab1f02ad36b7d0c50c4a71cb39a8ec78bf8d1dc3c82bb9dd1d69d9169d7c937165ea15f60ce1147f256d46644f944107a3a8a800d5bad70d4c255
 DIST refpolicy-2.20141203.tar.bz2 680243 SHA256 f438209c430d8a2d4ddcbe4bdd3edb46f6af7dc4913637af0b73c635e40c1522 SHA512 682e4280c5799e4c12ec7594afc1389f67be35055748d2e0dbdc3419159a16c96d4946ca6178daee8370515951f8653b2e452efe8c962b8d7f9bc192f0b15a0c WHIRLPOOL 74bca232534e7af9051bb1ab9f77c1ff6c425781cf4561f781d6e9a40cc5ca0d9add540249ea5493e8782a9372aea296ead6c165c6c440ae1509eb319d151ee5
diff --git a/sec-policy/selinux-gatekeeper/selinux-gatekeeper-2.20141203-r8.ebuild b/sec-policy/selinux-gatekeeper/selinux-gatekeeper-2.20141203-r8.ebuild
index 187d08a9ab1e..82a90a5bfa62 100644
--- a/sec-policy/selinux-gatekeeper/selinux-gatekeeper-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-gatekeeper/selinux-gatekeeper-2.20141203-r8.ebuild
@@ -13,5 +13,5 @@ DESCRIPTION="SELinux policy for gatekeeper"
 if [[ $PV == 9999* ]] ; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-gatekeeper/selinux-gatekeeper-2.20141203-r9.ebuild b/sec-policy/selinux-gatekeeper/selinux-gatekeeper-2.20141203-r9.ebuild
new file mode 100644
index 000000000000..187d08a9ab1e
--- /dev/null
+++ b/sec-policy/selinux-gatekeeper/selinux-gatekeeper-2.20141203-r9.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI="5"
+
+IUSE=""
+MODS="gatekeeper"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for gatekeeper"
+
+if [[ $PV == 9999* ]] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
diff --git a/sec-policy/selinux-gift/Manifest b/sec-policy/selinux-gift/Manifest
index 8327a635be01..91d204b0021a 100644
--- a/sec-policy/selinux-gift/Manifest
+++ b/sec-policy/selinux-gift/Manifest
@@ -9,5 +9,6 @@ DIST patchbundle-selinux-base-policy-2.20141203-r5.tar.bz2 274136 SHA256 c23d17c
 DIST patchbundle-selinux-base-policy-2.20141203-r6.tar.bz2 293231 SHA256 b686dcc517b97834f66d967afdcc724cb43b5c6dbf9f34043a91cdeda2625cc7 SHA512 a2c486cbe4a1d21ff3fd01bef25ecf5a633a4072646c67cfccf3f7187d95f3d9e3b482a46ba17c55c40a8e7c0dee56e9cf9ddc9f414d3e4511443b62f60d03e9 WHIRLPOOL 3d708e287e3f9b873be647b0327eab6675a8702ee1cffb56e36934cada306e5ccc64397a083dad9e59de37a067e628cacbf896ae99012d5a209e42fd7cd8a4c6
 DIST patchbundle-selinux-base-policy-2.20141203-r7.tar.bz2 295833 SHA256 ba2219b3efc747be65f94c4d8ac3cd6ee530c82c848fa41935a114184678622a SHA512 8e32d9dbfb2f0f3f50200543aadb51ed9834ccd5cdf30bf8e4d9e6d0b645ce44ffaf80f7aa9385e9c9095d9a383b3a348a92356cb5386c06544ab082a9a468c7 WHIRLPOOL 1648ee1be71e45fcf5a264816ce7edc7bab19bd28a68703923eb2d6068f1f0469ae593855231d31f88baecbf29e7cece2d6beeed20b7c04231a6c90e90d35910
 DIST patchbundle-selinux-base-policy-2.20141203-r8.tar.bz2 297919 SHA256 77539eb3d78105f8789cd8205d2698bd27e2abf100163bdd162cda860fd15120 SHA512 2f8a19e1e4bb65f32b480275f49099aed3ae9df543c7de862b3bbd93e81b89cd96dadac3d091e28673d09a6885db8c5656b3a77d0080775c110b04f2753de7a6 WHIRLPOOL 79cb7e620eb8e838192dc557c7a9ce7e713227d783cc8b63792825559b2145cad70d0af6f99948c1527557bc363feffd846c73893682b4a14fc7d08b9e20c649
+DIST patchbundle-selinux-base-policy-2.20141203-r9.tar.bz2 299602 SHA256 e8518004942a6c57170a609683e22b1410c93a2a195829c41dc8fbc703d941b5 SHA512 ce6484fbca1d2d074e50d1a3953392bd3ce0a4617df98fbac37747b469b4f160a9331586dfe1c3ddccb1ccbee24876a2f05ab49e37c8492a48baf83c2d01d140 WHIRLPOOL 1fd7b956e98e95a64c3a713a944d4531259bd156a7feabf6a89c4b5f33ac846377730eede97889e85183be086f282ebd18e860214f6ca3f01b40f2323470ee04
 DIST refpolicy-2.20140311.tar.bz2 664416 SHA256 f69437db95548c78a5dec44c236397146b144153149009ea554d2e536e5436f7 SHA512 50bacee82ed41ac8b8007ecc33bf51d22303cc2ddd27cfb72cb5520dab5f8e255186e34b89cec492c7a2d4220b200814bdede9b46c19f987a3d3d65a1c9b749a WHIRLPOOL e07480beba6ab1f02ad36b7d0c50c4a71cb39a8ec78bf8d1dc3c82bb9dd1d69d9169d7c937165ea15f60ce1147f256d46644f944107a3a8a800d5bad70d4c255
 DIST refpolicy-2.20141203.tar.bz2 680243 SHA256 f438209c430d8a2d4ddcbe4bdd3edb46f6af7dc4913637af0b73c635e40c1522 SHA512 682e4280c5799e4c12ec7594afc1389f67be35055748d2e0dbdc3419159a16c96d4946ca6178daee8370515951f8653b2e452efe8c962b8d7f9bc192f0b15a0c WHIRLPOOL 74bca232534e7af9051bb1ab9f77c1ff6c425781cf4561f781d6e9a40cc5ca0d9add540249ea5493e8782a9372aea296ead6c165c6c440ae1509eb319d151ee5
diff --git a/sec-policy/selinux-gift/selinux-gift-2.20141203-r8.ebuild b/sec-policy/selinux-gift/selinux-gift-2.20141203-r8.ebuild
index 4596b3953650..848e5a59bd74 100644
--- a/sec-policy/selinux-gift/selinux-gift-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-gift/selinux-gift-2.20141203-r8.ebuild
@@ -13,5 +13,5 @@ DESCRIPTION="SELinux policy for gift"
 if [[ $PV == 9999* ]] ; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-gift/selinux-gift-2.20141203-r9.ebuild b/sec-policy/selinux-gift/selinux-gift-2.20141203-r9.ebuild
new file mode 100644
index 000000000000..4596b3953650
--- /dev/null
+++ b/sec-policy/selinux-gift/selinux-gift-2.20141203-r9.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI="5"
+
+IUSE=""
+MODS="gift"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for gift"
+
+if [[ $PV == 9999* ]] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
diff --git a/sec-policy/selinux-git/Manifest b/sec-policy/selinux-git/Manifest
index 58f612f85f47..9e8e9f5a6a9d 100644
--- a/sec-policy/selinux-git/Manifest
+++ b/sec-policy/selinux-git/Manifest
@@ -2,4 +2,5 @@ DIST patchbundle-selinux-base-policy-2.20141203-r5.tar.bz2 274136 SHA256 c23d17c
 DIST patchbundle-selinux-base-policy-2.20141203-r6.tar.bz2 293231 SHA256 b686dcc517b97834f66d967afdcc724cb43b5c6dbf9f34043a91cdeda2625cc7 SHA512 a2c486cbe4a1d21ff3fd01bef25ecf5a633a4072646c67cfccf3f7187d95f3d9e3b482a46ba17c55c40a8e7c0dee56e9cf9ddc9f414d3e4511443b62f60d03e9 WHIRLPOOL 3d708e287e3f9b873be647b0327eab6675a8702ee1cffb56e36934cada306e5ccc64397a083dad9e59de37a067e628cacbf896ae99012d5a209e42fd7cd8a4c6
 DIST patchbundle-selinux-base-policy-2.20141203-r7.tar.bz2 295833 SHA256 ba2219b3efc747be65f94c4d8ac3cd6ee530c82c848fa41935a114184678622a SHA512 8e32d9dbfb2f0f3f50200543aadb51ed9834ccd5cdf30bf8e4d9e6d0b645ce44ffaf80f7aa9385e9c9095d9a383b3a348a92356cb5386c06544ab082a9a468c7 WHIRLPOOL 1648ee1be71e45fcf5a264816ce7edc7bab19bd28a68703923eb2d6068f1f0469ae593855231d31f88baecbf29e7cece2d6beeed20b7c04231a6c90e90d35910
 DIST patchbundle-selinux-base-policy-2.20141203-r8.tar.bz2 297919 SHA256 77539eb3d78105f8789cd8205d2698bd27e2abf100163bdd162cda860fd15120 SHA512 2f8a19e1e4bb65f32b480275f49099aed3ae9df543c7de862b3bbd93e81b89cd96dadac3d091e28673d09a6885db8c5656b3a77d0080775c110b04f2753de7a6 WHIRLPOOL 79cb7e620eb8e838192dc557c7a9ce7e713227d783cc8b63792825559b2145cad70d0af6f99948c1527557bc363feffd846c73893682b4a14fc7d08b9e20c649
+DIST patchbundle-selinux-base-policy-2.20141203-r9.tar.bz2 299602 SHA256 e8518004942a6c57170a609683e22b1410c93a2a195829c41dc8fbc703d941b5 SHA512 ce6484fbca1d2d074e50d1a3953392bd3ce0a4617df98fbac37747b469b4f160a9331586dfe1c3ddccb1ccbee24876a2f05ab49e37c8492a48baf83c2d01d140 WHIRLPOOL 1fd7b956e98e95a64c3a713a944d4531259bd156a7feabf6a89c4b5f33ac846377730eede97889e85183be086f282ebd18e860214f6ca3f01b40f2323470ee04
 DIST refpolicy-2.20141203.tar.bz2 680243 SHA256 f438209c430d8a2d4ddcbe4bdd3edb46f6af7dc4913637af0b73c635e40c1522 SHA512 682e4280c5799e4c12ec7594afc1389f67be35055748d2e0dbdc3419159a16c96d4946ca6178daee8370515951f8653b2e452efe8c962b8d7f9bc192f0b15a0c WHIRLPOOL 74bca232534e7af9051bb1ab9f77c1ff6c425781cf4561f781d6e9a40cc5ca0d9add540249ea5493e8782a9372aea296ead6c165c6c440ae1509eb319d151ee5
diff --git a/sec-policy/selinux-git/selinux-git-2.20141203-r8.ebuild b/sec-policy/selinux-git/selinux-git-2.20141203-r8.ebuild
index 5cb6287cc5c1..77c072e5eb2b 100644
--- a/sec-policy/selinux-git/selinux-git-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-git/selinux-git-2.20141203-r8.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="SELinux policy for git"
 if [[ $PV == 9999* ]] ; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-git/selinux-git-2.20141203-r9.ebuild b/sec-policy/selinux-git/selinux-git-2.20141203-r9.ebuild
new file mode 100644
index 000000000000..5cb6287cc5c1
--- /dev/null
+++ b/sec-policy/selinux-git/selinux-git-2.20141203-r9.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI="5"
+
+IUSE=""
+MODS="git"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for git"
+
+if [[ $PV == 9999* ]] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DEPEND="${DEPEND}
+	sec-policy/selinux-apache
+"
+RDEPEND="${DEPEND}
+	sec-policy/selinux-apache
+"
diff --git a/sec-policy/selinux-gitosis/Manifest b/sec-policy/selinux-gitosis/Manifest
index 8327a635be01..91d204b0021a 100644
--- a/sec-policy/selinux-gitosis/Manifest
+++ b/sec-policy/selinux-gitosis/Manifest
@@ -9,5 +9,6 @@ DIST patchbundle-selinux-base-policy-2.20141203-r5.tar.bz2 274136 SHA256 c23d17c
 DIST patchbundle-selinux-base-policy-2.20141203-r6.tar.bz2 293231 SHA256 b686dcc517b97834f66d967afdcc724cb43b5c6dbf9f34043a91cdeda2625cc7 SHA512 a2c486cbe4a1d21ff3fd01bef25ecf5a633a4072646c67cfccf3f7187d95f3d9e3b482a46ba17c55c40a8e7c0dee56e9cf9ddc9f414d3e4511443b62f60d03e9 WHIRLPOOL 3d708e287e3f9b873be647b0327eab6675a8702ee1cffb56e36934cada306e5ccc64397a083dad9e59de37a067e628cacbf896ae99012d5a209e42fd7cd8a4c6
 DIST patchbundle-selinux-base-policy-2.20141203-r7.tar.bz2 295833 SHA256 ba2219b3efc747be65f94c4d8ac3cd6ee530c82c848fa41935a114184678622a SHA512 8e32d9dbfb2f0f3f50200543aadb51ed9834ccd5cdf30bf8e4d9e6d0b645ce44ffaf80f7aa9385e9c9095d9a383b3a348a92356cb5386c06544ab082a9a468c7 WHIRLPOOL 1648ee1be71e45fcf5a264816ce7edc7bab19bd28a68703923eb2d6068f1f0469ae593855231d31f88baecbf29e7cece2d6beeed20b7c04231a6c90e90d35910
 DIST patchbundle-selinux-base-policy-2.20141203-r8.tar.bz2 297919 SHA256 77539eb3d78105f8789cd8205d2698bd27e2abf100163bdd162cda860fd15120 SHA512 2f8a19e1e4bb65f32b480275f49099aed3ae9df543c7de862b3bbd93e81b89cd96dadac3d091e28673d09a6885db8c5656b3a77d0080775c110b04f2753de7a6 WHIRLPOOL 79cb7e620eb8e838192dc557c7a9ce7e713227d783cc8b63792825559b2145cad70d0af6f99948c1527557bc363feffd846c73893682b4a14fc7d08b9e20c649
+DIST patchbundle-selinux-base-policy-2.20141203-r9.tar.bz2 299602 SHA256 e8518004942a6c57170a609683e22b1410c93a2a195829c41dc8fbc703d941b5 SHA512 ce6484fbca1d2d074e50d1a3953392bd3ce0a4617df98fbac37747b469b4f160a9331586dfe1c3ddccb1ccbee24876a2f05ab49e37c8492a48baf83c2d01d140 WHIRLPOOL 1fd7b956e98e95a64c3a713a944d4531259bd156a7feabf6a89c4b5f33ac846377730eede97889e85183be086f282ebd18e860214f6ca3f01b40f2323470ee04
 DIST refpolicy-2.20140311.tar.bz2 664416 SHA256 f69437db95548c78a5dec44c236397146b144153149009ea554d2e536e5436f7 SHA512 50bacee82ed41ac8b8007ecc33bf51d22303cc2ddd27cfb72cb5520dab5f8e255186e34b89cec492c7a2d4220b200814bdede9b46c19f987a3d3d65a1c9b749a WHIRLPOOL e07480beba6ab1f02ad36b7d0c50c4a71cb39a8ec78bf8d1dc3c82bb9dd1d69d9169d7c937165ea15f60ce1147f256d46644f944107a3a8a800d5bad70d4c255
 DIST refpolicy-2.20141203.tar.bz2 680243 SHA256 f438209c430d8a2d4ddcbe4bdd3edb46f6af7dc4913637af0b73c635e40c1522 SHA512 682e4280c5799e4c12ec7594afc1389f67be35055748d2e0dbdc3419159a16c96d4946ca6178daee8370515951f8653b2e452efe8c962b8d7f9bc192f0b15a0c WHIRLPOOL 74bca232534e7af9051bb1ab9f77c1ff6c425781cf4561f781d6e9a40cc5ca0d9add540249ea5493e8782a9372aea296ead6c165c6c440ae1509eb319d151ee5
diff --git a/sec-policy/selinux-gitosis/selinux-gitosis-2.20141203-r8.ebuild b/sec-policy/selinux-gitosis/selinux-gitosis-2.20141203-r8.ebuild
index 10cdcb488876..e09c983a70c4 100644
--- a/sec-policy/selinux-gitosis/selinux-gitosis-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-gitosis/selinux-gitosis-2.20141203-r8.ebuild
@@ -13,5 +13,5 @@ DESCRIPTION="SELinux policy for gitosis"
 if [[ $PV == 9999* ]] ; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-gitosis/selinux-gitosis-2.20141203-r9.ebuild b/sec-policy/selinux-gitosis/selinux-gitosis-2.20141203-r9.ebuild
new file mode 100644
index 000000000000..10cdcb488876
--- /dev/null
+++ b/sec-policy/selinux-gitosis/selinux-gitosis-2.20141203-r9.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI="5"
+
+IUSE=""
+MODS="gitosis"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for gitosis"
+
+if [[ $PV == 9999* ]] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
diff --git a/sec-policy/selinux-gnome/Manifest b/sec-policy/selinux-gnome/Manifest
index 8327a635be01..91d204b0021a 100644
--- a/sec-policy/selinux-gnome/Manifest
+++ b/sec-policy/selinux-gnome/Manifest
@@ -9,5 +9,6 @@ DIST patchbundle-selinux-base-policy-2.20141203-r5.tar.bz2 274136 SHA256 c23d17c
 DIST patchbundle-selinux-base-policy-2.20141203-r6.tar.bz2 293231 SHA256 b686dcc517b97834f66d967afdcc724cb43b5c6dbf9f34043a91cdeda2625cc7 SHA512 a2c486cbe4a1d21ff3fd01bef25ecf5a633a4072646c67cfccf3f7187d95f3d9e3b482a46ba17c55c40a8e7c0dee56e9cf9ddc9f414d3e4511443b62f60d03e9 WHIRLPOOL 3d708e287e3f9b873be647b0327eab6675a8702ee1cffb56e36934cada306e5ccc64397a083dad9e59de37a067e628cacbf896ae99012d5a209e42fd7cd8a4c6
 DIST patchbundle-selinux-base-policy-2.20141203-r7.tar.bz2 295833 SHA256 ba2219b3efc747be65f94c4d8ac3cd6ee530c82c848fa41935a114184678622a SHA512 8e32d9dbfb2f0f3f50200543aadb51ed9834ccd5cdf30bf8e4d9e6d0b645ce44ffaf80f7aa9385e9c9095d9a383b3a348a92356cb5386c06544ab082a9a468c7 WHIRLPOOL 1648ee1be71e45fcf5a264816ce7edc7bab19bd28a68703923eb2d6068f1f0469ae593855231d31f88baecbf29e7cece2d6beeed20b7c04231a6c90e90d35910
 DIST patchbundle-selinux-base-policy-2.20141203-r8.tar.bz2 297919 SHA256 77539eb3d78105f8789cd8205d2698bd27e2abf100163bdd162cda860fd15120 SHA512 2f8a19e1e4bb65f32b480275f49099aed3ae9df543c7de862b3bbd93e81b89cd96dadac3d091e28673d09a6885db8c5656b3a77d0080775c110b04f2753de7a6 WHIRLPOOL 79cb7e620eb8e838192dc557c7a9ce7e713227d783cc8b63792825559b2145cad70d0af6f99948c1527557bc363feffd846c73893682b4a14fc7d08b9e20c649
+DIST patchbundle-selinux-base-policy-2.20141203-r9.tar.bz2 299602 SHA256 e8518004942a6c57170a609683e22b1410c93a2a195829c41dc8fbc703d941b5 SHA512 ce6484fbca1d2d074e50d1a3953392bd3ce0a4617df98fbac37747b469b4f160a9331586dfe1c3ddccb1ccbee24876a2f05ab49e37c8492a48baf83c2d01d140 WHIRLPOOL 1fd7b956e98e95a64c3a713a944d4531259bd156a7feabf6a89c4b5f33ac846377730eede97889e85183be086f282ebd18e860214f6ca3f01b40f2323470ee04
 DIST refpolicy-2.20140311.tar.bz2 664416 SHA256 f69437db95548c78a5dec44c236397146b144153149009ea554d2e536e5436f7 SHA512 50bacee82ed41ac8b8007ecc33bf51d22303cc2ddd27cfb72cb5520dab5f8e255186e34b89cec492c7a2d4220b200814bdede9b46c19f987a3d3d65a1c9b749a WHIRLPOOL e07480beba6ab1f02ad36b7d0c50c4a71cb39a8ec78bf8d1dc3c82bb9dd1d69d9169d7c937165ea15f60ce1147f256d46644f944107a3a8a800d5bad70d4c255
 DIST refpolicy-2.20141203.tar.bz2 680243 SHA256 f438209c430d8a2d4ddcbe4bdd3edb46f6af7dc4913637af0b73c635e40c1522 SHA512 682e4280c5799e4c12ec7594afc1389f67be35055748d2e0dbdc3419159a16c96d4946ca6178daee8370515951f8653b2e452efe8c962b8d7f9bc192f0b15a0c WHIRLPOOL 74bca232534e7af9051bb1ab9f77c1ff6c425781cf4561f781d6e9a40cc5ca0d9add540249ea5493e8782a9372aea296ead6c165c6c440ae1509eb319d151ee5
diff --git a/sec-policy/selinux-gnome/selinux-gnome-2.20141203-r8.ebuild b/sec-policy/selinux-gnome/selinux-gnome-2.20141203-r8.ebuild
index 91c714285d56..a24013604051 100644
--- a/sec-policy/selinux-gnome/selinux-gnome-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-gnome/selinux-gnome-2.20141203-r8.ebuild
@@ -13,5 +13,5 @@ DESCRIPTION="SELinux policy for gnome"
 if [[ $PV == 9999* ]] ; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-gnome/selinux-gnome-2.20141203-r9.ebuild b/sec-policy/selinux-gnome/selinux-gnome-2.20141203-r9.ebuild
new file mode 100644
index 000000000000..91c714285d56
--- /dev/null
+++ b/sec-policy/selinux-gnome/selinux-gnome-2.20141203-r9.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI="5"
+
+IUSE=""
+MODS="gnome"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for gnome"
+
+if [[ $PV == 9999* ]] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
diff --git a/sec-policy/selinux-googletalk/Manifest b/sec-policy/selinux-googletalk/Manifest
index 8327a635be01..91d204b0021a 100644
--- a/sec-policy/selinux-googletalk/Manifest
+++ b/sec-policy/selinux-googletalk/Manifest
@@ -9,5 +9,6 @@ DIST patchbundle-selinux-base-policy-2.20141203-r5.tar.bz2 274136 SHA256 c23d17c
 DIST patchbundle-selinux-base-policy-2.20141203-r6.tar.bz2 293231 SHA256 b686dcc517b97834f66d967afdcc724cb43b5c6dbf9f34043a91cdeda2625cc7 SHA512 a2c486cbe4a1d21ff3fd01bef25ecf5a633a4072646c67cfccf3f7187d95f3d9e3b482a46ba17c55c40a8e7c0dee56e9cf9ddc9f414d3e4511443b62f60d03e9 WHIRLPOOL 3d708e287e3f9b873be647b0327eab6675a8702ee1cffb56e36934cada306e5ccc64397a083dad9e59de37a067e628cacbf896ae99012d5a209e42fd7cd8a4c6
 DIST patchbundle-selinux-base-policy-2.20141203-r7.tar.bz2 295833 SHA256 ba2219b3efc747be65f94c4d8ac3cd6ee530c82c848fa41935a114184678622a SHA512 8e32d9dbfb2f0f3f50200543aadb51ed9834ccd5cdf30bf8e4d9e6d0b645ce44ffaf80f7aa9385e9c9095d9a383b3a348a92356cb5386c06544ab082a9a468c7 WHIRLPOOL 1648ee1be71e45fcf5a264816ce7edc7bab19bd28a68703923eb2d6068f1f0469ae593855231d31f88baecbf29e7cece2d6beeed20b7c04231a6c90e90d35910
 DIST patchbundle-selinux-base-policy-2.20141203-r8.tar.bz2 297919 SHA256 77539eb3d78105f8789cd8205d2698bd27e2abf100163bdd162cda860fd15120 SHA512 2f8a19e1e4bb65f32b480275f49099aed3ae9df543c7de862b3bbd93e81b89cd96dadac3d091e28673d09a6885db8c5656b3a77d0080775c110b04f2753de7a6 WHIRLPOOL 79cb7e620eb8e838192dc557c7a9ce7e713227d783cc8b63792825559b2145cad70d0af6f99948c1527557bc363feffd846c73893682b4a14fc7d08b9e20c649
+DIST patchbundle-selinux-base-policy-2.20141203-r9.tar.bz2 299602 SHA256 e8518004942a6c57170a609683e22b1410c93a2a195829c41dc8fbc703d941b5 SHA512 ce6484fbca1d2d074e50d1a3953392bd3ce0a4617df98fbac37747b469b4f160a9331586dfe1c3ddccb1ccbee24876a2f05ab49e37c8492a48baf83c2d01d140 WHIRLPOOL 1fd7b956e98e95a64c3a713a944d4531259bd156a7feabf6a89c4b5f33ac846377730eede97889e85183be086f282ebd18e860214f6ca3f01b40f2323470ee04
 DIST refpolicy-2.20140311.tar.bz2 664416 SHA256 f69437db95548c78a5dec44c236397146b144153149009ea554d2e536e5436f7 SHA512 50bacee82ed41ac8b8007ecc33bf51d22303cc2ddd27cfb72cb5520dab5f8e255186e34b89cec492c7a2d4220b200814bdede9b46c19f987a3d3d65a1c9b749a WHIRLPOOL e07480beba6ab1f02ad36b7d0c50c4a71cb39a8ec78bf8d1dc3c82bb9dd1d69d9169d7c937165ea15f60ce1147f256d46644f944107a3a8a800d5bad70d4c255
 DIST refpolicy-2.20141203.tar.bz2 680243 SHA256 f438209c430d8a2d4ddcbe4bdd3edb46f6af7dc4913637af0b73c635e40c1522 SHA512 682e4280c5799e4c12ec7594afc1389f67be35055748d2e0dbdc3419159a16c96d4946ca6178daee8370515951f8653b2e452efe8c962b8d7f9bc192f0b15a0c WHIRLPOOL 74bca232534e7af9051bb1ab9f77c1ff6c425781cf4561f781d6e9a40cc5ca0d9add540249ea5493e8782a9372aea296ead6c165c6c440ae1509eb319d151ee5
diff --git a/sec-policy/selinux-googletalk/selinux-googletalk-2.20141203-r8.ebuild b/sec-policy/selinux-googletalk/selinux-googletalk-2.20141203-r8.ebuild
index 4d474a034e0f..63d0847c5346 100644
--- a/sec-policy/selinux-googletalk/selinux-googletalk-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-googletalk/selinux-googletalk-2.20141203-r8.ebuild
@@ -13,5 +13,5 @@ DESCRIPTION="SELinux policy for googletalk"
 if [[ $PV == 9999* ]] ; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-googletalk/selinux-googletalk-2.20141203-r9.ebuild b/sec-policy/selinux-googletalk/selinux-googletalk-2.20141203-r9.ebuild
new file mode 100644
index 000000000000..4d474a034e0f
--- /dev/null
+++ b/sec-policy/selinux-googletalk/selinux-googletalk-2.20141203-r9.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI="5"
+
+IUSE="alsa"
+MODS="googletalk"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for googletalk"
+
+if [[ $PV == 9999* ]] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
diff --git a/sec-policy/selinux-gorg/Manifest b/sec-policy/selinux-gorg/Manifest
index 8327a635be01..91d204b0021a 100644
--- a/sec-policy/selinux-gorg/Manifest
+++ b/sec-policy/selinux-gorg/Manifest
@@ -9,5 +9,6 @@ DIST patchbundle-selinux-base-policy-2.20141203-r5.tar.bz2 274136 SHA256 c23d17c
 DIST patchbundle-selinux-base-policy-2.20141203-r6.tar.bz2 293231 SHA256 b686dcc517b97834f66d967afdcc724cb43b5c6dbf9f34043a91cdeda2625cc7 SHA512 a2c486cbe4a1d21ff3fd01bef25ecf5a633a4072646c67cfccf3f7187d95f3d9e3b482a46ba17c55c40a8e7c0dee56e9cf9ddc9f414d3e4511443b62f60d03e9 WHIRLPOOL 3d708e287e3f9b873be647b0327eab6675a8702ee1cffb56e36934cada306e5ccc64397a083dad9e59de37a067e628cacbf896ae99012d5a209e42fd7cd8a4c6
 DIST patchbundle-selinux-base-policy-2.20141203-r7.tar.bz2 295833 SHA256 ba2219b3efc747be65f94c4d8ac3cd6ee530c82c848fa41935a114184678622a SHA512 8e32d9dbfb2f0f3f50200543aadb51ed9834ccd5cdf30bf8e4d9e6d0b645ce44ffaf80f7aa9385e9c9095d9a383b3a348a92356cb5386c06544ab082a9a468c7 WHIRLPOOL 1648ee1be71e45fcf5a264816ce7edc7bab19bd28a68703923eb2d6068f1f0469ae593855231d31f88baecbf29e7cece2d6beeed20b7c04231a6c90e90d35910
 DIST patchbundle-selinux-base-policy-2.20141203-r8.tar.bz2 297919 SHA256 77539eb3d78105f8789cd8205d2698bd27e2abf100163bdd162cda860fd15120 SHA512 2f8a19e1e4bb65f32b480275f49099aed3ae9df543c7de862b3bbd93e81b89cd96dadac3d091e28673d09a6885db8c5656b3a77d0080775c110b04f2753de7a6 WHIRLPOOL 79cb7e620eb8e838192dc557c7a9ce7e713227d783cc8b63792825559b2145cad70d0af6f99948c1527557bc363feffd846c73893682b4a14fc7d08b9e20c649
+DIST patchbundle-selinux-base-policy-2.20141203-r9.tar.bz2 299602 SHA256 e8518004942a6c57170a609683e22b1410c93a2a195829c41dc8fbc703d941b5 SHA512 ce6484fbca1d2d074e50d1a3953392bd3ce0a4617df98fbac37747b469b4f160a9331586dfe1c3ddccb1ccbee24876a2f05ab49e37c8492a48baf83c2d01d140 WHIRLPOOL 1fd7b956e98e95a64c3a713a944d4531259bd156a7feabf6a89c4b5f33ac846377730eede97889e85183be086f282ebd18e860214f6ca3f01b40f2323470ee04
 DIST refpolicy-2.20140311.tar.bz2 664416 SHA256 f69437db95548c78a5dec44c236397146b144153149009ea554d2e536e5436f7 SHA512 50bacee82ed41ac8b8007ecc33bf51d22303cc2ddd27cfb72cb5520dab5f8e255186e34b89cec492c7a2d4220b200814bdede9b46c19f987a3d3d65a1c9b749a WHIRLPOOL e07480beba6ab1f02ad36b7d0c50c4a71cb39a8ec78bf8d1dc3c82bb9dd1d69d9169d7c937165ea15f60ce1147f256d46644f944107a3a8a800d5bad70d4c255
 DIST refpolicy-2.20141203.tar.bz2 680243 SHA256 f438209c430d8a2d4ddcbe4bdd3edb46f6af7dc4913637af0b73c635e40c1522 SHA512 682e4280c5799e4c12ec7594afc1389f67be35055748d2e0dbdc3419159a16c96d4946ca6178daee8370515951f8653b2e452efe8c962b8d7f9bc192f0b15a0c WHIRLPOOL 74bca232534e7af9051bb1ab9f77c1ff6c425781cf4561f781d6e9a40cc5ca0d9add540249ea5493e8782a9372aea296ead6c165c6c440ae1509eb319d151ee5
diff --git a/sec-policy/selinux-gorg/selinux-gorg-2.20141203-r8.ebuild b/sec-policy/selinux-gorg/selinux-gorg-2.20141203-r8.ebuild
index e44cf2ab691b..76775db8aeee 100644
--- a/sec-policy/selinux-gorg/selinux-gorg-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-gorg/selinux-gorg-2.20141203-r8.ebuild
@@ -13,5 +13,5 @@ DESCRIPTION="SELinux policy for gorg"
 if [[ $PV == 9999* ]] ; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-gorg/selinux-gorg-2.20141203-r9.ebuild b/sec-policy/selinux-gorg/selinux-gorg-2.20141203-r9.ebuild
new file mode 100644
index 000000000000..e44cf2ab691b
--- /dev/null
+++ b/sec-policy/selinux-gorg/selinux-gorg-2.20141203-r9.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI="5"
+
+IUSE=""
+MODS="gorg"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for gorg"
+
+if [[ $PV == 9999* ]] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
diff --git a/sec-policy/selinux-gpg/Manifest b/sec-policy/selinux-gpg/Manifest
index 8327a635be01..91d204b0021a 100644
--- a/sec-policy/selinux-gpg/Manifest
+++ b/sec-policy/selinux-gpg/Manifest
@@ -9,5 +9,6 @@ DIST patchbundle-selinux-base-policy-2.20141203-r5.tar.bz2 274136 SHA256 c23d17c
 DIST patchbundle-selinux-base-policy-2.20141203-r6.tar.bz2 293231 SHA256 b686dcc517b97834f66d967afdcc724cb43b5c6dbf9f34043a91cdeda2625cc7 SHA512 a2c486cbe4a1d21ff3fd01bef25ecf5a633a4072646c67cfccf3f7187d95f3d9e3b482a46ba17c55c40a8e7c0dee56e9cf9ddc9f414d3e4511443b62f60d03e9 WHIRLPOOL 3d708e287e3f9b873be647b0327eab6675a8702ee1cffb56e36934cada306e5ccc64397a083dad9e59de37a067e628cacbf896ae99012d5a209e42fd7cd8a4c6
 DIST patchbundle-selinux-base-policy-2.20141203-r7.tar.bz2 295833 SHA256 ba2219b3efc747be65f94c4d8ac3cd6ee530c82c848fa41935a114184678622a SHA512 8e32d9dbfb2f0f3f50200543aadb51ed9834ccd5cdf30bf8e4d9e6d0b645ce44ffaf80f7aa9385e9c9095d9a383b3a348a92356cb5386c06544ab082a9a468c7 WHIRLPOOL 1648ee1be71e45fcf5a264816ce7edc7bab19bd28a68703923eb2d6068f1f0469ae593855231d31f88baecbf29e7cece2d6beeed20b7c04231a6c90e90d35910
 DIST patchbundle-selinux-base-policy-2.20141203-r8.tar.bz2 297919 SHA256 77539eb3d78105f8789cd8205d2698bd27e2abf100163bdd162cda860fd15120 SHA512 2f8a19e1e4bb65f32b480275f49099aed3ae9df543c7de862b3bbd93e81b89cd96dadac3d091e28673d09a6885db8c5656b3a77d0080775c110b04f2753de7a6 WHIRLPOOL 79cb7e620eb8e838192dc557c7a9ce7e713227d783cc8b63792825559b2145cad70d0af6f99948c1527557bc363feffd846c73893682b4a14fc7d08b9e20c649
+DIST patchbundle-selinux-base-policy-2.20141203-r9.tar.bz2 299602 SHA256 e8518004942a6c57170a609683e22b1410c93a2a195829c41dc8fbc703d941b5 SHA512 ce6484fbca1d2d074e50d1a3953392bd3ce0a4617df98fbac37747b469b4f160a9331586dfe1c3ddccb1ccbee24876a2f05ab49e37c8492a48baf83c2d01d140 WHIRLPOOL 1fd7b956e98e95a64c3a713a944d4531259bd156a7feabf6a89c4b5f33ac846377730eede97889e85183be086f282ebd18e860214f6ca3f01b40f2323470ee04
 DIST refpolicy-2.20140311.tar.bz2 664416 SHA256 f69437db95548c78a5dec44c236397146b144153149009ea554d2e536e5436f7 SHA512 50bacee82ed41ac8b8007ecc33bf51d22303cc2ddd27cfb72cb5520dab5f8e255186e34b89cec492c7a2d4220b200814bdede9b46c19f987a3d3d65a1c9b749a WHIRLPOOL e07480beba6ab1f02ad36b7d0c50c4a71cb39a8ec78bf8d1dc3c82bb9dd1d69d9169d7c937165ea15f60ce1147f256d46644f944107a3a8a800d5bad70d4c255
 DIST refpolicy-2.20141203.tar.bz2 680243 SHA256 f438209c430d8a2d4ddcbe4bdd3edb46f6af7dc4913637af0b73c635e40c1522 SHA512 682e4280c5799e4c12ec7594afc1389f67be35055748d2e0dbdc3419159a16c96d4946ca6178daee8370515951f8653b2e452efe8c962b8d7f9bc192f0b15a0c WHIRLPOOL 74bca232534e7af9051bb1ab9f77c1ff6c425781cf4561f781d6e9a40cc5ca0d9add540249ea5493e8782a9372aea296ead6c165c6c440ae1509eb319d151ee5
diff --git a/sec-policy/selinux-gpg/selinux-gpg-2.20141203-r8.ebuild b/sec-policy/selinux-gpg/selinux-gpg-2.20141203-r8.ebuild
index 65b9d0682526..b9054776423d 100644
--- a/sec-policy/selinux-gpg/selinux-gpg-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-gpg/selinux-gpg-2.20141203-r8.ebuild
@@ -13,5 +13,5 @@ DESCRIPTION="SELinux policy for gpg"
 if [[ $PV == 9999* ]] ; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-gpg/selinux-gpg-2.20141203-r9.ebuild b/sec-policy/selinux-gpg/selinux-gpg-2.20141203-r9.ebuild
new file mode 100644
index 000000000000..65b9d0682526
--- /dev/null
+++ b/sec-policy/selinux-gpg/selinux-gpg-2.20141203-r9.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI="5"
+
+IUSE=""
+MODS="gpg"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for gpg"
+
+if [[ $PV == 9999* ]] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
diff --git a/sec-policy/selinux-gpm/Manifest b/sec-policy/selinux-gpm/Manifest
index 8327a635be01..91d204b0021a 100644
--- a/sec-policy/selinux-gpm/Manifest
+++ b/sec-policy/selinux-gpm/Manifest
@@ -9,5 +9,6 @@ DIST patchbundle-selinux-base-policy-2.20141203-r5.tar.bz2 274136 SHA256 c23d17c
 DIST patchbundle-selinux-base-policy-2.20141203-r6.tar.bz2 293231 SHA256 b686dcc517b97834f66d967afdcc724cb43b5c6dbf9f34043a91cdeda2625cc7 SHA512 a2c486cbe4a1d21ff3fd01bef25ecf5a633a4072646c67cfccf3f7187d95f3d9e3b482a46ba17c55c40a8e7c0dee56e9cf9ddc9f414d3e4511443b62f60d03e9 WHIRLPOOL 3d708e287e3f9b873be647b0327eab6675a8702ee1cffb56e36934cada306e5ccc64397a083dad9e59de37a067e628cacbf896ae99012d5a209e42fd7cd8a4c6
 DIST patchbundle-selinux-base-policy-2.20141203-r7.tar.bz2 295833 SHA256 ba2219b3efc747be65f94c4d8ac3cd6ee530c82c848fa41935a114184678622a SHA512 8e32d9dbfb2f0f3f50200543aadb51ed9834ccd5cdf30bf8e4d9e6d0b645ce44ffaf80f7aa9385e9c9095d9a383b3a348a92356cb5386c06544ab082a9a468c7 WHIRLPOOL 1648ee1be71e45fcf5a264816ce7edc7bab19bd28a68703923eb2d6068f1f0469ae593855231d31f88baecbf29e7cece2d6beeed20b7c04231a6c90e90d35910
 DIST patchbundle-selinux-base-policy-2.20141203-r8.tar.bz2 297919 SHA256 77539eb3d78105f8789cd8205d2698bd27e2abf100163bdd162cda860fd15120 SHA512 2f8a19e1e4bb65f32b480275f49099aed3ae9df543c7de862b3bbd93e81b89cd96dadac3d091e28673d09a6885db8c5656b3a77d0080775c110b04f2753de7a6 WHIRLPOOL 79cb7e620eb8e838192dc557c7a9ce7e713227d783cc8b63792825559b2145cad70d0af6f99948c1527557bc363feffd846c73893682b4a14fc7d08b9e20c649
+DIST patchbundle-selinux-base-policy-2.20141203-r9.tar.bz2 299602 SHA256 e8518004942a6c57170a609683e22b1410c93a2a195829c41dc8fbc703d941b5 SHA512 ce6484fbca1d2d074e50d1a3953392bd3ce0a4617df98fbac37747b469b4f160a9331586dfe1c3ddccb1ccbee24876a2f05ab49e37c8492a48baf83c2d01d140 WHIRLPOOL 1fd7b956e98e95a64c3a713a944d4531259bd156a7feabf6a89c4b5f33ac846377730eede97889e85183be086f282ebd18e860214f6ca3f01b40f2323470ee04
 DIST refpolicy-2.20140311.tar.bz2 664416 SHA256 f69437db95548c78a5dec44c236397146b144153149009ea554d2e536e5436f7 SHA512 50bacee82ed41ac8b8007ecc33bf51d22303cc2ddd27cfb72cb5520dab5f8e255186e34b89cec492c7a2d4220b200814bdede9b46c19f987a3d3d65a1c9b749a WHIRLPOOL e07480beba6ab1f02ad36b7d0c50c4a71cb39a8ec78bf8d1dc3c82bb9dd1d69d9169d7c937165ea15f60ce1147f256d46644f944107a3a8a800d5bad70d4c255
 DIST refpolicy-2.20141203.tar.bz2 680243 SHA256 f438209c430d8a2d4ddcbe4bdd3edb46f6af7dc4913637af0b73c635e40c1522 SHA512 682e4280c5799e4c12ec7594afc1389f67be35055748d2e0dbdc3419159a16c96d4946ca6178daee8370515951f8653b2e452efe8c962b8d7f9bc192f0b15a0c WHIRLPOOL 74bca232534e7af9051bb1ab9f77c1ff6c425781cf4561f781d6e9a40cc5ca0d9add540249ea5493e8782a9372aea296ead6c165c6c440ae1509eb319d151ee5
diff --git a/sec-policy/selinux-gpm/selinux-gpm-2.20141203-r8.ebuild b/sec-policy/selinux-gpm/selinux-gpm-2.20141203-r8.ebuild
index 64a436022c04..2d018374a774 100644
--- a/sec-policy/selinux-gpm/selinux-gpm-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-gpm/selinux-gpm-2.20141203-r8.ebuild
@@ -13,5 +13,5 @@ DESCRIPTION="SELinux policy for gpm"
 if [[ $PV == 9999* ]] ; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-gpm/selinux-gpm-2.20141203-r9.ebuild b/sec-policy/selinux-gpm/selinux-gpm-2.20141203-r9.ebuild
new file mode 100644
index 000000000000..64a436022c04
--- /dev/null
+++ b/sec-policy/selinux-gpm/selinux-gpm-2.20141203-r9.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI="5"
+
+IUSE=""
+MODS="gpm"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for gpm"
+
+if [[ $PV == 9999* ]] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
diff --git a/sec-policy/selinux-gpsd/Manifest b/sec-policy/selinux-gpsd/Manifest
index 8327a635be01..91d204b0021a 100644
--- a/sec-policy/selinux-gpsd/Manifest
+++ b/sec-policy/selinux-gpsd/Manifest
@@ -9,5 +9,6 @@ DIST patchbundle-selinux-base-policy-2.20141203-r5.tar.bz2 274136 SHA256 c23d17c
 DIST patchbundle-selinux-base-policy-2.20141203-r6.tar.bz2 293231 SHA256 b686dcc517b97834f66d967afdcc724cb43b5c6dbf9f34043a91cdeda2625cc7 SHA512 a2c486cbe4a1d21ff3fd01bef25ecf5a633a4072646c67cfccf3f7187d95f3d9e3b482a46ba17c55c40a8e7c0dee56e9cf9ddc9f414d3e4511443b62f60d03e9 WHIRLPOOL 3d708e287e3f9b873be647b0327eab6675a8702ee1cffb56e36934cada306e5ccc64397a083dad9e59de37a067e628cacbf896ae99012d5a209e42fd7cd8a4c6
 DIST patchbundle-selinux-base-policy-2.20141203-r7.tar.bz2 295833 SHA256 ba2219b3efc747be65f94c4d8ac3cd6ee530c82c848fa41935a114184678622a SHA512 8e32d9dbfb2f0f3f50200543aadb51ed9834ccd5cdf30bf8e4d9e6d0b645ce44ffaf80f7aa9385e9c9095d9a383b3a348a92356cb5386c06544ab082a9a468c7 WHIRLPOOL 1648ee1be71e45fcf5a264816ce7edc7bab19bd28a68703923eb2d6068f1f0469ae593855231d31f88baecbf29e7cece2d6beeed20b7c04231a6c90e90d35910
 DIST patchbundle-selinux-base-policy-2.20141203-r8.tar.bz2 297919 SHA256 77539eb3d78105f8789cd8205d2698bd27e2abf100163bdd162cda860fd15120 SHA512 2f8a19e1e4bb65f32b480275f49099aed3ae9df543c7de862b3bbd93e81b89cd96dadac3d091e28673d09a6885db8c5656b3a77d0080775c110b04f2753de7a6 WHIRLPOOL 79cb7e620eb8e838192dc557c7a9ce7e713227d783cc8b63792825559b2145cad70d0af6f99948c1527557bc363feffd846c73893682b4a14fc7d08b9e20c649
+DIST patchbundle-selinux-base-policy-2.20141203-r9.tar.bz2 299602 SHA256 e8518004942a6c57170a609683e22b1410c93a2a195829c41dc8fbc703d941b5 SHA512 ce6484fbca1d2d074e50d1a3953392bd3ce0a4617df98fbac37747b469b4f160a9331586dfe1c3ddccb1ccbee24876a2f05ab49e37c8492a48baf83c2d01d140 WHIRLPOOL 1fd7b956e98e95a64c3a713a944d4531259bd156a7feabf6a89c4b5f33ac846377730eede97889e85183be086f282ebd18e860214f6ca3f01b40f2323470ee04
 DIST refpolicy-2.20140311.tar.bz2 664416 SHA256 f69437db95548c78a5dec44c236397146b144153149009ea554d2e536e5436f7 SHA512 50bacee82ed41ac8b8007ecc33bf51d22303cc2ddd27cfb72cb5520dab5f8e255186e34b89cec492c7a2d4220b200814bdede9b46c19f987a3d3d65a1c9b749a WHIRLPOOL e07480beba6ab1f02ad36b7d0c50c4a71cb39a8ec78bf8d1dc3c82bb9dd1d69d9169d7c937165ea15f60ce1147f256d46644f944107a3a8a800d5bad70d4c255
 DIST refpolicy-2.20141203.tar.bz2 680243 SHA256 f438209c430d8a2d4ddcbe4bdd3edb46f6af7dc4913637af0b73c635e40c1522 SHA512 682e4280c5799e4c12ec7594afc1389f67be35055748d2e0dbdc3419159a16c96d4946ca6178daee8370515951f8653b2e452efe8c962b8d7f9bc192f0b15a0c WHIRLPOOL 74bca232534e7af9051bb1ab9f77c1ff6c425781cf4561f781d6e9a40cc5ca0d9add540249ea5493e8782a9372aea296ead6c165c6c440ae1509eb319d151ee5
diff --git a/sec-policy/selinux-gpsd/selinux-gpsd-2.20141203-r8.ebuild b/sec-policy/selinux-gpsd/selinux-gpsd-2.20141203-r8.ebuild
index 125d41aeb1cd..039ca4aba333 100644
--- a/sec-policy/selinux-gpsd/selinux-gpsd-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-gpsd/selinux-gpsd-2.20141203-r8.ebuild
@@ -13,5 +13,5 @@ DESCRIPTION="SELinux policy for gpsd"
 if [[ $PV == 9999* ]] ; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-gpsd/selinux-gpsd-2.20141203-r9.ebuild b/sec-policy/selinux-gpsd/selinux-gpsd-2.20141203-r9.ebuild
new file mode 100644
index 000000000000..125d41aeb1cd
--- /dev/null
+++ b/sec-policy/selinux-gpsd/selinux-gpsd-2.20141203-r9.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI="5"
+
+IUSE=""
+MODS="gpsd"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for gpsd"
+
+if [[ $PV == 9999* ]] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
diff --git a/sec-policy/selinux-hddtemp/Manifest b/sec-policy/selinux-hddtemp/Manifest
index 8327a635be01..91d204b0021a 100644
--- a/sec-policy/selinux-hddtemp/Manifest
+++ b/sec-policy/selinux-hddtemp/Manifest
@@ -9,5 +9,6 @@ DIST patchbundle-selinux-base-policy-2.20141203-r5.tar.bz2 274136 SHA256 c23d17c
 DIST patchbundle-selinux-base-policy-2.20141203-r6.tar.bz2 293231 SHA256 b686dcc517b97834f66d967afdcc724cb43b5c6dbf9f34043a91cdeda2625cc7 SHA512 a2c486cbe4a1d21ff3fd01bef25ecf5a633a4072646c67cfccf3f7187d95f3d9e3b482a46ba17c55c40a8e7c0dee56e9cf9ddc9f414d3e4511443b62f60d03e9 WHIRLPOOL 3d708e287e3f9b873be647b0327eab6675a8702ee1cffb56e36934cada306e5ccc64397a083dad9e59de37a067e628cacbf896ae99012d5a209e42fd7cd8a4c6
 DIST patchbundle-selinux-base-policy-2.20141203-r7.tar.bz2 295833 SHA256 ba2219b3efc747be65f94c4d8ac3cd6ee530c82c848fa41935a114184678622a SHA512 8e32d9dbfb2f0f3f50200543aadb51ed9834ccd5cdf30bf8e4d9e6d0b645ce44ffaf80f7aa9385e9c9095d9a383b3a348a92356cb5386c06544ab082a9a468c7 WHIRLPOOL 1648ee1be71e45fcf5a264816ce7edc7bab19bd28a68703923eb2d6068f1f0469ae593855231d31f88baecbf29e7cece2d6beeed20b7c04231a6c90e90d35910
 DIST patchbundle-selinux-base-policy-2.20141203-r8.tar.bz2 297919 SHA256 77539eb3d78105f8789cd8205d2698bd27e2abf100163bdd162cda860fd15120 SHA512 2f8a19e1e4bb65f32b480275f49099aed3ae9df543c7de862b3bbd93e81b89cd96dadac3d091e28673d09a6885db8c5656b3a77d0080775c110b04f2753de7a6 WHIRLPOOL 79cb7e620eb8e838192dc557c7a9ce7e713227d783cc8b63792825559b2145cad70d0af6f99948c1527557bc363feffd846c73893682b4a14fc7d08b9e20c649
+DIST patchbundle-selinux-base-policy-2.20141203-r9.tar.bz2 299602 SHA256 e8518004942a6c57170a609683e22b1410c93a2a195829c41dc8fbc703d941b5 SHA512 ce6484fbca1d2d074e50d1a3953392bd3ce0a4617df98fbac37747b469b4f160a9331586dfe1c3ddccb1ccbee24876a2f05ab49e37c8492a48baf83c2d01d140 WHIRLPOOL 1fd7b956e98e95a64c3a713a944d4531259bd156a7feabf6a89c4b5f33ac846377730eede97889e85183be086f282ebd18e860214f6ca3f01b40f2323470ee04
 DIST refpolicy-2.20140311.tar.bz2 664416 SHA256 f69437db95548c78a5dec44c236397146b144153149009ea554d2e536e5436f7 SHA512 50bacee82ed41ac8b8007ecc33bf51d22303cc2ddd27cfb72cb5520dab5f8e255186e34b89cec492c7a2d4220b200814bdede9b46c19f987a3d3d65a1c9b749a WHIRLPOOL e07480beba6ab1f02ad36b7d0c50c4a71cb39a8ec78bf8d1dc3c82bb9dd1d69d9169d7c937165ea15f60ce1147f256d46644f944107a3a8a800d5bad70d4c255
 DIST refpolicy-2.20141203.tar.bz2 680243 SHA256 f438209c430d8a2d4ddcbe4bdd3edb46f6af7dc4913637af0b73c635e40c1522 SHA512 682e4280c5799e4c12ec7594afc1389f67be35055748d2e0dbdc3419159a16c96d4946ca6178daee8370515951f8653b2e452efe8c962b8d7f9bc192f0b15a0c WHIRLPOOL 74bca232534e7af9051bb1ab9f77c1ff6c425781cf4561f781d6e9a40cc5ca0d9add540249ea5493e8782a9372aea296ead6c165c6c440ae1509eb319d151ee5
diff --git a/sec-policy/selinux-hddtemp/selinux-hddtemp-2.20141203-r8.ebuild b/sec-policy/selinux-hddtemp/selinux-hddtemp-2.20141203-r8.ebuild
index 381eb31ba939..2fe2b65fc58d 100644
--- a/sec-policy/selinux-hddtemp/selinux-hddtemp-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-hddtemp/selinux-hddtemp-2.20141203-r8.ebuild
@@ -13,5 +13,5 @@ DESCRIPTION="SELinux policy for hddtemp"
 if [[ $PV == 9999* ]] ; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-hddtemp/selinux-hddtemp-2.20141203-r9.ebuild b/sec-policy/selinux-hddtemp/selinux-hddtemp-2.20141203-r9.ebuild
new file mode 100644
index 000000000000..381eb31ba939
--- /dev/null
+++ b/sec-policy/selinux-hddtemp/selinux-hddtemp-2.20141203-r9.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI="5"
+
+IUSE=""
+MODS="hddtemp"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for hddtemp"
+
+if [[ $PV == 9999* ]] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
diff --git a/sec-policy/selinux-howl/Manifest b/sec-policy/selinux-howl/Manifest
index 8327a635be01..91d204b0021a 100644
--- a/sec-policy/selinux-howl/Manifest
+++ b/sec-policy/selinux-howl/Manifest
@@ -9,5 +9,6 @@ DIST patchbundle-selinux-base-policy-2.20141203-r5.tar.bz2 274136 SHA256 c23d17c
 DIST patchbundle-selinux-base-policy-2.20141203-r6.tar.bz2 293231 SHA256 b686dcc517b97834f66d967afdcc724cb43b5c6dbf9f34043a91cdeda2625cc7 SHA512 a2c486cbe4a1d21ff3fd01bef25ecf5a633a4072646c67cfccf3f7187d95f3d9e3b482a46ba17c55c40a8e7c0dee56e9cf9ddc9f414d3e4511443b62f60d03e9 WHIRLPOOL 3d708e287e3f9b873be647b0327eab6675a8702ee1cffb56e36934cada306e5ccc64397a083dad9e59de37a067e628cacbf896ae99012d5a209e42fd7cd8a4c6
 DIST patchbundle-selinux-base-policy-2.20141203-r7.tar.bz2 295833 SHA256 ba2219b3efc747be65f94c4d8ac3cd6ee530c82c848fa41935a114184678622a SHA512 8e32d9dbfb2f0f3f50200543aadb51ed9834ccd5cdf30bf8e4d9e6d0b645ce44ffaf80f7aa9385e9c9095d9a383b3a348a92356cb5386c06544ab082a9a468c7 WHIRLPOOL 1648ee1be71e45fcf5a264816ce7edc7bab19bd28a68703923eb2d6068f1f0469ae593855231d31f88baecbf29e7cece2d6beeed20b7c04231a6c90e90d35910
 DIST patchbundle-selinux-base-policy-2.20141203-r8.tar.bz2 297919 SHA256 77539eb3d78105f8789cd8205d2698bd27e2abf100163bdd162cda860fd15120 SHA512 2f8a19e1e4bb65f32b480275f49099aed3ae9df543c7de862b3bbd93e81b89cd96dadac3d091e28673d09a6885db8c5656b3a77d0080775c110b04f2753de7a6 WHIRLPOOL 79cb7e620eb8e838192dc557c7a9ce7e713227d783cc8b63792825559b2145cad70d0af6f99948c1527557bc363feffd846c73893682b4a14fc7d08b9e20c649
+DIST patchbundle-selinux-base-policy-2.20141203-r9.tar.bz2 299602 SHA256 e8518004942a6c57170a609683e22b1410c93a2a195829c41dc8fbc703d941b5 SHA512 ce6484fbca1d2d074e50d1a3953392bd3ce0a4617df98fbac37747b469b4f160a9331586dfe1c3ddccb1ccbee24876a2f05ab49e37c8492a48baf83c2d01d140 WHIRLPOOL 1fd7b956e98e95a64c3a713a944d4531259bd156a7feabf6a89c4b5f33ac846377730eede97889e85183be086f282ebd18e860214f6ca3f01b40f2323470ee04
 DIST refpolicy-2.20140311.tar.bz2 664416 SHA256 f69437db95548c78a5dec44c236397146b144153149009ea554d2e536e5436f7 SHA512 50bacee82ed41ac8b8007ecc33bf51d22303cc2ddd27cfb72cb5520dab5f8e255186e34b89cec492c7a2d4220b200814bdede9b46c19f987a3d3d65a1c9b749a WHIRLPOOL e07480beba6ab1f02ad36b7d0c50c4a71cb39a8ec78bf8d1dc3c82bb9dd1d69d9169d7c937165ea15f60ce1147f256d46644f944107a3a8a800d5bad70d4c255
 DIST refpolicy-2.20141203.tar.bz2 680243 SHA256 f438209c430d8a2d4ddcbe4bdd3edb46f6af7dc4913637af0b73c635e40c1522 SHA512 682e4280c5799e4c12ec7594afc1389f67be35055748d2e0dbdc3419159a16c96d4946ca6178daee8370515951f8653b2e452efe8c962b8d7f9bc192f0b15a0c WHIRLPOOL 74bca232534e7af9051bb1ab9f77c1ff6c425781cf4561f781d6e9a40cc5ca0d9add540249ea5493e8782a9372aea296ead6c165c6c440ae1509eb319d151ee5
diff --git a/sec-policy/selinux-howl/selinux-howl-2.20141203-r8.ebuild b/sec-policy/selinux-howl/selinux-howl-2.20141203-r8.ebuild
index 8d5663c1e248..726c90dea450 100644
--- a/sec-policy/selinux-howl/selinux-howl-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-howl/selinux-howl-2.20141203-r8.ebuild
@@ -13,5 +13,5 @@ DESCRIPTION="SELinux policy for howl"
 if [[ $PV == 9999* ]] ; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-howl/selinux-howl-2.20141203-r9.ebuild b/sec-policy/selinux-howl/selinux-howl-2.20141203-r9.ebuild
new file mode 100644
index 000000000000..8d5663c1e248
--- /dev/null
+++ b/sec-policy/selinux-howl/selinux-howl-2.20141203-r9.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI="5"
+
+IUSE=""
+MODS="howl"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for howl"
+
+if [[ $PV == 9999* ]] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
diff --git a/sec-policy/selinux-icecast/Manifest b/sec-policy/selinux-icecast/Manifest
index 8327a635be01..91d204b0021a 100644
--- a/sec-policy/selinux-icecast/Manifest
+++ b/sec-policy/selinux-icecast/Manifest
@@ -9,5 +9,6 @@ DIST patchbundle-selinux-base-policy-2.20141203-r5.tar.bz2 274136 SHA256 c23d17c
 DIST patchbundle-selinux-base-policy-2.20141203-r6.tar.bz2 293231 SHA256 b686dcc517b97834f66d967afdcc724cb43b5c6dbf9f34043a91cdeda2625cc7 SHA512 a2c486cbe4a1d21ff3fd01bef25ecf5a633a4072646c67cfccf3f7187d95f3d9e3b482a46ba17c55c40a8e7c0dee56e9cf9ddc9f414d3e4511443b62f60d03e9 WHIRLPOOL 3d708e287e3f9b873be647b0327eab6675a8702ee1cffb56e36934cada306e5ccc64397a083dad9e59de37a067e628cacbf896ae99012d5a209e42fd7cd8a4c6
 DIST patchbundle-selinux-base-policy-2.20141203-r7.tar.bz2 295833 SHA256 ba2219b3efc747be65f94c4d8ac3cd6ee530c82c848fa41935a114184678622a SHA512 8e32d9dbfb2f0f3f50200543aadb51ed9834ccd5cdf30bf8e4d9e6d0b645ce44ffaf80f7aa9385e9c9095d9a383b3a348a92356cb5386c06544ab082a9a468c7 WHIRLPOOL 1648ee1be71e45fcf5a264816ce7edc7bab19bd28a68703923eb2d6068f1f0469ae593855231d31f88baecbf29e7cece2d6beeed20b7c04231a6c90e90d35910
 DIST patchbundle-selinux-base-policy-2.20141203-r8.tar.bz2 297919 SHA256 77539eb3d78105f8789cd8205d2698bd27e2abf100163bdd162cda860fd15120 SHA512 2f8a19e1e4bb65f32b480275f49099aed3ae9df543c7de862b3bbd93e81b89cd96dadac3d091e28673d09a6885db8c5656b3a77d0080775c110b04f2753de7a6 WHIRLPOOL 79cb7e620eb8e838192dc557c7a9ce7e713227d783cc8b63792825559b2145cad70d0af6f99948c1527557bc363feffd846c73893682b4a14fc7d08b9e20c649
+DIST patchbundle-selinux-base-policy-2.20141203-r9.tar.bz2 299602 SHA256 e8518004942a6c57170a609683e22b1410c93a2a195829c41dc8fbc703d941b5 SHA512 ce6484fbca1d2d074e50d1a3953392bd3ce0a4617df98fbac37747b469b4f160a9331586dfe1c3ddccb1ccbee24876a2f05ab49e37c8492a48baf83c2d01d140 WHIRLPOOL 1fd7b956e98e95a64c3a713a944d4531259bd156a7feabf6a89c4b5f33ac846377730eede97889e85183be086f282ebd18e860214f6ca3f01b40f2323470ee04
 DIST refpolicy-2.20140311.tar.bz2 664416 SHA256 f69437db95548c78a5dec44c236397146b144153149009ea554d2e536e5436f7 SHA512 50bacee82ed41ac8b8007ecc33bf51d22303cc2ddd27cfb72cb5520dab5f8e255186e34b89cec492c7a2d4220b200814bdede9b46c19f987a3d3d65a1c9b749a WHIRLPOOL e07480beba6ab1f02ad36b7d0c50c4a71cb39a8ec78bf8d1dc3c82bb9dd1d69d9169d7c937165ea15f60ce1147f256d46644f944107a3a8a800d5bad70d4c255
 DIST refpolicy-2.20141203.tar.bz2 680243 SHA256 f438209c430d8a2d4ddcbe4bdd3edb46f6af7dc4913637af0b73c635e40c1522 SHA512 682e4280c5799e4c12ec7594afc1389f67be35055748d2e0dbdc3419159a16c96d4946ca6178daee8370515951f8653b2e452efe8c962b8d7f9bc192f0b15a0c WHIRLPOOL 74bca232534e7af9051bb1ab9f77c1ff6c425781cf4561f781d6e9a40cc5ca0d9add540249ea5493e8782a9372aea296ead6c165c6c440ae1509eb319d151ee5
diff --git a/sec-policy/selinux-icecast/selinux-icecast-2.20141203-r8.ebuild b/sec-policy/selinux-icecast/selinux-icecast-2.20141203-r8.ebuild
index f94810ac5f62..d70c8a2d445b 100644
--- a/sec-policy/selinux-icecast/selinux-icecast-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-icecast/selinux-icecast-2.20141203-r8.ebuild
@@ -13,5 +13,5 @@ DESCRIPTION="SELinux policy for icecast"
 if [[ $PV == 9999* ]] ; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-icecast/selinux-icecast-2.20141203-r9.ebuild b/sec-policy/selinux-icecast/selinux-icecast-2.20141203-r9.ebuild
new file mode 100644
index 000000000000..f94810ac5f62
--- /dev/null
+++ b/sec-policy/selinux-icecast/selinux-icecast-2.20141203-r9.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI="5"
+
+IUSE=""
+MODS="icecast"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for icecast"
+
+if [[ $PV == 9999* ]] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
diff --git a/sec-policy/selinux-ifplugd/Manifest b/sec-policy/selinux-ifplugd/Manifest
index 8327a635be01..91d204b0021a 100644
--- a/sec-policy/selinux-ifplugd/Manifest
+++ b/sec-policy/selinux-ifplugd/Manifest
@@ -9,5 +9,6 @@ DIST patchbundle-selinux-base-policy-2.20141203-r5.tar.bz2 274136 SHA256 c23d17c
 DIST patchbundle-selinux-base-policy-2.20141203-r6.tar.bz2 293231 SHA256 b686dcc517b97834f66d967afdcc724cb43b5c6dbf9f34043a91cdeda2625cc7 SHA512 a2c486cbe4a1d21ff3fd01bef25ecf5a633a4072646c67cfccf3f7187d95f3d9e3b482a46ba17c55c40a8e7c0dee56e9cf9ddc9f414d3e4511443b62f60d03e9 WHIRLPOOL 3d708e287e3f9b873be647b0327eab6675a8702ee1cffb56e36934cada306e5ccc64397a083dad9e59de37a067e628cacbf896ae99012d5a209e42fd7cd8a4c6
 DIST patchbundle-selinux-base-policy-2.20141203-r7.tar.bz2 295833 SHA256 ba2219b3efc747be65f94c4d8ac3cd6ee530c82c848fa41935a114184678622a SHA512 8e32d9dbfb2f0f3f50200543aadb51ed9834ccd5cdf30bf8e4d9e6d0b645ce44ffaf80f7aa9385e9c9095d9a383b3a348a92356cb5386c06544ab082a9a468c7 WHIRLPOOL 1648ee1be71e45fcf5a264816ce7edc7bab19bd28a68703923eb2d6068f1f0469ae593855231d31f88baecbf29e7cece2d6beeed20b7c04231a6c90e90d35910
 DIST patchbundle-selinux-base-policy-2.20141203-r8.tar.bz2 297919 SHA256 77539eb3d78105f8789cd8205d2698bd27e2abf100163bdd162cda860fd15120 SHA512 2f8a19e1e4bb65f32b480275f49099aed3ae9df543c7de862b3bbd93e81b89cd96dadac3d091e28673d09a6885db8c5656b3a77d0080775c110b04f2753de7a6 WHIRLPOOL 79cb7e620eb8e838192dc557c7a9ce7e713227d783cc8b63792825559b2145cad70d0af6f99948c1527557bc363feffd846c73893682b4a14fc7d08b9e20c649
+DIST patchbundle-selinux-base-policy-2.20141203-r9.tar.bz2 299602 SHA256 e8518004942a6c57170a609683e22b1410c93a2a195829c41dc8fbc703d941b5 SHA512 ce6484fbca1d2d074e50d1a3953392bd3ce0a4617df98fbac37747b469b4f160a9331586dfe1c3ddccb1ccbee24876a2f05ab49e37c8492a48baf83c2d01d140 WHIRLPOOL 1fd7b956e98e95a64c3a713a944d4531259bd156a7feabf6a89c4b5f33ac846377730eede97889e85183be086f282ebd18e860214f6ca3f01b40f2323470ee04
 DIST refpolicy-2.20140311.tar.bz2 664416 SHA256 f69437db95548c78a5dec44c236397146b144153149009ea554d2e536e5436f7 SHA512 50bacee82ed41ac8b8007ecc33bf51d22303cc2ddd27cfb72cb5520dab5f8e255186e34b89cec492c7a2d4220b200814bdede9b46c19f987a3d3d65a1c9b749a WHIRLPOOL e07480beba6ab1f02ad36b7d0c50c4a71cb39a8ec78bf8d1dc3c82bb9dd1d69d9169d7c937165ea15f60ce1147f256d46644f944107a3a8a800d5bad70d4c255
 DIST refpolicy-2.20141203.tar.bz2 680243 SHA256 f438209c430d8a2d4ddcbe4bdd3edb46f6af7dc4913637af0b73c635e40c1522 SHA512 682e4280c5799e4c12ec7594afc1389f67be35055748d2e0dbdc3419159a16c96d4946ca6178daee8370515951f8653b2e452efe8c962b8d7f9bc192f0b15a0c WHIRLPOOL 74bca232534e7af9051bb1ab9f77c1ff6c425781cf4561f781d6e9a40cc5ca0d9add540249ea5493e8782a9372aea296ead6c165c6c440ae1509eb319d151ee5
diff --git a/sec-policy/selinux-ifplugd/selinux-ifplugd-2.20141203-r8.ebuild b/sec-policy/selinux-ifplugd/selinux-ifplugd-2.20141203-r8.ebuild
index 797c3da33ce7..5286ebc1ff46 100644
--- a/sec-policy/selinux-ifplugd/selinux-ifplugd-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-ifplugd/selinux-ifplugd-2.20141203-r8.ebuild
@@ -13,5 +13,5 @@ DESCRIPTION="SELinux policy for ifplugd"
 if [[ $PV == 9999* ]] ; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-ifplugd/selinux-ifplugd-2.20141203-r9.ebuild b/sec-policy/selinux-ifplugd/selinux-ifplugd-2.20141203-r9.ebuild
new file mode 100644
index 000000000000..797c3da33ce7
--- /dev/null
+++ b/sec-policy/selinux-ifplugd/selinux-ifplugd-2.20141203-r9.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI="5"
+
+IUSE=""
+MODS="ifplugd"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for ifplugd"
+
+if [[ $PV == 9999* ]] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
diff --git a/sec-policy/selinux-imaze/Manifest b/sec-policy/selinux-imaze/Manifest
index 8327a635be01..91d204b0021a 100644
--- a/sec-policy/selinux-imaze/Manifest
+++ b/sec-policy/selinux-imaze/Manifest
@@ -9,5 +9,6 @@ DIST patchbundle-selinux-base-policy-2.20141203-r5.tar.bz2 274136 SHA256 c23d17c
 DIST patchbundle-selinux-base-policy-2.20141203-r6.tar.bz2 293231 SHA256 b686dcc517b97834f66d967afdcc724cb43b5c6dbf9f34043a91cdeda2625cc7 SHA512 a2c486cbe4a1d21ff3fd01bef25ecf5a633a4072646c67cfccf3f7187d95f3d9e3b482a46ba17c55c40a8e7c0dee56e9cf9ddc9f414d3e4511443b62f60d03e9 WHIRLPOOL 3d708e287e3f9b873be647b0327eab6675a8702ee1cffb56e36934cada306e5ccc64397a083dad9e59de37a067e628cacbf896ae99012d5a209e42fd7cd8a4c6
 DIST patchbundle-selinux-base-policy-2.20141203-r7.tar.bz2 295833 SHA256 ba2219b3efc747be65f94c4d8ac3cd6ee530c82c848fa41935a114184678622a SHA512 8e32d9dbfb2f0f3f50200543aadb51ed9834ccd5cdf30bf8e4d9e6d0b645ce44ffaf80f7aa9385e9c9095d9a383b3a348a92356cb5386c06544ab082a9a468c7 WHIRLPOOL 1648ee1be71e45fcf5a264816ce7edc7bab19bd28a68703923eb2d6068f1f0469ae593855231d31f88baecbf29e7cece2d6beeed20b7c04231a6c90e90d35910
 DIST patchbundle-selinux-base-policy-2.20141203-r8.tar.bz2 297919 SHA256 77539eb3d78105f8789cd8205d2698bd27e2abf100163bdd162cda860fd15120 SHA512 2f8a19e1e4bb65f32b480275f49099aed3ae9df543c7de862b3bbd93e81b89cd96dadac3d091e28673d09a6885db8c5656b3a77d0080775c110b04f2753de7a6 WHIRLPOOL 79cb7e620eb8e838192dc557c7a9ce7e713227d783cc8b63792825559b2145cad70d0af6f99948c1527557bc363feffd846c73893682b4a14fc7d08b9e20c649
+DIST patchbundle-selinux-base-policy-2.20141203-r9.tar.bz2 299602 SHA256 e8518004942a6c57170a609683e22b1410c93a2a195829c41dc8fbc703d941b5 SHA512 ce6484fbca1d2d074e50d1a3953392bd3ce0a4617df98fbac37747b469b4f160a9331586dfe1c3ddccb1ccbee24876a2f05ab49e37c8492a48baf83c2d01d140 WHIRLPOOL 1fd7b956e98e95a64c3a713a944d4531259bd156a7feabf6a89c4b5f33ac846377730eede97889e85183be086f282ebd18e860214f6ca3f01b40f2323470ee04
 DIST refpolicy-2.20140311.tar.bz2 664416 SHA256 f69437db95548c78a5dec44c236397146b144153149009ea554d2e536e5436f7 SHA512 50bacee82ed41ac8b8007ecc33bf51d22303cc2ddd27cfb72cb5520dab5f8e255186e34b89cec492c7a2d4220b200814bdede9b46c19f987a3d3d65a1c9b749a WHIRLPOOL e07480beba6ab1f02ad36b7d0c50c4a71cb39a8ec78bf8d1dc3c82bb9dd1d69d9169d7c937165ea15f60ce1147f256d46644f944107a3a8a800d5bad70d4c255
 DIST refpolicy-2.20141203.tar.bz2 680243 SHA256 f438209c430d8a2d4ddcbe4bdd3edb46f6af7dc4913637af0b73c635e40c1522 SHA512 682e4280c5799e4c12ec7594afc1389f67be35055748d2e0dbdc3419159a16c96d4946ca6178daee8370515951f8653b2e452efe8c962b8d7f9bc192f0b15a0c WHIRLPOOL 74bca232534e7af9051bb1ab9f77c1ff6c425781cf4561f781d6e9a40cc5ca0d9add540249ea5493e8782a9372aea296ead6c165c6c440ae1509eb319d151ee5
diff --git a/sec-policy/selinux-imaze/selinux-imaze-2.20141203-r8.ebuild b/sec-policy/selinux-imaze/selinux-imaze-2.20141203-r8.ebuild
index b85d5178a407..e151fa3e5152 100644
--- a/sec-policy/selinux-imaze/selinux-imaze-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-imaze/selinux-imaze-2.20141203-r8.ebuild
@@ -13,5 +13,5 @@ DESCRIPTION="SELinux policy for imaze"
 if [[ $PV == 9999* ]] ; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-imaze/selinux-imaze-2.20141203-r9.ebuild b/sec-policy/selinux-imaze/selinux-imaze-2.20141203-r9.ebuild
new file mode 100644
index 000000000000..b85d5178a407
--- /dev/null
+++ b/sec-policy/selinux-imaze/selinux-imaze-2.20141203-r9.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI="5"
+
+IUSE=""
+MODS="imaze"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for imaze"
+
+if [[ $PV == 9999* ]] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
diff --git a/sec-policy/selinux-inetd/Manifest b/sec-policy/selinux-inetd/Manifest
index 8327a635be01..91d204b0021a 100644
--- a/sec-policy/selinux-inetd/Manifest
+++ b/sec-policy/selinux-inetd/Manifest
@@ -9,5 +9,6 @@ DIST patchbundle-selinux-base-policy-2.20141203-r5.tar.bz2 274136 SHA256 c23d17c
 DIST patchbundle-selinux-base-policy-2.20141203-r6.tar.bz2 293231 SHA256 b686dcc517b97834f66d967afdcc724cb43b5c6dbf9f34043a91cdeda2625cc7 SHA512 a2c486cbe4a1d21ff3fd01bef25ecf5a633a4072646c67cfccf3f7187d95f3d9e3b482a46ba17c55c40a8e7c0dee56e9cf9ddc9f414d3e4511443b62f60d03e9 WHIRLPOOL 3d708e287e3f9b873be647b0327eab6675a8702ee1cffb56e36934cada306e5ccc64397a083dad9e59de37a067e628cacbf896ae99012d5a209e42fd7cd8a4c6
 DIST patchbundle-selinux-base-policy-2.20141203-r7.tar.bz2 295833 SHA256 ba2219b3efc747be65f94c4d8ac3cd6ee530c82c848fa41935a114184678622a SHA512 8e32d9dbfb2f0f3f50200543aadb51ed9834ccd5cdf30bf8e4d9e6d0b645ce44ffaf80f7aa9385e9c9095d9a383b3a348a92356cb5386c06544ab082a9a468c7 WHIRLPOOL 1648ee1be71e45fcf5a264816ce7edc7bab19bd28a68703923eb2d6068f1f0469ae593855231d31f88baecbf29e7cece2d6beeed20b7c04231a6c90e90d35910
 DIST patchbundle-selinux-base-policy-2.20141203-r8.tar.bz2 297919 SHA256 77539eb3d78105f8789cd8205d2698bd27e2abf100163bdd162cda860fd15120 SHA512 2f8a19e1e4bb65f32b480275f49099aed3ae9df543c7de862b3bbd93e81b89cd96dadac3d091e28673d09a6885db8c5656b3a77d0080775c110b04f2753de7a6 WHIRLPOOL 79cb7e620eb8e838192dc557c7a9ce7e713227d783cc8b63792825559b2145cad70d0af6f99948c1527557bc363feffd846c73893682b4a14fc7d08b9e20c649
+DIST patchbundle-selinux-base-policy-2.20141203-r9.tar.bz2 299602 SHA256 e8518004942a6c57170a609683e22b1410c93a2a195829c41dc8fbc703d941b5 SHA512 ce6484fbca1d2d074e50d1a3953392bd3ce0a4617df98fbac37747b469b4f160a9331586dfe1c3ddccb1ccbee24876a2f05ab49e37c8492a48baf83c2d01d140 WHIRLPOOL 1fd7b956e98e95a64c3a713a944d4531259bd156a7feabf6a89c4b5f33ac846377730eede97889e85183be086f282ebd18e860214f6ca3f01b40f2323470ee04
 DIST refpolicy-2.20140311.tar.bz2 664416 SHA256 f69437db95548c78a5dec44c236397146b144153149009ea554d2e536e5436f7 SHA512 50bacee82ed41ac8b8007ecc33bf51d22303cc2ddd27cfb72cb5520dab5f8e255186e34b89cec492c7a2d4220b200814bdede9b46c19f987a3d3d65a1c9b749a WHIRLPOOL e07480beba6ab1f02ad36b7d0c50c4a71cb39a8ec78bf8d1dc3c82bb9dd1d69d9169d7c937165ea15f60ce1147f256d46644f944107a3a8a800d5bad70d4c255
 DIST refpolicy-2.20141203.tar.bz2 680243 SHA256 f438209c430d8a2d4ddcbe4bdd3edb46f6af7dc4913637af0b73c635e40c1522 SHA512 682e4280c5799e4c12ec7594afc1389f67be35055748d2e0dbdc3419159a16c96d4946ca6178daee8370515951f8653b2e452efe8c962b8d7f9bc192f0b15a0c WHIRLPOOL 74bca232534e7af9051bb1ab9f77c1ff6c425781cf4561f781d6e9a40cc5ca0d9add540249ea5493e8782a9372aea296ead6c165c6c440ae1509eb319d151ee5
diff --git a/sec-policy/selinux-inetd/selinux-inetd-2.20141203-r8.ebuild b/sec-policy/selinux-inetd/selinux-inetd-2.20141203-r8.ebuild
index 91fc6b78f843..58c6d660bb3a 100644
--- a/sec-policy/selinux-inetd/selinux-inetd-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-inetd/selinux-inetd-2.20141203-r8.ebuild
@@ -13,5 +13,5 @@ DESCRIPTION="SELinux policy for inetd"
 if [[ $PV == 9999* ]] ; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-inetd/selinux-inetd-2.20141203-r9.ebuild b/sec-policy/selinux-inetd/selinux-inetd-2.20141203-r9.ebuild
new file mode 100644
index 000000000000..91fc6b78f843
--- /dev/null
+++ b/sec-policy/selinux-inetd/selinux-inetd-2.20141203-r9.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI="5"
+
+IUSE=""
+MODS="inetd"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for inetd"
+
+if [[ $PV == 9999* ]] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
diff --git a/sec-policy/selinux-inn/Manifest b/sec-policy/selinux-inn/Manifest
index 8327a635be01..91d204b0021a 100644
--- a/sec-policy/selinux-inn/Manifest
+++ b/sec-policy/selinux-inn/Manifest
@@ -9,5 +9,6 @@ DIST patchbundle-selinux-base-policy-2.20141203-r5.tar.bz2 274136 SHA256 c23d17c
 DIST patchbundle-selinux-base-policy-2.20141203-r6.tar.bz2 293231 SHA256 b686dcc517b97834f66d967afdcc724cb43b5c6dbf9f34043a91cdeda2625cc7 SHA512 a2c486cbe4a1d21ff3fd01bef25ecf5a633a4072646c67cfccf3f7187d95f3d9e3b482a46ba17c55c40a8e7c0dee56e9cf9ddc9f414d3e4511443b62f60d03e9 WHIRLPOOL 3d708e287e3f9b873be647b0327eab6675a8702ee1cffb56e36934cada306e5ccc64397a083dad9e59de37a067e628cacbf896ae99012d5a209e42fd7cd8a4c6
 DIST patchbundle-selinux-base-policy-2.20141203-r7.tar.bz2 295833 SHA256 ba2219b3efc747be65f94c4d8ac3cd6ee530c82c848fa41935a114184678622a SHA512 8e32d9dbfb2f0f3f50200543aadb51ed9834ccd5cdf30bf8e4d9e6d0b645ce44ffaf80f7aa9385e9c9095d9a383b3a348a92356cb5386c06544ab082a9a468c7 WHIRLPOOL 1648ee1be71e45fcf5a264816ce7edc7bab19bd28a68703923eb2d6068f1f0469ae593855231d31f88baecbf29e7cece2d6beeed20b7c04231a6c90e90d35910
 DIST patchbundle-selinux-base-policy-2.20141203-r8.tar.bz2 297919 SHA256 77539eb3d78105f8789cd8205d2698bd27e2abf100163bdd162cda860fd15120 SHA512 2f8a19e1e4bb65f32b480275f49099aed3ae9df543c7de862b3bbd93e81b89cd96dadac3d091e28673d09a6885db8c5656b3a77d0080775c110b04f2753de7a6 WHIRLPOOL 79cb7e620eb8e838192dc557c7a9ce7e713227d783cc8b63792825559b2145cad70d0af6f99948c1527557bc363feffd846c73893682b4a14fc7d08b9e20c649
+DIST patchbundle-selinux-base-policy-2.20141203-r9.tar.bz2 299602 SHA256 e8518004942a6c57170a609683e22b1410c93a2a195829c41dc8fbc703d941b5 SHA512 ce6484fbca1d2d074e50d1a3953392bd3ce0a4617df98fbac37747b469b4f160a9331586dfe1c3ddccb1ccbee24876a2f05ab49e37c8492a48baf83c2d01d140 WHIRLPOOL 1fd7b956e98e95a64c3a713a944d4531259bd156a7feabf6a89c4b5f33ac846377730eede97889e85183be086f282ebd18e860214f6ca3f01b40f2323470ee04
 DIST refpolicy-2.20140311.tar.bz2 664416 SHA256 f69437db95548c78a5dec44c236397146b144153149009ea554d2e536e5436f7 SHA512 50bacee82ed41ac8b8007ecc33bf51d22303cc2ddd27cfb72cb5520dab5f8e255186e34b89cec492c7a2d4220b200814bdede9b46c19f987a3d3d65a1c9b749a WHIRLPOOL e07480beba6ab1f02ad36b7d0c50c4a71cb39a8ec78bf8d1dc3c82bb9dd1d69d9169d7c937165ea15f60ce1147f256d46644f944107a3a8a800d5bad70d4c255
 DIST refpolicy-2.20141203.tar.bz2 680243 SHA256 f438209c430d8a2d4ddcbe4bdd3edb46f6af7dc4913637af0b73c635e40c1522 SHA512 682e4280c5799e4c12ec7594afc1389f67be35055748d2e0dbdc3419159a16c96d4946ca6178daee8370515951f8653b2e452efe8c962b8d7f9bc192f0b15a0c WHIRLPOOL 74bca232534e7af9051bb1ab9f77c1ff6c425781cf4561f781d6e9a40cc5ca0d9add540249ea5493e8782a9372aea296ead6c165c6c440ae1509eb319d151ee5
diff --git a/sec-policy/selinux-inn/selinux-inn-2.20141203-r8.ebuild b/sec-policy/selinux-inn/selinux-inn-2.20141203-r8.ebuild
index b1e999e41131..38d590c02e78 100644
--- a/sec-policy/selinux-inn/selinux-inn-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-inn/selinux-inn-2.20141203-r8.ebuild
@@ -13,5 +13,5 @@ DESCRIPTION="SELinux policy for inn"
 if [[ $PV == 9999* ]] ; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-inn/selinux-inn-2.20141203-r9.ebuild b/sec-policy/selinux-inn/selinux-inn-2.20141203-r9.ebuild
new file mode 100644
index 000000000000..b1e999e41131
--- /dev/null
+++ b/sec-policy/selinux-inn/selinux-inn-2.20141203-r9.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI="5"
+
+IUSE=""
+MODS="inn"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for inn"
+
+if [[ $PV == 9999* ]] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
diff --git a/sec-policy/selinux-ipsec/Manifest b/sec-policy/selinux-ipsec/Manifest
index 8327a635be01..91d204b0021a 100644
--- a/sec-policy/selinux-ipsec/Manifest
+++ b/sec-policy/selinux-ipsec/Manifest
@@ -9,5 +9,6 @@ DIST patchbundle-selinux-base-policy-2.20141203-r5.tar.bz2 274136 SHA256 c23d17c
 DIST patchbundle-selinux-base-policy-2.20141203-r6.tar.bz2 293231 SHA256 b686dcc517b97834f66d967afdcc724cb43b5c6dbf9f34043a91cdeda2625cc7 SHA512 a2c486cbe4a1d21ff3fd01bef25ecf5a633a4072646c67cfccf3f7187d95f3d9e3b482a46ba17c55c40a8e7c0dee56e9cf9ddc9f414d3e4511443b62f60d03e9 WHIRLPOOL 3d708e287e3f9b873be647b0327eab6675a8702ee1cffb56e36934cada306e5ccc64397a083dad9e59de37a067e628cacbf896ae99012d5a209e42fd7cd8a4c6
 DIST patchbundle-selinux-base-policy-2.20141203-r7.tar.bz2 295833 SHA256 ba2219b3efc747be65f94c4d8ac3cd6ee530c82c848fa41935a114184678622a SHA512 8e32d9dbfb2f0f3f50200543aadb51ed9834ccd5cdf30bf8e4d9e6d0b645ce44ffaf80f7aa9385e9c9095d9a383b3a348a92356cb5386c06544ab082a9a468c7 WHIRLPOOL 1648ee1be71e45fcf5a264816ce7edc7bab19bd28a68703923eb2d6068f1f0469ae593855231d31f88baecbf29e7cece2d6beeed20b7c04231a6c90e90d35910
 DIST patchbundle-selinux-base-policy-2.20141203-r8.tar.bz2 297919 SHA256 77539eb3d78105f8789cd8205d2698bd27e2abf100163bdd162cda860fd15120 SHA512 2f8a19e1e4bb65f32b480275f49099aed3ae9df543c7de862b3bbd93e81b89cd96dadac3d091e28673d09a6885db8c5656b3a77d0080775c110b04f2753de7a6 WHIRLPOOL 79cb7e620eb8e838192dc557c7a9ce7e713227d783cc8b63792825559b2145cad70d0af6f99948c1527557bc363feffd846c73893682b4a14fc7d08b9e20c649
+DIST patchbundle-selinux-base-policy-2.20141203-r9.tar.bz2 299602 SHA256 e8518004942a6c57170a609683e22b1410c93a2a195829c41dc8fbc703d941b5 SHA512 ce6484fbca1d2d074e50d1a3953392bd3ce0a4617df98fbac37747b469b4f160a9331586dfe1c3ddccb1ccbee24876a2f05ab49e37c8492a48baf83c2d01d140 WHIRLPOOL 1fd7b956e98e95a64c3a713a944d4531259bd156a7feabf6a89c4b5f33ac846377730eede97889e85183be086f282ebd18e860214f6ca3f01b40f2323470ee04
 DIST refpolicy-2.20140311.tar.bz2 664416 SHA256 f69437db95548c78a5dec44c236397146b144153149009ea554d2e536e5436f7 SHA512 50bacee82ed41ac8b8007ecc33bf51d22303cc2ddd27cfb72cb5520dab5f8e255186e34b89cec492c7a2d4220b200814bdede9b46c19f987a3d3d65a1c9b749a WHIRLPOOL e07480beba6ab1f02ad36b7d0c50c4a71cb39a8ec78bf8d1dc3c82bb9dd1d69d9169d7c937165ea15f60ce1147f256d46644f944107a3a8a800d5bad70d4c255
 DIST refpolicy-2.20141203.tar.bz2 680243 SHA256 f438209c430d8a2d4ddcbe4bdd3edb46f6af7dc4913637af0b73c635e40c1522 SHA512 682e4280c5799e4c12ec7594afc1389f67be35055748d2e0dbdc3419159a16c96d4946ca6178daee8370515951f8653b2e452efe8c962b8d7f9bc192f0b15a0c WHIRLPOOL 74bca232534e7af9051bb1ab9f77c1ff6c425781cf4561f781d6e9a40cc5ca0d9add540249ea5493e8782a9372aea296ead6c165c6c440ae1509eb319d151ee5
diff --git a/sec-policy/selinux-ipsec/selinux-ipsec-2.20141203-r8.ebuild b/sec-policy/selinux-ipsec/selinux-ipsec-2.20141203-r8.ebuild
index ffe16812d3fa..897ddc00c1a8 100644
--- a/sec-policy/selinux-ipsec/selinux-ipsec-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-ipsec/selinux-ipsec-2.20141203-r8.ebuild
@@ -13,5 +13,5 @@ DESCRIPTION="SELinux policy for ipsec"
 if [[ $PV == 9999* ]] ; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-ipsec/selinux-ipsec-2.20141203-r9.ebuild b/sec-policy/selinux-ipsec/selinux-ipsec-2.20141203-r9.ebuild
new file mode 100644
index 000000000000..ffe16812d3fa
--- /dev/null
+++ b/sec-policy/selinux-ipsec/selinux-ipsec-2.20141203-r9.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI="5"
+
+IUSE=""
+MODS="ipsec"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for ipsec"
+
+if [[ $PV == 9999* ]] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
diff --git a/sec-policy/selinux-irc/Manifest b/sec-policy/selinux-irc/Manifest
index 8327a635be01..91d204b0021a 100644
--- a/sec-policy/selinux-irc/Manifest
+++ b/sec-policy/selinux-irc/Manifest
@@ -9,5 +9,6 @@ DIST patchbundle-selinux-base-policy-2.20141203-r5.tar.bz2 274136 SHA256 c23d17c
 DIST patchbundle-selinux-base-policy-2.20141203-r6.tar.bz2 293231 SHA256 b686dcc517b97834f66d967afdcc724cb43b5c6dbf9f34043a91cdeda2625cc7 SHA512 a2c486cbe4a1d21ff3fd01bef25ecf5a633a4072646c67cfccf3f7187d95f3d9e3b482a46ba17c55c40a8e7c0dee56e9cf9ddc9f414d3e4511443b62f60d03e9 WHIRLPOOL 3d708e287e3f9b873be647b0327eab6675a8702ee1cffb56e36934cada306e5ccc64397a083dad9e59de37a067e628cacbf896ae99012d5a209e42fd7cd8a4c6
 DIST patchbundle-selinux-base-policy-2.20141203-r7.tar.bz2 295833 SHA256 ba2219b3efc747be65f94c4d8ac3cd6ee530c82c848fa41935a114184678622a SHA512 8e32d9dbfb2f0f3f50200543aadb51ed9834ccd5cdf30bf8e4d9e6d0b645ce44ffaf80f7aa9385e9c9095d9a383b3a348a92356cb5386c06544ab082a9a468c7 WHIRLPOOL 1648ee1be71e45fcf5a264816ce7edc7bab19bd28a68703923eb2d6068f1f0469ae593855231d31f88baecbf29e7cece2d6beeed20b7c04231a6c90e90d35910
 DIST patchbundle-selinux-base-policy-2.20141203-r8.tar.bz2 297919 SHA256 77539eb3d78105f8789cd8205d2698bd27e2abf100163bdd162cda860fd15120 SHA512 2f8a19e1e4bb65f32b480275f49099aed3ae9df543c7de862b3bbd93e81b89cd96dadac3d091e28673d09a6885db8c5656b3a77d0080775c110b04f2753de7a6 WHIRLPOOL 79cb7e620eb8e838192dc557c7a9ce7e713227d783cc8b63792825559b2145cad70d0af6f99948c1527557bc363feffd846c73893682b4a14fc7d08b9e20c649
+DIST patchbundle-selinux-base-policy-2.20141203-r9.tar.bz2 299602 SHA256 e8518004942a6c57170a609683e22b1410c93a2a195829c41dc8fbc703d941b5 SHA512 ce6484fbca1d2d074e50d1a3953392bd3ce0a4617df98fbac37747b469b4f160a9331586dfe1c3ddccb1ccbee24876a2f05ab49e37c8492a48baf83c2d01d140 WHIRLPOOL 1fd7b956e98e95a64c3a713a944d4531259bd156a7feabf6a89c4b5f33ac846377730eede97889e85183be086f282ebd18e860214f6ca3f01b40f2323470ee04
 DIST refpolicy-2.20140311.tar.bz2 664416 SHA256 f69437db95548c78a5dec44c236397146b144153149009ea554d2e536e5436f7 SHA512 50bacee82ed41ac8b8007ecc33bf51d22303cc2ddd27cfb72cb5520dab5f8e255186e34b89cec492c7a2d4220b200814bdede9b46c19f987a3d3d65a1c9b749a WHIRLPOOL e07480beba6ab1f02ad36b7d0c50c4a71cb39a8ec78bf8d1dc3c82bb9dd1d69d9169d7c937165ea15f60ce1147f256d46644f944107a3a8a800d5bad70d4c255
 DIST refpolicy-2.20141203.tar.bz2 680243 SHA256 f438209c430d8a2d4ddcbe4bdd3edb46f6af7dc4913637af0b73c635e40c1522 SHA512 682e4280c5799e4c12ec7594afc1389f67be35055748d2e0dbdc3419159a16c96d4946ca6178daee8370515951f8653b2e452efe8c962b8d7f9bc192f0b15a0c WHIRLPOOL 74bca232534e7af9051bb1ab9f77c1ff6c425781cf4561f781d6e9a40cc5ca0d9add540249ea5493e8782a9372aea296ead6c165c6c440ae1509eb319d151ee5
diff --git a/sec-policy/selinux-irc/selinux-irc-2.20141203-r8.ebuild b/sec-policy/selinux-irc/selinux-irc-2.20141203-r8.ebuild
index 1f2bd3fd2065..e2bff602696e 100644
--- a/sec-policy/selinux-irc/selinux-irc-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-irc/selinux-irc-2.20141203-r8.ebuild
@@ -13,5 +13,5 @@ DESCRIPTION="SELinux policy for irc"
 if [[ $PV == 9999* ]] ; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-irc/selinux-irc-2.20141203-r9.ebuild b/sec-policy/selinux-irc/selinux-irc-2.20141203-r9.ebuild
new file mode 100644
index 000000000000..1f2bd3fd2065
--- /dev/null
+++ b/sec-policy/selinux-irc/selinux-irc-2.20141203-r9.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI="5"
+
+IUSE=""
+MODS="irc"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for irc"
+
+if [[ $PV == 9999* ]] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
diff --git a/sec-policy/selinux-ircd/Manifest b/sec-policy/selinux-ircd/Manifest
index 8327a635be01..91d204b0021a 100644
--- a/sec-policy/selinux-ircd/Manifest
+++ b/sec-policy/selinux-ircd/Manifest
@@ -9,5 +9,6 @@ DIST patchbundle-selinux-base-policy-2.20141203-r5.tar.bz2 274136 SHA256 c23d17c
 DIST patchbundle-selinux-base-policy-2.20141203-r6.tar.bz2 293231 SHA256 b686dcc517b97834f66d967afdcc724cb43b5c6dbf9f34043a91cdeda2625cc7 SHA512 a2c486cbe4a1d21ff3fd01bef25ecf5a633a4072646c67cfccf3f7187d95f3d9e3b482a46ba17c55c40a8e7c0dee56e9cf9ddc9f414d3e4511443b62f60d03e9 WHIRLPOOL 3d708e287e3f9b873be647b0327eab6675a8702ee1cffb56e36934cada306e5ccc64397a083dad9e59de37a067e628cacbf896ae99012d5a209e42fd7cd8a4c6
 DIST patchbundle-selinux-base-policy-2.20141203-r7.tar.bz2 295833 SHA256 ba2219b3efc747be65f94c4d8ac3cd6ee530c82c848fa41935a114184678622a SHA512 8e32d9dbfb2f0f3f50200543aadb51ed9834ccd5cdf30bf8e4d9e6d0b645ce44ffaf80f7aa9385e9c9095d9a383b3a348a92356cb5386c06544ab082a9a468c7 WHIRLPOOL 1648ee1be71e45fcf5a264816ce7edc7bab19bd28a68703923eb2d6068f1f0469ae593855231d31f88baecbf29e7cece2d6beeed20b7c04231a6c90e90d35910
 DIST patchbundle-selinux-base-policy-2.20141203-r8.tar.bz2 297919 SHA256 77539eb3d78105f8789cd8205d2698bd27e2abf100163bdd162cda860fd15120 SHA512 2f8a19e1e4bb65f32b480275f49099aed3ae9df543c7de862b3bbd93e81b89cd96dadac3d091e28673d09a6885db8c5656b3a77d0080775c110b04f2753de7a6 WHIRLPOOL 79cb7e620eb8e838192dc557c7a9ce7e713227d783cc8b63792825559b2145cad70d0af6f99948c1527557bc363feffd846c73893682b4a14fc7d08b9e20c649
+DIST patchbundle-selinux-base-policy-2.20141203-r9.tar.bz2 299602 SHA256 e8518004942a6c57170a609683e22b1410c93a2a195829c41dc8fbc703d941b5 SHA512 ce6484fbca1d2d074e50d1a3953392bd3ce0a4617df98fbac37747b469b4f160a9331586dfe1c3ddccb1ccbee24876a2f05ab49e37c8492a48baf83c2d01d140 WHIRLPOOL 1fd7b956e98e95a64c3a713a944d4531259bd156a7feabf6a89c4b5f33ac846377730eede97889e85183be086f282ebd18e860214f6ca3f01b40f2323470ee04
 DIST refpolicy-2.20140311.tar.bz2 664416 SHA256 f69437db95548c78a5dec44c236397146b144153149009ea554d2e536e5436f7 SHA512 50bacee82ed41ac8b8007ecc33bf51d22303cc2ddd27cfb72cb5520dab5f8e255186e34b89cec492c7a2d4220b200814bdede9b46c19f987a3d3d65a1c9b749a WHIRLPOOL e07480beba6ab1f02ad36b7d0c50c4a71cb39a8ec78bf8d1dc3c82bb9dd1d69d9169d7c937165ea15f60ce1147f256d46644f944107a3a8a800d5bad70d4c255
 DIST refpolicy-2.20141203.tar.bz2 680243 SHA256 f438209c430d8a2d4ddcbe4bdd3edb46f6af7dc4913637af0b73c635e40c1522 SHA512 682e4280c5799e4c12ec7594afc1389f67be35055748d2e0dbdc3419159a16c96d4946ca6178daee8370515951f8653b2e452efe8c962b8d7f9bc192f0b15a0c WHIRLPOOL 74bca232534e7af9051bb1ab9f77c1ff6c425781cf4561f781d6e9a40cc5ca0d9add540249ea5493e8782a9372aea296ead6c165c6c440ae1509eb319d151ee5
diff --git a/sec-policy/selinux-ircd/selinux-ircd-2.20141203-r8.ebuild b/sec-policy/selinux-ircd/selinux-ircd-2.20141203-r8.ebuild
index 18697ac3008a..fa28d74be7ce 100644
--- a/sec-policy/selinux-ircd/selinux-ircd-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-ircd/selinux-ircd-2.20141203-r8.ebuild
@@ -13,5 +13,5 @@ DESCRIPTION="SELinux policy for ircd"
 if [[ $PV == 9999* ]] ; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-ircd/selinux-ircd-2.20141203-r9.ebuild b/sec-policy/selinux-ircd/selinux-ircd-2.20141203-r9.ebuild
new file mode 100644
index 000000000000..18697ac3008a
--- /dev/null
+++ b/sec-policy/selinux-ircd/selinux-ircd-2.20141203-r9.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI="5"
+
+IUSE=""
+MODS="ircd"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for ircd"
+
+if [[ $PV == 9999* ]] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
diff --git a/sec-policy/selinux-irqbalance/Manifest b/sec-policy/selinux-irqbalance/Manifest
index 8327a635be01..91d204b0021a 100644
--- a/sec-policy/selinux-irqbalance/Manifest
+++ b/sec-policy/selinux-irqbalance/Manifest
@@ -9,5 +9,6 @@ DIST patchbundle-selinux-base-policy-2.20141203-r5.tar.bz2 274136 SHA256 c23d17c
 DIST patchbundle-selinux-base-policy-2.20141203-r6.tar.bz2 293231 SHA256 b686dcc517b97834f66d967afdcc724cb43b5c6dbf9f34043a91cdeda2625cc7 SHA512 a2c486cbe4a1d21ff3fd01bef25ecf5a633a4072646c67cfccf3f7187d95f3d9e3b482a46ba17c55c40a8e7c0dee56e9cf9ddc9f414d3e4511443b62f60d03e9 WHIRLPOOL 3d708e287e3f9b873be647b0327eab6675a8702ee1cffb56e36934cada306e5ccc64397a083dad9e59de37a067e628cacbf896ae99012d5a209e42fd7cd8a4c6
 DIST patchbundle-selinux-base-policy-2.20141203-r7.tar.bz2 295833 SHA256 ba2219b3efc747be65f94c4d8ac3cd6ee530c82c848fa41935a114184678622a SHA512 8e32d9dbfb2f0f3f50200543aadb51ed9834ccd5cdf30bf8e4d9e6d0b645ce44ffaf80f7aa9385e9c9095d9a383b3a348a92356cb5386c06544ab082a9a468c7 WHIRLPOOL 1648ee1be71e45fcf5a264816ce7edc7bab19bd28a68703923eb2d6068f1f0469ae593855231d31f88baecbf29e7cece2d6beeed20b7c04231a6c90e90d35910
 DIST patchbundle-selinux-base-policy-2.20141203-r8.tar.bz2 297919 SHA256 77539eb3d78105f8789cd8205d2698bd27e2abf100163bdd162cda860fd15120 SHA512 2f8a19e1e4bb65f32b480275f49099aed3ae9df543c7de862b3bbd93e81b89cd96dadac3d091e28673d09a6885db8c5656b3a77d0080775c110b04f2753de7a6 WHIRLPOOL 79cb7e620eb8e838192dc557c7a9ce7e713227d783cc8b63792825559b2145cad70d0af6f99948c1527557bc363feffd846c73893682b4a14fc7d08b9e20c649
+DIST patchbundle-selinux-base-policy-2.20141203-r9.tar.bz2 299602 SHA256 e8518004942a6c57170a609683e22b1410c93a2a195829c41dc8fbc703d941b5 SHA512 ce6484fbca1d2d074e50d1a3953392bd3ce0a4617df98fbac37747b469b4f160a9331586dfe1c3ddccb1ccbee24876a2f05ab49e37c8492a48baf83c2d01d140 WHIRLPOOL 1fd7b956e98e95a64c3a713a944d4531259bd156a7feabf6a89c4b5f33ac846377730eede97889e85183be086f282ebd18e860214f6ca3f01b40f2323470ee04
 DIST refpolicy-2.20140311.tar.bz2 664416 SHA256 f69437db95548c78a5dec44c236397146b144153149009ea554d2e536e5436f7 SHA512 50bacee82ed41ac8b8007ecc33bf51d22303cc2ddd27cfb72cb5520dab5f8e255186e34b89cec492c7a2d4220b200814bdede9b46c19f987a3d3d65a1c9b749a WHIRLPOOL e07480beba6ab1f02ad36b7d0c50c4a71cb39a8ec78bf8d1dc3c82bb9dd1d69d9169d7c937165ea15f60ce1147f256d46644f944107a3a8a800d5bad70d4c255
 DIST refpolicy-2.20141203.tar.bz2 680243 SHA256 f438209c430d8a2d4ddcbe4bdd3edb46f6af7dc4913637af0b73c635e40c1522 SHA512 682e4280c5799e4c12ec7594afc1389f67be35055748d2e0dbdc3419159a16c96d4946ca6178daee8370515951f8653b2e452efe8c962b8d7f9bc192f0b15a0c WHIRLPOOL 74bca232534e7af9051bb1ab9f77c1ff6c425781cf4561f781d6e9a40cc5ca0d9add540249ea5493e8782a9372aea296ead6c165c6c440ae1509eb319d151ee5
diff --git a/sec-policy/selinux-irqbalance/selinux-irqbalance-2.20141203-r8.ebuild b/sec-policy/selinux-irqbalance/selinux-irqbalance-2.20141203-r8.ebuild
index c36d63518297..62388821f780 100644
--- a/sec-policy/selinux-irqbalance/selinux-irqbalance-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-irqbalance/selinux-irqbalance-2.20141203-r8.ebuild
@@ -13,5 +13,5 @@ DESCRIPTION="SELinux policy for irqbalance"
 if [[ $PV == 9999* ]] ; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-irqbalance/selinux-irqbalance-2.20141203-r9.ebuild b/sec-policy/selinux-irqbalance/selinux-irqbalance-2.20141203-r9.ebuild
new file mode 100644
index 000000000000..c36d63518297
--- /dev/null
+++ b/sec-policy/selinux-irqbalance/selinux-irqbalance-2.20141203-r9.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI="5"
+
+IUSE=""
+MODS="irqbalance"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for irqbalance"
+
+if [[ $PV == 9999* ]] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
diff --git a/sec-policy/selinux-jabber/Manifest b/sec-policy/selinux-jabber/Manifest
index 8327a635be01..91d204b0021a 100644
--- a/sec-policy/selinux-jabber/Manifest
+++ b/sec-policy/selinux-jabber/Manifest
@@ -9,5 +9,6 @@ DIST patchbundle-selinux-base-policy-2.20141203-r5.tar.bz2 274136 SHA256 c23d17c
 DIST patchbundle-selinux-base-policy-2.20141203-r6.tar.bz2 293231 SHA256 b686dcc517b97834f66d967afdcc724cb43b5c6dbf9f34043a91cdeda2625cc7 SHA512 a2c486cbe4a1d21ff3fd01bef25ecf5a633a4072646c67cfccf3f7187d95f3d9e3b482a46ba17c55c40a8e7c0dee56e9cf9ddc9f414d3e4511443b62f60d03e9 WHIRLPOOL 3d708e287e3f9b873be647b0327eab6675a8702ee1cffb56e36934cada306e5ccc64397a083dad9e59de37a067e628cacbf896ae99012d5a209e42fd7cd8a4c6
 DIST patchbundle-selinux-base-policy-2.20141203-r7.tar.bz2 295833 SHA256 ba2219b3efc747be65f94c4d8ac3cd6ee530c82c848fa41935a114184678622a SHA512 8e32d9dbfb2f0f3f50200543aadb51ed9834ccd5cdf30bf8e4d9e6d0b645ce44ffaf80f7aa9385e9c9095d9a383b3a348a92356cb5386c06544ab082a9a468c7 WHIRLPOOL 1648ee1be71e45fcf5a264816ce7edc7bab19bd28a68703923eb2d6068f1f0469ae593855231d31f88baecbf29e7cece2d6beeed20b7c04231a6c90e90d35910
 DIST patchbundle-selinux-base-policy-2.20141203-r8.tar.bz2 297919 SHA256 77539eb3d78105f8789cd8205d2698bd27e2abf100163bdd162cda860fd15120 SHA512 2f8a19e1e4bb65f32b480275f49099aed3ae9df543c7de862b3bbd93e81b89cd96dadac3d091e28673d09a6885db8c5656b3a77d0080775c110b04f2753de7a6 WHIRLPOOL 79cb7e620eb8e838192dc557c7a9ce7e713227d783cc8b63792825559b2145cad70d0af6f99948c1527557bc363feffd846c73893682b4a14fc7d08b9e20c649
+DIST patchbundle-selinux-base-policy-2.20141203-r9.tar.bz2 299602 SHA256 e8518004942a6c57170a609683e22b1410c93a2a195829c41dc8fbc703d941b5 SHA512 ce6484fbca1d2d074e50d1a3953392bd3ce0a4617df98fbac37747b469b4f160a9331586dfe1c3ddccb1ccbee24876a2f05ab49e37c8492a48baf83c2d01d140 WHIRLPOOL 1fd7b956e98e95a64c3a713a944d4531259bd156a7feabf6a89c4b5f33ac846377730eede97889e85183be086f282ebd18e860214f6ca3f01b40f2323470ee04
 DIST refpolicy-2.20140311.tar.bz2 664416 SHA256 f69437db95548c78a5dec44c236397146b144153149009ea554d2e536e5436f7 SHA512 50bacee82ed41ac8b8007ecc33bf51d22303cc2ddd27cfb72cb5520dab5f8e255186e34b89cec492c7a2d4220b200814bdede9b46c19f987a3d3d65a1c9b749a WHIRLPOOL e07480beba6ab1f02ad36b7d0c50c4a71cb39a8ec78bf8d1dc3c82bb9dd1d69d9169d7c937165ea15f60ce1147f256d46644f944107a3a8a800d5bad70d4c255
 DIST refpolicy-2.20141203.tar.bz2 680243 SHA256 f438209c430d8a2d4ddcbe4bdd3edb46f6af7dc4913637af0b73c635e40c1522 SHA512 682e4280c5799e4c12ec7594afc1389f67be35055748d2e0dbdc3419159a16c96d4946ca6178daee8370515951f8653b2e452efe8c962b8d7f9bc192f0b15a0c WHIRLPOOL 74bca232534e7af9051bb1ab9f77c1ff6c425781cf4561f781d6e9a40cc5ca0d9add540249ea5493e8782a9372aea296ead6c165c6c440ae1509eb319d151ee5
diff --git a/sec-policy/selinux-jabber/selinux-jabber-2.20141203-r8.ebuild b/sec-policy/selinux-jabber/selinux-jabber-2.20141203-r8.ebuild
index 387f01edb278..36daacb9b606 100644
--- a/sec-policy/selinux-jabber/selinux-jabber-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-jabber/selinux-jabber-2.20141203-r8.ebuild
@@ -13,5 +13,5 @@ DESCRIPTION="SELinux policy for jabber"
 if [[ $PV == 9999* ]] ; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-jabber/selinux-jabber-2.20141203-r9.ebuild b/sec-policy/selinux-jabber/selinux-jabber-2.20141203-r9.ebuild
new file mode 100644
index 000000000000..387f01edb278
--- /dev/null
+++ b/sec-policy/selinux-jabber/selinux-jabber-2.20141203-r9.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI="5"
+
+IUSE=""
+MODS="jabber"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for jabber"
+
+if [[ $PV == 9999* ]] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
diff --git a/sec-policy/selinux-java/Manifest b/sec-policy/selinux-java/Manifest
index 8327a635be01..91d204b0021a 100644
--- a/sec-policy/selinux-java/Manifest
+++ b/sec-policy/selinux-java/Manifest
@@ -9,5 +9,6 @@ DIST patchbundle-selinux-base-policy-2.20141203-r5.tar.bz2 274136 SHA256 c23d17c
 DIST patchbundle-selinux-base-policy-2.20141203-r6.tar.bz2 293231 SHA256 b686dcc517b97834f66d967afdcc724cb43b5c6dbf9f34043a91cdeda2625cc7 SHA512 a2c486cbe4a1d21ff3fd01bef25ecf5a633a4072646c67cfccf3f7187d95f3d9e3b482a46ba17c55c40a8e7c0dee56e9cf9ddc9f414d3e4511443b62f60d03e9 WHIRLPOOL 3d708e287e3f9b873be647b0327eab6675a8702ee1cffb56e36934cada306e5ccc64397a083dad9e59de37a067e628cacbf896ae99012d5a209e42fd7cd8a4c6
 DIST patchbundle-selinux-base-policy-2.20141203-r7.tar.bz2 295833 SHA256 ba2219b3efc747be65f94c4d8ac3cd6ee530c82c848fa41935a114184678622a SHA512 8e32d9dbfb2f0f3f50200543aadb51ed9834ccd5cdf30bf8e4d9e6d0b645ce44ffaf80f7aa9385e9c9095d9a383b3a348a92356cb5386c06544ab082a9a468c7 WHIRLPOOL 1648ee1be71e45fcf5a264816ce7edc7bab19bd28a68703923eb2d6068f1f0469ae593855231d31f88baecbf29e7cece2d6beeed20b7c04231a6c90e90d35910
 DIST patchbundle-selinux-base-policy-2.20141203-r8.tar.bz2 297919 SHA256 77539eb3d78105f8789cd8205d2698bd27e2abf100163bdd162cda860fd15120 SHA512 2f8a19e1e4bb65f32b480275f49099aed3ae9df543c7de862b3bbd93e81b89cd96dadac3d091e28673d09a6885db8c5656b3a77d0080775c110b04f2753de7a6 WHIRLPOOL 79cb7e620eb8e838192dc557c7a9ce7e713227d783cc8b63792825559b2145cad70d0af6f99948c1527557bc363feffd846c73893682b4a14fc7d08b9e20c649
+DIST patchbundle-selinux-base-policy-2.20141203-r9.tar.bz2 299602 SHA256 e8518004942a6c57170a609683e22b1410c93a2a195829c41dc8fbc703d941b5 SHA512 ce6484fbca1d2d074e50d1a3953392bd3ce0a4617df98fbac37747b469b4f160a9331586dfe1c3ddccb1ccbee24876a2f05ab49e37c8492a48baf83c2d01d140 WHIRLPOOL 1fd7b956e98e95a64c3a713a944d4531259bd156a7feabf6a89c4b5f33ac846377730eede97889e85183be086f282ebd18e860214f6ca3f01b40f2323470ee04
 DIST refpolicy-2.20140311.tar.bz2 664416 SHA256 f69437db95548c78a5dec44c236397146b144153149009ea554d2e536e5436f7 SHA512 50bacee82ed41ac8b8007ecc33bf51d22303cc2ddd27cfb72cb5520dab5f8e255186e34b89cec492c7a2d4220b200814bdede9b46c19f987a3d3d65a1c9b749a WHIRLPOOL e07480beba6ab1f02ad36b7d0c50c4a71cb39a8ec78bf8d1dc3c82bb9dd1d69d9169d7c937165ea15f60ce1147f256d46644f944107a3a8a800d5bad70d4c255
 DIST refpolicy-2.20141203.tar.bz2 680243 SHA256 f438209c430d8a2d4ddcbe4bdd3edb46f6af7dc4913637af0b73c635e40c1522 SHA512 682e4280c5799e4c12ec7594afc1389f67be35055748d2e0dbdc3419159a16c96d4946ca6178daee8370515951f8653b2e452efe8c962b8d7f9bc192f0b15a0c WHIRLPOOL 74bca232534e7af9051bb1ab9f77c1ff6c425781cf4561f781d6e9a40cc5ca0d9add540249ea5493e8782a9372aea296ead6c165c6c440ae1509eb319d151ee5
diff --git a/sec-policy/selinux-java/selinux-java-2.20141203-r8.ebuild b/sec-policy/selinux-java/selinux-java-2.20141203-r8.ebuild
index 5cec61a4035a..585ca5fc5535 100644
--- a/sec-policy/selinux-java/selinux-java-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-java/selinux-java-2.20141203-r8.ebuild
@@ -13,5 +13,5 @@ DESCRIPTION="SELinux policy for java"
 if [[ $PV == 9999* ]] ; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-java/selinux-java-2.20141203-r9.ebuild b/sec-policy/selinux-java/selinux-java-2.20141203-r9.ebuild
new file mode 100644
index 000000000000..5cec61a4035a
--- /dev/null
+++ b/sec-policy/selinux-java/selinux-java-2.20141203-r9.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI="5"
+
+IUSE="alsa"
+MODS="java"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for java"
+
+if [[ $PV == 9999* ]] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
diff --git a/sec-policy/selinux-kdeconnect/Manifest b/sec-policy/selinux-kdeconnect/Manifest
index 3a8298729849..532f40841067 100644
--- a/sec-policy/selinux-kdeconnect/Manifest
+++ b/sec-policy/selinux-kdeconnect/Manifest
@@ -1,4 +1,5 @@
 DIST patchbundle-selinux-base-policy-2.20141203-r6.tar.bz2 293231 SHA256 b686dcc517b97834f66d967afdcc724cb43b5c6dbf9f34043a91cdeda2625cc7 SHA512 a2c486cbe4a1d21ff3fd01bef25ecf5a633a4072646c67cfccf3f7187d95f3d9e3b482a46ba17c55c40a8e7c0dee56e9cf9ddc9f414d3e4511443b62f60d03e9 WHIRLPOOL 3d708e287e3f9b873be647b0327eab6675a8702ee1cffb56e36934cada306e5ccc64397a083dad9e59de37a067e628cacbf896ae99012d5a209e42fd7cd8a4c6
 DIST patchbundle-selinux-base-policy-2.20141203-r7.tar.bz2 295833 SHA256 ba2219b3efc747be65f94c4d8ac3cd6ee530c82c848fa41935a114184678622a SHA512 8e32d9dbfb2f0f3f50200543aadb51ed9834ccd5cdf30bf8e4d9e6d0b645ce44ffaf80f7aa9385e9c9095d9a383b3a348a92356cb5386c06544ab082a9a468c7 WHIRLPOOL 1648ee1be71e45fcf5a264816ce7edc7bab19bd28a68703923eb2d6068f1f0469ae593855231d31f88baecbf29e7cece2d6beeed20b7c04231a6c90e90d35910
 DIST patchbundle-selinux-base-policy-2.20141203-r8.tar.bz2 297919 SHA256 77539eb3d78105f8789cd8205d2698bd27e2abf100163bdd162cda860fd15120 SHA512 2f8a19e1e4bb65f32b480275f49099aed3ae9df543c7de862b3bbd93e81b89cd96dadac3d091e28673d09a6885db8c5656b3a77d0080775c110b04f2753de7a6 WHIRLPOOL 79cb7e620eb8e838192dc557c7a9ce7e713227d783cc8b63792825559b2145cad70d0af6f99948c1527557bc363feffd846c73893682b4a14fc7d08b9e20c649
+DIST patchbundle-selinux-base-policy-2.20141203-r9.tar.bz2 299602 SHA256 e8518004942a6c57170a609683e22b1410c93a2a195829c41dc8fbc703d941b5 SHA512 ce6484fbca1d2d074e50d1a3953392bd3ce0a4617df98fbac37747b469b4f160a9331586dfe1c3ddccb1ccbee24876a2f05ab49e37c8492a48baf83c2d01d140 WHIRLPOOL 1fd7b956e98e95a64c3a713a944d4531259bd156a7feabf6a89c4b5f33ac846377730eede97889e85183be086f282ebd18e860214f6ca3f01b40f2323470ee04
 DIST refpolicy-2.20141203.tar.bz2 680243 SHA256 f438209c430d8a2d4ddcbe4bdd3edb46f6af7dc4913637af0b73c635e40c1522 SHA512 682e4280c5799e4c12ec7594afc1389f67be35055748d2e0dbdc3419159a16c96d4946ca6178daee8370515951f8653b2e452efe8c962b8d7f9bc192f0b15a0c WHIRLPOOL 74bca232534e7af9051bb1ab9f77c1ff6c425781cf4561f781d6e9a40cc5ca0d9add540249ea5493e8782a9372aea296ead6c165c6c440ae1509eb319d151ee5
diff --git a/sec-policy/selinux-kdeconnect/selinux-kdeconnect-2.20141203-r8.ebuild b/sec-policy/selinux-kdeconnect/selinux-kdeconnect-2.20141203-r8.ebuild
index b6df8dd32f85..d07d881b8c51 100644
--- a/sec-policy/selinux-kdeconnect/selinux-kdeconnect-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-kdeconnect/selinux-kdeconnect-2.20141203-r8.ebuild
@@ -13,5 +13,5 @@ DESCRIPTION="SELinux policy for kdeconnect"
 if [[ $PV == 9999* ]] ; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-kdeconnect/selinux-kdeconnect-2.20141203-r9.ebuild b/sec-policy/selinux-kdeconnect/selinux-kdeconnect-2.20141203-r9.ebuild
new file mode 100644
index 000000000000..b6df8dd32f85
--- /dev/null
+++ b/sec-policy/selinux-kdeconnect/selinux-kdeconnect-2.20141203-r9.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI="5"
+
+IUSE=""
+MODS="kdeconnect"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for kdeconnect"
+
+if [[ $PV == 9999* ]] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
diff --git a/sec-policy/selinux-kdump/Manifest b/sec-policy/selinux-kdump/Manifest
index 8327a635be01..91d204b0021a 100644
--- a/sec-policy/selinux-kdump/Manifest
+++ b/sec-policy/selinux-kdump/Manifest
@@ -9,5 +9,6 @@ DIST patchbundle-selinux-base-policy-2.20141203-r5.tar.bz2 274136 SHA256 c23d17c
 DIST patchbundle-selinux-base-policy-2.20141203-r6.tar.bz2 293231 SHA256 b686dcc517b97834f66d967afdcc724cb43b5c6dbf9f34043a91cdeda2625cc7 SHA512 a2c486cbe4a1d21ff3fd01bef25ecf5a633a4072646c67cfccf3f7187d95f3d9e3b482a46ba17c55c40a8e7c0dee56e9cf9ddc9f414d3e4511443b62f60d03e9 WHIRLPOOL 3d708e287e3f9b873be647b0327eab6675a8702ee1cffb56e36934cada306e5ccc64397a083dad9e59de37a067e628cacbf896ae99012d5a209e42fd7cd8a4c6
 DIST patchbundle-selinux-base-policy-2.20141203-r7.tar.bz2 295833 SHA256 ba2219b3efc747be65f94c4d8ac3cd6ee530c82c848fa41935a114184678622a SHA512 8e32d9dbfb2f0f3f50200543aadb51ed9834ccd5cdf30bf8e4d9e6d0b645ce44ffaf80f7aa9385e9c9095d9a383b3a348a92356cb5386c06544ab082a9a468c7 WHIRLPOOL 1648ee1be71e45fcf5a264816ce7edc7bab19bd28a68703923eb2d6068f1f0469ae593855231d31f88baecbf29e7cece2d6beeed20b7c04231a6c90e90d35910
 DIST patchbundle-selinux-base-policy-2.20141203-r8.tar.bz2 297919 SHA256 77539eb3d78105f8789cd8205d2698bd27e2abf100163bdd162cda860fd15120 SHA512 2f8a19e1e4bb65f32b480275f49099aed3ae9df543c7de862b3bbd93e81b89cd96dadac3d091e28673d09a6885db8c5656b3a77d0080775c110b04f2753de7a6 WHIRLPOOL 79cb7e620eb8e838192dc557c7a9ce7e713227d783cc8b63792825559b2145cad70d0af6f99948c1527557bc363feffd846c73893682b4a14fc7d08b9e20c649
+DIST patchbundle-selinux-base-policy-2.20141203-r9.tar.bz2 299602 SHA256 e8518004942a6c57170a609683e22b1410c93a2a195829c41dc8fbc703d941b5 SHA512 ce6484fbca1d2d074e50d1a3953392bd3ce0a4617df98fbac37747b469b4f160a9331586dfe1c3ddccb1ccbee24876a2f05ab49e37c8492a48baf83c2d01d140 WHIRLPOOL 1fd7b956e98e95a64c3a713a944d4531259bd156a7feabf6a89c4b5f33ac846377730eede97889e85183be086f282ebd18e860214f6ca3f01b40f2323470ee04
 DIST refpolicy-2.20140311.tar.bz2 664416 SHA256 f69437db95548c78a5dec44c236397146b144153149009ea554d2e536e5436f7 SHA512 50bacee82ed41ac8b8007ecc33bf51d22303cc2ddd27cfb72cb5520dab5f8e255186e34b89cec492c7a2d4220b200814bdede9b46c19f987a3d3d65a1c9b749a WHIRLPOOL e07480beba6ab1f02ad36b7d0c50c4a71cb39a8ec78bf8d1dc3c82bb9dd1d69d9169d7c937165ea15f60ce1147f256d46644f944107a3a8a800d5bad70d4c255
 DIST refpolicy-2.20141203.tar.bz2 680243 SHA256 f438209c430d8a2d4ddcbe4bdd3edb46f6af7dc4913637af0b73c635e40c1522 SHA512 682e4280c5799e4c12ec7594afc1389f67be35055748d2e0dbdc3419159a16c96d4946ca6178daee8370515951f8653b2e452efe8c962b8d7f9bc192f0b15a0c WHIRLPOOL 74bca232534e7af9051bb1ab9f77c1ff6c425781cf4561f781d6e9a40cc5ca0d9add540249ea5493e8782a9372aea296ead6c165c6c440ae1509eb319d151ee5
diff --git a/sec-policy/selinux-kdump/selinux-kdump-2.20141203-r8.ebuild b/sec-policy/selinux-kdump/selinux-kdump-2.20141203-r8.ebuild
index 76bbb44c6558..958d59fc4104 100644
--- a/sec-policy/selinux-kdump/selinux-kdump-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-kdump/selinux-kdump-2.20141203-r8.ebuild
@@ -13,5 +13,5 @@ DESCRIPTION="SELinux policy for kdump"
 if [[ $PV == 9999* ]] ; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-kdump/selinux-kdump-2.20141203-r9.ebuild b/sec-policy/selinux-kdump/selinux-kdump-2.20141203-r9.ebuild
new file mode 100644
index 000000000000..76bbb44c6558
--- /dev/null
+++ b/sec-policy/selinux-kdump/selinux-kdump-2.20141203-r9.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI="5"
+
+IUSE=""
+MODS="kdump"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for kdump"
+
+if [[ $PV == 9999* ]] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
diff --git a/sec-policy/selinux-kerberos/Manifest b/sec-policy/selinux-kerberos/Manifest
index 8327a635be01..91d204b0021a 100644
--- a/sec-policy/selinux-kerberos/Manifest
+++ b/sec-policy/selinux-kerberos/Manifest
@@ -9,5 +9,6 @@ DIST patchbundle-selinux-base-policy-2.20141203-r5.tar.bz2 274136 SHA256 c23d17c
 DIST patchbundle-selinux-base-policy-2.20141203-r6.tar.bz2 293231 SHA256 b686dcc517b97834f66d967afdcc724cb43b5c6dbf9f34043a91cdeda2625cc7 SHA512 a2c486cbe4a1d21ff3fd01bef25ecf5a633a4072646c67cfccf3f7187d95f3d9e3b482a46ba17c55c40a8e7c0dee56e9cf9ddc9f414d3e4511443b62f60d03e9 WHIRLPOOL 3d708e287e3f9b873be647b0327eab6675a8702ee1cffb56e36934cada306e5ccc64397a083dad9e59de37a067e628cacbf896ae99012d5a209e42fd7cd8a4c6
 DIST patchbundle-selinux-base-policy-2.20141203-r7.tar.bz2 295833 SHA256 ba2219b3efc747be65f94c4d8ac3cd6ee530c82c848fa41935a114184678622a SHA512 8e32d9dbfb2f0f3f50200543aadb51ed9834ccd5cdf30bf8e4d9e6d0b645ce44ffaf80f7aa9385e9c9095d9a383b3a348a92356cb5386c06544ab082a9a468c7 WHIRLPOOL 1648ee1be71e45fcf5a264816ce7edc7bab19bd28a68703923eb2d6068f1f0469ae593855231d31f88baecbf29e7cece2d6beeed20b7c04231a6c90e90d35910
 DIST patchbundle-selinux-base-policy-2.20141203-r8.tar.bz2 297919 SHA256 77539eb3d78105f8789cd8205d2698bd27e2abf100163bdd162cda860fd15120 SHA512 2f8a19e1e4bb65f32b480275f49099aed3ae9df543c7de862b3bbd93e81b89cd96dadac3d091e28673d09a6885db8c5656b3a77d0080775c110b04f2753de7a6 WHIRLPOOL 79cb7e620eb8e838192dc557c7a9ce7e713227d783cc8b63792825559b2145cad70d0af6f99948c1527557bc363feffd846c73893682b4a14fc7d08b9e20c649
+DIST patchbundle-selinux-base-policy-2.20141203-r9.tar.bz2 299602 SHA256 e8518004942a6c57170a609683e22b1410c93a2a195829c41dc8fbc703d941b5 SHA512 ce6484fbca1d2d074e50d1a3953392bd3ce0a4617df98fbac37747b469b4f160a9331586dfe1c3ddccb1ccbee24876a2f05ab49e37c8492a48baf83c2d01d140 WHIRLPOOL 1fd7b956e98e95a64c3a713a944d4531259bd156a7feabf6a89c4b5f33ac846377730eede97889e85183be086f282ebd18e860214f6ca3f01b40f2323470ee04
 DIST refpolicy-2.20140311.tar.bz2 664416 SHA256 f69437db95548c78a5dec44c236397146b144153149009ea554d2e536e5436f7 SHA512 50bacee82ed41ac8b8007ecc33bf51d22303cc2ddd27cfb72cb5520dab5f8e255186e34b89cec492c7a2d4220b200814bdede9b46c19f987a3d3d65a1c9b749a WHIRLPOOL e07480beba6ab1f02ad36b7d0c50c4a71cb39a8ec78bf8d1dc3c82bb9dd1d69d9169d7c937165ea15f60ce1147f256d46644f944107a3a8a800d5bad70d4c255
 DIST refpolicy-2.20141203.tar.bz2 680243 SHA256 f438209c430d8a2d4ddcbe4bdd3edb46f6af7dc4913637af0b73c635e40c1522 SHA512 682e4280c5799e4c12ec7594afc1389f67be35055748d2e0dbdc3419159a16c96d4946ca6178daee8370515951f8653b2e452efe8c962b8d7f9bc192f0b15a0c WHIRLPOOL 74bca232534e7af9051bb1ab9f77c1ff6c425781cf4561f781d6e9a40cc5ca0d9add540249ea5493e8782a9372aea296ead6c165c6c440ae1509eb319d151ee5
diff --git a/sec-policy/selinux-kerberos/selinux-kerberos-2.20141203-r8.ebuild b/sec-policy/selinux-kerberos/selinux-kerberos-2.20141203-r8.ebuild
index 20f27715e007..5c72b58f7148 100644
--- a/sec-policy/selinux-kerberos/selinux-kerberos-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-kerberos/selinux-kerberos-2.20141203-r8.ebuild
@@ -13,5 +13,5 @@ DESCRIPTION="SELinux policy for kerberos"
 if [[ $PV == 9999* ]] ; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-kerberos/selinux-kerberos-2.20141203-r9.ebuild b/sec-policy/selinux-kerberos/selinux-kerberos-2.20141203-r9.ebuild
new file mode 100644
index 000000000000..20f27715e007
--- /dev/null
+++ b/sec-policy/selinux-kerberos/selinux-kerberos-2.20141203-r9.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI="5"
+
+IUSE=""
+MODS="kerberos"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for kerberos"
+
+if [[ $PV == 9999* ]] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
diff --git a/sec-policy/selinux-kerneloops/Manifest b/sec-policy/selinux-kerneloops/Manifest
index 8327a635be01..91d204b0021a 100644
--- a/sec-policy/selinux-kerneloops/Manifest
+++ b/sec-policy/selinux-kerneloops/Manifest
@@ -9,5 +9,6 @@ DIST patchbundle-selinux-base-policy-2.20141203-r5.tar.bz2 274136 SHA256 c23d17c
 DIST patchbundle-selinux-base-policy-2.20141203-r6.tar.bz2 293231 SHA256 b686dcc517b97834f66d967afdcc724cb43b5c6dbf9f34043a91cdeda2625cc7 SHA512 a2c486cbe4a1d21ff3fd01bef25ecf5a633a4072646c67cfccf3f7187d95f3d9e3b482a46ba17c55c40a8e7c0dee56e9cf9ddc9f414d3e4511443b62f60d03e9 WHIRLPOOL 3d708e287e3f9b873be647b0327eab6675a8702ee1cffb56e36934cada306e5ccc64397a083dad9e59de37a067e628cacbf896ae99012d5a209e42fd7cd8a4c6
 DIST patchbundle-selinux-base-policy-2.20141203-r7.tar.bz2 295833 SHA256 ba2219b3efc747be65f94c4d8ac3cd6ee530c82c848fa41935a114184678622a SHA512 8e32d9dbfb2f0f3f50200543aadb51ed9834ccd5cdf30bf8e4d9e6d0b645ce44ffaf80f7aa9385e9c9095d9a383b3a348a92356cb5386c06544ab082a9a468c7 WHIRLPOOL 1648ee1be71e45fcf5a264816ce7edc7bab19bd28a68703923eb2d6068f1f0469ae593855231d31f88baecbf29e7cece2d6beeed20b7c04231a6c90e90d35910
 DIST patchbundle-selinux-base-policy-2.20141203-r8.tar.bz2 297919 SHA256 77539eb3d78105f8789cd8205d2698bd27e2abf100163bdd162cda860fd15120 SHA512 2f8a19e1e4bb65f32b480275f49099aed3ae9df543c7de862b3bbd93e81b89cd96dadac3d091e28673d09a6885db8c5656b3a77d0080775c110b04f2753de7a6 WHIRLPOOL 79cb7e620eb8e838192dc557c7a9ce7e713227d783cc8b63792825559b2145cad70d0af6f99948c1527557bc363feffd846c73893682b4a14fc7d08b9e20c649
+DIST patchbundle-selinux-base-policy-2.20141203-r9.tar.bz2 299602 SHA256 e8518004942a6c57170a609683e22b1410c93a2a195829c41dc8fbc703d941b5 SHA512 ce6484fbca1d2d074e50d1a3953392bd3ce0a4617df98fbac37747b469b4f160a9331586dfe1c3ddccb1ccbee24876a2f05ab49e37c8492a48baf83c2d01d140 WHIRLPOOL 1fd7b956e98e95a64c3a713a944d4531259bd156a7feabf6a89c4b5f33ac846377730eede97889e85183be086f282ebd18e860214f6ca3f01b40f2323470ee04
 DIST refpolicy-2.20140311.tar.bz2 664416 SHA256 f69437db95548c78a5dec44c236397146b144153149009ea554d2e536e5436f7 SHA512 50bacee82ed41ac8b8007ecc33bf51d22303cc2ddd27cfb72cb5520dab5f8e255186e34b89cec492c7a2d4220b200814bdede9b46c19f987a3d3d65a1c9b749a WHIRLPOOL e07480beba6ab1f02ad36b7d0c50c4a71cb39a8ec78bf8d1dc3c82bb9dd1d69d9169d7c937165ea15f60ce1147f256d46644f944107a3a8a800d5bad70d4c255
 DIST refpolicy-2.20141203.tar.bz2 680243 SHA256 f438209c430d8a2d4ddcbe4bdd3edb46f6af7dc4913637af0b73c635e40c1522 SHA512 682e4280c5799e4c12ec7594afc1389f67be35055748d2e0dbdc3419159a16c96d4946ca6178daee8370515951f8653b2e452efe8c962b8d7f9bc192f0b15a0c WHIRLPOOL 74bca232534e7af9051bb1ab9f77c1ff6c425781cf4561f781d6e9a40cc5ca0d9add540249ea5493e8782a9372aea296ead6c165c6c440ae1509eb319d151ee5
diff --git a/sec-policy/selinux-kerneloops/selinux-kerneloops-2.20141203-r8.ebuild b/sec-policy/selinux-kerneloops/selinux-kerneloops-2.20141203-r8.ebuild
index a7bc4954eaf8..7199c740ebfc 100644
--- a/sec-policy/selinux-kerneloops/selinux-kerneloops-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-kerneloops/selinux-kerneloops-2.20141203-r8.ebuild
@@ -13,5 +13,5 @@ DESCRIPTION="SELinux policy for kerneloops"
 if [[ $PV == 9999* ]] ; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-kerneloops/selinux-kerneloops-2.20141203-r9.ebuild b/sec-policy/selinux-kerneloops/selinux-kerneloops-2.20141203-r9.ebuild
new file mode 100644
index 000000000000..a7bc4954eaf8
--- /dev/null
+++ b/sec-policy/selinux-kerneloops/selinux-kerneloops-2.20141203-r9.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI="5"
+
+IUSE=""
+MODS="kerneloops"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for kerneloops"
+
+if [[ $PV == 9999* ]] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
diff --git a/sec-policy/selinux-kismet/Manifest b/sec-policy/selinux-kismet/Manifest
index 8327a635be01..91d204b0021a 100644
--- a/sec-policy/selinux-kismet/Manifest
+++ b/sec-policy/selinux-kismet/Manifest
@@ -9,5 +9,6 @@ DIST patchbundle-selinux-base-policy-2.20141203-r5.tar.bz2 274136 SHA256 c23d17c
 DIST patchbundle-selinux-base-policy-2.20141203-r6.tar.bz2 293231 SHA256 b686dcc517b97834f66d967afdcc724cb43b5c6dbf9f34043a91cdeda2625cc7 SHA512 a2c486cbe4a1d21ff3fd01bef25ecf5a633a4072646c67cfccf3f7187d95f3d9e3b482a46ba17c55c40a8e7c0dee56e9cf9ddc9f414d3e4511443b62f60d03e9 WHIRLPOOL 3d708e287e3f9b873be647b0327eab6675a8702ee1cffb56e36934cada306e5ccc64397a083dad9e59de37a067e628cacbf896ae99012d5a209e42fd7cd8a4c6
 DIST patchbundle-selinux-base-policy-2.20141203-r7.tar.bz2 295833 SHA256 ba2219b3efc747be65f94c4d8ac3cd6ee530c82c848fa41935a114184678622a SHA512 8e32d9dbfb2f0f3f50200543aadb51ed9834ccd5cdf30bf8e4d9e6d0b645ce44ffaf80f7aa9385e9c9095d9a383b3a348a92356cb5386c06544ab082a9a468c7 WHIRLPOOL 1648ee1be71e45fcf5a264816ce7edc7bab19bd28a68703923eb2d6068f1f0469ae593855231d31f88baecbf29e7cece2d6beeed20b7c04231a6c90e90d35910
 DIST patchbundle-selinux-base-policy-2.20141203-r8.tar.bz2 297919 SHA256 77539eb3d78105f8789cd8205d2698bd27e2abf100163bdd162cda860fd15120 SHA512 2f8a19e1e4bb65f32b480275f49099aed3ae9df543c7de862b3bbd93e81b89cd96dadac3d091e28673d09a6885db8c5656b3a77d0080775c110b04f2753de7a6 WHIRLPOOL 79cb7e620eb8e838192dc557c7a9ce7e713227d783cc8b63792825559b2145cad70d0af6f99948c1527557bc363feffd846c73893682b4a14fc7d08b9e20c649
+DIST patchbundle-selinux-base-policy-2.20141203-r9.tar.bz2 299602 SHA256 e8518004942a6c57170a609683e22b1410c93a2a195829c41dc8fbc703d941b5 SHA512 ce6484fbca1d2d074e50d1a3953392bd3ce0a4617df98fbac37747b469b4f160a9331586dfe1c3ddccb1ccbee24876a2f05ab49e37c8492a48baf83c2d01d140 WHIRLPOOL 1fd7b956e98e95a64c3a713a944d4531259bd156a7feabf6a89c4b5f33ac846377730eede97889e85183be086f282ebd18e860214f6ca3f01b40f2323470ee04
 DIST refpolicy-2.20140311.tar.bz2 664416 SHA256 f69437db95548c78a5dec44c236397146b144153149009ea554d2e536e5436f7 SHA512 50bacee82ed41ac8b8007ecc33bf51d22303cc2ddd27cfb72cb5520dab5f8e255186e34b89cec492c7a2d4220b200814bdede9b46c19f987a3d3d65a1c9b749a WHIRLPOOL e07480beba6ab1f02ad36b7d0c50c4a71cb39a8ec78bf8d1dc3c82bb9dd1d69d9169d7c937165ea15f60ce1147f256d46644f944107a3a8a800d5bad70d4c255
 DIST refpolicy-2.20141203.tar.bz2 680243 SHA256 f438209c430d8a2d4ddcbe4bdd3edb46f6af7dc4913637af0b73c635e40c1522 SHA512 682e4280c5799e4c12ec7594afc1389f67be35055748d2e0dbdc3419159a16c96d4946ca6178daee8370515951f8653b2e452efe8c962b8d7f9bc192f0b15a0c WHIRLPOOL 74bca232534e7af9051bb1ab9f77c1ff6c425781cf4561f781d6e9a40cc5ca0d9add540249ea5493e8782a9372aea296ead6c165c6c440ae1509eb319d151ee5
diff --git a/sec-policy/selinux-kismet/selinux-kismet-2.20141203-r8.ebuild b/sec-policy/selinux-kismet/selinux-kismet-2.20141203-r8.ebuild
index 61454fa1b3c5..8c8ad7bf7e43 100644
--- a/sec-policy/selinux-kismet/selinux-kismet-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-kismet/selinux-kismet-2.20141203-r8.ebuild
@@ -13,5 +13,5 @@ DESCRIPTION="SELinux policy for kismet"
 if [[ $PV == 9999* ]] ; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-kismet/selinux-kismet-2.20141203-r9.ebuild b/sec-policy/selinux-kismet/selinux-kismet-2.20141203-r9.ebuild
new file mode 100644
index 000000000000..61454fa1b3c5
--- /dev/null
+++ b/sec-policy/selinux-kismet/selinux-kismet-2.20141203-r9.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI="5"
+
+IUSE=""
+MODS="kismet"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for kismet"
+
+if [[ $PV == 9999* ]] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
diff --git a/sec-policy/selinux-ksmtuned/Manifest b/sec-policy/selinux-ksmtuned/Manifest
index 8327a635be01..91d204b0021a 100644
--- a/sec-policy/selinux-ksmtuned/Manifest
+++ b/sec-policy/selinux-ksmtuned/Manifest
@@ -9,5 +9,6 @@ DIST patchbundle-selinux-base-policy-2.20141203-r5.tar.bz2 274136 SHA256 c23d17c
 DIST patchbundle-selinux-base-policy-2.20141203-r6.tar.bz2 293231 SHA256 b686dcc517b97834f66d967afdcc724cb43b5c6dbf9f34043a91cdeda2625cc7 SHA512 a2c486cbe4a1d21ff3fd01bef25ecf5a633a4072646c67cfccf3f7187d95f3d9e3b482a46ba17c55c40a8e7c0dee56e9cf9ddc9f414d3e4511443b62f60d03e9 WHIRLPOOL 3d708e287e3f9b873be647b0327eab6675a8702ee1cffb56e36934cada306e5ccc64397a083dad9e59de37a067e628cacbf896ae99012d5a209e42fd7cd8a4c6
 DIST patchbundle-selinux-base-policy-2.20141203-r7.tar.bz2 295833 SHA256 ba2219b3efc747be65f94c4d8ac3cd6ee530c82c848fa41935a114184678622a SHA512 8e32d9dbfb2f0f3f50200543aadb51ed9834ccd5cdf30bf8e4d9e6d0b645ce44ffaf80f7aa9385e9c9095d9a383b3a348a92356cb5386c06544ab082a9a468c7 WHIRLPOOL 1648ee1be71e45fcf5a264816ce7edc7bab19bd28a68703923eb2d6068f1f0469ae593855231d31f88baecbf29e7cece2d6beeed20b7c04231a6c90e90d35910
 DIST patchbundle-selinux-base-policy-2.20141203-r8.tar.bz2 297919 SHA256 77539eb3d78105f8789cd8205d2698bd27e2abf100163bdd162cda860fd15120 SHA512 2f8a19e1e4bb65f32b480275f49099aed3ae9df543c7de862b3bbd93e81b89cd96dadac3d091e28673d09a6885db8c5656b3a77d0080775c110b04f2753de7a6 WHIRLPOOL 79cb7e620eb8e838192dc557c7a9ce7e713227d783cc8b63792825559b2145cad70d0af6f99948c1527557bc363feffd846c73893682b4a14fc7d08b9e20c649
+DIST patchbundle-selinux-base-policy-2.20141203-r9.tar.bz2 299602 SHA256 e8518004942a6c57170a609683e22b1410c93a2a195829c41dc8fbc703d941b5 SHA512 ce6484fbca1d2d074e50d1a3953392bd3ce0a4617df98fbac37747b469b4f160a9331586dfe1c3ddccb1ccbee24876a2f05ab49e37c8492a48baf83c2d01d140 WHIRLPOOL 1fd7b956e98e95a64c3a713a944d4531259bd156a7feabf6a89c4b5f33ac846377730eede97889e85183be086f282ebd18e860214f6ca3f01b40f2323470ee04
 DIST refpolicy-2.20140311.tar.bz2 664416 SHA256 f69437db95548c78a5dec44c236397146b144153149009ea554d2e536e5436f7 SHA512 50bacee82ed41ac8b8007ecc33bf51d22303cc2ddd27cfb72cb5520dab5f8e255186e34b89cec492c7a2d4220b200814bdede9b46c19f987a3d3d65a1c9b749a WHIRLPOOL e07480beba6ab1f02ad36b7d0c50c4a71cb39a8ec78bf8d1dc3c82bb9dd1d69d9169d7c937165ea15f60ce1147f256d46644f944107a3a8a800d5bad70d4c255
 DIST refpolicy-2.20141203.tar.bz2 680243 SHA256 f438209c430d8a2d4ddcbe4bdd3edb46f6af7dc4913637af0b73c635e40c1522 SHA512 682e4280c5799e4c12ec7594afc1389f67be35055748d2e0dbdc3419159a16c96d4946ca6178daee8370515951f8653b2e452efe8c962b8d7f9bc192f0b15a0c WHIRLPOOL 74bca232534e7af9051bb1ab9f77c1ff6c425781cf4561f781d6e9a40cc5ca0d9add540249ea5493e8782a9372aea296ead6c165c6c440ae1509eb319d151ee5
diff --git a/sec-policy/selinux-ksmtuned/selinux-ksmtuned-2.20141203-r8.ebuild b/sec-policy/selinux-ksmtuned/selinux-ksmtuned-2.20141203-r8.ebuild
index f611fc0a6674..d30162d68b12 100644
--- a/sec-policy/selinux-ksmtuned/selinux-ksmtuned-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-ksmtuned/selinux-ksmtuned-2.20141203-r8.ebuild
@@ -13,5 +13,5 @@ DESCRIPTION="SELinux policy for ksmtuned"
 if [[ $PV == 9999* ]] ; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-ksmtuned/selinux-ksmtuned-2.20141203-r9.ebuild b/sec-policy/selinux-ksmtuned/selinux-ksmtuned-2.20141203-r9.ebuild
new file mode 100644
index 000000000000..f611fc0a6674
--- /dev/null
+++ b/sec-policy/selinux-ksmtuned/selinux-ksmtuned-2.20141203-r9.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI="5"
+
+IUSE=""
+MODS="ksmtuned"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for ksmtuned"
+
+if [[ $PV == 9999* ]] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
diff --git a/sec-policy/selinux-kudzu/Manifest b/sec-policy/selinux-kudzu/Manifest
index 8327a635be01..91d204b0021a 100644
--- a/sec-policy/selinux-kudzu/Manifest
+++ b/sec-policy/selinux-kudzu/Manifest
@@ -9,5 +9,6 @@ DIST patchbundle-selinux-base-policy-2.20141203-r5.tar.bz2 274136 SHA256 c23d17c
 DIST patchbundle-selinux-base-policy-2.20141203-r6.tar.bz2 293231 SHA256 b686dcc517b97834f66d967afdcc724cb43b5c6dbf9f34043a91cdeda2625cc7 SHA512 a2c486cbe4a1d21ff3fd01bef25ecf5a633a4072646c67cfccf3f7187d95f3d9e3b482a46ba17c55c40a8e7c0dee56e9cf9ddc9f414d3e4511443b62f60d03e9 WHIRLPOOL 3d708e287e3f9b873be647b0327eab6675a8702ee1cffb56e36934cada306e5ccc64397a083dad9e59de37a067e628cacbf896ae99012d5a209e42fd7cd8a4c6
 DIST patchbundle-selinux-base-policy-2.20141203-r7.tar.bz2 295833 SHA256 ba2219b3efc747be65f94c4d8ac3cd6ee530c82c848fa41935a114184678622a SHA512 8e32d9dbfb2f0f3f50200543aadb51ed9834ccd5cdf30bf8e4d9e6d0b645ce44ffaf80f7aa9385e9c9095d9a383b3a348a92356cb5386c06544ab082a9a468c7 WHIRLPOOL 1648ee1be71e45fcf5a264816ce7edc7bab19bd28a68703923eb2d6068f1f0469ae593855231d31f88baecbf29e7cece2d6beeed20b7c04231a6c90e90d35910
 DIST patchbundle-selinux-base-policy-2.20141203-r8.tar.bz2 297919 SHA256 77539eb3d78105f8789cd8205d2698bd27e2abf100163bdd162cda860fd15120 SHA512 2f8a19e1e4bb65f32b480275f49099aed3ae9df543c7de862b3bbd93e81b89cd96dadac3d091e28673d09a6885db8c5656b3a77d0080775c110b04f2753de7a6 WHIRLPOOL 79cb7e620eb8e838192dc557c7a9ce7e713227d783cc8b63792825559b2145cad70d0af6f99948c1527557bc363feffd846c73893682b4a14fc7d08b9e20c649
+DIST patchbundle-selinux-base-policy-2.20141203-r9.tar.bz2 299602 SHA256 e8518004942a6c57170a609683e22b1410c93a2a195829c41dc8fbc703d941b5 SHA512 ce6484fbca1d2d074e50d1a3953392bd3ce0a4617df98fbac37747b469b4f160a9331586dfe1c3ddccb1ccbee24876a2f05ab49e37c8492a48baf83c2d01d140 WHIRLPOOL 1fd7b956e98e95a64c3a713a944d4531259bd156a7feabf6a89c4b5f33ac846377730eede97889e85183be086f282ebd18e860214f6ca3f01b40f2323470ee04
 DIST refpolicy-2.20140311.tar.bz2 664416 SHA256 f69437db95548c78a5dec44c236397146b144153149009ea554d2e536e5436f7 SHA512 50bacee82ed41ac8b8007ecc33bf51d22303cc2ddd27cfb72cb5520dab5f8e255186e34b89cec492c7a2d4220b200814bdede9b46c19f987a3d3d65a1c9b749a WHIRLPOOL e07480beba6ab1f02ad36b7d0c50c4a71cb39a8ec78bf8d1dc3c82bb9dd1d69d9169d7c937165ea15f60ce1147f256d46644f944107a3a8a800d5bad70d4c255
 DIST refpolicy-2.20141203.tar.bz2 680243 SHA256 f438209c430d8a2d4ddcbe4bdd3edb46f6af7dc4913637af0b73c635e40c1522 SHA512 682e4280c5799e4c12ec7594afc1389f67be35055748d2e0dbdc3419159a16c96d4946ca6178daee8370515951f8653b2e452efe8c962b8d7f9bc192f0b15a0c WHIRLPOOL 74bca232534e7af9051bb1ab9f77c1ff6c425781cf4561f781d6e9a40cc5ca0d9add540249ea5493e8782a9372aea296ead6c165c6c440ae1509eb319d151ee5
diff --git a/sec-policy/selinux-kudzu/selinux-kudzu-2.20141203-r8.ebuild b/sec-policy/selinux-kudzu/selinux-kudzu-2.20141203-r8.ebuild
index c34980720d41..a8e8ee0cc749 100644
--- a/sec-policy/selinux-kudzu/selinux-kudzu-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-kudzu/selinux-kudzu-2.20141203-r8.ebuild
@@ -13,5 +13,5 @@ DESCRIPTION="SELinux policy for kudzu"
 if [[ $PV == 9999* ]] ; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-kudzu/selinux-kudzu-2.20141203-r9.ebuild b/sec-policy/selinux-kudzu/selinux-kudzu-2.20141203-r9.ebuild
new file mode 100644
index 000000000000..c34980720d41
--- /dev/null
+++ b/sec-policy/selinux-kudzu/selinux-kudzu-2.20141203-r9.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI="5"
+
+IUSE=""
+MODS="kudzu"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for kudzu"
+
+if [[ $PV == 9999* ]] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
diff --git a/sec-policy/selinux-ldap/Manifest b/sec-policy/selinux-ldap/Manifest
index 8327a635be01..91d204b0021a 100644
--- a/sec-policy/selinux-ldap/Manifest
+++ b/sec-policy/selinux-ldap/Manifest
@@ -9,5 +9,6 @@ DIST patchbundle-selinux-base-policy-2.20141203-r5.tar.bz2 274136 SHA256 c23d17c
 DIST patchbundle-selinux-base-policy-2.20141203-r6.tar.bz2 293231 SHA256 b686dcc517b97834f66d967afdcc724cb43b5c6dbf9f34043a91cdeda2625cc7 SHA512 a2c486cbe4a1d21ff3fd01bef25ecf5a633a4072646c67cfccf3f7187d95f3d9e3b482a46ba17c55c40a8e7c0dee56e9cf9ddc9f414d3e4511443b62f60d03e9 WHIRLPOOL 3d708e287e3f9b873be647b0327eab6675a8702ee1cffb56e36934cada306e5ccc64397a083dad9e59de37a067e628cacbf896ae99012d5a209e42fd7cd8a4c6
 DIST patchbundle-selinux-base-policy-2.20141203-r7.tar.bz2 295833 SHA256 ba2219b3efc747be65f94c4d8ac3cd6ee530c82c848fa41935a114184678622a SHA512 8e32d9dbfb2f0f3f50200543aadb51ed9834ccd5cdf30bf8e4d9e6d0b645ce44ffaf80f7aa9385e9c9095d9a383b3a348a92356cb5386c06544ab082a9a468c7 WHIRLPOOL 1648ee1be71e45fcf5a264816ce7edc7bab19bd28a68703923eb2d6068f1f0469ae593855231d31f88baecbf29e7cece2d6beeed20b7c04231a6c90e90d35910
 DIST patchbundle-selinux-base-policy-2.20141203-r8.tar.bz2 297919 SHA256 77539eb3d78105f8789cd8205d2698bd27e2abf100163bdd162cda860fd15120 SHA512 2f8a19e1e4bb65f32b480275f49099aed3ae9df543c7de862b3bbd93e81b89cd96dadac3d091e28673d09a6885db8c5656b3a77d0080775c110b04f2753de7a6 WHIRLPOOL 79cb7e620eb8e838192dc557c7a9ce7e713227d783cc8b63792825559b2145cad70d0af6f99948c1527557bc363feffd846c73893682b4a14fc7d08b9e20c649
+DIST patchbundle-selinux-base-policy-2.20141203-r9.tar.bz2 299602 SHA256 e8518004942a6c57170a609683e22b1410c93a2a195829c41dc8fbc703d941b5 SHA512 ce6484fbca1d2d074e50d1a3953392bd3ce0a4617df98fbac37747b469b4f160a9331586dfe1c3ddccb1ccbee24876a2f05ab49e37c8492a48baf83c2d01d140 WHIRLPOOL 1fd7b956e98e95a64c3a713a944d4531259bd156a7feabf6a89c4b5f33ac846377730eede97889e85183be086f282ebd18e860214f6ca3f01b40f2323470ee04
 DIST refpolicy-2.20140311.tar.bz2 664416 SHA256 f69437db95548c78a5dec44c236397146b144153149009ea554d2e536e5436f7 SHA512 50bacee82ed41ac8b8007ecc33bf51d22303cc2ddd27cfb72cb5520dab5f8e255186e34b89cec492c7a2d4220b200814bdede9b46c19f987a3d3d65a1c9b749a WHIRLPOOL e07480beba6ab1f02ad36b7d0c50c4a71cb39a8ec78bf8d1dc3c82bb9dd1d69d9169d7c937165ea15f60ce1147f256d46644f944107a3a8a800d5bad70d4c255
 DIST refpolicy-2.20141203.tar.bz2 680243 SHA256 f438209c430d8a2d4ddcbe4bdd3edb46f6af7dc4913637af0b73c635e40c1522 SHA512 682e4280c5799e4c12ec7594afc1389f67be35055748d2e0dbdc3419159a16c96d4946ca6178daee8370515951f8653b2e452efe8c962b8d7f9bc192f0b15a0c WHIRLPOOL 74bca232534e7af9051bb1ab9f77c1ff6c425781cf4561f781d6e9a40cc5ca0d9add540249ea5493e8782a9372aea296ead6c165c6c440ae1509eb319d151ee5
diff --git a/sec-policy/selinux-ldap/selinux-ldap-2.20141203-r8.ebuild b/sec-policy/selinux-ldap/selinux-ldap-2.20141203-r8.ebuild
index 19a97012f9fa..3cba896fd284 100644
--- a/sec-policy/selinux-ldap/selinux-ldap-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-ldap/selinux-ldap-2.20141203-r8.ebuild
@@ -13,5 +13,5 @@ DESCRIPTION="SELinux policy for ldap"
 if [[ $PV == 9999* ]] ; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-ldap/selinux-ldap-2.20141203-r9.ebuild b/sec-policy/selinux-ldap/selinux-ldap-2.20141203-r9.ebuild
new file mode 100644
index 000000000000..19a97012f9fa
--- /dev/null
+++ b/sec-policy/selinux-ldap/selinux-ldap-2.20141203-r9.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI="5"
+
+IUSE=""
+MODS="ldap"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for ldap"
+
+if [[ $PV == 9999* ]] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
diff --git a/sec-policy/selinux-links/Manifest b/sec-policy/selinux-links/Manifest
index 8327a635be01..91d204b0021a 100644
--- a/sec-policy/selinux-links/Manifest
+++ b/sec-policy/selinux-links/Manifest
@@ -9,5 +9,6 @@ DIST patchbundle-selinux-base-policy-2.20141203-r5.tar.bz2 274136 SHA256 c23d17c
 DIST patchbundle-selinux-base-policy-2.20141203-r6.tar.bz2 293231 SHA256 b686dcc517b97834f66d967afdcc724cb43b5c6dbf9f34043a91cdeda2625cc7 SHA512 a2c486cbe4a1d21ff3fd01bef25ecf5a633a4072646c67cfccf3f7187d95f3d9e3b482a46ba17c55c40a8e7c0dee56e9cf9ddc9f414d3e4511443b62f60d03e9 WHIRLPOOL 3d708e287e3f9b873be647b0327eab6675a8702ee1cffb56e36934cada306e5ccc64397a083dad9e59de37a067e628cacbf896ae99012d5a209e42fd7cd8a4c6
 DIST patchbundle-selinux-base-policy-2.20141203-r7.tar.bz2 295833 SHA256 ba2219b3efc747be65f94c4d8ac3cd6ee530c82c848fa41935a114184678622a SHA512 8e32d9dbfb2f0f3f50200543aadb51ed9834ccd5cdf30bf8e4d9e6d0b645ce44ffaf80f7aa9385e9c9095d9a383b3a348a92356cb5386c06544ab082a9a468c7 WHIRLPOOL 1648ee1be71e45fcf5a264816ce7edc7bab19bd28a68703923eb2d6068f1f0469ae593855231d31f88baecbf29e7cece2d6beeed20b7c04231a6c90e90d35910
 DIST patchbundle-selinux-base-policy-2.20141203-r8.tar.bz2 297919 SHA256 77539eb3d78105f8789cd8205d2698bd27e2abf100163bdd162cda860fd15120 SHA512 2f8a19e1e4bb65f32b480275f49099aed3ae9df543c7de862b3bbd93e81b89cd96dadac3d091e28673d09a6885db8c5656b3a77d0080775c110b04f2753de7a6 WHIRLPOOL 79cb7e620eb8e838192dc557c7a9ce7e713227d783cc8b63792825559b2145cad70d0af6f99948c1527557bc363feffd846c73893682b4a14fc7d08b9e20c649
+DIST patchbundle-selinux-base-policy-2.20141203-r9.tar.bz2 299602 SHA256 e8518004942a6c57170a609683e22b1410c93a2a195829c41dc8fbc703d941b5 SHA512 ce6484fbca1d2d074e50d1a3953392bd3ce0a4617df98fbac37747b469b4f160a9331586dfe1c3ddccb1ccbee24876a2f05ab49e37c8492a48baf83c2d01d140 WHIRLPOOL 1fd7b956e98e95a64c3a713a944d4531259bd156a7feabf6a89c4b5f33ac846377730eede97889e85183be086f282ebd18e860214f6ca3f01b40f2323470ee04
 DIST refpolicy-2.20140311.tar.bz2 664416 SHA256 f69437db95548c78a5dec44c236397146b144153149009ea554d2e536e5436f7 SHA512 50bacee82ed41ac8b8007ecc33bf51d22303cc2ddd27cfb72cb5520dab5f8e255186e34b89cec492c7a2d4220b200814bdede9b46c19f987a3d3d65a1c9b749a WHIRLPOOL e07480beba6ab1f02ad36b7d0c50c4a71cb39a8ec78bf8d1dc3c82bb9dd1d69d9169d7c937165ea15f60ce1147f256d46644f944107a3a8a800d5bad70d4c255
 DIST refpolicy-2.20141203.tar.bz2 680243 SHA256 f438209c430d8a2d4ddcbe4bdd3edb46f6af7dc4913637af0b73c635e40c1522 SHA512 682e4280c5799e4c12ec7594afc1389f67be35055748d2e0dbdc3419159a16c96d4946ca6178daee8370515951f8653b2e452efe8c962b8d7f9bc192f0b15a0c WHIRLPOOL 74bca232534e7af9051bb1ab9f77c1ff6c425781cf4561f781d6e9a40cc5ca0d9add540249ea5493e8782a9372aea296ead6c165c6c440ae1509eb319d151ee5
diff --git a/sec-policy/selinux-links/selinux-links-2.20141203-r8.ebuild b/sec-policy/selinux-links/selinux-links-2.20141203-r8.ebuild
index 2310d60365fb..cdd7caedd91e 100644
--- a/sec-policy/selinux-links/selinux-links-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-links/selinux-links-2.20141203-r8.ebuild
@@ -13,5 +13,5 @@ DESCRIPTION="SELinux policy for links"
 if [[ $PV == 9999* ]] ; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-links/selinux-links-2.20141203-r9.ebuild b/sec-policy/selinux-links/selinux-links-2.20141203-r9.ebuild
new file mode 100644
index 000000000000..2310d60365fb
--- /dev/null
+++ b/sec-policy/selinux-links/selinux-links-2.20141203-r9.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI="5"
+
+IUSE=""
+MODS="links"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for links"
+
+if [[ $PV == 9999* ]] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
diff --git a/sec-policy/selinux-lircd/Manifest b/sec-policy/selinux-lircd/Manifest
index 8327a635be01..91d204b0021a 100644
--- a/sec-policy/selinux-lircd/Manifest
+++ b/sec-policy/selinux-lircd/Manifest
@@ -9,5 +9,6 @@ DIST patchbundle-selinux-base-policy-2.20141203-r5.tar.bz2 274136 SHA256 c23d17c
 DIST patchbundle-selinux-base-policy-2.20141203-r6.tar.bz2 293231 SHA256 b686dcc517b97834f66d967afdcc724cb43b5c6dbf9f34043a91cdeda2625cc7 SHA512 a2c486cbe4a1d21ff3fd01bef25ecf5a633a4072646c67cfccf3f7187d95f3d9e3b482a46ba17c55c40a8e7c0dee56e9cf9ddc9f414d3e4511443b62f60d03e9 WHIRLPOOL 3d708e287e3f9b873be647b0327eab6675a8702ee1cffb56e36934cada306e5ccc64397a083dad9e59de37a067e628cacbf896ae99012d5a209e42fd7cd8a4c6
 DIST patchbundle-selinux-base-policy-2.20141203-r7.tar.bz2 295833 SHA256 ba2219b3efc747be65f94c4d8ac3cd6ee530c82c848fa41935a114184678622a SHA512 8e32d9dbfb2f0f3f50200543aadb51ed9834ccd5cdf30bf8e4d9e6d0b645ce44ffaf80f7aa9385e9c9095d9a383b3a348a92356cb5386c06544ab082a9a468c7 WHIRLPOOL 1648ee1be71e45fcf5a264816ce7edc7bab19bd28a68703923eb2d6068f1f0469ae593855231d31f88baecbf29e7cece2d6beeed20b7c04231a6c90e90d35910
 DIST patchbundle-selinux-base-policy-2.20141203-r8.tar.bz2 297919 SHA256 77539eb3d78105f8789cd8205d2698bd27e2abf100163bdd162cda860fd15120 SHA512 2f8a19e1e4bb65f32b480275f49099aed3ae9df543c7de862b3bbd93e81b89cd96dadac3d091e28673d09a6885db8c5656b3a77d0080775c110b04f2753de7a6 WHIRLPOOL 79cb7e620eb8e838192dc557c7a9ce7e713227d783cc8b63792825559b2145cad70d0af6f99948c1527557bc363feffd846c73893682b4a14fc7d08b9e20c649
+DIST patchbundle-selinux-base-policy-2.20141203-r9.tar.bz2 299602 SHA256 e8518004942a6c57170a609683e22b1410c93a2a195829c41dc8fbc703d941b5 SHA512 ce6484fbca1d2d074e50d1a3953392bd3ce0a4617df98fbac37747b469b4f160a9331586dfe1c3ddccb1ccbee24876a2f05ab49e37c8492a48baf83c2d01d140 WHIRLPOOL 1fd7b956e98e95a64c3a713a944d4531259bd156a7feabf6a89c4b5f33ac846377730eede97889e85183be086f282ebd18e860214f6ca3f01b40f2323470ee04
 DIST refpolicy-2.20140311.tar.bz2 664416 SHA256 f69437db95548c78a5dec44c236397146b144153149009ea554d2e536e5436f7 SHA512 50bacee82ed41ac8b8007ecc33bf51d22303cc2ddd27cfb72cb5520dab5f8e255186e34b89cec492c7a2d4220b200814bdede9b46c19f987a3d3d65a1c9b749a WHIRLPOOL e07480beba6ab1f02ad36b7d0c50c4a71cb39a8ec78bf8d1dc3c82bb9dd1d69d9169d7c937165ea15f60ce1147f256d46644f944107a3a8a800d5bad70d4c255
 DIST refpolicy-2.20141203.tar.bz2 680243 SHA256 f438209c430d8a2d4ddcbe4bdd3edb46f6af7dc4913637af0b73c635e40c1522 SHA512 682e4280c5799e4c12ec7594afc1389f67be35055748d2e0dbdc3419159a16c96d4946ca6178daee8370515951f8653b2e452efe8c962b8d7f9bc192f0b15a0c WHIRLPOOL 74bca232534e7af9051bb1ab9f77c1ff6c425781cf4561f781d6e9a40cc5ca0d9add540249ea5493e8782a9372aea296ead6c165c6c440ae1509eb319d151ee5
diff --git a/sec-policy/selinux-lircd/selinux-lircd-2.20141203-r8.ebuild b/sec-policy/selinux-lircd/selinux-lircd-2.20141203-r8.ebuild
index c8181f304e35..8c07f12c9f1d 100644
--- a/sec-policy/selinux-lircd/selinux-lircd-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-lircd/selinux-lircd-2.20141203-r8.ebuild
@@ -13,5 +13,5 @@ DESCRIPTION="SELinux policy for lircd"
 if [[ $PV == 9999* ]] ; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-lircd/selinux-lircd-2.20141203-r9.ebuild b/sec-policy/selinux-lircd/selinux-lircd-2.20141203-r9.ebuild
new file mode 100644
index 000000000000..c8181f304e35
--- /dev/null
+++ b/sec-policy/selinux-lircd/selinux-lircd-2.20141203-r9.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI="5"
+
+IUSE=""
+MODS="lircd"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for lircd"
+
+if [[ $PV == 9999* ]] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
diff --git a/sec-policy/selinux-loadkeys/Manifest b/sec-policy/selinux-loadkeys/Manifest
index 8327a635be01..91d204b0021a 100644
--- a/sec-policy/selinux-loadkeys/Manifest
+++ b/sec-policy/selinux-loadkeys/Manifest
@@ -9,5 +9,6 @@ DIST patchbundle-selinux-base-policy-2.20141203-r5.tar.bz2 274136 SHA256 c23d17c
 DIST patchbundle-selinux-base-policy-2.20141203-r6.tar.bz2 293231 SHA256 b686dcc517b97834f66d967afdcc724cb43b5c6dbf9f34043a91cdeda2625cc7 SHA512 a2c486cbe4a1d21ff3fd01bef25ecf5a633a4072646c67cfccf3f7187d95f3d9e3b482a46ba17c55c40a8e7c0dee56e9cf9ddc9f414d3e4511443b62f60d03e9 WHIRLPOOL 3d708e287e3f9b873be647b0327eab6675a8702ee1cffb56e36934cada306e5ccc64397a083dad9e59de37a067e628cacbf896ae99012d5a209e42fd7cd8a4c6
 DIST patchbundle-selinux-base-policy-2.20141203-r7.tar.bz2 295833 SHA256 ba2219b3efc747be65f94c4d8ac3cd6ee530c82c848fa41935a114184678622a SHA512 8e32d9dbfb2f0f3f50200543aadb51ed9834ccd5cdf30bf8e4d9e6d0b645ce44ffaf80f7aa9385e9c9095d9a383b3a348a92356cb5386c06544ab082a9a468c7 WHIRLPOOL 1648ee1be71e45fcf5a264816ce7edc7bab19bd28a68703923eb2d6068f1f0469ae593855231d31f88baecbf29e7cece2d6beeed20b7c04231a6c90e90d35910
 DIST patchbundle-selinux-base-policy-2.20141203-r8.tar.bz2 297919 SHA256 77539eb3d78105f8789cd8205d2698bd27e2abf100163bdd162cda860fd15120 SHA512 2f8a19e1e4bb65f32b480275f49099aed3ae9df543c7de862b3bbd93e81b89cd96dadac3d091e28673d09a6885db8c5656b3a77d0080775c110b04f2753de7a6 WHIRLPOOL 79cb7e620eb8e838192dc557c7a9ce7e713227d783cc8b63792825559b2145cad70d0af6f99948c1527557bc363feffd846c73893682b4a14fc7d08b9e20c649
+DIST patchbundle-selinux-base-policy-2.20141203-r9.tar.bz2 299602 SHA256 e8518004942a6c57170a609683e22b1410c93a2a195829c41dc8fbc703d941b5 SHA512 ce6484fbca1d2d074e50d1a3953392bd3ce0a4617df98fbac37747b469b4f160a9331586dfe1c3ddccb1ccbee24876a2f05ab49e37c8492a48baf83c2d01d140 WHIRLPOOL 1fd7b956e98e95a64c3a713a944d4531259bd156a7feabf6a89c4b5f33ac846377730eede97889e85183be086f282ebd18e860214f6ca3f01b40f2323470ee04
 DIST refpolicy-2.20140311.tar.bz2 664416 SHA256 f69437db95548c78a5dec44c236397146b144153149009ea554d2e536e5436f7 SHA512 50bacee82ed41ac8b8007ecc33bf51d22303cc2ddd27cfb72cb5520dab5f8e255186e34b89cec492c7a2d4220b200814bdede9b46c19f987a3d3d65a1c9b749a WHIRLPOOL e07480beba6ab1f02ad36b7d0c50c4a71cb39a8ec78bf8d1dc3c82bb9dd1d69d9169d7c937165ea15f60ce1147f256d46644f944107a3a8a800d5bad70d4c255
 DIST refpolicy-2.20141203.tar.bz2 680243 SHA256 f438209c430d8a2d4ddcbe4bdd3edb46f6af7dc4913637af0b73c635e40c1522 SHA512 682e4280c5799e4c12ec7594afc1389f67be35055748d2e0dbdc3419159a16c96d4946ca6178daee8370515951f8653b2e452efe8c962b8d7f9bc192f0b15a0c WHIRLPOOL 74bca232534e7af9051bb1ab9f77c1ff6c425781cf4561f781d6e9a40cc5ca0d9add540249ea5493e8782a9372aea296ead6c165c6c440ae1509eb319d151ee5
diff --git a/sec-policy/selinux-loadkeys/selinux-loadkeys-2.20141203-r8.ebuild b/sec-policy/selinux-loadkeys/selinux-loadkeys-2.20141203-r8.ebuild
index 72a0ed226476..9522baa4ed41 100644
--- a/sec-policy/selinux-loadkeys/selinux-loadkeys-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-loadkeys/selinux-loadkeys-2.20141203-r8.ebuild
@@ -13,5 +13,5 @@ DESCRIPTION="SELinux policy for loadkeys"
 if [[ $PV == 9999* ]] ; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-loadkeys/selinux-loadkeys-2.20141203-r9.ebuild b/sec-policy/selinux-loadkeys/selinux-loadkeys-2.20141203-r9.ebuild
new file mode 100644
index 000000000000..72a0ed226476
--- /dev/null
+++ b/sec-policy/selinux-loadkeys/selinux-loadkeys-2.20141203-r9.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI="5"
+
+IUSE=""
+MODS="loadkeys"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for loadkeys"
+
+if [[ $PV == 9999* ]] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
diff --git a/sec-policy/selinux-lockdev/Manifest b/sec-policy/selinux-lockdev/Manifest
index 8327a635be01..91d204b0021a 100644
--- a/sec-policy/selinux-lockdev/Manifest
+++ b/sec-policy/selinux-lockdev/Manifest
@@ -9,5 +9,6 @@ DIST patchbundle-selinux-base-policy-2.20141203-r5.tar.bz2 274136 SHA256 c23d17c
 DIST patchbundle-selinux-base-policy-2.20141203-r6.tar.bz2 293231 SHA256 b686dcc517b97834f66d967afdcc724cb43b5c6dbf9f34043a91cdeda2625cc7 SHA512 a2c486cbe4a1d21ff3fd01bef25ecf5a633a4072646c67cfccf3f7187d95f3d9e3b482a46ba17c55c40a8e7c0dee56e9cf9ddc9f414d3e4511443b62f60d03e9 WHIRLPOOL 3d708e287e3f9b873be647b0327eab6675a8702ee1cffb56e36934cada306e5ccc64397a083dad9e59de37a067e628cacbf896ae99012d5a209e42fd7cd8a4c6
 DIST patchbundle-selinux-base-policy-2.20141203-r7.tar.bz2 295833 SHA256 ba2219b3efc747be65f94c4d8ac3cd6ee530c82c848fa41935a114184678622a SHA512 8e32d9dbfb2f0f3f50200543aadb51ed9834ccd5cdf30bf8e4d9e6d0b645ce44ffaf80f7aa9385e9c9095d9a383b3a348a92356cb5386c06544ab082a9a468c7 WHIRLPOOL 1648ee1be71e45fcf5a264816ce7edc7bab19bd28a68703923eb2d6068f1f0469ae593855231d31f88baecbf29e7cece2d6beeed20b7c04231a6c90e90d35910
 DIST patchbundle-selinux-base-policy-2.20141203-r8.tar.bz2 297919 SHA256 77539eb3d78105f8789cd8205d2698bd27e2abf100163bdd162cda860fd15120 SHA512 2f8a19e1e4bb65f32b480275f49099aed3ae9df543c7de862b3bbd93e81b89cd96dadac3d091e28673d09a6885db8c5656b3a77d0080775c110b04f2753de7a6 WHIRLPOOL 79cb7e620eb8e838192dc557c7a9ce7e713227d783cc8b63792825559b2145cad70d0af6f99948c1527557bc363feffd846c73893682b4a14fc7d08b9e20c649
+DIST patchbundle-selinux-base-policy-2.20141203-r9.tar.bz2 299602 SHA256 e8518004942a6c57170a609683e22b1410c93a2a195829c41dc8fbc703d941b5 SHA512 ce6484fbca1d2d074e50d1a3953392bd3ce0a4617df98fbac37747b469b4f160a9331586dfe1c3ddccb1ccbee24876a2f05ab49e37c8492a48baf83c2d01d140 WHIRLPOOL 1fd7b956e98e95a64c3a713a944d4531259bd156a7feabf6a89c4b5f33ac846377730eede97889e85183be086f282ebd18e860214f6ca3f01b40f2323470ee04
 DIST refpolicy-2.20140311.tar.bz2 664416 SHA256 f69437db95548c78a5dec44c236397146b144153149009ea554d2e536e5436f7 SHA512 50bacee82ed41ac8b8007ecc33bf51d22303cc2ddd27cfb72cb5520dab5f8e255186e34b89cec492c7a2d4220b200814bdede9b46c19f987a3d3d65a1c9b749a WHIRLPOOL e07480beba6ab1f02ad36b7d0c50c4a71cb39a8ec78bf8d1dc3c82bb9dd1d69d9169d7c937165ea15f60ce1147f256d46644f944107a3a8a800d5bad70d4c255
 DIST refpolicy-2.20141203.tar.bz2 680243 SHA256 f438209c430d8a2d4ddcbe4bdd3edb46f6af7dc4913637af0b73c635e40c1522 SHA512 682e4280c5799e4c12ec7594afc1389f67be35055748d2e0dbdc3419159a16c96d4946ca6178daee8370515951f8653b2e452efe8c962b8d7f9bc192f0b15a0c WHIRLPOOL 74bca232534e7af9051bb1ab9f77c1ff6c425781cf4561f781d6e9a40cc5ca0d9add540249ea5493e8782a9372aea296ead6c165c6c440ae1509eb319d151ee5
diff --git a/sec-policy/selinux-lockdev/selinux-lockdev-2.20141203-r8.ebuild b/sec-policy/selinux-lockdev/selinux-lockdev-2.20141203-r8.ebuild
index 848eed568c1d..c4f3817a5c73 100644
--- a/sec-policy/selinux-lockdev/selinux-lockdev-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-lockdev/selinux-lockdev-2.20141203-r8.ebuild
@@ -13,5 +13,5 @@ DESCRIPTION="SELinux policy for lockdev"
 if [[ $PV == 9999* ]] ; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-lockdev/selinux-lockdev-2.20141203-r9.ebuild b/sec-policy/selinux-lockdev/selinux-lockdev-2.20141203-r9.ebuild
new file mode 100644
index 000000000000..848eed568c1d
--- /dev/null
+++ b/sec-policy/selinux-lockdev/selinux-lockdev-2.20141203-r9.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI="5"
+
+IUSE=""
+MODS="lockdev"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for lockdev"
+
+if [[ $PV == 9999* ]] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
diff --git a/sec-policy/selinux-logrotate/Manifest b/sec-policy/selinux-logrotate/Manifest
index 8327a635be01..91d204b0021a 100644
--- a/sec-policy/selinux-logrotate/Manifest
+++ b/sec-policy/selinux-logrotate/Manifest
@@ -9,5 +9,6 @@ DIST patchbundle-selinux-base-policy-2.20141203-r5.tar.bz2 274136 SHA256 c23d17c
 DIST patchbundle-selinux-base-policy-2.20141203-r6.tar.bz2 293231 SHA256 b686dcc517b97834f66d967afdcc724cb43b5c6dbf9f34043a91cdeda2625cc7 SHA512 a2c486cbe4a1d21ff3fd01bef25ecf5a633a4072646c67cfccf3f7187d95f3d9e3b482a46ba17c55c40a8e7c0dee56e9cf9ddc9f414d3e4511443b62f60d03e9 WHIRLPOOL 3d708e287e3f9b873be647b0327eab6675a8702ee1cffb56e36934cada306e5ccc64397a083dad9e59de37a067e628cacbf896ae99012d5a209e42fd7cd8a4c6
 DIST patchbundle-selinux-base-policy-2.20141203-r7.tar.bz2 295833 SHA256 ba2219b3efc747be65f94c4d8ac3cd6ee530c82c848fa41935a114184678622a SHA512 8e32d9dbfb2f0f3f50200543aadb51ed9834ccd5cdf30bf8e4d9e6d0b645ce44ffaf80f7aa9385e9c9095d9a383b3a348a92356cb5386c06544ab082a9a468c7 WHIRLPOOL 1648ee1be71e45fcf5a264816ce7edc7bab19bd28a68703923eb2d6068f1f0469ae593855231d31f88baecbf29e7cece2d6beeed20b7c04231a6c90e90d35910
 DIST patchbundle-selinux-base-policy-2.20141203-r8.tar.bz2 297919 SHA256 77539eb3d78105f8789cd8205d2698bd27e2abf100163bdd162cda860fd15120 SHA512 2f8a19e1e4bb65f32b480275f49099aed3ae9df543c7de862b3bbd93e81b89cd96dadac3d091e28673d09a6885db8c5656b3a77d0080775c110b04f2753de7a6 WHIRLPOOL 79cb7e620eb8e838192dc557c7a9ce7e713227d783cc8b63792825559b2145cad70d0af6f99948c1527557bc363feffd846c73893682b4a14fc7d08b9e20c649
+DIST patchbundle-selinux-base-policy-2.20141203-r9.tar.bz2 299602 SHA256 e8518004942a6c57170a609683e22b1410c93a2a195829c41dc8fbc703d941b5 SHA512 ce6484fbca1d2d074e50d1a3953392bd3ce0a4617df98fbac37747b469b4f160a9331586dfe1c3ddccb1ccbee24876a2f05ab49e37c8492a48baf83c2d01d140 WHIRLPOOL 1fd7b956e98e95a64c3a713a944d4531259bd156a7feabf6a89c4b5f33ac846377730eede97889e85183be086f282ebd18e860214f6ca3f01b40f2323470ee04
 DIST refpolicy-2.20140311.tar.bz2 664416 SHA256 f69437db95548c78a5dec44c236397146b144153149009ea554d2e536e5436f7 SHA512 50bacee82ed41ac8b8007ecc33bf51d22303cc2ddd27cfb72cb5520dab5f8e255186e34b89cec492c7a2d4220b200814bdede9b46c19f987a3d3d65a1c9b749a WHIRLPOOL e07480beba6ab1f02ad36b7d0c50c4a71cb39a8ec78bf8d1dc3c82bb9dd1d69d9169d7c937165ea15f60ce1147f256d46644f944107a3a8a800d5bad70d4c255
 DIST refpolicy-2.20141203.tar.bz2 680243 SHA256 f438209c430d8a2d4ddcbe4bdd3edb46f6af7dc4913637af0b73c635e40c1522 SHA512 682e4280c5799e4c12ec7594afc1389f67be35055748d2e0dbdc3419159a16c96d4946ca6178daee8370515951f8653b2e452efe8c962b8d7f9bc192f0b15a0c WHIRLPOOL 74bca232534e7af9051bb1ab9f77c1ff6c425781cf4561f781d6e9a40cc5ca0d9add540249ea5493e8782a9372aea296ead6c165c6c440ae1509eb319d151ee5
diff --git a/sec-policy/selinux-logrotate/selinux-logrotate-2.20141203-r8.ebuild b/sec-policy/selinux-logrotate/selinux-logrotate-2.20141203-r8.ebuild
index 997eef18fb06..b2a27c05b820 100644
--- a/sec-policy/selinux-logrotate/selinux-logrotate-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-logrotate/selinux-logrotate-2.20141203-r8.ebuild
@@ -13,5 +13,5 @@ DESCRIPTION="SELinux policy for logrotate"
 if [[ $PV == 9999* ]] ; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-logrotate/selinux-logrotate-2.20141203-r9.ebuild b/sec-policy/selinux-logrotate/selinux-logrotate-2.20141203-r9.ebuild
new file mode 100644
index 000000000000..997eef18fb06
--- /dev/null
+++ b/sec-policy/selinux-logrotate/selinux-logrotate-2.20141203-r9.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI="5"
+
+IUSE=""
+MODS="logrotate"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for logrotate"
+
+if [[ $PV == 9999* ]] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
diff --git a/sec-policy/selinux-logsentry/Manifest b/sec-policy/selinux-logsentry/Manifest
index 8327a635be01..91d204b0021a 100644
--- a/sec-policy/selinux-logsentry/Manifest
+++ b/sec-policy/selinux-logsentry/Manifest
@@ -9,5 +9,6 @@ DIST patchbundle-selinux-base-policy-2.20141203-r5.tar.bz2 274136 SHA256 c23d17c
 DIST patchbundle-selinux-base-policy-2.20141203-r6.tar.bz2 293231 SHA256 b686dcc517b97834f66d967afdcc724cb43b5c6dbf9f34043a91cdeda2625cc7 SHA512 a2c486cbe4a1d21ff3fd01bef25ecf5a633a4072646c67cfccf3f7187d95f3d9e3b482a46ba17c55c40a8e7c0dee56e9cf9ddc9f414d3e4511443b62f60d03e9 WHIRLPOOL 3d708e287e3f9b873be647b0327eab6675a8702ee1cffb56e36934cada306e5ccc64397a083dad9e59de37a067e628cacbf896ae99012d5a209e42fd7cd8a4c6
 DIST patchbundle-selinux-base-policy-2.20141203-r7.tar.bz2 295833 SHA256 ba2219b3efc747be65f94c4d8ac3cd6ee530c82c848fa41935a114184678622a SHA512 8e32d9dbfb2f0f3f50200543aadb51ed9834ccd5cdf30bf8e4d9e6d0b645ce44ffaf80f7aa9385e9c9095d9a383b3a348a92356cb5386c06544ab082a9a468c7 WHIRLPOOL 1648ee1be71e45fcf5a264816ce7edc7bab19bd28a68703923eb2d6068f1f0469ae593855231d31f88baecbf29e7cece2d6beeed20b7c04231a6c90e90d35910
 DIST patchbundle-selinux-base-policy-2.20141203-r8.tar.bz2 297919 SHA256 77539eb3d78105f8789cd8205d2698bd27e2abf100163bdd162cda860fd15120 SHA512 2f8a19e1e4bb65f32b480275f49099aed3ae9df543c7de862b3bbd93e81b89cd96dadac3d091e28673d09a6885db8c5656b3a77d0080775c110b04f2753de7a6 WHIRLPOOL 79cb7e620eb8e838192dc557c7a9ce7e713227d783cc8b63792825559b2145cad70d0af6f99948c1527557bc363feffd846c73893682b4a14fc7d08b9e20c649
+DIST patchbundle-selinux-base-policy-2.20141203-r9.tar.bz2 299602 SHA256 e8518004942a6c57170a609683e22b1410c93a2a195829c41dc8fbc703d941b5 SHA512 ce6484fbca1d2d074e50d1a3953392bd3ce0a4617df98fbac37747b469b4f160a9331586dfe1c3ddccb1ccbee24876a2f05ab49e37c8492a48baf83c2d01d140 WHIRLPOOL 1fd7b956e98e95a64c3a713a944d4531259bd156a7feabf6a89c4b5f33ac846377730eede97889e85183be086f282ebd18e860214f6ca3f01b40f2323470ee04
 DIST refpolicy-2.20140311.tar.bz2 664416 SHA256 f69437db95548c78a5dec44c236397146b144153149009ea554d2e536e5436f7 SHA512 50bacee82ed41ac8b8007ecc33bf51d22303cc2ddd27cfb72cb5520dab5f8e255186e34b89cec492c7a2d4220b200814bdede9b46c19f987a3d3d65a1c9b749a WHIRLPOOL e07480beba6ab1f02ad36b7d0c50c4a71cb39a8ec78bf8d1dc3c82bb9dd1d69d9169d7c937165ea15f60ce1147f256d46644f944107a3a8a800d5bad70d4c255
 DIST refpolicy-2.20141203.tar.bz2 680243 SHA256 f438209c430d8a2d4ddcbe4bdd3edb46f6af7dc4913637af0b73c635e40c1522 SHA512 682e4280c5799e4c12ec7594afc1389f67be35055748d2e0dbdc3419159a16c96d4946ca6178daee8370515951f8653b2e452efe8c962b8d7f9bc192f0b15a0c WHIRLPOOL 74bca232534e7af9051bb1ab9f77c1ff6c425781cf4561f781d6e9a40cc5ca0d9add540249ea5493e8782a9372aea296ead6c165c6c440ae1509eb319d151ee5
diff --git a/sec-policy/selinux-logsentry/selinux-logsentry-2.20141203-r8.ebuild b/sec-policy/selinux-logsentry/selinux-logsentry-2.20141203-r8.ebuild
index 795437ddb489..acd11a57988f 100644
--- a/sec-policy/selinux-logsentry/selinux-logsentry-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-logsentry/selinux-logsentry-2.20141203-r8.ebuild
@@ -13,5 +13,5 @@ DESCRIPTION="SELinux policy for logsentry"
 if [[ $PV == 9999* ]] ; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-logsentry/selinux-logsentry-2.20141203-r9.ebuild b/sec-policy/selinux-logsentry/selinux-logsentry-2.20141203-r9.ebuild
new file mode 100644
index 000000000000..795437ddb489
--- /dev/null
+++ b/sec-policy/selinux-logsentry/selinux-logsentry-2.20141203-r9.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI="5"
+
+IUSE=""
+MODS="logsentry"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for logsentry"
+
+if [[ $PV == 9999* ]] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
diff --git a/sec-policy/selinux-logwatch/Manifest b/sec-policy/selinux-logwatch/Manifest
index 8327a635be01..91d204b0021a 100644
--- a/sec-policy/selinux-logwatch/Manifest
+++ b/sec-policy/selinux-logwatch/Manifest
@@ -9,5 +9,6 @@ DIST patchbundle-selinux-base-policy-2.20141203-r5.tar.bz2 274136 SHA256 c23d17c
 DIST patchbundle-selinux-base-policy-2.20141203-r6.tar.bz2 293231 SHA256 b686dcc517b97834f66d967afdcc724cb43b5c6dbf9f34043a91cdeda2625cc7 SHA512 a2c486cbe4a1d21ff3fd01bef25ecf5a633a4072646c67cfccf3f7187d95f3d9e3b482a46ba17c55c40a8e7c0dee56e9cf9ddc9f414d3e4511443b62f60d03e9 WHIRLPOOL 3d708e287e3f9b873be647b0327eab6675a8702ee1cffb56e36934cada306e5ccc64397a083dad9e59de37a067e628cacbf896ae99012d5a209e42fd7cd8a4c6
 DIST patchbundle-selinux-base-policy-2.20141203-r7.tar.bz2 295833 SHA256 ba2219b3efc747be65f94c4d8ac3cd6ee530c82c848fa41935a114184678622a SHA512 8e32d9dbfb2f0f3f50200543aadb51ed9834ccd5cdf30bf8e4d9e6d0b645ce44ffaf80f7aa9385e9c9095d9a383b3a348a92356cb5386c06544ab082a9a468c7 WHIRLPOOL 1648ee1be71e45fcf5a264816ce7edc7bab19bd28a68703923eb2d6068f1f0469ae593855231d31f88baecbf29e7cece2d6beeed20b7c04231a6c90e90d35910
 DIST patchbundle-selinux-base-policy-2.20141203-r8.tar.bz2 297919 SHA256 77539eb3d78105f8789cd8205d2698bd27e2abf100163bdd162cda860fd15120 SHA512 2f8a19e1e4bb65f32b480275f49099aed3ae9df543c7de862b3bbd93e81b89cd96dadac3d091e28673d09a6885db8c5656b3a77d0080775c110b04f2753de7a6 WHIRLPOOL 79cb7e620eb8e838192dc557c7a9ce7e713227d783cc8b63792825559b2145cad70d0af6f99948c1527557bc363feffd846c73893682b4a14fc7d08b9e20c649
+DIST patchbundle-selinux-base-policy-2.20141203-r9.tar.bz2 299602 SHA256 e8518004942a6c57170a609683e22b1410c93a2a195829c41dc8fbc703d941b5 SHA512 ce6484fbca1d2d074e50d1a3953392bd3ce0a4617df98fbac37747b469b4f160a9331586dfe1c3ddccb1ccbee24876a2f05ab49e37c8492a48baf83c2d01d140 WHIRLPOOL 1fd7b956e98e95a64c3a713a944d4531259bd156a7feabf6a89c4b5f33ac846377730eede97889e85183be086f282ebd18e860214f6ca3f01b40f2323470ee04
 DIST refpolicy-2.20140311.tar.bz2 664416 SHA256 f69437db95548c78a5dec44c236397146b144153149009ea554d2e536e5436f7 SHA512 50bacee82ed41ac8b8007ecc33bf51d22303cc2ddd27cfb72cb5520dab5f8e255186e34b89cec492c7a2d4220b200814bdede9b46c19f987a3d3d65a1c9b749a WHIRLPOOL e07480beba6ab1f02ad36b7d0c50c4a71cb39a8ec78bf8d1dc3c82bb9dd1d69d9169d7c937165ea15f60ce1147f256d46644f944107a3a8a800d5bad70d4c255
 DIST refpolicy-2.20141203.tar.bz2 680243 SHA256 f438209c430d8a2d4ddcbe4bdd3edb46f6af7dc4913637af0b73c635e40c1522 SHA512 682e4280c5799e4c12ec7594afc1389f67be35055748d2e0dbdc3419159a16c96d4946ca6178daee8370515951f8653b2e452efe8c962b8d7f9bc192f0b15a0c WHIRLPOOL 74bca232534e7af9051bb1ab9f77c1ff6c425781cf4561f781d6e9a40cc5ca0d9add540249ea5493e8782a9372aea296ead6c165c6c440ae1509eb319d151ee5
diff --git a/sec-policy/selinux-logwatch/selinux-logwatch-2.20141203-r8.ebuild b/sec-policy/selinux-logwatch/selinux-logwatch-2.20141203-r8.ebuild
index 88898934d4ea..6abd986d8eaf 100644
--- a/sec-policy/selinux-logwatch/selinux-logwatch-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-logwatch/selinux-logwatch-2.20141203-r8.ebuild
@@ -13,5 +13,5 @@ DESCRIPTION="SELinux policy for logwatch"
 if [[ $PV == 9999* ]] ; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-logwatch/selinux-logwatch-2.20141203-r9.ebuild b/sec-policy/selinux-logwatch/selinux-logwatch-2.20141203-r9.ebuild
new file mode 100644
index 000000000000..88898934d4ea
--- /dev/null
+++ b/sec-policy/selinux-logwatch/selinux-logwatch-2.20141203-r9.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI="5"
+
+IUSE=""
+MODS="logwatch"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for logwatch"
+
+if [[ $PV == 9999* ]] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
diff --git a/sec-policy/selinux-lpd/Manifest b/sec-policy/selinux-lpd/Manifest
index 8327a635be01..91d204b0021a 100644
--- a/sec-policy/selinux-lpd/Manifest
+++ b/sec-policy/selinux-lpd/Manifest
@@ -9,5 +9,6 @@ DIST patchbundle-selinux-base-policy-2.20141203-r5.tar.bz2 274136 SHA256 c23d17c
 DIST patchbundle-selinux-base-policy-2.20141203-r6.tar.bz2 293231 SHA256 b686dcc517b97834f66d967afdcc724cb43b5c6dbf9f34043a91cdeda2625cc7 SHA512 a2c486cbe4a1d21ff3fd01bef25ecf5a633a4072646c67cfccf3f7187d95f3d9e3b482a46ba17c55c40a8e7c0dee56e9cf9ddc9f414d3e4511443b62f60d03e9 WHIRLPOOL 3d708e287e3f9b873be647b0327eab6675a8702ee1cffb56e36934cada306e5ccc64397a083dad9e59de37a067e628cacbf896ae99012d5a209e42fd7cd8a4c6
 DIST patchbundle-selinux-base-policy-2.20141203-r7.tar.bz2 295833 SHA256 ba2219b3efc747be65f94c4d8ac3cd6ee530c82c848fa41935a114184678622a SHA512 8e32d9dbfb2f0f3f50200543aadb51ed9834ccd5cdf30bf8e4d9e6d0b645ce44ffaf80f7aa9385e9c9095d9a383b3a348a92356cb5386c06544ab082a9a468c7 WHIRLPOOL 1648ee1be71e45fcf5a264816ce7edc7bab19bd28a68703923eb2d6068f1f0469ae593855231d31f88baecbf29e7cece2d6beeed20b7c04231a6c90e90d35910
 DIST patchbundle-selinux-base-policy-2.20141203-r8.tar.bz2 297919 SHA256 77539eb3d78105f8789cd8205d2698bd27e2abf100163bdd162cda860fd15120 SHA512 2f8a19e1e4bb65f32b480275f49099aed3ae9df543c7de862b3bbd93e81b89cd96dadac3d091e28673d09a6885db8c5656b3a77d0080775c110b04f2753de7a6 WHIRLPOOL 79cb7e620eb8e838192dc557c7a9ce7e713227d783cc8b63792825559b2145cad70d0af6f99948c1527557bc363feffd846c73893682b4a14fc7d08b9e20c649
+DIST patchbundle-selinux-base-policy-2.20141203-r9.tar.bz2 299602 SHA256 e8518004942a6c57170a609683e22b1410c93a2a195829c41dc8fbc703d941b5 SHA512 ce6484fbca1d2d074e50d1a3953392bd3ce0a4617df98fbac37747b469b4f160a9331586dfe1c3ddccb1ccbee24876a2f05ab49e37c8492a48baf83c2d01d140 WHIRLPOOL 1fd7b956e98e95a64c3a713a944d4531259bd156a7feabf6a89c4b5f33ac846377730eede97889e85183be086f282ebd18e860214f6ca3f01b40f2323470ee04
 DIST refpolicy-2.20140311.tar.bz2 664416 SHA256 f69437db95548c78a5dec44c236397146b144153149009ea554d2e536e5436f7 SHA512 50bacee82ed41ac8b8007ecc33bf51d22303cc2ddd27cfb72cb5520dab5f8e255186e34b89cec492c7a2d4220b200814bdede9b46c19f987a3d3d65a1c9b749a WHIRLPOOL e07480beba6ab1f02ad36b7d0c50c4a71cb39a8ec78bf8d1dc3c82bb9dd1d69d9169d7c937165ea15f60ce1147f256d46644f944107a3a8a800d5bad70d4c255
 DIST refpolicy-2.20141203.tar.bz2 680243 SHA256 f438209c430d8a2d4ddcbe4bdd3edb46f6af7dc4913637af0b73c635e40c1522 SHA512 682e4280c5799e4c12ec7594afc1389f67be35055748d2e0dbdc3419159a16c96d4946ca6178daee8370515951f8653b2e452efe8c962b8d7f9bc192f0b15a0c WHIRLPOOL 74bca232534e7af9051bb1ab9f77c1ff6c425781cf4561f781d6e9a40cc5ca0d9add540249ea5493e8782a9372aea296ead6c165c6c440ae1509eb319d151ee5
diff --git a/sec-policy/selinux-lpd/selinux-lpd-2.20141203-r8.ebuild b/sec-policy/selinux-lpd/selinux-lpd-2.20141203-r8.ebuild
index 34e1915ec9dc..5b5bf2d593c8 100644
--- a/sec-policy/selinux-lpd/selinux-lpd-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-lpd/selinux-lpd-2.20141203-r8.ebuild
@@ -13,5 +13,5 @@ DESCRIPTION="SELinux policy for lpd"
 if [[ $PV == 9999* ]] ; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-lpd/selinux-lpd-2.20141203-r9.ebuild b/sec-policy/selinux-lpd/selinux-lpd-2.20141203-r9.ebuild
new file mode 100644
index 000000000000..34e1915ec9dc
--- /dev/null
+++ b/sec-policy/selinux-lpd/selinux-lpd-2.20141203-r9.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI="5"
+
+IUSE=""
+MODS="lpd"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for lpd"
+
+if [[ $PV == 9999* ]] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
diff --git a/sec-policy/selinux-mailman/Manifest b/sec-policy/selinux-mailman/Manifest
index 8327a635be01..91d204b0021a 100644
--- a/sec-policy/selinux-mailman/Manifest
+++ b/sec-policy/selinux-mailman/Manifest
@@ -9,5 +9,6 @@ DIST patchbundle-selinux-base-policy-2.20141203-r5.tar.bz2 274136 SHA256 c23d17c
 DIST patchbundle-selinux-base-policy-2.20141203-r6.tar.bz2 293231 SHA256 b686dcc517b97834f66d967afdcc724cb43b5c6dbf9f34043a91cdeda2625cc7 SHA512 a2c486cbe4a1d21ff3fd01bef25ecf5a633a4072646c67cfccf3f7187d95f3d9e3b482a46ba17c55c40a8e7c0dee56e9cf9ddc9f414d3e4511443b62f60d03e9 WHIRLPOOL 3d708e287e3f9b873be647b0327eab6675a8702ee1cffb56e36934cada306e5ccc64397a083dad9e59de37a067e628cacbf896ae99012d5a209e42fd7cd8a4c6
 DIST patchbundle-selinux-base-policy-2.20141203-r7.tar.bz2 295833 SHA256 ba2219b3efc747be65f94c4d8ac3cd6ee530c82c848fa41935a114184678622a SHA512 8e32d9dbfb2f0f3f50200543aadb51ed9834ccd5cdf30bf8e4d9e6d0b645ce44ffaf80f7aa9385e9c9095d9a383b3a348a92356cb5386c06544ab082a9a468c7 WHIRLPOOL 1648ee1be71e45fcf5a264816ce7edc7bab19bd28a68703923eb2d6068f1f0469ae593855231d31f88baecbf29e7cece2d6beeed20b7c04231a6c90e90d35910
 DIST patchbundle-selinux-base-policy-2.20141203-r8.tar.bz2 297919 SHA256 77539eb3d78105f8789cd8205d2698bd27e2abf100163bdd162cda860fd15120 SHA512 2f8a19e1e4bb65f32b480275f49099aed3ae9df543c7de862b3bbd93e81b89cd96dadac3d091e28673d09a6885db8c5656b3a77d0080775c110b04f2753de7a6 WHIRLPOOL 79cb7e620eb8e838192dc557c7a9ce7e713227d783cc8b63792825559b2145cad70d0af6f99948c1527557bc363feffd846c73893682b4a14fc7d08b9e20c649
+DIST patchbundle-selinux-base-policy-2.20141203-r9.tar.bz2 299602 SHA256 e8518004942a6c57170a609683e22b1410c93a2a195829c41dc8fbc703d941b5 SHA512 ce6484fbca1d2d074e50d1a3953392bd3ce0a4617df98fbac37747b469b4f160a9331586dfe1c3ddccb1ccbee24876a2f05ab49e37c8492a48baf83c2d01d140 WHIRLPOOL 1fd7b956e98e95a64c3a713a944d4531259bd156a7feabf6a89c4b5f33ac846377730eede97889e85183be086f282ebd18e860214f6ca3f01b40f2323470ee04
 DIST refpolicy-2.20140311.tar.bz2 664416 SHA256 f69437db95548c78a5dec44c236397146b144153149009ea554d2e536e5436f7 SHA512 50bacee82ed41ac8b8007ecc33bf51d22303cc2ddd27cfb72cb5520dab5f8e255186e34b89cec492c7a2d4220b200814bdede9b46c19f987a3d3d65a1c9b749a WHIRLPOOL e07480beba6ab1f02ad36b7d0c50c4a71cb39a8ec78bf8d1dc3c82bb9dd1d69d9169d7c937165ea15f60ce1147f256d46644f944107a3a8a800d5bad70d4c255
 DIST refpolicy-2.20141203.tar.bz2 680243 SHA256 f438209c430d8a2d4ddcbe4bdd3edb46f6af7dc4913637af0b73c635e40c1522 SHA512 682e4280c5799e4c12ec7594afc1389f67be35055748d2e0dbdc3419159a16c96d4946ca6178daee8370515951f8653b2e452efe8c962b8d7f9bc192f0b15a0c WHIRLPOOL 74bca232534e7af9051bb1ab9f77c1ff6c425781cf4561f781d6e9a40cc5ca0d9add540249ea5493e8782a9372aea296ead6c165c6c440ae1509eb319d151ee5
diff --git a/sec-policy/selinux-mailman/selinux-mailman-2.20141203-r8.ebuild b/sec-policy/selinux-mailman/selinux-mailman-2.20141203-r8.ebuild
index a20284d40646..a9a919748e5c 100644
--- a/sec-policy/selinux-mailman/selinux-mailman-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-mailman/selinux-mailman-2.20141203-r8.ebuild
@@ -13,5 +13,5 @@ DESCRIPTION="SELinux policy for mailman"
 if [[ $PV == 9999* ]] ; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-mailman/selinux-mailman-2.20141203-r9.ebuild b/sec-policy/selinux-mailman/selinux-mailman-2.20141203-r9.ebuild
new file mode 100644
index 000000000000..a20284d40646
--- /dev/null
+++ b/sec-policy/selinux-mailman/selinux-mailman-2.20141203-r9.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI="5"
+
+IUSE=""
+MODS="mailman"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for mailman"
+
+if [[ $PV == 9999* ]] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
diff --git a/sec-policy/selinux-makewhatis/Manifest b/sec-policy/selinux-makewhatis/Manifest
index 8327a635be01..91d204b0021a 100644
--- a/sec-policy/selinux-makewhatis/Manifest
+++ b/sec-policy/selinux-makewhatis/Manifest
@@ -9,5 +9,6 @@ DIST patchbundle-selinux-base-policy-2.20141203-r5.tar.bz2 274136 SHA256 c23d17c
 DIST patchbundle-selinux-base-policy-2.20141203-r6.tar.bz2 293231 SHA256 b686dcc517b97834f66d967afdcc724cb43b5c6dbf9f34043a91cdeda2625cc7 SHA512 a2c486cbe4a1d21ff3fd01bef25ecf5a633a4072646c67cfccf3f7187d95f3d9e3b482a46ba17c55c40a8e7c0dee56e9cf9ddc9f414d3e4511443b62f60d03e9 WHIRLPOOL 3d708e287e3f9b873be647b0327eab6675a8702ee1cffb56e36934cada306e5ccc64397a083dad9e59de37a067e628cacbf896ae99012d5a209e42fd7cd8a4c6
 DIST patchbundle-selinux-base-policy-2.20141203-r7.tar.bz2 295833 SHA256 ba2219b3efc747be65f94c4d8ac3cd6ee530c82c848fa41935a114184678622a SHA512 8e32d9dbfb2f0f3f50200543aadb51ed9834ccd5cdf30bf8e4d9e6d0b645ce44ffaf80f7aa9385e9c9095d9a383b3a348a92356cb5386c06544ab082a9a468c7 WHIRLPOOL 1648ee1be71e45fcf5a264816ce7edc7bab19bd28a68703923eb2d6068f1f0469ae593855231d31f88baecbf29e7cece2d6beeed20b7c04231a6c90e90d35910
 DIST patchbundle-selinux-base-policy-2.20141203-r8.tar.bz2 297919 SHA256 77539eb3d78105f8789cd8205d2698bd27e2abf100163bdd162cda860fd15120 SHA512 2f8a19e1e4bb65f32b480275f49099aed3ae9df543c7de862b3bbd93e81b89cd96dadac3d091e28673d09a6885db8c5656b3a77d0080775c110b04f2753de7a6 WHIRLPOOL 79cb7e620eb8e838192dc557c7a9ce7e713227d783cc8b63792825559b2145cad70d0af6f99948c1527557bc363feffd846c73893682b4a14fc7d08b9e20c649
+DIST patchbundle-selinux-base-policy-2.20141203-r9.tar.bz2 299602 SHA256 e8518004942a6c57170a609683e22b1410c93a2a195829c41dc8fbc703d941b5 SHA512 ce6484fbca1d2d074e50d1a3953392bd3ce0a4617df98fbac37747b469b4f160a9331586dfe1c3ddccb1ccbee24876a2f05ab49e37c8492a48baf83c2d01d140 WHIRLPOOL 1fd7b956e98e95a64c3a713a944d4531259bd156a7feabf6a89c4b5f33ac846377730eede97889e85183be086f282ebd18e860214f6ca3f01b40f2323470ee04
 DIST refpolicy-2.20140311.tar.bz2 664416 SHA256 f69437db95548c78a5dec44c236397146b144153149009ea554d2e536e5436f7 SHA512 50bacee82ed41ac8b8007ecc33bf51d22303cc2ddd27cfb72cb5520dab5f8e255186e34b89cec492c7a2d4220b200814bdede9b46c19f987a3d3d65a1c9b749a WHIRLPOOL e07480beba6ab1f02ad36b7d0c50c4a71cb39a8ec78bf8d1dc3c82bb9dd1d69d9169d7c937165ea15f60ce1147f256d46644f944107a3a8a800d5bad70d4c255
 DIST refpolicy-2.20141203.tar.bz2 680243 SHA256 f438209c430d8a2d4ddcbe4bdd3edb46f6af7dc4913637af0b73c635e40c1522 SHA512 682e4280c5799e4c12ec7594afc1389f67be35055748d2e0dbdc3419159a16c96d4946ca6178daee8370515951f8653b2e452efe8c962b8d7f9bc192f0b15a0c WHIRLPOOL 74bca232534e7af9051bb1ab9f77c1ff6c425781cf4561f781d6e9a40cc5ca0d9add540249ea5493e8782a9372aea296ead6c165c6c440ae1509eb319d151ee5
diff --git a/sec-policy/selinux-makewhatis/selinux-makewhatis-2.20141203-r8.ebuild b/sec-policy/selinux-makewhatis/selinux-makewhatis-2.20141203-r8.ebuild
index 11c520732f3c..1bfc1ea19b54 100644
--- a/sec-policy/selinux-makewhatis/selinux-makewhatis-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-makewhatis/selinux-makewhatis-2.20141203-r8.ebuild
@@ -13,5 +13,5 @@ DESCRIPTION="SELinux policy for makewhatis"
 if [[ $PV == 9999* ]] ; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-makewhatis/selinux-makewhatis-2.20141203-r9.ebuild b/sec-policy/selinux-makewhatis/selinux-makewhatis-2.20141203-r9.ebuild
new file mode 100644
index 000000000000..11c520732f3c
--- /dev/null
+++ b/sec-policy/selinux-makewhatis/selinux-makewhatis-2.20141203-r9.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI="5"
+
+IUSE=""
+MODS="makewhatis"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for makewhatis"
+
+if [[ $PV == 9999* ]] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
diff --git a/sec-policy/selinux-mandb/Manifest b/sec-policy/selinux-mandb/Manifest
index 8327a635be01..91d204b0021a 100644
--- a/sec-policy/selinux-mandb/Manifest
+++ b/sec-policy/selinux-mandb/Manifest
@@ -9,5 +9,6 @@ DIST patchbundle-selinux-base-policy-2.20141203-r5.tar.bz2 274136 SHA256 c23d17c
 DIST patchbundle-selinux-base-policy-2.20141203-r6.tar.bz2 293231 SHA256 b686dcc517b97834f66d967afdcc724cb43b5c6dbf9f34043a91cdeda2625cc7 SHA512 a2c486cbe4a1d21ff3fd01bef25ecf5a633a4072646c67cfccf3f7187d95f3d9e3b482a46ba17c55c40a8e7c0dee56e9cf9ddc9f414d3e4511443b62f60d03e9 WHIRLPOOL 3d708e287e3f9b873be647b0327eab6675a8702ee1cffb56e36934cada306e5ccc64397a083dad9e59de37a067e628cacbf896ae99012d5a209e42fd7cd8a4c6
 DIST patchbundle-selinux-base-policy-2.20141203-r7.tar.bz2 295833 SHA256 ba2219b3efc747be65f94c4d8ac3cd6ee530c82c848fa41935a114184678622a SHA512 8e32d9dbfb2f0f3f50200543aadb51ed9834ccd5cdf30bf8e4d9e6d0b645ce44ffaf80f7aa9385e9c9095d9a383b3a348a92356cb5386c06544ab082a9a468c7 WHIRLPOOL 1648ee1be71e45fcf5a264816ce7edc7bab19bd28a68703923eb2d6068f1f0469ae593855231d31f88baecbf29e7cece2d6beeed20b7c04231a6c90e90d35910
 DIST patchbundle-selinux-base-policy-2.20141203-r8.tar.bz2 297919 SHA256 77539eb3d78105f8789cd8205d2698bd27e2abf100163bdd162cda860fd15120 SHA512 2f8a19e1e4bb65f32b480275f49099aed3ae9df543c7de862b3bbd93e81b89cd96dadac3d091e28673d09a6885db8c5656b3a77d0080775c110b04f2753de7a6 WHIRLPOOL 79cb7e620eb8e838192dc557c7a9ce7e713227d783cc8b63792825559b2145cad70d0af6f99948c1527557bc363feffd846c73893682b4a14fc7d08b9e20c649
+DIST patchbundle-selinux-base-policy-2.20141203-r9.tar.bz2 299602 SHA256 e8518004942a6c57170a609683e22b1410c93a2a195829c41dc8fbc703d941b5 SHA512 ce6484fbca1d2d074e50d1a3953392bd3ce0a4617df98fbac37747b469b4f160a9331586dfe1c3ddccb1ccbee24876a2f05ab49e37c8492a48baf83c2d01d140 WHIRLPOOL 1fd7b956e98e95a64c3a713a944d4531259bd156a7feabf6a89c4b5f33ac846377730eede97889e85183be086f282ebd18e860214f6ca3f01b40f2323470ee04
 DIST refpolicy-2.20140311.tar.bz2 664416 SHA256 f69437db95548c78a5dec44c236397146b144153149009ea554d2e536e5436f7 SHA512 50bacee82ed41ac8b8007ecc33bf51d22303cc2ddd27cfb72cb5520dab5f8e255186e34b89cec492c7a2d4220b200814bdede9b46c19f987a3d3d65a1c9b749a WHIRLPOOL e07480beba6ab1f02ad36b7d0c50c4a71cb39a8ec78bf8d1dc3c82bb9dd1d69d9169d7c937165ea15f60ce1147f256d46644f944107a3a8a800d5bad70d4c255
 DIST refpolicy-2.20141203.tar.bz2 680243 SHA256 f438209c430d8a2d4ddcbe4bdd3edb46f6af7dc4913637af0b73c635e40c1522 SHA512 682e4280c5799e4c12ec7594afc1389f67be35055748d2e0dbdc3419159a16c96d4946ca6178daee8370515951f8653b2e452efe8c962b8d7f9bc192f0b15a0c WHIRLPOOL 74bca232534e7af9051bb1ab9f77c1ff6c425781cf4561f781d6e9a40cc5ca0d9add540249ea5493e8782a9372aea296ead6c165c6c440ae1509eb319d151ee5
diff --git a/sec-policy/selinux-mandb/selinux-mandb-2.20141203-r8.ebuild b/sec-policy/selinux-mandb/selinux-mandb-2.20141203-r8.ebuild
index afae66e25ccd..785c609bdb79 100644
--- a/sec-policy/selinux-mandb/selinux-mandb-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-mandb/selinux-mandb-2.20141203-r8.ebuild
@@ -13,5 +13,5 @@ DESCRIPTION="SELinux policy for mandb"
 if [[ $PV == 9999* ]] ; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-mandb/selinux-mandb-2.20141203-r9.ebuild b/sec-policy/selinux-mandb/selinux-mandb-2.20141203-r9.ebuild
new file mode 100644
index 000000000000..afae66e25ccd
--- /dev/null
+++ b/sec-policy/selinux-mandb/selinux-mandb-2.20141203-r9.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI="5"
+
+IUSE=""
+MODS="mandb"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for mandb"
+
+if [[ $PV == 9999* ]] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
diff --git a/sec-policy/selinux-mcelog/Manifest b/sec-policy/selinux-mcelog/Manifest
index 8327a635be01..91d204b0021a 100644
--- a/sec-policy/selinux-mcelog/Manifest
+++ b/sec-policy/selinux-mcelog/Manifest
@@ -9,5 +9,6 @@ DIST patchbundle-selinux-base-policy-2.20141203-r5.tar.bz2 274136 SHA256 c23d17c
 DIST patchbundle-selinux-base-policy-2.20141203-r6.tar.bz2 293231 SHA256 b686dcc517b97834f66d967afdcc724cb43b5c6dbf9f34043a91cdeda2625cc7 SHA512 a2c486cbe4a1d21ff3fd01bef25ecf5a633a4072646c67cfccf3f7187d95f3d9e3b482a46ba17c55c40a8e7c0dee56e9cf9ddc9f414d3e4511443b62f60d03e9 WHIRLPOOL 3d708e287e3f9b873be647b0327eab6675a8702ee1cffb56e36934cada306e5ccc64397a083dad9e59de37a067e628cacbf896ae99012d5a209e42fd7cd8a4c6
 DIST patchbundle-selinux-base-policy-2.20141203-r7.tar.bz2 295833 SHA256 ba2219b3efc747be65f94c4d8ac3cd6ee530c82c848fa41935a114184678622a SHA512 8e32d9dbfb2f0f3f50200543aadb51ed9834ccd5cdf30bf8e4d9e6d0b645ce44ffaf80f7aa9385e9c9095d9a383b3a348a92356cb5386c06544ab082a9a468c7 WHIRLPOOL 1648ee1be71e45fcf5a264816ce7edc7bab19bd28a68703923eb2d6068f1f0469ae593855231d31f88baecbf29e7cece2d6beeed20b7c04231a6c90e90d35910
 DIST patchbundle-selinux-base-policy-2.20141203-r8.tar.bz2 297919 SHA256 77539eb3d78105f8789cd8205d2698bd27e2abf100163bdd162cda860fd15120 SHA512 2f8a19e1e4bb65f32b480275f49099aed3ae9df543c7de862b3bbd93e81b89cd96dadac3d091e28673d09a6885db8c5656b3a77d0080775c110b04f2753de7a6 WHIRLPOOL 79cb7e620eb8e838192dc557c7a9ce7e713227d783cc8b63792825559b2145cad70d0af6f99948c1527557bc363feffd846c73893682b4a14fc7d08b9e20c649
+DIST patchbundle-selinux-base-policy-2.20141203-r9.tar.bz2 299602 SHA256 e8518004942a6c57170a609683e22b1410c93a2a195829c41dc8fbc703d941b5 SHA512 ce6484fbca1d2d074e50d1a3953392bd3ce0a4617df98fbac37747b469b4f160a9331586dfe1c3ddccb1ccbee24876a2f05ab49e37c8492a48baf83c2d01d140 WHIRLPOOL 1fd7b956e98e95a64c3a713a944d4531259bd156a7feabf6a89c4b5f33ac846377730eede97889e85183be086f282ebd18e860214f6ca3f01b40f2323470ee04
 DIST refpolicy-2.20140311.tar.bz2 664416 SHA256 f69437db95548c78a5dec44c236397146b144153149009ea554d2e536e5436f7 SHA512 50bacee82ed41ac8b8007ecc33bf51d22303cc2ddd27cfb72cb5520dab5f8e255186e34b89cec492c7a2d4220b200814bdede9b46c19f987a3d3d65a1c9b749a WHIRLPOOL e07480beba6ab1f02ad36b7d0c50c4a71cb39a8ec78bf8d1dc3c82bb9dd1d69d9169d7c937165ea15f60ce1147f256d46644f944107a3a8a800d5bad70d4c255
 DIST refpolicy-2.20141203.tar.bz2 680243 SHA256 f438209c430d8a2d4ddcbe4bdd3edb46f6af7dc4913637af0b73c635e40c1522 SHA512 682e4280c5799e4c12ec7594afc1389f67be35055748d2e0dbdc3419159a16c96d4946ca6178daee8370515951f8653b2e452efe8c962b8d7f9bc192f0b15a0c WHIRLPOOL 74bca232534e7af9051bb1ab9f77c1ff6c425781cf4561f781d6e9a40cc5ca0d9add540249ea5493e8782a9372aea296ead6c165c6c440ae1509eb319d151ee5
diff --git a/sec-policy/selinux-mcelog/selinux-mcelog-2.20141203-r8.ebuild b/sec-policy/selinux-mcelog/selinux-mcelog-2.20141203-r8.ebuild
index a58d9010f928..44f545f05c55 100644
--- a/sec-policy/selinux-mcelog/selinux-mcelog-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-mcelog/selinux-mcelog-2.20141203-r8.ebuild
@@ -13,5 +13,5 @@ DESCRIPTION="SELinux policy for mcelog"
 if [[ $PV == 9999* ]] ; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-mcelog/selinux-mcelog-2.20141203-r9.ebuild b/sec-policy/selinux-mcelog/selinux-mcelog-2.20141203-r9.ebuild
new file mode 100644
index 000000000000..a58d9010f928
--- /dev/null
+++ b/sec-policy/selinux-mcelog/selinux-mcelog-2.20141203-r9.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI="5"
+
+IUSE=""
+MODS="mcelog"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for mcelog"
+
+if [[ $PV == 9999* ]] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
diff --git a/sec-policy/selinux-memcached/Manifest b/sec-policy/selinux-memcached/Manifest
index 8327a635be01..91d204b0021a 100644
--- a/sec-policy/selinux-memcached/Manifest
+++ b/sec-policy/selinux-memcached/Manifest
@@ -9,5 +9,6 @@ DIST patchbundle-selinux-base-policy-2.20141203-r5.tar.bz2 274136 SHA256 c23d17c
 DIST patchbundle-selinux-base-policy-2.20141203-r6.tar.bz2 293231 SHA256 b686dcc517b97834f66d967afdcc724cb43b5c6dbf9f34043a91cdeda2625cc7 SHA512 a2c486cbe4a1d21ff3fd01bef25ecf5a633a4072646c67cfccf3f7187d95f3d9e3b482a46ba17c55c40a8e7c0dee56e9cf9ddc9f414d3e4511443b62f60d03e9 WHIRLPOOL 3d708e287e3f9b873be647b0327eab6675a8702ee1cffb56e36934cada306e5ccc64397a083dad9e59de37a067e628cacbf896ae99012d5a209e42fd7cd8a4c6
 DIST patchbundle-selinux-base-policy-2.20141203-r7.tar.bz2 295833 SHA256 ba2219b3efc747be65f94c4d8ac3cd6ee530c82c848fa41935a114184678622a SHA512 8e32d9dbfb2f0f3f50200543aadb51ed9834ccd5cdf30bf8e4d9e6d0b645ce44ffaf80f7aa9385e9c9095d9a383b3a348a92356cb5386c06544ab082a9a468c7 WHIRLPOOL 1648ee1be71e45fcf5a264816ce7edc7bab19bd28a68703923eb2d6068f1f0469ae593855231d31f88baecbf29e7cece2d6beeed20b7c04231a6c90e90d35910
 DIST patchbundle-selinux-base-policy-2.20141203-r8.tar.bz2 297919 SHA256 77539eb3d78105f8789cd8205d2698bd27e2abf100163bdd162cda860fd15120 SHA512 2f8a19e1e4bb65f32b480275f49099aed3ae9df543c7de862b3bbd93e81b89cd96dadac3d091e28673d09a6885db8c5656b3a77d0080775c110b04f2753de7a6 WHIRLPOOL 79cb7e620eb8e838192dc557c7a9ce7e713227d783cc8b63792825559b2145cad70d0af6f99948c1527557bc363feffd846c73893682b4a14fc7d08b9e20c649
+DIST patchbundle-selinux-base-policy-2.20141203-r9.tar.bz2 299602 SHA256 e8518004942a6c57170a609683e22b1410c93a2a195829c41dc8fbc703d941b5 SHA512 ce6484fbca1d2d074e50d1a3953392bd3ce0a4617df98fbac37747b469b4f160a9331586dfe1c3ddccb1ccbee24876a2f05ab49e37c8492a48baf83c2d01d140 WHIRLPOOL 1fd7b956e98e95a64c3a713a944d4531259bd156a7feabf6a89c4b5f33ac846377730eede97889e85183be086f282ebd18e860214f6ca3f01b40f2323470ee04
 DIST refpolicy-2.20140311.tar.bz2 664416 SHA256 f69437db95548c78a5dec44c236397146b144153149009ea554d2e536e5436f7 SHA512 50bacee82ed41ac8b8007ecc33bf51d22303cc2ddd27cfb72cb5520dab5f8e255186e34b89cec492c7a2d4220b200814bdede9b46c19f987a3d3d65a1c9b749a WHIRLPOOL e07480beba6ab1f02ad36b7d0c50c4a71cb39a8ec78bf8d1dc3c82bb9dd1d69d9169d7c937165ea15f60ce1147f256d46644f944107a3a8a800d5bad70d4c255
 DIST refpolicy-2.20141203.tar.bz2 680243 SHA256 f438209c430d8a2d4ddcbe4bdd3edb46f6af7dc4913637af0b73c635e40c1522 SHA512 682e4280c5799e4c12ec7594afc1389f67be35055748d2e0dbdc3419159a16c96d4946ca6178daee8370515951f8653b2e452efe8c962b8d7f9bc192f0b15a0c WHIRLPOOL 74bca232534e7af9051bb1ab9f77c1ff6c425781cf4561f781d6e9a40cc5ca0d9add540249ea5493e8782a9372aea296ead6c165c6c440ae1509eb319d151ee5
diff --git a/sec-policy/selinux-memcached/selinux-memcached-2.20141203-r8.ebuild b/sec-policy/selinux-memcached/selinux-memcached-2.20141203-r8.ebuild
index e0c0c914e9c7..887fa3305f43 100644
--- a/sec-policy/selinux-memcached/selinux-memcached-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-memcached/selinux-memcached-2.20141203-r8.ebuild
@@ -13,5 +13,5 @@ DESCRIPTION="SELinux policy for memcached"
 if [[ $PV == 9999* ]] ; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-memcached/selinux-memcached-2.20141203-r9.ebuild b/sec-policy/selinux-memcached/selinux-memcached-2.20141203-r9.ebuild
new file mode 100644
index 000000000000..e0c0c914e9c7
--- /dev/null
+++ b/sec-policy/selinux-memcached/selinux-memcached-2.20141203-r9.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI="5"
+
+IUSE=""
+MODS="memcached"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for memcached"
+
+if [[ $PV == 9999* ]] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
diff --git a/sec-policy/selinux-milter/Manifest b/sec-policy/selinux-milter/Manifest
index 8327a635be01..91d204b0021a 100644
--- a/sec-policy/selinux-milter/Manifest
+++ b/sec-policy/selinux-milter/Manifest
@@ -9,5 +9,6 @@ DIST patchbundle-selinux-base-policy-2.20141203-r5.tar.bz2 274136 SHA256 c23d17c
 DIST patchbundle-selinux-base-policy-2.20141203-r6.tar.bz2 293231 SHA256 b686dcc517b97834f66d967afdcc724cb43b5c6dbf9f34043a91cdeda2625cc7 SHA512 a2c486cbe4a1d21ff3fd01bef25ecf5a633a4072646c67cfccf3f7187d95f3d9e3b482a46ba17c55c40a8e7c0dee56e9cf9ddc9f414d3e4511443b62f60d03e9 WHIRLPOOL 3d708e287e3f9b873be647b0327eab6675a8702ee1cffb56e36934cada306e5ccc64397a083dad9e59de37a067e628cacbf896ae99012d5a209e42fd7cd8a4c6
 DIST patchbundle-selinux-base-policy-2.20141203-r7.tar.bz2 295833 SHA256 ba2219b3efc747be65f94c4d8ac3cd6ee530c82c848fa41935a114184678622a SHA512 8e32d9dbfb2f0f3f50200543aadb51ed9834ccd5cdf30bf8e4d9e6d0b645ce44ffaf80f7aa9385e9c9095d9a383b3a348a92356cb5386c06544ab082a9a468c7 WHIRLPOOL 1648ee1be71e45fcf5a264816ce7edc7bab19bd28a68703923eb2d6068f1f0469ae593855231d31f88baecbf29e7cece2d6beeed20b7c04231a6c90e90d35910
 DIST patchbundle-selinux-base-policy-2.20141203-r8.tar.bz2 297919 SHA256 77539eb3d78105f8789cd8205d2698bd27e2abf100163bdd162cda860fd15120 SHA512 2f8a19e1e4bb65f32b480275f49099aed3ae9df543c7de862b3bbd93e81b89cd96dadac3d091e28673d09a6885db8c5656b3a77d0080775c110b04f2753de7a6 WHIRLPOOL 79cb7e620eb8e838192dc557c7a9ce7e713227d783cc8b63792825559b2145cad70d0af6f99948c1527557bc363feffd846c73893682b4a14fc7d08b9e20c649
+DIST patchbundle-selinux-base-policy-2.20141203-r9.tar.bz2 299602 SHA256 e8518004942a6c57170a609683e22b1410c93a2a195829c41dc8fbc703d941b5 SHA512 ce6484fbca1d2d074e50d1a3953392bd3ce0a4617df98fbac37747b469b4f160a9331586dfe1c3ddccb1ccbee24876a2f05ab49e37c8492a48baf83c2d01d140 WHIRLPOOL 1fd7b956e98e95a64c3a713a944d4531259bd156a7feabf6a89c4b5f33ac846377730eede97889e85183be086f282ebd18e860214f6ca3f01b40f2323470ee04
 DIST refpolicy-2.20140311.tar.bz2 664416 SHA256 f69437db95548c78a5dec44c236397146b144153149009ea554d2e536e5436f7 SHA512 50bacee82ed41ac8b8007ecc33bf51d22303cc2ddd27cfb72cb5520dab5f8e255186e34b89cec492c7a2d4220b200814bdede9b46c19f987a3d3d65a1c9b749a WHIRLPOOL e07480beba6ab1f02ad36b7d0c50c4a71cb39a8ec78bf8d1dc3c82bb9dd1d69d9169d7c937165ea15f60ce1147f256d46644f944107a3a8a800d5bad70d4c255
 DIST refpolicy-2.20141203.tar.bz2 680243 SHA256 f438209c430d8a2d4ddcbe4bdd3edb46f6af7dc4913637af0b73c635e40c1522 SHA512 682e4280c5799e4c12ec7594afc1389f67be35055748d2e0dbdc3419159a16c96d4946ca6178daee8370515951f8653b2e452efe8c962b8d7f9bc192f0b15a0c WHIRLPOOL 74bca232534e7af9051bb1ab9f77c1ff6c425781cf4561f781d6e9a40cc5ca0d9add540249ea5493e8782a9372aea296ead6c165c6c440ae1509eb319d151ee5
diff --git a/sec-policy/selinux-milter/selinux-milter-2.20141203-r8.ebuild b/sec-policy/selinux-milter/selinux-milter-2.20141203-r8.ebuild
index 5447646722dc..988641e335f5 100644
--- a/sec-policy/selinux-milter/selinux-milter-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-milter/selinux-milter-2.20141203-r8.ebuild
@@ -13,5 +13,5 @@ DESCRIPTION="SELinux policy for milter"
 if [[ $PV == 9999* ]] ; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-milter/selinux-milter-2.20141203-r9.ebuild b/sec-policy/selinux-milter/selinux-milter-2.20141203-r9.ebuild
new file mode 100644
index 000000000000..5447646722dc
--- /dev/null
+++ b/sec-policy/selinux-milter/selinux-milter-2.20141203-r9.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI="5"
+
+IUSE=""
+MODS="milter"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for milter"
+
+if [[ $PV == 9999* ]] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
diff --git a/sec-policy/selinux-modemmanager/Manifest b/sec-policy/selinux-modemmanager/Manifest
index 8327a635be01..91d204b0021a 100644
--- a/sec-policy/selinux-modemmanager/Manifest
+++ b/sec-policy/selinux-modemmanager/Manifest
@@ -9,5 +9,6 @@ DIST patchbundle-selinux-base-policy-2.20141203-r5.tar.bz2 274136 SHA256 c23d17c
 DIST patchbundle-selinux-base-policy-2.20141203-r6.tar.bz2 293231 SHA256 b686dcc517b97834f66d967afdcc724cb43b5c6dbf9f34043a91cdeda2625cc7 SHA512 a2c486cbe4a1d21ff3fd01bef25ecf5a633a4072646c67cfccf3f7187d95f3d9e3b482a46ba17c55c40a8e7c0dee56e9cf9ddc9f414d3e4511443b62f60d03e9 WHIRLPOOL 3d708e287e3f9b873be647b0327eab6675a8702ee1cffb56e36934cada306e5ccc64397a083dad9e59de37a067e628cacbf896ae99012d5a209e42fd7cd8a4c6
 DIST patchbundle-selinux-base-policy-2.20141203-r7.tar.bz2 295833 SHA256 ba2219b3efc747be65f94c4d8ac3cd6ee530c82c848fa41935a114184678622a SHA512 8e32d9dbfb2f0f3f50200543aadb51ed9834ccd5cdf30bf8e4d9e6d0b645ce44ffaf80f7aa9385e9c9095d9a383b3a348a92356cb5386c06544ab082a9a468c7 WHIRLPOOL 1648ee1be71e45fcf5a264816ce7edc7bab19bd28a68703923eb2d6068f1f0469ae593855231d31f88baecbf29e7cece2d6beeed20b7c04231a6c90e90d35910
 DIST patchbundle-selinux-base-policy-2.20141203-r8.tar.bz2 297919 SHA256 77539eb3d78105f8789cd8205d2698bd27e2abf100163bdd162cda860fd15120 SHA512 2f8a19e1e4bb65f32b480275f49099aed3ae9df543c7de862b3bbd93e81b89cd96dadac3d091e28673d09a6885db8c5656b3a77d0080775c110b04f2753de7a6 WHIRLPOOL 79cb7e620eb8e838192dc557c7a9ce7e713227d783cc8b63792825559b2145cad70d0af6f99948c1527557bc363feffd846c73893682b4a14fc7d08b9e20c649
+DIST patchbundle-selinux-base-policy-2.20141203-r9.tar.bz2 299602 SHA256 e8518004942a6c57170a609683e22b1410c93a2a195829c41dc8fbc703d941b5 SHA512 ce6484fbca1d2d074e50d1a3953392bd3ce0a4617df98fbac37747b469b4f160a9331586dfe1c3ddccb1ccbee24876a2f05ab49e37c8492a48baf83c2d01d140 WHIRLPOOL 1fd7b956e98e95a64c3a713a944d4531259bd156a7feabf6a89c4b5f33ac846377730eede97889e85183be086f282ebd18e860214f6ca3f01b40f2323470ee04
 DIST refpolicy-2.20140311.tar.bz2 664416 SHA256 f69437db95548c78a5dec44c236397146b144153149009ea554d2e536e5436f7 SHA512 50bacee82ed41ac8b8007ecc33bf51d22303cc2ddd27cfb72cb5520dab5f8e255186e34b89cec492c7a2d4220b200814bdede9b46c19f987a3d3d65a1c9b749a WHIRLPOOL e07480beba6ab1f02ad36b7d0c50c4a71cb39a8ec78bf8d1dc3c82bb9dd1d69d9169d7c937165ea15f60ce1147f256d46644f944107a3a8a800d5bad70d4c255
 DIST refpolicy-2.20141203.tar.bz2 680243 SHA256 f438209c430d8a2d4ddcbe4bdd3edb46f6af7dc4913637af0b73c635e40c1522 SHA512 682e4280c5799e4c12ec7594afc1389f67be35055748d2e0dbdc3419159a16c96d4946ca6178daee8370515951f8653b2e452efe8c962b8d7f9bc192f0b15a0c WHIRLPOOL 74bca232534e7af9051bb1ab9f77c1ff6c425781cf4561f781d6e9a40cc5ca0d9add540249ea5493e8782a9372aea296ead6c165c6c440ae1509eb319d151ee5
diff --git a/sec-policy/selinux-modemmanager/selinux-modemmanager-2.20141203-r8.ebuild b/sec-policy/selinux-modemmanager/selinux-modemmanager-2.20141203-r8.ebuild
index 44540375af01..557eb2bae899 100644
--- a/sec-policy/selinux-modemmanager/selinux-modemmanager-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-modemmanager/selinux-modemmanager-2.20141203-r8.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="SELinux policy for modemmanager"
 if [[ $PV == 9999* ]] ; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-dbus
diff --git a/sec-policy/selinux-modemmanager/selinux-modemmanager-2.20141203-r9.ebuild b/sec-policy/selinux-modemmanager/selinux-modemmanager-2.20141203-r9.ebuild
new file mode 100644
index 000000000000..44540375af01
--- /dev/null
+++ b/sec-policy/selinux-modemmanager/selinux-modemmanager-2.20141203-r9.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI="5"
+
+IUSE=""
+MODS="modemmanager"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for modemmanager"
+
+if [[ $PV == 9999* ]] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
+DEPEND="${DEPEND}
+	sec-policy/selinux-dbus
+"
+RDEPEND="${RDEPEND}
+	sec-policy/selinux-dbus
+"
diff --git a/sec-policy/selinux-mono/Manifest b/sec-policy/selinux-mono/Manifest
index 8327a635be01..91d204b0021a 100644
--- a/sec-policy/selinux-mono/Manifest
+++ b/sec-policy/selinux-mono/Manifest
@@ -9,5 +9,6 @@ DIST patchbundle-selinux-base-policy-2.20141203-r5.tar.bz2 274136 SHA256 c23d17c
 DIST patchbundle-selinux-base-policy-2.20141203-r6.tar.bz2 293231 SHA256 b686dcc517b97834f66d967afdcc724cb43b5c6dbf9f34043a91cdeda2625cc7 SHA512 a2c486cbe4a1d21ff3fd01bef25ecf5a633a4072646c67cfccf3f7187d95f3d9e3b482a46ba17c55c40a8e7c0dee56e9cf9ddc9f414d3e4511443b62f60d03e9 WHIRLPOOL 3d708e287e3f9b873be647b0327eab6675a8702ee1cffb56e36934cada306e5ccc64397a083dad9e59de37a067e628cacbf896ae99012d5a209e42fd7cd8a4c6
 DIST patchbundle-selinux-base-policy-2.20141203-r7.tar.bz2 295833 SHA256 ba2219b3efc747be65f94c4d8ac3cd6ee530c82c848fa41935a114184678622a SHA512 8e32d9dbfb2f0f3f50200543aadb51ed9834ccd5cdf30bf8e4d9e6d0b645ce44ffaf80f7aa9385e9c9095d9a383b3a348a92356cb5386c06544ab082a9a468c7 WHIRLPOOL 1648ee1be71e45fcf5a264816ce7edc7bab19bd28a68703923eb2d6068f1f0469ae593855231d31f88baecbf29e7cece2d6beeed20b7c04231a6c90e90d35910
 DIST patchbundle-selinux-base-policy-2.20141203-r8.tar.bz2 297919 SHA256 77539eb3d78105f8789cd8205d2698bd27e2abf100163bdd162cda860fd15120 SHA512 2f8a19e1e4bb65f32b480275f49099aed3ae9df543c7de862b3bbd93e81b89cd96dadac3d091e28673d09a6885db8c5656b3a77d0080775c110b04f2753de7a6 WHIRLPOOL 79cb7e620eb8e838192dc557c7a9ce7e713227d783cc8b63792825559b2145cad70d0af6f99948c1527557bc363feffd846c73893682b4a14fc7d08b9e20c649
+DIST patchbundle-selinux-base-policy-2.20141203-r9.tar.bz2 299602 SHA256 e8518004942a6c57170a609683e22b1410c93a2a195829c41dc8fbc703d941b5 SHA512 ce6484fbca1d2d074e50d1a3953392bd3ce0a4617df98fbac37747b469b4f160a9331586dfe1c3ddccb1ccbee24876a2f05ab49e37c8492a48baf83c2d01d140 WHIRLPOOL 1fd7b956e98e95a64c3a713a944d4531259bd156a7feabf6a89c4b5f33ac846377730eede97889e85183be086f282ebd18e860214f6ca3f01b40f2323470ee04
 DIST refpolicy-2.20140311.tar.bz2 664416 SHA256 f69437db95548c78a5dec44c236397146b144153149009ea554d2e536e5436f7 SHA512 50bacee82ed41ac8b8007ecc33bf51d22303cc2ddd27cfb72cb5520dab5f8e255186e34b89cec492c7a2d4220b200814bdede9b46c19f987a3d3d65a1c9b749a WHIRLPOOL e07480beba6ab1f02ad36b7d0c50c4a71cb39a8ec78bf8d1dc3c82bb9dd1d69d9169d7c937165ea15f60ce1147f256d46644f944107a3a8a800d5bad70d4c255
 DIST refpolicy-2.20141203.tar.bz2 680243 SHA256 f438209c430d8a2d4ddcbe4bdd3edb46f6af7dc4913637af0b73c635e40c1522 SHA512 682e4280c5799e4c12ec7594afc1389f67be35055748d2e0dbdc3419159a16c96d4946ca6178daee8370515951f8653b2e452efe8c962b8d7f9bc192f0b15a0c WHIRLPOOL 74bca232534e7af9051bb1ab9f77c1ff6c425781cf4561f781d6e9a40cc5ca0d9add540249ea5493e8782a9372aea296ead6c165c6c440ae1509eb319d151ee5
diff --git a/sec-policy/selinux-mono/selinux-mono-2.20141203-r8.ebuild b/sec-policy/selinux-mono/selinux-mono-2.20141203-r8.ebuild
index 4ff3a61d8a5d..c55daf7a59c7 100644
--- a/sec-policy/selinux-mono/selinux-mono-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-mono/selinux-mono-2.20141203-r8.ebuild
@@ -13,5 +13,5 @@ DESCRIPTION="SELinux policy for mono"
 if [[ $PV == 9999* ]] ; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-mono/selinux-mono-2.20141203-r9.ebuild b/sec-policy/selinux-mono/selinux-mono-2.20141203-r9.ebuild
new file mode 100644
index 000000000000..4ff3a61d8a5d
--- /dev/null
+++ b/sec-policy/selinux-mono/selinux-mono-2.20141203-r9.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI="5"
+
+IUSE=""
+MODS="mono"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for mono"
+
+if [[ $PV == 9999* ]] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
diff --git a/sec-policy/selinux-mozilla/Manifest b/sec-policy/selinux-mozilla/Manifest
index 8327a635be01..91d204b0021a 100644
--- a/sec-policy/selinux-mozilla/Manifest
+++ b/sec-policy/selinux-mozilla/Manifest
@@ -9,5 +9,6 @@ DIST patchbundle-selinux-base-policy-2.20141203-r5.tar.bz2 274136 SHA256 c23d17c
 DIST patchbundle-selinux-base-policy-2.20141203-r6.tar.bz2 293231 SHA256 b686dcc517b97834f66d967afdcc724cb43b5c6dbf9f34043a91cdeda2625cc7 SHA512 a2c486cbe4a1d21ff3fd01bef25ecf5a633a4072646c67cfccf3f7187d95f3d9e3b482a46ba17c55c40a8e7c0dee56e9cf9ddc9f414d3e4511443b62f60d03e9 WHIRLPOOL 3d708e287e3f9b873be647b0327eab6675a8702ee1cffb56e36934cada306e5ccc64397a083dad9e59de37a067e628cacbf896ae99012d5a209e42fd7cd8a4c6
 DIST patchbundle-selinux-base-policy-2.20141203-r7.tar.bz2 295833 SHA256 ba2219b3efc747be65f94c4d8ac3cd6ee530c82c848fa41935a114184678622a SHA512 8e32d9dbfb2f0f3f50200543aadb51ed9834ccd5cdf30bf8e4d9e6d0b645ce44ffaf80f7aa9385e9c9095d9a383b3a348a92356cb5386c06544ab082a9a468c7 WHIRLPOOL 1648ee1be71e45fcf5a264816ce7edc7bab19bd28a68703923eb2d6068f1f0469ae593855231d31f88baecbf29e7cece2d6beeed20b7c04231a6c90e90d35910
 DIST patchbundle-selinux-base-policy-2.20141203-r8.tar.bz2 297919 SHA256 77539eb3d78105f8789cd8205d2698bd27e2abf100163bdd162cda860fd15120 SHA512 2f8a19e1e4bb65f32b480275f49099aed3ae9df543c7de862b3bbd93e81b89cd96dadac3d091e28673d09a6885db8c5656b3a77d0080775c110b04f2753de7a6 WHIRLPOOL 79cb7e620eb8e838192dc557c7a9ce7e713227d783cc8b63792825559b2145cad70d0af6f99948c1527557bc363feffd846c73893682b4a14fc7d08b9e20c649
+DIST patchbundle-selinux-base-policy-2.20141203-r9.tar.bz2 299602 SHA256 e8518004942a6c57170a609683e22b1410c93a2a195829c41dc8fbc703d941b5 SHA512 ce6484fbca1d2d074e50d1a3953392bd3ce0a4617df98fbac37747b469b4f160a9331586dfe1c3ddccb1ccbee24876a2f05ab49e37c8492a48baf83c2d01d140 WHIRLPOOL 1fd7b956e98e95a64c3a713a944d4531259bd156a7feabf6a89c4b5f33ac846377730eede97889e85183be086f282ebd18e860214f6ca3f01b40f2323470ee04
 DIST refpolicy-2.20140311.tar.bz2 664416 SHA256 f69437db95548c78a5dec44c236397146b144153149009ea554d2e536e5436f7 SHA512 50bacee82ed41ac8b8007ecc33bf51d22303cc2ddd27cfb72cb5520dab5f8e255186e34b89cec492c7a2d4220b200814bdede9b46c19f987a3d3d65a1c9b749a WHIRLPOOL e07480beba6ab1f02ad36b7d0c50c4a71cb39a8ec78bf8d1dc3c82bb9dd1d69d9169d7c937165ea15f60ce1147f256d46644f944107a3a8a800d5bad70d4c255
 DIST refpolicy-2.20141203.tar.bz2 680243 SHA256 f438209c430d8a2d4ddcbe4bdd3edb46f6af7dc4913637af0b73c635e40c1522 SHA512 682e4280c5799e4c12ec7594afc1389f67be35055748d2e0dbdc3419159a16c96d4946ca6178daee8370515951f8653b2e452efe8c962b8d7f9bc192f0b15a0c WHIRLPOOL 74bca232534e7af9051bb1ab9f77c1ff6c425781cf4561f781d6e9a40cc5ca0d9add540249ea5493e8782a9372aea296ead6c165c6c440ae1509eb319d151ee5
diff --git a/sec-policy/selinux-mozilla/selinux-mozilla-2.20141203-r8.ebuild b/sec-policy/selinux-mozilla/selinux-mozilla-2.20141203-r8.ebuild
index 63a803efdce7..4861d2c421f8 100644
--- a/sec-policy/selinux-mozilla/selinux-mozilla-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-mozilla/selinux-mozilla-2.20141203-r8.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="SELinux policy for mozilla"
 if [[ $PV == 9999* ]] ; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-xserver
diff --git a/sec-policy/selinux-mozilla/selinux-mozilla-2.20141203-r9.ebuild b/sec-policy/selinux-mozilla/selinux-mozilla-2.20141203-r9.ebuild
new file mode 100644
index 000000000000..63a803efdce7
--- /dev/null
+++ b/sec-policy/selinux-mozilla/selinux-mozilla-2.20141203-r9.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI="5"
+
+IUSE="alsa"
+MODS="mozilla"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for mozilla"
+
+if [[ $PV == 9999* ]] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
+DEPEND="${DEPEND}
+	sec-policy/selinux-xserver
+"
+RDEPEND="${RDEPEND}
+	sec-policy/selinux-xserver
+"
diff --git a/sec-policy/selinux-mpd/Manifest b/sec-policy/selinux-mpd/Manifest
index 8327a635be01..91d204b0021a 100644
--- a/sec-policy/selinux-mpd/Manifest
+++ b/sec-policy/selinux-mpd/Manifest
@@ -9,5 +9,6 @@ DIST patchbundle-selinux-base-policy-2.20141203-r5.tar.bz2 274136 SHA256 c23d17c
 DIST patchbundle-selinux-base-policy-2.20141203-r6.tar.bz2 293231 SHA256 b686dcc517b97834f66d967afdcc724cb43b5c6dbf9f34043a91cdeda2625cc7 SHA512 a2c486cbe4a1d21ff3fd01bef25ecf5a633a4072646c67cfccf3f7187d95f3d9e3b482a46ba17c55c40a8e7c0dee56e9cf9ddc9f414d3e4511443b62f60d03e9 WHIRLPOOL 3d708e287e3f9b873be647b0327eab6675a8702ee1cffb56e36934cada306e5ccc64397a083dad9e59de37a067e628cacbf896ae99012d5a209e42fd7cd8a4c6
 DIST patchbundle-selinux-base-policy-2.20141203-r7.tar.bz2 295833 SHA256 ba2219b3efc747be65f94c4d8ac3cd6ee530c82c848fa41935a114184678622a SHA512 8e32d9dbfb2f0f3f50200543aadb51ed9834ccd5cdf30bf8e4d9e6d0b645ce44ffaf80f7aa9385e9c9095d9a383b3a348a92356cb5386c06544ab082a9a468c7 WHIRLPOOL 1648ee1be71e45fcf5a264816ce7edc7bab19bd28a68703923eb2d6068f1f0469ae593855231d31f88baecbf29e7cece2d6beeed20b7c04231a6c90e90d35910
 DIST patchbundle-selinux-base-policy-2.20141203-r8.tar.bz2 297919 SHA256 77539eb3d78105f8789cd8205d2698bd27e2abf100163bdd162cda860fd15120 SHA512 2f8a19e1e4bb65f32b480275f49099aed3ae9df543c7de862b3bbd93e81b89cd96dadac3d091e28673d09a6885db8c5656b3a77d0080775c110b04f2753de7a6 WHIRLPOOL 79cb7e620eb8e838192dc557c7a9ce7e713227d783cc8b63792825559b2145cad70d0af6f99948c1527557bc363feffd846c73893682b4a14fc7d08b9e20c649
+DIST patchbundle-selinux-base-policy-2.20141203-r9.tar.bz2 299602 SHA256 e8518004942a6c57170a609683e22b1410c93a2a195829c41dc8fbc703d941b5 SHA512 ce6484fbca1d2d074e50d1a3953392bd3ce0a4617df98fbac37747b469b4f160a9331586dfe1c3ddccb1ccbee24876a2f05ab49e37c8492a48baf83c2d01d140 WHIRLPOOL 1fd7b956e98e95a64c3a713a944d4531259bd156a7feabf6a89c4b5f33ac846377730eede97889e85183be086f282ebd18e860214f6ca3f01b40f2323470ee04
 DIST refpolicy-2.20140311.tar.bz2 664416 SHA256 f69437db95548c78a5dec44c236397146b144153149009ea554d2e536e5436f7 SHA512 50bacee82ed41ac8b8007ecc33bf51d22303cc2ddd27cfb72cb5520dab5f8e255186e34b89cec492c7a2d4220b200814bdede9b46c19f987a3d3d65a1c9b749a WHIRLPOOL e07480beba6ab1f02ad36b7d0c50c4a71cb39a8ec78bf8d1dc3c82bb9dd1d69d9169d7c937165ea15f60ce1147f256d46644f944107a3a8a800d5bad70d4c255
 DIST refpolicy-2.20141203.tar.bz2 680243 SHA256 f438209c430d8a2d4ddcbe4bdd3edb46f6af7dc4913637af0b73c635e40c1522 SHA512 682e4280c5799e4c12ec7594afc1389f67be35055748d2e0dbdc3419159a16c96d4946ca6178daee8370515951f8653b2e452efe8c962b8d7f9bc192f0b15a0c WHIRLPOOL 74bca232534e7af9051bb1ab9f77c1ff6c425781cf4561f781d6e9a40cc5ca0d9add540249ea5493e8782a9372aea296ead6c165c6c440ae1509eb319d151ee5
diff --git a/sec-policy/selinux-mpd/selinux-mpd-2.20141203-r8.ebuild b/sec-policy/selinux-mpd/selinux-mpd-2.20141203-r8.ebuild
index 4a3544b3e0cc..ac82a3a57d1b 100644
--- a/sec-policy/selinux-mpd/selinux-mpd-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-mpd/selinux-mpd-2.20141203-r8.ebuild
@@ -13,5 +13,5 @@ DESCRIPTION="SELinux policy for mpd"
 if [[ $PV == 9999* ]] ; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-mpd/selinux-mpd-2.20141203-r9.ebuild b/sec-policy/selinux-mpd/selinux-mpd-2.20141203-r9.ebuild
new file mode 100644
index 000000000000..4a3544b3e0cc
--- /dev/null
+++ b/sec-policy/selinux-mpd/selinux-mpd-2.20141203-r9.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI="5"
+
+IUSE=""
+MODS="mpd"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for mpd"
+
+if [[ $PV == 9999* ]] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
diff --git a/sec-policy/selinux-mplayer/Manifest b/sec-policy/selinux-mplayer/Manifest
index 8327a635be01..91d204b0021a 100644
--- a/sec-policy/selinux-mplayer/Manifest
+++ b/sec-policy/selinux-mplayer/Manifest
@@ -9,5 +9,6 @@ DIST patchbundle-selinux-base-policy-2.20141203-r5.tar.bz2 274136 SHA256 c23d17c
 DIST patchbundle-selinux-base-policy-2.20141203-r6.tar.bz2 293231 SHA256 b686dcc517b97834f66d967afdcc724cb43b5c6dbf9f34043a91cdeda2625cc7 SHA512 a2c486cbe4a1d21ff3fd01bef25ecf5a633a4072646c67cfccf3f7187d95f3d9e3b482a46ba17c55c40a8e7c0dee56e9cf9ddc9f414d3e4511443b62f60d03e9 WHIRLPOOL 3d708e287e3f9b873be647b0327eab6675a8702ee1cffb56e36934cada306e5ccc64397a083dad9e59de37a067e628cacbf896ae99012d5a209e42fd7cd8a4c6
 DIST patchbundle-selinux-base-policy-2.20141203-r7.tar.bz2 295833 SHA256 ba2219b3efc747be65f94c4d8ac3cd6ee530c82c848fa41935a114184678622a SHA512 8e32d9dbfb2f0f3f50200543aadb51ed9834ccd5cdf30bf8e4d9e6d0b645ce44ffaf80f7aa9385e9c9095d9a383b3a348a92356cb5386c06544ab082a9a468c7 WHIRLPOOL 1648ee1be71e45fcf5a264816ce7edc7bab19bd28a68703923eb2d6068f1f0469ae593855231d31f88baecbf29e7cece2d6beeed20b7c04231a6c90e90d35910
 DIST patchbundle-selinux-base-policy-2.20141203-r8.tar.bz2 297919 SHA256 77539eb3d78105f8789cd8205d2698bd27e2abf100163bdd162cda860fd15120 SHA512 2f8a19e1e4bb65f32b480275f49099aed3ae9df543c7de862b3bbd93e81b89cd96dadac3d091e28673d09a6885db8c5656b3a77d0080775c110b04f2753de7a6 WHIRLPOOL 79cb7e620eb8e838192dc557c7a9ce7e713227d783cc8b63792825559b2145cad70d0af6f99948c1527557bc363feffd846c73893682b4a14fc7d08b9e20c649
+DIST patchbundle-selinux-base-policy-2.20141203-r9.tar.bz2 299602 SHA256 e8518004942a6c57170a609683e22b1410c93a2a195829c41dc8fbc703d941b5 SHA512 ce6484fbca1d2d074e50d1a3953392bd3ce0a4617df98fbac37747b469b4f160a9331586dfe1c3ddccb1ccbee24876a2f05ab49e37c8492a48baf83c2d01d140 WHIRLPOOL 1fd7b956e98e95a64c3a713a944d4531259bd156a7feabf6a89c4b5f33ac846377730eede97889e85183be086f282ebd18e860214f6ca3f01b40f2323470ee04
 DIST refpolicy-2.20140311.tar.bz2 664416 SHA256 f69437db95548c78a5dec44c236397146b144153149009ea554d2e536e5436f7 SHA512 50bacee82ed41ac8b8007ecc33bf51d22303cc2ddd27cfb72cb5520dab5f8e255186e34b89cec492c7a2d4220b200814bdede9b46c19f987a3d3d65a1c9b749a WHIRLPOOL e07480beba6ab1f02ad36b7d0c50c4a71cb39a8ec78bf8d1dc3c82bb9dd1d69d9169d7c937165ea15f60ce1147f256d46644f944107a3a8a800d5bad70d4c255
 DIST refpolicy-2.20141203.tar.bz2 680243 SHA256 f438209c430d8a2d4ddcbe4bdd3edb46f6af7dc4913637af0b73c635e40c1522 SHA512 682e4280c5799e4c12ec7594afc1389f67be35055748d2e0dbdc3419159a16c96d4946ca6178daee8370515951f8653b2e452efe8c962b8d7f9bc192f0b15a0c WHIRLPOOL 74bca232534e7af9051bb1ab9f77c1ff6c425781cf4561f781d6e9a40cc5ca0d9add540249ea5493e8782a9372aea296ead6c165c6c440ae1509eb319d151ee5
diff --git a/sec-policy/selinux-mplayer/selinux-mplayer-2.20141203-r8.ebuild b/sec-policy/selinux-mplayer/selinux-mplayer-2.20141203-r8.ebuild
index 7886d175026f..8ebb73782a44 100644
--- a/sec-policy/selinux-mplayer/selinux-mplayer-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-mplayer/selinux-mplayer-2.20141203-r8.ebuild
@@ -13,5 +13,5 @@ DESCRIPTION="SELinux policy for mplayer"
 if [[ $PV == 9999* ]] ; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-mplayer/selinux-mplayer-2.20141203-r9.ebuild b/sec-policy/selinux-mplayer/selinux-mplayer-2.20141203-r9.ebuild
new file mode 100644
index 000000000000..7886d175026f
--- /dev/null
+++ b/sec-policy/selinux-mplayer/selinux-mplayer-2.20141203-r9.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI="5"
+
+IUSE="alsa"
+MODS="mplayer"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for mplayer"
+
+if [[ $PV == 9999* ]] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
diff --git a/sec-policy/selinux-mrtg/Manifest b/sec-policy/selinux-mrtg/Manifest
index 8327a635be01..91d204b0021a 100644
--- a/sec-policy/selinux-mrtg/Manifest
+++ b/sec-policy/selinux-mrtg/Manifest
@@ -9,5 +9,6 @@ DIST patchbundle-selinux-base-policy-2.20141203-r5.tar.bz2 274136 SHA256 c23d17c
 DIST patchbundle-selinux-base-policy-2.20141203-r6.tar.bz2 293231 SHA256 b686dcc517b97834f66d967afdcc724cb43b5c6dbf9f34043a91cdeda2625cc7 SHA512 a2c486cbe4a1d21ff3fd01bef25ecf5a633a4072646c67cfccf3f7187d95f3d9e3b482a46ba17c55c40a8e7c0dee56e9cf9ddc9f414d3e4511443b62f60d03e9 WHIRLPOOL 3d708e287e3f9b873be647b0327eab6675a8702ee1cffb56e36934cada306e5ccc64397a083dad9e59de37a067e628cacbf896ae99012d5a209e42fd7cd8a4c6
 DIST patchbundle-selinux-base-policy-2.20141203-r7.tar.bz2 295833 SHA256 ba2219b3efc747be65f94c4d8ac3cd6ee530c82c848fa41935a114184678622a SHA512 8e32d9dbfb2f0f3f50200543aadb51ed9834ccd5cdf30bf8e4d9e6d0b645ce44ffaf80f7aa9385e9c9095d9a383b3a348a92356cb5386c06544ab082a9a468c7 WHIRLPOOL 1648ee1be71e45fcf5a264816ce7edc7bab19bd28a68703923eb2d6068f1f0469ae593855231d31f88baecbf29e7cece2d6beeed20b7c04231a6c90e90d35910
 DIST patchbundle-selinux-base-policy-2.20141203-r8.tar.bz2 297919 SHA256 77539eb3d78105f8789cd8205d2698bd27e2abf100163bdd162cda860fd15120 SHA512 2f8a19e1e4bb65f32b480275f49099aed3ae9df543c7de862b3bbd93e81b89cd96dadac3d091e28673d09a6885db8c5656b3a77d0080775c110b04f2753de7a6 WHIRLPOOL 79cb7e620eb8e838192dc557c7a9ce7e713227d783cc8b63792825559b2145cad70d0af6f99948c1527557bc363feffd846c73893682b4a14fc7d08b9e20c649
+DIST patchbundle-selinux-base-policy-2.20141203-r9.tar.bz2 299602 SHA256 e8518004942a6c57170a609683e22b1410c93a2a195829c41dc8fbc703d941b5 SHA512 ce6484fbca1d2d074e50d1a3953392bd3ce0a4617df98fbac37747b469b4f160a9331586dfe1c3ddccb1ccbee24876a2f05ab49e37c8492a48baf83c2d01d140 WHIRLPOOL 1fd7b956e98e95a64c3a713a944d4531259bd156a7feabf6a89c4b5f33ac846377730eede97889e85183be086f282ebd18e860214f6ca3f01b40f2323470ee04
 DIST refpolicy-2.20140311.tar.bz2 664416 SHA256 f69437db95548c78a5dec44c236397146b144153149009ea554d2e536e5436f7 SHA512 50bacee82ed41ac8b8007ecc33bf51d22303cc2ddd27cfb72cb5520dab5f8e255186e34b89cec492c7a2d4220b200814bdede9b46c19f987a3d3d65a1c9b749a WHIRLPOOL e07480beba6ab1f02ad36b7d0c50c4a71cb39a8ec78bf8d1dc3c82bb9dd1d69d9169d7c937165ea15f60ce1147f256d46644f944107a3a8a800d5bad70d4c255
 DIST refpolicy-2.20141203.tar.bz2 680243 SHA256 f438209c430d8a2d4ddcbe4bdd3edb46f6af7dc4913637af0b73c635e40c1522 SHA512 682e4280c5799e4c12ec7594afc1389f67be35055748d2e0dbdc3419159a16c96d4946ca6178daee8370515951f8653b2e452efe8c962b8d7f9bc192f0b15a0c WHIRLPOOL 74bca232534e7af9051bb1ab9f77c1ff6c425781cf4561f781d6e9a40cc5ca0d9add540249ea5493e8782a9372aea296ead6c165c6c440ae1509eb319d151ee5
diff --git a/sec-policy/selinux-mrtg/selinux-mrtg-2.20141203-r8.ebuild b/sec-policy/selinux-mrtg/selinux-mrtg-2.20141203-r8.ebuild
index a517dc75f989..dbd15a5fd784 100644
--- a/sec-policy/selinux-mrtg/selinux-mrtg-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-mrtg/selinux-mrtg-2.20141203-r8.ebuild
@@ -13,5 +13,5 @@ DESCRIPTION="SELinux policy for mrtg"
 if [[ $PV == 9999* ]] ; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-mrtg/selinux-mrtg-2.20141203-r9.ebuild b/sec-policy/selinux-mrtg/selinux-mrtg-2.20141203-r9.ebuild
new file mode 100644
index 000000000000..a517dc75f989
--- /dev/null
+++ b/sec-policy/selinux-mrtg/selinux-mrtg-2.20141203-r9.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI="5"
+
+IUSE=""
+MODS="mrtg"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for mrtg"
+
+if [[ $PV == 9999* ]] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
diff --git a/sec-policy/selinux-munin/Manifest b/sec-policy/selinux-munin/Manifest
index 8327a635be01..91d204b0021a 100644
--- a/sec-policy/selinux-munin/Manifest
+++ b/sec-policy/selinux-munin/Manifest
@@ -9,5 +9,6 @@ DIST patchbundle-selinux-base-policy-2.20141203-r5.tar.bz2 274136 SHA256 c23d17c
 DIST patchbundle-selinux-base-policy-2.20141203-r6.tar.bz2 293231 SHA256 b686dcc517b97834f66d967afdcc724cb43b5c6dbf9f34043a91cdeda2625cc7 SHA512 a2c486cbe4a1d21ff3fd01bef25ecf5a633a4072646c67cfccf3f7187d95f3d9e3b482a46ba17c55c40a8e7c0dee56e9cf9ddc9f414d3e4511443b62f60d03e9 WHIRLPOOL 3d708e287e3f9b873be647b0327eab6675a8702ee1cffb56e36934cada306e5ccc64397a083dad9e59de37a067e628cacbf896ae99012d5a209e42fd7cd8a4c6
 DIST patchbundle-selinux-base-policy-2.20141203-r7.tar.bz2 295833 SHA256 ba2219b3efc747be65f94c4d8ac3cd6ee530c82c848fa41935a114184678622a SHA512 8e32d9dbfb2f0f3f50200543aadb51ed9834ccd5cdf30bf8e4d9e6d0b645ce44ffaf80f7aa9385e9c9095d9a383b3a348a92356cb5386c06544ab082a9a468c7 WHIRLPOOL 1648ee1be71e45fcf5a264816ce7edc7bab19bd28a68703923eb2d6068f1f0469ae593855231d31f88baecbf29e7cece2d6beeed20b7c04231a6c90e90d35910
 DIST patchbundle-selinux-base-policy-2.20141203-r8.tar.bz2 297919 SHA256 77539eb3d78105f8789cd8205d2698bd27e2abf100163bdd162cda860fd15120 SHA512 2f8a19e1e4bb65f32b480275f49099aed3ae9df543c7de862b3bbd93e81b89cd96dadac3d091e28673d09a6885db8c5656b3a77d0080775c110b04f2753de7a6 WHIRLPOOL 79cb7e620eb8e838192dc557c7a9ce7e713227d783cc8b63792825559b2145cad70d0af6f99948c1527557bc363feffd846c73893682b4a14fc7d08b9e20c649
+DIST patchbundle-selinux-base-policy-2.20141203-r9.tar.bz2 299602 SHA256 e8518004942a6c57170a609683e22b1410c93a2a195829c41dc8fbc703d941b5 SHA512 ce6484fbca1d2d074e50d1a3953392bd3ce0a4617df98fbac37747b469b4f160a9331586dfe1c3ddccb1ccbee24876a2f05ab49e37c8492a48baf83c2d01d140 WHIRLPOOL 1fd7b956e98e95a64c3a713a944d4531259bd156a7feabf6a89c4b5f33ac846377730eede97889e85183be086f282ebd18e860214f6ca3f01b40f2323470ee04
 DIST refpolicy-2.20140311.tar.bz2 664416 SHA256 f69437db95548c78a5dec44c236397146b144153149009ea554d2e536e5436f7 SHA512 50bacee82ed41ac8b8007ecc33bf51d22303cc2ddd27cfb72cb5520dab5f8e255186e34b89cec492c7a2d4220b200814bdede9b46c19f987a3d3d65a1c9b749a WHIRLPOOL e07480beba6ab1f02ad36b7d0c50c4a71cb39a8ec78bf8d1dc3c82bb9dd1d69d9169d7c937165ea15f60ce1147f256d46644f944107a3a8a800d5bad70d4c255
 DIST refpolicy-2.20141203.tar.bz2 680243 SHA256 f438209c430d8a2d4ddcbe4bdd3edb46f6af7dc4913637af0b73c635e40c1522 SHA512 682e4280c5799e4c12ec7594afc1389f67be35055748d2e0dbdc3419159a16c96d4946ca6178daee8370515951f8653b2e452efe8c962b8d7f9bc192f0b15a0c WHIRLPOOL 74bca232534e7af9051bb1ab9f77c1ff6c425781cf4561f781d6e9a40cc5ca0d9add540249ea5493e8782a9372aea296ead6c165c6c440ae1509eb319d151ee5
diff --git a/sec-policy/selinux-munin/selinux-munin-2.20141203-r8.ebuild b/sec-policy/selinux-munin/selinux-munin-2.20141203-r8.ebuild
index fd4175500220..398878e73c89 100644
--- a/sec-policy/selinux-munin/selinux-munin-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-munin/selinux-munin-2.20141203-r8.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="SELinux policy for munin"
 if [[ $PV == 9999* ]] ; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-apache
diff --git a/sec-policy/selinux-munin/selinux-munin-2.20141203-r9.ebuild b/sec-policy/selinux-munin/selinux-munin-2.20141203-r9.ebuild
new file mode 100644
index 000000000000..fd4175500220
--- /dev/null
+++ b/sec-policy/selinux-munin/selinux-munin-2.20141203-r9.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI="5"
+
+IUSE=""
+MODS="munin"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for munin"
+
+if [[ $PV == 9999* ]] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
+DEPEND="${DEPEND}
+	sec-policy/selinux-apache
+"
+RDEPEND="${RDEPEND}
+	sec-policy/selinux-apache
+"
diff --git a/sec-policy/selinux-mutt/Manifest b/sec-policy/selinux-mutt/Manifest
index 8327a635be01..91d204b0021a 100644
--- a/sec-policy/selinux-mutt/Manifest
+++ b/sec-policy/selinux-mutt/Manifest
@@ -9,5 +9,6 @@ DIST patchbundle-selinux-base-policy-2.20141203-r5.tar.bz2 274136 SHA256 c23d17c
 DIST patchbundle-selinux-base-policy-2.20141203-r6.tar.bz2 293231 SHA256 b686dcc517b97834f66d967afdcc724cb43b5c6dbf9f34043a91cdeda2625cc7 SHA512 a2c486cbe4a1d21ff3fd01bef25ecf5a633a4072646c67cfccf3f7187d95f3d9e3b482a46ba17c55c40a8e7c0dee56e9cf9ddc9f414d3e4511443b62f60d03e9 WHIRLPOOL 3d708e287e3f9b873be647b0327eab6675a8702ee1cffb56e36934cada306e5ccc64397a083dad9e59de37a067e628cacbf896ae99012d5a209e42fd7cd8a4c6
 DIST patchbundle-selinux-base-policy-2.20141203-r7.tar.bz2 295833 SHA256 ba2219b3efc747be65f94c4d8ac3cd6ee530c82c848fa41935a114184678622a SHA512 8e32d9dbfb2f0f3f50200543aadb51ed9834ccd5cdf30bf8e4d9e6d0b645ce44ffaf80f7aa9385e9c9095d9a383b3a348a92356cb5386c06544ab082a9a468c7 WHIRLPOOL 1648ee1be71e45fcf5a264816ce7edc7bab19bd28a68703923eb2d6068f1f0469ae593855231d31f88baecbf29e7cece2d6beeed20b7c04231a6c90e90d35910
 DIST patchbundle-selinux-base-policy-2.20141203-r8.tar.bz2 297919 SHA256 77539eb3d78105f8789cd8205d2698bd27e2abf100163bdd162cda860fd15120 SHA512 2f8a19e1e4bb65f32b480275f49099aed3ae9df543c7de862b3bbd93e81b89cd96dadac3d091e28673d09a6885db8c5656b3a77d0080775c110b04f2753de7a6 WHIRLPOOL 79cb7e620eb8e838192dc557c7a9ce7e713227d783cc8b63792825559b2145cad70d0af6f99948c1527557bc363feffd846c73893682b4a14fc7d08b9e20c649
+DIST patchbundle-selinux-base-policy-2.20141203-r9.tar.bz2 299602 SHA256 e8518004942a6c57170a609683e22b1410c93a2a195829c41dc8fbc703d941b5 SHA512 ce6484fbca1d2d074e50d1a3953392bd3ce0a4617df98fbac37747b469b4f160a9331586dfe1c3ddccb1ccbee24876a2f05ab49e37c8492a48baf83c2d01d140 WHIRLPOOL 1fd7b956e98e95a64c3a713a944d4531259bd156a7feabf6a89c4b5f33ac846377730eede97889e85183be086f282ebd18e860214f6ca3f01b40f2323470ee04
 DIST refpolicy-2.20140311.tar.bz2 664416 SHA256 f69437db95548c78a5dec44c236397146b144153149009ea554d2e536e5436f7 SHA512 50bacee82ed41ac8b8007ecc33bf51d22303cc2ddd27cfb72cb5520dab5f8e255186e34b89cec492c7a2d4220b200814bdede9b46c19f987a3d3d65a1c9b749a WHIRLPOOL e07480beba6ab1f02ad36b7d0c50c4a71cb39a8ec78bf8d1dc3c82bb9dd1d69d9169d7c937165ea15f60ce1147f256d46644f944107a3a8a800d5bad70d4c255
 DIST refpolicy-2.20141203.tar.bz2 680243 SHA256 f438209c430d8a2d4ddcbe4bdd3edb46f6af7dc4913637af0b73c635e40c1522 SHA512 682e4280c5799e4c12ec7594afc1389f67be35055748d2e0dbdc3419159a16c96d4946ca6178daee8370515951f8653b2e452efe8c962b8d7f9bc192f0b15a0c WHIRLPOOL 74bca232534e7af9051bb1ab9f77c1ff6c425781cf4561f781d6e9a40cc5ca0d9add540249ea5493e8782a9372aea296ead6c165c6c440ae1509eb319d151ee5
diff --git a/sec-policy/selinux-mutt/selinux-mutt-2.20141203-r8.ebuild b/sec-policy/selinux-mutt/selinux-mutt-2.20141203-r8.ebuild
index 469432b8942b..04f6819f4f4e 100644
--- a/sec-policy/selinux-mutt/selinux-mutt-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-mutt/selinux-mutt-2.20141203-r8.ebuild
@@ -13,5 +13,5 @@ DESCRIPTION="SELinux policy for mutt"
 if [[ $PV == 9999* ]] ; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-mutt/selinux-mutt-2.20141203-r9.ebuild b/sec-policy/selinux-mutt/selinux-mutt-2.20141203-r9.ebuild
new file mode 100644
index 000000000000..469432b8942b
--- /dev/null
+++ b/sec-policy/selinux-mutt/selinux-mutt-2.20141203-r9.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI="5"
+
+IUSE=""
+MODS="mutt"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for mutt"
+
+if [[ $PV == 9999* ]] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
diff --git a/sec-policy/selinux-mysql/Manifest b/sec-policy/selinux-mysql/Manifest
index 8327a635be01..91d204b0021a 100644
--- a/sec-policy/selinux-mysql/Manifest
+++ b/sec-policy/selinux-mysql/Manifest
@@ -9,5 +9,6 @@ DIST patchbundle-selinux-base-policy-2.20141203-r5.tar.bz2 274136 SHA256 c23d17c
 DIST patchbundle-selinux-base-policy-2.20141203-r6.tar.bz2 293231 SHA256 b686dcc517b97834f66d967afdcc724cb43b5c6dbf9f34043a91cdeda2625cc7 SHA512 a2c486cbe4a1d21ff3fd01bef25ecf5a633a4072646c67cfccf3f7187d95f3d9e3b482a46ba17c55c40a8e7c0dee56e9cf9ddc9f414d3e4511443b62f60d03e9 WHIRLPOOL 3d708e287e3f9b873be647b0327eab6675a8702ee1cffb56e36934cada306e5ccc64397a083dad9e59de37a067e628cacbf896ae99012d5a209e42fd7cd8a4c6
 DIST patchbundle-selinux-base-policy-2.20141203-r7.tar.bz2 295833 SHA256 ba2219b3efc747be65f94c4d8ac3cd6ee530c82c848fa41935a114184678622a SHA512 8e32d9dbfb2f0f3f50200543aadb51ed9834ccd5cdf30bf8e4d9e6d0b645ce44ffaf80f7aa9385e9c9095d9a383b3a348a92356cb5386c06544ab082a9a468c7 WHIRLPOOL 1648ee1be71e45fcf5a264816ce7edc7bab19bd28a68703923eb2d6068f1f0469ae593855231d31f88baecbf29e7cece2d6beeed20b7c04231a6c90e90d35910
 DIST patchbundle-selinux-base-policy-2.20141203-r8.tar.bz2 297919 SHA256 77539eb3d78105f8789cd8205d2698bd27e2abf100163bdd162cda860fd15120 SHA512 2f8a19e1e4bb65f32b480275f49099aed3ae9df543c7de862b3bbd93e81b89cd96dadac3d091e28673d09a6885db8c5656b3a77d0080775c110b04f2753de7a6 WHIRLPOOL 79cb7e620eb8e838192dc557c7a9ce7e713227d783cc8b63792825559b2145cad70d0af6f99948c1527557bc363feffd846c73893682b4a14fc7d08b9e20c649
+DIST patchbundle-selinux-base-policy-2.20141203-r9.tar.bz2 299602 SHA256 e8518004942a6c57170a609683e22b1410c93a2a195829c41dc8fbc703d941b5 SHA512 ce6484fbca1d2d074e50d1a3953392bd3ce0a4617df98fbac37747b469b4f160a9331586dfe1c3ddccb1ccbee24876a2f05ab49e37c8492a48baf83c2d01d140 WHIRLPOOL 1fd7b956e98e95a64c3a713a944d4531259bd156a7feabf6a89c4b5f33ac846377730eede97889e85183be086f282ebd18e860214f6ca3f01b40f2323470ee04
 DIST refpolicy-2.20140311.tar.bz2 664416 SHA256 f69437db95548c78a5dec44c236397146b144153149009ea554d2e536e5436f7 SHA512 50bacee82ed41ac8b8007ecc33bf51d22303cc2ddd27cfb72cb5520dab5f8e255186e34b89cec492c7a2d4220b200814bdede9b46c19f987a3d3d65a1c9b749a WHIRLPOOL e07480beba6ab1f02ad36b7d0c50c4a71cb39a8ec78bf8d1dc3c82bb9dd1d69d9169d7c937165ea15f60ce1147f256d46644f944107a3a8a800d5bad70d4c255
 DIST refpolicy-2.20141203.tar.bz2 680243 SHA256 f438209c430d8a2d4ddcbe4bdd3edb46f6af7dc4913637af0b73c635e40c1522 SHA512 682e4280c5799e4c12ec7594afc1389f67be35055748d2e0dbdc3419159a16c96d4946ca6178daee8370515951f8653b2e452efe8c962b8d7f9bc192f0b15a0c WHIRLPOOL 74bca232534e7af9051bb1ab9f77c1ff6c425781cf4561f781d6e9a40cc5ca0d9add540249ea5493e8782a9372aea296ead6c165c6c440ae1509eb319d151ee5
diff --git a/sec-policy/selinux-mysql/selinux-mysql-2.20141203-r8.ebuild b/sec-policy/selinux-mysql/selinux-mysql-2.20141203-r8.ebuild
index bad2376a0365..7b58f7831df3 100644
--- a/sec-policy/selinux-mysql/selinux-mysql-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-mysql/selinux-mysql-2.20141203-r8.ebuild
@@ -13,5 +13,5 @@ DESCRIPTION="SELinux policy for mysql"
 if [[ $PV == 9999* ]] ; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-mysql/selinux-mysql-2.20141203-r9.ebuild b/sec-policy/selinux-mysql/selinux-mysql-2.20141203-r9.ebuild
new file mode 100644
index 000000000000..bad2376a0365
--- /dev/null
+++ b/sec-policy/selinux-mysql/selinux-mysql-2.20141203-r9.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI="5"
+
+IUSE=""
+MODS="mysql"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for mysql"
+
+if [[ $PV == 9999* ]] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
diff --git a/sec-policy/selinux-nagios/Manifest b/sec-policy/selinux-nagios/Manifest
index 8327a635be01..91d204b0021a 100644
--- a/sec-policy/selinux-nagios/Manifest
+++ b/sec-policy/selinux-nagios/Manifest
@@ -9,5 +9,6 @@ DIST patchbundle-selinux-base-policy-2.20141203-r5.tar.bz2 274136 SHA256 c23d17c
 DIST patchbundle-selinux-base-policy-2.20141203-r6.tar.bz2 293231 SHA256 b686dcc517b97834f66d967afdcc724cb43b5c6dbf9f34043a91cdeda2625cc7 SHA512 a2c486cbe4a1d21ff3fd01bef25ecf5a633a4072646c67cfccf3f7187d95f3d9e3b482a46ba17c55c40a8e7c0dee56e9cf9ddc9f414d3e4511443b62f60d03e9 WHIRLPOOL 3d708e287e3f9b873be647b0327eab6675a8702ee1cffb56e36934cada306e5ccc64397a083dad9e59de37a067e628cacbf896ae99012d5a209e42fd7cd8a4c6
 DIST patchbundle-selinux-base-policy-2.20141203-r7.tar.bz2 295833 SHA256 ba2219b3efc747be65f94c4d8ac3cd6ee530c82c848fa41935a114184678622a SHA512 8e32d9dbfb2f0f3f50200543aadb51ed9834ccd5cdf30bf8e4d9e6d0b645ce44ffaf80f7aa9385e9c9095d9a383b3a348a92356cb5386c06544ab082a9a468c7 WHIRLPOOL 1648ee1be71e45fcf5a264816ce7edc7bab19bd28a68703923eb2d6068f1f0469ae593855231d31f88baecbf29e7cece2d6beeed20b7c04231a6c90e90d35910
 DIST patchbundle-selinux-base-policy-2.20141203-r8.tar.bz2 297919 SHA256 77539eb3d78105f8789cd8205d2698bd27e2abf100163bdd162cda860fd15120 SHA512 2f8a19e1e4bb65f32b480275f49099aed3ae9df543c7de862b3bbd93e81b89cd96dadac3d091e28673d09a6885db8c5656b3a77d0080775c110b04f2753de7a6 WHIRLPOOL 79cb7e620eb8e838192dc557c7a9ce7e713227d783cc8b63792825559b2145cad70d0af6f99948c1527557bc363feffd846c73893682b4a14fc7d08b9e20c649
+DIST patchbundle-selinux-base-policy-2.20141203-r9.tar.bz2 299602 SHA256 e8518004942a6c57170a609683e22b1410c93a2a195829c41dc8fbc703d941b5 SHA512 ce6484fbca1d2d074e50d1a3953392bd3ce0a4617df98fbac37747b469b4f160a9331586dfe1c3ddccb1ccbee24876a2f05ab49e37c8492a48baf83c2d01d140 WHIRLPOOL 1fd7b956e98e95a64c3a713a944d4531259bd156a7feabf6a89c4b5f33ac846377730eede97889e85183be086f282ebd18e860214f6ca3f01b40f2323470ee04
 DIST refpolicy-2.20140311.tar.bz2 664416 SHA256 f69437db95548c78a5dec44c236397146b144153149009ea554d2e536e5436f7 SHA512 50bacee82ed41ac8b8007ecc33bf51d22303cc2ddd27cfb72cb5520dab5f8e255186e34b89cec492c7a2d4220b200814bdede9b46c19f987a3d3d65a1c9b749a WHIRLPOOL e07480beba6ab1f02ad36b7d0c50c4a71cb39a8ec78bf8d1dc3c82bb9dd1d69d9169d7c937165ea15f60ce1147f256d46644f944107a3a8a800d5bad70d4c255
 DIST refpolicy-2.20141203.tar.bz2 680243 SHA256 f438209c430d8a2d4ddcbe4bdd3edb46f6af7dc4913637af0b73c635e40c1522 SHA512 682e4280c5799e4c12ec7594afc1389f67be35055748d2e0dbdc3419159a16c96d4946ca6178daee8370515951f8653b2e452efe8c962b8d7f9bc192f0b15a0c WHIRLPOOL 74bca232534e7af9051bb1ab9f77c1ff6c425781cf4561f781d6e9a40cc5ca0d9add540249ea5493e8782a9372aea296ead6c165c6c440ae1509eb319d151ee5
diff --git a/sec-policy/selinux-nagios/selinux-nagios-2.20141203-r8.ebuild b/sec-policy/selinux-nagios/selinux-nagios-2.20141203-r8.ebuild
index 224ada901964..56cfef545a9a 100644
--- a/sec-policy/selinux-nagios/selinux-nagios-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-nagios/selinux-nagios-2.20141203-r8.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="SELinux policy for nagios"
 if [[ $PV == 9999* ]] ; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-apache
diff --git a/sec-policy/selinux-nagios/selinux-nagios-2.20141203-r9.ebuild b/sec-policy/selinux-nagios/selinux-nagios-2.20141203-r9.ebuild
new file mode 100644
index 000000000000..224ada901964
--- /dev/null
+++ b/sec-policy/selinux-nagios/selinux-nagios-2.20141203-r9.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI="5"
+
+IUSE=""
+MODS="nagios"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for nagios"
+
+if [[ $PV == 9999* ]] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
+DEPEND="${DEPEND}
+	sec-policy/selinux-apache
+"
+RDEPEND="${RDEPEND}
+	sec-policy/selinux-apache
+"
diff --git a/sec-policy/selinux-ncftool/Manifest b/sec-policy/selinux-ncftool/Manifest
index 8327a635be01..91d204b0021a 100644
--- a/sec-policy/selinux-ncftool/Manifest
+++ b/sec-policy/selinux-ncftool/Manifest
@@ -9,5 +9,6 @@ DIST patchbundle-selinux-base-policy-2.20141203-r5.tar.bz2 274136 SHA256 c23d17c
 DIST patchbundle-selinux-base-policy-2.20141203-r6.tar.bz2 293231 SHA256 b686dcc517b97834f66d967afdcc724cb43b5c6dbf9f34043a91cdeda2625cc7 SHA512 a2c486cbe4a1d21ff3fd01bef25ecf5a633a4072646c67cfccf3f7187d95f3d9e3b482a46ba17c55c40a8e7c0dee56e9cf9ddc9f414d3e4511443b62f60d03e9 WHIRLPOOL 3d708e287e3f9b873be647b0327eab6675a8702ee1cffb56e36934cada306e5ccc64397a083dad9e59de37a067e628cacbf896ae99012d5a209e42fd7cd8a4c6
 DIST patchbundle-selinux-base-policy-2.20141203-r7.tar.bz2 295833 SHA256 ba2219b3efc747be65f94c4d8ac3cd6ee530c82c848fa41935a114184678622a SHA512 8e32d9dbfb2f0f3f50200543aadb51ed9834ccd5cdf30bf8e4d9e6d0b645ce44ffaf80f7aa9385e9c9095d9a383b3a348a92356cb5386c06544ab082a9a468c7 WHIRLPOOL 1648ee1be71e45fcf5a264816ce7edc7bab19bd28a68703923eb2d6068f1f0469ae593855231d31f88baecbf29e7cece2d6beeed20b7c04231a6c90e90d35910
 DIST patchbundle-selinux-base-policy-2.20141203-r8.tar.bz2 297919 SHA256 77539eb3d78105f8789cd8205d2698bd27e2abf100163bdd162cda860fd15120 SHA512 2f8a19e1e4bb65f32b480275f49099aed3ae9df543c7de862b3bbd93e81b89cd96dadac3d091e28673d09a6885db8c5656b3a77d0080775c110b04f2753de7a6 WHIRLPOOL 79cb7e620eb8e838192dc557c7a9ce7e713227d783cc8b63792825559b2145cad70d0af6f99948c1527557bc363feffd846c73893682b4a14fc7d08b9e20c649
+DIST patchbundle-selinux-base-policy-2.20141203-r9.tar.bz2 299602 SHA256 e8518004942a6c57170a609683e22b1410c93a2a195829c41dc8fbc703d941b5 SHA512 ce6484fbca1d2d074e50d1a3953392bd3ce0a4617df98fbac37747b469b4f160a9331586dfe1c3ddccb1ccbee24876a2f05ab49e37c8492a48baf83c2d01d140 WHIRLPOOL 1fd7b956e98e95a64c3a713a944d4531259bd156a7feabf6a89c4b5f33ac846377730eede97889e85183be086f282ebd18e860214f6ca3f01b40f2323470ee04
 DIST refpolicy-2.20140311.tar.bz2 664416 SHA256 f69437db95548c78a5dec44c236397146b144153149009ea554d2e536e5436f7 SHA512 50bacee82ed41ac8b8007ecc33bf51d22303cc2ddd27cfb72cb5520dab5f8e255186e34b89cec492c7a2d4220b200814bdede9b46c19f987a3d3d65a1c9b749a WHIRLPOOL e07480beba6ab1f02ad36b7d0c50c4a71cb39a8ec78bf8d1dc3c82bb9dd1d69d9169d7c937165ea15f60ce1147f256d46644f944107a3a8a800d5bad70d4c255
 DIST refpolicy-2.20141203.tar.bz2 680243 SHA256 f438209c430d8a2d4ddcbe4bdd3edb46f6af7dc4913637af0b73c635e40c1522 SHA512 682e4280c5799e4c12ec7594afc1389f67be35055748d2e0dbdc3419159a16c96d4946ca6178daee8370515951f8653b2e452efe8c962b8d7f9bc192f0b15a0c WHIRLPOOL 74bca232534e7af9051bb1ab9f77c1ff6c425781cf4561f781d6e9a40cc5ca0d9add540249ea5493e8782a9372aea296ead6c165c6c440ae1509eb319d151ee5
diff --git a/sec-policy/selinux-ncftool/selinux-ncftool-2.20141203-r8.ebuild b/sec-policy/selinux-ncftool/selinux-ncftool-2.20141203-r8.ebuild
index 0626c6f6c274..d8f466fe2d34 100644
--- a/sec-policy/selinux-ncftool/selinux-ncftool-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-ncftool/selinux-ncftool-2.20141203-r8.ebuild
@@ -13,5 +13,5 @@ DESCRIPTION="SELinux policy for ncftool"
 if [[ $PV == 9999* ]] ; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-ncftool/selinux-ncftool-2.20141203-r9.ebuild b/sec-policy/selinux-ncftool/selinux-ncftool-2.20141203-r9.ebuild
new file mode 100644
index 000000000000..0626c6f6c274
--- /dev/null
+++ b/sec-policy/selinux-ncftool/selinux-ncftool-2.20141203-r9.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI="5"
+
+IUSE=""
+MODS="ncftool"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for ncftool"
+
+if [[ $PV == 9999* ]] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
diff --git a/sec-policy/selinux-nessus/Manifest b/sec-policy/selinux-nessus/Manifest
index 8327a635be01..91d204b0021a 100644
--- a/sec-policy/selinux-nessus/Manifest
+++ b/sec-policy/selinux-nessus/Manifest
@@ -9,5 +9,6 @@ DIST patchbundle-selinux-base-policy-2.20141203-r5.tar.bz2 274136 SHA256 c23d17c
 DIST patchbundle-selinux-base-policy-2.20141203-r6.tar.bz2 293231 SHA256 b686dcc517b97834f66d967afdcc724cb43b5c6dbf9f34043a91cdeda2625cc7 SHA512 a2c486cbe4a1d21ff3fd01bef25ecf5a633a4072646c67cfccf3f7187d95f3d9e3b482a46ba17c55c40a8e7c0dee56e9cf9ddc9f414d3e4511443b62f60d03e9 WHIRLPOOL 3d708e287e3f9b873be647b0327eab6675a8702ee1cffb56e36934cada306e5ccc64397a083dad9e59de37a067e628cacbf896ae99012d5a209e42fd7cd8a4c6
 DIST patchbundle-selinux-base-policy-2.20141203-r7.tar.bz2 295833 SHA256 ba2219b3efc747be65f94c4d8ac3cd6ee530c82c848fa41935a114184678622a SHA512 8e32d9dbfb2f0f3f50200543aadb51ed9834ccd5cdf30bf8e4d9e6d0b645ce44ffaf80f7aa9385e9c9095d9a383b3a348a92356cb5386c06544ab082a9a468c7 WHIRLPOOL 1648ee1be71e45fcf5a264816ce7edc7bab19bd28a68703923eb2d6068f1f0469ae593855231d31f88baecbf29e7cece2d6beeed20b7c04231a6c90e90d35910
 DIST patchbundle-selinux-base-policy-2.20141203-r8.tar.bz2 297919 SHA256 77539eb3d78105f8789cd8205d2698bd27e2abf100163bdd162cda860fd15120 SHA512 2f8a19e1e4bb65f32b480275f49099aed3ae9df543c7de862b3bbd93e81b89cd96dadac3d091e28673d09a6885db8c5656b3a77d0080775c110b04f2753de7a6 WHIRLPOOL 79cb7e620eb8e838192dc557c7a9ce7e713227d783cc8b63792825559b2145cad70d0af6f99948c1527557bc363feffd846c73893682b4a14fc7d08b9e20c649
+DIST patchbundle-selinux-base-policy-2.20141203-r9.tar.bz2 299602 SHA256 e8518004942a6c57170a609683e22b1410c93a2a195829c41dc8fbc703d941b5 SHA512 ce6484fbca1d2d074e50d1a3953392bd3ce0a4617df98fbac37747b469b4f160a9331586dfe1c3ddccb1ccbee24876a2f05ab49e37c8492a48baf83c2d01d140 WHIRLPOOL 1fd7b956e98e95a64c3a713a944d4531259bd156a7feabf6a89c4b5f33ac846377730eede97889e85183be086f282ebd18e860214f6ca3f01b40f2323470ee04
 DIST refpolicy-2.20140311.tar.bz2 664416 SHA256 f69437db95548c78a5dec44c236397146b144153149009ea554d2e536e5436f7 SHA512 50bacee82ed41ac8b8007ecc33bf51d22303cc2ddd27cfb72cb5520dab5f8e255186e34b89cec492c7a2d4220b200814bdede9b46c19f987a3d3d65a1c9b749a WHIRLPOOL e07480beba6ab1f02ad36b7d0c50c4a71cb39a8ec78bf8d1dc3c82bb9dd1d69d9169d7c937165ea15f60ce1147f256d46644f944107a3a8a800d5bad70d4c255
 DIST refpolicy-2.20141203.tar.bz2 680243 SHA256 f438209c430d8a2d4ddcbe4bdd3edb46f6af7dc4913637af0b73c635e40c1522 SHA512 682e4280c5799e4c12ec7594afc1389f67be35055748d2e0dbdc3419159a16c96d4946ca6178daee8370515951f8653b2e452efe8c962b8d7f9bc192f0b15a0c WHIRLPOOL 74bca232534e7af9051bb1ab9f77c1ff6c425781cf4561f781d6e9a40cc5ca0d9add540249ea5493e8782a9372aea296ead6c165c6c440ae1509eb319d151ee5
diff --git a/sec-policy/selinux-nessus/selinux-nessus-2.20141203-r8.ebuild b/sec-policy/selinux-nessus/selinux-nessus-2.20141203-r8.ebuild
index 03f1f028f04c..fa4ab315fc61 100644
--- a/sec-policy/selinux-nessus/selinux-nessus-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-nessus/selinux-nessus-2.20141203-r8.ebuild
@@ -13,5 +13,5 @@ DESCRIPTION="SELinux policy for nessus"
 if [[ $PV == 9999* ]] ; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-nessus/selinux-nessus-2.20141203-r9.ebuild b/sec-policy/selinux-nessus/selinux-nessus-2.20141203-r9.ebuild
new file mode 100644
index 000000000000..03f1f028f04c
--- /dev/null
+++ b/sec-policy/selinux-nessus/selinux-nessus-2.20141203-r9.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI="5"
+
+IUSE=""
+MODS="nessus"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for nessus"
+
+if [[ $PV == 9999* ]] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
diff --git a/sec-policy/selinux-networkmanager/Manifest b/sec-policy/selinux-networkmanager/Manifest
index 8327a635be01..91d204b0021a 100644
--- a/sec-policy/selinux-networkmanager/Manifest
+++ b/sec-policy/selinux-networkmanager/Manifest
@@ -9,5 +9,6 @@ DIST patchbundle-selinux-base-policy-2.20141203-r5.tar.bz2 274136 SHA256 c23d17c
 DIST patchbundle-selinux-base-policy-2.20141203-r6.tar.bz2 293231 SHA256 b686dcc517b97834f66d967afdcc724cb43b5c6dbf9f34043a91cdeda2625cc7 SHA512 a2c486cbe4a1d21ff3fd01bef25ecf5a633a4072646c67cfccf3f7187d95f3d9e3b482a46ba17c55c40a8e7c0dee56e9cf9ddc9f414d3e4511443b62f60d03e9 WHIRLPOOL 3d708e287e3f9b873be647b0327eab6675a8702ee1cffb56e36934cada306e5ccc64397a083dad9e59de37a067e628cacbf896ae99012d5a209e42fd7cd8a4c6
 DIST patchbundle-selinux-base-policy-2.20141203-r7.tar.bz2 295833 SHA256 ba2219b3efc747be65f94c4d8ac3cd6ee530c82c848fa41935a114184678622a SHA512 8e32d9dbfb2f0f3f50200543aadb51ed9834ccd5cdf30bf8e4d9e6d0b645ce44ffaf80f7aa9385e9c9095d9a383b3a348a92356cb5386c06544ab082a9a468c7 WHIRLPOOL 1648ee1be71e45fcf5a264816ce7edc7bab19bd28a68703923eb2d6068f1f0469ae593855231d31f88baecbf29e7cece2d6beeed20b7c04231a6c90e90d35910
 DIST patchbundle-selinux-base-policy-2.20141203-r8.tar.bz2 297919 SHA256 77539eb3d78105f8789cd8205d2698bd27e2abf100163bdd162cda860fd15120 SHA512 2f8a19e1e4bb65f32b480275f49099aed3ae9df543c7de862b3bbd93e81b89cd96dadac3d091e28673d09a6885db8c5656b3a77d0080775c110b04f2753de7a6 WHIRLPOOL 79cb7e620eb8e838192dc557c7a9ce7e713227d783cc8b63792825559b2145cad70d0af6f99948c1527557bc363feffd846c73893682b4a14fc7d08b9e20c649
+DIST patchbundle-selinux-base-policy-2.20141203-r9.tar.bz2 299602 SHA256 e8518004942a6c57170a609683e22b1410c93a2a195829c41dc8fbc703d941b5 SHA512 ce6484fbca1d2d074e50d1a3953392bd3ce0a4617df98fbac37747b469b4f160a9331586dfe1c3ddccb1ccbee24876a2f05ab49e37c8492a48baf83c2d01d140 WHIRLPOOL 1fd7b956e98e95a64c3a713a944d4531259bd156a7feabf6a89c4b5f33ac846377730eede97889e85183be086f282ebd18e860214f6ca3f01b40f2323470ee04
 DIST refpolicy-2.20140311.tar.bz2 664416 SHA256 f69437db95548c78a5dec44c236397146b144153149009ea554d2e536e5436f7 SHA512 50bacee82ed41ac8b8007ecc33bf51d22303cc2ddd27cfb72cb5520dab5f8e255186e34b89cec492c7a2d4220b200814bdede9b46c19f987a3d3d65a1c9b749a WHIRLPOOL e07480beba6ab1f02ad36b7d0c50c4a71cb39a8ec78bf8d1dc3c82bb9dd1d69d9169d7c937165ea15f60ce1147f256d46644f944107a3a8a800d5bad70d4c255
 DIST refpolicy-2.20141203.tar.bz2 680243 SHA256 f438209c430d8a2d4ddcbe4bdd3edb46f6af7dc4913637af0b73c635e40c1522 SHA512 682e4280c5799e4c12ec7594afc1389f67be35055748d2e0dbdc3419159a16c96d4946ca6178daee8370515951f8653b2e452efe8c962b8d7f9bc192f0b15a0c WHIRLPOOL 74bca232534e7af9051bb1ab9f77c1ff6c425781cf4561f781d6e9a40cc5ca0d9add540249ea5493e8782a9372aea296ead6c165c6c440ae1509eb319d151ee5
diff --git a/sec-policy/selinux-networkmanager/selinux-networkmanager-2.20141203-r8.ebuild b/sec-policy/selinux-networkmanager/selinux-networkmanager-2.20141203-r8.ebuild
index 208521b01727..6bb1d2db3647 100644
--- a/sec-policy/selinux-networkmanager/selinux-networkmanager-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-networkmanager/selinux-networkmanager-2.20141203-r8.ebuild
@@ -13,5 +13,5 @@ DESCRIPTION="SELinux policy for networkmanager"
 if [[ $PV == 9999* ]] ; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-networkmanager/selinux-networkmanager-2.20141203-r9.ebuild b/sec-policy/selinux-networkmanager/selinux-networkmanager-2.20141203-r9.ebuild
new file mode 100644
index 000000000000..208521b01727
--- /dev/null
+++ b/sec-policy/selinux-networkmanager/selinux-networkmanager-2.20141203-r9.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI="5"
+
+IUSE=""
+MODS="networkmanager"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for networkmanager"
+
+if [[ $PV == 9999* ]] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
diff --git a/sec-policy/selinux-nginx/Manifest b/sec-policy/selinux-nginx/Manifest
index 8327a635be01..91d204b0021a 100644
--- a/sec-policy/selinux-nginx/Manifest
+++ b/sec-policy/selinux-nginx/Manifest
@@ -9,5 +9,6 @@ DIST patchbundle-selinux-base-policy-2.20141203-r5.tar.bz2 274136 SHA256 c23d17c
 DIST patchbundle-selinux-base-policy-2.20141203-r6.tar.bz2 293231 SHA256 b686dcc517b97834f66d967afdcc724cb43b5c6dbf9f34043a91cdeda2625cc7 SHA512 a2c486cbe4a1d21ff3fd01bef25ecf5a633a4072646c67cfccf3f7187d95f3d9e3b482a46ba17c55c40a8e7c0dee56e9cf9ddc9f414d3e4511443b62f60d03e9 WHIRLPOOL 3d708e287e3f9b873be647b0327eab6675a8702ee1cffb56e36934cada306e5ccc64397a083dad9e59de37a067e628cacbf896ae99012d5a209e42fd7cd8a4c6
 DIST patchbundle-selinux-base-policy-2.20141203-r7.tar.bz2 295833 SHA256 ba2219b3efc747be65f94c4d8ac3cd6ee530c82c848fa41935a114184678622a SHA512 8e32d9dbfb2f0f3f50200543aadb51ed9834ccd5cdf30bf8e4d9e6d0b645ce44ffaf80f7aa9385e9c9095d9a383b3a348a92356cb5386c06544ab082a9a468c7 WHIRLPOOL 1648ee1be71e45fcf5a264816ce7edc7bab19bd28a68703923eb2d6068f1f0469ae593855231d31f88baecbf29e7cece2d6beeed20b7c04231a6c90e90d35910
 DIST patchbundle-selinux-base-policy-2.20141203-r8.tar.bz2 297919 SHA256 77539eb3d78105f8789cd8205d2698bd27e2abf100163bdd162cda860fd15120 SHA512 2f8a19e1e4bb65f32b480275f49099aed3ae9df543c7de862b3bbd93e81b89cd96dadac3d091e28673d09a6885db8c5656b3a77d0080775c110b04f2753de7a6 WHIRLPOOL 79cb7e620eb8e838192dc557c7a9ce7e713227d783cc8b63792825559b2145cad70d0af6f99948c1527557bc363feffd846c73893682b4a14fc7d08b9e20c649
+DIST patchbundle-selinux-base-policy-2.20141203-r9.tar.bz2 299602 SHA256 e8518004942a6c57170a609683e22b1410c93a2a195829c41dc8fbc703d941b5 SHA512 ce6484fbca1d2d074e50d1a3953392bd3ce0a4617df98fbac37747b469b4f160a9331586dfe1c3ddccb1ccbee24876a2f05ab49e37c8492a48baf83c2d01d140 WHIRLPOOL 1fd7b956e98e95a64c3a713a944d4531259bd156a7feabf6a89c4b5f33ac846377730eede97889e85183be086f282ebd18e860214f6ca3f01b40f2323470ee04
 DIST refpolicy-2.20140311.tar.bz2 664416 SHA256 f69437db95548c78a5dec44c236397146b144153149009ea554d2e536e5436f7 SHA512 50bacee82ed41ac8b8007ecc33bf51d22303cc2ddd27cfb72cb5520dab5f8e255186e34b89cec492c7a2d4220b200814bdede9b46c19f987a3d3d65a1c9b749a WHIRLPOOL e07480beba6ab1f02ad36b7d0c50c4a71cb39a8ec78bf8d1dc3c82bb9dd1d69d9169d7c937165ea15f60ce1147f256d46644f944107a3a8a800d5bad70d4c255
 DIST refpolicy-2.20141203.tar.bz2 680243 SHA256 f438209c430d8a2d4ddcbe4bdd3edb46f6af7dc4913637af0b73c635e40c1522 SHA512 682e4280c5799e4c12ec7594afc1389f67be35055748d2e0dbdc3419159a16c96d4946ca6178daee8370515951f8653b2e452efe8c962b8d7f9bc192f0b15a0c WHIRLPOOL 74bca232534e7af9051bb1ab9f77c1ff6c425781cf4561f781d6e9a40cc5ca0d9add540249ea5493e8782a9372aea296ead6c165c6c440ae1509eb319d151ee5
diff --git a/sec-policy/selinux-nginx/selinux-nginx-2.20141203-r8.ebuild b/sec-policy/selinux-nginx/selinux-nginx-2.20141203-r8.ebuild
index cf66f2d58f52..21d945a7425f 100644
--- a/sec-policy/selinux-nginx/selinux-nginx-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-nginx/selinux-nginx-2.20141203-r8.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="SELinux policy for nginx"
 if [[ $PV == 9999* ]] ; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-apache
diff --git a/sec-policy/selinux-nginx/selinux-nginx-2.20141203-r9.ebuild b/sec-policy/selinux-nginx/selinux-nginx-2.20141203-r9.ebuild
new file mode 100644
index 000000000000..cf66f2d58f52
--- /dev/null
+++ b/sec-policy/selinux-nginx/selinux-nginx-2.20141203-r9.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI="5"
+
+IUSE=""
+MODS="nginx"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for nginx"
+
+if [[ $PV == 9999* ]] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
+DEPEND="${DEPEND}
+	sec-policy/selinux-apache
+"
+RDEPEND="${DEPEND}
+	sec-policy/selinux-apache
+"
diff --git a/sec-policy/selinux-nslcd/Manifest b/sec-policy/selinux-nslcd/Manifest
index 8327a635be01..91d204b0021a 100644
--- a/sec-policy/selinux-nslcd/Manifest
+++ b/sec-policy/selinux-nslcd/Manifest
@@ -9,5 +9,6 @@ DIST patchbundle-selinux-base-policy-2.20141203-r5.tar.bz2 274136 SHA256 c23d17c
 DIST patchbundle-selinux-base-policy-2.20141203-r6.tar.bz2 293231 SHA256 b686dcc517b97834f66d967afdcc724cb43b5c6dbf9f34043a91cdeda2625cc7 SHA512 a2c486cbe4a1d21ff3fd01bef25ecf5a633a4072646c67cfccf3f7187d95f3d9e3b482a46ba17c55c40a8e7c0dee56e9cf9ddc9f414d3e4511443b62f60d03e9 WHIRLPOOL 3d708e287e3f9b873be647b0327eab6675a8702ee1cffb56e36934cada306e5ccc64397a083dad9e59de37a067e628cacbf896ae99012d5a209e42fd7cd8a4c6
 DIST patchbundle-selinux-base-policy-2.20141203-r7.tar.bz2 295833 SHA256 ba2219b3efc747be65f94c4d8ac3cd6ee530c82c848fa41935a114184678622a SHA512 8e32d9dbfb2f0f3f50200543aadb51ed9834ccd5cdf30bf8e4d9e6d0b645ce44ffaf80f7aa9385e9c9095d9a383b3a348a92356cb5386c06544ab082a9a468c7 WHIRLPOOL 1648ee1be71e45fcf5a264816ce7edc7bab19bd28a68703923eb2d6068f1f0469ae593855231d31f88baecbf29e7cece2d6beeed20b7c04231a6c90e90d35910
 DIST patchbundle-selinux-base-policy-2.20141203-r8.tar.bz2 297919 SHA256 77539eb3d78105f8789cd8205d2698bd27e2abf100163bdd162cda860fd15120 SHA512 2f8a19e1e4bb65f32b480275f49099aed3ae9df543c7de862b3bbd93e81b89cd96dadac3d091e28673d09a6885db8c5656b3a77d0080775c110b04f2753de7a6 WHIRLPOOL 79cb7e620eb8e838192dc557c7a9ce7e713227d783cc8b63792825559b2145cad70d0af6f99948c1527557bc363feffd846c73893682b4a14fc7d08b9e20c649
+DIST patchbundle-selinux-base-policy-2.20141203-r9.tar.bz2 299602 SHA256 e8518004942a6c57170a609683e22b1410c93a2a195829c41dc8fbc703d941b5 SHA512 ce6484fbca1d2d074e50d1a3953392bd3ce0a4617df98fbac37747b469b4f160a9331586dfe1c3ddccb1ccbee24876a2f05ab49e37c8492a48baf83c2d01d140 WHIRLPOOL 1fd7b956e98e95a64c3a713a944d4531259bd156a7feabf6a89c4b5f33ac846377730eede97889e85183be086f282ebd18e860214f6ca3f01b40f2323470ee04
 DIST refpolicy-2.20140311.tar.bz2 664416 SHA256 f69437db95548c78a5dec44c236397146b144153149009ea554d2e536e5436f7 SHA512 50bacee82ed41ac8b8007ecc33bf51d22303cc2ddd27cfb72cb5520dab5f8e255186e34b89cec492c7a2d4220b200814bdede9b46c19f987a3d3d65a1c9b749a WHIRLPOOL e07480beba6ab1f02ad36b7d0c50c4a71cb39a8ec78bf8d1dc3c82bb9dd1d69d9169d7c937165ea15f60ce1147f256d46644f944107a3a8a800d5bad70d4c255
 DIST refpolicy-2.20141203.tar.bz2 680243 SHA256 f438209c430d8a2d4ddcbe4bdd3edb46f6af7dc4913637af0b73c635e40c1522 SHA512 682e4280c5799e4c12ec7594afc1389f67be35055748d2e0dbdc3419159a16c96d4946ca6178daee8370515951f8653b2e452efe8c962b8d7f9bc192f0b15a0c WHIRLPOOL 74bca232534e7af9051bb1ab9f77c1ff6c425781cf4561f781d6e9a40cc5ca0d9add540249ea5493e8782a9372aea296ead6c165c6c440ae1509eb319d151ee5
diff --git a/sec-policy/selinux-nslcd/selinux-nslcd-2.20141203-r8.ebuild b/sec-policy/selinux-nslcd/selinux-nslcd-2.20141203-r8.ebuild
index 237b8c92e649..4dab8df1b170 100644
--- a/sec-policy/selinux-nslcd/selinux-nslcd-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-nslcd/selinux-nslcd-2.20141203-r8.ebuild
@@ -13,5 +13,5 @@ DESCRIPTION="SELinux policy for nslcd"
 if [[ $PV == 9999* ]] ; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-nslcd/selinux-nslcd-2.20141203-r9.ebuild b/sec-policy/selinux-nslcd/selinux-nslcd-2.20141203-r9.ebuild
new file mode 100644
index 000000000000..237b8c92e649
--- /dev/null
+++ b/sec-policy/selinux-nslcd/selinux-nslcd-2.20141203-r9.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI="5"
+
+IUSE=""
+MODS="nslcd"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for nslcd"
+
+if [[ $PV == 9999* ]] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
diff --git a/sec-policy/selinux-ntop/Manifest b/sec-policy/selinux-ntop/Manifest
index 8327a635be01..91d204b0021a 100644
--- a/sec-policy/selinux-ntop/Manifest
+++ b/sec-policy/selinux-ntop/Manifest
@@ -9,5 +9,6 @@ DIST patchbundle-selinux-base-policy-2.20141203-r5.tar.bz2 274136 SHA256 c23d17c
 DIST patchbundle-selinux-base-policy-2.20141203-r6.tar.bz2 293231 SHA256 b686dcc517b97834f66d967afdcc724cb43b5c6dbf9f34043a91cdeda2625cc7 SHA512 a2c486cbe4a1d21ff3fd01bef25ecf5a633a4072646c67cfccf3f7187d95f3d9e3b482a46ba17c55c40a8e7c0dee56e9cf9ddc9f414d3e4511443b62f60d03e9 WHIRLPOOL 3d708e287e3f9b873be647b0327eab6675a8702ee1cffb56e36934cada306e5ccc64397a083dad9e59de37a067e628cacbf896ae99012d5a209e42fd7cd8a4c6
 DIST patchbundle-selinux-base-policy-2.20141203-r7.tar.bz2 295833 SHA256 ba2219b3efc747be65f94c4d8ac3cd6ee530c82c848fa41935a114184678622a SHA512 8e32d9dbfb2f0f3f50200543aadb51ed9834ccd5cdf30bf8e4d9e6d0b645ce44ffaf80f7aa9385e9c9095d9a383b3a348a92356cb5386c06544ab082a9a468c7 WHIRLPOOL 1648ee1be71e45fcf5a264816ce7edc7bab19bd28a68703923eb2d6068f1f0469ae593855231d31f88baecbf29e7cece2d6beeed20b7c04231a6c90e90d35910
 DIST patchbundle-selinux-base-policy-2.20141203-r8.tar.bz2 297919 SHA256 77539eb3d78105f8789cd8205d2698bd27e2abf100163bdd162cda860fd15120 SHA512 2f8a19e1e4bb65f32b480275f49099aed3ae9df543c7de862b3bbd93e81b89cd96dadac3d091e28673d09a6885db8c5656b3a77d0080775c110b04f2753de7a6 WHIRLPOOL 79cb7e620eb8e838192dc557c7a9ce7e713227d783cc8b63792825559b2145cad70d0af6f99948c1527557bc363feffd846c73893682b4a14fc7d08b9e20c649
+DIST patchbundle-selinux-base-policy-2.20141203-r9.tar.bz2 299602 SHA256 e8518004942a6c57170a609683e22b1410c93a2a195829c41dc8fbc703d941b5 SHA512 ce6484fbca1d2d074e50d1a3953392bd3ce0a4617df98fbac37747b469b4f160a9331586dfe1c3ddccb1ccbee24876a2f05ab49e37c8492a48baf83c2d01d140 WHIRLPOOL 1fd7b956e98e95a64c3a713a944d4531259bd156a7feabf6a89c4b5f33ac846377730eede97889e85183be086f282ebd18e860214f6ca3f01b40f2323470ee04
 DIST refpolicy-2.20140311.tar.bz2 664416 SHA256 f69437db95548c78a5dec44c236397146b144153149009ea554d2e536e5436f7 SHA512 50bacee82ed41ac8b8007ecc33bf51d22303cc2ddd27cfb72cb5520dab5f8e255186e34b89cec492c7a2d4220b200814bdede9b46c19f987a3d3d65a1c9b749a WHIRLPOOL e07480beba6ab1f02ad36b7d0c50c4a71cb39a8ec78bf8d1dc3c82bb9dd1d69d9169d7c937165ea15f60ce1147f256d46644f944107a3a8a800d5bad70d4c255
 DIST refpolicy-2.20141203.tar.bz2 680243 SHA256 f438209c430d8a2d4ddcbe4bdd3edb46f6af7dc4913637af0b73c635e40c1522 SHA512 682e4280c5799e4c12ec7594afc1389f67be35055748d2e0dbdc3419159a16c96d4946ca6178daee8370515951f8653b2e452efe8c962b8d7f9bc192f0b15a0c WHIRLPOOL 74bca232534e7af9051bb1ab9f77c1ff6c425781cf4561f781d6e9a40cc5ca0d9add540249ea5493e8782a9372aea296ead6c165c6c440ae1509eb319d151ee5
diff --git a/sec-policy/selinux-ntop/selinux-ntop-2.20141203-r8.ebuild b/sec-policy/selinux-ntop/selinux-ntop-2.20141203-r8.ebuild
index 47d2d0030507..5652fa2e1f6c 100644
--- a/sec-policy/selinux-ntop/selinux-ntop-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-ntop/selinux-ntop-2.20141203-r8.ebuild
@@ -13,5 +13,5 @@ DESCRIPTION="SELinux policy for ntop"
 if [[ $PV == 9999* ]] ; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-ntop/selinux-ntop-2.20141203-r9.ebuild b/sec-policy/selinux-ntop/selinux-ntop-2.20141203-r9.ebuild
new file mode 100644
index 000000000000..47d2d0030507
--- /dev/null
+++ b/sec-policy/selinux-ntop/selinux-ntop-2.20141203-r9.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI="5"
+
+IUSE=""
+MODS="ntop"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for ntop"
+
+if [[ $PV == 9999* ]] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
diff --git a/sec-policy/selinux-ntp/Manifest b/sec-policy/selinux-ntp/Manifest
index 8327a635be01..91d204b0021a 100644
--- a/sec-policy/selinux-ntp/Manifest
+++ b/sec-policy/selinux-ntp/Manifest
@@ -9,5 +9,6 @@ DIST patchbundle-selinux-base-policy-2.20141203-r5.tar.bz2 274136 SHA256 c23d17c
 DIST patchbundle-selinux-base-policy-2.20141203-r6.tar.bz2 293231 SHA256 b686dcc517b97834f66d967afdcc724cb43b5c6dbf9f34043a91cdeda2625cc7 SHA512 a2c486cbe4a1d21ff3fd01bef25ecf5a633a4072646c67cfccf3f7187d95f3d9e3b482a46ba17c55c40a8e7c0dee56e9cf9ddc9f414d3e4511443b62f60d03e9 WHIRLPOOL 3d708e287e3f9b873be647b0327eab6675a8702ee1cffb56e36934cada306e5ccc64397a083dad9e59de37a067e628cacbf896ae99012d5a209e42fd7cd8a4c6
 DIST patchbundle-selinux-base-policy-2.20141203-r7.tar.bz2 295833 SHA256 ba2219b3efc747be65f94c4d8ac3cd6ee530c82c848fa41935a114184678622a SHA512 8e32d9dbfb2f0f3f50200543aadb51ed9834ccd5cdf30bf8e4d9e6d0b645ce44ffaf80f7aa9385e9c9095d9a383b3a348a92356cb5386c06544ab082a9a468c7 WHIRLPOOL 1648ee1be71e45fcf5a264816ce7edc7bab19bd28a68703923eb2d6068f1f0469ae593855231d31f88baecbf29e7cece2d6beeed20b7c04231a6c90e90d35910
 DIST patchbundle-selinux-base-policy-2.20141203-r8.tar.bz2 297919 SHA256 77539eb3d78105f8789cd8205d2698bd27e2abf100163bdd162cda860fd15120 SHA512 2f8a19e1e4bb65f32b480275f49099aed3ae9df543c7de862b3bbd93e81b89cd96dadac3d091e28673d09a6885db8c5656b3a77d0080775c110b04f2753de7a6 WHIRLPOOL 79cb7e620eb8e838192dc557c7a9ce7e713227d783cc8b63792825559b2145cad70d0af6f99948c1527557bc363feffd846c73893682b4a14fc7d08b9e20c649
+DIST patchbundle-selinux-base-policy-2.20141203-r9.tar.bz2 299602 SHA256 e8518004942a6c57170a609683e22b1410c93a2a195829c41dc8fbc703d941b5 SHA512 ce6484fbca1d2d074e50d1a3953392bd3ce0a4617df98fbac37747b469b4f160a9331586dfe1c3ddccb1ccbee24876a2f05ab49e37c8492a48baf83c2d01d140 WHIRLPOOL 1fd7b956e98e95a64c3a713a944d4531259bd156a7feabf6a89c4b5f33ac846377730eede97889e85183be086f282ebd18e860214f6ca3f01b40f2323470ee04
 DIST refpolicy-2.20140311.tar.bz2 664416 SHA256 f69437db95548c78a5dec44c236397146b144153149009ea554d2e536e5436f7 SHA512 50bacee82ed41ac8b8007ecc33bf51d22303cc2ddd27cfb72cb5520dab5f8e255186e34b89cec492c7a2d4220b200814bdede9b46c19f987a3d3d65a1c9b749a WHIRLPOOL e07480beba6ab1f02ad36b7d0c50c4a71cb39a8ec78bf8d1dc3c82bb9dd1d69d9169d7c937165ea15f60ce1147f256d46644f944107a3a8a800d5bad70d4c255
 DIST refpolicy-2.20141203.tar.bz2 680243 SHA256 f438209c430d8a2d4ddcbe4bdd3edb46f6af7dc4913637af0b73c635e40c1522 SHA512 682e4280c5799e4c12ec7594afc1389f67be35055748d2e0dbdc3419159a16c96d4946ca6178daee8370515951f8653b2e452efe8c962b8d7f9bc192f0b15a0c WHIRLPOOL 74bca232534e7af9051bb1ab9f77c1ff6c425781cf4561f781d6e9a40cc5ca0d9add540249ea5493e8782a9372aea296ead6c165c6c440ae1509eb319d151ee5
diff --git a/sec-policy/selinux-ntp/selinux-ntp-2.20141203-r8.ebuild b/sec-policy/selinux-ntp/selinux-ntp-2.20141203-r8.ebuild
index d9aa753e05e2..f6fb8c1db85d 100644
--- a/sec-policy/selinux-ntp/selinux-ntp-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-ntp/selinux-ntp-2.20141203-r8.ebuild
@@ -13,5 +13,5 @@ DESCRIPTION="SELinux policy for ntp"
 if [[ $PV == 9999* ]] ; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-ntp/selinux-ntp-2.20141203-r9.ebuild b/sec-policy/selinux-ntp/selinux-ntp-2.20141203-r9.ebuild
new file mode 100644
index 000000000000..d9aa753e05e2
--- /dev/null
+++ b/sec-policy/selinux-ntp/selinux-ntp-2.20141203-r9.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI="5"
+
+IUSE=""
+MODS="ntp"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for ntp"
+
+if [[ $PV == 9999* ]] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
diff --git a/sec-policy/selinux-nut/Manifest b/sec-policy/selinux-nut/Manifest
index 8327a635be01..91d204b0021a 100644
--- a/sec-policy/selinux-nut/Manifest
+++ b/sec-policy/selinux-nut/Manifest
@@ -9,5 +9,6 @@ DIST patchbundle-selinux-base-policy-2.20141203-r5.tar.bz2 274136 SHA256 c23d17c
 DIST patchbundle-selinux-base-policy-2.20141203-r6.tar.bz2 293231 SHA256 b686dcc517b97834f66d967afdcc724cb43b5c6dbf9f34043a91cdeda2625cc7 SHA512 a2c486cbe4a1d21ff3fd01bef25ecf5a633a4072646c67cfccf3f7187d95f3d9e3b482a46ba17c55c40a8e7c0dee56e9cf9ddc9f414d3e4511443b62f60d03e9 WHIRLPOOL 3d708e287e3f9b873be647b0327eab6675a8702ee1cffb56e36934cada306e5ccc64397a083dad9e59de37a067e628cacbf896ae99012d5a209e42fd7cd8a4c6
 DIST patchbundle-selinux-base-policy-2.20141203-r7.tar.bz2 295833 SHA256 ba2219b3efc747be65f94c4d8ac3cd6ee530c82c848fa41935a114184678622a SHA512 8e32d9dbfb2f0f3f50200543aadb51ed9834ccd5cdf30bf8e4d9e6d0b645ce44ffaf80f7aa9385e9c9095d9a383b3a348a92356cb5386c06544ab082a9a468c7 WHIRLPOOL 1648ee1be71e45fcf5a264816ce7edc7bab19bd28a68703923eb2d6068f1f0469ae593855231d31f88baecbf29e7cece2d6beeed20b7c04231a6c90e90d35910
 DIST patchbundle-selinux-base-policy-2.20141203-r8.tar.bz2 297919 SHA256 77539eb3d78105f8789cd8205d2698bd27e2abf100163bdd162cda860fd15120 SHA512 2f8a19e1e4bb65f32b480275f49099aed3ae9df543c7de862b3bbd93e81b89cd96dadac3d091e28673d09a6885db8c5656b3a77d0080775c110b04f2753de7a6 WHIRLPOOL 79cb7e620eb8e838192dc557c7a9ce7e713227d783cc8b63792825559b2145cad70d0af6f99948c1527557bc363feffd846c73893682b4a14fc7d08b9e20c649
+DIST patchbundle-selinux-base-policy-2.20141203-r9.tar.bz2 299602 SHA256 e8518004942a6c57170a609683e22b1410c93a2a195829c41dc8fbc703d941b5 SHA512 ce6484fbca1d2d074e50d1a3953392bd3ce0a4617df98fbac37747b469b4f160a9331586dfe1c3ddccb1ccbee24876a2f05ab49e37c8492a48baf83c2d01d140 WHIRLPOOL 1fd7b956e98e95a64c3a713a944d4531259bd156a7feabf6a89c4b5f33ac846377730eede97889e85183be086f282ebd18e860214f6ca3f01b40f2323470ee04
 DIST refpolicy-2.20140311.tar.bz2 664416 SHA256 f69437db95548c78a5dec44c236397146b144153149009ea554d2e536e5436f7 SHA512 50bacee82ed41ac8b8007ecc33bf51d22303cc2ddd27cfb72cb5520dab5f8e255186e34b89cec492c7a2d4220b200814bdede9b46c19f987a3d3d65a1c9b749a WHIRLPOOL e07480beba6ab1f02ad36b7d0c50c4a71cb39a8ec78bf8d1dc3c82bb9dd1d69d9169d7c937165ea15f60ce1147f256d46644f944107a3a8a800d5bad70d4c255
 DIST refpolicy-2.20141203.tar.bz2 680243 SHA256 f438209c430d8a2d4ddcbe4bdd3edb46f6af7dc4913637af0b73c635e40c1522 SHA512 682e4280c5799e4c12ec7594afc1389f67be35055748d2e0dbdc3419159a16c96d4946ca6178daee8370515951f8653b2e452efe8c962b8d7f9bc192f0b15a0c WHIRLPOOL 74bca232534e7af9051bb1ab9f77c1ff6c425781cf4561f781d6e9a40cc5ca0d9add540249ea5493e8782a9372aea296ead6c165c6c440ae1509eb319d151ee5
diff --git a/sec-policy/selinux-nut/selinux-nut-2.20141203-r8.ebuild b/sec-policy/selinux-nut/selinux-nut-2.20141203-r8.ebuild
index c5a5fc04fd3a..15a47507c0f4 100644
--- a/sec-policy/selinux-nut/selinux-nut-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-nut/selinux-nut-2.20141203-r8.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="SELinux policy for nut"
 if [[ $PV == 9999* ]] ; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-apache
diff --git a/sec-policy/selinux-nut/selinux-nut-2.20141203-r9.ebuild b/sec-policy/selinux-nut/selinux-nut-2.20141203-r9.ebuild
new file mode 100644
index 000000000000..c5a5fc04fd3a
--- /dev/null
+++ b/sec-policy/selinux-nut/selinux-nut-2.20141203-r9.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI="5"
+
+IUSE=""
+MODS="nut"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for nut"
+
+if [[ $PV == 9999* ]] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
+DEPEND="${DEPEND}
+	sec-policy/selinux-apache
+"
+RDEPEND="${RDEPEND}
+	sec-policy/selinux-apache
+"
diff --git a/sec-policy/selinux-nx/Manifest b/sec-policy/selinux-nx/Manifest
index 8327a635be01..91d204b0021a 100644
--- a/sec-policy/selinux-nx/Manifest
+++ b/sec-policy/selinux-nx/Manifest
@@ -9,5 +9,6 @@ DIST patchbundle-selinux-base-policy-2.20141203-r5.tar.bz2 274136 SHA256 c23d17c
 DIST patchbundle-selinux-base-policy-2.20141203-r6.tar.bz2 293231 SHA256 b686dcc517b97834f66d967afdcc724cb43b5c6dbf9f34043a91cdeda2625cc7 SHA512 a2c486cbe4a1d21ff3fd01bef25ecf5a633a4072646c67cfccf3f7187d95f3d9e3b482a46ba17c55c40a8e7c0dee56e9cf9ddc9f414d3e4511443b62f60d03e9 WHIRLPOOL 3d708e287e3f9b873be647b0327eab6675a8702ee1cffb56e36934cada306e5ccc64397a083dad9e59de37a067e628cacbf896ae99012d5a209e42fd7cd8a4c6
 DIST patchbundle-selinux-base-policy-2.20141203-r7.tar.bz2 295833 SHA256 ba2219b3efc747be65f94c4d8ac3cd6ee530c82c848fa41935a114184678622a SHA512 8e32d9dbfb2f0f3f50200543aadb51ed9834ccd5cdf30bf8e4d9e6d0b645ce44ffaf80f7aa9385e9c9095d9a383b3a348a92356cb5386c06544ab082a9a468c7 WHIRLPOOL 1648ee1be71e45fcf5a264816ce7edc7bab19bd28a68703923eb2d6068f1f0469ae593855231d31f88baecbf29e7cece2d6beeed20b7c04231a6c90e90d35910
 DIST patchbundle-selinux-base-policy-2.20141203-r8.tar.bz2 297919 SHA256 77539eb3d78105f8789cd8205d2698bd27e2abf100163bdd162cda860fd15120 SHA512 2f8a19e1e4bb65f32b480275f49099aed3ae9df543c7de862b3bbd93e81b89cd96dadac3d091e28673d09a6885db8c5656b3a77d0080775c110b04f2753de7a6 WHIRLPOOL 79cb7e620eb8e838192dc557c7a9ce7e713227d783cc8b63792825559b2145cad70d0af6f99948c1527557bc363feffd846c73893682b4a14fc7d08b9e20c649
+DIST patchbundle-selinux-base-policy-2.20141203-r9.tar.bz2 299602 SHA256 e8518004942a6c57170a609683e22b1410c93a2a195829c41dc8fbc703d941b5 SHA512 ce6484fbca1d2d074e50d1a3953392bd3ce0a4617df98fbac37747b469b4f160a9331586dfe1c3ddccb1ccbee24876a2f05ab49e37c8492a48baf83c2d01d140 WHIRLPOOL 1fd7b956e98e95a64c3a713a944d4531259bd156a7feabf6a89c4b5f33ac846377730eede97889e85183be086f282ebd18e860214f6ca3f01b40f2323470ee04
 DIST refpolicy-2.20140311.tar.bz2 664416 SHA256 f69437db95548c78a5dec44c236397146b144153149009ea554d2e536e5436f7 SHA512 50bacee82ed41ac8b8007ecc33bf51d22303cc2ddd27cfb72cb5520dab5f8e255186e34b89cec492c7a2d4220b200814bdede9b46c19f987a3d3d65a1c9b749a WHIRLPOOL e07480beba6ab1f02ad36b7d0c50c4a71cb39a8ec78bf8d1dc3c82bb9dd1d69d9169d7c937165ea15f60ce1147f256d46644f944107a3a8a800d5bad70d4c255
 DIST refpolicy-2.20141203.tar.bz2 680243 SHA256 f438209c430d8a2d4ddcbe4bdd3edb46f6af7dc4913637af0b73c635e40c1522 SHA512 682e4280c5799e4c12ec7594afc1389f67be35055748d2e0dbdc3419159a16c96d4946ca6178daee8370515951f8653b2e452efe8c962b8d7f9bc192f0b15a0c WHIRLPOOL 74bca232534e7af9051bb1ab9f77c1ff6c425781cf4561f781d6e9a40cc5ca0d9add540249ea5493e8782a9372aea296ead6c165c6c440ae1509eb319d151ee5
diff --git a/sec-policy/selinux-nx/selinux-nx-2.20141203-r8.ebuild b/sec-policy/selinux-nx/selinux-nx-2.20141203-r8.ebuild
index c6e57d5ebf09..ed7ccad1f872 100644
--- a/sec-policy/selinux-nx/selinux-nx-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-nx/selinux-nx-2.20141203-r8.ebuild
@@ -13,5 +13,5 @@ DESCRIPTION="SELinux policy for nx"
 if [[ $PV == 9999* ]] ; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-nx/selinux-nx-2.20141203-r9.ebuild b/sec-policy/selinux-nx/selinux-nx-2.20141203-r9.ebuild
new file mode 100644
index 000000000000..c6e57d5ebf09
--- /dev/null
+++ b/sec-policy/selinux-nx/selinux-nx-2.20141203-r9.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI="5"
+
+IUSE=""
+MODS="nx"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for nx"
+
+if [[ $PV == 9999* ]] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
diff --git a/sec-policy/selinux-oddjob/Manifest b/sec-policy/selinux-oddjob/Manifest
index 8327a635be01..91d204b0021a 100644
--- a/sec-policy/selinux-oddjob/Manifest
+++ b/sec-policy/selinux-oddjob/Manifest
@@ -9,5 +9,6 @@ DIST patchbundle-selinux-base-policy-2.20141203-r5.tar.bz2 274136 SHA256 c23d17c
 DIST patchbundle-selinux-base-policy-2.20141203-r6.tar.bz2 293231 SHA256 b686dcc517b97834f66d967afdcc724cb43b5c6dbf9f34043a91cdeda2625cc7 SHA512 a2c486cbe4a1d21ff3fd01bef25ecf5a633a4072646c67cfccf3f7187d95f3d9e3b482a46ba17c55c40a8e7c0dee56e9cf9ddc9f414d3e4511443b62f60d03e9 WHIRLPOOL 3d708e287e3f9b873be647b0327eab6675a8702ee1cffb56e36934cada306e5ccc64397a083dad9e59de37a067e628cacbf896ae99012d5a209e42fd7cd8a4c6
 DIST patchbundle-selinux-base-policy-2.20141203-r7.tar.bz2 295833 SHA256 ba2219b3efc747be65f94c4d8ac3cd6ee530c82c848fa41935a114184678622a SHA512 8e32d9dbfb2f0f3f50200543aadb51ed9834ccd5cdf30bf8e4d9e6d0b645ce44ffaf80f7aa9385e9c9095d9a383b3a348a92356cb5386c06544ab082a9a468c7 WHIRLPOOL 1648ee1be71e45fcf5a264816ce7edc7bab19bd28a68703923eb2d6068f1f0469ae593855231d31f88baecbf29e7cece2d6beeed20b7c04231a6c90e90d35910
 DIST patchbundle-selinux-base-policy-2.20141203-r8.tar.bz2 297919 SHA256 77539eb3d78105f8789cd8205d2698bd27e2abf100163bdd162cda860fd15120 SHA512 2f8a19e1e4bb65f32b480275f49099aed3ae9df543c7de862b3bbd93e81b89cd96dadac3d091e28673d09a6885db8c5656b3a77d0080775c110b04f2753de7a6 WHIRLPOOL 79cb7e620eb8e838192dc557c7a9ce7e713227d783cc8b63792825559b2145cad70d0af6f99948c1527557bc363feffd846c73893682b4a14fc7d08b9e20c649
+DIST patchbundle-selinux-base-policy-2.20141203-r9.tar.bz2 299602 SHA256 e8518004942a6c57170a609683e22b1410c93a2a195829c41dc8fbc703d941b5 SHA512 ce6484fbca1d2d074e50d1a3953392bd3ce0a4617df98fbac37747b469b4f160a9331586dfe1c3ddccb1ccbee24876a2f05ab49e37c8492a48baf83c2d01d140 WHIRLPOOL 1fd7b956e98e95a64c3a713a944d4531259bd156a7feabf6a89c4b5f33ac846377730eede97889e85183be086f282ebd18e860214f6ca3f01b40f2323470ee04
 DIST refpolicy-2.20140311.tar.bz2 664416 SHA256 f69437db95548c78a5dec44c236397146b144153149009ea554d2e536e5436f7 SHA512 50bacee82ed41ac8b8007ecc33bf51d22303cc2ddd27cfb72cb5520dab5f8e255186e34b89cec492c7a2d4220b200814bdede9b46c19f987a3d3d65a1c9b749a WHIRLPOOL e07480beba6ab1f02ad36b7d0c50c4a71cb39a8ec78bf8d1dc3c82bb9dd1d69d9169d7c937165ea15f60ce1147f256d46644f944107a3a8a800d5bad70d4c255
 DIST refpolicy-2.20141203.tar.bz2 680243 SHA256 f438209c430d8a2d4ddcbe4bdd3edb46f6af7dc4913637af0b73c635e40c1522 SHA512 682e4280c5799e4c12ec7594afc1389f67be35055748d2e0dbdc3419159a16c96d4946ca6178daee8370515951f8653b2e452efe8c962b8d7f9bc192f0b15a0c WHIRLPOOL 74bca232534e7af9051bb1ab9f77c1ff6c425781cf4561f781d6e9a40cc5ca0d9add540249ea5493e8782a9372aea296ead6c165c6c440ae1509eb319d151ee5
diff --git a/sec-policy/selinux-oddjob/selinux-oddjob-2.20141203-r8.ebuild b/sec-policy/selinux-oddjob/selinux-oddjob-2.20141203-r8.ebuild
index 543de6d401e4..20e7796355ee 100644
--- a/sec-policy/selinux-oddjob/selinux-oddjob-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-oddjob/selinux-oddjob-2.20141203-r8.ebuild
@@ -13,5 +13,5 @@ DESCRIPTION="SELinux policy for oddjob"
 if [[ $PV == 9999* ]] ; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-oddjob/selinux-oddjob-2.20141203-r9.ebuild b/sec-policy/selinux-oddjob/selinux-oddjob-2.20141203-r9.ebuild
new file mode 100644
index 000000000000..543de6d401e4
--- /dev/null
+++ b/sec-policy/selinux-oddjob/selinux-oddjob-2.20141203-r9.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI="5"
+
+IUSE=""
+MODS="oddjob"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for oddjob"
+
+if [[ $PV == 9999* ]] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
diff --git a/sec-policy/selinux-oident/Manifest b/sec-policy/selinux-oident/Manifest
index 8327a635be01..91d204b0021a 100644
--- a/sec-policy/selinux-oident/Manifest
+++ b/sec-policy/selinux-oident/Manifest
@@ -9,5 +9,6 @@ DIST patchbundle-selinux-base-policy-2.20141203-r5.tar.bz2 274136 SHA256 c23d17c
 DIST patchbundle-selinux-base-policy-2.20141203-r6.tar.bz2 293231 SHA256 b686dcc517b97834f66d967afdcc724cb43b5c6dbf9f34043a91cdeda2625cc7 SHA512 a2c486cbe4a1d21ff3fd01bef25ecf5a633a4072646c67cfccf3f7187d95f3d9e3b482a46ba17c55c40a8e7c0dee56e9cf9ddc9f414d3e4511443b62f60d03e9 WHIRLPOOL 3d708e287e3f9b873be647b0327eab6675a8702ee1cffb56e36934cada306e5ccc64397a083dad9e59de37a067e628cacbf896ae99012d5a209e42fd7cd8a4c6
 DIST patchbundle-selinux-base-policy-2.20141203-r7.tar.bz2 295833 SHA256 ba2219b3efc747be65f94c4d8ac3cd6ee530c82c848fa41935a114184678622a SHA512 8e32d9dbfb2f0f3f50200543aadb51ed9834ccd5cdf30bf8e4d9e6d0b645ce44ffaf80f7aa9385e9c9095d9a383b3a348a92356cb5386c06544ab082a9a468c7 WHIRLPOOL 1648ee1be71e45fcf5a264816ce7edc7bab19bd28a68703923eb2d6068f1f0469ae593855231d31f88baecbf29e7cece2d6beeed20b7c04231a6c90e90d35910
 DIST patchbundle-selinux-base-policy-2.20141203-r8.tar.bz2 297919 SHA256 77539eb3d78105f8789cd8205d2698bd27e2abf100163bdd162cda860fd15120 SHA512 2f8a19e1e4bb65f32b480275f49099aed3ae9df543c7de862b3bbd93e81b89cd96dadac3d091e28673d09a6885db8c5656b3a77d0080775c110b04f2753de7a6 WHIRLPOOL 79cb7e620eb8e838192dc557c7a9ce7e713227d783cc8b63792825559b2145cad70d0af6f99948c1527557bc363feffd846c73893682b4a14fc7d08b9e20c649
+DIST patchbundle-selinux-base-policy-2.20141203-r9.tar.bz2 299602 SHA256 e8518004942a6c57170a609683e22b1410c93a2a195829c41dc8fbc703d941b5 SHA512 ce6484fbca1d2d074e50d1a3953392bd3ce0a4617df98fbac37747b469b4f160a9331586dfe1c3ddccb1ccbee24876a2f05ab49e37c8492a48baf83c2d01d140 WHIRLPOOL 1fd7b956e98e95a64c3a713a944d4531259bd156a7feabf6a89c4b5f33ac846377730eede97889e85183be086f282ebd18e860214f6ca3f01b40f2323470ee04
 DIST refpolicy-2.20140311.tar.bz2 664416 SHA256 f69437db95548c78a5dec44c236397146b144153149009ea554d2e536e5436f7 SHA512 50bacee82ed41ac8b8007ecc33bf51d22303cc2ddd27cfb72cb5520dab5f8e255186e34b89cec492c7a2d4220b200814bdede9b46c19f987a3d3d65a1c9b749a WHIRLPOOL e07480beba6ab1f02ad36b7d0c50c4a71cb39a8ec78bf8d1dc3c82bb9dd1d69d9169d7c937165ea15f60ce1147f256d46644f944107a3a8a800d5bad70d4c255
 DIST refpolicy-2.20141203.tar.bz2 680243 SHA256 f438209c430d8a2d4ddcbe4bdd3edb46f6af7dc4913637af0b73c635e40c1522 SHA512 682e4280c5799e4c12ec7594afc1389f67be35055748d2e0dbdc3419159a16c96d4946ca6178daee8370515951f8653b2e452efe8c962b8d7f9bc192f0b15a0c WHIRLPOOL 74bca232534e7af9051bb1ab9f77c1ff6c425781cf4561f781d6e9a40cc5ca0d9add540249ea5493e8782a9372aea296ead6c165c6c440ae1509eb319d151ee5
diff --git a/sec-policy/selinux-oident/selinux-oident-2.20141203-r8.ebuild b/sec-policy/selinux-oident/selinux-oident-2.20141203-r8.ebuild
index f9a8bfd2b0e4..a6665c0a4356 100644
--- a/sec-policy/selinux-oident/selinux-oident-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-oident/selinux-oident-2.20141203-r8.ebuild
@@ -13,5 +13,5 @@ DESCRIPTION="SELinux policy for oident"
 if [[ $PV == 9999* ]] ; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-oident/selinux-oident-2.20141203-r9.ebuild b/sec-policy/selinux-oident/selinux-oident-2.20141203-r9.ebuild
new file mode 100644
index 000000000000..f9a8bfd2b0e4
--- /dev/null
+++ b/sec-policy/selinux-oident/selinux-oident-2.20141203-r9.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI="5"
+
+IUSE=""
+MODS="oident"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for oident"
+
+if [[ $PV == 9999* ]] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
diff --git a/sec-policy/selinux-openct/Manifest b/sec-policy/selinux-openct/Manifest
index 8327a635be01..91d204b0021a 100644
--- a/sec-policy/selinux-openct/Manifest
+++ b/sec-policy/selinux-openct/Manifest
@@ -9,5 +9,6 @@ DIST patchbundle-selinux-base-policy-2.20141203-r5.tar.bz2 274136 SHA256 c23d17c
 DIST patchbundle-selinux-base-policy-2.20141203-r6.tar.bz2 293231 SHA256 b686dcc517b97834f66d967afdcc724cb43b5c6dbf9f34043a91cdeda2625cc7 SHA512 a2c486cbe4a1d21ff3fd01bef25ecf5a633a4072646c67cfccf3f7187d95f3d9e3b482a46ba17c55c40a8e7c0dee56e9cf9ddc9f414d3e4511443b62f60d03e9 WHIRLPOOL 3d708e287e3f9b873be647b0327eab6675a8702ee1cffb56e36934cada306e5ccc64397a083dad9e59de37a067e628cacbf896ae99012d5a209e42fd7cd8a4c6
 DIST patchbundle-selinux-base-policy-2.20141203-r7.tar.bz2 295833 SHA256 ba2219b3efc747be65f94c4d8ac3cd6ee530c82c848fa41935a114184678622a SHA512 8e32d9dbfb2f0f3f50200543aadb51ed9834ccd5cdf30bf8e4d9e6d0b645ce44ffaf80f7aa9385e9c9095d9a383b3a348a92356cb5386c06544ab082a9a468c7 WHIRLPOOL 1648ee1be71e45fcf5a264816ce7edc7bab19bd28a68703923eb2d6068f1f0469ae593855231d31f88baecbf29e7cece2d6beeed20b7c04231a6c90e90d35910
 DIST patchbundle-selinux-base-policy-2.20141203-r8.tar.bz2 297919 SHA256 77539eb3d78105f8789cd8205d2698bd27e2abf100163bdd162cda860fd15120 SHA512 2f8a19e1e4bb65f32b480275f49099aed3ae9df543c7de862b3bbd93e81b89cd96dadac3d091e28673d09a6885db8c5656b3a77d0080775c110b04f2753de7a6 WHIRLPOOL 79cb7e620eb8e838192dc557c7a9ce7e713227d783cc8b63792825559b2145cad70d0af6f99948c1527557bc363feffd846c73893682b4a14fc7d08b9e20c649
+DIST patchbundle-selinux-base-policy-2.20141203-r9.tar.bz2 299602 SHA256 e8518004942a6c57170a609683e22b1410c93a2a195829c41dc8fbc703d941b5 SHA512 ce6484fbca1d2d074e50d1a3953392bd3ce0a4617df98fbac37747b469b4f160a9331586dfe1c3ddccb1ccbee24876a2f05ab49e37c8492a48baf83c2d01d140 WHIRLPOOL 1fd7b956e98e95a64c3a713a944d4531259bd156a7feabf6a89c4b5f33ac846377730eede97889e85183be086f282ebd18e860214f6ca3f01b40f2323470ee04
 DIST refpolicy-2.20140311.tar.bz2 664416 SHA256 f69437db95548c78a5dec44c236397146b144153149009ea554d2e536e5436f7 SHA512 50bacee82ed41ac8b8007ecc33bf51d22303cc2ddd27cfb72cb5520dab5f8e255186e34b89cec492c7a2d4220b200814bdede9b46c19f987a3d3d65a1c9b749a WHIRLPOOL e07480beba6ab1f02ad36b7d0c50c4a71cb39a8ec78bf8d1dc3c82bb9dd1d69d9169d7c937165ea15f60ce1147f256d46644f944107a3a8a800d5bad70d4c255
 DIST refpolicy-2.20141203.tar.bz2 680243 SHA256 f438209c430d8a2d4ddcbe4bdd3edb46f6af7dc4913637af0b73c635e40c1522 SHA512 682e4280c5799e4c12ec7594afc1389f67be35055748d2e0dbdc3419159a16c96d4946ca6178daee8370515951f8653b2e452efe8c962b8d7f9bc192f0b15a0c WHIRLPOOL 74bca232534e7af9051bb1ab9f77c1ff6c425781cf4561f781d6e9a40cc5ca0d9add540249ea5493e8782a9372aea296ead6c165c6c440ae1509eb319d151ee5
diff --git a/sec-policy/selinux-openct/selinux-openct-2.20141203-r8.ebuild b/sec-policy/selinux-openct/selinux-openct-2.20141203-r8.ebuild
index 6f265c53a93e..7c04e793e8ee 100644
--- a/sec-policy/selinux-openct/selinux-openct-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-openct/selinux-openct-2.20141203-r8.ebuild
@@ -13,5 +13,5 @@ DESCRIPTION="SELinux policy for openct"
 if [[ $PV == 9999* ]] ; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-openct/selinux-openct-2.20141203-r9.ebuild b/sec-policy/selinux-openct/selinux-openct-2.20141203-r9.ebuild
new file mode 100644
index 000000000000..6f265c53a93e
--- /dev/null
+++ b/sec-policy/selinux-openct/selinux-openct-2.20141203-r9.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI="5"
+
+IUSE=""
+MODS="openct"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for openct"
+
+if [[ $PV == 9999* ]] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
diff --git a/sec-policy/selinux-openrc/Manifest b/sec-policy/selinux-openrc/Manifest
index 8327a635be01..91d204b0021a 100644
--- a/sec-policy/selinux-openrc/Manifest
+++ b/sec-policy/selinux-openrc/Manifest
@@ -9,5 +9,6 @@ DIST patchbundle-selinux-base-policy-2.20141203-r5.tar.bz2 274136 SHA256 c23d17c
 DIST patchbundle-selinux-base-policy-2.20141203-r6.tar.bz2 293231 SHA256 b686dcc517b97834f66d967afdcc724cb43b5c6dbf9f34043a91cdeda2625cc7 SHA512 a2c486cbe4a1d21ff3fd01bef25ecf5a633a4072646c67cfccf3f7187d95f3d9e3b482a46ba17c55c40a8e7c0dee56e9cf9ddc9f414d3e4511443b62f60d03e9 WHIRLPOOL 3d708e287e3f9b873be647b0327eab6675a8702ee1cffb56e36934cada306e5ccc64397a083dad9e59de37a067e628cacbf896ae99012d5a209e42fd7cd8a4c6
 DIST patchbundle-selinux-base-policy-2.20141203-r7.tar.bz2 295833 SHA256 ba2219b3efc747be65f94c4d8ac3cd6ee530c82c848fa41935a114184678622a SHA512 8e32d9dbfb2f0f3f50200543aadb51ed9834ccd5cdf30bf8e4d9e6d0b645ce44ffaf80f7aa9385e9c9095d9a383b3a348a92356cb5386c06544ab082a9a468c7 WHIRLPOOL 1648ee1be71e45fcf5a264816ce7edc7bab19bd28a68703923eb2d6068f1f0469ae593855231d31f88baecbf29e7cece2d6beeed20b7c04231a6c90e90d35910
 DIST patchbundle-selinux-base-policy-2.20141203-r8.tar.bz2 297919 SHA256 77539eb3d78105f8789cd8205d2698bd27e2abf100163bdd162cda860fd15120 SHA512 2f8a19e1e4bb65f32b480275f49099aed3ae9df543c7de862b3bbd93e81b89cd96dadac3d091e28673d09a6885db8c5656b3a77d0080775c110b04f2753de7a6 WHIRLPOOL 79cb7e620eb8e838192dc557c7a9ce7e713227d783cc8b63792825559b2145cad70d0af6f99948c1527557bc363feffd846c73893682b4a14fc7d08b9e20c649
+DIST patchbundle-selinux-base-policy-2.20141203-r9.tar.bz2 299602 SHA256 e8518004942a6c57170a609683e22b1410c93a2a195829c41dc8fbc703d941b5 SHA512 ce6484fbca1d2d074e50d1a3953392bd3ce0a4617df98fbac37747b469b4f160a9331586dfe1c3ddccb1ccbee24876a2f05ab49e37c8492a48baf83c2d01d140 WHIRLPOOL 1fd7b956e98e95a64c3a713a944d4531259bd156a7feabf6a89c4b5f33ac846377730eede97889e85183be086f282ebd18e860214f6ca3f01b40f2323470ee04
 DIST refpolicy-2.20140311.tar.bz2 664416 SHA256 f69437db95548c78a5dec44c236397146b144153149009ea554d2e536e5436f7 SHA512 50bacee82ed41ac8b8007ecc33bf51d22303cc2ddd27cfb72cb5520dab5f8e255186e34b89cec492c7a2d4220b200814bdede9b46c19f987a3d3d65a1c9b749a WHIRLPOOL e07480beba6ab1f02ad36b7d0c50c4a71cb39a8ec78bf8d1dc3c82bb9dd1d69d9169d7c937165ea15f60ce1147f256d46644f944107a3a8a800d5bad70d4c255
 DIST refpolicy-2.20141203.tar.bz2 680243 SHA256 f438209c430d8a2d4ddcbe4bdd3edb46f6af7dc4913637af0b73c635e40c1522 SHA512 682e4280c5799e4c12ec7594afc1389f67be35055748d2e0dbdc3419159a16c96d4946ca6178daee8370515951f8653b2e452efe8c962b8d7f9bc192f0b15a0c WHIRLPOOL 74bca232534e7af9051bb1ab9f77c1ff6c425781cf4561f781d6e9a40cc5ca0d9add540249ea5493e8782a9372aea296ead6c165c6c440ae1509eb319d151ee5
diff --git a/sec-policy/selinux-openrc/selinux-openrc-2.20141203-r8.ebuild b/sec-policy/selinux-openrc/selinux-openrc-2.20141203-r8.ebuild
index fb6f2173c397..b6cefe7f4702 100644
--- a/sec-policy/selinux-openrc/selinux-openrc-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-openrc/selinux-openrc-2.20141203-r8.ebuild
@@ -13,5 +13,5 @@ DESCRIPTION="SELinux policy for openrc"
 if [[ $PV == 9999* ]] ; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-openrc/selinux-openrc-2.20141203-r9.ebuild b/sec-policy/selinux-openrc/selinux-openrc-2.20141203-r9.ebuild
new file mode 100644
index 000000000000..fb6f2173c397
--- /dev/null
+++ b/sec-policy/selinux-openrc/selinux-openrc-2.20141203-r9.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI="5"
+
+IUSE=""
+MODS="openrc"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for openrc"
+
+if [[ $PV == 9999* ]] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
diff --git a/sec-policy/selinux-openvpn/Manifest b/sec-policy/selinux-openvpn/Manifest
index 8327a635be01..91d204b0021a 100644
--- a/sec-policy/selinux-openvpn/Manifest
+++ b/sec-policy/selinux-openvpn/Manifest
@@ -9,5 +9,6 @@ DIST patchbundle-selinux-base-policy-2.20141203-r5.tar.bz2 274136 SHA256 c23d17c
 DIST patchbundle-selinux-base-policy-2.20141203-r6.tar.bz2 293231 SHA256 b686dcc517b97834f66d967afdcc724cb43b5c6dbf9f34043a91cdeda2625cc7 SHA512 a2c486cbe4a1d21ff3fd01bef25ecf5a633a4072646c67cfccf3f7187d95f3d9e3b482a46ba17c55c40a8e7c0dee56e9cf9ddc9f414d3e4511443b62f60d03e9 WHIRLPOOL 3d708e287e3f9b873be647b0327eab6675a8702ee1cffb56e36934cada306e5ccc64397a083dad9e59de37a067e628cacbf896ae99012d5a209e42fd7cd8a4c6
 DIST patchbundle-selinux-base-policy-2.20141203-r7.tar.bz2 295833 SHA256 ba2219b3efc747be65f94c4d8ac3cd6ee530c82c848fa41935a114184678622a SHA512 8e32d9dbfb2f0f3f50200543aadb51ed9834ccd5cdf30bf8e4d9e6d0b645ce44ffaf80f7aa9385e9c9095d9a383b3a348a92356cb5386c06544ab082a9a468c7 WHIRLPOOL 1648ee1be71e45fcf5a264816ce7edc7bab19bd28a68703923eb2d6068f1f0469ae593855231d31f88baecbf29e7cece2d6beeed20b7c04231a6c90e90d35910
 DIST patchbundle-selinux-base-policy-2.20141203-r8.tar.bz2 297919 SHA256 77539eb3d78105f8789cd8205d2698bd27e2abf100163bdd162cda860fd15120 SHA512 2f8a19e1e4bb65f32b480275f49099aed3ae9df543c7de862b3bbd93e81b89cd96dadac3d091e28673d09a6885db8c5656b3a77d0080775c110b04f2753de7a6 WHIRLPOOL 79cb7e620eb8e838192dc557c7a9ce7e713227d783cc8b63792825559b2145cad70d0af6f99948c1527557bc363feffd846c73893682b4a14fc7d08b9e20c649
+DIST patchbundle-selinux-base-policy-2.20141203-r9.tar.bz2 299602 SHA256 e8518004942a6c57170a609683e22b1410c93a2a195829c41dc8fbc703d941b5 SHA512 ce6484fbca1d2d074e50d1a3953392bd3ce0a4617df98fbac37747b469b4f160a9331586dfe1c3ddccb1ccbee24876a2f05ab49e37c8492a48baf83c2d01d140 WHIRLPOOL 1fd7b956e98e95a64c3a713a944d4531259bd156a7feabf6a89c4b5f33ac846377730eede97889e85183be086f282ebd18e860214f6ca3f01b40f2323470ee04
 DIST refpolicy-2.20140311.tar.bz2 664416 SHA256 f69437db95548c78a5dec44c236397146b144153149009ea554d2e536e5436f7 SHA512 50bacee82ed41ac8b8007ecc33bf51d22303cc2ddd27cfb72cb5520dab5f8e255186e34b89cec492c7a2d4220b200814bdede9b46c19f987a3d3d65a1c9b749a WHIRLPOOL e07480beba6ab1f02ad36b7d0c50c4a71cb39a8ec78bf8d1dc3c82bb9dd1d69d9169d7c937165ea15f60ce1147f256d46644f944107a3a8a800d5bad70d4c255
 DIST refpolicy-2.20141203.tar.bz2 680243 SHA256 f438209c430d8a2d4ddcbe4bdd3edb46f6af7dc4913637af0b73c635e40c1522 SHA512 682e4280c5799e4c12ec7594afc1389f67be35055748d2e0dbdc3419159a16c96d4946ca6178daee8370515951f8653b2e452efe8c962b8d7f9bc192f0b15a0c WHIRLPOOL 74bca232534e7af9051bb1ab9f77c1ff6c425781cf4561f781d6e9a40cc5ca0d9add540249ea5493e8782a9372aea296ead6c165c6c440ae1509eb319d151ee5
diff --git a/sec-policy/selinux-openvpn/selinux-openvpn-2.20141203-r8.ebuild b/sec-policy/selinux-openvpn/selinux-openvpn-2.20141203-r8.ebuild
index 5ab117a61776..e5c43eac9aac 100644
--- a/sec-policy/selinux-openvpn/selinux-openvpn-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-openvpn/selinux-openvpn-2.20141203-r8.ebuild
@@ -13,5 +13,5 @@ DESCRIPTION="SELinux policy for openvpn"
 if [[ $PV == 9999* ]] ; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-openvpn/selinux-openvpn-2.20141203-r9.ebuild b/sec-policy/selinux-openvpn/selinux-openvpn-2.20141203-r9.ebuild
new file mode 100644
index 000000000000..5ab117a61776
--- /dev/null
+++ b/sec-policy/selinux-openvpn/selinux-openvpn-2.20141203-r9.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI="5"
+
+IUSE=""
+MODS="openvpn"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for openvpn"
+
+if [[ $PV == 9999* ]] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
diff --git a/sec-policy/selinux-pan/Manifest b/sec-policy/selinux-pan/Manifest
index 8327a635be01..91d204b0021a 100644
--- a/sec-policy/selinux-pan/Manifest
+++ b/sec-policy/selinux-pan/Manifest
@@ -9,5 +9,6 @@ DIST patchbundle-selinux-base-policy-2.20141203-r5.tar.bz2 274136 SHA256 c23d17c
 DIST patchbundle-selinux-base-policy-2.20141203-r6.tar.bz2 293231 SHA256 b686dcc517b97834f66d967afdcc724cb43b5c6dbf9f34043a91cdeda2625cc7 SHA512 a2c486cbe4a1d21ff3fd01bef25ecf5a633a4072646c67cfccf3f7187d95f3d9e3b482a46ba17c55c40a8e7c0dee56e9cf9ddc9f414d3e4511443b62f60d03e9 WHIRLPOOL 3d708e287e3f9b873be647b0327eab6675a8702ee1cffb56e36934cada306e5ccc64397a083dad9e59de37a067e628cacbf896ae99012d5a209e42fd7cd8a4c6
 DIST patchbundle-selinux-base-policy-2.20141203-r7.tar.bz2 295833 SHA256 ba2219b3efc747be65f94c4d8ac3cd6ee530c82c848fa41935a114184678622a SHA512 8e32d9dbfb2f0f3f50200543aadb51ed9834ccd5cdf30bf8e4d9e6d0b645ce44ffaf80f7aa9385e9c9095d9a383b3a348a92356cb5386c06544ab082a9a468c7 WHIRLPOOL 1648ee1be71e45fcf5a264816ce7edc7bab19bd28a68703923eb2d6068f1f0469ae593855231d31f88baecbf29e7cece2d6beeed20b7c04231a6c90e90d35910
 DIST patchbundle-selinux-base-policy-2.20141203-r8.tar.bz2 297919 SHA256 77539eb3d78105f8789cd8205d2698bd27e2abf100163bdd162cda860fd15120 SHA512 2f8a19e1e4bb65f32b480275f49099aed3ae9df543c7de862b3bbd93e81b89cd96dadac3d091e28673d09a6885db8c5656b3a77d0080775c110b04f2753de7a6 WHIRLPOOL 79cb7e620eb8e838192dc557c7a9ce7e713227d783cc8b63792825559b2145cad70d0af6f99948c1527557bc363feffd846c73893682b4a14fc7d08b9e20c649
+DIST patchbundle-selinux-base-policy-2.20141203-r9.tar.bz2 299602 SHA256 e8518004942a6c57170a609683e22b1410c93a2a195829c41dc8fbc703d941b5 SHA512 ce6484fbca1d2d074e50d1a3953392bd3ce0a4617df98fbac37747b469b4f160a9331586dfe1c3ddccb1ccbee24876a2f05ab49e37c8492a48baf83c2d01d140 WHIRLPOOL 1fd7b956e98e95a64c3a713a944d4531259bd156a7feabf6a89c4b5f33ac846377730eede97889e85183be086f282ebd18e860214f6ca3f01b40f2323470ee04
 DIST refpolicy-2.20140311.tar.bz2 664416 SHA256 f69437db95548c78a5dec44c236397146b144153149009ea554d2e536e5436f7 SHA512 50bacee82ed41ac8b8007ecc33bf51d22303cc2ddd27cfb72cb5520dab5f8e255186e34b89cec492c7a2d4220b200814bdede9b46c19f987a3d3d65a1c9b749a WHIRLPOOL e07480beba6ab1f02ad36b7d0c50c4a71cb39a8ec78bf8d1dc3c82bb9dd1d69d9169d7c937165ea15f60ce1147f256d46644f944107a3a8a800d5bad70d4c255
 DIST refpolicy-2.20141203.tar.bz2 680243 SHA256 f438209c430d8a2d4ddcbe4bdd3edb46f6af7dc4913637af0b73c635e40c1522 SHA512 682e4280c5799e4c12ec7594afc1389f67be35055748d2e0dbdc3419159a16c96d4946ca6178daee8370515951f8653b2e452efe8c962b8d7f9bc192f0b15a0c WHIRLPOOL 74bca232534e7af9051bb1ab9f77c1ff6c425781cf4561f781d6e9a40cc5ca0d9add540249ea5493e8782a9372aea296ead6c165c6c440ae1509eb319d151ee5
diff --git a/sec-policy/selinux-pan/selinux-pan-2.20141203-r8.ebuild b/sec-policy/selinux-pan/selinux-pan-2.20141203-r8.ebuild
index ef31138c54f7..9605471c4084 100644
--- a/sec-policy/selinux-pan/selinux-pan-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-pan/selinux-pan-2.20141203-r8.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="SELinux policy for pan"
 if [[ $PV == 9999* ]] ; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-xserver
diff --git a/sec-policy/selinux-pan/selinux-pan-2.20141203-r9.ebuild b/sec-policy/selinux-pan/selinux-pan-2.20141203-r9.ebuild
new file mode 100644
index 000000000000..ef31138c54f7
--- /dev/null
+++ b/sec-policy/selinux-pan/selinux-pan-2.20141203-r9.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI="5"
+
+IUSE=""
+MODS="pan"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for pan"
+
+if [[ $PV == 9999* ]] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
+DEPEND="${DEPEND}
+	sec-policy/selinux-xserver
+"
+RDEPEND="${RDEPEND}
+	sec-policy/selinux-xserver
+"
diff --git a/sec-policy/selinux-pcmcia/Manifest b/sec-policy/selinux-pcmcia/Manifest
index 8327a635be01..91d204b0021a 100644
--- a/sec-policy/selinux-pcmcia/Manifest
+++ b/sec-policy/selinux-pcmcia/Manifest
@@ -9,5 +9,6 @@ DIST patchbundle-selinux-base-policy-2.20141203-r5.tar.bz2 274136 SHA256 c23d17c
 DIST patchbundle-selinux-base-policy-2.20141203-r6.tar.bz2 293231 SHA256 b686dcc517b97834f66d967afdcc724cb43b5c6dbf9f34043a91cdeda2625cc7 SHA512 a2c486cbe4a1d21ff3fd01bef25ecf5a633a4072646c67cfccf3f7187d95f3d9e3b482a46ba17c55c40a8e7c0dee56e9cf9ddc9f414d3e4511443b62f60d03e9 WHIRLPOOL 3d708e287e3f9b873be647b0327eab6675a8702ee1cffb56e36934cada306e5ccc64397a083dad9e59de37a067e628cacbf896ae99012d5a209e42fd7cd8a4c6
 DIST patchbundle-selinux-base-policy-2.20141203-r7.tar.bz2 295833 SHA256 ba2219b3efc747be65f94c4d8ac3cd6ee530c82c848fa41935a114184678622a SHA512 8e32d9dbfb2f0f3f50200543aadb51ed9834ccd5cdf30bf8e4d9e6d0b645ce44ffaf80f7aa9385e9c9095d9a383b3a348a92356cb5386c06544ab082a9a468c7 WHIRLPOOL 1648ee1be71e45fcf5a264816ce7edc7bab19bd28a68703923eb2d6068f1f0469ae593855231d31f88baecbf29e7cece2d6beeed20b7c04231a6c90e90d35910
 DIST patchbundle-selinux-base-policy-2.20141203-r8.tar.bz2 297919 SHA256 77539eb3d78105f8789cd8205d2698bd27e2abf100163bdd162cda860fd15120 SHA512 2f8a19e1e4bb65f32b480275f49099aed3ae9df543c7de862b3bbd93e81b89cd96dadac3d091e28673d09a6885db8c5656b3a77d0080775c110b04f2753de7a6 WHIRLPOOL 79cb7e620eb8e838192dc557c7a9ce7e713227d783cc8b63792825559b2145cad70d0af6f99948c1527557bc363feffd846c73893682b4a14fc7d08b9e20c649
+DIST patchbundle-selinux-base-policy-2.20141203-r9.tar.bz2 299602 SHA256 e8518004942a6c57170a609683e22b1410c93a2a195829c41dc8fbc703d941b5 SHA512 ce6484fbca1d2d074e50d1a3953392bd3ce0a4617df98fbac37747b469b4f160a9331586dfe1c3ddccb1ccbee24876a2f05ab49e37c8492a48baf83c2d01d140 WHIRLPOOL 1fd7b956e98e95a64c3a713a944d4531259bd156a7feabf6a89c4b5f33ac846377730eede97889e85183be086f282ebd18e860214f6ca3f01b40f2323470ee04
 DIST refpolicy-2.20140311.tar.bz2 664416 SHA256 f69437db95548c78a5dec44c236397146b144153149009ea554d2e536e5436f7 SHA512 50bacee82ed41ac8b8007ecc33bf51d22303cc2ddd27cfb72cb5520dab5f8e255186e34b89cec492c7a2d4220b200814bdede9b46c19f987a3d3d65a1c9b749a WHIRLPOOL e07480beba6ab1f02ad36b7d0c50c4a71cb39a8ec78bf8d1dc3c82bb9dd1d69d9169d7c937165ea15f60ce1147f256d46644f944107a3a8a800d5bad70d4c255
 DIST refpolicy-2.20141203.tar.bz2 680243 SHA256 f438209c430d8a2d4ddcbe4bdd3edb46f6af7dc4913637af0b73c635e40c1522 SHA512 682e4280c5799e4c12ec7594afc1389f67be35055748d2e0dbdc3419159a16c96d4946ca6178daee8370515951f8653b2e452efe8c962b8d7f9bc192f0b15a0c WHIRLPOOL 74bca232534e7af9051bb1ab9f77c1ff6c425781cf4561f781d6e9a40cc5ca0d9add540249ea5493e8782a9372aea296ead6c165c6c440ae1509eb319d151ee5
diff --git a/sec-policy/selinux-pcmcia/selinux-pcmcia-2.20141203-r8.ebuild b/sec-policy/selinux-pcmcia/selinux-pcmcia-2.20141203-r8.ebuild
index 29d461e5a9eb..d9d0b33143ed 100644
--- a/sec-policy/selinux-pcmcia/selinux-pcmcia-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-pcmcia/selinux-pcmcia-2.20141203-r8.ebuild
@@ -13,5 +13,5 @@ DESCRIPTION="SELinux policy for pcmcia"
 if [[ $PV == 9999* ]] ; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-pcmcia/selinux-pcmcia-2.20141203-r9.ebuild b/sec-policy/selinux-pcmcia/selinux-pcmcia-2.20141203-r9.ebuild
new file mode 100644
index 000000000000..29d461e5a9eb
--- /dev/null
+++ b/sec-policy/selinux-pcmcia/selinux-pcmcia-2.20141203-r9.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI="5"
+
+IUSE=""
+MODS="pcmcia"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for pcmcia"
+
+if [[ $PV == 9999* ]] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
diff --git a/sec-policy/selinux-pcscd/Manifest b/sec-policy/selinux-pcscd/Manifest
index 8327a635be01..91d204b0021a 100644
--- a/sec-policy/selinux-pcscd/Manifest
+++ b/sec-policy/selinux-pcscd/Manifest
@@ -9,5 +9,6 @@ DIST patchbundle-selinux-base-policy-2.20141203-r5.tar.bz2 274136 SHA256 c23d17c
 DIST patchbundle-selinux-base-policy-2.20141203-r6.tar.bz2 293231 SHA256 b686dcc517b97834f66d967afdcc724cb43b5c6dbf9f34043a91cdeda2625cc7 SHA512 a2c486cbe4a1d21ff3fd01bef25ecf5a633a4072646c67cfccf3f7187d95f3d9e3b482a46ba17c55c40a8e7c0dee56e9cf9ddc9f414d3e4511443b62f60d03e9 WHIRLPOOL 3d708e287e3f9b873be647b0327eab6675a8702ee1cffb56e36934cada306e5ccc64397a083dad9e59de37a067e628cacbf896ae99012d5a209e42fd7cd8a4c6
 DIST patchbundle-selinux-base-policy-2.20141203-r7.tar.bz2 295833 SHA256 ba2219b3efc747be65f94c4d8ac3cd6ee530c82c848fa41935a114184678622a SHA512 8e32d9dbfb2f0f3f50200543aadb51ed9834ccd5cdf30bf8e4d9e6d0b645ce44ffaf80f7aa9385e9c9095d9a383b3a348a92356cb5386c06544ab082a9a468c7 WHIRLPOOL 1648ee1be71e45fcf5a264816ce7edc7bab19bd28a68703923eb2d6068f1f0469ae593855231d31f88baecbf29e7cece2d6beeed20b7c04231a6c90e90d35910
 DIST patchbundle-selinux-base-policy-2.20141203-r8.tar.bz2 297919 SHA256 77539eb3d78105f8789cd8205d2698bd27e2abf100163bdd162cda860fd15120 SHA512 2f8a19e1e4bb65f32b480275f49099aed3ae9df543c7de862b3bbd93e81b89cd96dadac3d091e28673d09a6885db8c5656b3a77d0080775c110b04f2753de7a6 WHIRLPOOL 79cb7e620eb8e838192dc557c7a9ce7e713227d783cc8b63792825559b2145cad70d0af6f99948c1527557bc363feffd846c73893682b4a14fc7d08b9e20c649
+DIST patchbundle-selinux-base-policy-2.20141203-r9.tar.bz2 299602 SHA256 e8518004942a6c57170a609683e22b1410c93a2a195829c41dc8fbc703d941b5 SHA512 ce6484fbca1d2d074e50d1a3953392bd3ce0a4617df98fbac37747b469b4f160a9331586dfe1c3ddccb1ccbee24876a2f05ab49e37c8492a48baf83c2d01d140 WHIRLPOOL 1fd7b956e98e95a64c3a713a944d4531259bd156a7feabf6a89c4b5f33ac846377730eede97889e85183be086f282ebd18e860214f6ca3f01b40f2323470ee04
 DIST refpolicy-2.20140311.tar.bz2 664416 SHA256 f69437db95548c78a5dec44c236397146b144153149009ea554d2e536e5436f7 SHA512 50bacee82ed41ac8b8007ecc33bf51d22303cc2ddd27cfb72cb5520dab5f8e255186e34b89cec492c7a2d4220b200814bdede9b46c19f987a3d3d65a1c9b749a WHIRLPOOL e07480beba6ab1f02ad36b7d0c50c4a71cb39a8ec78bf8d1dc3c82bb9dd1d69d9169d7c937165ea15f60ce1147f256d46644f944107a3a8a800d5bad70d4c255
 DIST refpolicy-2.20141203.tar.bz2 680243 SHA256 f438209c430d8a2d4ddcbe4bdd3edb46f6af7dc4913637af0b73c635e40c1522 SHA512 682e4280c5799e4c12ec7594afc1389f67be35055748d2e0dbdc3419159a16c96d4946ca6178daee8370515951f8653b2e452efe8c962b8d7f9bc192f0b15a0c WHIRLPOOL 74bca232534e7af9051bb1ab9f77c1ff6c425781cf4561f781d6e9a40cc5ca0d9add540249ea5493e8782a9372aea296ead6c165c6c440ae1509eb319d151ee5
diff --git a/sec-policy/selinux-pcscd/selinux-pcscd-2.20141203-r8.ebuild b/sec-policy/selinux-pcscd/selinux-pcscd-2.20141203-r8.ebuild
index d6131d8d8f20..2f8f11b3f55c 100644
--- a/sec-policy/selinux-pcscd/selinux-pcscd-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-pcscd/selinux-pcscd-2.20141203-r8.ebuild
@@ -13,5 +13,5 @@ DESCRIPTION="SELinux policy for pcscd"
 if [[ $PV == 9999* ]] ; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-pcscd/selinux-pcscd-2.20141203-r9.ebuild b/sec-policy/selinux-pcscd/selinux-pcscd-2.20141203-r9.ebuild
new file mode 100644
index 000000000000..d6131d8d8f20
--- /dev/null
+++ b/sec-policy/selinux-pcscd/selinux-pcscd-2.20141203-r9.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI="5"
+
+IUSE=""
+MODS="pcscd"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for pcscd"
+
+if [[ $PV == 9999* ]] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
diff --git a/sec-policy/selinux-perdition/Manifest b/sec-policy/selinux-perdition/Manifest
index 8327a635be01..91d204b0021a 100644
--- a/sec-policy/selinux-perdition/Manifest
+++ b/sec-policy/selinux-perdition/Manifest
@@ -9,5 +9,6 @@ DIST patchbundle-selinux-base-policy-2.20141203-r5.tar.bz2 274136 SHA256 c23d17c
 DIST patchbundle-selinux-base-policy-2.20141203-r6.tar.bz2 293231 SHA256 b686dcc517b97834f66d967afdcc724cb43b5c6dbf9f34043a91cdeda2625cc7 SHA512 a2c486cbe4a1d21ff3fd01bef25ecf5a633a4072646c67cfccf3f7187d95f3d9e3b482a46ba17c55c40a8e7c0dee56e9cf9ddc9f414d3e4511443b62f60d03e9 WHIRLPOOL 3d708e287e3f9b873be647b0327eab6675a8702ee1cffb56e36934cada306e5ccc64397a083dad9e59de37a067e628cacbf896ae99012d5a209e42fd7cd8a4c6
 DIST patchbundle-selinux-base-policy-2.20141203-r7.tar.bz2 295833 SHA256 ba2219b3efc747be65f94c4d8ac3cd6ee530c82c848fa41935a114184678622a SHA512 8e32d9dbfb2f0f3f50200543aadb51ed9834ccd5cdf30bf8e4d9e6d0b645ce44ffaf80f7aa9385e9c9095d9a383b3a348a92356cb5386c06544ab082a9a468c7 WHIRLPOOL 1648ee1be71e45fcf5a264816ce7edc7bab19bd28a68703923eb2d6068f1f0469ae593855231d31f88baecbf29e7cece2d6beeed20b7c04231a6c90e90d35910
 DIST patchbundle-selinux-base-policy-2.20141203-r8.tar.bz2 297919 SHA256 77539eb3d78105f8789cd8205d2698bd27e2abf100163bdd162cda860fd15120 SHA512 2f8a19e1e4bb65f32b480275f49099aed3ae9df543c7de862b3bbd93e81b89cd96dadac3d091e28673d09a6885db8c5656b3a77d0080775c110b04f2753de7a6 WHIRLPOOL 79cb7e620eb8e838192dc557c7a9ce7e713227d783cc8b63792825559b2145cad70d0af6f99948c1527557bc363feffd846c73893682b4a14fc7d08b9e20c649
+DIST patchbundle-selinux-base-policy-2.20141203-r9.tar.bz2 299602 SHA256 e8518004942a6c57170a609683e22b1410c93a2a195829c41dc8fbc703d941b5 SHA512 ce6484fbca1d2d074e50d1a3953392bd3ce0a4617df98fbac37747b469b4f160a9331586dfe1c3ddccb1ccbee24876a2f05ab49e37c8492a48baf83c2d01d140 WHIRLPOOL 1fd7b956e98e95a64c3a713a944d4531259bd156a7feabf6a89c4b5f33ac846377730eede97889e85183be086f282ebd18e860214f6ca3f01b40f2323470ee04
 DIST refpolicy-2.20140311.tar.bz2 664416 SHA256 f69437db95548c78a5dec44c236397146b144153149009ea554d2e536e5436f7 SHA512 50bacee82ed41ac8b8007ecc33bf51d22303cc2ddd27cfb72cb5520dab5f8e255186e34b89cec492c7a2d4220b200814bdede9b46c19f987a3d3d65a1c9b749a WHIRLPOOL e07480beba6ab1f02ad36b7d0c50c4a71cb39a8ec78bf8d1dc3c82bb9dd1d69d9169d7c937165ea15f60ce1147f256d46644f944107a3a8a800d5bad70d4c255
 DIST refpolicy-2.20141203.tar.bz2 680243 SHA256 f438209c430d8a2d4ddcbe4bdd3edb46f6af7dc4913637af0b73c635e40c1522 SHA512 682e4280c5799e4c12ec7594afc1389f67be35055748d2e0dbdc3419159a16c96d4946ca6178daee8370515951f8653b2e452efe8c962b8d7f9bc192f0b15a0c WHIRLPOOL 74bca232534e7af9051bb1ab9f77c1ff6c425781cf4561f781d6e9a40cc5ca0d9add540249ea5493e8782a9372aea296ead6c165c6c440ae1509eb319d151ee5
diff --git a/sec-policy/selinux-perdition/selinux-perdition-2.20141203-r8.ebuild b/sec-policy/selinux-perdition/selinux-perdition-2.20141203-r8.ebuild
index 6de146b97965..9ab69431148e 100644
--- a/sec-policy/selinux-perdition/selinux-perdition-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-perdition/selinux-perdition-2.20141203-r8.ebuild
@@ -13,5 +13,5 @@ DESCRIPTION="SELinux policy for perdition"
 if [[ $PV == 9999* ]] ; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-perdition/selinux-perdition-2.20141203-r9.ebuild b/sec-policy/selinux-perdition/selinux-perdition-2.20141203-r9.ebuild
new file mode 100644
index 000000000000..6de146b97965
--- /dev/null
+++ b/sec-policy/selinux-perdition/selinux-perdition-2.20141203-r9.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI="5"
+
+IUSE=""
+MODS="perdition"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for perdition"
+
+if [[ $PV == 9999* ]] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
diff --git a/sec-policy/selinux-phpfpm/Manifest b/sec-policy/selinux-phpfpm/Manifest
index 8327a635be01..91d204b0021a 100644
--- a/sec-policy/selinux-phpfpm/Manifest
+++ b/sec-policy/selinux-phpfpm/Manifest
@@ -9,5 +9,6 @@ DIST patchbundle-selinux-base-policy-2.20141203-r5.tar.bz2 274136 SHA256 c23d17c
 DIST patchbundle-selinux-base-policy-2.20141203-r6.tar.bz2 293231 SHA256 b686dcc517b97834f66d967afdcc724cb43b5c6dbf9f34043a91cdeda2625cc7 SHA512 a2c486cbe4a1d21ff3fd01bef25ecf5a633a4072646c67cfccf3f7187d95f3d9e3b482a46ba17c55c40a8e7c0dee56e9cf9ddc9f414d3e4511443b62f60d03e9 WHIRLPOOL 3d708e287e3f9b873be647b0327eab6675a8702ee1cffb56e36934cada306e5ccc64397a083dad9e59de37a067e628cacbf896ae99012d5a209e42fd7cd8a4c6
 DIST patchbundle-selinux-base-policy-2.20141203-r7.tar.bz2 295833 SHA256 ba2219b3efc747be65f94c4d8ac3cd6ee530c82c848fa41935a114184678622a SHA512 8e32d9dbfb2f0f3f50200543aadb51ed9834ccd5cdf30bf8e4d9e6d0b645ce44ffaf80f7aa9385e9c9095d9a383b3a348a92356cb5386c06544ab082a9a468c7 WHIRLPOOL 1648ee1be71e45fcf5a264816ce7edc7bab19bd28a68703923eb2d6068f1f0469ae593855231d31f88baecbf29e7cece2d6beeed20b7c04231a6c90e90d35910
 DIST patchbundle-selinux-base-policy-2.20141203-r8.tar.bz2 297919 SHA256 77539eb3d78105f8789cd8205d2698bd27e2abf100163bdd162cda860fd15120 SHA512 2f8a19e1e4bb65f32b480275f49099aed3ae9df543c7de862b3bbd93e81b89cd96dadac3d091e28673d09a6885db8c5656b3a77d0080775c110b04f2753de7a6 WHIRLPOOL 79cb7e620eb8e838192dc557c7a9ce7e713227d783cc8b63792825559b2145cad70d0af6f99948c1527557bc363feffd846c73893682b4a14fc7d08b9e20c649
+DIST patchbundle-selinux-base-policy-2.20141203-r9.tar.bz2 299602 SHA256 e8518004942a6c57170a609683e22b1410c93a2a195829c41dc8fbc703d941b5 SHA512 ce6484fbca1d2d074e50d1a3953392bd3ce0a4617df98fbac37747b469b4f160a9331586dfe1c3ddccb1ccbee24876a2f05ab49e37c8492a48baf83c2d01d140 WHIRLPOOL 1fd7b956e98e95a64c3a713a944d4531259bd156a7feabf6a89c4b5f33ac846377730eede97889e85183be086f282ebd18e860214f6ca3f01b40f2323470ee04
 DIST refpolicy-2.20140311.tar.bz2 664416 SHA256 f69437db95548c78a5dec44c236397146b144153149009ea554d2e536e5436f7 SHA512 50bacee82ed41ac8b8007ecc33bf51d22303cc2ddd27cfb72cb5520dab5f8e255186e34b89cec492c7a2d4220b200814bdede9b46c19f987a3d3d65a1c9b749a WHIRLPOOL e07480beba6ab1f02ad36b7d0c50c4a71cb39a8ec78bf8d1dc3c82bb9dd1d69d9169d7c937165ea15f60ce1147f256d46644f944107a3a8a800d5bad70d4c255
 DIST refpolicy-2.20141203.tar.bz2 680243 SHA256 f438209c430d8a2d4ddcbe4bdd3edb46f6af7dc4913637af0b73c635e40c1522 SHA512 682e4280c5799e4c12ec7594afc1389f67be35055748d2e0dbdc3419159a16c96d4946ca6178daee8370515951f8653b2e452efe8c962b8d7f9bc192f0b15a0c WHIRLPOOL 74bca232534e7af9051bb1ab9f77c1ff6c425781cf4561f781d6e9a40cc5ca0d9add540249ea5493e8782a9372aea296ead6c165c6c440ae1509eb319d151ee5
diff --git a/sec-policy/selinux-phpfpm/selinux-phpfpm-2.20141203-r8.ebuild b/sec-policy/selinux-phpfpm/selinux-phpfpm-2.20141203-r8.ebuild
index 916da00cb6ac..83bfc5f3a5c5 100644
--- a/sec-policy/selinux-phpfpm/selinux-phpfpm-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-phpfpm/selinux-phpfpm-2.20141203-r8.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="SELinux policy for phpfpm"
 if [[ $PV == 9999* ]] ; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-apache
diff --git a/sec-policy/selinux-phpfpm/selinux-phpfpm-2.20141203-r9.ebuild b/sec-policy/selinux-phpfpm/selinux-phpfpm-2.20141203-r9.ebuild
new file mode 100644
index 000000000000..916da00cb6ac
--- /dev/null
+++ b/sec-policy/selinux-phpfpm/selinux-phpfpm-2.20141203-r9.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI="5"
+
+IUSE=""
+MODS="phpfpm"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for phpfpm"
+
+if [[ $PV == 9999* ]] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
+DEPEND="${DEPEND}
+	sec-policy/selinux-apache
+"
+RDEPEND="${RDEPEND}
+	sec-policy/selinux-apache
+"
diff --git a/sec-policy/selinux-plymouthd/Manifest b/sec-policy/selinux-plymouthd/Manifest
index 8327a635be01..91d204b0021a 100644
--- a/sec-policy/selinux-plymouthd/Manifest
+++ b/sec-policy/selinux-plymouthd/Manifest
@@ -9,5 +9,6 @@ DIST patchbundle-selinux-base-policy-2.20141203-r5.tar.bz2 274136 SHA256 c23d17c
 DIST patchbundle-selinux-base-policy-2.20141203-r6.tar.bz2 293231 SHA256 b686dcc517b97834f66d967afdcc724cb43b5c6dbf9f34043a91cdeda2625cc7 SHA512 a2c486cbe4a1d21ff3fd01bef25ecf5a633a4072646c67cfccf3f7187d95f3d9e3b482a46ba17c55c40a8e7c0dee56e9cf9ddc9f414d3e4511443b62f60d03e9 WHIRLPOOL 3d708e287e3f9b873be647b0327eab6675a8702ee1cffb56e36934cada306e5ccc64397a083dad9e59de37a067e628cacbf896ae99012d5a209e42fd7cd8a4c6
 DIST patchbundle-selinux-base-policy-2.20141203-r7.tar.bz2 295833 SHA256 ba2219b3efc747be65f94c4d8ac3cd6ee530c82c848fa41935a114184678622a SHA512 8e32d9dbfb2f0f3f50200543aadb51ed9834ccd5cdf30bf8e4d9e6d0b645ce44ffaf80f7aa9385e9c9095d9a383b3a348a92356cb5386c06544ab082a9a468c7 WHIRLPOOL 1648ee1be71e45fcf5a264816ce7edc7bab19bd28a68703923eb2d6068f1f0469ae593855231d31f88baecbf29e7cece2d6beeed20b7c04231a6c90e90d35910
 DIST patchbundle-selinux-base-policy-2.20141203-r8.tar.bz2 297919 SHA256 77539eb3d78105f8789cd8205d2698bd27e2abf100163bdd162cda860fd15120 SHA512 2f8a19e1e4bb65f32b480275f49099aed3ae9df543c7de862b3bbd93e81b89cd96dadac3d091e28673d09a6885db8c5656b3a77d0080775c110b04f2753de7a6 WHIRLPOOL 79cb7e620eb8e838192dc557c7a9ce7e713227d783cc8b63792825559b2145cad70d0af6f99948c1527557bc363feffd846c73893682b4a14fc7d08b9e20c649
+DIST patchbundle-selinux-base-policy-2.20141203-r9.tar.bz2 299602 SHA256 e8518004942a6c57170a609683e22b1410c93a2a195829c41dc8fbc703d941b5 SHA512 ce6484fbca1d2d074e50d1a3953392bd3ce0a4617df98fbac37747b469b4f160a9331586dfe1c3ddccb1ccbee24876a2f05ab49e37c8492a48baf83c2d01d140 WHIRLPOOL 1fd7b956e98e95a64c3a713a944d4531259bd156a7feabf6a89c4b5f33ac846377730eede97889e85183be086f282ebd18e860214f6ca3f01b40f2323470ee04
 DIST refpolicy-2.20140311.tar.bz2 664416 SHA256 f69437db95548c78a5dec44c236397146b144153149009ea554d2e536e5436f7 SHA512 50bacee82ed41ac8b8007ecc33bf51d22303cc2ddd27cfb72cb5520dab5f8e255186e34b89cec492c7a2d4220b200814bdede9b46c19f987a3d3d65a1c9b749a WHIRLPOOL e07480beba6ab1f02ad36b7d0c50c4a71cb39a8ec78bf8d1dc3c82bb9dd1d69d9169d7c937165ea15f60ce1147f256d46644f944107a3a8a800d5bad70d4c255
 DIST refpolicy-2.20141203.tar.bz2 680243 SHA256 f438209c430d8a2d4ddcbe4bdd3edb46f6af7dc4913637af0b73c635e40c1522 SHA512 682e4280c5799e4c12ec7594afc1389f67be35055748d2e0dbdc3419159a16c96d4946ca6178daee8370515951f8653b2e452efe8c962b8d7f9bc192f0b15a0c WHIRLPOOL 74bca232534e7af9051bb1ab9f77c1ff6c425781cf4561f781d6e9a40cc5ca0d9add540249ea5493e8782a9372aea296ead6c165c6c440ae1509eb319d151ee5
diff --git a/sec-policy/selinux-plymouthd/selinux-plymouthd-2.20141203-r8.ebuild b/sec-policy/selinux-plymouthd/selinux-plymouthd-2.20141203-r8.ebuild
index 7f7ea4ac7f0c..02b531f793ab 100644
--- a/sec-policy/selinux-plymouthd/selinux-plymouthd-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-plymouthd/selinux-plymouthd-2.20141203-r8.ebuild
@@ -13,5 +13,5 @@ DESCRIPTION="SELinux policy for plymouthd"
 if [[ $PV == 9999* ]] ; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-plymouthd/selinux-plymouthd-2.20141203-r9.ebuild b/sec-policy/selinux-plymouthd/selinux-plymouthd-2.20141203-r9.ebuild
new file mode 100644
index 000000000000..7f7ea4ac7f0c
--- /dev/null
+++ b/sec-policy/selinux-plymouthd/selinux-plymouthd-2.20141203-r9.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI="5"
+
+IUSE=""
+MODS="plymouthd"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for plymouthd"
+
+if [[ $PV == 9999* ]] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
diff --git a/sec-policy/selinux-podsleuth/Manifest b/sec-policy/selinux-podsleuth/Manifest
index 8327a635be01..91d204b0021a 100644
--- a/sec-policy/selinux-podsleuth/Manifest
+++ b/sec-policy/selinux-podsleuth/Manifest
@@ -9,5 +9,6 @@ DIST patchbundle-selinux-base-policy-2.20141203-r5.tar.bz2 274136 SHA256 c23d17c
 DIST patchbundle-selinux-base-policy-2.20141203-r6.tar.bz2 293231 SHA256 b686dcc517b97834f66d967afdcc724cb43b5c6dbf9f34043a91cdeda2625cc7 SHA512 a2c486cbe4a1d21ff3fd01bef25ecf5a633a4072646c67cfccf3f7187d95f3d9e3b482a46ba17c55c40a8e7c0dee56e9cf9ddc9f414d3e4511443b62f60d03e9 WHIRLPOOL 3d708e287e3f9b873be647b0327eab6675a8702ee1cffb56e36934cada306e5ccc64397a083dad9e59de37a067e628cacbf896ae99012d5a209e42fd7cd8a4c6
 DIST patchbundle-selinux-base-policy-2.20141203-r7.tar.bz2 295833 SHA256 ba2219b3efc747be65f94c4d8ac3cd6ee530c82c848fa41935a114184678622a SHA512 8e32d9dbfb2f0f3f50200543aadb51ed9834ccd5cdf30bf8e4d9e6d0b645ce44ffaf80f7aa9385e9c9095d9a383b3a348a92356cb5386c06544ab082a9a468c7 WHIRLPOOL 1648ee1be71e45fcf5a264816ce7edc7bab19bd28a68703923eb2d6068f1f0469ae593855231d31f88baecbf29e7cece2d6beeed20b7c04231a6c90e90d35910
 DIST patchbundle-selinux-base-policy-2.20141203-r8.tar.bz2 297919 SHA256 77539eb3d78105f8789cd8205d2698bd27e2abf100163bdd162cda860fd15120 SHA512 2f8a19e1e4bb65f32b480275f49099aed3ae9df543c7de862b3bbd93e81b89cd96dadac3d091e28673d09a6885db8c5656b3a77d0080775c110b04f2753de7a6 WHIRLPOOL 79cb7e620eb8e838192dc557c7a9ce7e713227d783cc8b63792825559b2145cad70d0af6f99948c1527557bc363feffd846c73893682b4a14fc7d08b9e20c649
+DIST patchbundle-selinux-base-policy-2.20141203-r9.tar.bz2 299602 SHA256 e8518004942a6c57170a609683e22b1410c93a2a195829c41dc8fbc703d941b5 SHA512 ce6484fbca1d2d074e50d1a3953392bd3ce0a4617df98fbac37747b469b4f160a9331586dfe1c3ddccb1ccbee24876a2f05ab49e37c8492a48baf83c2d01d140 WHIRLPOOL 1fd7b956e98e95a64c3a713a944d4531259bd156a7feabf6a89c4b5f33ac846377730eede97889e85183be086f282ebd18e860214f6ca3f01b40f2323470ee04
 DIST refpolicy-2.20140311.tar.bz2 664416 SHA256 f69437db95548c78a5dec44c236397146b144153149009ea554d2e536e5436f7 SHA512 50bacee82ed41ac8b8007ecc33bf51d22303cc2ddd27cfb72cb5520dab5f8e255186e34b89cec492c7a2d4220b200814bdede9b46c19f987a3d3d65a1c9b749a WHIRLPOOL e07480beba6ab1f02ad36b7d0c50c4a71cb39a8ec78bf8d1dc3c82bb9dd1d69d9169d7c937165ea15f60ce1147f256d46644f944107a3a8a800d5bad70d4c255
 DIST refpolicy-2.20141203.tar.bz2 680243 SHA256 f438209c430d8a2d4ddcbe4bdd3edb46f6af7dc4913637af0b73c635e40c1522 SHA512 682e4280c5799e4c12ec7594afc1389f67be35055748d2e0dbdc3419159a16c96d4946ca6178daee8370515951f8653b2e452efe8c962b8d7f9bc192f0b15a0c WHIRLPOOL 74bca232534e7af9051bb1ab9f77c1ff6c425781cf4561f781d6e9a40cc5ca0d9add540249ea5493e8782a9372aea296ead6c165c6c440ae1509eb319d151ee5
diff --git a/sec-policy/selinux-podsleuth/selinux-podsleuth-2.20141203-r8.ebuild b/sec-policy/selinux-podsleuth/selinux-podsleuth-2.20141203-r8.ebuild
index 5edd2b88854a..649a30fc26e6 100644
--- a/sec-policy/selinux-podsleuth/selinux-podsleuth-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-podsleuth/selinux-podsleuth-2.20141203-r8.ebuild
@@ -13,5 +13,5 @@ DESCRIPTION="SELinux policy for podsleuth"
 if [[ $PV == 9999* ]] ; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-podsleuth/selinux-podsleuth-2.20141203-r9.ebuild b/sec-policy/selinux-podsleuth/selinux-podsleuth-2.20141203-r9.ebuild
new file mode 100644
index 000000000000..5edd2b88854a
--- /dev/null
+++ b/sec-policy/selinux-podsleuth/selinux-podsleuth-2.20141203-r9.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI="5"
+
+IUSE=""
+MODS="podsleuth"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for podsleuth"
+
+if [[ $PV == 9999* ]] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
diff --git a/sec-policy/selinux-policykit/Manifest b/sec-policy/selinux-policykit/Manifest
index 8327a635be01..91d204b0021a 100644
--- a/sec-policy/selinux-policykit/Manifest
+++ b/sec-policy/selinux-policykit/Manifest
@@ -9,5 +9,6 @@ DIST patchbundle-selinux-base-policy-2.20141203-r5.tar.bz2 274136 SHA256 c23d17c
 DIST patchbundle-selinux-base-policy-2.20141203-r6.tar.bz2 293231 SHA256 b686dcc517b97834f66d967afdcc724cb43b5c6dbf9f34043a91cdeda2625cc7 SHA512 a2c486cbe4a1d21ff3fd01bef25ecf5a633a4072646c67cfccf3f7187d95f3d9e3b482a46ba17c55c40a8e7c0dee56e9cf9ddc9f414d3e4511443b62f60d03e9 WHIRLPOOL 3d708e287e3f9b873be647b0327eab6675a8702ee1cffb56e36934cada306e5ccc64397a083dad9e59de37a067e628cacbf896ae99012d5a209e42fd7cd8a4c6
 DIST patchbundle-selinux-base-policy-2.20141203-r7.tar.bz2 295833 SHA256 ba2219b3efc747be65f94c4d8ac3cd6ee530c82c848fa41935a114184678622a SHA512 8e32d9dbfb2f0f3f50200543aadb51ed9834ccd5cdf30bf8e4d9e6d0b645ce44ffaf80f7aa9385e9c9095d9a383b3a348a92356cb5386c06544ab082a9a468c7 WHIRLPOOL 1648ee1be71e45fcf5a264816ce7edc7bab19bd28a68703923eb2d6068f1f0469ae593855231d31f88baecbf29e7cece2d6beeed20b7c04231a6c90e90d35910
 DIST patchbundle-selinux-base-policy-2.20141203-r8.tar.bz2 297919 SHA256 77539eb3d78105f8789cd8205d2698bd27e2abf100163bdd162cda860fd15120 SHA512 2f8a19e1e4bb65f32b480275f49099aed3ae9df543c7de862b3bbd93e81b89cd96dadac3d091e28673d09a6885db8c5656b3a77d0080775c110b04f2753de7a6 WHIRLPOOL 79cb7e620eb8e838192dc557c7a9ce7e713227d783cc8b63792825559b2145cad70d0af6f99948c1527557bc363feffd846c73893682b4a14fc7d08b9e20c649
+DIST patchbundle-selinux-base-policy-2.20141203-r9.tar.bz2 299602 SHA256 e8518004942a6c57170a609683e22b1410c93a2a195829c41dc8fbc703d941b5 SHA512 ce6484fbca1d2d074e50d1a3953392bd3ce0a4617df98fbac37747b469b4f160a9331586dfe1c3ddccb1ccbee24876a2f05ab49e37c8492a48baf83c2d01d140 WHIRLPOOL 1fd7b956e98e95a64c3a713a944d4531259bd156a7feabf6a89c4b5f33ac846377730eede97889e85183be086f282ebd18e860214f6ca3f01b40f2323470ee04
 DIST refpolicy-2.20140311.tar.bz2 664416 SHA256 f69437db95548c78a5dec44c236397146b144153149009ea554d2e536e5436f7 SHA512 50bacee82ed41ac8b8007ecc33bf51d22303cc2ddd27cfb72cb5520dab5f8e255186e34b89cec492c7a2d4220b200814bdede9b46c19f987a3d3d65a1c9b749a WHIRLPOOL e07480beba6ab1f02ad36b7d0c50c4a71cb39a8ec78bf8d1dc3c82bb9dd1d69d9169d7c937165ea15f60ce1147f256d46644f944107a3a8a800d5bad70d4c255
 DIST refpolicy-2.20141203.tar.bz2 680243 SHA256 f438209c430d8a2d4ddcbe4bdd3edb46f6af7dc4913637af0b73c635e40c1522 SHA512 682e4280c5799e4c12ec7594afc1389f67be35055748d2e0dbdc3419159a16c96d4946ca6178daee8370515951f8653b2e452efe8c962b8d7f9bc192f0b15a0c WHIRLPOOL 74bca232534e7af9051bb1ab9f77c1ff6c425781cf4561f781d6e9a40cc5ca0d9add540249ea5493e8782a9372aea296ead6c165c6c440ae1509eb319d151ee5
diff --git a/sec-policy/selinux-policykit/selinux-policykit-2.20141203-r8.ebuild b/sec-policy/selinux-policykit/selinux-policykit-2.20141203-r8.ebuild
index 95883f6ff894..f50ad7dad9ad 100644
--- a/sec-policy/selinux-policykit/selinux-policykit-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-policykit/selinux-policykit-2.20141203-r8.ebuild
@@ -13,5 +13,5 @@ DESCRIPTION="SELinux policy for policykit"
 if [[ $PV == 9999* ]] ; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-policykit/selinux-policykit-2.20141203-r9.ebuild b/sec-policy/selinux-policykit/selinux-policykit-2.20141203-r9.ebuild
new file mode 100644
index 000000000000..95883f6ff894
--- /dev/null
+++ b/sec-policy/selinux-policykit/selinux-policykit-2.20141203-r9.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI="5"
+
+IUSE=""
+MODS="policykit"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for policykit"
+
+if [[ $PV == 9999* ]] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
diff --git a/sec-policy/selinux-portmap/Manifest b/sec-policy/selinux-portmap/Manifest
index 8327a635be01..91d204b0021a 100644
--- a/sec-policy/selinux-portmap/Manifest
+++ b/sec-policy/selinux-portmap/Manifest
@@ -9,5 +9,6 @@ DIST patchbundle-selinux-base-policy-2.20141203-r5.tar.bz2 274136 SHA256 c23d17c
 DIST patchbundle-selinux-base-policy-2.20141203-r6.tar.bz2 293231 SHA256 b686dcc517b97834f66d967afdcc724cb43b5c6dbf9f34043a91cdeda2625cc7 SHA512 a2c486cbe4a1d21ff3fd01bef25ecf5a633a4072646c67cfccf3f7187d95f3d9e3b482a46ba17c55c40a8e7c0dee56e9cf9ddc9f414d3e4511443b62f60d03e9 WHIRLPOOL 3d708e287e3f9b873be647b0327eab6675a8702ee1cffb56e36934cada306e5ccc64397a083dad9e59de37a067e628cacbf896ae99012d5a209e42fd7cd8a4c6
 DIST patchbundle-selinux-base-policy-2.20141203-r7.tar.bz2 295833 SHA256 ba2219b3efc747be65f94c4d8ac3cd6ee530c82c848fa41935a114184678622a SHA512 8e32d9dbfb2f0f3f50200543aadb51ed9834ccd5cdf30bf8e4d9e6d0b645ce44ffaf80f7aa9385e9c9095d9a383b3a348a92356cb5386c06544ab082a9a468c7 WHIRLPOOL 1648ee1be71e45fcf5a264816ce7edc7bab19bd28a68703923eb2d6068f1f0469ae593855231d31f88baecbf29e7cece2d6beeed20b7c04231a6c90e90d35910
 DIST patchbundle-selinux-base-policy-2.20141203-r8.tar.bz2 297919 SHA256 77539eb3d78105f8789cd8205d2698bd27e2abf100163bdd162cda860fd15120 SHA512 2f8a19e1e4bb65f32b480275f49099aed3ae9df543c7de862b3bbd93e81b89cd96dadac3d091e28673d09a6885db8c5656b3a77d0080775c110b04f2753de7a6 WHIRLPOOL 79cb7e620eb8e838192dc557c7a9ce7e713227d783cc8b63792825559b2145cad70d0af6f99948c1527557bc363feffd846c73893682b4a14fc7d08b9e20c649
+DIST patchbundle-selinux-base-policy-2.20141203-r9.tar.bz2 299602 SHA256 e8518004942a6c57170a609683e22b1410c93a2a195829c41dc8fbc703d941b5 SHA512 ce6484fbca1d2d074e50d1a3953392bd3ce0a4617df98fbac37747b469b4f160a9331586dfe1c3ddccb1ccbee24876a2f05ab49e37c8492a48baf83c2d01d140 WHIRLPOOL 1fd7b956e98e95a64c3a713a944d4531259bd156a7feabf6a89c4b5f33ac846377730eede97889e85183be086f282ebd18e860214f6ca3f01b40f2323470ee04
 DIST refpolicy-2.20140311.tar.bz2 664416 SHA256 f69437db95548c78a5dec44c236397146b144153149009ea554d2e536e5436f7 SHA512 50bacee82ed41ac8b8007ecc33bf51d22303cc2ddd27cfb72cb5520dab5f8e255186e34b89cec492c7a2d4220b200814bdede9b46c19f987a3d3d65a1c9b749a WHIRLPOOL e07480beba6ab1f02ad36b7d0c50c4a71cb39a8ec78bf8d1dc3c82bb9dd1d69d9169d7c937165ea15f60ce1147f256d46644f944107a3a8a800d5bad70d4c255
 DIST refpolicy-2.20141203.tar.bz2 680243 SHA256 f438209c430d8a2d4ddcbe4bdd3edb46f6af7dc4913637af0b73c635e40c1522 SHA512 682e4280c5799e4c12ec7594afc1389f67be35055748d2e0dbdc3419159a16c96d4946ca6178daee8370515951f8653b2e452efe8c962b8d7f9bc192f0b15a0c WHIRLPOOL 74bca232534e7af9051bb1ab9f77c1ff6c425781cf4561f781d6e9a40cc5ca0d9add540249ea5493e8782a9372aea296ead6c165c6c440ae1509eb319d151ee5
diff --git a/sec-policy/selinux-portmap/selinux-portmap-2.20141203-r8.ebuild b/sec-policy/selinux-portmap/selinux-portmap-2.20141203-r8.ebuild
index 8995d67b5428..d19358bd54ec 100644
--- a/sec-policy/selinux-portmap/selinux-portmap-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-portmap/selinux-portmap-2.20141203-r8.ebuild
@@ -13,5 +13,5 @@ DESCRIPTION="SELinux policy for portmap"
 if [[ $PV == 9999* ]] ; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-portmap/selinux-portmap-2.20141203-r9.ebuild b/sec-policy/selinux-portmap/selinux-portmap-2.20141203-r9.ebuild
new file mode 100644
index 000000000000..8995d67b5428
--- /dev/null
+++ b/sec-policy/selinux-portmap/selinux-portmap-2.20141203-r9.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI="5"
+
+IUSE=""
+MODS="portmap"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for portmap"
+
+if [[ $PV == 9999* ]] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
diff --git a/sec-policy/selinux-postfix/Manifest b/sec-policy/selinux-postfix/Manifest
index 8327a635be01..91d204b0021a 100644
--- a/sec-policy/selinux-postfix/Manifest
+++ b/sec-policy/selinux-postfix/Manifest
@@ -9,5 +9,6 @@ DIST patchbundle-selinux-base-policy-2.20141203-r5.tar.bz2 274136 SHA256 c23d17c
 DIST patchbundle-selinux-base-policy-2.20141203-r6.tar.bz2 293231 SHA256 b686dcc517b97834f66d967afdcc724cb43b5c6dbf9f34043a91cdeda2625cc7 SHA512 a2c486cbe4a1d21ff3fd01bef25ecf5a633a4072646c67cfccf3f7187d95f3d9e3b482a46ba17c55c40a8e7c0dee56e9cf9ddc9f414d3e4511443b62f60d03e9 WHIRLPOOL 3d708e287e3f9b873be647b0327eab6675a8702ee1cffb56e36934cada306e5ccc64397a083dad9e59de37a067e628cacbf896ae99012d5a209e42fd7cd8a4c6
 DIST patchbundle-selinux-base-policy-2.20141203-r7.tar.bz2 295833 SHA256 ba2219b3efc747be65f94c4d8ac3cd6ee530c82c848fa41935a114184678622a SHA512 8e32d9dbfb2f0f3f50200543aadb51ed9834ccd5cdf30bf8e4d9e6d0b645ce44ffaf80f7aa9385e9c9095d9a383b3a348a92356cb5386c06544ab082a9a468c7 WHIRLPOOL 1648ee1be71e45fcf5a264816ce7edc7bab19bd28a68703923eb2d6068f1f0469ae593855231d31f88baecbf29e7cece2d6beeed20b7c04231a6c90e90d35910
 DIST patchbundle-selinux-base-policy-2.20141203-r8.tar.bz2 297919 SHA256 77539eb3d78105f8789cd8205d2698bd27e2abf100163bdd162cda860fd15120 SHA512 2f8a19e1e4bb65f32b480275f49099aed3ae9df543c7de862b3bbd93e81b89cd96dadac3d091e28673d09a6885db8c5656b3a77d0080775c110b04f2753de7a6 WHIRLPOOL 79cb7e620eb8e838192dc557c7a9ce7e713227d783cc8b63792825559b2145cad70d0af6f99948c1527557bc363feffd846c73893682b4a14fc7d08b9e20c649
+DIST patchbundle-selinux-base-policy-2.20141203-r9.tar.bz2 299602 SHA256 e8518004942a6c57170a609683e22b1410c93a2a195829c41dc8fbc703d941b5 SHA512 ce6484fbca1d2d074e50d1a3953392bd3ce0a4617df98fbac37747b469b4f160a9331586dfe1c3ddccb1ccbee24876a2f05ab49e37c8492a48baf83c2d01d140 WHIRLPOOL 1fd7b956e98e95a64c3a713a944d4531259bd156a7feabf6a89c4b5f33ac846377730eede97889e85183be086f282ebd18e860214f6ca3f01b40f2323470ee04
 DIST refpolicy-2.20140311.tar.bz2 664416 SHA256 f69437db95548c78a5dec44c236397146b144153149009ea554d2e536e5436f7 SHA512 50bacee82ed41ac8b8007ecc33bf51d22303cc2ddd27cfb72cb5520dab5f8e255186e34b89cec492c7a2d4220b200814bdede9b46c19f987a3d3d65a1c9b749a WHIRLPOOL e07480beba6ab1f02ad36b7d0c50c4a71cb39a8ec78bf8d1dc3c82bb9dd1d69d9169d7c937165ea15f60ce1147f256d46644f944107a3a8a800d5bad70d4c255
 DIST refpolicy-2.20141203.tar.bz2 680243 SHA256 f438209c430d8a2d4ddcbe4bdd3edb46f6af7dc4913637af0b73c635e40c1522 SHA512 682e4280c5799e4c12ec7594afc1389f67be35055748d2e0dbdc3419159a16c96d4946ca6178daee8370515951f8653b2e452efe8c962b8d7f9bc192f0b15a0c WHIRLPOOL 74bca232534e7af9051bb1ab9f77c1ff6c425781cf4561f781d6e9a40cc5ca0d9add540249ea5493e8782a9372aea296ead6c165c6c440ae1509eb319d151ee5
diff --git a/sec-policy/selinux-postfix/selinux-postfix-2.20141203-r8.ebuild b/sec-policy/selinux-postfix/selinux-postfix-2.20141203-r8.ebuild
index 8eedcffa4283..b87f33dbddfd 100644
--- a/sec-policy/selinux-postfix/selinux-postfix-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-postfix/selinux-postfix-2.20141203-r8.ebuild
@@ -13,5 +13,5 @@ DESCRIPTION="SELinux policy for postfix"
 if [[ $PV == 9999* ]] ; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-postfix/selinux-postfix-2.20141203-r9.ebuild b/sec-policy/selinux-postfix/selinux-postfix-2.20141203-r9.ebuild
new file mode 100644
index 000000000000..8eedcffa4283
--- /dev/null
+++ b/sec-policy/selinux-postfix/selinux-postfix-2.20141203-r9.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI="5"
+
+IUSE=""
+MODS="postfix"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for postfix"
+
+if [[ $PV == 9999* ]] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
diff --git a/sec-policy/selinux-postgresql/Manifest b/sec-policy/selinux-postgresql/Manifest
index 8327a635be01..91d204b0021a 100644
--- a/sec-policy/selinux-postgresql/Manifest
+++ b/sec-policy/selinux-postgresql/Manifest
@@ -9,5 +9,6 @@ DIST patchbundle-selinux-base-policy-2.20141203-r5.tar.bz2 274136 SHA256 c23d17c
 DIST patchbundle-selinux-base-policy-2.20141203-r6.tar.bz2 293231 SHA256 b686dcc517b97834f66d967afdcc724cb43b5c6dbf9f34043a91cdeda2625cc7 SHA512 a2c486cbe4a1d21ff3fd01bef25ecf5a633a4072646c67cfccf3f7187d95f3d9e3b482a46ba17c55c40a8e7c0dee56e9cf9ddc9f414d3e4511443b62f60d03e9 WHIRLPOOL 3d708e287e3f9b873be647b0327eab6675a8702ee1cffb56e36934cada306e5ccc64397a083dad9e59de37a067e628cacbf896ae99012d5a209e42fd7cd8a4c6
 DIST patchbundle-selinux-base-policy-2.20141203-r7.tar.bz2 295833 SHA256 ba2219b3efc747be65f94c4d8ac3cd6ee530c82c848fa41935a114184678622a SHA512 8e32d9dbfb2f0f3f50200543aadb51ed9834ccd5cdf30bf8e4d9e6d0b645ce44ffaf80f7aa9385e9c9095d9a383b3a348a92356cb5386c06544ab082a9a468c7 WHIRLPOOL 1648ee1be71e45fcf5a264816ce7edc7bab19bd28a68703923eb2d6068f1f0469ae593855231d31f88baecbf29e7cece2d6beeed20b7c04231a6c90e90d35910
 DIST patchbundle-selinux-base-policy-2.20141203-r8.tar.bz2 297919 SHA256 77539eb3d78105f8789cd8205d2698bd27e2abf100163bdd162cda860fd15120 SHA512 2f8a19e1e4bb65f32b480275f49099aed3ae9df543c7de862b3bbd93e81b89cd96dadac3d091e28673d09a6885db8c5656b3a77d0080775c110b04f2753de7a6 WHIRLPOOL 79cb7e620eb8e838192dc557c7a9ce7e713227d783cc8b63792825559b2145cad70d0af6f99948c1527557bc363feffd846c73893682b4a14fc7d08b9e20c649
+DIST patchbundle-selinux-base-policy-2.20141203-r9.tar.bz2 299602 SHA256 e8518004942a6c57170a609683e22b1410c93a2a195829c41dc8fbc703d941b5 SHA512 ce6484fbca1d2d074e50d1a3953392bd3ce0a4617df98fbac37747b469b4f160a9331586dfe1c3ddccb1ccbee24876a2f05ab49e37c8492a48baf83c2d01d140 WHIRLPOOL 1fd7b956e98e95a64c3a713a944d4531259bd156a7feabf6a89c4b5f33ac846377730eede97889e85183be086f282ebd18e860214f6ca3f01b40f2323470ee04
 DIST refpolicy-2.20140311.tar.bz2 664416 SHA256 f69437db95548c78a5dec44c236397146b144153149009ea554d2e536e5436f7 SHA512 50bacee82ed41ac8b8007ecc33bf51d22303cc2ddd27cfb72cb5520dab5f8e255186e34b89cec492c7a2d4220b200814bdede9b46c19f987a3d3d65a1c9b749a WHIRLPOOL e07480beba6ab1f02ad36b7d0c50c4a71cb39a8ec78bf8d1dc3c82bb9dd1d69d9169d7c937165ea15f60ce1147f256d46644f944107a3a8a800d5bad70d4c255
 DIST refpolicy-2.20141203.tar.bz2 680243 SHA256 f438209c430d8a2d4ddcbe4bdd3edb46f6af7dc4913637af0b73c635e40c1522 SHA512 682e4280c5799e4c12ec7594afc1389f67be35055748d2e0dbdc3419159a16c96d4946ca6178daee8370515951f8653b2e452efe8c962b8d7f9bc192f0b15a0c WHIRLPOOL 74bca232534e7af9051bb1ab9f77c1ff6c425781cf4561f781d6e9a40cc5ca0d9add540249ea5493e8782a9372aea296ead6c165c6c440ae1509eb319d151ee5
diff --git a/sec-policy/selinux-postgresql/selinux-postgresql-2.20141203-r8.ebuild b/sec-policy/selinux-postgresql/selinux-postgresql-2.20141203-r8.ebuild
index d216e6d4636d..d17f4609561b 100644
--- a/sec-policy/selinux-postgresql/selinux-postgresql-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-postgresql/selinux-postgresql-2.20141203-r8.ebuild
@@ -13,5 +13,5 @@ DESCRIPTION="SELinux policy for postgresql"
 if [[ $PV == 9999* ]] ; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-postgresql/selinux-postgresql-2.20141203-r9.ebuild b/sec-policy/selinux-postgresql/selinux-postgresql-2.20141203-r9.ebuild
new file mode 100644
index 000000000000..d216e6d4636d
--- /dev/null
+++ b/sec-policy/selinux-postgresql/selinux-postgresql-2.20141203-r9.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI="5"
+
+IUSE=""
+MODS="postgresql"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for postgresql"
+
+if [[ $PV == 9999* ]] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
diff --git a/sec-policy/selinux-postgrey/Manifest b/sec-policy/selinux-postgrey/Manifest
index 8327a635be01..91d204b0021a 100644
--- a/sec-policy/selinux-postgrey/Manifest
+++ b/sec-policy/selinux-postgrey/Manifest
@@ -9,5 +9,6 @@ DIST patchbundle-selinux-base-policy-2.20141203-r5.tar.bz2 274136 SHA256 c23d17c
 DIST patchbundle-selinux-base-policy-2.20141203-r6.tar.bz2 293231 SHA256 b686dcc517b97834f66d967afdcc724cb43b5c6dbf9f34043a91cdeda2625cc7 SHA512 a2c486cbe4a1d21ff3fd01bef25ecf5a633a4072646c67cfccf3f7187d95f3d9e3b482a46ba17c55c40a8e7c0dee56e9cf9ddc9f414d3e4511443b62f60d03e9 WHIRLPOOL 3d708e287e3f9b873be647b0327eab6675a8702ee1cffb56e36934cada306e5ccc64397a083dad9e59de37a067e628cacbf896ae99012d5a209e42fd7cd8a4c6
 DIST patchbundle-selinux-base-policy-2.20141203-r7.tar.bz2 295833 SHA256 ba2219b3efc747be65f94c4d8ac3cd6ee530c82c848fa41935a114184678622a SHA512 8e32d9dbfb2f0f3f50200543aadb51ed9834ccd5cdf30bf8e4d9e6d0b645ce44ffaf80f7aa9385e9c9095d9a383b3a348a92356cb5386c06544ab082a9a468c7 WHIRLPOOL 1648ee1be71e45fcf5a264816ce7edc7bab19bd28a68703923eb2d6068f1f0469ae593855231d31f88baecbf29e7cece2d6beeed20b7c04231a6c90e90d35910
 DIST patchbundle-selinux-base-policy-2.20141203-r8.tar.bz2 297919 SHA256 77539eb3d78105f8789cd8205d2698bd27e2abf100163bdd162cda860fd15120 SHA512 2f8a19e1e4bb65f32b480275f49099aed3ae9df543c7de862b3bbd93e81b89cd96dadac3d091e28673d09a6885db8c5656b3a77d0080775c110b04f2753de7a6 WHIRLPOOL 79cb7e620eb8e838192dc557c7a9ce7e713227d783cc8b63792825559b2145cad70d0af6f99948c1527557bc363feffd846c73893682b4a14fc7d08b9e20c649
+DIST patchbundle-selinux-base-policy-2.20141203-r9.tar.bz2 299602 SHA256 e8518004942a6c57170a609683e22b1410c93a2a195829c41dc8fbc703d941b5 SHA512 ce6484fbca1d2d074e50d1a3953392bd3ce0a4617df98fbac37747b469b4f160a9331586dfe1c3ddccb1ccbee24876a2f05ab49e37c8492a48baf83c2d01d140 WHIRLPOOL 1fd7b956e98e95a64c3a713a944d4531259bd156a7feabf6a89c4b5f33ac846377730eede97889e85183be086f282ebd18e860214f6ca3f01b40f2323470ee04
 DIST refpolicy-2.20140311.tar.bz2 664416 SHA256 f69437db95548c78a5dec44c236397146b144153149009ea554d2e536e5436f7 SHA512 50bacee82ed41ac8b8007ecc33bf51d22303cc2ddd27cfb72cb5520dab5f8e255186e34b89cec492c7a2d4220b200814bdede9b46c19f987a3d3d65a1c9b749a WHIRLPOOL e07480beba6ab1f02ad36b7d0c50c4a71cb39a8ec78bf8d1dc3c82bb9dd1d69d9169d7c937165ea15f60ce1147f256d46644f944107a3a8a800d5bad70d4c255
 DIST refpolicy-2.20141203.tar.bz2 680243 SHA256 f438209c430d8a2d4ddcbe4bdd3edb46f6af7dc4913637af0b73c635e40c1522 SHA512 682e4280c5799e4c12ec7594afc1389f67be35055748d2e0dbdc3419159a16c96d4946ca6178daee8370515951f8653b2e452efe8c962b8d7f9bc192f0b15a0c WHIRLPOOL 74bca232534e7af9051bb1ab9f77c1ff6c425781cf4561f781d6e9a40cc5ca0d9add540249ea5493e8782a9372aea296ead6c165c6c440ae1509eb319d151ee5
diff --git a/sec-policy/selinux-postgrey/selinux-postgrey-2.20141203-r8.ebuild b/sec-policy/selinux-postgrey/selinux-postgrey-2.20141203-r8.ebuild
index 58b38a0b5055..b002f12bd749 100644
--- a/sec-policy/selinux-postgrey/selinux-postgrey-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-postgrey/selinux-postgrey-2.20141203-r8.ebuild
@@ -13,5 +13,5 @@ DESCRIPTION="SELinux policy for postgrey"
 if [[ $PV == 9999* ]] ; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-postgrey/selinux-postgrey-2.20141203-r9.ebuild b/sec-policy/selinux-postgrey/selinux-postgrey-2.20141203-r9.ebuild
new file mode 100644
index 000000000000..58b38a0b5055
--- /dev/null
+++ b/sec-policy/selinux-postgrey/selinux-postgrey-2.20141203-r9.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI="5"
+
+IUSE=""
+MODS="postgrey"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for postgrey"
+
+if [[ $PV == 9999* ]] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
diff --git a/sec-policy/selinux-ppp/Manifest b/sec-policy/selinux-ppp/Manifest
index 8327a635be01..91d204b0021a 100644
--- a/sec-policy/selinux-ppp/Manifest
+++ b/sec-policy/selinux-ppp/Manifest
@@ -9,5 +9,6 @@ DIST patchbundle-selinux-base-policy-2.20141203-r5.tar.bz2 274136 SHA256 c23d17c
 DIST patchbundle-selinux-base-policy-2.20141203-r6.tar.bz2 293231 SHA256 b686dcc517b97834f66d967afdcc724cb43b5c6dbf9f34043a91cdeda2625cc7 SHA512 a2c486cbe4a1d21ff3fd01bef25ecf5a633a4072646c67cfccf3f7187d95f3d9e3b482a46ba17c55c40a8e7c0dee56e9cf9ddc9f414d3e4511443b62f60d03e9 WHIRLPOOL 3d708e287e3f9b873be647b0327eab6675a8702ee1cffb56e36934cada306e5ccc64397a083dad9e59de37a067e628cacbf896ae99012d5a209e42fd7cd8a4c6
 DIST patchbundle-selinux-base-policy-2.20141203-r7.tar.bz2 295833 SHA256 ba2219b3efc747be65f94c4d8ac3cd6ee530c82c848fa41935a114184678622a SHA512 8e32d9dbfb2f0f3f50200543aadb51ed9834ccd5cdf30bf8e4d9e6d0b645ce44ffaf80f7aa9385e9c9095d9a383b3a348a92356cb5386c06544ab082a9a468c7 WHIRLPOOL 1648ee1be71e45fcf5a264816ce7edc7bab19bd28a68703923eb2d6068f1f0469ae593855231d31f88baecbf29e7cece2d6beeed20b7c04231a6c90e90d35910
 DIST patchbundle-selinux-base-policy-2.20141203-r8.tar.bz2 297919 SHA256 77539eb3d78105f8789cd8205d2698bd27e2abf100163bdd162cda860fd15120 SHA512 2f8a19e1e4bb65f32b480275f49099aed3ae9df543c7de862b3bbd93e81b89cd96dadac3d091e28673d09a6885db8c5656b3a77d0080775c110b04f2753de7a6 WHIRLPOOL 79cb7e620eb8e838192dc557c7a9ce7e713227d783cc8b63792825559b2145cad70d0af6f99948c1527557bc363feffd846c73893682b4a14fc7d08b9e20c649
+DIST patchbundle-selinux-base-policy-2.20141203-r9.tar.bz2 299602 SHA256 e8518004942a6c57170a609683e22b1410c93a2a195829c41dc8fbc703d941b5 SHA512 ce6484fbca1d2d074e50d1a3953392bd3ce0a4617df98fbac37747b469b4f160a9331586dfe1c3ddccb1ccbee24876a2f05ab49e37c8492a48baf83c2d01d140 WHIRLPOOL 1fd7b956e98e95a64c3a713a944d4531259bd156a7feabf6a89c4b5f33ac846377730eede97889e85183be086f282ebd18e860214f6ca3f01b40f2323470ee04
 DIST refpolicy-2.20140311.tar.bz2 664416 SHA256 f69437db95548c78a5dec44c236397146b144153149009ea554d2e536e5436f7 SHA512 50bacee82ed41ac8b8007ecc33bf51d22303cc2ddd27cfb72cb5520dab5f8e255186e34b89cec492c7a2d4220b200814bdede9b46c19f987a3d3d65a1c9b749a WHIRLPOOL e07480beba6ab1f02ad36b7d0c50c4a71cb39a8ec78bf8d1dc3c82bb9dd1d69d9169d7c937165ea15f60ce1147f256d46644f944107a3a8a800d5bad70d4c255
 DIST refpolicy-2.20141203.tar.bz2 680243 SHA256 f438209c430d8a2d4ddcbe4bdd3edb46f6af7dc4913637af0b73c635e40c1522 SHA512 682e4280c5799e4c12ec7594afc1389f67be35055748d2e0dbdc3419159a16c96d4946ca6178daee8370515951f8653b2e452efe8c962b8d7f9bc192f0b15a0c WHIRLPOOL 74bca232534e7af9051bb1ab9f77c1ff6c425781cf4561f781d6e9a40cc5ca0d9add540249ea5493e8782a9372aea296ead6c165c6c440ae1509eb319d151ee5
diff --git a/sec-policy/selinux-ppp/selinux-ppp-2.20141203-r8.ebuild b/sec-policy/selinux-ppp/selinux-ppp-2.20141203-r8.ebuild
index 6129bb5266ab..70614b2c6e04 100644
--- a/sec-policy/selinux-ppp/selinux-ppp-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-ppp/selinux-ppp-2.20141203-r8.ebuild
@@ -13,5 +13,5 @@ DESCRIPTION="SELinux policy for ppp"
 if [[ $PV == 9999* ]] ; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-ppp/selinux-ppp-2.20141203-r9.ebuild b/sec-policy/selinux-ppp/selinux-ppp-2.20141203-r9.ebuild
new file mode 100644
index 000000000000..6129bb5266ab
--- /dev/null
+++ b/sec-policy/selinux-ppp/selinux-ppp-2.20141203-r9.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI="5"
+
+IUSE=""
+MODS="ppp"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for ppp"
+
+if [[ $PV == 9999* ]] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
diff --git a/sec-policy/selinux-prelink/Manifest b/sec-policy/selinux-prelink/Manifest
index 8327a635be01..91d204b0021a 100644
--- a/sec-policy/selinux-prelink/Manifest
+++ b/sec-policy/selinux-prelink/Manifest
@@ -9,5 +9,6 @@ DIST patchbundle-selinux-base-policy-2.20141203-r5.tar.bz2 274136 SHA256 c23d17c
 DIST patchbundle-selinux-base-policy-2.20141203-r6.tar.bz2 293231 SHA256 b686dcc517b97834f66d967afdcc724cb43b5c6dbf9f34043a91cdeda2625cc7 SHA512 a2c486cbe4a1d21ff3fd01bef25ecf5a633a4072646c67cfccf3f7187d95f3d9e3b482a46ba17c55c40a8e7c0dee56e9cf9ddc9f414d3e4511443b62f60d03e9 WHIRLPOOL 3d708e287e3f9b873be647b0327eab6675a8702ee1cffb56e36934cada306e5ccc64397a083dad9e59de37a067e628cacbf896ae99012d5a209e42fd7cd8a4c6
 DIST patchbundle-selinux-base-policy-2.20141203-r7.tar.bz2 295833 SHA256 ba2219b3efc747be65f94c4d8ac3cd6ee530c82c848fa41935a114184678622a SHA512 8e32d9dbfb2f0f3f50200543aadb51ed9834ccd5cdf30bf8e4d9e6d0b645ce44ffaf80f7aa9385e9c9095d9a383b3a348a92356cb5386c06544ab082a9a468c7 WHIRLPOOL 1648ee1be71e45fcf5a264816ce7edc7bab19bd28a68703923eb2d6068f1f0469ae593855231d31f88baecbf29e7cece2d6beeed20b7c04231a6c90e90d35910
 DIST patchbundle-selinux-base-policy-2.20141203-r8.tar.bz2 297919 SHA256 77539eb3d78105f8789cd8205d2698bd27e2abf100163bdd162cda860fd15120 SHA512 2f8a19e1e4bb65f32b480275f49099aed3ae9df543c7de862b3bbd93e81b89cd96dadac3d091e28673d09a6885db8c5656b3a77d0080775c110b04f2753de7a6 WHIRLPOOL 79cb7e620eb8e838192dc557c7a9ce7e713227d783cc8b63792825559b2145cad70d0af6f99948c1527557bc363feffd846c73893682b4a14fc7d08b9e20c649
+DIST patchbundle-selinux-base-policy-2.20141203-r9.tar.bz2 299602 SHA256 e8518004942a6c57170a609683e22b1410c93a2a195829c41dc8fbc703d941b5 SHA512 ce6484fbca1d2d074e50d1a3953392bd3ce0a4617df98fbac37747b469b4f160a9331586dfe1c3ddccb1ccbee24876a2f05ab49e37c8492a48baf83c2d01d140 WHIRLPOOL 1fd7b956e98e95a64c3a713a944d4531259bd156a7feabf6a89c4b5f33ac846377730eede97889e85183be086f282ebd18e860214f6ca3f01b40f2323470ee04
 DIST refpolicy-2.20140311.tar.bz2 664416 SHA256 f69437db95548c78a5dec44c236397146b144153149009ea554d2e536e5436f7 SHA512 50bacee82ed41ac8b8007ecc33bf51d22303cc2ddd27cfb72cb5520dab5f8e255186e34b89cec492c7a2d4220b200814bdede9b46c19f987a3d3d65a1c9b749a WHIRLPOOL e07480beba6ab1f02ad36b7d0c50c4a71cb39a8ec78bf8d1dc3c82bb9dd1d69d9169d7c937165ea15f60ce1147f256d46644f944107a3a8a800d5bad70d4c255
 DIST refpolicy-2.20141203.tar.bz2 680243 SHA256 f438209c430d8a2d4ddcbe4bdd3edb46f6af7dc4913637af0b73c635e40c1522 SHA512 682e4280c5799e4c12ec7594afc1389f67be35055748d2e0dbdc3419159a16c96d4946ca6178daee8370515951f8653b2e452efe8c962b8d7f9bc192f0b15a0c WHIRLPOOL 74bca232534e7af9051bb1ab9f77c1ff6c425781cf4561f781d6e9a40cc5ca0d9add540249ea5493e8782a9372aea296ead6c165c6c440ae1509eb319d151ee5
diff --git a/sec-policy/selinux-prelink/selinux-prelink-2.20141203-r8.ebuild b/sec-policy/selinux-prelink/selinux-prelink-2.20141203-r8.ebuild
index 810014c8ed0c..f9a110013c3d 100644
--- a/sec-policy/selinux-prelink/selinux-prelink-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-prelink/selinux-prelink-2.20141203-r8.ebuild
@@ -13,5 +13,5 @@ DESCRIPTION="SELinux policy for prelink"
 if [[ $PV == 9999* ]] ; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-prelink/selinux-prelink-2.20141203-r9.ebuild b/sec-policy/selinux-prelink/selinux-prelink-2.20141203-r9.ebuild
new file mode 100644
index 000000000000..810014c8ed0c
--- /dev/null
+++ b/sec-policy/selinux-prelink/selinux-prelink-2.20141203-r9.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI="5"
+
+IUSE=""
+MODS="prelink"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for prelink"
+
+if [[ $PV == 9999* ]] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
diff --git a/sec-policy/selinux-prelude/Manifest b/sec-policy/selinux-prelude/Manifest
index 8327a635be01..91d204b0021a 100644
--- a/sec-policy/selinux-prelude/Manifest
+++ b/sec-policy/selinux-prelude/Manifest
@@ -9,5 +9,6 @@ DIST patchbundle-selinux-base-policy-2.20141203-r5.tar.bz2 274136 SHA256 c23d17c
 DIST patchbundle-selinux-base-policy-2.20141203-r6.tar.bz2 293231 SHA256 b686dcc517b97834f66d967afdcc724cb43b5c6dbf9f34043a91cdeda2625cc7 SHA512 a2c486cbe4a1d21ff3fd01bef25ecf5a633a4072646c67cfccf3f7187d95f3d9e3b482a46ba17c55c40a8e7c0dee56e9cf9ddc9f414d3e4511443b62f60d03e9 WHIRLPOOL 3d708e287e3f9b873be647b0327eab6675a8702ee1cffb56e36934cada306e5ccc64397a083dad9e59de37a067e628cacbf896ae99012d5a209e42fd7cd8a4c6
 DIST patchbundle-selinux-base-policy-2.20141203-r7.tar.bz2 295833 SHA256 ba2219b3efc747be65f94c4d8ac3cd6ee530c82c848fa41935a114184678622a SHA512 8e32d9dbfb2f0f3f50200543aadb51ed9834ccd5cdf30bf8e4d9e6d0b645ce44ffaf80f7aa9385e9c9095d9a383b3a348a92356cb5386c06544ab082a9a468c7 WHIRLPOOL 1648ee1be71e45fcf5a264816ce7edc7bab19bd28a68703923eb2d6068f1f0469ae593855231d31f88baecbf29e7cece2d6beeed20b7c04231a6c90e90d35910
 DIST patchbundle-selinux-base-policy-2.20141203-r8.tar.bz2 297919 SHA256 77539eb3d78105f8789cd8205d2698bd27e2abf100163bdd162cda860fd15120 SHA512 2f8a19e1e4bb65f32b480275f49099aed3ae9df543c7de862b3bbd93e81b89cd96dadac3d091e28673d09a6885db8c5656b3a77d0080775c110b04f2753de7a6 WHIRLPOOL 79cb7e620eb8e838192dc557c7a9ce7e713227d783cc8b63792825559b2145cad70d0af6f99948c1527557bc363feffd846c73893682b4a14fc7d08b9e20c649
+DIST patchbundle-selinux-base-policy-2.20141203-r9.tar.bz2 299602 SHA256 e8518004942a6c57170a609683e22b1410c93a2a195829c41dc8fbc703d941b5 SHA512 ce6484fbca1d2d074e50d1a3953392bd3ce0a4617df98fbac37747b469b4f160a9331586dfe1c3ddccb1ccbee24876a2f05ab49e37c8492a48baf83c2d01d140 WHIRLPOOL 1fd7b956e98e95a64c3a713a944d4531259bd156a7feabf6a89c4b5f33ac846377730eede97889e85183be086f282ebd18e860214f6ca3f01b40f2323470ee04
 DIST refpolicy-2.20140311.tar.bz2 664416 SHA256 f69437db95548c78a5dec44c236397146b144153149009ea554d2e536e5436f7 SHA512 50bacee82ed41ac8b8007ecc33bf51d22303cc2ddd27cfb72cb5520dab5f8e255186e34b89cec492c7a2d4220b200814bdede9b46c19f987a3d3d65a1c9b749a WHIRLPOOL e07480beba6ab1f02ad36b7d0c50c4a71cb39a8ec78bf8d1dc3c82bb9dd1d69d9169d7c937165ea15f60ce1147f256d46644f944107a3a8a800d5bad70d4c255
 DIST refpolicy-2.20141203.tar.bz2 680243 SHA256 f438209c430d8a2d4ddcbe4bdd3edb46f6af7dc4913637af0b73c635e40c1522 SHA512 682e4280c5799e4c12ec7594afc1389f67be35055748d2e0dbdc3419159a16c96d4946ca6178daee8370515951f8653b2e452efe8c962b8d7f9bc192f0b15a0c WHIRLPOOL 74bca232534e7af9051bb1ab9f77c1ff6c425781cf4561f781d6e9a40cc5ca0d9add540249ea5493e8782a9372aea296ead6c165c6c440ae1509eb319d151ee5
diff --git a/sec-policy/selinux-prelude/selinux-prelude-2.20141203-r8.ebuild b/sec-policy/selinux-prelude/selinux-prelude-2.20141203-r8.ebuild
index af325acad96d..b08b1c81bada 100644
--- a/sec-policy/selinux-prelude/selinux-prelude-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-prelude/selinux-prelude-2.20141203-r8.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="SELinux policy for prelude"
 if [[ $PV == 9999* ]] ; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-apache
diff --git a/sec-policy/selinux-prelude/selinux-prelude-2.20141203-r9.ebuild b/sec-policy/selinux-prelude/selinux-prelude-2.20141203-r9.ebuild
new file mode 100644
index 000000000000..af325acad96d
--- /dev/null
+++ b/sec-policy/selinux-prelude/selinux-prelude-2.20141203-r9.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI="5"
+
+IUSE=""
+MODS="prelude"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for prelude"
+
+if [[ $PV == 9999* ]] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
+DEPEND="${DEPEND}
+	sec-policy/selinux-apache
+"
+RDEPEND="${RDEPEND}
+	sec-policy/selinux-apache
+"
diff --git a/sec-policy/selinux-privoxy/Manifest b/sec-policy/selinux-privoxy/Manifest
index 8327a635be01..91d204b0021a 100644
--- a/sec-policy/selinux-privoxy/Manifest
+++ b/sec-policy/selinux-privoxy/Manifest
@@ -9,5 +9,6 @@ DIST patchbundle-selinux-base-policy-2.20141203-r5.tar.bz2 274136 SHA256 c23d17c
 DIST patchbundle-selinux-base-policy-2.20141203-r6.tar.bz2 293231 SHA256 b686dcc517b97834f66d967afdcc724cb43b5c6dbf9f34043a91cdeda2625cc7 SHA512 a2c486cbe4a1d21ff3fd01bef25ecf5a633a4072646c67cfccf3f7187d95f3d9e3b482a46ba17c55c40a8e7c0dee56e9cf9ddc9f414d3e4511443b62f60d03e9 WHIRLPOOL 3d708e287e3f9b873be647b0327eab6675a8702ee1cffb56e36934cada306e5ccc64397a083dad9e59de37a067e628cacbf896ae99012d5a209e42fd7cd8a4c6
 DIST patchbundle-selinux-base-policy-2.20141203-r7.tar.bz2 295833 SHA256 ba2219b3efc747be65f94c4d8ac3cd6ee530c82c848fa41935a114184678622a SHA512 8e32d9dbfb2f0f3f50200543aadb51ed9834ccd5cdf30bf8e4d9e6d0b645ce44ffaf80f7aa9385e9c9095d9a383b3a348a92356cb5386c06544ab082a9a468c7 WHIRLPOOL 1648ee1be71e45fcf5a264816ce7edc7bab19bd28a68703923eb2d6068f1f0469ae593855231d31f88baecbf29e7cece2d6beeed20b7c04231a6c90e90d35910
 DIST patchbundle-selinux-base-policy-2.20141203-r8.tar.bz2 297919 SHA256 77539eb3d78105f8789cd8205d2698bd27e2abf100163bdd162cda860fd15120 SHA512 2f8a19e1e4bb65f32b480275f49099aed3ae9df543c7de862b3bbd93e81b89cd96dadac3d091e28673d09a6885db8c5656b3a77d0080775c110b04f2753de7a6 WHIRLPOOL 79cb7e620eb8e838192dc557c7a9ce7e713227d783cc8b63792825559b2145cad70d0af6f99948c1527557bc363feffd846c73893682b4a14fc7d08b9e20c649
+DIST patchbundle-selinux-base-policy-2.20141203-r9.tar.bz2 299602 SHA256 e8518004942a6c57170a609683e22b1410c93a2a195829c41dc8fbc703d941b5 SHA512 ce6484fbca1d2d074e50d1a3953392bd3ce0a4617df98fbac37747b469b4f160a9331586dfe1c3ddccb1ccbee24876a2f05ab49e37c8492a48baf83c2d01d140 WHIRLPOOL 1fd7b956e98e95a64c3a713a944d4531259bd156a7feabf6a89c4b5f33ac846377730eede97889e85183be086f282ebd18e860214f6ca3f01b40f2323470ee04
 DIST refpolicy-2.20140311.tar.bz2 664416 SHA256 f69437db95548c78a5dec44c236397146b144153149009ea554d2e536e5436f7 SHA512 50bacee82ed41ac8b8007ecc33bf51d22303cc2ddd27cfb72cb5520dab5f8e255186e34b89cec492c7a2d4220b200814bdede9b46c19f987a3d3d65a1c9b749a WHIRLPOOL e07480beba6ab1f02ad36b7d0c50c4a71cb39a8ec78bf8d1dc3c82bb9dd1d69d9169d7c937165ea15f60ce1147f256d46644f944107a3a8a800d5bad70d4c255
 DIST refpolicy-2.20141203.tar.bz2 680243 SHA256 f438209c430d8a2d4ddcbe4bdd3edb46f6af7dc4913637af0b73c635e40c1522 SHA512 682e4280c5799e4c12ec7594afc1389f67be35055748d2e0dbdc3419159a16c96d4946ca6178daee8370515951f8653b2e452efe8c962b8d7f9bc192f0b15a0c WHIRLPOOL 74bca232534e7af9051bb1ab9f77c1ff6c425781cf4561f781d6e9a40cc5ca0d9add540249ea5493e8782a9372aea296ead6c165c6c440ae1509eb319d151ee5
diff --git a/sec-policy/selinux-privoxy/selinux-privoxy-2.20141203-r8.ebuild b/sec-policy/selinux-privoxy/selinux-privoxy-2.20141203-r8.ebuild
index 1560ea2cd6be..685e03b7d28f 100644
--- a/sec-policy/selinux-privoxy/selinux-privoxy-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-privoxy/selinux-privoxy-2.20141203-r8.ebuild
@@ -13,5 +13,5 @@ DESCRIPTION="SELinux policy for privoxy"
 if [[ $PV == 9999* ]] ; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-privoxy/selinux-privoxy-2.20141203-r9.ebuild b/sec-policy/selinux-privoxy/selinux-privoxy-2.20141203-r9.ebuild
new file mode 100644
index 000000000000..1560ea2cd6be
--- /dev/null
+++ b/sec-policy/selinux-privoxy/selinux-privoxy-2.20141203-r9.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI="5"
+
+IUSE=""
+MODS="privoxy"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for privoxy"
+
+if [[ $PV == 9999* ]] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
diff --git a/sec-policy/selinux-procmail/Manifest b/sec-policy/selinux-procmail/Manifest
index 8327a635be01..91d204b0021a 100644
--- a/sec-policy/selinux-procmail/Manifest
+++ b/sec-policy/selinux-procmail/Manifest
@@ -9,5 +9,6 @@ DIST patchbundle-selinux-base-policy-2.20141203-r5.tar.bz2 274136 SHA256 c23d17c
 DIST patchbundle-selinux-base-policy-2.20141203-r6.tar.bz2 293231 SHA256 b686dcc517b97834f66d967afdcc724cb43b5c6dbf9f34043a91cdeda2625cc7 SHA512 a2c486cbe4a1d21ff3fd01bef25ecf5a633a4072646c67cfccf3f7187d95f3d9e3b482a46ba17c55c40a8e7c0dee56e9cf9ddc9f414d3e4511443b62f60d03e9 WHIRLPOOL 3d708e287e3f9b873be647b0327eab6675a8702ee1cffb56e36934cada306e5ccc64397a083dad9e59de37a067e628cacbf896ae99012d5a209e42fd7cd8a4c6
 DIST patchbundle-selinux-base-policy-2.20141203-r7.tar.bz2 295833 SHA256 ba2219b3efc747be65f94c4d8ac3cd6ee530c82c848fa41935a114184678622a SHA512 8e32d9dbfb2f0f3f50200543aadb51ed9834ccd5cdf30bf8e4d9e6d0b645ce44ffaf80f7aa9385e9c9095d9a383b3a348a92356cb5386c06544ab082a9a468c7 WHIRLPOOL 1648ee1be71e45fcf5a264816ce7edc7bab19bd28a68703923eb2d6068f1f0469ae593855231d31f88baecbf29e7cece2d6beeed20b7c04231a6c90e90d35910
 DIST patchbundle-selinux-base-policy-2.20141203-r8.tar.bz2 297919 SHA256 77539eb3d78105f8789cd8205d2698bd27e2abf100163bdd162cda860fd15120 SHA512 2f8a19e1e4bb65f32b480275f49099aed3ae9df543c7de862b3bbd93e81b89cd96dadac3d091e28673d09a6885db8c5656b3a77d0080775c110b04f2753de7a6 WHIRLPOOL 79cb7e620eb8e838192dc557c7a9ce7e713227d783cc8b63792825559b2145cad70d0af6f99948c1527557bc363feffd846c73893682b4a14fc7d08b9e20c649
+DIST patchbundle-selinux-base-policy-2.20141203-r9.tar.bz2 299602 SHA256 e8518004942a6c57170a609683e22b1410c93a2a195829c41dc8fbc703d941b5 SHA512 ce6484fbca1d2d074e50d1a3953392bd3ce0a4617df98fbac37747b469b4f160a9331586dfe1c3ddccb1ccbee24876a2f05ab49e37c8492a48baf83c2d01d140 WHIRLPOOL 1fd7b956e98e95a64c3a713a944d4531259bd156a7feabf6a89c4b5f33ac846377730eede97889e85183be086f282ebd18e860214f6ca3f01b40f2323470ee04
 DIST refpolicy-2.20140311.tar.bz2 664416 SHA256 f69437db95548c78a5dec44c236397146b144153149009ea554d2e536e5436f7 SHA512 50bacee82ed41ac8b8007ecc33bf51d22303cc2ddd27cfb72cb5520dab5f8e255186e34b89cec492c7a2d4220b200814bdede9b46c19f987a3d3d65a1c9b749a WHIRLPOOL e07480beba6ab1f02ad36b7d0c50c4a71cb39a8ec78bf8d1dc3c82bb9dd1d69d9169d7c937165ea15f60ce1147f256d46644f944107a3a8a800d5bad70d4c255
 DIST refpolicy-2.20141203.tar.bz2 680243 SHA256 f438209c430d8a2d4ddcbe4bdd3edb46f6af7dc4913637af0b73c635e40c1522 SHA512 682e4280c5799e4c12ec7594afc1389f67be35055748d2e0dbdc3419159a16c96d4946ca6178daee8370515951f8653b2e452efe8c962b8d7f9bc192f0b15a0c WHIRLPOOL 74bca232534e7af9051bb1ab9f77c1ff6c425781cf4561f781d6e9a40cc5ca0d9add540249ea5493e8782a9372aea296ead6c165c6c440ae1509eb319d151ee5
diff --git a/sec-policy/selinux-procmail/selinux-procmail-2.20141203-r8.ebuild b/sec-policy/selinux-procmail/selinux-procmail-2.20141203-r8.ebuild
index e12dca38246e..c269a5cda2ff 100644
--- a/sec-policy/selinux-procmail/selinux-procmail-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-procmail/selinux-procmail-2.20141203-r8.ebuild
@@ -13,5 +13,5 @@ DESCRIPTION="SELinux policy for procmail"
 if [[ $PV == 9999* ]] ; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-procmail/selinux-procmail-2.20141203-r9.ebuild b/sec-policy/selinux-procmail/selinux-procmail-2.20141203-r9.ebuild
new file mode 100644
index 000000000000..e12dca38246e
--- /dev/null
+++ b/sec-policy/selinux-procmail/selinux-procmail-2.20141203-r9.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI="5"
+
+IUSE=""
+MODS="procmail"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for procmail"
+
+if [[ $PV == 9999* ]] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
diff --git a/sec-policy/selinux-psad/Manifest b/sec-policy/selinux-psad/Manifest
index 8327a635be01..91d204b0021a 100644
--- a/sec-policy/selinux-psad/Manifest
+++ b/sec-policy/selinux-psad/Manifest
@@ -9,5 +9,6 @@ DIST patchbundle-selinux-base-policy-2.20141203-r5.tar.bz2 274136 SHA256 c23d17c
 DIST patchbundle-selinux-base-policy-2.20141203-r6.tar.bz2 293231 SHA256 b686dcc517b97834f66d967afdcc724cb43b5c6dbf9f34043a91cdeda2625cc7 SHA512 a2c486cbe4a1d21ff3fd01bef25ecf5a633a4072646c67cfccf3f7187d95f3d9e3b482a46ba17c55c40a8e7c0dee56e9cf9ddc9f414d3e4511443b62f60d03e9 WHIRLPOOL 3d708e287e3f9b873be647b0327eab6675a8702ee1cffb56e36934cada306e5ccc64397a083dad9e59de37a067e628cacbf896ae99012d5a209e42fd7cd8a4c6
 DIST patchbundle-selinux-base-policy-2.20141203-r7.tar.bz2 295833 SHA256 ba2219b3efc747be65f94c4d8ac3cd6ee530c82c848fa41935a114184678622a SHA512 8e32d9dbfb2f0f3f50200543aadb51ed9834ccd5cdf30bf8e4d9e6d0b645ce44ffaf80f7aa9385e9c9095d9a383b3a348a92356cb5386c06544ab082a9a468c7 WHIRLPOOL 1648ee1be71e45fcf5a264816ce7edc7bab19bd28a68703923eb2d6068f1f0469ae593855231d31f88baecbf29e7cece2d6beeed20b7c04231a6c90e90d35910
 DIST patchbundle-selinux-base-policy-2.20141203-r8.tar.bz2 297919 SHA256 77539eb3d78105f8789cd8205d2698bd27e2abf100163bdd162cda860fd15120 SHA512 2f8a19e1e4bb65f32b480275f49099aed3ae9df543c7de862b3bbd93e81b89cd96dadac3d091e28673d09a6885db8c5656b3a77d0080775c110b04f2753de7a6 WHIRLPOOL 79cb7e620eb8e838192dc557c7a9ce7e713227d783cc8b63792825559b2145cad70d0af6f99948c1527557bc363feffd846c73893682b4a14fc7d08b9e20c649
+DIST patchbundle-selinux-base-policy-2.20141203-r9.tar.bz2 299602 SHA256 e8518004942a6c57170a609683e22b1410c93a2a195829c41dc8fbc703d941b5 SHA512 ce6484fbca1d2d074e50d1a3953392bd3ce0a4617df98fbac37747b469b4f160a9331586dfe1c3ddccb1ccbee24876a2f05ab49e37c8492a48baf83c2d01d140 WHIRLPOOL 1fd7b956e98e95a64c3a713a944d4531259bd156a7feabf6a89c4b5f33ac846377730eede97889e85183be086f282ebd18e860214f6ca3f01b40f2323470ee04
 DIST refpolicy-2.20140311.tar.bz2 664416 SHA256 f69437db95548c78a5dec44c236397146b144153149009ea554d2e536e5436f7 SHA512 50bacee82ed41ac8b8007ecc33bf51d22303cc2ddd27cfb72cb5520dab5f8e255186e34b89cec492c7a2d4220b200814bdede9b46c19f987a3d3d65a1c9b749a WHIRLPOOL e07480beba6ab1f02ad36b7d0c50c4a71cb39a8ec78bf8d1dc3c82bb9dd1d69d9169d7c937165ea15f60ce1147f256d46644f944107a3a8a800d5bad70d4c255
 DIST refpolicy-2.20141203.tar.bz2 680243 SHA256 f438209c430d8a2d4ddcbe4bdd3edb46f6af7dc4913637af0b73c635e40c1522 SHA512 682e4280c5799e4c12ec7594afc1389f67be35055748d2e0dbdc3419159a16c96d4946ca6178daee8370515951f8653b2e452efe8c962b8d7f9bc192f0b15a0c WHIRLPOOL 74bca232534e7af9051bb1ab9f77c1ff6c425781cf4561f781d6e9a40cc5ca0d9add540249ea5493e8782a9372aea296ead6c165c6c440ae1509eb319d151ee5
diff --git a/sec-policy/selinux-psad/selinux-psad-2.20141203-r8.ebuild b/sec-policy/selinux-psad/selinux-psad-2.20141203-r8.ebuild
index f776c6464a48..dec8eb033334 100644
--- a/sec-policy/selinux-psad/selinux-psad-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-psad/selinux-psad-2.20141203-r8.ebuild
@@ -13,5 +13,5 @@ DESCRIPTION="SELinux policy for psad"
 if [[ $PV == 9999* ]] ; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-psad/selinux-psad-2.20141203-r9.ebuild b/sec-policy/selinux-psad/selinux-psad-2.20141203-r9.ebuild
new file mode 100644
index 000000000000..f776c6464a48
--- /dev/null
+++ b/sec-policy/selinux-psad/selinux-psad-2.20141203-r9.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI="5"
+
+IUSE=""
+MODS="psad"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for psad"
+
+if [[ $PV == 9999* ]] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
diff --git a/sec-policy/selinux-publicfile/Manifest b/sec-policy/selinux-publicfile/Manifest
index 8327a635be01..91d204b0021a 100644
--- a/sec-policy/selinux-publicfile/Manifest
+++ b/sec-policy/selinux-publicfile/Manifest
@@ -9,5 +9,6 @@ DIST patchbundle-selinux-base-policy-2.20141203-r5.tar.bz2 274136 SHA256 c23d17c
 DIST patchbundle-selinux-base-policy-2.20141203-r6.tar.bz2 293231 SHA256 b686dcc517b97834f66d967afdcc724cb43b5c6dbf9f34043a91cdeda2625cc7 SHA512 a2c486cbe4a1d21ff3fd01bef25ecf5a633a4072646c67cfccf3f7187d95f3d9e3b482a46ba17c55c40a8e7c0dee56e9cf9ddc9f414d3e4511443b62f60d03e9 WHIRLPOOL 3d708e287e3f9b873be647b0327eab6675a8702ee1cffb56e36934cada306e5ccc64397a083dad9e59de37a067e628cacbf896ae99012d5a209e42fd7cd8a4c6
 DIST patchbundle-selinux-base-policy-2.20141203-r7.tar.bz2 295833 SHA256 ba2219b3efc747be65f94c4d8ac3cd6ee530c82c848fa41935a114184678622a SHA512 8e32d9dbfb2f0f3f50200543aadb51ed9834ccd5cdf30bf8e4d9e6d0b645ce44ffaf80f7aa9385e9c9095d9a383b3a348a92356cb5386c06544ab082a9a468c7 WHIRLPOOL 1648ee1be71e45fcf5a264816ce7edc7bab19bd28a68703923eb2d6068f1f0469ae593855231d31f88baecbf29e7cece2d6beeed20b7c04231a6c90e90d35910
 DIST patchbundle-selinux-base-policy-2.20141203-r8.tar.bz2 297919 SHA256 77539eb3d78105f8789cd8205d2698bd27e2abf100163bdd162cda860fd15120 SHA512 2f8a19e1e4bb65f32b480275f49099aed3ae9df543c7de862b3bbd93e81b89cd96dadac3d091e28673d09a6885db8c5656b3a77d0080775c110b04f2753de7a6 WHIRLPOOL 79cb7e620eb8e838192dc557c7a9ce7e713227d783cc8b63792825559b2145cad70d0af6f99948c1527557bc363feffd846c73893682b4a14fc7d08b9e20c649
+DIST patchbundle-selinux-base-policy-2.20141203-r9.tar.bz2 299602 SHA256 e8518004942a6c57170a609683e22b1410c93a2a195829c41dc8fbc703d941b5 SHA512 ce6484fbca1d2d074e50d1a3953392bd3ce0a4617df98fbac37747b469b4f160a9331586dfe1c3ddccb1ccbee24876a2f05ab49e37c8492a48baf83c2d01d140 WHIRLPOOL 1fd7b956e98e95a64c3a713a944d4531259bd156a7feabf6a89c4b5f33ac846377730eede97889e85183be086f282ebd18e860214f6ca3f01b40f2323470ee04
 DIST refpolicy-2.20140311.tar.bz2 664416 SHA256 f69437db95548c78a5dec44c236397146b144153149009ea554d2e536e5436f7 SHA512 50bacee82ed41ac8b8007ecc33bf51d22303cc2ddd27cfb72cb5520dab5f8e255186e34b89cec492c7a2d4220b200814bdede9b46c19f987a3d3d65a1c9b749a WHIRLPOOL e07480beba6ab1f02ad36b7d0c50c4a71cb39a8ec78bf8d1dc3c82bb9dd1d69d9169d7c937165ea15f60ce1147f256d46644f944107a3a8a800d5bad70d4c255
 DIST refpolicy-2.20141203.tar.bz2 680243 SHA256 f438209c430d8a2d4ddcbe4bdd3edb46f6af7dc4913637af0b73c635e40c1522 SHA512 682e4280c5799e4c12ec7594afc1389f67be35055748d2e0dbdc3419159a16c96d4946ca6178daee8370515951f8653b2e452efe8c962b8d7f9bc192f0b15a0c WHIRLPOOL 74bca232534e7af9051bb1ab9f77c1ff6c425781cf4561f781d6e9a40cc5ca0d9add540249ea5493e8782a9372aea296ead6c165c6c440ae1509eb319d151ee5
diff --git a/sec-policy/selinux-publicfile/selinux-publicfile-2.20141203-r8.ebuild b/sec-policy/selinux-publicfile/selinux-publicfile-2.20141203-r8.ebuild
index b1cfae569c11..a4b7c86f3eb6 100644
--- a/sec-policy/selinux-publicfile/selinux-publicfile-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-publicfile/selinux-publicfile-2.20141203-r8.ebuild
@@ -13,5 +13,5 @@ DESCRIPTION="SELinux policy for publicfile"
 if [[ $PV == 9999* ]] ; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-publicfile/selinux-publicfile-2.20141203-r9.ebuild b/sec-policy/selinux-publicfile/selinux-publicfile-2.20141203-r9.ebuild
new file mode 100644
index 000000000000..b1cfae569c11
--- /dev/null
+++ b/sec-policy/selinux-publicfile/selinux-publicfile-2.20141203-r9.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI="5"
+
+IUSE=""
+MODS="publicfile"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for publicfile"
+
+if [[ $PV == 9999* ]] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
diff --git a/sec-policy/selinux-pulseaudio/Manifest b/sec-policy/selinux-pulseaudio/Manifest
index 8327a635be01..91d204b0021a 100644
--- a/sec-policy/selinux-pulseaudio/Manifest
+++ b/sec-policy/selinux-pulseaudio/Manifest
@@ -9,5 +9,6 @@ DIST patchbundle-selinux-base-policy-2.20141203-r5.tar.bz2 274136 SHA256 c23d17c
 DIST patchbundle-selinux-base-policy-2.20141203-r6.tar.bz2 293231 SHA256 b686dcc517b97834f66d967afdcc724cb43b5c6dbf9f34043a91cdeda2625cc7 SHA512 a2c486cbe4a1d21ff3fd01bef25ecf5a633a4072646c67cfccf3f7187d95f3d9e3b482a46ba17c55c40a8e7c0dee56e9cf9ddc9f414d3e4511443b62f60d03e9 WHIRLPOOL 3d708e287e3f9b873be647b0327eab6675a8702ee1cffb56e36934cada306e5ccc64397a083dad9e59de37a067e628cacbf896ae99012d5a209e42fd7cd8a4c6
 DIST patchbundle-selinux-base-policy-2.20141203-r7.tar.bz2 295833 SHA256 ba2219b3efc747be65f94c4d8ac3cd6ee530c82c848fa41935a114184678622a SHA512 8e32d9dbfb2f0f3f50200543aadb51ed9834ccd5cdf30bf8e4d9e6d0b645ce44ffaf80f7aa9385e9c9095d9a383b3a348a92356cb5386c06544ab082a9a468c7 WHIRLPOOL 1648ee1be71e45fcf5a264816ce7edc7bab19bd28a68703923eb2d6068f1f0469ae593855231d31f88baecbf29e7cece2d6beeed20b7c04231a6c90e90d35910
 DIST patchbundle-selinux-base-policy-2.20141203-r8.tar.bz2 297919 SHA256 77539eb3d78105f8789cd8205d2698bd27e2abf100163bdd162cda860fd15120 SHA512 2f8a19e1e4bb65f32b480275f49099aed3ae9df543c7de862b3bbd93e81b89cd96dadac3d091e28673d09a6885db8c5656b3a77d0080775c110b04f2753de7a6 WHIRLPOOL 79cb7e620eb8e838192dc557c7a9ce7e713227d783cc8b63792825559b2145cad70d0af6f99948c1527557bc363feffd846c73893682b4a14fc7d08b9e20c649
+DIST patchbundle-selinux-base-policy-2.20141203-r9.tar.bz2 299602 SHA256 e8518004942a6c57170a609683e22b1410c93a2a195829c41dc8fbc703d941b5 SHA512 ce6484fbca1d2d074e50d1a3953392bd3ce0a4617df98fbac37747b469b4f160a9331586dfe1c3ddccb1ccbee24876a2f05ab49e37c8492a48baf83c2d01d140 WHIRLPOOL 1fd7b956e98e95a64c3a713a944d4531259bd156a7feabf6a89c4b5f33ac846377730eede97889e85183be086f282ebd18e860214f6ca3f01b40f2323470ee04
 DIST refpolicy-2.20140311.tar.bz2 664416 SHA256 f69437db95548c78a5dec44c236397146b144153149009ea554d2e536e5436f7 SHA512 50bacee82ed41ac8b8007ecc33bf51d22303cc2ddd27cfb72cb5520dab5f8e255186e34b89cec492c7a2d4220b200814bdede9b46c19f987a3d3d65a1c9b749a WHIRLPOOL e07480beba6ab1f02ad36b7d0c50c4a71cb39a8ec78bf8d1dc3c82bb9dd1d69d9169d7c937165ea15f60ce1147f256d46644f944107a3a8a800d5bad70d4c255
 DIST refpolicy-2.20141203.tar.bz2 680243 SHA256 f438209c430d8a2d4ddcbe4bdd3edb46f6af7dc4913637af0b73c635e40c1522 SHA512 682e4280c5799e4c12ec7594afc1389f67be35055748d2e0dbdc3419159a16c96d4946ca6178daee8370515951f8653b2e452efe8c962b8d7f9bc192f0b15a0c WHIRLPOOL 74bca232534e7af9051bb1ab9f77c1ff6c425781cf4561f781d6e9a40cc5ca0d9add540249ea5493e8782a9372aea296ead6c165c6c440ae1509eb319d151ee5
diff --git a/sec-policy/selinux-pulseaudio/selinux-pulseaudio-2.20141203-r8.ebuild b/sec-policy/selinux-pulseaudio/selinux-pulseaudio-2.20141203-r8.ebuild
index 2502bae21e9a..c7b3afaa63b8 100644
--- a/sec-policy/selinux-pulseaudio/selinux-pulseaudio-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-pulseaudio/selinux-pulseaudio-2.20141203-r8.ebuild
@@ -13,5 +13,5 @@ DESCRIPTION="SELinux policy for pulseaudio"
 if [[ $PV == 9999* ]] ; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-pulseaudio/selinux-pulseaudio-2.20141203-r9.ebuild b/sec-policy/selinux-pulseaudio/selinux-pulseaudio-2.20141203-r9.ebuild
new file mode 100644
index 000000000000..2502bae21e9a
--- /dev/null
+++ b/sec-policy/selinux-pulseaudio/selinux-pulseaudio-2.20141203-r9.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI="5"
+
+IUSE=""
+MODS="pulseaudio"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for pulseaudio"
+
+if [[ $PV == 9999* ]] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
diff --git a/sec-policy/selinux-puppet/Manifest b/sec-policy/selinux-puppet/Manifest
index 8327a635be01..91d204b0021a 100644
--- a/sec-policy/selinux-puppet/Manifest
+++ b/sec-policy/selinux-puppet/Manifest
@@ -9,5 +9,6 @@ DIST patchbundle-selinux-base-policy-2.20141203-r5.tar.bz2 274136 SHA256 c23d17c
 DIST patchbundle-selinux-base-policy-2.20141203-r6.tar.bz2 293231 SHA256 b686dcc517b97834f66d967afdcc724cb43b5c6dbf9f34043a91cdeda2625cc7 SHA512 a2c486cbe4a1d21ff3fd01bef25ecf5a633a4072646c67cfccf3f7187d95f3d9e3b482a46ba17c55c40a8e7c0dee56e9cf9ddc9f414d3e4511443b62f60d03e9 WHIRLPOOL 3d708e287e3f9b873be647b0327eab6675a8702ee1cffb56e36934cada306e5ccc64397a083dad9e59de37a067e628cacbf896ae99012d5a209e42fd7cd8a4c6
 DIST patchbundle-selinux-base-policy-2.20141203-r7.tar.bz2 295833 SHA256 ba2219b3efc747be65f94c4d8ac3cd6ee530c82c848fa41935a114184678622a SHA512 8e32d9dbfb2f0f3f50200543aadb51ed9834ccd5cdf30bf8e4d9e6d0b645ce44ffaf80f7aa9385e9c9095d9a383b3a348a92356cb5386c06544ab082a9a468c7 WHIRLPOOL 1648ee1be71e45fcf5a264816ce7edc7bab19bd28a68703923eb2d6068f1f0469ae593855231d31f88baecbf29e7cece2d6beeed20b7c04231a6c90e90d35910
 DIST patchbundle-selinux-base-policy-2.20141203-r8.tar.bz2 297919 SHA256 77539eb3d78105f8789cd8205d2698bd27e2abf100163bdd162cda860fd15120 SHA512 2f8a19e1e4bb65f32b480275f49099aed3ae9df543c7de862b3bbd93e81b89cd96dadac3d091e28673d09a6885db8c5656b3a77d0080775c110b04f2753de7a6 WHIRLPOOL 79cb7e620eb8e838192dc557c7a9ce7e713227d783cc8b63792825559b2145cad70d0af6f99948c1527557bc363feffd846c73893682b4a14fc7d08b9e20c649
+DIST patchbundle-selinux-base-policy-2.20141203-r9.tar.bz2 299602 SHA256 e8518004942a6c57170a609683e22b1410c93a2a195829c41dc8fbc703d941b5 SHA512 ce6484fbca1d2d074e50d1a3953392bd3ce0a4617df98fbac37747b469b4f160a9331586dfe1c3ddccb1ccbee24876a2f05ab49e37c8492a48baf83c2d01d140 WHIRLPOOL 1fd7b956e98e95a64c3a713a944d4531259bd156a7feabf6a89c4b5f33ac846377730eede97889e85183be086f282ebd18e860214f6ca3f01b40f2323470ee04
 DIST refpolicy-2.20140311.tar.bz2 664416 SHA256 f69437db95548c78a5dec44c236397146b144153149009ea554d2e536e5436f7 SHA512 50bacee82ed41ac8b8007ecc33bf51d22303cc2ddd27cfb72cb5520dab5f8e255186e34b89cec492c7a2d4220b200814bdede9b46c19f987a3d3d65a1c9b749a WHIRLPOOL e07480beba6ab1f02ad36b7d0c50c4a71cb39a8ec78bf8d1dc3c82bb9dd1d69d9169d7c937165ea15f60ce1147f256d46644f944107a3a8a800d5bad70d4c255
 DIST refpolicy-2.20141203.tar.bz2 680243 SHA256 f438209c430d8a2d4ddcbe4bdd3edb46f6af7dc4913637af0b73c635e40c1522 SHA512 682e4280c5799e4c12ec7594afc1389f67be35055748d2e0dbdc3419159a16c96d4946ca6178daee8370515951f8653b2e452efe8c962b8d7f9bc192f0b15a0c WHIRLPOOL 74bca232534e7af9051bb1ab9f77c1ff6c425781cf4561f781d6e9a40cc5ca0d9add540249ea5493e8782a9372aea296ead6c165c6c440ae1509eb319d151ee5
diff --git a/sec-policy/selinux-puppet/selinux-puppet-2.20141203-r8.ebuild b/sec-policy/selinux-puppet/selinux-puppet-2.20141203-r8.ebuild
index f77d3abb227a..0cfbeeb8d747 100644
--- a/sec-policy/selinux-puppet/selinux-puppet-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-puppet/selinux-puppet-2.20141203-r8.ebuild
@@ -13,5 +13,5 @@ DESCRIPTION="SELinux policy for puppet"
 if [[ $PV == 9999* ]] ; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-puppet/selinux-puppet-2.20141203-r9.ebuild b/sec-policy/selinux-puppet/selinux-puppet-2.20141203-r9.ebuild
new file mode 100644
index 000000000000..f77d3abb227a
--- /dev/null
+++ b/sec-policy/selinux-puppet/selinux-puppet-2.20141203-r9.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI="5"
+
+IUSE=""
+MODS="puppet"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for puppet"
+
+if [[ $PV == 9999* ]] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
diff --git a/sec-policy/selinux-pyicqt/Manifest b/sec-policy/selinux-pyicqt/Manifest
index 8327a635be01..91d204b0021a 100644
--- a/sec-policy/selinux-pyicqt/Manifest
+++ b/sec-policy/selinux-pyicqt/Manifest
@@ -9,5 +9,6 @@ DIST patchbundle-selinux-base-policy-2.20141203-r5.tar.bz2 274136 SHA256 c23d17c
 DIST patchbundle-selinux-base-policy-2.20141203-r6.tar.bz2 293231 SHA256 b686dcc517b97834f66d967afdcc724cb43b5c6dbf9f34043a91cdeda2625cc7 SHA512 a2c486cbe4a1d21ff3fd01bef25ecf5a633a4072646c67cfccf3f7187d95f3d9e3b482a46ba17c55c40a8e7c0dee56e9cf9ddc9f414d3e4511443b62f60d03e9 WHIRLPOOL 3d708e287e3f9b873be647b0327eab6675a8702ee1cffb56e36934cada306e5ccc64397a083dad9e59de37a067e628cacbf896ae99012d5a209e42fd7cd8a4c6
 DIST patchbundle-selinux-base-policy-2.20141203-r7.tar.bz2 295833 SHA256 ba2219b3efc747be65f94c4d8ac3cd6ee530c82c848fa41935a114184678622a SHA512 8e32d9dbfb2f0f3f50200543aadb51ed9834ccd5cdf30bf8e4d9e6d0b645ce44ffaf80f7aa9385e9c9095d9a383b3a348a92356cb5386c06544ab082a9a468c7 WHIRLPOOL 1648ee1be71e45fcf5a264816ce7edc7bab19bd28a68703923eb2d6068f1f0469ae593855231d31f88baecbf29e7cece2d6beeed20b7c04231a6c90e90d35910
 DIST patchbundle-selinux-base-policy-2.20141203-r8.tar.bz2 297919 SHA256 77539eb3d78105f8789cd8205d2698bd27e2abf100163bdd162cda860fd15120 SHA512 2f8a19e1e4bb65f32b480275f49099aed3ae9df543c7de862b3bbd93e81b89cd96dadac3d091e28673d09a6885db8c5656b3a77d0080775c110b04f2753de7a6 WHIRLPOOL 79cb7e620eb8e838192dc557c7a9ce7e713227d783cc8b63792825559b2145cad70d0af6f99948c1527557bc363feffd846c73893682b4a14fc7d08b9e20c649
+DIST patchbundle-selinux-base-policy-2.20141203-r9.tar.bz2 299602 SHA256 e8518004942a6c57170a609683e22b1410c93a2a195829c41dc8fbc703d941b5 SHA512 ce6484fbca1d2d074e50d1a3953392bd3ce0a4617df98fbac37747b469b4f160a9331586dfe1c3ddccb1ccbee24876a2f05ab49e37c8492a48baf83c2d01d140 WHIRLPOOL 1fd7b956e98e95a64c3a713a944d4531259bd156a7feabf6a89c4b5f33ac846377730eede97889e85183be086f282ebd18e860214f6ca3f01b40f2323470ee04
 DIST refpolicy-2.20140311.tar.bz2 664416 SHA256 f69437db95548c78a5dec44c236397146b144153149009ea554d2e536e5436f7 SHA512 50bacee82ed41ac8b8007ecc33bf51d22303cc2ddd27cfb72cb5520dab5f8e255186e34b89cec492c7a2d4220b200814bdede9b46c19f987a3d3d65a1c9b749a WHIRLPOOL e07480beba6ab1f02ad36b7d0c50c4a71cb39a8ec78bf8d1dc3c82bb9dd1d69d9169d7c937165ea15f60ce1147f256d46644f944107a3a8a800d5bad70d4c255
 DIST refpolicy-2.20141203.tar.bz2 680243 SHA256 f438209c430d8a2d4ddcbe4bdd3edb46f6af7dc4913637af0b73c635e40c1522 SHA512 682e4280c5799e4c12ec7594afc1389f67be35055748d2e0dbdc3419159a16c96d4946ca6178daee8370515951f8653b2e452efe8c962b8d7f9bc192f0b15a0c WHIRLPOOL 74bca232534e7af9051bb1ab9f77c1ff6c425781cf4561f781d6e9a40cc5ca0d9add540249ea5493e8782a9372aea296ead6c165c6c440ae1509eb319d151ee5
diff --git a/sec-policy/selinux-pyicqt/selinux-pyicqt-2.20141203-r8.ebuild b/sec-policy/selinux-pyicqt/selinux-pyicqt-2.20141203-r8.ebuild
index 492b76ad105d..907eea382c9b 100644
--- a/sec-policy/selinux-pyicqt/selinux-pyicqt-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-pyicqt/selinux-pyicqt-2.20141203-r8.ebuild
@@ -13,5 +13,5 @@ DESCRIPTION="SELinux policy for pyicqt"
 if [[ $PV == 9999* ]] ; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-pyicqt/selinux-pyicqt-2.20141203-r9.ebuild b/sec-policy/selinux-pyicqt/selinux-pyicqt-2.20141203-r9.ebuild
new file mode 100644
index 000000000000..492b76ad105d
--- /dev/null
+++ b/sec-policy/selinux-pyicqt/selinux-pyicqt-2.20141203-r9.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI="5"
+
+IUSE=""
+MODS="pyicqt"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for pyicqt"
+
+if [[ $PV == 9999* ]] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
diff --git a/sec-policy/selinux-pyzor/Manifest b/sec-policy/selinux-pyzor/Manifest
index 8327a635be01..91d204b0021a 100644
--- a/sec-policy/selinux-pyzor/Manifest
+++ b/sec-policy/selinux-pyzor/Manifest
@@ -9,5 +9,6 @@ DIST patchbundle-selinux-base-policy-2.20141203-r5.tar.bz2 274136 SHA256 c23d17c
 DIST patchbundle-selinux-base-policy-2.20141203-r6.tar.bz2 293231 SHA256 b686dcc517b97834f66d967afdcc724cb43b5c6dbf9f34043a91cdeda2625cc7 SHA512 a2c486cbe4a1d21ff3fd01bef25ecf5a633a4072646c67cfccf3f7187d95f3d9e3b482a46ba17c55c40a8e7c0dee56e9cf9ddc9f414d3e4511443b62f60d03e9 WHIRLPOOL 3d708e287e3f9b873be647b0327eab6675a8702ee1cffb56e36934cada306e5ccc64397a083dad9e59de37a067e628cacbf896ae99012d5a209e42fd7cd8a4c6
 DIST patchbundle-selinux-base-policy-2.20141203-r7.tar.bz2 295833 SHA256 ba2219b3efc747be65f94c4d8ac3cd6ee530c82c848fa41935a114184678622a SHA512 8e32d9dbfb2f0f3f50200543aadb51ed9834ccd5cdf30bf8e4d9e6d0b645ce44ffaf80f7aa9385e9c9095d9a383b3a348a92356cb5386c06544ab082a9a468c7 WHIRLPOOL 1648ee1be71e45fcf5a264816ce7edc7bab19bd28a68703923eb2d6068f1f0469ae593855231d31f88baecbf29e7cece2d6beeed20b7c04231a6c90e90d35910
 DIST patchbundle-selinux-base-policy-2.20141203-r8.tar.bz2 297919 SHA256 77539eb3d78105f8789cd8205d2698bd27e2abf100163bdd162cda860fd15120 SHA512 2f8a19e1e4bb65f32b480275f49099aed3ae9df543c7de862b3bbd93e81b89cd96dadac3d091e28673d09a6885db8c5656b3a77d0080775c110b04f2753de7a6 WHIRLPOOL 79cb7e620eb8e838192dc557c7a9ce7e713227d783cc8b63792825559b2145cad70d0af6f99948c1527557bc363feffd846c73893682b4a14fc7d08b9e20c649
+DIST patchbundle-selinux-base-policy-2.20141203-r9.tar.bz2 299602 SHA256 e8518004942a6c57170a609683e22b1410c93a2a195829c41dc8fbc703d941b5 SHA512 ce6484fbca1d2d074e50d1a3953392bd3ce0a4617df98fbac37747b469b4f160a9331586dfe1c3ddccb1ccbee24876a2f05ab49e37c8492a48baf83c2d01d140 WHIRLPOOL 1fd7b956e98e95a64c3a713a944d4531259bd156a7feabf6a89c4b5f33ac846377730eede97889e85183be086f282ebd18e860214f6ca3f01b40f2323470ee04
 DIST refpolicy-2.20140311.tar.bz2 664416 SHA256 f69437db95548c78a5dec44c236397146b144153149009ea554d2e536e5436f7 SHA512 50bacee82ed41ac8b8007ecc33bf51d22303cc2ddd27cfb72cb5520dab5f8e255186e34b89cec492c7a2d4220b200814bdede9b46c19f987a3d3d65a1c9b749a WHIRLPOOL e07480beba6ab1f02ad36b7d0c50c4a71cb39a8ec78bf8d1dc3c82bb9dd1d69d9169d7c937165ea15f60ce1147f256d46644f944107a3a8a800d5bad70d4c255
 DIST refpolicy-2.20141203.tar.bz2 680243 SHA256 f438209c430d8a2d4ddcbe4bdd3edb46f6af7dc4913637af0b73c635e40c1522 SHA512 682e4280c5799e4c12ec7594afc1389f67be35055748d2e0dbdc3419159a16c96d4946ca6178daee8370515951f8653b2e452efe8c962b8d7f9bc192f0b15a0c WHIRLPOOL 74bca232534e7af9051bb1ab9f77c1ff6c425781cf4561f781d6e9a40cc5ca0d9add540249ea5493e8782a9372aea296ead6c165c6c440ae1509eb319d151ee5
diff --git a/sec-policy/selinux-pyzor/selinux-pyzor-2.20141203-r8.ebuild b/sec-policy/selinux-pyzor/selinux-pyzor-2.20141203-r8.ebuild
index fd5160fc17de..0351cf81145b 100644
--- a/sec-policy/selinux-pyzor/selinux-pyzor-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-pyzor/selinux-pyzor-2.20141203-r8.ebuild
@@ -13,5 +13,5 @@ DESCRIPTION="SELinux policy for pyzor"
 if [[ $PV == 9999* ]] ; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-pyzor/selinux-pyzor-2.20141203-r9.ebuild b/sec-policy/selinux-pyzor/selinux-pyzor-2.20141203-r9.ebuild
new file mode 100644
index 000000000000..fd5160fc17de
--- /dev/null
+++ b/sec-policy/selinux-pyzor/selinux-pyzor-2.20141203-r9.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI="5"
+
+IUSE=""
+MODS="pyzor"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for pyzor"
+
+if [[ $PV == 9999* ]] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
diff --git a/sec-policy/selinux-qemu/Manifest b/sec-policy/selinux-qemu/Manifest
index 8327a635be01..91d204b0021a 100644
--- a/sec-policy/selinux-qemu/Manifest
+++ b/sec-policy/selinux-qemu/Manifest
@@ -9,5 +9,6 @@ DIST patchbundle-selinux-base-policy-2.20141203-r5.tar.bz2 274136 SHA256 c23d17c
 DIST patchbundle-selinux-base-policy-2.20141203-r6.tar.bz2 293231 SHA256 b686dcc517b97834f66d967afdcc724cb43b5c6dbf9f34043a91cdeda2625cc7 SHA512 a2c486cbe4a1d21ff3fd01bef25ecf5a633a4072646c67cfccf3f7187d95f3d9e3b482a46ba17c55c40a8e7c0dee56e9cf9ddc9f414d3e4511443b62f60d03e9 WHIRLPOOL 3d708e287e3f9b873be647b0327eab6675a8702ee1cffb56e36934cada306e5ccc64397a083dad9e59de37a067e628cacbf896ae99012d5a209e42fd7cd8a4c6
 DIST patchbundle-selinux-base-policy-2.20141203-r7.tar.bz2 295833 SHA256 ba2219b3efc747be65f94c4d8ac3cd6ee530c82c848fa41935a114184678622a SHA512 8e32d9dbfb2f0f3f50200543aadb51ed9834ccd5cdf30bf8e4d9e6d0b645ce44ffaf80f7aa9385e9c9095d9a383b3a348a92356cb5386c06544ab082a9a468c7 WHIRLPOOL 1648ee1be71e45fcf5a264816ce7edc7bab19bd28a68703923eb2d6068f1f0469ae593855231d31f88baecbf29e7cece2d6beeed20b7c04231a6c90e90d35910
 DIST patchbundle-selinux-base-policy-2.20141203-r8.tar.bz2 297919 SHA256 77539eb3d78105f8789cd8205d2698bd27e2abf100163bdd162cda860fd15120 SHA512 2f8a19e1e4bb65f32b480275f49099aed3ae9df543c7de862b3bbd93e81b89cd96dadac3d091e28673d09a6885db8c5656b3a77d0080775c110b04f2753de7a6 WHIRLPOOL 79cb7e620eb8e838192dc557c7a9ce7e713227d783cc8b63792825559b2145cad70d0af6f99948c1527557bc363feffd846c73893682b4a14fc7d08b9e20c649
+DIST patchbundle-selinux-base-policy-2.20141203-r9.tar.bz2 299602 SHA256 e8518004942a6c57170a609683e22b1410c93a2a195829c41dc8fbc703d941b5 SHA512 ce6484fbca1d2d074e50d1a3953392bd3ce0a4617df98fbac37747b469b4f160a9331586dfe1c3ddccb1ccbee24876a2f05ab49e37c8492a48baf83c2d01d140 WHIRLPOOL 1fd7b956e98e95a64c3a713a944d4531259bd156a7feabf6a89c4b5f33ac846377730eede97889e85183be086f282ebd18e860214f6ca3f01b40f2323470ee04
 DIST refpolicy-2.20140311.tar.bz2 664416 SHA256 f69437db95548c78a5dec44c236397146b144153149009ea554d2e536e5436f7 SHA512 50bacee82ed41ac8b8007ecc33bf51d22303cc2ddd27cfb72cb5520dab5f8e255186e34b89cec492c7a2d4220b200814bdede9b46c19f987a3d3d65a1c9b749a WHIRLPOOL e07480beba6ab1f02ad36b7d0c50c4a71cb39a8ec78bf8d1dc3c82bb9dd1d69d9169d7c937165ea15f60ce1147f256d46644f944107a3a8a800d5bad70d4c255
 DIST refpolicy-2.20141203.tar.bz2 680243 SHA256 f438209c430d8a2d4ddcbe4bdd3edb46f6af7dc4913637af0b73c635e40c1522 SHA512 682e4280c5799e4c12ec7594afc1389f67be35055748d2e0dbdc3419159a16c96d4946ca6178daee8370515951f8653b2e452efe8c962b8d7f9bc192f0b15a0c WHIRLPOOL 74bca232534e7af9051bb1ab9f77c1ff6c425781cf4561f781d6e9a40cc5ca0d9add540249ea5493e8782a9372aea296ead6c165c6c440ae1509eb319d151ee5
diff --git a/sec-policy/selinux-qemu/selinux-qemu-2.20141203-r8.ebuild b/sec-policy/selinux-qemu/selinux-qemu-2.20141203-r8.ebuild
index 9ecab5c45338..551a30c4cfeb 100644
--- a/sec-policy/selinux-qemu/selinux-qemu-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-qemu/selinux-qemu-2.20141203-r8.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="SELinux policy for qemu"
 if [[ $PV == 9999* ]] ; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-virt
diff --git a/sec-policy/selinux-qemu/selinux-qemu-2.20141203-r9.ebuild b/sec-policy/selinux-qemu/selinux-qemu-2.20141203-r9.ebuild
new file mode 100644
index 000000000000..9ecab5c45338
--- /dev/null
+++ b/sec-policy/selinux-qemu/selinux-qemu-2.20141203-r9.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI="5"
+
+IUSE=""
+MODS="qemu"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for qemu"
+
+if [[ $PV == 9999* ]] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
+DEPEND="${DEPEND}
+	sec-policy/selinux-virt
+"
+RDEPEND="${RDEPEND}
+	sec-policy/selinux-virt
+"
diff --git a/sec-policy/selinux-qmail/Manifest b/sec-policy/selinux-qmail/Manifest
index 8327a635be01..91d204b0021a 100644
--- a/sec-policy/selinux-qmail/Manifest
+++ b/sec-policy/selinux-qmail/Manifest
@@ -9,5 +9,6 @@ DIST patchbundle-selinux-base-policy-2.20141203-r5.tar.bz2 274136 SHA256 c23d17c
 DIST patchbundle-selinux-base-policy-2.20141203-r6.tar.bz2 293231 SHA256 b686dcc517b97834f66d967afdcc724cb43b5c6dbf9f34043a91cdeda2625cc7 SHA512 a2c486cbe4a1d21ff3fd01bef25ecf5a633a4072646c67cfccf3f7187d95f3d9e3b482a46ba17c55c40a8e7c0dee56e9cf9ddc9f414d3e4511443b62f60d03e9 WHIRLPOOL 3d708e287e3f9b873be647b0327eab6675a8702ee1cffb56e36934cada306e5ccc64397a083dad9e59de37a067e628cacbf896ae99012d5a209e42fd7cd8a4c6
 DIST patchbundle-selinux-base-policy-2.20141203-r7.tar.bz2 295833 SHA256 ba2219b3efc747be65f94c4d8ac3cd6ee530c82c848fa41935a114184678622a SHA512 8e32d9dbfb2f0f3f50200543aadb51ed9834ccd5cdf30bf8e4d9e6d0b645ce44ffaf80f7aa9385e9c9095d9a383b3a348a92356cb5386c06544ab082a9a468c7 WHIRLPOOL 1648ee1be71e45fcf5a264816ce7edc7bab19bd28a68703923eb2d6068f1f0469ae593855231d31f88baecbf29e7cece2d6beeed20b7c04231a6c90e90d35910
 DIST patchbundle-selinux-base-policy-2.20141203-r8.tar.bz2 297919 SHA256 77539eb3d78105f8789cd8205d2698bd27e2abf100163bdd162cda860fd15120 SHA512 2f8a19e1e4bb65f32b480275f49099aed3ae9df543c7de862b3bbd93e81b89cd96dadac3d091e28673d09a6885db8c5656b3a77d0080775c110b04f2753de7a6 WHIRLPOOL 79cb7e620eb8e838192dc557c7a9ce7e713227d783cc8b63792825559b2145cad70d0af6f99948c1527557bc363feffd846c73893682b4a14fc7d08b9e20c649
+DIST patchbundle-selinux-base-policy-2.20141203-r9.tar.bz2 299602 SHA256 e8518004942a6c57170a609683e22b1410c93a2a195829c41dc8fbc703d941b5 SHA512 ce6484fbca1d2d074e50d1a3953392bd3ce0a4617df98fbac37747b469b4f160a9331586dfe1c3ddccb1ccbee24876a2f05ab49e37c8492a48baf83c2d01d140 WHIRLPOOL 1fd7b956e98e95a64c3a713a944d4531259bd156a7feabf6a89c4b5f33ac846377730eede97889e85183be086f282ebd18e860214f6ca3f01b40f2323470ee04
 DIST refpolicy-2.20140311.tar.bz2 664416 SHA256 f69437db95548c78a5dec44c236397146b144153149009ea554d2e536e5436f7 SHA512 50bacee82ed41ac8b8007ecc33bf51d22303cc2ddd27cfb72cb5520dab5f8e255186e34b89cec492c7a2d4220b200814bdede9b46c19f987a3d3d65a1c9b749a WHIRLPOOL e07480beba6ab1f02ad36b7d0c50c4a71cb39a8ec78bf8d1dc3c82bb9dd1d69d9169d7c937165ea15f60ce1147f256d46644f944107a3a8a800d5bad70d4c255
 DIST refpolicy-2.20141203.tar.bz2 680243 SHA256 f438209c430d8a2d4ddcbe4bdd3edb46f6af7dc4913637af0b73c635e40c1522 SHA512 682e4280c5799e4c12ec7594afc1389f67be35055748d2e0dbdc3419159a16c96d4946ca6178daee8370515951f8653b2e452efe8c962b8d7f9bc192f0b15a0c WHIRLPOOL 74bca232534e7af9051bb1ab9f77c1ff6c425781cf4561f781d6e9a40cc5ca0d9add540249ea5493e8782a9372aea296ead6c165c6c440ae1509eb319d151ee5
diff --git a/sec-policy/selinux-qmail/selinux-qmail-2.20141203-r8.ebuild b/sec-policy/selinux-qmail/selinux-qmail-2.20141203-r8.ebuild
index aa9eb61767cd..f156ae0762c4 100644
--- a/sec-policy/selinux-qmail/selinux-qmail-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-qmail/selinux-qmail-2.20141203-r8.ebuild
@@ -13,5 +13,5 @@ DESCRIPTION="SELinux policy for qmail"
 if [[ $PV == 9999* ]] ; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-qmail/selinux-qmail-2.20141203-r9.ebuild b/sec-policy/selinux-qmail/selinux-qmail-2.20141203-r9.ebuild
new file mode 100644
index 000000000000..aa9eb61767cd
--- /dev/null
+++ b/sec-policy/selinux-qmail/selinux-qmail-2.20141203-r9.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI="5"
+
+IUSE=""
+MODS="qmail"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for qmail"
+
+if [[ $PV == 9999* ]] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
diff --git a/sec-policy/selinux-quota/Manifest b/sec-policy/selinux-quota/Manifest
index 8327a635be01..91d204b0021a 100644
--- a/sec-policy/selinux-quota/Manifest
+++ b/sec-policy/selinux-quota/Manifest
@@ -9,5 +9,6 @@ DIST patchbundle-selinux-base-policy-2.20141203-r5.tar.bz2 274136 SHA256 c23d17c
 DIST patchbundle-selinux-base-policy-2.20141203-r6.tar.bz2 293231 SHA256 b686dcc517b97834f66d967afdcc724cb43b5c6dbf9f34043a91cdeda2625cc7 SHA512 a2c486cbe4a1d21ff3fd01bef25ecf5a633a4072646c67cfccf3f7187d95f3d9e3b482a46ba17c55c40a8e7c0dee56e9cf9ddc9f414d3e4511443b62f60d03e9 WHIRLPOOL 3d708e287e3f9b873be647b0327eab6675a8702ee1cffb56e36934cada306e5ccc64397a083dad9e59de37a067e628cacbf896ae99012d5a209e42fd7cd8a4c6
 DIST patchbundle-selinux-base-policy-2.20141203-r7.tar.bz2 295833 SHA256 ba2219b3efc747be65f94c4d8ac3cd6ee530c82c848fa41935a114184678622a SHA512 8e32d9dbfb2f0f3f50200543aadb51ed9834ccd5cdf30bf8e4d9e6d0b645ce44ffaf80f7aa9385e9c9095d9a383b3a348a92356cb5386c06544ab082a9a468c7 WHIRLPOOL 1648ee1be71e45fcf5a264816ce7edc7bab19bd28a68703923eb2d6068f1f0469ae593855231d31f88baecbf29e7cece2d6beeed20b7c04231a6c90e90d35910
 DIST patchbundle-selinux-base-policy-2.20141203-r8.tar.bz2 297919 SHA256 77539eb3d78105f8789cd8205d2698bd27e2abf100163bdd162cda860fd15120 SHA512 2f8a19e1e4bb65f32b480275f49099aed3ae9df543c7de862b3bbd93e81b89cd96dadac3d091e28673d09a6885db8c5656b3a77d0080775c110b04f2753de7a6 WHIRLPOOL 79cb7e620eb8e838192dc557c7a9ce7e713227d783cc8b63792825559b2145cad70d0af6f99948c1527557bc363feffd846c73893682b4a14fc7d08b9e20c649
+DIST patchbundle-selinux-base-policy-2.20141203-r9.tar.bz2 299602 SHA256 e8518004942a6c57170a609683e22b1410c93a2a195829c41dc8fbc703d941b5 SHA512 ce6484fbca1d2d074e50d1a3953392bd3ce0a4617df98fbac37747b469b4f160a9331586dfe1c3ddccb1ccbee24876a2f05ab49e37c8492a48baf83c2d01d140 WHIRLPOOL 1fd7b956e98e95a64c3a713a944d4531259bd156a7feabf6a89c4b5f33ac846377730eede97889e85183be086f282ebd18e860214f6ca3f01b40f2323470ee04
 DIST refpolicy-2.20140311.tar.bz2 664416 SHA256 f69437db95548c78a5dec44c236397146b144153149009ea554d2e536e5436f7 SHA512 50bacee82ed41ac8b8007ecc33bf51d22303cc2ddd27cfb72cb5520dab5f8e255186e34b89cec492c7a2d4220b200814bdede9b46c19f987a3d3d65a1c9b749a WHIRLPOOL e07480beba6ab1f02ad36b7d0c50c4a71cb39a8ec78bf8d1dc3c82bb9dd1d69d9169d7c937165ea15f60ce1147f256d46644f944107a3a8a800d5bad70d4c255
 DIST refpolicy-2.20141203.tar.bz2 680243 SHA256 f438209c430d8a2d4ddcbe4bdd3edb46f6af7dc4913637af0b73c635e40c1522 SHA512 682e4280c5799e4c12ec7594afc1389f67be35055748d2e0dbdc3419159a16c96d4946ca6178daee8370515951f8653b2e452efe8c962b8d7f9bc192f0b15a0c WHIRLPOOL 74bca232534e7af9051bb1ab9f77c1ff6c425781cf4561f781d6e9a40cc5ca0d9add540249ea5493e8782a9372aea296ead6c165c6c440ae1509eb319d151ee5
diff --git a/sec-policy/selinux-quota/selinux-quota-2.20141203-r8.ebuild b/sec-policy/selinux-quota/selinux-quota-2.20141203-r8.ebuild
index e241cb401157..a5e9beb0865c 100644
--- a/sec-policy/selinux-quota/selinux-quota-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-quota/selinux-quota-2.20141203-r8.ebuild
@@ -13,5 +13,5 @@ DESCRIPTION="SELinux policy for quota"
 if [[ $PV == 9999* ]] ; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-quota/selinux-quota-2.20141203-r9.ebuild b/sec-policy/selinux-quota/selinux-quota-2.20141203-r9.ebuild
new file mode 100644
index 000000000000..e241cb401157
--- /dev/null
+++ b/sec-policy/selinux-quota/selinux-quota-2.20141203-r9.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI="5"
+
+IUSE=""
+MODS="quota"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for quota"
+
+if [[ $PV == 9999* ]] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
diff --git a/sec-policy/selinux-radius/Manifest b/sec-policy/selinux-radius/Manifest
index 8327a635be01..91d204b0021a 100644
--- a/sec-policy/selinux-radius/Manifest
+++ b/sec-policy/selinux-radius/Manifest
@@ -9,5 +9,6 @@ DIST patchbundle-selinux-base-policy-2.20141203-r5.tar.bz2 274136 SHA256 c23d17c
 DIST patchbundle-selinux-base-policy-2.20141203-r6.tar.bz2 293231 SHA256 b686dcc517b97834f66d967afdcc724cb43b5c6dbf9f34043a91cdeda2625cc7 SHA512 a2c486cbe4a1d21ff3fd01bef25ecf5a633a4072646c67cfccf3f7187d95f3d9e3b482a46ba17c55c40a8e7c0dee56e9cf9ddc9f414d3e4511443b62f60d03e9 WHIRLPOOL 3d708e287e3f9b873be647b0327eab6675a8702ee1cffb56e36934cada306e5ccc64397a083dad9e59de37a067e628cacbf896ae99012d5a209e42fd7cd8a4c6
 DIST patchbundle-selinux-base-policy-2.20141203-r7.tar.bz2 295833 SHA256 ba2219b3efc747be65f94c4d8ac3cd6ee530c82c848fa41935a114184678622a SHA512 8e32d9dbfb2f0f3f50200543aadb51ed9834ccd5cdf30bf8e4d9e6d0b645ce44ffaf80f7aa9385e9c9095d9a383b3a348a92356cb5386c06544ab082a9a468c7 WHIRLPOOL 1648ee1be71e45fcf5a264816ce7edc7bab19bd28a68703923eb2d6068f1f0469ae593855231d31f88baecbf29e7cece2d6beeed20b7c04231a6c90e90d35910
 DIST patchbundle-selinux-base-policy-2.20141203-r8.tar.bz2 297919 SHA256 77539eb3d78105f8789cd8205d2698bd27e2abf100163bdd162cda860fd15120 SHA512 2f8a19e1e4bb65f32b480275f49099aed3ae9df543c7de862b3bbd93e81b89cd96dadac3d091e28673d09a6885db8c5656b3a77d0080775c110b04f2753de7a6 WHIRLPOOL 79cb7e620eb8e838192dc557c7a9ce7e713227d783cc8b63792825559b2145cad70d0af6f99948c1527557bc363feffd846c73893682b4a14fc7d08b9e20c649
+DIST patchbundle-selinux-base-policy-2.20141203-r9.tar.bz2 299602 SHA256 e8518004942a6c57170a609683e22b1410c93a2a195829c41dc8fbc703d941b5 SHA512 ce6484fbca1d2d074e50d1a3953392bd3ce0a4617df98fbac37747b469b4f160a9331586dfe1c3ddccb1ccbee24876a2f05ab49e37c8492a48baf83c2d01d140 WHIRLPOOL 1fd7b956e98e95a64c3a713a944d4531259bd156a7feabf6a89c4b5f33ac846377730eede97889e85183be086f282ebd18e860214f6ca3f01b40f2323470ee04
 DIST refpolicy-2.20140311.tar.bz2 664416 SHA256 f69437db95548c78a5dec44c236397146b144153149009ea554d2e536e5436f7 SHA512 50bacee82ed41ac8b8007ecc33bf51d22303cc2ddd27cfb72cb5520dab5f8e255186e34b89cec492c7a2d4220b200814bdede9b46c19f987a3d3d65a1c9b749a WHIRLPOOL e07480beba6ab1f02ad36b7d0c50c4a71cb39a8ec78bf8d1dc3c82bb9dd1d69d9169d7c937165ea15f60ce1147f256d46644f944107a3a8a800d5bad70d4c255
 DIST refpolicy-2.20141203.tar.bz2 680243 SHA256 f438209c430d8a2d4ddcbe4bdd3edb46f6af7dc4913637af0b73c635e40c1522 SHA512 682e4280c5799e4c12ec7594afc1389f67be35055748d2e0dbdc3419159a16c96d4946ca6178daee8370515951f8653b2e452efe8c962b8d7f9bc192f0b15a0c WHIRLPOOL 74bca232534e7af9051bb1ab9f77c1ff6c425781cf4561f781d6e9a40cc5ca0d9add540249ea5493e8782a9372aea296ead6c165c6c440ae1509eb319d151ee5
diff --git a/sec-policy/selinux-radius/selinux-radius-2.20141203-r8.ebuild b/sec-policy/selinux-radius/selinux-radius-2.20141203-r8.ebuild
index 63f282e43c12..c1ddfbd9d715 100644
--- a/sec-policy/selinux-radius/selinux-radius-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-radius/selinux-radius-2.20141203-r8.ebuild
@@ -13,5 +13,5 @@ DESCRIPTION="SELinux policy for radius"
 if [[ $PV == 9999* ]] ; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-radius/selinux-radius-2.20141203-r9.ebuild b/sec-policy/selinux-radius/selinux-radius-2.20141203-r9.ebuild
new file mode 100644
index 000000000000..63f282e43c12
--- /dev/null
+++ b/sec-policy/selinux-radius/selinux-radius-2.20141203-r9.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI="5"
+
+IUSE=""
+MODS="radius"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for radius"
+
+if [[ $PV == 9999* ]] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
diff --git a/sec-policy/selinux-radvd/Manifest b/sec-policy/selinux-radvd/Manifest
index 8327a635be01..91d204b0021a 100644
--- a/sec-policy/selinux-radvd/Manifest
+++ b/sec-policy/selinux-radvd/Manifest
@@ -9,5 +9,6 @@ DIST patchbundle-selinux-base-policy-2.20141203-r5.tar.bz2 274136 SHA256 c23d17c
 DIST patchbundle-selinux-base-policy-2.20141203-r6.tar.bz2 293231 SHA256 b686dcc517b97834f66d967afdcc724cb43b5c6dbf9f34043a91cdeda2625cc7 SHA512 a2c486cbe4a1d21ff3fd01bef25ecf5a633a4072646c67cfccf3f7187d95f3d9e3b482a46ba17c55c40a8e7c0dee56e9cf9ddc9f414d3e4511443b62f60d03e9 WHIRLPOOL 3d708e287e3f9b873be647b0327eab6675a8702ee1cffb56e36934cada306e5ccc64397a083dad9e59de37a067e628cacbf896ae99012d5a209e42fd7cd8a4c6
 DIST patchbundle-selinux-base-policy-2.20141203-r7.tar.bz2 295833 SHA256 ba2219b3efc747be65f94c4d8ac3cd6ee530c82c848fa41935a114184678622a SHA512 8e32d9dbfb2f0f3f50200543aadb51ed9834ccd5cdf30bf8e4d9e6d0b645ce44ffaf80f7aa9385e9c9095d9a383b3a348a92356cb5386c06544ab082a9a468c7 WHIRLPOOL 1648ee1be71e45fcf5a264816ce7edc7bab19bd28a68703923eb2d6068f1f0469ae593855231d31f88baecbf29e7cece2d6beeed20b7c04231a6c90e90d35910
 DIST patchbundle-selinux-base-policy-2.20141203-r8.tar.bz2 297919 SHA256 77539eb3d78105f8789cd8205d2698bd27e2abf100163bdd162cda860fd15120 SHA512 2f8a19e1e4bb65f32b480275f49099aed3ae9df543c7de862b3bbd93e81b89cd96dadac3d091e28673d09a6885db8c5656b3a77d0080775c110b04f2753de7a6 WHIRLPOOL 79cb7e620eb8e838192dc557c7a9ce7e713227d783cc8b63792825559b2145cad70d0af6f99948c1527557bc363feffd846c73893682b4a14fc7d08b9e20c649
+DIST patchbundle-selinux-base-policy-2.20141203-r9.tar.bz2 299602 SHA256 e8518004942a6c57170a609683e22b1410c93a2a195829c41dc8fbc703d941b5 SHA512 ce6484fbca1d2d074e50d1a3953392bd3ce0a4617df98fbac37747b469b4f160a9331586dfe1c3ddccb1ccbee24876a2f05ab49e37c8492a48baf83c2d01d140 WHIRLPOOL 1fd7b956e98e95a64c3a713a944d4531259bd156a7feabf6a89c4b5f33ac846377730eede97889e85183be086f282ebd18e860214f6ca3f01b40f2323470ee04
 DIST refpolicy-2.20140311.tar.bz2 664416 SHA256 f69437db95548c78a5dec44c236397146b144153149009ea554d2e536e5436f7 SHA512 50bacee82ed41ac8b8007ecc33bf51d22303cc2ddd27cfb72cb5520dab5f8e255186e34b89cec492c7a2d4220b200814bdede9b46c19f987a3d3d65a1c9b749a WHIRLPOOL e07480beba6ab1f02ad36b7d0c50c4a71cb39a8ec78bf8d1dc3c82bb9dd1d69d9169d7c937165ea15f60ce1147f256d46644f944107a3a8a800d5bad70d4c255
 DIST refpolicy-2.20141203.tar.bz2 680243 SHA256 f438209c430d8a2d4ddcbe4bdd3edb46f6af7dc4913637af0b73c635e40c1522 SHA512 682e4280c5799e4c12ec7594afc1389f67be35055748d2e0dbdc3419159a16c96d4946ca6178daee8370515951f8653b2e452efe8c962b8d7f9bc192f0b15a0c WHIRLPOOL 74bca232534e7af9051bb1ab9f77c1ff6c425781cf4561f781d6e9a40cc5ca0d9add540249ea5493e8782a9372aea296ead6c165c6c440ae1509eb319d151ee5
diff --git a/sec-policy/selinux-radvd/selinux-radvd-2.20141203-r8.ebuild b/sec-policy/selinux-radvd/selinux-radvd-2.20141203-r8.ebuild
index 222adf8eb341..ba16a5735c40 100644
--- a/sec-policy/selinux-radvd/selinux-radvd-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-radvd/selinux-radvd-2.20141203-r8.ebuild
@@ -13,5 +13,5 @@ DESCRIPTION="SELinux policy for radvd"
 if [[ $PV == 9999* ]] ; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-radvd/selinux-radvd-2.20141203-r9.ebuild b/sec-policy/selinux-radvd/selinux-radvd-2.20141203-r9.ebuild
new file mode 100644
index 000000000000..222adf8eb341
--- /dev/null
+++ b/sec-policy/selinux-radvd/selinux-radvd-2.20141203-r9.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI="5"
+
+IUSE=""
+MODS="radvd"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for radvd"
+
+if [[ $PV == 9999* ]] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
diff --git a/sec-policy/selinux-razor/Manifest b/sec-policy/selinux-razor/Manifest
index 8327a635be01..91d204b0021a 100644
--- a/sec-policy/selinux-razor/Manifest
+++ b/sec-policy/selinux-razor/Manifest
@@ -9,5 +9,6 @@ DIST patchbundle-selinux-base-policy-2.20141203-r5.tar.bz2 274136 SHA256 c23d17c
 DIST patchbundle-selinux-base-policy-2.20141203-r6.tar.bz2 293231 SHA256 b686dcc517b97834f66d967afdcc724cb43b5c6dbf9f34043a91cdeda2625cc7 SHA512 a2c486cbe4a1d21ff3fd01bef25ecf5a633a4072646c67cfccf3f7187d95f3d9e3b482a46ba17c55c40a8e7c0dee56e9cf9ddc9f414d3e4511443b62f60d03e9 WHIRLPOOL 3d708e287e3f9b873be647b0327eab6675a8702ee1cffb56e36934cada306e5ccc64397a083dad9e59de37a067e628cacbf896ae99012d5a209e42fd7cd8a4c6
 DIST patchbundle-selinux-base-policy-2.20141203-r7.tar.bz2 295833 SHA256 ba2219b3efc747be65f94c4d8ac3cd6ee530c82c848fa41935a114184678622a SHA512 8e32d9dbfb2f0f3f50200543aadb51ed9834ccd5cdf30bf8e4d9e6d0b645ce44ffaf80f7aa9385e9c9095d9a383b3a348a92356cb5386c06544ab082a9a468c7 WHIRLPOOL 1648ee1be71e45fcf5a264816ce7edc7bab19bd28a68703923eb2d6068f1f0469ae593855231d31f88baecbf29e7cece2d6beeed20b7c04231a6c90e90d35910
 DIST patchbundle-selinux-base-policy-2.20141203-r8.tar.bz2 297919 SHA256 77539eb3d78105f8789cd8205d2698bd27e2abf100163bdd162cda860fd15120 SHA512 2f8a19e1e4bb65f32b480275f49099aed3ae9df543c7de862b3bbd93e81b89cd96dadac3d091e28673d09a6885db8c5656b3a77d0080775c110b04f2753de7a6 WHIRLPOOL 79cb7e620eb8e838192dc557c7a9ce7e713227d783cc8b63792825559b2145cad70d0af6f99948c1527557bc363feffd846c73893682b4a14fc7d08b9e20c649
+DIST patchbundle-selinux-base-policy-2.20141203-r9.tar.bz2 299602 SHA256 e8518004942a6c57170a609683e22b1410c93a2a195829c41dc8fbc703d941b5 SHA512 ce6484fbca1d2d074e50d1a3953392bd3ce0a4617df98fbac37747b469b4f160a9331586dfe1c3ddccb1ccbee24876a2f05ab49e37c8492a48baf83c2d01d140 WHIRLPOOL 1fd7b956e98e95a64c3a713a944d4531259bd156a7feabf6a89c4b5f33ac846377730eede97889e85183be086f282ebd18e860214f6ca3f01b40f2323470ee04
 DIST refpolicy-2.20140311.tar.bz2 664416 SHA256 f69437db95548c78a5dec44c236397146b144153149009ea554d2e536e5436f7 SHA512 50bacee82ed41ac8b8007ecc33bf51d22303cc2ddd27cfb72cb5520dab5f8e255186e34b89cec492c7a2d4220b200814bdede9b46c19f987a3d3d65a1c9b749a WHIRLPOOL e07480beba6ab1f02ad36b7d0c50c4a71cb39a8ec78bf8d1dc3c82bb9dd1d69d9169d7c937165ea15f60ce1147f256d46644f944107a3a8a800d5bad70d4c255
 DIST refpolicy-2.20141203.tar.bz2 680243 SHA256 f438209c430d8a2d4ddcbe4bdd3edb46f6af7dc4913637af0b73c635e40c1522 SHA512 682e4280c5799e4c12ec7594afc1389f67be35055748d2e0dbdc3419159a16c96d4946ca6178daee8370515951f8653b2e452efe8c962b8d7f9bc192f0b15a0c WHIRLPOOL 74bca232534e7af9051bb1ab9f77c1ff6c425781cf4561f781d6e9a40cc5ca0d9add540249ea5493e8782a9372aea296ead6c165c6c440ae1509eb319d151ee5
diff --git a/sec-policy/selinux-razor/selinux-razor-2.20141203-r8.ebuild b/sec-policy/selinux-razor/selinux-razor-2.20141203-r8.ebuild
index 00e51aa1c7f8..745a0c92ca4e 100644
--- a/sec-policy/selinux-razor/selinux-razor-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-razor/selinux-razor-2.20141203-r8.ebuild
@@ -13,5 +13,5 @@ DESCRIPTION="SELinux policy for razor"
 if [[ $PV == 9999* ]] ; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-razor/selinux-razor-2.20141203-r9.ebuild b/sec-policy/selinux-razor/selinux-razor-2.20141203-r9.ebuild
new file mode 100644
index 000000000000..00e51aa1c7f8
--- /dev/null
+++ b/sec-policy/selinux-razor/selinux-razor-2.20141203-r9.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI="5"
+
+IUSE=""
+MODS="razor"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for razor"
+
+if [[ $PV == 9999* ]] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
diff --git a/sec-policy/selinux-remotelogin/Manifest b/sec-policy/selinux-remotelogin/Manifest
index 8327a635be01..91d204b0021a 100644
--- a/sec-policy/selinux-remotelogin/Manifest
+++ b/sec-policy/selinux-remotelogin/Manifest
@@ -9,5 +9,6 @@ DIST patchbundle-selinux-base-policy-2.20141203-r5.tar.bz2 274136 SHA256 c23d17c
 DIST patchbundle-selinux-base-policy-2.20141203-r6.tar.bz2 293231 SHA256 b686dcc517b97834f66d967afdcc724cb43b5c6dbf9f34043a91cdeda2625cc7 SHA512 a2c486cbe4a1d21ff3fd01bef25ecf5a633a4072646c67cfccf3f7187d95f3d9e3b482a46ba17c55c40a8e7c0dee56e9cf9ddc9f414d3e4511443b62f60d03e9 WHIRLPOOL 3d708e287e3f9b873be647b0327eab6675a8702ee1cffb56e36934cada306e5ccc64397a083dad9e59de37a067e628cacbf896ae99012d5a209e42fd7cd8a4c6
 DIST patchbundle-selinux-base-policy-2.20141203-r7.tar.bz2 295833 SHA256 ba2219b3efc747be65f94c4d8ac3cd6ee530c82c848fa41935a114184678622a SHA512 8e32d9dbfb2f0f3f50200543aadb51ed9834ccd5cdf30bf8e4d9e6d0b645ce44ffaf80f7aa9385e9c9095d9a383b3a348a92356cb5386c06544ab082a9a468c7 WHIRLPOOL 1648ee1be71e45fcf5a264816ce7edc7bab19bd28a68703923eb2d6068f1f0469ae593855231d31f88baecbf29e7cece2d6beeed20b7c04231a6c90e90d35910
 DIST patchbundle-selinux-base-policy-2.20141203-r8.tar.bz2 297919 SHA256 77539eb3d78105f8789cd8205d2698bd27e2abf100163bdd162cda860fd15120 SHA512 2f8a19e1e4bb65f32b480275f49099aed3ae9df543c7de862b3bbd93e81b89cd96dadac3d091e28673d09a6885db8c5656b3a77d0080775c110b04f2753de7a6 WHIRLPOOL 79cb7e620eb8e838192dc557c7a9ce7e713227d783cc8b63792825559b2145cad70d0af6f99948c1527557bc363feffd846c73893682b4a14fc7d08b9e20c649
+DIST patchbundle-selinux-base-policy-2.20141203-r9.tar.bz2 299602 SHA256 e8518004942a6c57170a609683e22b1410c93a2a195829c41dc8fbc703d941b5 SHA512 ce6484fbca1d2d074e50d1a3953392bd3ce0a4617df98fbac37747b469b4f160a9331586dfe1c3ddccb1ccbee24876a2f05ab49e37c8492a48baf83c2d01d140 WHIRLPOOL 1fd7b956e98e95a64c3a713a944d4531259bd156a7feabf6a89c4b5f33ac846377730eede97889e85183be086f282ebd18e860214f6ca3f01b40f2323470ee04
 DIST refpolicy-2.20140311.tar.bz2 664416 SHA256 f69437db95548c78a5dec44c236397146b144153149009ea554d2e536e5436f7 SHA512 50bacee82ed41ac8b8007ecc33bf51d22303cc2ddd27cfb72cb5520dab5f8e255186e34b89cec492c7a2d4220b200814bdede9b46c19f987a3d3d65a1c9b749a WHIRLPOOL e07480beba6ab1f02ad36b7d0c50c4a71cb39a8ec78bf8d1dc3c82bb9dd1d69d9169d7c937165ea15f60ce1147f256d46644f944107a3a8a800d5bad70d4c255
 DIST refpolicy-2.20141203.tar.bz2 680243 SHA256 f438209c430d8a2d4ddcbe4bdd3edb46f6af7dc4913637af0b73c635e40c1522 SHA512 682e4280c5799e4c12ec7594afc1389f67be35055748d2e0dbdc3419159a16c96d4946ca6178daee8370515951f8653b2e452efe8c962b8d7f9bc192f0b15a0c WHIRLPOOL 74bca232534e7af9051bb1ab9f77c1ff6c425781cf4561f781d6e9a40cc5ca0d9add540249ea5493e8782a9372aea296ead6c165c6c440ae1509eb319d151ee5
diff --git a/sec-policy/selinux-remotelogin/selinux-remotelogin-2.20141203-r8.ebuild b/sec-policy/selinux-remotelogin/selinux-remotelogin-2.20141203-r8.ebuild
index b2931aff42fd..980574699d5f 100644
--- a/sec-policy/selinux-remotelogin/selinux-remotelogin-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-remotelogin/selinux-remotelogin-2.20141203-r8.ebuild
@@ -13,5 +13,5 @@ DESCRIPTION="SELinux policy for remotelogin"
 if [[ $PV == 9999* ]] ; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-remotelogin/selinux-remotelogin-2.20141203-r9.ebuild b/sec-policy/selinux-remotelogin/selinux-remotelogin-2.20141203-r9.ebuild
new file mode 100644
index 000000000000..b2931aff42fd
--- /dev/null
+++ b/sec-policy/selinux-remotelogin/selinux-remotelogin-2.20141203-r9.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI="5"
+
+IUSE=""
+MODS="remotelogin"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for remotelogin"
+
+if [[ $PV == 9999* ]] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
diff --git a/sec-policy/selinux-resolvconf/Manifest b/sec-policy/selinux-resolvconf/Manifest
index 8327a635be01..91d204b0021a 100644
--- a/sec-policy/selinux-resolvconf/Manifest
+++ b/sec-policy/selinux-resolvconf/Manifest
@@ -9,5 +9,6 @@ DIST patchbundle-selinux-base-policy-2.20141203-r5.tar.bz2 274136 SHA256 c23d17c
 DIST patchbundle-selinux-base-policy-2.20141203-r6.tar.bz2 293231 SHA256 b686dcc517b97834f66d967afdcc724cb43b5c6dbf9f34043a91cdeda2625cc7 SHA512 a2c486cbe4a1d21ff3fd01bef25ecf5a633a4072646c67cfccf3f7187d95f3d9e3b482a46ba17c55c40a8e7c0dee56e9cf9ddc9f414d3e4511443b62f60d03e9 WHIRLPOOL 3d708e287e3f9b873be647b0327eab6675a8702ee1cffb56e36934cada306e5ccc64397a083dad9e59de37a067e628cacbf896ae99012d5a209e42fd7cd8a4c6
 DIST patchbundle-selinux-base-policy-2.20141203-r7.tar.bz2 295833 SHA256 ba2219b3efc747be65f94c4d8ac3cd6ee530c82c848fa41935a114184678622a SHA512 8e32d9dbfb2f0f3f50200543aadb51ed9834ccd5cdf30bf8e4d9e6d0b645ce44ffaf80f7aa9385e9c9095d9a383b3a348a92356cb5386c06544ab082a9a468c7 WHIRLPOOL 1648ee1be71e45fcf5a264816ce7edc7bab19bd28a68703923eb2d6068f1f0469ae593855231d31f88baecbf29e7cece2d6beeed20b7c04231a6c90e90d35910
 DIST patchbundle-selinux-base-policy-2.20141203-r8.tar.bz2 297919 SHA256 77539eb3d78105f8789cd8205d2698bd27e2abf100163bdd162cda860fd15120 SHA512 2f8a19e1e4bb65f32b480275f49099aed3ae9df543c7de862b3bbd93e81b89cd96dadac3d091e28673d09a6885db8c5656b3a77d0080775c110b04f2753de7a6 WHIRLPOOL 79cb7e620eb8e838192dc557c7a9ce7e713227d783cc8b63792825559b2145cad70d0af6f99948c1527557bc363feffd846c73893682b4a14fc7d08b9e20c649
+DIST patchbundle-selinux-base-policy-2.20141203-r9.tar.bz2 299602 SHA256 e8518004942a6c57170a609683e22b1410c93a2a195829c41dc8fbc703d941b5 SHA512 ce6484fbca1d2d074e50d1a3953392bd3ce0a4617df98fbac37747b469b4f160a9331586dfe1c3ddccb1ccbee24876a2f05ab49e37c8492a48baf83c2d01d140 WHIRLPOOL 1fd7b956e98e95a64c3a713a944d4531259bd156a7feabf6a89c4b5f33ac846377730eede97889e85183be086f282ebd18e860214f6ca3f01b40f2323470ee04
 DIST refpolicy-2.20140311.tar.bz2 664416 SHA256 f69437db95548c78a5dec44c236397146b144153149009ea554d2e536e5436f7 SHA512 50bacee82ed41ac8b8007ecc33bf51d22303cc2ddd27cfb72cb5520dab5f8e255186e34b89cec492c7a2d4220b200814bdede9b46c19f987a3d3d65a1c9b749a WHIRLPOOL e07480beba6ab1f02ad36b7d0c50c4a71cb39a8ec78bf8d1dc3c82bb9dd1d69d9169d7c937165ea15f60ce1147f256d46644f944107a3a8a800d5bad70d4c255
 DIST refpolicy-2.20141203.tar.bz2 680243 SHA256 f438209c430d8a2d4ddcbe4bdd3edb46f6af7dc4913637af0b73c635e40c1522 SHA512 682e4280c5799e4c12ec7594afc1389f67be35055748d2e0dbdc3419159a16c96d4946ca6178daee8370515951f8653b2e452efe8c962b8d7f9bc192f0b15a0c WHIRLPOOL 74bca232534e7af9051bb1ab9f77c1ff6c425781cf4561f781d6e9a40cc5ca0d9add540249ea5493e8782a9372aea296ead6c165c6c440ae1509eb319d151ee5
diff --git a/sec-policy/selinux-resolvconf/selinux-resolvconf-2.20141203-r8.ebuild b/sec-policy/selinux-resolvconf/selinux-resolvconf-2.20141203-r8.ebuild
index f3b91810c856..6536fb880be1 100644
--- a/sec-policy/selinux-resolvconf/selinux-resolvconf-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-resolvconf/selinux-resolvconf-2.20141203-r8.ebuild
@@ -13,5 +13,5 @@ DESCRIPTION="SELinux policy for resolvconf"
 if [[ $PV == 9999* ]] ; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-resolvconf/selinux-resolvconf-2.20141203-r9.ebuild b/sec-policy/selinux-resolvconf/selinux-resolvconf-2.20141203-r9.ebuild
new file mode 100644
index 000000000000..f3b91810c856
--- /dev/null
+++ b/sec-policy/selinux-resolvconf/selinux-resolvconf-2.20141203-r9.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI="5"
+
+IUSE=""
+MODS="resolvconf"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for resolvconf"
+
+if [[ $PV == 9999* ]] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
diff --git a/sec-policy/selinux-rgmanager/Manifest b/sec-policy/selinux-rgmanager/Manifest
index 8327a635be01..91d204b0021a 100644
--- a/sec-policy/selinux-rgmanager/Manifest
+++ b/sec-policy/selinux-rgmanager/Manifest
@@ -9,5 +9,6 @@ DIST patchbundle-selinux-base-policy-2.20141203-r5.tar.bz2 274136 SHA256 c23d17c
 DIST patchbundle-selinux-base-policy-2.20141203-r6.tar.bz2 293231 SHA256 b686dcc517b97834f66d967afdcc724cb43b5c6dbf9f34043a91cdeda2625cc7 SHA512 a2c486cbe4a1d21ff3fd01bef25ecf5a633a4072646c67cfccf3f7187d95f3d9e3b482a46ba17c55c40a8e7c0dee56e9cf9ddc9f414d3e4511443b62f60d03e9 WHIRLPOOL 3d708e287e3f9b873be647b0327eab6675a8702ee1cffb56e36934cada306e5ccc64397a083dad9e59de37a067e628cacbf896ae99012d5a209e42fd7cd8a4c6
 DIST patchbundle-selinux-base-policy-2.20141203-r7.tar.bz2 295833 SHA256 ba2219b3efc747be65f94c4d8ac3cd6ee530c82c848fa41935a114184678622a SHA512 8e32d9dbfb2f0f3f50200543aadb51ed9834ccd5cdf30bf8e4d9e6d0b645ce44ffaf80f7aa9385e9c9095d9a383b3a348a92356cb5386c06544ab082a9a468c7 WHIRLPOOL 1648ee1be71e45fcf5a264816ce7edc7bab19bd28a68703923eb2d6068f1f0469ae593855231d31f88baecbf29e7cece2d6beeed20b7c04231a6c90e90d35910
 DIST patchbundle-selinux-base-policy-2.20141203-r8.tar.bz2 297919 SHA256 77539eb3d78105f8789cd8205d2698bd27e2abf100163bdd162cda860fd15120 SHA512 2f8a19e1e4bb65f32b480275f49099aed3ae9df543c7de862b3bbd93e81b89cd96dadac3d091e28673d09a6885db8c5656b3a77d0080775c110b04f2753de7a6 WHIRLPOOL 79cb7e620eb8e838192dc557c7a9ce7e713227d783cc8b63792825559b2145cad70d0af6f99948c1527557bc363feffd846c73893682b4a14fc7d08b9e20c649
+DIST patchbundle-selinux-base-policy-2.20141203-r9.tar.bz2 299602 SHA256 e8518004942a6c57170a609683e22b1410c93a2a195829c41dc8fbc703d941b5 SHA512 ce6484fbca1d2d074e50d1a3953392bd3ce0a4617df98fbac37747b469b4f160a9331586dfe1c3ddccb1ccbee24876a2f05ab49e37c8492a48baf83c2d01d140 WHIRLPOOL 1fd7b956e98e95a64c3a713a944d4531259bd156a7feabf6a89c4b5f33ac846377730eede97889e85183be086f282ebd18e860214f6ca3f01b40f2323470ee04
 DIST refpolicy-2.20140311.tar.bz2 664416 SHA256 f69437db95548c78a5dec44c236397146b144153149009ea554d2e536e5436f7 SHA512 50bacee82ed41ac8b8007ecc33bf51d22303cc2ddd27cfb72cb5520dab5f8e255186e34b89cec492c7a2d4220b200814bdede9b46c19f987a3d3d65a1c9b749a WHIRLPOOL e07480beba6ab1f02ad36b7d0c50c4a71cb39a8ec78bf8d1dc3c82bb9dd1d69d9169d7c937165ea15f60ce1147f256d46644f944107a3a8a800d5bad70d4c255
 DIST refpolicy-2.20141203.tar.bz2 680243 SHA256 f438209c430d8a2d4ddcbe4bdd3edb46f6af7dc4913637af0b73c635e40c1522 SHA512 682e4280c5799e4c12ec7594afc1389f67be35055748d2e0dbdc3419159a16c96d4946ca6178daee8370515951f8653b2e452efe8c962b8d7f9bc192f0b15a0c WHIRLPOOL 74bca232534e7af9051bb1ab9f77c1ff6c425781cf4561f781d6e9a40cc5ca0d9add540249ea5493e8782a9372aea296ead6c165c6c440ae1509eb319d151ee5
diff --git a/sec-policy/selinux-rgmanager/selinux-rgmanager-2.20141203-r8.ebuild b/sec-policy/selinux-rgmanager/selinux-rgmanager-2.20141203-r8.ebuild
index 9ccc7601f22a..078f9c508af9 100644
--- a/sec-policy/selinux-rgmanager/selinux-rgmanager-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-rgmanager/selinux-rgmanager-2.20141203-r8.ebuild
@@ -13,5 +13,5 @@ DESCRIPTION="SELinux policy for rgmanager"
 if [[ $PV == 9999* ]] ; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-rgmanager/selinux-rgmanager-2.20141203-r9.ebuild b/sec-policy/selinux-rgmanager/selinux-rgmanager-2.20141203-r9.ebuild
new file mode 100644
index 000000000000..9ccc7601f22a
--- /dev/null
+++ b/sec-policy/selinux-rgmanager/selinux-rgmanager-2.20141203-r9.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI="5"
+
+IUSE=""
+MODS="rgmanager"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for rgmanager"
+
+if [[ $PV == 9999* ]] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
diff --git a/sec-policy/selinux-rngd/Manifest b/sec-policy/selinux-rngd/Manifest
index 8327a635be01..91d204b0021a 100644
--- a/sec-policy/selinux-rngd/Manifest
+++ b/sec-policy/selinux-rngd/Manifest
@@ -9,5 +9,6 @@ DIST patchbundle-selinux-base-policy-2.20141203-r5.tar.bz2 274136 SHA256 c23d17c
 DIST patchbundle-selinux-base-policy-2.20141203-r6.tar.bz2 293231 SHA256 b686dcc517b97834f66d967afdcc724cb43b5c6dbf9f34043a91cdeda2625cc7 SHA512 a2c486cbe4a1d21ff3fd01bef25ecf5a633a4072646c67cfccf3f7187d95f3d9e3b482a46ba17c55c40a8e7c0dee56e9cf9ddc9f414d3e4511443b62f60d03e9 WHIRLPOOL 3d708e287e3f9b873be647b0327eab6675a8702ee1cffb56e36934cada306e5ccc64397a083dad9e59de37a067e628cacbf896ae99012d5a209e42fd7cd8a4c6
 DIST patchbundle-selinux-base-policy-2.20141203-r7.tar.bz2 295833 SHA256 ba2219b3efc747be65f94c4d8ac3cd6ee530c82c848fa41935a114184678622a SHA512 8e32d9dbfb2f0f3f50200543aadb51ed9834ccd5cdf30bf8e4d9e6d0b645ce44ffaf80f7aa9385e9c9095d9a383b3a348a92356cb5386c06544ab082a9a468c7 WHIRLPOOL 1648ee1be71e45fcf5a264816ce7edc7bab19bd28a68703923eb2d6068f1f0469ae593855231d31f88baecbf29e7cece2d6beeed20b7c04231a6c90e90d35910
 DIST patchbundle-selinux-base-policy-2.20141203-r8.tar.bz2 297919 SHA256 77539eb3d78105f8789cd8205d2698bd27e2abf100163bdd162cda860fd15120 SHA512 2f8a19e1e4bb65f32b480275f49099aed3ae9df543c7de862b3bbd93e81b89cd96dadac3d091e28673d09a6885db8c5656b3a77d0080775c110b04f2753de7a6 WHIRLPOOL 79cb7e620eb8e838192dc557c7a9ce7e713227d783cc8b63792825559b2145cad70d0af6f99948c1527557bc363feffd846c73893682b4a14fc7d08b9e20c649
+DIST patchbundle-selinux-base-policy-2.20141203-r9.tar.bz2 299602 SHA256 e8518004942a6c57170a609683e22b1410c93a2a195829c41dc8fbc703d941b5 SHA512 ce6484fbca1d2d074e50d1a3953392bd3ce0a4617df98fbac37747b469b4f160a9331586dfe1c3ddccb1ccbee24876a2f05ab49e37c8492a48baf83c2d01d140 WHIRLPOOL 1fd7b956e98e95a64c3a713a944d4531259bd156a7feabf6a89c4b5f33ac846377730eede97889e85183be086f282ebd18e860214f6ca3f01b40f2323470ee04
 DIST refpolicy-2.20140311.tar.bz2 664416 SHA256 f69437db95548c78a5dec44c236397146b144153149009ea554d2e536e5436f7 SHA512 50bacee82ed41ac8b8007ecc33bf51d22303cc2ddd27cfb72cb5520dab5f8e255186e34b89cec492c7a2d4220b200814bdede9b46c19f987a3d3d65a1c9b749a WHIRLPOOL e07480beba6ab1f02ad36b7d0c50c4a71cb39a8ec78bf8d1dc3c82bb9dd1d69d9169d7c937165ea15f60ce1147f256d46644f944107a3a8a800d5bad70d4c255
 DIST refpolicy-2.20141203.tar.bz2 680243 SHA256 f438209c430d8a2d4ddcbe4bdd3edb46f6af7dc4913637af0b73c635e40c1522 SHA512 682e4280c5799e4c12ec7594afc1389f67be35055748d2e0dbdc3419159a16c96d4946ca6178daee8370515951f8653b2e452efe8c962b8d7f9bc192f0b15a0c WHIRLPOOL 74bca232534e7af9051bb1ab9f77c1ff6c425781cf4561f781d6e9a40cc5ca0d9add540249ea5493e8782a9372aea296ead6c165c6c440ae1509eb319d151ee5
diff --git a/sec-policy/selinux-rngd/selinux-rngd-2.20141203-r8.ebuild b/sec-policy/selinux-rngd/selinux-rngd-2.20141203-r8.ebuild
index f89d2f1d3619..fd1382a719d5 100644
--- a/sec-policy/selinux-rngd/selinux-rngd-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-rngd/selinux-rngd-2.20141203-r8.ebuild
@@ -13,5 +13,5 @@ DESCRIPTION="SELinux policy for rngd"
 if [[ $PV == 9999* ]] ; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-rngd/selinux-rngd-2.20141203-r9.ebuild b/sec-policy/selinux-rngd/selinux-rngd-2.20141203-r9.ebuild
new file mode 100644
index 000000000000..f89d2f1d3619
--- /dev/null
+++ b/sec-policy/selinux-rngd/selinux-rngd-2.20141203-r9.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI="5"
+
+IUSE=""
+MODS="rngd"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for rngd"
+
+if [[ $PV == 9999* ]] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
diff --git a/sec-policy/selinux-roundup/Manifest b/sec-policy/selinux-roundup/Manifest
index 8327a635be01..91d204b0021a 100644
--- a/sec-policy/selinux-roundup/Manifest
+++ b/sec-policy/selinux-roundup/Manifest
@@ -9,5 +9,6 @@ DIST patchbundle-selinux-base-policy-2.20141203-r5.tar.bz2 274136 SHA256 c23d17c
 DIST patchbundle-selinux-base-policy-2.20141203-r6.tar.bz2 293231 SHA256 b686dcc517b97834f66d967afdcc724cb43b5c6dbf9f34043a91cdeda2625cc7 SHA512 a2c486cbe4a1d21ff3fd01bef25ecf5a633a4072646c67cfccf3f7187d95f3d9e3b482a46ba17c55c40a8e7c0dee56e9cf9ddc9f414d3e4511443b62f60d03e9 WHIRLPOOL 3d708e287e3f9b873be647b0327eab6675a8702ee1cffb56e36934cada306e5ccc64397a083dad9e59de37a067e628cacbf896ae99012d5a209e42fd7cd8a4c6
 DIST patchbundle-selinux-base-policy-2.20141203-r7.tar.bz2 295833 SHA256 ba2219b3efc747be65f94c4d8ac3cd6ee530c82c848fa41935a114184678622a SHA512 8e32d9dbfb2f0f3f50200543aadb51ed9834ccd5cdf30bf8e4d9e6d0b645ce44ffaf80f7aa9385e9c9095d9a383b3a348a92356cb5386c06544ab082a9a468c7 WHIRLPOOL 1648ee1be71e45fcf5a264816ce7edc7bab19bd28a68703923eb2d6068f1f0469ae593855231d31f88baecbf29e7cece2d6beeed20b7c04231a6c90e90d35910
 DIST patchbundle-selinux-base-policy-2.20141203-r8.tar.bz2 297919 SHA256 77539eb3d78105f8789cd8205d2698bd27e2abf100163bdd162cda860fd15120 SHA512 2f8a19e1e4bb65f32b480275f49099aed3ae9df543c7de862b3bbd93e81b89cd96dadac3d091e28673d09a6885db8c5656b3a77d0080775c110b04f2753de7a6 WHIRLPOOL 79cb7e620eb8e838192dc557c7a9ce7e713227d783cc8b63792825559b2145cad70d0af6f99948c1527557bc363feffd846c73893682b4a14fc7d08b9e20c649
+DIST patchbundle-selinux-base-policy-2.20141203-r9.tar.bz2 299602 SHA256 e8518004942a6c57170a609683e22b1410c93a2a195829c41dc8fbc703d941b5 SHA512 ce6484fbca1d2d074e50d1a3953392bd3ce0a4617df98fbac37747b469b4f160a9331586dfe1c3ddccb1ccbee24876a2f05ab49e37c8492a48baf83c2d01d140 WHIRLPOOL 1fd7b956e98e95a64c3a713a944d4531259bd156a7feabf6a89c4b5f33ac846377730eede97889e85183be086f282ebd18e860214f6ca3f01b40f2323470ee04
 DIST refpolicy-2.20140311.tar.bz2 664416 SHA256 f69437db95548c78a5dec44c236397146b144153149009ea554d2e536e5436f7 SHA512 50bacee82ed41ac8b8007ecc33bf51d22303cc2ddd27cfb72cb5520dab5f8e255186e34b89cec492c7a2d4220b200814bdede9b46c19f987a3d3d65a1c9b749a WHIRLPOOL e07480beba6ab1f02ad36b7d0c50c4a71cb39a8ec78bf8d1dc3c82bb9dd1d69d9169d7c937165ea15f60ce1147f256d46644f944107a3a8a800d5bad70d4c255
 DIST refpolicy-2.20141203.tar.bz2 680243 SHA256 f438209c430d8a2d4ddcbe4bdd3edb46f6af7dc4913637af0b73c635e40c1522 SHA512 682e4280c5799e4c12ec7594afc1389f67be35055748d2e0dbdc3419159a16c96d4946ca6178daee8370515951f8653b2e452efe8c962b8d7f9bc192f0b15a0c WHIRLPOOL 74bca232534e7af9051bb1ab9f77c1ff6c425781cf4561f781d6e9a40cc5ca0d9add540249ea5493e8782a9372aea296ead6c165c6c440ae1509eb319d151ee5
diff --git a/sec-policy/selinux-roundup/selinux-roundup-2.20141203-r8.ebuild b/sec-policy/selinux-roundup/selinux-roundup-2.20141203-r8.ebuild
index 443c41890a4d..abe29d5f268c 100644
--- a/sec-policy/selinux-roundup/selinux-roundup-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-roundup/selinux-roundup-2.20141203-r8.ebuild
@@ -13,5 +13,5 @@ DESCRIPTION="SELinux policy for roundup"
 if [[ $PV == 9999* ]] ; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-roundup/selinux-roundup-2.20141203-r9.ebuild b/sec-policy/selinux-roundup/selinux-roundup-2.20141203-r9.ebuild
new file mode 100644
index 000000000000..443c41890a4d
--- /dev/null
+++ b/sec-policy/selinux-roundup/selinux-roundup-2.20141203-r9.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI="5"
+
+IUSE=""
+MODS="roundup"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for roundup"
+
+if [[ $PV == 9999* ]] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
diff --git a/sec-policy/selinux-rpc/Manifest b/sec-policy/selinux-rpc/Manifest
index 8327a635be01..91d204b0021a 100644
--- a/sec-policy/selinux-rpc/Manifest
+++ b/sec-policy/selinux-rpc/Manifest
@@ -9,5 +9,6 @@ DIST patchbundle-selinux-base-policy-2.20141203-r5.tar.bz2 274136 SHA256 c23d17c
 DIST patchbundle-selinux-base-policy-2.20141203-r6.tar.bz2 293231 SHA256 b686dcc517b97834f66d967afdcc724cb43b5c6dbf9f34043a91cdeda2625cc7 SHA512 a2c486cbe4a1d21ff3fd01bef25ecf5a633a4072646c67cfccf3f7187d95f3d9e3b482a46ba17c55c40a8e7c0dee56e9cf9ddc9f414d3e4511443b62f60d03e9 WHIRLPOOL 3d708e287e3f9b873be647b0327eab6675a8702ee1cffb56e36934cada306e5ccc64397a083dad9e59de37a067e628cacbf896ae99012d5a209e42fd7cd8a4c6
 DIST patchbundle-selinux-base-policy-2.20141203-r7.tar.bz2 295833 SHA256 ba2219b3efc747be65f94c4d8ac3cd6ee530c82c848fa41935a114184678622a SHA512 8e32d9dbfb2f0f3f50200543aadb51ed9834ccd5cdf30bf8e4d9e6d0b645ce44ffaf80f7aa9385e9c9095d9a383b3a348a92356cb5386c06544ab082a9a468c7 WHIRLPOOL 1648ee1be71e45fcf5a264816ce7edc7bab19bd28a68703923eb2d6068f1f0469ae593855231d31f88baecbf29e7cece2d6beeed20b7c04231a6c90e90d35910
 DIST patchbundle-selinux-base-policy-2.20141203-r8.tar.bz2 297919 SHA256 77539eb3d78105f8789cd8205d2698bd27e2abf100163bdd162cda860fd15120 SHA512 2f8a19e1e4bb65f32b480275f49099aed3ae9df543c7de862b3bbd93e81b89cd96dadac3d091e28673d09a6885db8c5656b3a77d0080775c110b04f2753de7a6 WHIRLPOOL 79cb7e620eb8e838192dc557c7a9ce7e713227d783cc8b63792825559b2145cad70d0af6f99948c1527557bc363feffd846c73893682b4a14fc7d08b9e20c649
+DIST patchbundle-selinux-base-policy-2.20141203-r9.tar.bz2 299602 SHA256 e8518004942a6c57170a609683e22b1410c93a2a195829c41dc8fbc703d941b5 SHA512 ce6484fbca1d2d074e50d1a3953392bd3ce0a4617df98fbac37747b469b4f160a9331586dfe1c3ddccb1ccbee24876a2f05ab49e37c8492a48baf83c2d01d140 WHIRLPOOL 1fd7b956e98e95a64c3a713a944d4531259bd156a7feabf6a89c4b5f33ac846377730eede97889e85183be086f282ebd18e860214f6ca3f01b40f2323470ee04
 DIST refpolicy-2.20140311.tar.bz2 664416 SHA256 f69437db95548c78a5dec44c236397146b144153149009ea554d2e536e5436f7 SHA512 50bacee82ed41ac8b8007ecc33bf51d22303cc2ddd27cfb72cb5520dab5f8e255186e34b89cec492c7a2d4220b200814bdede9b46c19f987a3d3d65a1c9b749a WHIRLPOOL e07480beba6ab1f02ad36b7d0c50c4a71cb39a8ec78bf8d1dc3c82bb9dd1d69d9169d7c937165ea15f60ce1147f256d46644f944107a3a8a800d5bad70d4c255
 DIST refpolicy-2.20141203.tar.bz2 680243 SHA256 f438209c430d8a2d4ddcbe4bdd3edb46f6af7dc4913637af0b73c635e40c1522 SHA512 682e4280c5799e4c12ec7594afc1389f67be35055748d2e0dbdc3419159a16c96d4946ca6178daee8370515951f8653b2e452efe8c962b8d7f9bc192f0b15a0c WHIRLPOOL 74bca232534e7af9051bb1ab9f77c1ff6c425781cf4561f781d6e9a40cc5ca0d9add540249ea5493e8782a9372aea296ead6c165c6c440ae1509eb319d151ee5
diff --git a/sec-policy/selinux-rpc/selinux-rpc-2.20141203-r8.ebuild b/sec-policy/selinux-rpc/selinux-rpc-2.20141203-r8.ebuild
index 56cfe9d9a8e0..85413fa66c5e 100644
--- a/sec-policy/selinux-rpc/selinux-rpc-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-rpc/selinux-rpc-2.20141203-r8.ebuild
@@ -13,5 +13,5 @@ DESCRIPTION="SELinux policy for rpc"
 if [[ $PV == 9999* ]] ; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-rpc/selinux-rpc-2.20141203-r9.ebuild b/sec-policy/selinux-rpc/selinux-rpc-2.20141203-r9.ebuild
new file mode 100644
index 000000000000..56cfe9d9a8e0
--- /dev/null
+++ b/sec-policy/selinux-rpc/selinux-rpc-2.20141203-r9.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI="5"
+
+IUSE=""
+MODS="rpc"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for rpc"
+
+if [[ $PV == 9999* ]] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
diff --git a/sec-policy/selinux-rpcbind/Manifest b/sec-policy/selinux-rpcbind/Manifest
index 8327a635be01..91d204b0021a 100644
--- a/sec-policy/selinux-rpcbind/Manifest
+++ b/sec-policy/selinux-rpcbind/Manifest
@@ -9,5 +9,6 @@ DIST patchbundle-selinux-base-policy-2.20141203-r5.tar.bz2 274136 SHA256 c23d17c
 DIST patchbundle-selinux-base-policy-2.20141203-r6.tar.bz2 293231 SHA256 b686dcc517b97834f66d967afdcc724cb43b5c6dbf9f34043a91cdeda2625cc7 SHA512 a2c486cbe4a1d21ff3fd01bef25ecf5a633a4072646c67cfccf3f7187d95f3d9e3b482a46ba17c55c40a8e7c0dee56e9cf9ddc9f414d3e4511443b62f60d03e9 WHIRLPOOL 3d708e287e3f9b873be647b0327eab6675a8702ee1cffb56e36934cada306e5ccc64397a083dad9e59de37a067e628cacbf896ae99012d5a209e42fd7cd8a4c6
 DIST patchbundle-selinux-base-policy-2.20141203-r7.tar.bz2 295833 SHA256 ba2219b3efc747be65f94c4d8ac3cd6ee530c82c848fa41935a114184678622a SHA512 8e32d9dbfb2f0f3f50200543aadb51ed9834ccd5cdf30bf8e4d9e6d0b645ce44ffaf80f7aa9385e9c9095d9a383b3a348a92356cb5386c06544ab082a9a468c7 WHIRLPOOL 1648ee1be71e45fcf5a264816ce7edc7bab19bd28a68703923eb2d6068f1f0469ae593855231d31f88baecbf29e7cece2d6beeed20b7c04231a6c90e90d35910
 DIST patchbundle-selinux-base-policy-2.20141203-r8.tar.bz2 297919 SHA256 77539eb3d78105f8789cd8205d2698bd27e2abf100163bdd162cda860fd15120 SHA512 2f8a19e1e4bb65f32b480275f49099aed3ae9df543c7de862b3bbd93e81b89cd96dadac3d091e28673d09a6885db8c5656b3a77d0080775c110b04f2753de7a6 WHIRLPOOL 79cb7e620eb8e838192dc557c7a9ce7e713227d783cc8b63792825559b2145cad70d0af6f99948c1527557bc363feffd846c73893682b4a14fc7d08b9e20c649
+DIST patchbundle-selinux-base-policy-2.20141203-r9.tar.bz2 299602 SHA256 e8518004942a6c57170a609683e22b1410c93a2a195829c41dc8fbc703d941b5 SHA512 ce6484fbca1d2d074e50d1a3953392bd3ce0a4617df98fbac37747b469b4f160a9331586dfe1c3ddccb1ccbee24876a2f05ab49e37c8492a48baf83c2d01d140 WHIRLPOOL 1fd7b956e98e95a64c3a713a944d4531259bd156a7feabf6a89c4b5f33ac846377730eede97889e85183be086f282ebd18e860214f6ca3f01b40f2323470ee04
 DIST refpolicy-2.20140311.tar.bz2 664416 SHA256 f69437db95548c78a5dec44c236397146b144153149009ea554d2e536e5436f7 SHA512 50bacee82ed41ac8b8007ecc33bf51d22303cc2ddd27cfb72cb5520dab5f8e255186e34b89cec492c7a2d4220b200814bdede9b46c19f987a3d3d65a1c9b749a WHIRLPOOL e07480beba6ab1f02ad36b7d0c50c4a71cb39a8ec78bf8d1dc3c82bb9dd1d69d9169d7c937165ea15f60ce1147f256d46644f944107a3a8a800d5bad70d4c255
 DIST refpolicy-2.20141203.tar.bz2 680243 SHA256 f438209c430d8a2d4ddcbe4bdd3edb46f6af7dc4913637af0b73c635e40c1522 SHA512 682e4280c5799e4c12ec7594afc1389f67be35055748d2e0dbdc3419159a16c96d4946ca6178daee8370515951f8653b2e452efe8c962b8d7f9bc192f0b15a0c WHIRLPOOL 74bca232534e7af9051bb1ab9f77c1ff6c425781cf4561f781d6e9a40cc5ca0d9add540249ea5493e8782a9372aea296ead6c165c6c440ae1509eb319d151ee5
diff --git a/sec-policy/selinux-rpcbind/selinux-rpcbind-2.20141203-r8.ebuild b/sec-policy/selinux-rpcbind/selinux-rpcbind-2.20141203-r8.ebuild
index 3762021f16a1..511605a4be1e 100644
--- a/sec-policy/selinux-rpcbind/selinux-rpcbind-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-rpcbind/selinux-rpcbind-2.20141203-r8.ebuild
@@ -13,5 +13,5 @@ DESCRIPTION="SELinux policy for rpcbind"
 if [[ $PV == 9999* ]] ; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-rpcbind/selinux-rpcbind-2.20141203-r9.ebuild b/sec-policy/selinux-rpcbind/selinux-rpcbind-2.20141203-r9.ebuild
new file mode 100644
index 000000000000..3762021f16a1
--- /dev/null
+++ b/sec-policy/selinux-rpcbind/selinux-rpcbind-2.20141203-r9.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI="5"
+
+IUSE=""
+MODS="rpcbind"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for rpcbind"
+
+if [[ $PV == 9999* ]] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
diff --git a/sec-policy/selinux-rpm/Manifest b/sec-policy/selinux-rpm/Manifest
index 8327a635be01..91d204b0021a 100644
--- a/sec-policy/selinux-rpm/Manifest
+++ b/sec-policy/selinux-rpm/Manifest
@@ -9,5 +9,6 @@ DIST patchbundle-selinux-base-policy-2.20141203-r5.tar.bz2 274136 SHA256 c23d17c
 DIST patchbundle-selinux-base-policy-2.20141203-r6.tar.bz2 293231 SHA256 b686dcc517b97834f66d967afdcc724cb43b5c6dbf9f34043a91cdeda2625cc7 SHA512 a2c486cbe4a1d21ff3fd01bef25ecf5a633a4072646c67cfccf3f7187d95f3d9e3b482a46ba17c55c40a8e7c0dee56e9cf9ddc9f414d3e4511443b62f60d03e9 WHIRLPOOL 3d708e287e3f9b873be647b0327eab6675a8702ee1cffb56e36934cada306e5ccc64397a083dad9e59de37a067e628cacbf896ae99012d5a209e42fd7cd8a4c6
 DIST patchbundle-selinux-base-policy-2.20141203-r7.tar.bz2 295833 SHA256 ba2219b3efc747be65f94c4d8ac3cd6ee530c82c848fa41935a114184678622a SHA512 8e32d9dbfb2f0f3f50200543aadb51ed9834ccd5cdf30bf8e4d9e6d0b645ce44ffaf80f7aa9385e9c9095d9a383b3a348a92356cb5386c06544ab082a9a468c7 WHIRLPOOL 1648ee1be71e45fcf5a264816ce7edc7bab19bd28a68703923eb2d6068f1f0469ae593855231d31f88baecbf29e7cece2d6beeed20b7c04231a6c90e90d35910
 DIST patchbundle-selinux-base-policy-2.20141203-r8.tar.bz2 297919 SHA256 77539eb3d78105f8789cd8205d2698bd27e2abf100163bdd162cda860fd15120 SHA512 2f8a19e1e4bb65f32b480275f49099aed3ae9df543c7de862b3bbd93e81b89cd96dadac3d091e28673d09a6885db8c5656b3a77d0080775c110b04f2753de7a6 WHIRLPOOL 79cb7e620eb8e838192dc557c7a9ce7e713227d783cc8b63792825559b2145cad70d0af6f99948c1527557bc363feffd846c73893682b4a14fc7d08b9e20c649
+DIST patchbundle-selinux-base-policy-2.20141203-r9.tar.bz2 299602 SHA256 e8518004942a6c57170a609683e22b1410c93a2a195829c41dc8fbc703d941b5 SHA512 ce6484fbca1d2d074e50d1a3953392bd3ce0a4617df98fbac37747b469b4f160a9331586dfe1c3ddccb1ccbee24876a2f05ab49e37c8492a48baf83c2d01d140 WHIRLPOOL 1fd7b956e98e95a64c3a713a944d4531259bd156a7feabf6a89c4b5f33ac846377730eede97889e85183be086f282ebd18e860214f6ca3f01b40f2323470ee04
 DIST refpolicy-2.20140311.tar.bz2 664416 SHA256 f69437db95548c78a5dec44c236397146b144153149009ea554d2e536e5436f7 SHA512 50bacee82ed41ac8b8007ecc33bf51d22303cc2ddd27cfb72cb5520dab5f8e255186e34b89cec492c7a2d4220b200814bdede9b46c19f987a3d3d65a1c9b749a WHIRLPOOL e07480beba6ab1f02ad36b7d0c50c4a71cb39a8ec78bf8d1dc3c82bb9dd1d69d9169d7c937165ea15f60ce1147f256d46644f944107a3a8a800d5bad70d4c255
 DIST refpolicy-2.20141203.tar.bz2 680243 SHA256 f438209c430d8a2d4ddcbe4bdd3edb46f6af7dc4913637af0b73c635e40c1522 SHA512 682e4280c5799e4c12ec7594afc1389f67be35055748d2e0dbdc3419159a16c96d4946ca6178daee8370515951f8653b2e452efe8c962b8d7f9bc192f0b15a0c WHIRLPOOL 74bca232534e7af9051bb1ab9f77c1ff6c425781cf4561f781d6e9a40cc5ca0d9add540249ea5493e8782a9372aea296ead6c165c6c440ae1509eb319d151ee5
diff --git a/sec-policy/selinux-rpm/selinux-rpm-2.20141203-r8.ebuild b/sec-policy/selinux-rpm/selinux-rpm-2.20141203-r8.ebuild
index 805f0aa45502..647be8aad17e 100644
--- a/sec-policy/selinux-rpm/selinux-rpm-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-rpm/selinux-rpm-2.20141203-r8.ebuild
@@ -13,5 +13,5 @@ DESCRIPTION="SELinux policy for rpm"
 if [[ $PV == 9999* ]] ; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-rpm/selinux-rpm-2.20141203-r9.ebuild b/sec-policy/selinux-rpm/selinux-rpm-2.20141203-r9.ebuild
new file mode 100644
index 000000000000..805f0aa45502
--- /dev/null
+++ b/sec-policy/selinux-rpm/selinux-rpm-2.20141203-r9.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI="5"
+
+IUSE=""
+MODS="rpm"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for rpm"
+
+if [[ $PV == 9999* ]] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
diff --git a/sec-policy/selinux-rssh/Manifest b/sec-policy/selinux-rssh/Manifest
index 8327a635be01..91d204b0021a 100644
--- a/sec-policy/selinux-rssh/Manifest
+++ b/sec-policy/selinux-rssh/Manifest
@@ -9,5 +9,6 @@ DIST patchbundle-selinux-base-policy-2.20141203-r5.tar.bz2 274136 SHA256 c23d17c
 DIST patchbundle-selinux-base-policy-2.20141203-r6.tar.bz2 293231 SHA256 b686dcc517b97834f66d967afdcc724cb43b5c6dbf9f34043a91cdeda2625cc7 SHA512 a2c486cbe4a1d21ff3fd01bef25ecf5a633a4072646c67cfccf3f7187d95f3d9e3b482a46ba17c55c40a8e7c0dee56e9cf9ddc9f414d3e4511443b62f60d03e9 WHIRLPOOL 3d708e287e3f9b873be647b0327eab6675a8702ee1cffb56e36934cada306e5ccc64397a083dad9e59de37a067e628cacbf896ae99012d5a209e42fd7cd8a4c6
 DIST patchbundle-selinux-base-policy-2.20141203-r7.tar.bz2 295833 SHA256 ba2219b3efc747be65f94c4d8ac3cd6ee530c82c848fa41935a114184678622a SHA512 8e32d9dbfb2f0f3f50200543aadb51ed9834ccd5cdf30bf8e4d9e6d0b645ce44ffaf80f7aa9385e9c9095d9a383b3a348a92356cb5386c06544ab082a9a468c7 WHIRLPOOL 1648ee1be71e45fcf5a264816ce7edc7bab19bd28a68703923eb2d6068f1f0469ae593855231d31f88baecbf29e7cece2d6beeed20b7c04231a6c90e90d35910
 DIST patchbundle-selinux-base-policy-2.20141203-r8.tar.bz2 297919 SHA256 77539eb3d78105f8789cd8205d2698bd27e2abf100163bdd162cda860fd15120 SHA512 2f8a19e1e4bb65f32b480275f49099aed3ae9df543c7de862b3bbd93e81b89cd96dadac3d091e28673d09a6885db8c5656b3a77d0080775c110b04f2753de7a6 WHIRLPOOL 79cb7e620eb8e838192dc557c7a9ce7e713227d783cc8b63792825559b2145cad70d0af6f99948c1527557bc363feffd846c73893682b4a14fc7d08b9e20c649
+DIST patchbundle-selinux-base-policy-2.20141203-r9.tar.bz2 299602 SHA256 e8518004942a6c57170a609683e22b1410c93a2a195829c41dc8fbc703d941b5 SHA512 ce6484fbca1d2d074e50d1a3953392bd3ce0a4617df98fbac37747b469b4f160a9331586dfe1c3ddccb1ccbee24876a2f05ab49e37c8492a48baf83c2d01d140 WHIRLPOOL 1fd7b956e98e95a64c3a713a944d4531259bd156a7feabf6a89c4b5f33ac846377730eede97889e85183be086f282ebd18e860214f6ca3f01b40f2323470ee04
 DIST refpolicy-2.20140311.tar.bz2 664416 SHA256 f69437db95548c78a5dec44c236397146b144153149009ea554d2e536e5436f7 SHA512 50bacee82ed41ac8b8007ecc33bf51d22303cc2ddd27cfb72cb5520dab5f8e255186e34b89cec492c7a2d4220b200814bdede9b46c19f987a3d3d65a1c9b749a WHIRLPOOL e07480beba6ab1f02ad36b7d0c50c4a71cb39a8ec78bf8d1dc3c82bb9dd1d69d9169d7c937165ea15f60ce1147f256d46644f944107a3a8a800d5bad70d4c255
 DIST refpolicy-2.20141203.tar.bz2 680243 SHA256 f438209c430d8a2d4ddcbe4bdd3edb46f6af7dc4913637af0b73c635e40c1522 SHA512 682e4280c5799e4c12ec7594afc1389f67be35055748d2e0dbdc3419159a16c96d4946ca6178daee8370515951f8653b2e452efe8c962b8d7f9bc192f0b15a0c WHIRLPOOL 74bca232534e7af9051bb1ab9f77c1ff6c425781cf4561f781d6e9a40cc5ca0d9add540249ea5493e8782a9372aea296ead6c165c6c440ae1509eb319d151ee5
diff --git a/sec-policy/selinux-rssh/selinux-rssh-2.20141203-r8.ebuild b/sec-policy/selinux-rssh/selinux-rssh-2.20141203-r8.ebuild
index 22b5a6d213d0..9ce67ca96922 100644
--- a/sec-policy/selinux-rssh/selinux-rssh-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-rssh/selinux-rssh-2.20141203-r8.ebuild
@@ -13,5 +13,5 @@ DESCRIPTION="SELinux policy for rssh"
 if [[ $PV == 9999* ]] ; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-rssh/selinux-rssh-2.20141203-r9.ebuild b/sec-policy/selinux-rssh/selinux-rssh-2.20141203-r9.ebuild
new file mode 100644
index 000000000000..22b5a6d213d0
--- /dev/null
+++ b/sec-policy/selinux-rssh/selinux-rssh-2.20141203-r9.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI="5"
+
+IUSE=""
+MODS="rssh"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for rssh"
+
+if [[ $PV == 9999* ]] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
diff --git a/sec-policy/selinux-rtkit/Manifest b/sec-policy/selinux-rtkit/Manifest
index 8327a635be01..91d204b0021a 100644
--- a/sec-policy/selinux-rtkit/Manifest
+++ b/sec-policy/selinux-rtkit/Manifest
@@ -9,5 +9,6 @@ DIST patchbundle-selinux-base-policy-2.20141203-r5.tar.bz2 274136 SHA256 c23d17c
 DIST patchbundle-selinux-base-policy-2.20141203-r6.tar.bz2 293231 SHA256 b686dcc517b97834f66d967afdcc724cb43b5c6dbf9f34043a91cdeda2625cc7 SHA512 a2c486cbe4a1d21ff3fd01bef25ecf5a633a4072646c67cfccf3f7187d95f3d9e3b482a46ba17c55c40a8e7c0dee56e9cf9ddc9f414d3e4511443b62f60d03e9 WHIRLPOOL 3d708e287e3f9b873be647b0327eab6675a8702ee1cffb56e36934cada306e5ccc64397a083dad9e59de37a067e628cacbf896ae99012d5a209e42fd7cd8a4c6
 DIST patchbundle-selinux-base-policy-2.20141203-r7.tar.bz2 295833 SHA256 ba2219b3efc747be65f94c4d8ac3cd6ee530c82c848fa41935a114184678622a SHA512 8e32d9dbfb2f0f3f50200543aadb51ed9834ccd5cdf30bf8e4d9e6d0b645ce44ffaf80f7aa9385e9c9095d9a383b3a348a92356cb5386c06544ab082a9a468c7 WHIRLPOOL 1648ee1be71e45fcf5a264816ce7edc7bab19bd28a68703923eb2d6068f1f0469ae593855231d31f88baecbf29e7cece2d6beeed20b7c04231a6c90e90d35910
 DIST patchbundle-selinux-base-policy-2.20141203-r8.tar.bz2 297919 SHA256 77539eb3d78105f8789cd8205d2698bd27e2abf100163bdd162cda860fd15120 SHA512 2f8a19e1e4bb65f32b480275f49099aed3ae9df543c7de862b3bbd93e81b89cd96dadac3d091e28673d09a6885db8c5656b3a77d0080775c110b04f2753de7a6 WHIRLPOOL 79cb7e620eb8e838192dc557c7a9ce7e713227d783cc8b63792825559b2145cad70d0af6f99948c1527557bc363feffd846c73893682b4a14fc7d08b9e20c649
+DIST patchbundle-selinux-base-policy-2.20141203-r9.tar.bz2 299602 SHA256 e8518004942a6c57170a609683e22b1410c93a2a195829c41dc8fbc703d941b5 SHA512 ce6484fbca1d2d074e50d1a3953392bd3ce0a4617df98fbac37747b469b4f160a9331586dfe1c3ddccb1ccbee24876a2f05ab49e37c8492a48baf83c2d01d140 WHIRLPOOL 1fd7b956e98e95a64c3a713a944d4531259bd156a7feabf6a89c4b5f33ac846377730eede97889e85183be086f282ebd18e860214f6ca3f01b40f2323470ee04
 DIST refpolicy-2.20140311.tar.bz2 664416 SHA256 f69437db95548c78a5dec44c236397146b144153149009ea554d2e536e5436f7 SHA512 50bacee82ed41ac8b8007ecc33bf51d22303cc2ddd27cfb72cb5520dab5f8e255186e34b89cec492c7a2d4220b200814bdede9b46c19f987a3d3d65a1c9b749a WHIRLPOOL e07480beba6ab1f02ad36b7d0c50c4a71cb39a8ec78bf8d1dc3c82bb9dd1d69d9169d7c937165ea15f60ce1147f256d46644f944107a3a8a800d5bad70d4c255
 DIST refpolicy-2.20141203.tar.bz2 680243 SHA256 f438209c430d8a2d4ddcbe4bdd3edb46f6af7dc4913637af0b73c635e40c1522 SHA512 682e4280c5799e4c12ec7594afc1389f67be35055748d2e0dbdc3419159a16c96d4946ca6178daee8370515951f8653b2e452efe8c962b8d7f9bc192f0b15a0c WHIRLPOOL 74bca232534e7af9051bb1ab9f77c1ff6c425781cf4561f781d6e9a40cc5ca0d9add540249ea5493e8782a9372aea296ead6c165c6c440ae1509eb319d151ee5
diff --git a/sec-policy/selinux-rtkit/selinux-rtkit-2.20141203-r8.ebuild b/sec-policy/selinux-rtkit/selinux-rtkit-2.20141203-r8.ebuild
index c7fee66cef1a..8b517a064ba1 100644
--- a/sec-policy/selinux-rtkit/selinux-rtkit-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-rtkit/selinux-rtkit-2.20141203-r8.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="SELinux policy for rtkit"
 if [[ $PV == 9999* ]] ; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-dbus
diff --git a/sec-policy/selinux-rtkit/selinux-rtkit-2.20141203-r9.ebuild b/sec-policy/selinux-rtkit/selinux-rtkit-2.20141203-r9.ebuild
new file mode 100644
index 000000000000..c7fee66cef1a
--- /dev/null
+++ b/sec-policy/selinux-rtkit/selinux-rtkit-2.20141203-r9.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI="5"
+
+IUSE=""
+MODS="rtkit"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for rtkit"
+
+if [[ $PV == 9999* ]] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
+DEPEND="${DEPEND}
+	sec-policy/selinux-dbus
+"
+RDEPEND="${RDEPEND}
+	sec-policy/selinux-dbus
+"
diff --git a/sec-policy/selinux-rtorrent/Manifest b/sec-policy/selinux-rtorrent/Manifest
index 8327a635be01..91d204b0021a 100644
--- a/sec-policy/selinux-rtorrent/Manifest
+++ b/sec-policy/selinux-rtorrent/Manifest
@@ -9,5 +9,6 @@ DIST patchbundle-selinux-base-policy-2.20141203-r5.tar.bz2 274136 SHA256 c23d17c
 DIST patchbundle-selinux-base-policy-2.20141203-r6.tar.bz2 293231 SHA256 b686dcc517b97834f66d967afdcc724cb43b5c6dbf9f34043a91cdeda2625cc7 SHA512 a2c486cbe4a1d21ff3fd01bef25ecf5a633a4072646c67cfccf3f7187d95f3d9e3b482a46ba17c55c40a8e7c0dee56e9cf9ddc9f414d3e4511443b62f60d03e9 WHIRLPOOL 3d708e287e3f9b873be647b0327eab6675a8702ee1cffb56e36934cada306e5ccc64397a083dad9e59de37a067e628cacbf896ae99012d5a209e42fd7cd8a4c6
 DIST patchbundle-selinux-base-policy-2.20141203-r7.tar.bz2 295833 SHA256 ba2219b3efc747be65f94c4d8ac3cd6ee530c82c848fa41935a114184678622a SHA512 8e32d9dbfb2f0f3f50200543aadb51ed9834ccd5cdf30bf8e4d9e6d0b645ce44ffaf80f7aa9385e9c9095d9a383b3a348a92356cb5386c06544ab082a9a468c7 WHIRLPOOL 1648ee1be71e45fcf5a264816ce7edc7bab19bd28a68703923eb2d6068f1f0469ae593855231d31f88baecbf29e7cece2d6beeed20b7c04231a6c90e90d35910
 DIST patchbundle-selinux-base-policy-2.20141203-r8.tar.bz2 297919 SHA256 77539eb3d78105f8789cd8205d2698bd27e2abf100163bdd162cda860fd15120 SHA512 2f8a19e1e4bb65f32b480275f49099aed3ae9df543c7de862b3bbd93e81b89cd96dadac3d091e28673d09a6885db8c5656b3a77d0080775c110b04f2753de7a6 WHIRLPOOL 79cb7e620eb8e838192dc557c7a9ce7e713227d783cc8b63792825559b2145cad70d0af6f99948c1527557bc363feffd846c73893682b4a14fc7d08b9e20c649
+DIST patchbundle-selinux-base-policy-2.20141203-r9.tar.bz2 299602 SHA256 e8518004942a6c57170a609683e22b1410c93a2a195829c41dc8fbc703d941b5 SHA512 ce6484fbca1d2d074e50d1a3953392bd3ce0a4617df98fbac37747b469b4f160a9331586dfe1c3ddccb1ccbee24876a2f05ab49e37c8492a48baf83c2d01d140 WHIRLPOOL 1fd7b956e98e95a64c3a713a944d4531259bd156a7feabf6a89c4b5f33ac846377730eede97889e85183be086f282ebd18e860214f6ca3f01b40f2323470ee04
 DIST refpolicy-2.20140311.tar.bz2 664416 SHA256 f69437db95548c78a5dec44c236397146b144153149009ea554d2e536e5436f7 SHA512 50bacee82ed41ac8b8007ecc33bf51d22303cc2ddd27cfb72cb5520dab5f8e255186e34b89cec492c7a2d4220b200814bdede9b46c19f987a3d3d65a1c9b749a WHIRLPOOL e07480beba6ab1f02ad36b7d0c50c4a71cb39a8ec78bf8d1dc3c82bb9dd1d69d9169d7c937165ea15f60ce1147f256d46644f944107a3a8a800d5bad70d4c255
 DIST refpolicy-2.20141203.tar.bz2 680243 SHA256 f438209c430d8a2d4ddcbe4bdd3edb46f6af7dc4913637af0b73c635e40c1522 SHA512 682e4280c5799e4c12ec7594afc1389f67be35055748d2e0dbdc3419159a16c96d4946ca6178daee8370515951f8653b2e452efe8c962b8d7f9bc192f0b15a0c WHIRLPOOL 74bca232534e7af9051bb1ab9f77c1ff6c425781cf4561f781d6e9a40cc5ca0d9add540249ea5493e8782a9372aea296ead6c165c6c440ae1509eb319d151ee5
diff --git a/sec-policy/selinux-rtorrent/selinux-rtorrent-2.20141203-r8.ebuild b/sec-policy/selinux-rtorrent/selinux-rtorrent-2.20141203-r8.ebuild
index df447b49cae6..ac8c6ec770bf 100644
--- a/sec-policy/selinux-rtorrent/selinux-rtorrent-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-rtorrent/selinux-rtorrent-2.20141203-r8.ebuild
@@ -13,5 +13,5 @@ DESCRIPTION="SELinux policy for rtorrent"
 if [[ $PV == 9999* ]] ; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-rtorrent/selinux-rtorrent-2.20141203-r9.ebuild b/sec-policy/selinux-rtorrent/selinux-rtorrent-2.20141203-r9.ebuild
new file mode 100644
index 000000000000..df447b49cae6
--- /dev/null
+++ b/sec-policy/selinux-rtorrent/selinux-rtorrent-2.20141203-r9.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI="5"
+
+IUSE=""
+MODS="rtorrent"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for rtorrent"
+
+if [[ $PV == 9999* ]] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
diff --git a/sec-policy/selinux-salt/Manifest b/sec-policy/selinux-salt/Manifest
index 4bdcd0ab71c3..3f127d234f06 100644
--- a/sec-policy/selinux-salt/Manifest
+++ b/sec-policy/selinux-salt/Manifest
@@ -8,5 +8,6 @@ DIST patchbundle-selinux-base-policy-2.20141203-r5.tar.bz2 274136 SHA256 c23d17c
 DIST patchbundle-selinux-base-policy-2.20141203-r6.tar.bz2 293231 SHA256 b686dcc517b97834f66d967afdcc724cb43b5c6dbf9f34043a91cdeda2625cc7 SHA512 a2c486cbe4a1d21ff3fd01bef25ecf5a633a4072646c67cfccf3f7187d95f3d9e3b482a46ba17c55c40a8e7c0dee56e9cf9ddc9f414d3e4511443b62f60d03e9 WHIRLPOOL 3d708e287e3f9b873be647b0327eab6675a8702ee1cffb56e36934cada306e5ccc64397a083dad9e59de37a067e628cacbf896ae99012d5a209e42fd7cd8a4c6
 DIST patchbundle-selinux-base-policy-2.20141203-r7.tar.bz2 295833 SHA256 ba2219b3efc747be65f94c4d8ac3cd6ee530c82c848fa41935a114184678622a SHA512 8e32d9dbfb2f0f3f50200543aadb51ed9834ccd5cdf30bf8e4d9e6d0b645ce44ffaf80f7aa9385e9c9095d9a383b3a348a92356cb5386c06544ab082a9a468c7 WHIRLPOOL 1648ee1be71e45fcf5a264816ce7edc7bab19bd28a68703923eb2d6068f1f0469ae593855231d31f88baecbf29e7cece2d6beeed20b7c04231a6c90e90d35910
 DIST patchbundle-selinux-base-policy-2.20141203-r8.tar.bz2 297919 SHA256 77539eb3d78105f8789cd8205d2698bd27e2abf100163bdd162cda860fd15120 SHA512 2f8a19e1e4bb65f32b480275f49099aed3ae9df543c7de862b3bbd93e81b89cd96dadac3d091e28673d09a6885db8c5656b3a77d0080775c110b04f2753de7a6 WHIRLPOOL 79cb7e620eb8e838192dc557c7a9ce7e713227d783cc8b63792825559b2145cad70d0af6f99948c1527557bc363feffd846c73893682b4a14fc7d08b9e20c649
+DIST patchbundle-selinux-base-policy-2.20141203-r9.tar.bz2 299602 SHA256 e8518004942a6c57170a609683e22b1410c93a2a195829c41dc8fbc703d941b5 SHA512 ce6484fbca1d2d074e50d1a3953392bd3ce0a4617df98fbac37747b469b4f160a9331586dfe1c3ddccb1ccbee24876a2f05ab49e37c8492a48baf83c2d01d140 WHIRLPOOL 1fd7b956e98e95a64c3a713a944d4531259bd156a7feabf6a89c4b5f33ac846377730eede97889e85183be086f282ebd18e860214f6ca3f01b40f2323470ee04
 DIST refpolicy-2.20140311.tar.bz2 664416 SHA256 f69437db95548c78a5dec44c236397146b144153149009ea554d2e536e5436f7 SHA512 50bacee82ed41ac8b8007ecc33bf51d22303cc2ddd27cfb72cb5520dab5f8e255186e34b89cec492c7a2d4220b200814bdede9b46c19f987a3d3d65a1c9b749a WHIRLPOOL e07480beba6ab1f02ad36b7d0c50c4a71cb39a8ec78bf8d1dc3c82bb9dd1d69d9169d7c937165ea15f60ce1147f256d46644f944107a3a8a800d5bad70d4c255
 DIST refpolicy-2.20141203.tar.bz2 680243 SHA256 f438209c430d8a2d4ddcbe4bdd3edb46f6af7dc4913637af0b73c635e40c1522 SHA512 682e4280c5799e4c12ec7594afc1389f67be35055748d2e0dbdc3419159a16c96d4946ca6178daee8370515951f8653b2e452efe8c962b8d7f9bc192f0b15a0c WHIRLPOOL 74bca232534e7af9051bb1ab9f77c1ff6c425781cf4561f781d6e9a40cc5ca0d9add540249ea5493e8782a9372aea296ead6c165c6c440ae1509eb319d151ee5
diff --git a/sec-policy/selinux-salt/selinux-salt-2.20141203-r8.ebuild b/sec-policy/selinux-salt/selinux-salt-2.20141203-r8.ebuild
index c6e888b43fb3..e40e22ba8046 100644
--- a/sec-policy/selinux-salt/selinux-salt-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-salt/selinux-salt-2.20141203-r8.ebuild
@@ -13,5 +13,5 @@ DESCRIPTION="SELinux policy for salt"
 if [[ $PV == 9999* ]] ; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-salt/selinux-salt-2.20141203-r9.ebuild b/sec-policy/selinux-salt/selinux-salt-2.20141203-r9.ebuild
new file mode 100644
index 000000000000..c6e888b43fb3
--- /dev/null
+++ b/sec-policy/selinux-salt/selinux-salt-2.20141203-r9.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI="5"
+
+IUSE=""
+MODS="salt"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for salt"
+
+if [[ $PV == 9999* ]] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
diff --git a/sec-policy/selinux-samba/Manifest b/sec-policy/selinux-samba/Manifest
index 8327a635be01..91d204b0021a 100644
--- a/sec-policy/selinux-samba/Manifest
+++ b/sec-policy/selinux-samba/Manifest
@@ -9,5 +9,6 @@ DIST patchbundle-selinux-base-policy-2.20141203-r5.tar.bz2 274136 SHA256 c23d17c
 DIST patchbundle-selinux-base-policy-2.20141203-r6.tar.bz2 293231 SHA256 b686dcc517b97834f66d967afdcc724cb43b5c6dbf9f34043a91cdeda2625cc7 SHA512 a2c486cbe4a1d21ff3fd01bef25ecf5a633a4072646c67cfccf3f7187d95f3d9e3b482a46ba17c55c40a8e7c0dee56e9cf9ddc9f414d3e4511443b62f60d03e9 WHIRLPOOL 3d708e287e3f9b873be647b0327eab6675a8702ee1cffb56e36934cada306e5ccc64397a083dad9e59de37a067e628cacbf896ae99012d5a209e42fd7cd8a4c6
 DIST patchbundle-selinux-base-policy-2.20141203-r7.tar.bz2 295833 SHA256 ba2219b3efc747be65f94c4d8ac3cd6ee530c82c848fa41935a114184678622a SHA512 8e32d9dbfb2f0f3f50200543aadb51ed9834ccd5cdf30bf8e4d9e6d0b645ce44ffaf80f7aa9385e9c9095d9a383b3a348a92356cb5386c06544ab082a9a468c7 WHIRLPOOL 1648ee1be71e45fcf5a264816ce7edc7bab19bd28a68703923eb2d6068f1f0469ae593855231d31f88baecbf29e7cece2d6beeed20b7c04231a6c90e90d35910
 DIST patchbundle-selinux-base-policy-2.20141203-r8.tar.bz2 297919 SHA256 77539eb3d78105f8789cd8205d2698bd27e2abf100163bdd162cda860fd15120 SHA512 2f8a19e1e4bb65f32b480275f49099aed3ae9df543c7de862b3bbd93e81b89cd96dadac3d091e28673d09a6885db8c5656b3a77d0080775c110b04f2753de7a6 WHIRLPOOL 79cb7e620eb8e838192dc557c7a9ce7e713227d783cc8b63792825559b2145cad70d0af6f99948c1527557bc363feffd846c73893682b4a14fc7d08b9e20c649
+DIST patchbundle-selinux-base-policy-2.20141203-r9.tar.bz2 299602 SHA256 e8518004942a6c57170a609683e22b1410c93a2a195829c41dc8fbc703d941b5 SHA512 ce6484fbca1d2d074e50d1a3953392bd3ce0a4617df98fbac37747b469b4f160a9331586dfe1c3ddccb1ccbee24876a2f05ab49e37c8492a48baf83c2d01d140 WHIRLPOOL 1fd7b956e98e95a64c3a713a944d4531259bd156a7feabf6a89c4b5f33ac846377730eede97889e85183be086f282ebd18e860214f6ca3f01b40f2323470ee04
 DIST refpolicy-2.20140311.tar.bz2 664416 SHA256 f69437db95548c78a5dec44c236397146b144153149009ea554d2e536e5436f7 SHA512 50bacee82ed41ac8b8007ecc33bf51d22303cc2ddd27cfb72cb5520dab5f8e255186e34b89cec492c7a2d4220b200814bdede9b46c19f987a3d3d65a1c9b749a WHIRLPOOL e07480beba6ab1f02ad36b7d0c50c4a71cb39a8ec78bf8d1dc3c82bb9dd1d69d9169d7c937165ea15f60ce1147f256d46644f944107a3a8a800d5bad70d4c255
 DIST refpolicy-2.20141203.tar.bz2 680243 SHA256 f438209c430d8a2d4ddcbe4bdd3edb46f6af7dc4913637af0b73c635e40c1522 SHA512 682e4280c5799e4c12ec7594afc1389f67be35055748d2e0dbdc3419159a16c96d4946ca6178daee8370515951f8653b2e452efe8c962b8d7f9bc192f0b15a0c WHIRLPOOL 74bca232534e7af9051bb1ab9f77c1ff6c425781cf4561f781d6e9a40cc5ca0d9add540249ea5493e8782a9372aea296ead6c165c6c440ae1509eb319d151ee5
diff --git a/sec-policy/selinux-samba/selinux-samba-2.20141203-r8.ebuild b/sec-policy/selinux-samba/selinux-samba-2.20141203-r8.ebuild
index b8518f63983b..3949bf2e47db 100644
--- a/sec-policy/selinux-samba/selinux-samba-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-samba/selinux-samba-2.20141203-r8.ebuild
@@ -13,5 +13,5 @@ DESCRIPTION="SELinux policy for samba"
 if [[ $PV == 9999* ]] ; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-samba/selinux-samba-2.20141203-r9.ebuild b/sec-policy/selinux-samba/selinux-samba-2.20141203-r9.ebuild
new file mode 100644
index 000000000000..b8518f63983b
--- /dev/null
+++ b/sec-policy/selinux-samba/selinux-samba-2.20141203-r9.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI="5"
+
+IUSE=""
+MODS="samba"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for samba"
+
+if [[ $PV == 9999* ]] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
diff --git a/sec-policy/selinux-sasl/Manifest b/sec-policy/selinux-sasl/Manifest
index 8327a635be01..91d204b0021a 100644
--- a/sec-policy/selinux-sasl/Manifest
+++ b/sec-policy/selinux-sasl/Manifest
@@ -9,5 +9,6 @@ DIST patchbundle-selinux-base-policy-2.20141203-r5.tar.bz2 274136 SHA256 c23d17c
 DIST patchbundle-selinux-base-policy-2.20141203-r6.tar.bz2 293231 SHA256 b686dcc517b97834f66d967afdcc724cb43b5c6dbf9f34043a91cdeda2625cc7 SHA512 a2c486cbe4a1d21ff3fd01bef25ecf5a633a4072646c67cfccf3f7187d95f3d9e3b482a46ba17c55c40a8e7c0dee56e9cf9ddc9f414d3e4511443b62f60d03e9 WHIRLPOOL 3d708e287e3f9b873be647b0327eab6675a8702ee1cffb56e36934cada306e5ccc64397a083dad9e59de37a067e628cacbf896ae99012d5a209e42fd7cd8a4c6
 DIST patchbundle-selinux-base-policy-2.20141203-r7.tar.bz2 295833 SHA256 ba2219b3efc747be65f94c4d8ac3cd6ee530c82c848fa41935a114184678622a SHA512 8e32d9dbfb2f0f3f50200543aadb51ed9834ccd5cdf30bf8e4d9e6d0b645ce44ffaf80f7aa9385e9c9095d9a383b3a348a92356cb5386c06544ab082a9a468c7 WHIRLPOOL 1648ee1be71e45fcf5a264816ce7edc7bab19bd28a68703923eb2d6068f1f0469ae593855231d31f88baecbf29e7cece2d6beeed20b7c04231a6c90e90d35910
 DIST patchbundle-selinux-base-policy-2.20141203-r8.tar.bz2 297919 SHA256 77539eb3d78105f8789cd8205d2698bd27e2abf100163bdd162cda860fd15120 SHA512 2f8a19e1e4bb65f32b480275f49099aed3ae9df543c7de862b3bbd93e81b89cd96dadac3d091e28673d09a6885db8c5656b3a77d0080775c110b04f2753de7a6 WHIRLPOOL 79cb7e620eb8e838192dc557c7a9ce7e713227d783cc8b63792825559b2145cad70d0af6f99948c1527557bc363feffd846c73893682b4a14fc7d08b9e20c649
+DIST patchbundle-selinux-base-policy-2.20141203-r9.tar.bz2 299602 SHA256 e8518004942a6c57170a609683e22b1410c93a2a195829c41dc8fbc703d941b5 SHA512 ce6484fbca1d2d074e50d1a3953392bd3ce0a4617df98fbac37747b469b4f160a9331586dfe1c3ddccb1ccbee24876a2f05ab49e37c8492a48baf83c2d01d140 WHIRLPOOL 1fd7b956e98e95a64c3a713a944d4531259bd156a7feabf6a89c4b5f33ac846377730eede97889e85183be086f282ebd18e860214f6ca3f01b40f2323470ee04
 DIST refpolicy-2.20140311.tar.bz2 664416 SHA256 f69437db95548c78a5dec44c236397146b144153149009ea554d2e536e5436f7 SHA512 50bacee82ed41ac8b8007ecc33bf51d22303cc2ddd27cfb72cb5520dab5f8e255186e34b89cec492c7a2d4220b200814bdede9b46c19f987a3d3d65a1c9b749a WHIRLPOOL e07480beba6ab1f02ad36b7d0c50c4a71cb39a8ec78bf8d1dc3c82bb9dd1d69d9169d7c937165ea15f60ce1147f256d46644f944107a3a8a800d5bad70d4c255
 DIST refpolicy-2.20141203.tar.bz2 680243 SHA256 f438209c430d8a2d4ddcbe4bdd3edb46f6af7dc4913637af0b73c635e40c1522 SHA512 682e4280c5799e4c12ec7594afc1389f67be35055748d2e0dbdc3419159a16c96d4946ca6178daee8370515951f8653b2e452efe8c962b8d7f9bc192f0b15a0c WHIRLPOOL 74bca232534e7af9051bb1ab9f77c1ff6c425781cf4561f781d6e9a40cc5ca0d9add540249ea5493e8782a9372aea296ead6c165c6c440ae1509eb319d151ee5
diff --git a/sec-policy/selinux-sasl/selinux-sasl-2.20141203-r8.ebuild b/sec-policy/selinux-sasl/selinux-sasl-2.20141203-r8.ebuild
index 29d1f07fc134..f68978fdce4a 100644
--- a/sec-policy/selinux-sasl/selinux-sasl-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-sasl/selinux-sasl-2.20141203-r8.ebuild
@@ -13,5 +13,5 @@ DESCRIPTION="SELinux policy for sasl"
 if [[ $PV == 9999* ]] ; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-sasl/selinux-sasl-2.20141203-r9.ebuild b/sec-policy/selinux-sasl/selinux-sasl-2.20141203-r9.ebuild
new file mode 100644
index 000000000000..29d1f07fc134
--- /dev/null
+++ b/sec-policy/selinux-sasl/selinux-sasl-2.20141203-r9.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI="5"
+
+IUSE=""
+MODS="sasl"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for sasl"
+
+if [[ $PV == 9999* ]] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
diff --git a/sec-policy/selinux-screen/Manifest b/sec-policy/selinux-screen/Manifest
index 8327a635be01..91d204b0021a 100644
--- a/sec-policy/selinux-screen/Manifest
+++ b/sec-policy/selinux-screen/Manifest
@@ -9,5 +9,6 @@ DIST patchbundle-selinux-base-policy-2.20141203-r5.tar.bz2 274136 SHA256 c23d17c
 DIST patchbundle-selinux-base-policy-2.20141203-r6.tar.bz2 293231 SHA256 b686dcc517b97834f66d967afdcc724cb43b5c6dbf9f34043a91cdeda2625cc7 SHA512 a2c486cbe4a1d21ff3fd01bef25ecf5a633a4072646c67cfccf3f7187d95f3d9e3b482a46ba17c55c40a8e7c0dee56e9cf9ddc9f414d3e4511443b62f60d03e9 WHIRLPOOL 3d708e287e3f9b873be647b0327eab6675a8702ee1cffb56e36934cada306e5ccc64397a083dad9e59de37a067e628cacbf896ae99012d5a209e42fd7cd8a4c6
 DIST patchbundle-selinux-base-policy-2.20141203-r7.tar.bz2 295833 SHA256 ba2219b3efc747be65f94c4d8ac3cd6ee530c82c848fa41935a114184678622a SHA512 8e32d9dbfb2f0f3f50200543aadb51ed9834ccd5cdf30bf8e4d9e6d0b645ce44ffaf80f7aa9385e9c9095d9a383b3a348a92356cb5386c06544ab082a9a468c7 WHIRLPOOL 1648ee1be71e45fcf5a264816ce7edc7bab19bd28a68703923eb2d6068f1f0469ae593855231d31f88baecbf29e7cece2d6beeed20b7c04231a6c90e90d35910
 DIST patchbundle-selinux-base-policy-2.20141203-r8.tar.bz2 297919 SHA256 77539eb3d78105f8789cd8205d2698bd27e2abf100163bdd162cda860fd15120 SHA512 2f8a19e1e4bb65f32b480275f49099aed3ae9df543c7de862b3bbd93e81b89cd96dadac3d091e28673d09a6885db8c5656b3a77d0080775c110b04f2753de7a6 WHIRLPOOL 79cb7e620eb8e838192dc557c7a9ce7e713227d783cc8b63792825559b2145cad70d0af6f99948c1527557bc363feffd846c73893682b4a14fc7d08b9e20c649
+DIST patchbundle-selinux-base-policy-2.20141203-r9.tar.bz2 299602 SHA256 e8518004942a6c57170a609683e22b1410c93a2a195829c41dc8fbc703d941b5 SHA512 ce6484fbca1d2d074e50d1a3953392bd3ce0a4617df98fbac37747b469b4f160a9331586dfe1c3ddccb1ccbee24876a2f05ab49e37c8492a48baf83c2d01d140 WHIRLPOOL 1fd7b956e98e95a64c3a713a944d4531259bd156a7feabf6a89c4b5f33ac846377730eede97889e85183be086f282ebd18e860214f6ca3f01b40f2323470ee04
 DIST refpolicy-2.20140311.tar.bz2 664416 SHA256 f69437db95548c78a5dec44c236397146b144153149009ea554d2e536e5436f7 SHA512 50bacee82ed41ac8b8007ecc33bf51d22303cc2ddd27cfb72cb5520dab5f8e255186e34b89cec492c7a2d4220b200814bdede9b46c19f987a3d3d65a1c9b749a WHIRLPOOL e07480beba6ab1f02ad36b7d0c50c4a71cb39a8ec78bf8d1dc3c82bb9dd1d69d9169d7c937165ea15f60ce1147f256d46644f944107a3a8a800d5bad70d4c255
 DIST refpolicy-2.20141203.tar.bz2 680243 SHA256 f438209c430d8a2d4ddcbe4bdd3edb46f6af7dc4913637af0b73c635e40c1522 SHA512 682e4280c5799e4c12ec7594afc1389f67be35055748d2e0dbdc3419159a16c96d4946ca6178daee8370515951f8653b2e452efe8c962b8d7f9bc192f0b15a0c WHIRLPOOL 74bca232534e7af9051bb1ab9f77c1ff6c425781cf4561f781d6e9a40cc5ca0d9add540249ea5493e8782a9372aea296ead6c165c6c440ae1509eb319d151ee5
diff --git a/sec-policy/selinux-screen/selinux-screen-2.20141203-r8.ebuild b/sec-policy/selinux-screen/selinux-screen-2.20141203-r8.ebuild
index bdc3f652e0cb..3615f7e164a9 100644
--- a/sec-policy/selinux-screen/selinux-screen-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-screen/selinux-screen-2.20141203-r8.ebuild
@@ -13,5 +13,5 @@ DESCRIPTION="SELinux policy for screen"
 if [[ $PV == 9999* ]] ; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-screen/selinux-screen-2.20141203-r9.ebuild b/sec-policy/selinux-screen/selinux-screen-2.20141203-r9.ebuild
new file mode 100644
index 000000000000..bdc3f652e0cb
--- /dev/null
+++ b/sec-policy/selinux-screen/selinux-screen-2.20141203-r9.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI="5"
+
+IUSE=""
+MODS="screen"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for screen"
+
+if [[ $PV == 9999* ]] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
diff --git a/sec-policy/selinux-sendmail/Manifest b/sec-policy/selinux-sendmail/Manifest
index 8327a635be01..91d204b0021a 100644
--- a/sec-policy/selinux-sendmail/Manifest
+++ b/sec-policy/selinux-sendmail/Manifest
@@ -9,5 +9,6 @@ DIST patchbundle-selinux-base-policy-2.20141203-r5.tar.bz2 274136 SHA256 c23d17c
 DIST patchbundle-selinux-base-policy-2.20141203-r6.tar.bz2 293231 SHA256 b686dcc517b97834f66d967afdcc724cb43b5c6dbf9f34043a91cdeda2625cc7 SHA512 a2c486cbe4a1d21ff3fd01bef25ecf5a633a4072646c67cfccf3f7187d95f3d9e3b482a46ba17c55c40a8e7c0dee56e9cf9ddc9f414d3e4511443b62f60d03e9 WHIRLPOOL 3d708e287e3f9b873be647b0327eab6675a8702ee1cffb56e36934cada306e5ccc64397a083dad9e59de37a067e628cacbf896ae99012d5a209e42fd7cd8a4c6
 DIST patchbundle-selinux-base-policy-2.20141203-r7.tar.bz2 295833 SHA256 ba2219b3efc747be65f94c4d8ac3cd6ee530c82c848fa41935a114184678622a SHA512 8e32d9dbfb2f0f3f50200543aadb51ed9834ccd5cdf30bf8e4d9e6d0b645ce44ffaf80f7aa9385e9c9095d9a383b3a348a92356cb5386c06544ab082a9a468c7 WHIRLPOOL 1648ee1be71e45fcf5a264816ce7edc7bab19bd28a68703923eb2d6068f1f0469ae593855231d31f88baecbf29e7cece2d6beeed20b7c04231a6c90e90d35910
 DIST patchbundle-selinux-base-policy-2.20141203-r8.tar.bz2 297919 SHA256 77539eb3d78105f8789cd8205d2698bd27e2abf100163bdd162cda860fd15120 SHA512 2f8a19e1e4bb65f32b480275f49099aed3ae9df543c7de862b3bbd93e81b89cd96dadac3d091e28673d09a6885db8c5656b3a77d0080775c110b04f2753de7a6 WHIRLPOOL 79cb7e620eb8e838192dc557c7a9ce7e713227d783cc8b63792825559b2145cad70d0af6f99948c1527557bc363feffd846c73893682b4a14fc7d08b9e20c649
+DIST patchbundle-selinux-base-policy-2.20141203-r9.tar.bz2 299602 SHA256 e8518004942a6c57170a609683e22b1410c93a2a195829c41dc8fbc703d941b5 SHA512 ce6484fbca1d2d074e50d1a3953392bd3ce0a4617df98fbac37747b469b4f160a9331586dfe1c3ddccb1ccbee24876a2f05ab49e37c8492a48baf83c2d01d140 WHIRLPOOL 1fd7b956e98e95a64c3a713a944d4531259bd156a7feabf6a89c4b5f33ac846377730eede97889e85183be086f282ebd18e860214f6ca3f01b40f2323470ee04
 DIST refpolicy-2.20140311.tar.bz2 664416 SHA256 f69437db95548c78a5dec44c236397146b144153149009ea554d2e536e5436f7 SHA512 50bacee82ed41ac8b8007ecc33bf51d22303cc2ddd27cfb72cb5520dab5f8e255186e34b89cec492c7a2d4220b200814bdede9b46c19f987a3d3d65a1c9b749a WHIRLPOOL e07480beba6ab1f02ad36b7d0c50c4a71cb39a8ec78bf8d1dc3c82bb9dd1d69d9169d7c937165ea15f60ce1147f256d46644f944107a3a8a800d5bad70d4c255
 DIST refpolicy-2.20141203.tar.bz2 680243 SHA256 f438209c430d8a2d4ddcbe4bdd3edb46f6af7dc4913637af0b73c635e40c1522 SHA512 682e4280c5799e4c12ec7594afc1389f67be35055748d2e0dbdc3419159a16c96d4946ca6178daee8370515951f8653b2e452efe8c962b8d7f9bc192f0b15a0c WHIRLPOOL 74bca232534e7af9051bb1ab9f77c1ff6c425781cf4561f781d6e9a40cc5ca0d9add540249ea5493e8782a9372aea296ead6c165c6c440ae1509eb319d151ee5
diff --git a/sec-policy/selinux-sendmail/selinux-sendmail-2.20141203-r8.ebuild b/sec-policy/selinux-sendmail/selinux-sendmail-2.20141203-r8.ebuild
index ca085016864f..fa147acd0efe 100644
--- a/sec-policy/selinux-sendmail/selinux-sendmail-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-sendmail/selinux-sendmail-2.20141203-r8.ebuild
@@ -13,5 +13,5 @@ DESCRIPTION="SELinux policy for sendmail"
 if [[ $PV == 9999* ]] ; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-sendmail/selinux-sendmail-2.20141203-r9.ebuild b/sec-policy/selinux-sendmail/selinux-sendmail-2.20141203-r9.ebuild
new file mode 100644
index 000000000000..ca085016864f
--- /dev/null
+++ b/sec-policy/selinux-sendmail/selinux-sendmail-2.20141203-r9.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI="5"
+
+IUSE=""
+MODS="sendmail"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for sendmail"
+
+if [[ $PV == 9999* ]] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
diff --git a/sec-policy/selinux-sensord/Manifest b/sec-policy/selinux-sensord/Manifest
index 8327a635be01..91d204b0021a 100644
--- a/sec-policy/selinux-sensord/Manifest
+++ b/sec-policy/selinux-sensord/Manifest
@@ -9,5 +9,6 @@ DIST patchbundle-selinux-base-policy-2.20141203-r5.tar.bz2 274136 SHA256 c23d17c
 DIST patchbundle-selinux-base-policy-2.20141203-r6.tar.bz2 293231 SHA256 b686dcc517b97834f66d967afdcc724cb43b5c6dbf9f34043a91cdeda2625cc7 SHA512 a2c486cbe4a1d21ff3fd01bef25ecf5a633a4072646c67cfccf3f7187d95f3d9e3b482a46ba17c55c40a8e7c0dee56e9cf9ddc9f414d3e4511443b62f60d03e9 WHIRLPOOL 3d708e287e3f9b873be647b0327eab6675a8702ee1cffb56e36934cada306e5ccc64397a083dad9e59de37a067e628cacbf896ae99012d5a209e42fd7cd8a4c6
 DIST patchbundle-selinux-base-policy-2.20141203-r7.tar.bz2 295833 SHA256 ba2219b3efc747be65f94c4d8ac3cd6ee530c82c848fa41935a114184678622a SHA512 8e32d9dbfb2f0f3f50200543aadb51ed9834ccd5cdf30bf8e4d9e6d0b645ce44ffaf80f7aa9385e9c9095d9a383b3a348a92356cb5386c06544ab082a9a468c7 WHIRLPOOL 1648ee1be71e45fcf5a264816ce7edc7bab19bd28a68703923eb2d6068f1f0469ae593855231d31f88baecbf29e7cece2d6beeed20b7c04231a6c90e90d35910
 DIST patchbundle-selinux-base-policy-2.20141203-r8.tar.bz2 297919 SHA256 77539eb3d78105f8789cd8205d2698bd27e2abf100163bdd162cda860fd15120 SHA512 2f8a19e1e4bb65f32b480275f49099aed3ae9df543c7de862b3bbd93e81b89cd96dadac3d091e28673d09a6885db8c5656b3a77d0080775c110b04f2753de7a6 WHIRLPOOL 79cb7e620eb8e838192dc557c7a9ce7e713227d783cc8b63792825559b2145cad70d0af6f99948c1527557bc363feffd846c73893682b4a14fc7d08b9e20c649
+DIST patchbundle-selinux-base-policy-2.20141203-r9.tar.bz2 299602 SHA256 e8518004942a6c57170a609683e22b1410c93a2a195829c41dc8fbc703d941b5 SHA512 ce6484fbca1d2d074e50d1a3953392bd3ce0a4617df98fbac37747b469b4f160a9331586dfe1c3ddccb1ccbee24876a2f05ab49e37c8492a48baf83c2d01d140 WHIRLPOOL 1fd7b956e98e95a64c3a713a944d4531259bd156a7feabf6a89c4b5f33ac846377730eede97889e85183be086f282ebd18e860214f6ca3f01b40f2323470ee04
 DIST refpolicy-2.20140311.tar.bz2 664416 SHA256 f69437db95548c78a5dec44c236397146b144153149009ea554d2e536e5436f7 SHA512 50bacee82ed41ac8b8007ecc33bf51d22303cc2ddd27cfb72cb5520dab5f8e255186e34b89cec492c7a2d4220b200814bdede9b46c19f987a3d3d65a1c9b749a WHIRLPOOL e07480beba6ab1f02ad36b7d0c50c4a71cb39a8ec78bf8d1dc3c82bb9dd1d69d9169d7c937165ea15f60ce1147f256d46644f944107a3a8a800d5bad70d4c255
 DIST refpolicy-2.20141203.tar.bz2 680243 SHA256 f438209c430d8a2d4ddcbe4bdd3edb46f6af7dc4913637af0b73c635e40c1522 SHA512 682e4280c5799e4c12ec7594afc1389f67be35055748d2e0dbdc3419159a16c96d4946ca6178daee8370515951f8653b2e452efe8c962b8d7f9bc192f0b15a0c WHIRLPOOL 74bca232534e7af9051bb1ab9f77c1ff6c425781cf4561f781d6e9a40cc5ca0d9add540249ea5493e8782a9372aea296ead6c165c6c440ae1509eb319d151ee5
diff --git a/sec-policy/selinux-sensord/selinux-sensord-2.20141203-r8.ebuild b/sec-policy/selinux-sensord/selinux-sensord-2.20141203-r8.ebuild
index e617f7cfa7b5..01a687ba0150 100644
--- a/sec-policy/selinux-sensord/selinux-sensord-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-sensord/selinux-sensord-2.20141203-r8.ebuild
@@ -13,5 +13,5 @@ DESCRIPTION="SELinux policy for sensord"
 if [[ $PV == 9999* ]] ; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-sensord/selinux-sensord-2.20141203-r9.ebuild b/sec-policy/selinux-sensord/selinux-sensord-2.20141203-r9.ebuild
new file mode 100644
index 000000000000..e617f7cfa7b5
--- /dev/null
+++ b/sec-policy/selinux-sensord/selinux-sensord-2.20141203-r9.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI="5"
+
+IUSE=""
+MODS="sensord"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for sensord"
+
+if [[ $PV == 9999* ]] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
diff --git a/sec-policy/selinux-shorewall/Manifest b/sec-policy/selinux-shorewall/Manifest
index 8327a635be01..91d204b0021a 100644
--- a/sec-policy/selinux-shorewall/Manifest
+++ b/sec-policy/selinux-shorewall/Manifest
@@ -9,5 +9,6 @@ DIST patchbundle-selinux-base-policy-2.20141203-r5.tar.bz2 274136 SHA256 c23d17c
 DIST patchbundle-selinux-base-policy-2.20141203-r6.tar.bz2 293231 SHA256 b686dcc517b97834f66d967afdcc724cb43b5c6dbf9f34043a91cdeda2625cc7 SHA512 a2c486cbe4a1d21ff3fd01bef25ecf5a633a4072646c67cfccf3f7187d95f3d9e3b482a46ba17c55c40a8e7c0dee56e9cf9ddc9f414d3e4511443b62f60d03e9 WHIRLPOOL 3d708e287e3f9b873be647b0327eab6675a8702ee1cffb56e36934cada306e5ccc64397a083dad9e59de37a067e628cacbf896ae99012d5a209e42fd7cd8a4c6
 DIST patchbundle-selinux-base-policy-2.20141203-r7.tar.bz2 295833 SHA256 ba2219b3efc747be65f94c4d8ac3cd6ee530c82c848fa41935a114184678622a SHA512 8e32d9dbfb2f0f3f50200543aadb51ed9834ccd5cdf30bf8e4d9e6d0b645ce44ffaf80f7aa9385e9c9095d9a383b3a348a92356cb5386c06544ab082a9a468c7 WHIRLPOOL 1648ee1be71e45fcf5a264816ce7edc7bab19bd28a68703923eb2d6068f1f0469ae593855231d31f88baecbf29e7cece2d6beeed20b7c04231a6c90e90d35910
 DIST patchbundle-selinux-base-policy-2.20141203-r8.tar.bz2 297919 SHA256 77539eb3d78105f8789cd8205d2698bd27e2abf100163bdd162cda860fd15120 SHA512 2f8a19e1e4bb65f32b480275f49099aed3ae9df543c7de862b3bbd93e81b89cd96dadac3d091e28673d09a6885db8c5656b3a77d0080775c110b04f2753de7a6 WHIRLPOOL 79cb7e620eb8e838192dc557c7a9ce7e713227d783cc8b63792825559b2145cad70d0af6f99948c1527557bc363feffd846c73893682b4a14fc7d08b9e20c649
+DIST patchbundle-selinux-base-policy-2.20141203-r9.tar.bz2 299602 SHA256 e8518004942a6c57170a609683e22b1410c93a2a195829c41dc8fbc703d941b5 SHA512 ce6484fbca1d2d074e50d1a3953392bd3ce0a4617df98fbac37747b469b4f160a9331586dfe1c3ddccb1ccbee24876a2f05ab49e37c8492a48baf83c2d01d140 WHIRLPOOL 1fd7b956e98e95a64c3a713a944d4531259bd156a7feabf6a89c4b5f33ac846377730eede97889e85183be086f282ebd18e860214f6ca3f01b40f2323470ee04
 DIST refpolicy-2.20140311.tar.bz2 664416 SHA256 f69437db95548c78a5dec44c236397146b144153149009ea554d2e536e5436f7 SHA512 50bacee82ed41ac8b8007ecc33bf51d22303cc2ddd27cfb72cb5520dab5f8e255186e34b89cec492c7a2d4220b200814bdede9b46c19f987a3d3d65a1c9b749a WHIRLPOOL e07480beba6ab1f02ad36b7d0c50c4a71cb39a8ec78bf8d1dc3c82bb9dd1d69d9169d7c937165ea15f60ce1147f256d46644f944107a3a8a800d5bad70d4c255
 DIST refpolicy-2.20141203.tar.bz2 680243 SHA256 f438209c430d8a2d4ddcbe4bdd3edb46f6af7dc4913637af0b73c635e40c1522 SHA512 682e4280c5799e4c12ec7594afc1389f67be35055748d2e0dbdc3419159a16c96d4946ca6178daee8370515951f8653b2e452efe8c962b8d7f9bc192f0b15a0c WHIRLPOOL 74bca232534e7af9051bb1ab9f77c1ff6c425781cf4561f781d6e9a40cc5ca0d9add540249ea5493e8782a9372aea296ead6c165c6c440ae1509eb319d151ee5
diff --git a/sec-policy/selinux-shorewall/selinux-shorewall-2.20141203-r8.ebuild b/sec-policy/selinux-shorewall/selinux-shorewall-2.20141203-r8.ebuild
index b2fd0ac065a9..b661903c1df8 100644
--- a/sec-policy/selinux-shorewall/selinux-shorewall-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-shorewall/selinux-shorewall-2.20141203-r8.ebuild
@@ -13,5 +13,5 @@ DESCRIPTION="SELinux policy for shorewall"
 if [[ $PV == 9999* ]] ; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-shorewall/selinux-shorewall-2.20141203-r9.ebuild b/sec-policy/selinux-shorewall/selinux-shorewall-2.20141203-r9.ebuild
new file mode 100644
index 000000000000..b2fd0ac065a9
--- /dev/null
+++ b/sec-policy/selinux-shorewall/selinux-shorewall-2.20141203-r9.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI="5"
+
+IUSE=""
+MODS="shorewall"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for shorewall"
+
+if [[ $PV == 9999* ]] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
diff --git a/sec-policy/selinux-shutdown/Manifest b/sec-policy/selinux-shutdown/Manifest
index 8327a635be01..91d204b0021a 100644
--- a/sec-policy/selinux-shutdown/Manifest
+++ b/sec-policy/selinux-shutdown/Manifest
@@ -9,5 +9,6 @@ DIST patchbundle-selinux-base-policy-2.20141203-r5.tar.bz2 274136 SHA256 c23d17c
 DIST patchbundle-selinux-base-policy-2.20141203-r6.tar.bz2 293231 SHA256 b686dcc517b97834f66d967afdcc724cb43b5c6dbf9f34043a91cdeda2625cc7 SHA512 a2c486cbe4a1d21ff3fd01bef25ecf5a633a4072646c67cfccf3f7187d95f3d9e3b482a46ba17c55c40a8e7c0dee56e9cf9ddc9f414d3e4511443b62f60d03e9 WHIRLPOOL 3d708e287e3f9b873be647b0327eab6675a8702ee1cffb56e36934cada306e5ccc64397a083dad9e59de37a067e628cacbf896ae99012d5a209e42fd7cd8a4c6
 DIST patchbundle-selinux-base-policy-2.20141203-r7.tar.bz2 295833 SHA256 ba2219b3efc747be65f94c4d8ac3cd6ee530c82c848fa41935a114184678622a SHA512 8e32d9dbfb2f0f3f50200543aadb51ed9834ccd5cdf30bf8e4d9e6d0b645ce44ffaf80f7aa9385e9c9095d9a383b3a348a92356cb5386c06544ab082a9a468c7 WHIRLPOOL 1648ee1be71e45fcf5a264816ce7edc7bab19bd28a68703923eb2d6068f1f0469ae593855231d31f88baecbf29e7cece2d6beeed20b7c04231a6c90e90d35910
 DIST patchbundle-selinux-base-policy-2.20141203-r8.tar.bz2 297919 SHA256 77539eb3d78105f8789cd8205d2698bd27e2abf100163bdd162cda860fd15120 SHA512 2f8a19e1e4bb65f32b480275f49099aed3ae9df543c7de862b3bbd93e81b89cd96dadac3d091e28673d09a6885db8c5656b3a77d0080775c110b04f2753de7a6 WHIRLPOOL 79cb7e620eb8e838192dc557c7a9ce7e713227d783cc8b63792825559b2145cad70d0af6f99948c1527557bc363feffd846c73893682b4a14fc7d08b9e20c649
+DIST patchbundle-selinux-base-policy-2.20141203-r9.tar.bz2 299602 SHA256 e8518004942a6c57170a609683e22b1410c93a2a195829c41dc8fbc703d941b5 SHA512 ce6484fbca1d2d074e50d1a3953392bd3ce0a4617df98fbac37747b469b4f160a9331586dfe1c3ddccb1ccbee24876a2f05ab49e37c8492a48baf83c2d01d140 WHIRLPOOL 1fd7b956e98e95a64c3a713a944d4531259bd156a7feabf6a89c4b5f33ac846377730eede97889e85183be086f282ebd18e860214f6ca3f01b40f2323470ee04
 DIST refpolicy-2.20140311.tar.bz2 664416 SHA256 f69437db95548c78a5dec44c236397146b144153149009ea554d2e536e5436f7 SHA512 50bacee82ed41ac8b8007ecc33bf51d22303cc2ddd27cfb72cb5520dab5f8e255186e34b89cec492c7a2d4220b200814bdede9b46c19f987a3d3d65a1c9b749a WHIRLPOOL e07480beba6ab1f02ad36b7d0c50c4a71cb39a8ec78bf8d1dc3c82bb9dd1d69d9169d7c937165ea15f60ce1147f256d46644f944107a3a8a800d5bad70d4c255
 DIST refpolicy-2.20141203.tar.bz2 680243 SHA256 f438209c430d8a2d4ddcbe4bdd3edb46f6af7dc4913637af0b73c635e40c1522 SHA512 682e4280c5799e4c12ec7594afc1389f67be35055748d2e0dbdc3419159a16c96d4946ca6178daee8370515951f8653b2e452efe8c962b8d7f9bc192f0b15a0c WHIRLPOOL 74bca232534e7af9051bb1ab9f77c1ff6c425781cf4561f781d6e9a40cc5ca0d9add540249ea5493e8782a9372aea296ead6c165c6c440ae1509eb319d151ee5
diff --git a/sec-policy/selinux-shutdown/selinux-shutdown-2.20141203-r8.ebuild b/sec-policy/selinux-shutdown/selinux-shutdown-2.20141203-r8.ebuild
index 531cc9b85198..102644128891 100644
--- a/sec-policy/selinux-shutdown/selinux-shutdown-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-shutdown/selinux-shutdown-2.20141203-r8.ebuild
@@ -13,5 +13,5 @@ DESCRIPTION="SELinux policy for shutdown"
 if [[ $PV == 9999* ]] ; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-shutdown/selinux-shutdown-2.20141203-r9.ebuild b/sec-policy/selinux-shutdown/selinux-shutdown-2.20141203-r9.ebuild
new file mode 100644
index 000000000000..531cc9b85198
--- /dev/null
+++ b/sec-policy/selinux-shutdown/selinux-shutdown-2.20141203-r9.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI="5"
+
+IUSE=""
+MODS="shutdown"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for shutdown"
+
+if [[ $PV == 9999* ]] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
diff --git a/sec-policy/selinux-skype/Manifest b/sec-policy/selinux-skype/Manifest
index 8327a635be01..91d204b0021a 100644
--- a/sec-policy/selinux-skype/Manifest
+++ b/sec-policy/selinux-skype/Manifest
@@ -9,5 +9,6 @@ DIST patchbundle-selinux-base-policy-2.20141203-r5.tar.bz2 274136 SHA256 c23d17c
 DIST patchbundle-selinux-base-policy-2.20141203-r6.tar.bz2 293231 SHA256 b686dcc517b97834f66d967afdcc724cb43b5c6dbf9f34043a91cdeda2625cc7 SHA512 a2c486cbe4a1d21ff3fd01bef25ecf5a633a4072646c67cfccf3f7187d95f3d9e3b482a46ba17c55c40a8e7c0dee56e9cf9ddc9f414d3e4511443b62f60d03e9 WHIRLPOOL 3d708e287e3f9b873be647b0327eab6675a8702ee1cffb56e36934cada306e5ccc64397a083dad9e59de37a067e628cacbf896ae99012d5a209e42fd7cd8a4c6
 DIST patchbundle-selinux-base-policy-2.20141203-r7.tar.bz2 295833 SHA256 ba2219b3efc747be65f94c4d8ac3cd6ee530c82c848fa41935a114184678622a SHA512 8e32d9dbfb2f0f3f50200543aadb51ed9834ccd5cdf30bf8e4d9e6d0b645ce44ffaf80f7aa9385e9c9095d9a383b3a348a92356cb5386c06544ab082a9a468c7 WHIRLPOOL 1648ee1be71e45fcf5a264816ce7edc7bab19bd28a68703923eb2d6068f1f0469ae593855231d31f88baecbf29e7cece2d6beeed20b7c04231a6c90e90d35910
 DIST patchbundle-selinux-base-policy-2.20141203-r8.tar.bz2 297919 SHA256 77539eb3d78105f8789cd8205d2698bd27e2abf100163bdd162cda860fd15120 SHA512 2f8a19e1e4bb65f32b480275f49099aed3ae9df543c7de862b3bbd93e81b89cd96dadac3d091e28673d09a6885db8c5656b3a77d0080775c110b04f2753de7a6 WHIRLPOOL 79cb7e620eb8e838192dc557c7a9ce7e713227d783cc8b63792825559b2145cad70d0af6f99948c1527557bc363feffd846c73893682b4a14fc7d08b9e20c649
+DIST patchbundle-selinux-base-policy-2.20141203-r9.tar.bz2 299602 SHA256 e8518004942a6c57170a609683e22b1410c93a2a195829c41dc8fbc703d941b5 SHA512 ce6484fbca1d2d074e50d1a3953392bd3ce0a4617df98fbac37747b469b4f160a9331586dfe1c3ddccb1ccbee24876a2f05ab49e37c8492a48baf83c2d01d140 WHIRLPOOL 1fd7b956e98e95a64c3a713a944d4531259bd156a7feabf6a89c4b5f33ac846377730eede97889e85183be086f282ebd18e860214f6ca3f01b40f2323470ee04
 DIST refpolicy-2.20140311.tar.bz2 664416 SHA256 f69437db95548c78a5dec44c236397146b144153149009ea554d2e536e5436f7 SHA512 50bacee82ed41ac8b8007ecc33bf51d22303cc2ddd27cfb72cb5520dab5f8e255186e34b89cec492c7a2d4220b200814bdede9b46c19f987a3d3d65a1c9b749a WHIRLPOOL e07480beba6ab1f02ad36b7d0c50c4a71cb39a8ec78bf8d1dc3c82bb9dd1d69d9169d7c937165ea15f60ce1147f256d46644f944107a3a8a800d5bad70d4c255
 DIST refpolicy-2.20141203.tar.bz2 680243 SHA256 f438209c430d8a2d4ddcbe4bdd3edb46f6af7dc4913637af0b73c635e40c1522 SHA512 682e4280c5799e4c12ec7594afc1389f67be35055748d2e0dbdc3419159a16c96d4946ca6178daee8370515951f8653b2e452efe8c962b8d7f9bc192f0b15a0c WHIRLPOOL 74bca232534e7af9051bb1ab9f77c1ff6c425781cf4561f781d6e9a40cc5ca0d9add540249ea5493e8782a9372aea296ead6c165c6c440ae1509eb319d151ee5
diff --git a/sec-policy/selinux-skype/selinux-skype-2.20141203-r8.ebuild b/sec-policy/selinux-skype/selinux-skype-2.20141203-r8.ebuild
index 8fa579cc06cc..9d082b5a9b9b 100644
--- a/sec-policy/selinux-skype/selinux-skype-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-skype/selinux-skype-2.20141203-r8.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="SELinux policy for skype"
 if [[ $PV == 9999* ]] ; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-xserver
diff --git a/sec-policy/selinux-skype/selinux-skype-2.20141203-r9.ebuild b/sec-policy/selinux-skype/selinux-skype-2.20141203-r9.ebuild
new file mode 100644
index 000000000000..8fa579cc06cc
--- /dev/null
+++ b/sec-policy/selinux-skype/selinux-skype-2.20141203-r9.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI="5"
+
+IUSE="alsa"
+MODS="skype"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for skype"
+
+if [[ $PV == 9999* ]] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
+DEPEND="${DEPEND}
+	sec-policy/selinux-xserver
+"
+RDEPEND="${RDEPEND}
+	sec-policy/selinux-xserver
+"
diff --git a/sec-policy/selinux-slocate/Manifest b/sec-policy/selinux-slocate/Manifest
index 8327a635be01..91d204b0021a 100644
--- a/sec-policy/selinux-slocate/Manifest
+++ b/sec-policy/selinux-slocate/Manifest
@@ -9,5 +9,6 @@ DIST patchbundle-selinux-base-policy-2.20141203-r5.tar.bz2 274136 SHA256 c23d17c
 DIST patchbundle-selinux-base-policy-2.20141203-r6.tar.bz2 293231 SHA256 b686dcc517b97834f66d967afdcc724cb43b5c6dbf9f34043a91cdeda2625cc7 SHA512 a2c486cbe4a1d21ff3fd01bef25ecf5a633a4072646c67cfccf3f7187d95f3d9e3b482a46ba17c55c40a8e7c0dee56e9cf9ddc9f414d3e4511443b62f60d03e9 WHIRLPOOL 3d708e287e3f9b873be647b0327eab6675a8702ee1cffb56e36934cada306e5ccc64397a083dad9e59de37a067e628cacbf896ae99012d5a209e42fd7cd8a4c6
 DIST patchbundle-selinux-base-policy-2.20141203-r7.tar.bz2 295833 SHA256 ba2219b3efc747be65f94c4d8ac3cd6ee530c82c848fa41935a114184678622a SHA512 8e32d9dbfb2f0f3f50200543aadb51ed9834ccd5cdf30bf8e4d9e6d0b645ce44ffaf80f7aa9385e9c9095d9a383b3a348a92356cb5386c06544ab082a9a468c7 WHIRLPOOL 1648ee1be71e45fcf5a264816ce7edc7bab19bd28a68703923eb2d6068f1f0469ae593855231d31f88baecbf29e7cece2d6beeed20b7c04231a6c90e90d35910
 DIST patchbundle-selinux-base-policy-2.20141203-r8.tar.bz2 297919 SHA256 77539eb3d78105f8789cd8205d2698bd27e2abf100163bdd162cda860fd15120 SHA512 2f8a19e1e4bb65f32b480275f49099aed3ae9df543c7de862b3bbd93e81b89cd96dadac3d091e28673d09a6885db8c5656b3a77d0080775c110b04f2753de7a6 WHIRLPOOL 79cb7e620eb8e838192dc557c7a9ce7e713227d783cc8b63792825559b2145cad70d0af6f99948c1527557bc363feffd846c73893682b4a14fc7d08b9e20c649
+DIST patchbundle-selinux-base-policy-2.20141203-r9.tar.bz2 299602 SHA256 e8518004942a6c57170a609683e22b1410c93a2a195829c41dc8fbc703d941b5 SHA512 ce6484fbca1d2d074e50d1a3953392bd3ce0a4617df98fbac37747b469b4f160a9331586dfe1c3ddccb1ccbee24876a2f05ab49e37c8492a48baf83c2d01d140 WHIRLPOOL 1fd7b956e98e95a64c3a713a944d4531259bd156a7feabf6a89c4b5f33ac846377730eede97889e85183be086f282ebd18e860214f6ca3f01b40f2323470ee04
 DIST refpolicy-2.20140311.tar.bz2 664416 SHA256 f69437db95548c78a5dec44c236397146b144153149009ea554d2e536e5436f7 SHA512 50bacee82ed41ac8b8007ecc33bf51d22303cc2ddd27cfb72cb5520dab5f8e255186e34b89cec492c7a2d4220b200814bdede9b46c19f987a3d3d65a1c9b749a WHIRLPOOL e07480beba6ab1f02ad36b7d0c50c4a71cb39a8ec78bf8d1dc3c82bb9dd1d69d9169d7c937165ea15f60ce1147f256d46644f944107a3a8a800d5bad70d4c255
 DIST refpolicy-2.20141203.tar.bz2 680243 SHA256 f438209c430d8a2d4ddcbe4bdd3edb46f6af7dc4913637af0b73c635e40c1522 SHA512 682e4280c5799e4c12ec7594afc1389f67be35055748d2e0dbdc3419159a16c96d4946ca6178daee8370515951f8653b2e452efe8c962b8d7f9bc192f0b15a0c WHIRLPOOL 74bca232534e7af9051bb1ab9f77c1ff6c425781cf4561f781d6e9a40cc5ca0d9add540249ea5493e8782a9372aea296ead6c165c6c440ae1509eb319d151ee5
diff --git a/sec-policy/selinux-slocate/selinux-slocate-2.20141203-r8.ebuild b/sec-policy/selinux-slocate/selinux-slocate-2.20141203-r8.ebuild
index 03bb3f3ca731..dc34013f981b 100644
--- a/sec-policy/selinux-slocate/selinux-slocate-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-slocate/selinux-slocate-2.20141203-r8.ebuild
@@ -13,5 +13,5 @@ DESCRIPTION="SELinux policy for slocate"
 if [[ $PV == 9999* ]] ; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-slocate/selinux-slocate-2.20141203-r9.ebuild b/sec-policy/selinux-slocate/selinux-slocate-2.20141203-r9.ebuild
new file mode 100644
index 000000000000..03bb3f3ca731
--- /dev/null
+++ b/sec-policy/selinux-slocate/selinux-slocate-2.20141203-r9.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI="5"
+
+IUSE=""
+MODS="slocate"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for slocate"
+
+if [[ $PV == 9999* ]] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
diff --git a/sec-policy/selinux-slrnpull/Manifest b/sec-policy/selinux-slrnpull/Manifest
index 8327a635be01..91d204b0021a 100644
--- a/sec-policy/selinux-slrnpull/Manifest
+++ b/sec-policy/selinux-slrnpull/Manifest
@@ -9,5 +9,6 @@ DIST patchbundle-selinux-base-policy-2.20141203-r5.tar.bz2 274136 SHA256 c23d17c
 DIST patchbundle-selinux-base-policy-2.20141203-r6.tar.bz2 293231 SHA256 b686dcc517b97834f66d967afdcc724cb43b5c6dbf9f34043a91cdeda2625cc7 SHA512 a2c486cbe4a1d21ff3fd01bef25ecf5a633a4072646c67cfccf3f7187d95f3d9e3b482a46ba17c55c40a8e7c0dee56e9cf9ddc9f414d3e4511443b62f60d03e9 WHIRLPOOL 3d708e287e3f9b873be647b0327eab6675a8702ee1cffb56e36934cada306e5ccc64397a083dad9e59de37a067e628cacbf896ae99012d5a209e42fd7cd8a4c6
 DIST patchbundle-selinux-base-policy-2.20141203-r7.tar.bz2 295833 SHA256 ba2219b3efc747be65f94c4d8ac3cd6ee530c82c848fa41935a114184678622a SHA512 8e32d9dbfb2f0f3f50200543aadb51ed9834ccd5cdf30bf8e4d9e6d0b645ce44ffaf80f7aa9385e9c9095d9a383b3a348a92356cb5386c06544ab082a9a468c7 WHIRLPOOL 1648ee1be71e45fcf5a264816ce7edc7bab19bd28a68703923eb2d6068f1f0469ae593855231d31f88baecbf29e7cece2d6beeed20b7c04231a6c90e90d35910
 DIST patchbundle-selinux-base-policy-2.20141203-r8.tar.bz2 297919 SHA256 77539eb3d78105f8789cd8205d2698bd27e2abf100163bdd162cda860fd15120 SHA512 2f8a19e1e4bb65f32b480275f49099aed3ae9df543c7de862b3bbd93e81b89cd96dadac3d091e28673d09a6885db8c5656b3a77d0080775c110b04f2753de7a6 WHIRLPOOL 79cb7e620eb8e838192dc557c7a9ce7e713227d783cc8b63792825559b2145cad70d0af6f99948c1527557bc363feffd846c73893682b4a14fc7d08b9e20c649
+DIST patchbundle-selinux-base-policy-2.20141203-r9.tar.bz2 299602 SHA256 e8518004942a6c57170a609683e22b1410c93a2a195829c41dc8fbc703d941b5 SHA512 ce6484fbca1d2d074e50d1a3953392bd3ce0a4617df98fbac37747b469b4f160a9331586dfe1c3ddccb1ccbee24876a2f05ab49e37c8492a48baf83c2d01d140 WHIRLPOOL 1fd7b956e98e95a64c3a713a944d4531259bd156a7feabf6a89c4b5f33ac846377730eede97889e85183be086f282ebd18e860214f6ca3f01b40f2323470ee04
 DIST refpolicy-2.20140311.tar.bz2 664416 SHA256 f69437db95548c78a5dec44c236397146b144153149009ea554d2e536e5436f7 SHA512 50bacee82ed41ac8b8007ecc33bf51d22303cc2ddd27cfb72cb5520dab5f8e255186e34b89cec492c7a2d4220b200814bdede9b46c19f987a3d3d65a1c9b749a WHIRLPOOL e07480beba6ab1f02ad36b7d0c50c4a71cb39a8ec78bf8d1dc3c82bb9dd1d69d9169d7c937165ea15f60ce1147f256d46644f944107a3a8a800d5bad70d4c255
 DIST refpolicy-2.20141203.tar.bz2 680243 SHA256 f438209c430d8a2d4ddcbe4bdd3edb46f6af7dc4913637af0b73c635e40c1522 SHA512 682e4280c5799e4c12ec7594afc1389f67be35055748d2e0dbdc3419159a16c96d4946ca6178daee8370515951f8653b2e452efe8c962b8d7f9bc192f0b15a0c WHIRLPOOL 74bca232534e7af9051bb1ab9f77c1ff6c425781cf4561f781d6e9a40cc5ca0d9add540249ea5493e8782a9372aea296ead6c165c6c440ae1509eb319d151ee5
diff --git a/sec-policy/selinux-slrnpull/selinux-slrnpull-2.20141203-r8.ebuild b/sec-policy/selinux-slrnpull/selinux-slrnpull-2.20141203-r8.ebuild
index 98bf7e5544b6..db7888715db2 100644
--- a/sec-policy/selinux-slrnpull/selinux-slrnpull-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-slrnpull/selinux-slrnpull-2.20141203-r8.ebuild
@@ -13,5 +13,5 @@ DESCRIPTION="SELinux policy for slrnpull"
 if [[ $PV == 9999* ]] ; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-slrnpull/selinux-slrnpull-2.20141203-r9.ebuild b/sec-policy/selinux-slrnpull/selinux-slrnpull-2.20141203-r9.ebuild
new file mode 100644
index 000000000000..98bf7e5544b6
--- /dev/null
+++ b/sec-policy/selinux-slrnpull/selinux-slrnpull-2.20141203-r9.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI="5"
+
+IUSE=""
+MODS="slrnpull"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for slrnpull"
+
+if [[ $PV == 9999* ]] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
diff --git a/sec-policy/selinux-smartmon/Manifest b/sec-policy/selinux-smartmon/Manifest
index 8327a635be01..91d204b0021a 100644
--- a/sec-policy/selinux-smartmon/Manifest
+++ b/sec-policy/selinux-smartmon/Manifest
@@ -9,5 +9,6 @@ DIST patchbundle-selinux-base-policy-2.20141203-r5.tar.bz2 274136 SHA256 c23d17c
 DIST patchbundle-selinux-base-policy-2.20141203-r6.tar.bz2 293231 SHA256 b686dcc517b97834f66d967afdcc724cb43b5c6dbf9f34043a91cdeda2625cc7 SHA512 a2c486cbe4a1d21ff3fd01bef25ecf5a633a4072646c67cfccf3f7187d95f3d9e3b482a46ba17c55c40a8e7c0dee56e9cf9ddc9f414d3e4511443b62f60d03e9 WHIRLPOOL 3d708e287e3f9b873be647b0327eab6675a8702ee1cffb56e36934cada306e5ccc64397a083dad9e59de37a067e628cacbf896ae99012d5a209e42fd7cd8a4c6
 DIST patchbundle-selinux-base-policy-2.20141203-r7.tar.bz2 295833 SHA256 ba2219b3efc747be65f94c4d8ac3cd6ee530c82c848fa41935a114184678622a SHA512 8e32d9dbfb2f0f3f50200543aadb51ed9834ccd5cdf30bf8e4d9e6d0b645ce44ffaf80f7aa9385e9c9095d9a383b3a348a92356cb5386c06544ab082a9a468c7 WHIRLPOOL 1648ee1be71e45fcf5a264816ce7edc7bab19bd28a68703923eb2d6068f1f0469ae593855231d31f88baecbf29e7cece2d6beeed20b7c04231a6c90e90d35910
 DIST patchbundle-selinux-base-policy-2.20141203-r8.tar.bz2 297919 SHA256 77539eb3d78105f8789cd8205d2698bd27e2abf100163bdd162cda860fd15120 SHA512 2f8a19e1e4bb65f32b480275f49099aed3ae9df543c7de862b3bbd93e81b89cd96dadac3d091e28673d09a6885db8c5656b3a77d0080775c110b04f2753de7a6 WHIRLPOOL 79cb7e620eb8e838192dc557c7a9ce7e713227d783cc8b63792825559b2145cad70d0af6f99948c1527557bc363feffd846c73893682b4a14fc7d08b9e20c649
+DIST patchbundle-selinux-base-policy-2.20141203-r9.tar.bz2 299602 SHA256 e8518004942a6c57170a609683e22b1410c93a2a195829c41dc8fbc703d941b5 SHA512 ce6484fbca1d2d074e50d1a3953392bd3ce0a4617df98fbac37747b469b4f160a9331586dfe1c3ddccb1ccbee24876a2f05ab49e37c8492a48baf83c2d01d140 WHIRLPOOL 1fd7b956e98e95a64c3a713a944d4531259bd156a7feabf6a89c4b5f33ac846377730eede97889e85183be086f282ebd18e860214f6ca3f01b40f2323470ee04
 DIST refpolicy-2.20140311.tar.bz2 664416 SHA256 f69437db95548c78a5dec44c236397146b144153149009ea554d2e536e5436f7 SHA512 50bacee82ed41ac8b8007ecc33bf51d22303cc2ddd27cfb72cb5520dab5f8e255186e34b89cec492c7a2d4220b200814bdede9b46c19f987a3d3d65a1c9b749a WHIRLPOOL e07480beba6ab1f02ad36b7d0c50c4a71cb39a8ec78bf8d1dc3c82bb9dd1d69d9169d7c937165ea15f60ce1147f256d46644f944107a3a8a800d5bad70d4c255
 DIST refpolicy-2.20141203.tar.bz2 680243 SHA256 f438209c430d8a2d4ddcbe4bdd3edb46f6af7dc4913637af0b73c635e40c1522 SHA512 682e4280c5799e4c12ec7594afc1389f67be35055748d2e0dbdc3419159a16c96d4946ca6178daee8370515951f8653b2e452efe8c962b8d7f9bc192f0b15a0c WHIRLPOOL 74bca232534e7af9051bb1ab9f77c1ff6c425781cf4561f781d6e9a40cc5ca0d9add540249ea5493e8782a9372aea296ead6c165c6c440ae1509eb319d151ee5
diff --git a/sec-policy/selinux-smartmon/selinux-smartmon-2.20141203-r8.ebuild b/sec-policy/selinux-smartmon/selinux-smartmon-2.20141203-r8.ebuild
index 535869b6fbad..b164fd1d6fc0 100644
--- a/sec-policy/selinux-smartmon/selinux-smartmon-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-smartmon/selinux-smartmon-2.20141203-r8.ebuild
@@ -13,5 +13,5 @@ DESCRIPTION="SELinux policy for smartmon"
 if [[ $PV == 9999* ]] ; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-smartmon/selinux-smartmon-2.20141203-r9.ebuild b/sec-policy/selinux-smartmon/selinux-smartmon-2.20141203-r9.ebuild
new file mode 100644
index 000000000000..535869b6fbad
--- /dev/null
+++ b/sec-policy/selinux-smartmon/selinux-smartmon-2.20141203-r9.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI="5"
+
+IUSE=""
+MODS="smartmon"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for smartmon"
+
+if [[ $PV == 9999* ]] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
diff --git a/sec-policy/selinux-smokeping/Manifest b/sec-policy/selinux-smokeping/Manifest
index 8327a635be01..91d204b0021a 100644
--- a/sec-policy/selinux-smokeping/Manifest
+++ b/sec-policy/selinux-smokeping/Manifest
@@ -9,5 +9,6 @@ DIST patchbundle-selinux-base-policy-2.20141203-r5.tar.bz2 274136 SHA256 c23d17c
 DIST patchbundle-selinux-base-policy-2.20141203-r6.tar.bz2 293231 SHA256 b686dcc517b97834f66d967afdcc724cb43b5c6dbf9f34043a91cdeda2625cc7 SHA512 a2c486cbe4a1d21ff3fd01bef25ecf5a633a4072646c67cfccf3f7187d95f3d9e3b482a46ba17c55c40a8e7c0dee56e9cf9ddc9f414d3e4511443b62f60d03e9 WHIRLPOOL 3d708e287e3f9b873be647b0327eab6675a8702ee1cffb56e36934cada306e5ccc64397a083dad9e59de37a067e628cacbf896ae99012d5a209e42fd7cd8a4c6
 DIST patchbundle-selinux-base-policy-2.20141203-r7.tar.bz2 295833 SHA256 ba2219b3efc747be65f94c4d8ac3cd6ee530c82c848fa41935a114184678622a SHA512 8e32d9dbfb2f0f3f50200543aadb51ed9834ccd5cdf30bf8e4d9e6d0b645ce44ffaf80f7aa9385e9c9095d9a383b3a348a92356cb5386c06544ab082a9a468c7 WHIRLPOOL 1648ee1be71e45fcf5a264816ce7edc7bab19bd28a68703923eb2d6068f1f0469ae593855231d31f88baecbf29e7cece2d6beeed20b7c04231a6c90e90d35910
 DIST patchbundle-selinux-base-policy-2.20141203-r8.tar.bz2 297919 SHA256 77539eb3d78105f8789cd8205d2698bd27e2abf100163bdd162cda860fd15120 SHA512 2f8a19e1e4bb65f32b480275f49099aed3ae9df543c7de862b3bbd93e81b89cd96dadac3d091e28673d09a6885db8c5656b3a77d0080775c110b04f2753de7a6 WHIRLPOOL 79cb7e620eb8e838192dc557c7a9ce7e713227d783cc8b63792825559b2145cad70d0af6f99948c1527557bc363feffd846c73893682b4a14fc7d08b9e20c649
+DIST patchbundle-selinux-base-policy-2.20141203-r9.tar.bz2 299602 SHA256 e8518004942a6c57170a609683e22b1410c93a2a195829c41dc8fbc703d941b5 SHA512 ce6484fbca1d2d074e50d1a3953392bd3ce0a4617df98fbac37747b469b4f160a9331586dfe1c3ddccb1ccbee24876a2f05ab49e37c8492a48baf83c2d01d140 WHIRLPOOL 1fd7b956e98e95a64c3a713a944d4531259bd156a7feabf6a89c4b5f33ac846377730eede97889e85183be086f282ebd18e860214f6ca3f01b40f2323470ee04
 DIST refpolicy-2.20140311.tar.bz2 664416 SHA256 f69437db95548c78a5dec44c236397146b144153149009ea554d2e536e5436f7 SHA512 50bacee82ed41ac8b8007ecc33bf51d22303cc2ddd27cfb72cb5520dab5f8e255186e34b89cec492c7a2d4220b200814bdede9b46c19f987a3d3d65a1c9b749a WHIRLPOOL e07480beba6ab1f02ad36b7d0c50c4a71cb39a8ec78bf8d1dc3c82bb9dd1d69d9169d7c937165ea15f60ce1147f256d46644f944107a3a8a800d5bad70d4c255
 DIST refpolicy-2.20141203.tar.bz2 680243 SHA256 f438209c430d8a2d4ddcbe4bdd3edb46f6af7dc4913637af0b73c635e40c1522 SHA512 682e4280c5799e4c12ec7594afc1389f67be35055748d2e0dbdc3419159a16c96d4946ca6178daee8370515951f8653b2e452efe8c962b8d7f9bc192f0b15a0c WHIRLPOOL 74bca232534e7af9051bb1ab9f77c1ff6c425781cf4561f781d6e9a40cc5ca0d9add540249ea5493e8782a9372aea296ead6c165c6c440ae1509eb319d151ee5
diff --git a/sec-policy/selinux-smokeping/selinux-smokeping-2.20141203-r8.ebuild b/sec-policy/selinux-smokeping/selinux-smokeping-2.20141203-r8.ebuild
index 65ee403460e7..548546f7fbc9 100644
--- a/sec-policy/selinux-smokeping/selinux-smokeping-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-smokeping/selinux-smokeping-2.20141203-r8.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="SELinux policy for smokeping"
 if [[ $PV == 9999* ]] ; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-apache
diff --git a/sec-policy/selinux-smokeping/selinux-smokeping-2.20141203-r9.ebuild b/sec-policy/selinux-smokeping/selinux-smokeping-2.20141203-r9.ebuild
new file mode 100644
index 000000000000..65ee403460e7
--- /dev/null
+++ b/sec-policy/selinux-smokeping/selinux-smokeping-2.20141203-r9.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI="5"
+
+IUSE=""
+MODS="smokeping"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for smokeping"
+
+if [[ $PV == 9999* ]] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
+DEPEND="${DEPEND}
+	sec-policy/selinux-apache
+"
+RDEPEND="${RDEPEND}
+	sec-policy/selinux-apache
+"
diff --git a/sec-policy/selinux-snmp/Manifest b/sec-policy/selinux-snmp/Manifest
index 8327a635be01..91d204b0021a 100644
--- a/sec-policy/selinux-snmp/Manifest
+++ b/sec-policy/selinux-snmp/Manifest
@@ -9,5 +9,6 @@ DIST patchbundle-selinux-base-policy-2.20141203-r5.tar.bz2 274136 SHA256 c23d17c
 DIST patchbundle-selinux-base-policy-2.20141203-r6.tar.bz2 293231 SHA256 b686dcc517b97834f66d967afdcc724cb43b5c6dbf9f34043a91cdeda2625cc7 SHA512 a2c486cbe4a1d21ff3fd01bef25ecf5a633a4072646c67cfccf3f7187d95f3d9e3b482a46ba17c55c40a8e7c0dee56e9cf9ddc9f414d3e4511443b62f60d03e9 WHIRLPOOL 3d708e287e3f9b873be647b0327eab6675a8702ee1cffb56e36934cada306e5ccc64397a083dad9e59de37a067e628cacbf896ae99012d5a209e42fd7cd8a4c6
 DIST patchbundle-selinux-base-policy-2.20141203-r7.tar.bz2 295833 SHA256 ba2219b3efc747be65f94c4d8ac3cd6ee530c82c848fa41935a114184678622a SHA512 8e32d9dbfb2f0f3f50200543aadb51ed9834ccd5cdf30bf8e4d9e6d0b645ce44ffaf80f7aa9385e9c9095d9a383b3a348a92356cb5386c06544ab082a9a468c7 WHIRLPOOL 1648ee1be71e45fcf5a264816ce7edc7bab19bd28a68703923eb2d6068f1f0469ae593855231d31f88baecbf29e7cece2d6beeed20b7c04231a6c90e90d35910
 DIST patchbundle-selinux-base-policy-2.20141203-r8.tar.bz2 297919 SHA256 77539eb3d78105f8789cd8205d2698bd27e2abf100163bdd162cda860fd15120 SHA512 2f8a19e1e4bb65f32b480275f49099aed3ae9df543c7de862b3bbd93e81b89cd96dadac3d091e28673d09a6885db8c5656b3a77d0080775c110b04f2753de7a6 WHIRLPOOL 79cb7e620eb8e838192dc557c7a9ce7e713227d783cc8b63792825559b2145cad70d0af6f99948c1527557bc363feffd846c73893682b4a14fc7d08b9e20c649
+DIST patchbundle-selinux-base-policy-2.20141203-r9.tar.bz2 299602 SHA256 e8518004942a6c57170a609683e22b1410c93a2a195829c41dc8fbc703d941b5 SHA512 ce6484fbca1d2d074e50d1a3953392bd3ce0a4617df98fbac37747b469b4f160a9331586dfe1c3ddccb1ccbee24876a2f05ab49e37c8492a48baf83c2d01d140 WHIRLPOOL 1fd7b956e98e95a64c3a713a944d4531259bd156a7feabf6a89c4b5f33ac846377730eede97889e85183be086f282ebd18e860214f6ca3f01b40f2323470ee04
 DIST refpolicy-2.20140311.tar.bz2 664416 SHA256 f69437db95548c78a5dec44c236397146b144153149009ea554d2e536e5436f7 SHA512 50bacee82ed41ac8b8007ecc33bf51d22303cc2ddd27cfb72cb5520dab5f8e255186e34b89cec492c7a2d4220b200814bdede9b46c19f987a3d3d65a1c9b749a WHIRLPOOL e07480beba6ab1f02ad36b7d0c50c4a71cb39a8ec78bf8d1dc3c82bb9dd1d69d9169d7c937165ea15f60ce1147f256d46644f944107a3a8a800d5bad70d4c255
 DIST refpolicy-2.20141203.tar.bz2 680243 SHA256 f438209c430d8a2d4ddcbe4bdd3edb46f6af7dc4913637af0b73c635e40c1522 SHA512 682e4280c5799e4c12ec7594afc1389f67be35055748d2e0dbdc3419159a16c96d4946ca6178daee8370515951f8653b2e452efe8c962b8d7f9bc192f0b15a0c WHIRLPOOL 74bca232534e7af9051bb1ab9f77c1ff6c425781cf4561f781d6e9a40cc5ca0d9add540249ea5493e8782a9372aea296ead6c165c6c440ae1509eb319d151ee5
diff --git a/sec-policy/selinux-snmp/selinux-snmp-2.20141203-r8.ebuild b/sec-policy/selinux-snmp/selinux-snmp-2.20141203-r8.ebuild
index a20532c9f7fa..2c0589edbecf 100644
--- a/sec-policy/selinux-snmp/selinux-snmp-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-snmp/selinux-snmp-2.20141203-r8.ebuild
@@ -13,5 +13,5 @@ DESCRIPTION="SELinux policy for snmp"
 if [[ $PV == 9999* ]] ; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-snmp/selinux-snmp-2.20141203-r9.ebuild b/sec-policy/selinux-snmp/selinux-snmp-2.20141203-r9.ebuild
new file mode 100644
index 000000000000..a20532c9f7fa
--- /dev/null
+++ b/sec-policy/selinux-snmp/selinux-snmp-2.20141203-r9.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI="5"
+
+IUSE=""
+MODS="snmp"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for snmp"
+
+if [[ $PV == 9999* ]] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
diff --git a/sec-policy/selinux-snort/Manifest b/sec-policy/selinux-snort/Manifest
index 8327a635be01..91d204b0021a 100644
--- a/sec-policy/selinux-snort/Manifest
+++ b/sec-policy/selinux-snort/Manifest
@@ -9,5 +9,6 @@ DIST patchbundle-selinux-base-policy-2.20141203-r5.tar.bz2 274136 SHA256 c23d17c
 DIST patchbundle-selinux-base-policy-2.20141203-r6.tar.bz2 293231 SHA256 b686dcc517b97834f66d967afdcc724cb43b5c6dbf9f34043a91cdeda2625cc7 SHA512 a2c486cbe4a1d21ff3fd01bef25ecf5a633a4072646c67cfccf3f7187d95f3d9e3b482a46ba17c55c40a8e7c0dee56e9cf9ddc9f414d3e4511443b62f60d03e9 WHIRLPOOL 3d708e287e3f9b873be647b0327eab6675a8702ee1cffb56e36934cada306e5ccc64397a083dad9e59de37a067e628cacbf896ae99012d5a209e42fd7cd8a4c6
 DIST patchbundle-selinux-base-policy-2.20141203-r7.tar.bz2 295833 SHA256 ba2219b3efc747be65f94c4d8ac3cd6ee530c82c848fa41935a114184678622a SHA512 8e32d9dbfb2f0f3f50200543aadb51ed9834ccd5cdf30bf8e4d9e6d0b645ce44ffaf80f7aa9385e9c9095d9a383b3a348a92356cb5386c06544ab082a9a468c7 WHIRLPOOL 1648ee1be71e45fcf5a264816ce7edc7bab19bd28a68703923eb2d6068f1f0469ae593855231d31f88baecbf29e7cece2d6beeed20b7c04231a6c90e90d35910
 DIST patchbundle-selinux-base-policy-2.20141203-r8.tar.bz2 297919 SHA256 77539eb3d78105f8789cd8205d2698bd27e2abf100163bdd162cda860fd15120 SHA512 2f8a19e1e4bb65f32b480275f49099aed3ae9df543c7de862b3bbd93e81b89cd96dadac3d091e28673d09a6885db8c5656b3a77d0080775c110b04f2753de7a6 WHIRLPOOL 79cb7e620eb8e838192dc557c7a9ce7e713227d783cc8b63792825559b2145cad70d0af6f99948c1527557bc363feffd846c73893682b4a14fc7d08b9e20c649
+DIST patchbundle-selinux-base-policy-2.20141203-r9.tar.bz2 299602 SHA256 e8518004942a6c57170a609683e22b1410c93a2a195829c41dc8fbc703d941b5 SHA512 ce6484fbca1d2d074e50d1a3953392bd3ce0a4617df98fbac37747b469b4f160a9331586dfe1c3ddccb1ccbee24876a2f05ab49e37c8492a48baf83c2d01d140 WHIRLPOOL 1fd7b956e98e95a64c3a713a944d4531259bd156a7feabf6a89c4b5f33ac846377730eede97889e85183be086f282ebd18e860214f6ca3f01b40f2323470ee04
 DIST refpolicy-2.20140311.tar.bz2 664416 SHA256 f69437db95548c78a5dec44c236397146b144153149009ea554d2e536e5436f7 SHA512 50bacee82ed41ac8b8007ecc33bf51d22303cc2ddd27cfb72cb5520dab5f8e255186e34b89cec492c7a2d4220b200814bdede9b46c19f987a3d3d65a1c9b749a WHIRLPOOL e07480beba6ab1f02ad36b7d0c50c4a71cb39a8ec78bf8d1dc3c82bb9dd1d69d9169d7c937165ea15f60ce1147f256d46644f944107a3a8a800d5bad70d4c255
 DIST refpolicy-2.20141203.tar.bz2 680243 SHA256 f438209c430d8a2d4ddcbe4bdd3edb46f6af7dc4913637af0b73c635e40c1522 SHA512 682e4280c5799e4c12ec7594afc1389f67be35055748d2e0dbdc3419159a16c96d4946ca6178daee8370515951f8653b2e452efe8c962b8d7f9bc192f0b15a0c WHIRLPOOL 74bca232534e7af9051bb1ab9f77c1ff6c425781cf4561f781d6e9a40cc5ca0d9add540249ea5493e8782a9372aea296ead6c165c6c440ae1509eb319d151ee5
diff --git a/sec-policy/selinux-snort/selinux-snort-2.20141203-r8.ebuild b/sec-policy/selinux-snort/selinux-snort-2.20141203-r8.ebuild
index 70cbb7918673..051ad60f57d6 100644
--- a/sec-policy/selinux-snort/selinux-snort-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-snort/selinux-snort-2.20141203-r8.ebuild
@@ -13,5 +13,5 @@ DESCRIPTION="SELinux policy for snort"
 if [[ $PV == 9999* ]] ; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-snort/selinux-snort-2.20141203-r9.ebuild b/sec-policy/selinux-snort/selinux-snort-2.20141203-r9.ebuild
new file mode 100644
index 000000000000..70cbb7918673
--- /dev/null
+++ b/sec-policy/selinux-snort/selinux-snort-2.20141203-r9.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI="5"
+
+IUSE=""
+MODS="snort"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for snort"
+
+if [[ $PV == 9999* ]] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
diff --git a/sec-policy/selinux-soundserver/Manifest b/sec-policy/selinux-soundserver/Manifest
index 8327a635be01..91d204b0021a 100644
--- a/sec-policy/selinux-soundserver/Manifest
+++ b/sec-policy/selinux-soundserver/Manifest
@@ -9,5 +9,6 @@ DIST patchbundle-selinux-base-policy-2.20141203-r5.tar.bz2 274136 SHA256 c23d17c
 DIST patchbundle-selinux-base-policy-2.20141203-r6.tar.bz2 293231 SHA256 b686dcc517b97834f66d967afdcc724cb43b5c6dbf9f34043a91cdeda2625cc7 SHA512 a2c486cbe4a1d21ff3fd01bef25ecf5a633a4072646c67cfccf3f7187d95f3d9e3b482a46ba17c55c40a8e7c0dee56e9cf9ddc9f414d3e4511443b62f60d03e9 WHIRLPOOL 3d708e287e3f9b873be647b0327eab6675a8702ee1cffb56e36934cada306e5ccc64397a083dad9e59de37a067e628cacbf896ae99012d5a209e42fd7cd8a4c6
 DIST patchbundle-selinux-base-policy-2.20141203-r7.tar.bz2 295833 SHA256 ba2219b3efc747be65f94c4d8ac3cd6ee530c82c848fa41935a114184678622a SHA512 8e32d9dbfb2f0f3f50200543aadb51ed9834ccd5cdf30bf8e4d9e6d0b645ce44ffaf80f7aa9385e9c9095d9a383b3a348a92356cb5386c06544ab082a9a468c7 WHIRLPOOL 1648ee1be71e45fcf5a264816ce7edc7bab19bd28a68703923eb2d6068f1f0469ae593855231d31f88baecbf29e7cece2d6beeed20b7c04231a6c90e90d35910
 DIST patchbundle-selinux-base-policy-2.20141203-r8.tar.bz2 297919 SHA256 77539eb3d78105f8789cd8205d2698bd27e2abf100163bdd162cda860fd15120 SHA512 2f8a19e1e4bb65f32b480275f49099aed3ae9df543c7de862b3bbd93e81b89cd96dadac3d091e28673d09a6885db8c5656b3a77d0080775c110b04f2753de7a6 WHIRLPOOL 79cb7e620eb8e838192dc557c7a9ce7e713227d783cc8b63792825559b2145cad70d0af6f99948c1527557bc363feffd846c73893682b4a14fc7d08b9e20c649
+DIST patchbundle-selinux-base-policy-2.20141203-r9.tar.bz2 299602 SHA256 e8518004942a6c57170a609683e22b1410c93a2a195829c41dc8fbc703d941b5 SHA512 ce6484fbca1d2d074e50d1a3953392bd3ce0a4617df98fbac37747b469b4f160a9331586dfe1c3ddccb1ccbee24876a2f05ab49e37c8492a48baf83c2d01d140 WHIRLPOOL 1fd7b956e98e95a64c3a713a944d4531259bd156a7feabf6a89c4b5f33ac846377730eede97889e85183be086f282ebd18e860214f6ca3f01b40f2323470ee04
 DIST refpolicy-2.20140311.tar.bz2 664416 SHA256 f69437db95548c78a5dec44c236397146b144153149009ea554d2e536e5436f7 SHA512 50bacee82ed41ac8b8007ecc33bf51d22303cc2ddd27cfb72cb5520dab5f8e255186e34b89cec492c7a2d4220b200814bdede9b46c19f987a3d3d65a1c9b749a WHIRLPOOL e07480beba6ab1f02ad36b7d0c50c4a71cb39a8ec78bf8d1dc3c82bb9dd1d69d9169d7c937165ea15f60ce1147f256d46644f944107a3a8a800d5bad70d4c255
 DIST refpolicy-2.20141203.tar.bz2 680243 SHA256 f438209c430d8a2d4ddcbe4bdd3edb46f6af7dc4913637af0b73c635e40c1522 SHA512 682e4280c5799e4c12ec7594afc1389f67be35055748d2e0dbdc3419159a16c96d4946ca6178daee8370515951f8653b2e452efe8c962b8d7f9bc192f0b15a0c WHIRLPOOL 74bca232534e7af9051bb1ab9f77c1ff6c425781cf4561f781d6e9a40cc5ca0d9add540249ea5493e8782a9372aea296ead6c165c6c440ae1509eb319d151ee5
diff --git a/sec-policy/selinux-soundserver/selinux-soundserver-2.20141203-r8.ebuild b/sec-policy/selinux-soundserver/selinux-soundserver-2.20141203-r8.ebuild
index ce324c846a0a..e62fecc52753 100644
--- a/sec-policy/selinux-soundserver/selinux-soundserver-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-soundserver/selinux-soundserver-2.20141203-r8.ebuild
@@ -13,5 +13,5 @@ DESCRIPTION="SELinux policy for soundserver"
 if [[ $PV == 9999* ]] ; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-soundserver/selinux-soundserver-2.20141203-r9.ebuild b/sec-policy/selinux-soundserver/selinux-soundserver-2.20141203-r9.ebuild
new file mode 100644
index 000000000000..ce324c846a0a
--- /dev/null
+++ b/sec-policy/selinux-soundserver/selinux-soundserver-2.20141203-r9.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI="5"
+
+IUSE=""
+MODS="soundserver"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for soundserver"
+
+if [[ $PV == 9999* ]] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
diff --git a/sec-policy/selinux-spamassassin/Manifest b/sec-policy/selinux-spamassassin/Manifest
index 8327a635be01..91d204b0021a 100644
--- a/sec-policy/selinux-spamassassin/Manifest
+++ b/sec-policy/selinux-spamassassin/Manifest
@@ -9,5 +9,6 @@ DIST patchbundle-selinux-base-policy-2.20141203-r5.tar.bz2 274136 SHA256 c23d17c
 DIST patchbundle-selinux-base-policy-2.20141203-r6.tar.bz2 293231 SHA256 b686dcc517b97834f66d967afdcc724cb43b5c6dbf9f34043a91cdeda2625cc7 SHA512 a2c486cbe4a1d21ff3fd01bef25ecf5a633a4072646c67cfccf3f7187d95f3d9e3b482a46ba17c55c40a8e7c0dee56e9cf9ddc9f414d3e4511443b62f60d03e9 WHIRLPOOL 3d708e287e3f9b873be647b0327eab6675a8702ee1cffb56e36934cada306e5ccc64397a083dad9e59de37a067e628cacbf896ae99012d5a209e42fd7cd8a4c6
 DIST patchbundle-selinux-base-policy-2.20141203-r7.tar.bz2 295833 SHA256 ba2219b3efc747be65f94c4d8ac3cd6ee530c82c848fa41935a114184678622a SHA512 8e32d9dbfb2f0f3f50200543aadb51ed9834ccd5cdf30bf8e4d9e6d0b645ce44ffaf80f7aa9385e9c9095d9a383b3a348a92356cb5386c06544ab082a9a468c7 WHIRLPOOL 1648ee1be71e45fcf5a264816ce7edc7bab19bd28a68703923eb2d6068f1f0469ae593855231d31f88baecbf29e7cece2d6beeed20b7c04231a6c90e90d35910
 DIST patchbundle-selinux-base-policy-2.20141203-r8.tar.bz2 297919 SHA256 77539eb3d78105f8789cd8205d2698bd27e2abf100163bdd162cda860fd15120 SHA512 2f8a19e1e4bb65f32b480275f49099aed3ae9df543c7de862b3bbd93e81b89cd96dadac3d091e28673d09a6885db8c5656b3a77d0080775c110b04f2753de7a6 WHIRLPOOL 79cb7e620eb8e838192dc557c7a9ce7e713227d783cc8b63792825559b2145cad70d0af6f99948c1527557bc363feffd846c73893682b4a14fc7d08b9e20c649
+DIST patchbundle-selinux-base-policy-2.20141203-r9.tar.bz2 299602 SHA256 e8518004942a6c57170a609683e22b1410c93a2a195829c41dc8fbc703d941b5 SHA512 ce6484fbca1d2d074e50d1a3953392bd3ce0a4617df98fbac37747b469b4f160a9331586dfe1c3ddccb1ccbee24876a2f05ab49e37c8492a48baf83c2d01d140 WHIRLPOOL 1fd7b956e98e95a64c3a713a944d4531259bd156a7feabf6a89c4b5f33ac846377730eede97889e85183be086f282ebd18e860214f6ca3f01b40f2323470ee04
 DIST refpolicy-2.20140311.tar.bz2 664416 SHA256 f69437db95548c78a5dec44c236397146b144153149009ea554d2e536e5436f7 SHA512 50bacee82ed41ac8b8007ecc33bf51d22303cc2ddd27cfb72cb5520dab5f8e255186e34b89cec492c7a2d4220b200814bdede9b46c19f987a3d3d65a1c9b749a WHIRLPOOL e07480beba6ab1f02ad36b7d0c50c4a71cb39a8ec78bf8d1dc3c82bb9dd1d69d9169d7c937165ea15f60ce1147f256d46644f944107a3a8a800d5bad70d4c255
 DIST refpolicy-2.20141203.tar.bz2 680243 SHA256 f438209c430d8a2d4ddcbe4bdd3edb46f6af7dc4913637af0b73c635e40c1522 SHA512 682e4280c5799e4c12ec7594afc1389f67be35055748d2e0dbdc3419159a16c96d4946ca6178daee8370515951f8653b2e452efe8c962b8d7f9bc192f0b15a0c WHIRLPOOL 74bca232534e7af9051bb1ab9f77c1ff6c425781cf4561f781d6e9a40cc5ca0d9add540249ea5493e8782a9372aea296ead6c165c6c440ae1509eb319d151ee5
diff --git a/sec-policy/selinux-spamassassin/selinux-spamassassin-2.20141203-r8.ebuild b/sec-policy/selinux-spamassassin/selinux-spamassassin-2.20141203-r8.ebuild
index dc343200d04e..7c6d2c8f7f83 100644
--- a/sec-policy/selinux-spamassassin/selinux-spamassassin-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-spamassassin/selinux-spamassassin-2.20141203-r8.ebuild
@@ -13,5 +13,5 @@ DESCRIPTION="SELinux policy for spamassassin"
 if [[ $PV == 9999* ]] ; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-spamassassin/selinux-spamassassin-2.20141203-r9.ebuild b/sec-policy/selinux-spamassassin/selinux-spamassassin-2.20141203-r9.ebuild
new file mode 100644
index 000000000000..dc343200d04e
--- /dev/null
+++ b/sec-policy/selinux-spamassassin/selinux-spamassassin-2.20141203-r9.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI="5"
+
+IUSE=""
+MODS="spamassassin"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for spamassassin"
+
+if [[ $PV == 9999* ]] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
diff --git a/sec-policy/selinux-speedtouch/Manifest b/sec-policy/selinux-speedtouch/Manifest
index 8327a635be01..91d204b0021a 100644
--- a/sec-policy/selinux-speedtouch/Manifest
+++ b/sec-policy/selinux-speedtouch/Manifest
@@ -9,5 +9,6 @@ DIST patchbundle-selinux-base-policy-2.20141203-r5.tar.bz2 274136 SHA256 c23d17c
 DIST patchbundle-selinux-base-policy-2.20141203-r6.tar.bz2 293231 SHA256 b686dcc517b97834f66d967afdcc724cb43b5c6dbf9f34043a91cdeda2625cc7 SHA512 a2c486cbe4a1d21ff3fd01bef25ecf5a633a4072646c67cfccf3f7187d95f3d9e3b482a46ba17c55c40a8e7c0dee56e9cf9ddc9f414d3e4511443b62f60d03e9 WHIRLPOOL 3d708e287e3f9b873be647b0327eab6675a8702ee1cffb56e36934cada306e5ccc64397a083dad9e59de37a067e628cacbf896ae99012d5a209e42fd7cd8a4c6
 DIST patchbundle-selinux-base-policy-2.20141203-r7.tar.bz2 295833 SHA256 ba2219b3efc747be65f94c4d8ac3cd6ee530c82c848fa41935a114184678622a SHA512 8e32d9dbfb2f0f3f50200543aadb51ed9834ccd5cdf30bf8e4d9e6d0b645ce44ffaf80f7aa9385e9c9095d9a383b3a348a92356cb5386c06544ab082a9a468c7 WHIRLPOOL 1648ee1be71e45fcf5a264816ce7edc7bab19bd28a68703923eb2d6068f1f0469ae593855231d31f88baecbf29e7cece2d6beeed20b7c04231a6c90e90d35910
 DIST patchbundle-selinux-base-policy-2.20141203-r8.tar.bz2 297919 SHA256 77539eb3d78105f8789cd8205d2698bd27e2abf100163bdd162cda860fd15120 SHA512 2f8a19e1e4bb65f32b480275f49099aed3ae9df543c7de862b3bbd93e81b89cd96dadac3d091e28673d09a6885db8c5656b3a77d0080775c110b04f2753de7a6 WHIRLPOOL 79cb7e620eb8e838192dc557c7a9ce7e713227d783cc8b63792825559b2145cad70d0af6f99948c1527557bc363feffd846c73893682b4a14fc7d08b9e20c649
+DIST patchbundle-selinux-base-policy-2.20141203-r9.tar.bz2 299602 SHA256 e8518004942a6c57170a609683e22b1410c93a2a195829c41dc8fbc703d941b5 SHA512 ce6484fbca1d2d074e50d1a3953392bd3ce0a4617df98fbac37747b469b4f160a9331586dfe1c3ddccb1ccbee24876a2f05ab49e37c8492a48baf83c2d01d140 WHIRLPOOL 1fd7b956e98e95a64c3a713a944d4531259bd156a7feabf6a89c4b5f33ac846377730eede97889e85183be086f282ebd18e860214f6ca3f01b40f2323470ee04
 DIST refpolicy-2.20140311.tar.bz2 664416 SHA256 f69437db95548c78a5dec44c236397146b144153149009ea554d2e536e5436f7 SHA512 50bacee82ed41ac8b8007ecc33bf51d22303cc2ddd27cfb72cb5520dab5f8e255186e34b89cec492c7a2d4220b200814bdede9b46c19f987a3d3d65a1c9b749a WHIRLPOOL e07480beba6ab1f02ad36b7d0c50c4a71cb39a8ec78bf8d1dc3c82bb9dd1d69d9169d7c937165ea15f60ce1147f256d46644f944107a3a8a800d5bad70d4c255
 DIST refpolicy-2.20141203.tar.bz2 680243 SHA256 f438209c430d8a2d4ddcbe4bdd3edb46f6af7dc4913637af0b73c635e40c1522 SHA512 682e4280c5799e4c12ec7594afc1389f67be35055748d2e0dbdc3419159a16c96d4946ca6178daee8370515951f8653b2e452efe8c962b8d7f9bc192f0b15a0c WHIRLPOOL 74bca232534e7af9051bb1ab9f77c1ff6c425781cf4561f781d6e9a40cc5ca0d9add540249ea5493e8782a9372aea296ead6c165c6c440ae1509eb319d151ee5
diff --git a/sec-policy/selinux-speedtouch/selinux-speedtouch-2.20141203-r8.ebuild b/sec-policy/selinux-speedtouch/selinux-speedtouch-2.20141203-r8.ebuild
index 3eaa6f4bf99c..548b5d92afb1 100644
--- a/sec-policy/selinux-speedtouch/selinux-speedtouch-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-speedtouch/selinux-speedtouch-2.20141203-r8.ebuild
@@ -13,5 +13,5 @@ DESCRIPTION="SELinux policy for speedtouch"
 if [[ $PV == 9999* ]] ; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-speedtouch/selinux-speedtouch-2.20141203-r9.ebuild b/sec-policy/selinux-speedtouch/selinux-speedtouch-2.20141203-r9.ebuild
new file mode 100644
index 000000000000..3eaa6f4bf99c
--- /dev/null
+++ b/sec-policy/selinux-speedtouch/selinux-speedtouch-2.20141203-r9.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI="5"
+
+IUSE=""
+MODS="speedtouch"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for speedtouch"
+
+if [[ $PV == 9999* ]] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
diff --git a/sec-policy/selinux-squid/Manifest b/sec-policy/selinux-squid/Manifest
index 8327a635be01..91d204b0021a 100644
--- a/sec-policy/selinux-squid/Manifest
+++ b/sec-policy/selinux-squid/Manifest
@@ -9,5 +9,6 @@ DIST patchbundle-selinux-base-policy-2.20141203-r5.tar.bz2 274136 SHA256 c23d17c
 DIST patchbundle-selinux-base-policy-2.20141203-r6.tar.bz2 293231 SHA256 b686dcc517b97834f66d967afdcc724cb43b5c6dbf9f34043a91cdeda2625cc7 SHA512 a2c486cbe4a1d21ff3fd01bef25ecf5a633a4072646c67cfccf3f7187d95f3d9e3b482a46ba17c55c40a8e7c0dee56e9cf9ddc9f414d3e4511443b62f60d03e9 WHIRLPOOL 3d708e287e3f9b873be647b0327eab6675a8702ee1cffb56e36934cada306e5ccc64397a083dad9e59de37a067e628cacbf896ae99012d5a209e42fd7cd8a4c6
 DIST patchbundle-selinux-base-policy-2.20141203-r7.tar.bz2 295833 SHA256 ba2219b3efc747be65f94c4d8ac3cd6ee530c82c848fa41935a114184678622a SHA512 8e32d9dbfb2f0f3f50200543aadb51ed9834ccd5cdf30bf8e4d9e6d0b645ce44ffaf80f7aa9385e9c9095d9a383b3a348a92356cb5386c06544ab082a9a468c7 WHIRLPOOL 1648ee1be71e45fcf5a264816ce7edc7bab19bd28a68703923eb2d6068f1f0469ae593855231d31f88baecbf29e7cece2d6beeed20b7c04231a6c90e90d35910
 DIST patchbundle-selinux-base-policy-2.20141203-r8.tar.bz2 297919 SHA256 77539eb3d78105f8789cd8205d2698bd27e2abf100163bdd162cda860fd15120 SHA512 2f8a19e1e4bb65f32b480275f49099aed3ae9df543c7de862b3bbd93e81b89cd96dadac3d091e28673d09a6885db8c5656b3a77d0080775c110b04f2753de7a6 WHIRLPOOL 79cb7e620eb8e838192dc557c7a9ce7e713227d783cc8b63792825559b2145cad70d0af6f99948c1527557bc363feffd846c73893682b4a14fc7d08b9e20c649
+DIST patchbundle-selinux-base-policy-2.20141203-r9.tar.bz2 299602 SHA256 e8518004942a6c57170a609683e22b1410c93a2a195829c41dc8fbc703d941b5 SHA512 ce6484fbca1d2d074e50d1a3953392bd3ce0a4617df98fbac37747b469b4f160a9331586dfe1c3ddccb1ccbee24876a2f05ab49e37c8492a48baf83c2d01d140 WHIRLPOOL 1fd7b956e98e95a64c3a713a944d4531259bd156a7feabf6a89c4b5f33ac846377730eede97889e85183be086f282ebd18e860214f6ca3f01b40f2323470ee04
 DIST refpolicy-2.20140311.tar.bz2 664416 SHA256 f69437db95548c78a5dec44c236397146b144153149009ea554d2e536e5436f7 SHA512 50bacee82ed41ac8b8007ecc33bf51d22303cc2ddd27cfb72cb5520dab5f8e255186e34b89cec492c7a2d4220b200814bdede9b46c19f987a3d3d65a1c9b749a WHIRLPOOL e07480beba6ab1f02ad36b7d0c50c4a71cb39a8ec78bf8d1dc3c82bb9dd1d69d9169d7c937165ea15f60ce1147f256d46644f944107a3a8a800d5bad70d4c255
 DIST refpolicy-2.20141203.tar.bz2 680243 SHA256 f438209c430d8a2d4ddcbe4bdd3edb46f6af7dc4913637af0b73c635e40c1522 SHA512 682e4280c5799e4c12ec7594afc1389f67be35055748d2e0dbdc3419159a16c96d4946ca6178daee8370515951f8653b2e452efe8c962b8d7f9bc192f0b15a0c WHIRLPOOL 74bca232534e7af9051bb1ab9f77c1ff6c425781cf4561f781d6e9a40cc5ca0d9add540249ea5493e8782a9372aea296ead6c165c6c440ae1509eb319d151ee5
diff --git a/sec-policy/selinux-squid/selinux-squid-2.20141203-r8.ebuild b/sec-policy/selinux-squid/selinux-squid-2.20141203-r8.ebuild
index c4b2a600027b..f3b8426a31fd 100644
--- a/sec-policy/selinux-squid/selinux-squid-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-squid/selinux-squid-2.20141203-r8.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="SELinux policy for squid"
 if [[ $PV == 9999* ]] ; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-apache
diff --git a/sec-policy/selinux-squid/selinux-squid-2.20141203-r9.ebuild b/sec-policy/selinux-squid/selinux-squid-2.20141203-r9.ebuild
new file mode 100644
index 000000000000..c4b2a600027b
--- /dev/null
+++ b/sec-policy/selinux-squid/selinux-squid-2.20141203-r9.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI="5"
+
+IUSE=""
+MODS="squid"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for squid"
+
+if [[ $PV == 9999* ]] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
+DEPEND="${DEPEND}
+	sec-policy/selinux-apache
+"
+RDEPEND="${RDEPEND}
+	sec-policy/selinux-apache
+"
diff --git a/sec-policy/selinux-sssd/Manifest b/sec-policy/selinux-sssd/Manifest
index 8327a635be01..91d204b0021a 100644
--- a/sec-policy/selinux-sssd/Manifest
+++ b/sec-policy/selinux-sssd/Manifest
@@ -9,5 +9,6 @@ DIST patchbundle-selinux-base-policy-2.20141203-r5.tar.bz2 274136 SHA256 c23d17c
 DIST patchbundle-selinux-base-policy-2.20141203-r6.tar.bz2 293231 SHA256 b686dcc517b97834f66d967afdcc724cb43b5c6dbf9f34043a91cdeda2625cc7 SHA512 a2c486cbe4a1d21ff3fd01bef25ecf5a633a4072646c67cfccf3f7187d95f3d9e3b482a46ba17c55c40a8e7c0dee56e9cf9ddc9f414d3e4511443b62f60d03e9 WHIRLPOOL 3d708e287e3f9b873be647b0327eab6675a8702ee1cffb56e36934cada306e5ccc64397a083dad9e59de37a067e628cacbf896ae99012d5a209e42fd7cd8a4c6
 DIST patchbundle-selinux-base-policy-2.20141203-r7.tar.bz2 295833 SHA256 ba2219b3efc747be65f94c4d8ac3cd6ee530c82c848fa41935a114184678622a SHA512 8e32d9dbfb2f0f3f50200543aadb51ed9834ccd5cdf30bf8e4d9e6d0b645ce44ffaf80f7aa9385e9c9095d9a383b3a348a92356cb5386c06544ab082a9a468c7 WHIRLPOOL 1648ee1be71e45fcf5a264816ce7edc7bab19bd28a68703923eb2d6068f1f0469ae593855231d31f88baecbf29e7cece2d6beeed20b7c04231a6c90e90d35910
 DIST patchbundle-selinux-base-policy-2.20141203-r8.tar.bz2 297919 SHA256 77539eb3d78105f8789cd8205d2698bd27e2abf100163bdd162cda860fd15120 SHA512 2f8a19e1e4bb65f32b480275f49099aed3ae9df543c7de862b3bbd93e81b89cd96dadac3d091e28673d09a6885db8c5656b3a77d0080775c110b04f2753de7a6 WHIRLPOOL 79cb7e620eb8e838192dc557c7a9ce7e713227d783cc8b63792825559b2145cad70d0af6f99948c1527557bc363feffd846c73893682b4a14fc7d08b9e20c649
+DIST patchbundle-selinux-base-policy-2.20141203-r9.tar.bz2 299602 SHA256 e8518004942a6c57170a609683e22b1410c93a2a195829c41dc8fbc703d941b5 SHA512 ce6484fbca1d2d074e50d1a3953392bd3ce0a4617df98fbac37747b469b4f160a9331586dfe1c3ddccb1ccbee24876a2f05ab49e37c8492a48baf83c2d01d140 WHIRLPOOL 1fd7b956e98e95a64c3a713a944d4531259bd156a7feabf6a89c4b5f33ac846377730eede97889e85183be086f282ebd18e860214f6ca3f01b40f2323470ee04
 DIST refpolicy-2.20140311.tar.bz2 664416 SHA256 f69437db95548c78a5dec44c236397146b144153149009ea554d2e536e5436f7 SHA512 50bacee82ed41ac8b8007ecc33bf51d22303cc2ddd27cfb72cb5520dab5f8e255186e34b89cec492c7a2d4220b200814bdede9b46c19f987a3d3d65a1c9b749a WHIRLPOOL e07480beba6ab1f02ad36b7d0c50c4a71cb39a8ec78bf8d1dc3c82bb9dd1d69d9169d7c937165ea15f60ce1147f256d46644f944107a3a8a800d5bad70d4c255
 DIST refpolicy-2.20141203.tar.bz2 680243 SHA256 f438209c430d8a2d4ddcbe4bdd3edb46f6af7dc4913637af0b73c635e40c1522 SHA512 682e4280c5799e4c12ec7594afc1389f67be35055748d2e0dbdc3419159a16c96d4946ca6178daee8370515951f8653b2e452efe8c962b8d7f9bc192f0b15a0c WHIRLPOOL 74bca232534e7af9051bb1ab9f77c1ff6c425781cf4561f781d6e9a40cc5ca0d9add540249ea5493e8782a9372aea296ead6c165c6c440ae1509eb319d151ee5
diff --git a/sec-policy/selinux-sssd/selinux-sssd-2.20141203-r8.ebuild b/sec-policy/selinux-sssd/selinux-sssd-2.20141203-r8.ebuild
index 3b510059b671..6708c97321db 100644
--- a/sec-policy/selinux-sssd/selinux-sssd-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-sssd/selinux-sssd-2.20141203-r8.ebuild
@@ -13,5 +13,5 @@ DESCRIPTION="SELinux policy for sssd"
 if [[ $PV == 9999* ]] ; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-sssd/selinux-sssd-2.20141203-r9.ebuild b/sec-policy/selinux-sssd/selinux-sssd-2.20141203-r9.ebuild
new file mode 100644
index 000000000000..3b510059b671
--- /dev/null
+++ b/sec-policy/selinux-sssd/selinux-sssd-2.20141203-r9.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI="5"
+
+IUSE=""
+MODS="sssd"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for sssd"
+
+if [[ $PV == 9999* ]] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
diff --git a/sec-policy/selinux-stunnel/Manifest b/sec-policy/selinux-stunnel/Manifest
index 8327a635be01..91d204b0021a 100644
--- a/sec-policy/selinux-stunnel/Manifest
+++ b/sec-policy/selinux-stunnel/Manifest
@@ -9,5 +9,6 @@ DIST patchbundle-selinux-base-policy-2.20141203-r5.tar.bz2 274136 SHA256 c23d17c
 DIST patchbundle-selinux-base-policy-2.20141203-r6.tar.bz2 293231 SHA256 b686dcc517b97834f66d967afdcc724cb43b5c6dbf9f34043a91cdeda2625cc7 SHA512 a2c486cbe4a1d21ff3fd01bef25ecf5a633a4072646c67cfccf3f7187d95f3d9e3b482a46ba17c55c40a8e7c0dee56e9cf9ddc9f414d3e4511443b62f60d03e9 WHIRLPOOL 3d708e287e3f9b873be647b0327eab6675a8702ee1cffb56e36934cada306e5ccc64397a083dad9e59de37a067e628cacbf896ae99012d5a209e42fd7cd8a4c6
 DIST patchbundle-selinux-base-policy-2.20141203-r7.tar.bz2 295833 SHA256 ba2219b3efc747be65f94c4d8ac3cd6ee530c82c848fa41935a114184678622a SHA512 8e32d9dbfb2f0f3f50200543aadb51ed9834ccd5cdf30bf8e4d9e6d0b645ce44ffaf80f7aa9385e9c9095d9a383b3a348a92356cb5386c06544ab082a9a468c7 WHIRLPOOL 1648ee1be71e45fcf5a264816ce7edc7bab19bd28a68703923eb2d6068f1f0469ae593855231d31f88baecbf29e7cece2d6beeed20b7c04231a6c90e90d35910
 DIST patchbundle-selinux-base-policy-2.20141203-r8.tar.bz2 297919 SHA256 77539eb3d78105f8789cd8205d2698bd27e2abf100163bdd162cda860fd15120 SHA512 2f8a19e1e4bb65f32b480275f49099aed3ae9df543c7de862b3bbd93e81b89cd96dadac3d091e28673d09a6885db8c5656b3a77d0080775c110b04f2753de7a6 WHIRLPOOL 79cb7e620eb8e838192dc557c7a9ce7e713227d783cc8b63792825559b2145cad70d0af6f99948c1527557bc363feffd846c73893682b4a14fc7d08b9e20c649
+DIST patchbundle-selinux-base-policy-2.20141203-r9.tar.bz2 299602 SHA256 e8518004942a6c57170a609683e22b1410c93a2a195829c41dc8fbc703d941b5 SHA512 ce6484fbca1d2d074e50d1a3953392bd3ce0a4617df98fbac37747b469b4f160a9331586dfe1c3ddccb1ccbee24876a2f05ab49e37c8492a48baf83c2d01d140 WHIRLPOOL 1fd7b956e98e95a64c3a713a944d4531259bd156a7feabf6a89c4b5f33ac846377730eede97889e85183be086f282ebd18e860214f6ca3f01b40f2323470ee04
 DIST refpolicy-2.20140311.tar.bz2 664416 SHA256 f69437db95548c78a5dec44c236397146b144153149009ea554d2e536e5436f7 SHA512 50bacee82ed41ac8b8007ecc33bf51d22303cc2ddd27cfb72cb5520dab5f8e255186e34b89cec492c7a2d4220b200814bdede9b46c19f987a3d3d65a1c9b749a WHIRLPOOL e07480beba6ab1f02ad36b7d0c50c4a71cb39a8ec78bf8d1dc3c82bb9dd1d69d9169d7c937165ea15f60ce1147f256d46644f944107a3a8a800d5bad70d4c255
 DIST refpolicy-2.20141203.tar.bz2 680243 SHA256 f438209c430d8a2d4ddcbe4bdd3edb46f6af7dc4913637af0b73c635e40c1522 SHA512 682e4280c5799e4c12ec7594afc1389f67be35055748d2e0dbdc3419159a16c96d4946ca6178daee8370515951f8653b2e452efe8c962b8d7f9bc192f0b15a0c WHIRLPOOL 74bca232534e7af9051bb1ab9f77c1ff6c425781cf4561f781d6e9a40cc5ca0d9add540249ea5493e8782a9372aea296ead6c165c6c440ae1509eb319d151ee5
diff --git a/sec-policy/selinux-stunnel/selinux-stunnel-2.20141203-r8.ebuild b/sec-policy/selinux-stunnel/selinux-stunnel-2.20141203-r8.ebuild
index 0b804bf71053..a260ae363578 100644
--- a/sec-policy/selinux-stunnel/selinux-stunnel-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-stunnel/selinux-stunnel-2.20141203-r8.ebuild
@@ -13,5 +13,5 @@ DESCRIPTION="SELinux policy for stunnel"
 if [[ $PV == 9999* ]] ; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-stunnel/selinux-stunnel-2.20141203-r9.ebuild b/sec-policy/selinux-stunnel/selinux-stunnel-2.20141203-r9.ebuild
new file mode 100644
index 000000000000..0b804bf71053
--- /dev/null
+++ b/sec-policy/selinux-stunnel/selinux-stunnel-2.20141203-r9.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI="5"
+
+IUSE=""
+MODS="stunnel"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for stunnel"
+
+if [[ $PV == 9999* ]] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
diff --git a/sec-policy/selinux-subsonic/Manifest b/sec-policy/selinux-subsonic/Manifest
index 557ae6e25780..673f22620a6d 100644
--- a/sec-policy/selinux-subsonic/Manifest
+++ b/sec-policy/selinux-subsonic/Manifest
@@ -1,2 +1,3 @@
 DIST patchbundle-selinux-base-policy-2.20141203-r8.tar.bz2 297919 SHA256 77539eb3d78105f8789cd8205d2698bd27e2abf100163bdd162cda860fd15120 SHA512 2f8a19e1e4bb65f32b480275f49099aed3ae9df543c7de862b3bbd93e81b89cd96dadac3d091e28673d09a6885db8c5656b3a77d0080775c110b04f2753de7a6 WHIRLPOOL 79cb7e620eb8e838192dc557c7a9ce7e713227d783cc8b63792825559b2145cad70d0af6f99948c1527557bc363feffd846c73893682b4a14fc7d08b9e20c649
+DIST patchbundle-selinux-base-policy-2.20141203-r9.tar.bz2 299602 SHA256 e8518004942a6c57170a609683e22b1410c93a2a195829c41dc8fbc703d941b5 SHA512 ce6484fbca1d2d074e50d1a3953392bd3ce0a4617df98fbac37747b469b4f160a9331586dfe1c3ddccb1ccbee24876a2f05ab49e37c8492a48baf83c2d01d140 WHIRLPOOL 1fd7b956e98e95a64c3a713a944d4531259bd156a7feabf6a89c4b5f33ac846377730eede97889e85183be086f282ebd18e860214f6ca3f01b40f2323470ee04
 DIST refpolicy-2.20141203.tar.bz2 680243 SHA256 f438209c430d8a2d4ddcbe4bdd3edb46f6af7dc4913637af0b73c635e40c1522 SHA512 682e4280c5799e4c12ec7594afc1389f67be35055748d2e0dbdc3419159a16c96d4946ca6178daee8370515951f8653b2e452efe8c962b8d7f9bc192f0b15a0c WHIRLPOOL 74bca232534e7af9051bb1ab9f77c1ff6c425781cf4561f781d6e9a40cc5ca0d9add540249ea5493e8782a9372aea296ead6c165c6c440ae1509eb319d151ee5
diff --git a/sec-policy/selinux-subsonic/selinux-subsonic-2.20141203-r8.ebuild b/sec-policy/selinux-subsonic/selinux-subsonic-2.20141203-r8.ebuild
index 48141a7964b1..0ef6b968e5dc 100644
--- a/sec-policy/selinux-subsonic/selinux-subsonic-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-subsonic/selinux-subsonic-2.20141203-r8.ebuild
@@ -13,5 +13,5 @@ DESCRIPTION="SELinux policy for subsonic"
 if [[ $PV == 9999* ]] ; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-subsonic/selinux-subsonic-2.20141203-r9.ebuild b/sec-policy/selinux-subsonic/selinux-subsonic-2.20141203-r9.ebuild
new file mode 100644
index 000000000000..48141a7964b1
--- /dev/null
+++ b/sec-policy/selinux-subsonic/selinux-subsonic-2.20141203-r9.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI="5"
+
+IUSE=""
+MODS="subsonic"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for subsonic"
+
+if [[ $PV == 9999* ]] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
diff --git a/sec-policy/selinux-sudo/Manifest b/sec-policy/selinux-sudo/Manifest
index 8327a635be01..91d204b0021a 100644
--- a/sec-policy/selinux-sudo/Manifest
+++ b/sec-policy/selinux-sudo/Manifest
@@ -9,5 +9,6 @@ DIST patchbundle-selinux-base-policy-2.20141203-r5.tar.bz2 274136 SHA256 c23d17c
 DIST patchbundle-selinux-base-policy-2.20141203-r6.tar.bz2 293231 SHA256 b686dcc517b97834f66d967afdcc724cb43b5c6dbf9f34043a91cdeda2625cc7 SHA512 a2c486cbe4a1d21ff3fd01bef25ecf5a633a4072646c67cfccf3f7187d95f3d9e3b482a46ba17c55c40a8e7c0dee56e9cf9ddc9f414d3e4511443b62f60d03e9 WHIRLPOOL 3d708e287e3f9b873be647b0327eab6675a8702ee1cffb56e36934cada306e5ccc64397a083dad9e59de37a067e628cacbf896ae99012d5a209e42fd7cd8a4c6
 DIST patchbundle-selinux-base-policy-2.20141203-r7.tar.bz2 295833 SHA256 ba2219b3efc747be65f94c4d8ac3cd6ee530c82c848fa41935a114184678622a SHA512 8e32d9dbfb2f0f3f50200543aadb51ed9834ccd5cdf30bf8e4d9e6d0b645ce44ffaf80f7aa9385e9c9095d9a383b3a348a92356cb5386c06544ab082a9a468c7 WHIRLPOOL 1648ee1be71e45fcf5a264816ce7edc7bab19bd28a68703923eb2d6068f1f0469ae593855231d31f88baecbf29e7cece2d6beeed20b7c04231a6c90e90d35910
 DIST patchbundle-selinux-base-policy-2.20141203-r8.tar.bz2 297919 SHA256 77539eb3d78105f8789cd8205d2698bd27e2abf100163bdd162cda860fd15120 SHA512 2f8a19e1e4bb65f32b480275f49099aed3ae9df543c7de862b3bbd93e81b89cd96dadac3d091e28673d09a6885db8c5656b3a77d0080775c110b04f2753de7a6 WHIRLPOOL 79cb7e620eb8e838192dc557c7a9ce7e713227d783cc8b63792825559b2145cad70d0af6f99948c1527557bc363feffd846c73893682b4a14fc7d08b9e20c649
+DIST patchbundle-selinux-base-policy-2.20141203-r9.tar.bz2 299602 SHA256 e8518004942a6c57170a609683e22b1410c93a2a195829c41dc8fbc703d941b5 SHA512 ce6484fbca1d2d074e50d1a3953392bd3ce0a4617df98fbac37747b469b4f160a9331586dfe1c3ddccb1ccbee24876a2f05ab49e37c8492a48baf83c2d01d140 WHIRLPOOL 1fd7b956e98e95a64c3a713a944d4531259bd156a7feabf6a89c4b5f33ac846377730eede97889e85183be086f282ebd18e860214f6ca3f01b40f2323470ee04
 DIST refpolicy-2.20140311.tar.bz2 664416 SHA256 f69437db95548c78a5dec44c236397146b144153149009ea554d2e536e5436f7 SHA512 50bacee82ed41ac8b8007ecc33bf51d22303cc2ddd27cfb72cb5520dab5f8e255186e34b89cec492c7a2d4220b200814bdede9b46c19f987a3d3d65a1c9b749a WHIRLPOOL e07480beba6ab1f02ad36b7d0c50c4a71cb39a8ec78bf8d1dc3c82bb9dd1d69d9169d7c937165ea15f60ce1147f256d46644f944107a3a8a800d5bad70d4c255
 DIST refpolicy-2.20141203.tar.bz2 680243 SHA256 f438209c430d8a2d4ddcbe4bdd3edb46f6af7dc4913637af0b73c635e40c1522 SHA512 682e4280c5799e4c12ec7594afc1389f67be35055748d2e0dbdc3419159a16c96d4946ca6178daee8370515951f8653b2e452efe8c962b8d7f9bc192f0b15a0c WHIRLPOOL 74bca232534e7af9051bb1ab9f77c1ff6c425781cf4561f781d6e9a40cc5ca0d9add540249ea5493e8782a9372aea296ead6c165c6c440ae1509eb319d151ee5
diff --git a/sec-policy/selinux-sudo/selinux-sudo-2.20141203-r8.ebuild b/sec-policy/selinux-sudo/selinux-sudo-2.20141203-r8.ebuild
index 021969afe9ea..29d1d8e53e7c 100644
--- a/sec-policy/selinux-sudo/selinux-sudo-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-sudo/selinux-sudo-2.20141203-r8.ebuild
@@ -13,5 +13,5 @@ DESCRIPTION="SELinux policy for sudo"
 if [[ $PV == 9999* ]] ; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-sudo/selinux-sudo-2.20141203-r9.ebuild b/sec-policy/selinux-sudo/selinux-sudo-2.20141203-r9.ebuild
new file mode 100644
index 000000000000..021969afe9ea
--- /dev/null
+++ b/sec-policy/selinux-sudo/selinux-sudo-2.20141203-r9.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI="5"
+
+IUSE=""
+MODS="sudo"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for sudo"
+
+if [[ $PV == 9999* ]] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
diff --git a/sec-policy/selinux-sxid/Manifest b/sec-policy/selinux-sxid/Manifest
index 8327a635be01..91d204b0021a 100644
--- a/sec-policy/selinux-sxid/Manifest
+++ b/sec-policy/selinux-sxid/Manifest
@@ -9,5 +9,6 @@ DIST patchbundle-selinux-base-policy-2.20141203-r5.tar.bz2 274136 SHA256 c23d17c
 DIST patchbundle-selinux-base-policy-2.20141203-r6.tar.bz2 293231 SHA256 b686dcc517b97834f66d967afdcc724cb43b5c6dbf9f34043a91cdeda2625cc7 SHA512 a2c486cbe4a1d21ff3fd01bef25ecf5a633a4072646c67cfccf3f7187d95f3d9e3b482a46ba17c55c40a8e7c0dee56e9cf9ddc9f414d3e4511443b62f60d03e9 WHIRLPOOL 3d708e287e3f9b873be647b0327eab6675a8702ee1cffb56e36934cada306e5ccc64397a083dad9e59de37a067e628cacbf896ae99012d5a209e42fd7cd8a4c6
 DIST patchbundle-selinux-base-policy-2.20141203-r7.tar.bz2 295833 SHA256 ba2219b3efc747be65f94c4d8ac3cd6ee530c82c848fa41935a114184678622a SHA512 8e32d9dbfb2f0f3f50200543aadb51ed9834ccd5cdf30bf8e4d9e6d0b645ce44ffaf80f7aa9385e9c9095d9a383b3a348a92356cb5386c06544ab082a9a468c7 WHIRLPOOL 1648ee1be71e45fcf5a264816ce7edc7bab19bd28a68703923eb2d6068f1f0469ae593855231d31f88baecbf29e7cece2d6beeed20b7c04231a6c90e90d35910
 DIST patchbundle-selinux-base-policy-2.20141203-r8.tar.bz2 297919 SHA256 77539eb3d78105f8789cd8205d2698bd27e2abf100163bdd162cda860fd15120 SHA512 2f8a19e1e4bb65f32b480275f49099aed3ae9df543c7de862b3bbd93e81b89cd96dadac3d091e28673d09a6885db8c5656b3a77d0080775c110b04f2753de7a6 WHIRLPOOL 79cb7e620eb8e838192dc557c7a9ce7e713227d783cc8b63792825559b2145cad70d0af6f99948c1527557bc363feffd846c73893682b4a14fc7d08b9e20c649
+DIST patchbundle-selinux-base-policy-2.20141203-r9.tar.bz2 299602 SHA256 e8518004942a6c57170a609683e22b1410c93a2a195829c41dc8fbc703d941b5 SHA512 ce6484fbca1d2d074e50d1a3953392bd3ce0a4617df98fbac37747b469b4f160a9331586dfe1c3ddccb1ccbee24876a2f05ab49e37c8492a48baf83c2d01d140 WHIRLPOOL 1fd7b956e98e95a64c3a713a944d4531259bd156a7feabf6a89c4b5f33ac846377730eede97889e85183be086f282ebd18e860214f6ca3f01b40f2323470ee04
 DIST refpolicy-2.20140311.tar.bz2 664416 SHA256 f69437db95548c78a5dec44c236397146b144153149009ea554d2e536e5436f7 SHA512 50bacee82ed41ac8b8007ecc33bf51d22303cc2ddd27cfb72cb5520dab5f8e255186e34b89cec492c7a2d4220b200814bdede9b46c19f987a3d3d65a1c9b749a WHIRLPOOL e07480beba6ab1f02ad36b7d0c50c4a71cb39a8ec78bf8d1dc3c82bb9dd1d69d9169d7c937165ea15f60ce1147f256d46644f944107a3a8a800d5bad70d4c255
 DIST refpolicy-2.20141203.tar.bz2 680243 SHA256 f438209c430d8a2d4ddcbe4bdd3edb46f6af7dc4913637af0b73c635e40c1522 SHA512 682e4280c5799e4c12ec7594afc1389f67be35055748d2e0dbdc3419159a16c96d4946ca6178daee8370515951f8653b2e452efe8c962b8d7f9bc192f0b15a0c WHIRLPOOL 74bca232534e7af9051bb1ab9f77c1ff6c425781cf4561f781d6e9a40cc5ca0d9add540249ea5493e8782a9372aea296ead6c165c6c440ae1509eb319d151ee5
diff --git a/sec-policy/selinux-sxid/selinux-sxid-2.20141203-r8.ebuild b/sec-policy/selinux-sxid/selinux-sxid-2.20141203-r8.ebuild
index c5d7b5cedf5a..a609d52d25fe 100644
--- a/sec-policy/selinux-sxid/selinux-sxid-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-sxid/selinux-sxid-2.20141203-r8.ebuild
@@ -13,5 +13,5 @@ DESCRIPTION="SELinux policy for sxid"
 if [[ $PV == 9999* ]] ; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-sxid/selinux-sxid-2.20141203-r9.ebuild b/sec-policy/selinux-sxid/selinux-sxid-2.20141203-r9.ebuild
new file mode 100644
index 000000000000..c5d7b5cedf5a
--- /dev/null
+++ b/sec-policy/selinux-sxid/selinux-sxid-2.20141203-r9.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI="5"
+
+IUSE=""
+MODS="sxid"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for sxid"
+
+if [[ $PV == 9999* ]] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
diff --git a/sec-policy/selinux-sysstat/Manifest b/sec-policy/selinux-sysstat/Manifest
index 8327a635be01..91d204b0021a 100644
--- a/sec-policy/selinux-sysstat/Manifest
+++ b/sec-policy/selinux-sysstat/Manifest
@@ -9,5 +9,6 @@ DIST patchbundle-selinux-base-policy-2.20141203-r5.tar.bz2 274136 SHA256 c23d17c
 DIST patchbundle-selinux-base-policy-2.20141203-r6.tar.bz2 293231 SHA256 b686dcc517b97834f66d967afdcc724cb43b5c6dbf9f34043a91cdeda2625cc7 SHA512 a2c486cbe4a1d21ff3fd01bef25ecf5a633a4072646c67cfccf3f7187d95f3d9e3b482a46ba17c55c40a8e7c0dee56e9cf9ddc9f414d3e4511443b62f60d03e9 WHIRLPOOL 3d708e287e3f9b873be647b0327eab6675a8702ee1cffb56e36934cada306e5ccc64397a083dad9e59de37a067e628cacbf896ae99012d5a209e42fd7cd8a4c6
 DIST patchbundle-selinux-base-policy-2.20141203-r7.tar.bz2 295833 SHA256 ba2219b3efc747be65f94c4d8ac3cd6ee530c82c848fa41935a114184678622a SHA512 8e32d9dbfb2f0f3f50200543aadb51ed9834ccd5cdf30bf8e4d9e6d0b645ce44ffaf80f7aa9385e9c9095d9a383b3a348a92356cb5386c06544ab082a9a468c7 WHIRLPOOL 1648ee1be71e45fcf5a264816ce7edc7bab19bd28a68703923eb2d6068f1f0469ae593855231d31f88baecbf29e7cece2d6beeed20b7c04231a6c90e90d35910
 DIST patchbundle-selinux-base-policy-2.20141203-r8.tar.bz2 297919 SHA256 77539eb3d78105f8789cd8205d2698bd27e2abf100163bdd162cda860fd15120 SHA512 2f8a19e1e4bb65f32b480275f49099aed3ae9df543c7de862b3bbd93e81b89cd96dadac3d091e28673d09a6885db8c5656b3a77d0080775c110b04f2753de7a6 WHIRLPOOL 79cb7e620eb8e838192dc557c7a9ce7e713227d783cc8b63792825559b2145cad70d0af6f99948c1527557bc363feffd846c73893682b4a14fc7d08b9e20c649
+DIST patchbundle-selinux-base-policy-2.20141203-r9.tar.bz2 299602 SHA256 e8518004942a6c57170a609683e22b1410c93a2a195829c41dc8fbc703d941b5 SHA512 ce6484fbca1d2d074e50d1a3953392bd3ce0a4617df98fbac37747b469b4f160a9331586dfe1c3ddccb1ccbee24876a2f05ab49e37c8492a48baf83c2d01d140 WHIRLPOOL 1fd7b956e98e95a64c3a713a944d4531259bd156a7feabf6a89c4b5f33ac846377730eede97889e85183be086f282ebd18e860214f6ca3f01b40f2323470ee04
 DIST refpolicy-2.20140311.tar.bz2 664416 SHA256 f69437db95548c78a5dec44c236397146b144153149009ea554d2e536e5436f7 SHA512 50bacee82ed41ac8b8007ecc33bf51d22303cc2ddd27cfb72cb5520dab5f8e255186e34b89cec492c7a2d4220b200814bdede9b46c19f987a3d3d65a1c9b749a WHIRLPOOL e07480beba6ab1f02ad36b7d0c50c4a71cb39a8ec78bf8d1dc3c82bb9dd1d69d9169d7c937165ea15f60ce1147f256d46644f944107a3a8a800d5bad70d4c255
 DIST refpolicy-2.20141203.tar.bz2 680243 SHA256 f438209c430d8a2d4ddcbe4bdd3edb46f6af7dc4913637af0b73c635e40c1522 SHA512 682e4280c5799e4c12ec7594afc1389f67be35055748d2e0dbdc3419159a16c96d4946ca6178daee8370515951f8653b2e452efe8c962b8d7f9bc192f0b15a0c WHIRLPOOL 74bca232534e7af9051bb1ab9f77c1ff6c425781cf4561f781d6e9a40cc5ca0d9add540249ea5493e8782a9372aea296ead6c165c6c440ae1509eb319d151ee5
diff --git a/sec-policy/selinux-sysstat/selinux-sysstat-2.20141203-r8.ebuild b/sec-policy/selinux-sysstat/selinux-sysstat-2.20141203-r8.ebuild
index ea3bff72efda..c0c1d963342e 100644
--- a/sec-policy/selinux-sysstat/selinux-sysstat-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-sysstat/selinux-sysstat-2.20141203-r8.ebuild
@@ -13,5 +13,5 @@ DESCRIPTION="SELinux policy for sysstat"
 if [[ $PV == 9999* ]] ; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-sysstat/selinux-sysstat-2.20141203-r9.ebuild b/sec-policy/selinux-sysstat/selinux-sysstat-2.20141203-r9.ebuild
new file mode 100644
index 000000000000..ea3bff72efda
--- /dev/null
+++ b/sec-policy/selinux-sysstat/selinux-sysstat-2.20141203-r9.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI="5"
+
+IUSE=""
+MODS="sysstat"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for sysstat"
+
+if [[ $PV == 9999* ]] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
diff --git a/sec-policy/selinux-tcpd/Manifest b/sec-policy/selinux-tcpd/Manifest
index 8327a635be01..91d204b0021a 100644
--- a/sec-policy/selinux-tcpd/Manifest
+++ b/sec-policy/selinux-tcpd/Manifest
@@ -9,5 +9,6 @@ DIST patchbundle-selinux-base-policy-2.20141203-r5.tar.bz2 274136 SHA256 c23d17c
 DIST patchbundle-selinux-base-policy-2.20141203-r6.tar.bz2 293231 SHA256 b686dcc517b97834f66d967afdcc724cb43b5c6dbf9f34043a91cdeda2625cc7 SHA512 a2c486cbe4a1d21ff3fd01bef25ecf5a633a4072646c67cfccf3f7187d95f3d9e3b482a46ba17c55c40a8e7c0dee56e9cf9ddc9f414d3e4511443b62f60d03e9 WHIRLPOOL 3d708e287e3f9b873be647b0327eab6675a8702ee1cffb56e36934cada306e5ccc64397a083dad9e59de37a067e628cacbf896ae99012d5a209e42fd7cd8a4c6
 DIST patchbundle-selinux-base-policy-2.20141203-r7.tar.bz2 295833 SHA256 ba2219b3efc747be65f94c4d8ac3cd6ee530c82c848fa41935a114184678622a SHA512 8e32d9dbfb2f0f3f50200543aadb51ed9834ccd5cdf30bf8e4d9e6d0b645ce44ffaf80f7aa9385e9c9095d9a383b3a348a92356cb5386c06544ab082a9a468c7 WHIRLPOOL 1648ee1be71e45fcf5a264816ce7edc7bab19bd28a68703923eb2d6068f1f0469ae593855231d31f88baecbf29e7cece2d6beeed20b7c04231a6c90e90d35910
 DIST patchbundle-selinux-base-policy-2.20141203-r8.tar.bz2 297919 SHA256 77539eb3d78105f8789cd8205d2698bd27e2abf100163bdd162cda860fd15120 SHA512 2f8a19e1e4bb65f32b480275f49099aed3ae9df543c7de862b3bbd93e81b89cd96dadac3d091e28673d09a6885db8c5656b3a77d0080775c110b04f2753de7a6 WHIRLPOOL 79cb7e620eb8e838192dc557c7a9ce7e713227d783cc8b63792825559b2145cad70d0af6f99948c1527557bc363feffd846c73893682b4a14fc7d08b9e20c649
+DIST patchbundle-selinux-base-policy-2.20141203-r9.tar.bz2 299602 SHA256 e8518004942a6c57170a609683e22b1410c93a2a195829c41dc8fbc703d941b5 SHA512 ce6484fbca1d2d074e50d1a3953392bd3ce0a4617df98fbac37747b469b4f160a9331586dfe1c3ddccb1ccbee24876a2f05ab49e37c8492a48baf83c2d01d140 WHIRLPOOL 1fd7b956e98e95a64c3a713a944d4531259bd156a7feabf6a89c4b5f33ac846377730eede97889e85183be086f282ebd18e860214f6ca3f01b40f2323470ee04
 DIST refpolicy-2.20140311.tar.bz2 664416 SHA256 f69437db95548c78a5dec44c236397146b144153149009ea554d2e536e5436f7 SHA512 50bacee82ed41ac8b8007ecc33bf51d22303cc2ddd27cfb72cb5520dab5f8e255186e34b89cec492c7a2d4220b200814bdede9b46c19f987a3d3d65a1c9b749a WHIRLPOOL e07480beba6ab1f02ad36b7d0c50c4a71cb39a8ec78bf8d1dc3c82bb9dd1d69d9169d7c937165ea15f60ce1147f256d46644f944107a3a8a800d5bad70d4c255
 DIST refpolicy-2.20141203.tar.bz2 680243 SHA256 f438209c430d8a2d4ddcbe4bdd3edb46f6af7dc4913637af0b73c635e40c1522 SHA512 682e4280c5799e4c12ec7594afc1389f67be35055748d2e0dbdc3419159a16c96d4946ca6178daee8370515951f8653b2e452efe8c962b8d7f9bc192f0b15a0c WHIRLPOOL 74bca232534e7af9051bb1ab9f77c1ff6c425781cf4561f781d6e9a40cc5ca0d9add540249ea5493e8782a9372aea296ead6c165c6c440ae1509eb319d151ee5
diff --git a/sec-policy/selinux-tcpd/selinux-tcpd-2.20141203-r8.ebuild b/sec-policy/selinux-tcpd/selinux-tcpd-2.20141203-r8.ebuild
index bbd9221a5af7..55667d582022 100644
--- a/sec-policy/selinux-tcpd/selinux-tcpd-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-tcpd/selinux-tcpd-2.20141203-r8.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="SELinux policy for tcpd"
 if [[ $PV == 9999* ]] ; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-inetd
diff --git a/sec-policy/selinux-tcpd/selinux-tcpd-2.20141203-r9.ebuild b/sec-policy/selinux-tcpd/selinux-tcpd-2.20141203-r9.ebuild
new file mode 100644
index 000000000000..bbd9221a5af7
--- /dev/null
+++ b/sec-policy/selinux-tcpd/selinux-tcpd-2.20141203-r9.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI="5"
+
+IUSE=""
+MODS="tcpd"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for tcpd"
+
+if [[ $PV == 9999* ]] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
+DEPEND="${DEPEND}
+	sec-policy/selinux-inetd
+"
+RDEPEND="${RDEPEND}
+	sec-policy/selinux-inetd
+"
diff --git a/sec-policy/selinux-tcsd/Manifest b/sec-policy/selinux-tcsd/Manifest
index 8327a635be01..91d204b0021a 100644
--- a/sec-policy/selinux-tcsd/Manifest
+++ b/sec-policy/selinux-tcsd/Manifest
@@ -9,5 +9,6 @@ DIST patchbundle-selinux-base-policy-2.20141203-r5.tar.bz2 274136 SHA256 c23d17c
 DIST patchbundle-selinux-base-policy-2.20141203-r6.tar.bz2 293231 SHA256 b686dcc517b97834f66d967afdcc724cb43b5c6dbf9f34043a91cdeda2625cc7 SHA512 a2c486cbe4a1d21ff3fd01bef25ecf5a633a4072646c67cfccf3f7187d95f3d9e3b482a46ba17c55c40a8e7c0dee56e9cf9ddc9f414d3e4511443b62f60d03e9 WHIRLPOOL 3d708e287e3f9b873be647b0327eab6675a8702ee1cffb56e36934cada306e5ccc64397a083dad9e59de37a067e628cacbf896ae99012d5a209e42fd7cd8a4c6
 DIST patchbundle-selinux-base-policy-2.20141203-r7.tar.bz2 295833 SHA256 ba2219b3efc747be65f94c4d8ac3cd6ee530c82c848fa41935a114184678622a SHA512 8e32d9dbfb2f0f3f50200543aadb51ed9834ccd5cdf30bf8e4d9e6d0b645ce44ffaf80f7aa9385e9c9095d9a383b3a348a92356cb5386c06544ab082a9a468c7 WHIRLPOOL 1648ee1be71e45fcf5a264816ce7edc7bab19bd28a68703923eb2d6068f1f0469ae593855231d31f88baecbf29e7cece2d6beeed20b7c04231a6c90e90d35910
 DIST patchbundle-selinux-base-policy-2.20141203-r8.tar.bz2 297919 SHA256 77539eb3d78105f8789cd8205d2698bd27e2abf100163bdd162cda860fd15120 SHA512 2f8a19e1e4bb65f32b480275f49099aed3ae9df543c7de862b3bbd93e81b89cd96dadac3d091e28673d09a6885db8c5656b3a77d0080775c110b04f2753de7a6 WHIRLPOOL 79cb7e620eb8e838192dc557c7a9ce7e713227d783cc8b63792825559b2145cad70d0af6f99948c1527557bc363feffd846c73893682b4a14fc7d08b9e20c649
+DIST patchbundle-selinux-base-policy-2.20141203-r9.tar.bz2 299602 SHA256 e8518004942a6c57170a609683e22b1410c93a2a195829c41dc8fbc703d941b5 SHA512 ce6484fbca1d2d074e50d1a3953392bd3ce0a4617df98fbac37747b469b4f160a9331586dfe1c3ddccb1ccbee24876a2f05ab49e37c8492a48baf83c2d01d140 WHIRLPOOL 1fd7b956e98e95a64c3a713a944d4531259bd156a7feabf6a89c4b5f33ac846377730eede97889e85183be086f282ebd18e860214f6ca3f01b40f2323470ee04
 DIST refpolicy-2.20140311.tar.bz2 664416 SHA256 f69437db95548c78a5dec44c236397146b144153149009ea554d2e536e5436f7 SHA512 50bacee82ed41ac8b8007ecc33bf51d22303cc2ddd27cfb72cb5520dab5f8e255186e34b89cec492c7a2d4220b200814bdede9b46c19f987a3d3d65a1c9b749a WHIRLPOOL e07480beba6ab1f02ad36b7d0c50c4a71cb39a8ec78bf8d1dc3c82bb9dd1d69d9169d7c937165ea15f60ce1147f256d46644f944107a3a8a800d5bad70d4c255
 DIST refpolicy-2.20141203.tar.bz2 680243 SHA256 f438209c430d8a2d4ddcbe4bdd3edb46f6af7dc4913637af0b73c635e40c1522 SHA512 682e4280c5799e4c12ec7594afc1389f67be35055748d2e0dbdc3419159a16c96d4946ca6178daee8370515951f8653b2e452efe8c962b8d7f9bc192f0b15a0c WHIRLPOOL 74bca232534e7af9051bb1ab9f77c1ff6c425781cf4561f781d6e9a40cc5ca0d9add540249ea5493e8782a9372aea296ead6c165c6c440ae1509eb319d151ee5
diff --git a/sec-policy/selinux-tcsd/selinux-tcsd-2.20141203-r8.ebuild b/sec-policy/selinux-tcsd/selinux-tcsd-2.20141203-r8.ebuild
index ba6ee03492f6..ccabdb886964 100644
--- a/sec-policy/selinux-tcsd/selinux-tcsd-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-tcsd/selinux-tcsd-2.20141203-r8.ebuild
@@ -13,5 +13,5 @@ DESCRIPTION="SELinux policy for tcsd"
 if [[ $PV == 9999* ]] ; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-tcsd/selinux-tcsd-2.20141203-r9.ebuild b/sec-policy/selinux-tcsd/selinux-tcsd-2.20141203-r9.ebuild
new file mode 100644
index 000000000000..ba6ee03492f6
--- /dev/null
+++ b/sec-policy/selinux-tcsd/selinux-tcsd-2.20141203-r9.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI="5"
+
+IUSE=""
+MODS="tcsd"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for tcsd"
+
+if [[ $PV == 9999* ]] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
diff --git a/sec-policy/selinux-telnet/Manifest b/sec-policy/selinux-telnet/Manifest
index 8327a635be01..91d204b0021a 100644
--- a/sec-policy/selinux-telnet/Manifest
+++ b/sec-policy/selinux-telnet/Manifest
@@ -9,5 +9,6 @@ DIST patchbundle-selinux-base-policy-2.20141203-r5.tar.bz2 274136 SHA256 c23d17c
 DIST patchbundle-selinux-base-policy-2.20141203-r6.tar.bz2 293231 SHA256 b686dcc517b97834f66d967afdcc724cb43b5c6dbf9f34043a91cdeda2625cc7 SHA512 a2c486cbe4a1d21ff3fd01bef25ecf5a633a4072646c67cfccf3f7187d95f3d9e3b482a46ba17c55c40a8e7c0dee56e9cf9ddc9f414d3e4511443b62f60d03e9 WHIRLPOOL 3d708e287e3f9b873be647b0327eab6675a8702ee1cffb56e36934cada306e5ccc64397a083dad9e59de37a067e628cacbf896ae99012d5a209e42fd7cd8a4c6
 DIST patchbundle-selinux-base-policy-2.20141203-r7.tar.bz2 295833 SHA256 ba2219b3efc747be65f94c4d8ac3cd6ee530c82c848fa41935a114184678622a SHA512 8e32d9dbfb2f0f3f50200543aadb51ed9834ccd5cdf30bf8e4d9e6d0b645ce44ffaf80f7aa9385e9c9095d9a383b3a348a92356cb5386c06544ab082a9a468c7 WHIRLPOOL 1648ee1be71e45fcf5a264816ce7edc7bab19bd28a68703923eb2d6068f1f0469ae593855231d31f88baecbf29e7cece2d6beeed20b7c04231a6c90e90d35910
 DIST patchbundle-selinux-base-policy-2.20141203-r8.tar.bz2 297919 SHA256 77539eb3d78105f8789cd8205d2698bd27e2abf100163bdd162cda860fd15120 SHA512 2f8a19e1e4bb65f32b480275f49099aed3ae9df543c7de862b3bbd93e81b89cd96dadac3d091e28673d09a6885db8c5656b3a77d0080775c110b04f2753de7a6 WHIRLPOOL 79cb7e620eb8e838192dc557c7a9ce7e713227d783cc8b63792825559b2145cad70d0af6f99948c1527557bc363feffd846c73893682b4a14fc7d08b9e20c649
+DIST patchbundle-selinux-base-policy-2.20141203-r9.tar.bz2 299602 SHA256 e8518004942a6c57170a609683e22b1410c93a2a195829c41dc8fbc703d941b5 SHA512 ce6484fbca1d2d074e50d1a3953392bd3ce0a4617df98fbac37747b469b4f160a9331586dfe1c3ddccb1ccbee24876a2f05ab49e37c8492a48baf83c2d01d140 WHIRLPOOL 1fd7b956e98e95a64c3a713a944d4531259bd156a7feabf6a89c4b5f33ac846377730eede97889e85183be086f282ebd18e860214f6ca3f01b40f2323470ee04
 DIST refpolicy-2.20140311.tar.bz2 664416 SHA256 f69437db95548c78a5dec44c236397146b144153149009ea554d2e536e5436f7 SHA512 50bacee82ed41ac8b8007ecc33bf51d22303cc2ddd27cfb72cb5520dab5f8e255186e34b89cec492c7a2d4220b200814bdede9b46c19f987a3d3d65a1c9b749a WHIRLPOOL e07480beba6ab1f02ad36b7d0c50c4a71cb39a8ec78bf8d1dc3c82bb9dd1d69d9169d7c937165ea15f60ce1147f256d46644f944107a3a8a800d5bad70d4c255
 DIST refpolicy-2.20141203.tar.bz2 680243 SHA256 f438209c430d8a2d4ddcbe4bdd3edb46f6af7dc4913637af0b73c635e40c1522 SHA512 682e4280c5799e4c12ec7594afc1389f67be35055748d2e0dbdc3419159a16c96d4946ca6178daee8370515951f8653b2e452efe8c962b8d7f9bc192f0b15a0c WHIRLPOOL 74bca232534e7af9051bb1ab9f77c1ff6c425781cf4561f781d6e9a40cc5ca0d9add540249ea5493e8782a9372aea296ead6c165c6c440ae1509eb319d151ee5
diff --git a/sec-policy/selinux-telnet/selinux-telnet-2.20141203-r8.ebuild b/sec-policy/selinux-telnet/selinux-telnet-2.20141203-r8.ebuild
index f2ea1a6896ad..25ebc0513c4d 100644
--- a/sec-policy/selinux-telnet/selinux-telnet-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-telnet/selinux-telnet-2.20141203-r8.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="SELinux policy for telnet"
 if [[ $PV == 9999* ]] ; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-remotelogin
diff --git a/sec-policy/selinux-telnet/selinux-telnet-2.20141203-r9.ebuild b/sec-policy/selinux-telnet/selinux-telnet-2.20141203-r9.ebuild
new file mode 100644
index 000000000000..f2ea1a6896ad
--- /dev/null
+++ b/sec-policy/selinux-telnet/selinux-telnet-2.20141203-r9.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI="5"
+
+IUSE=""
+MODS="telnet"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for telnet"
+
+if [[ $PV == 9999* ]] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
+DEPEND="${DEPEND}
+	sec-policy/selinux-remotelogin
+"
+RDEPEND="${RDEPEND}
+	sec-policy/selinux-remotelogin
+"
diff --git a/sec-policy/selinux-tftp/Manifest b/sec-policy/selinux-tftp/Manifest
index 8327a635be01..91d204b0021a 100644
--- a/sec-policy/selinux-tftp/Manifest
+++ b/sec-policy/selinux-tftp/Manifest
@@ -9,5 +9,6 @@ DIST patchbundle-selinux-base-policy-2.20141203-r5.tar.bz2 274136 SHA256 c23d17c
 DIST patchbundle-selinux-base-policy-2.20141203-r6.tar.bz2 293231 SHA256 b686dcc517b97834f66d967afdcc724cb43b5c6dbf9f34043a91cdeda2625cc7 SHA512 a2c486cbe4a1d21ff3fd01bef25ecf5a633a4072646c67cfccf3f7187d95f3d9e3b482a46ba17c55c40a8e7c0dee56e9cf9ddc9f414d3e4511443b62f60d03e9 WHIRLPOOL 3d708e287e3f9b873be647b0327eab6675a8702ee1cffb56e36934cada306e5ccc64397a083dad9e59de37a067e628cacbf896ae99012d5a209e42fd7cd8a4c6
 DIST patchbundle-selinux-base-policy-2.20141203-r7.tar.bz2 295833 SHA256 ba2219b3efc747be65f94c4d8ac3cd6ee530c82c848fa41935a114184678622a SHA512 8e32d9dbfb2f0f3f50200543aadb51ed9834ccd5cdf30bf8e4d9e6d0b645ce44ffaf80f7aa9385e9c9095d9a383b3a348a92356cb5386c06544ab082a9a468c7 WHIRLPOOL 1648ee1be71e45fcf5a264816ce7edc7bab19bd28a68703923eb2d6068f1f0469ae593855231d31f88baecbf29e7cece2d6beeed20b7c04231a6c90e90d35910
 DIST patchbundle-selinux-base-policy-2.20141203-r8.tar.bz2 297919 SHA256 77539eb3d78105f8789cd8205d2698bd27e2abf100163bdd162cda860fd15120 SHA512 2f8a19e1e4bb65f32b480275f49099aed3ae9df543c7de862b3bbd93e81b89cd96dadac3d091e28673d09a6885db8c5656b3a77d0080775c110b04f2753de7a6 WHIRLPOOL 79cb7e620eb8e838192dc557c7a9ce7e713227d783cc8b63792825559b2145cad70d0af6f99948c1527557bc363feffd846c73893682b4a14fc7d08b9e20c649
+DIST patchbundle-selinux-base-policy-2.20141203-r9.tar.bz2 299602 SHA256 e8518004942a6c57170a609683e22b1410c93a2a195829c41dc8fbc703d941b5 SHA512 ce6484fbca1d2d074e50d1a3953392bd3ce0a4617df98fbac37747b469b4f160a9331586dfe1c3ddccb1ccbee24876a2f05ab49e37c8492a48baf83c2d01d140 WHIRLPOOL 1fd7b956e98e95a64c3a713a944d4531259bd156a7feabf6a89c4b5f33ac846377730eede97889e85183be086f282ebd18e860214f6ca3f01b40f2323470ee04
 DIST refpolicy-2.20140311.tar.bz2 664416 SHA256 f69437db95548c78a5dec44c236397146b144153149009ea554d2e536e5436f7 SHA512 50bacee82ed41ac8b8007ecc33bf51d22303cc2ddd27cfb72cb5520dab5f8e255186e34b89cec492c7a2d4220b200814bdede9b46c19f987a3d3d65a1c9b749a WHIRLPOOL e07480beba6ab1f02ad36b7d0c50c4a71cb39a8ec78bf8d1dc3c82bb9dd1d69d9169d7c937165ea15f60ce1147f256d46644f944107a3a8a800d5bad70d4c255
 DIST refpolicy-2.20141203.tar.bz2 680243 SHA256 f438209c430d8a2d4ddcbe4bdd3edb46f6af7dc4913637af0b73c635e40c1522 SHA512 682e4280c5799e4c12ec7594afc1389f67be35055748d2e0dbdc3419159a16c96d4946ca6178daee8370515951f8653b2e452efe8c962b8d7f9bc192f0b15a0c WHIRLPOOL 74bca232534e7af9051bb1ab9f77c1ff6c425781cf4561f781d6e9a40cc5ca0d9add540249ea5493e8782a9372aea296ead6c165c6c440ae1509eb319d151ee5
diff --git a/sec-policy/selinux-tftp/selinux-tftp-2.20141203-r8.ebuild b/sec-policy/selinux-tftp/selinux-tftp-2.20141203-r8.ebuild
index ea0936c1579d..70c59c60075c 100644
--- a/sec-policy/selinux-tftp/selinux-tftp-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-tftp/selinux-tftp-2.20141203-r8.ebuild
@@ -13,5 +13,5 @@ DESCRIPTION="SELinux policy for tftp"
 if [[ $PV == 9999* ]] ; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-tftp/selinux-tftp-2.20141203-r9.ebuild b/sec-policy/selinux-tftp/selinux-tftp-2.20141203-r9.ebuild
new file mode 100644
index 000000000000..ea0936c1579d
--- /dev/null
+++ b/sec-policy/selinux-tftp/selinux-tftp-2.20141203-r9.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI="5"
+
+IUSE=""
+MODS="tftp"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for tftp"
+
+if [[ $PV == 9999* ]] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
diff --git a/sec-policy/selinux-tgtd/Manifest b/sec-policy/selinux-tgtd/Manifest
index 8327a635be01..91d204b0021a 100644
--- a/sec-policy/selinux-tgtd/Manifest
+++ b/sec-policy/selinux-tgtd/Manifest
@@ -9,5 +9,6 @@ DIST patchbundle-selinux-base-policy-2.20141203-r5.tar.bz2 274136 SHA256 c23d17c
 DIST patchbundle-selinux-base-policy-2.20141203-r6.tar.bz2 293231 SHA256 b686dcc517b97834f66d967afdcc724cb43b5c6dbf9f34043a91cdeda2625cc7 SHA512 a2c486cbe4a1d21ff3fd01bef25ecf5a633a4072646c67cfccf3f7187d95f3d9e3b482a46ba17c55c40a8e7c0dee56e9cf9ddc9f414d3e4511443b62f60d03e9 WHIRLPOOL 3d708e287e3f9b873be647b0327eab6675a8702ee1cffb56e36934cada306e5ccc64397a083dad9e59de37a067e628cacbf896ae99012d5a209e42fd7cd8a4c6
 DIST patchbundle-selinux-base-policy-2.20141203-r7.tar.bz2 295833 SHA256 ba2219b3efc747be65f94c4d8ac3cd6ee530c82c848fa41935a114184678622a SHA512 8e32d9dbfb2f0f3f50200543aadb51ed9834ccd5cdf30bf8e4d9e6d0b645ce44ffaf80f7aa9385e9c9095d9a383b3a348a92356cb5386c06544ab082a9a468c7 WHIRLPOOL 1648ee1be71e45fcf5a264816ce7edc7bab19bd28a68703923eb2d6068f1f0469ae593855231d31f88baecbf29e7cece2d6beeed20b7c04231a6c90e90d35910
 DIST patchbundle-selinux-base-policy-2.20141203-r8.tar.bz2 297919 SHA256 77539eb3d78105f8789cd8205d2698bd27e2abf100163bdd162cda860fd15120 SHA512 2f8a19e1e4bb65f32b480275f49099aed3ae9df543c7de862b3bbd93e81b89cd96dadac3d091e28673d09a6885db8c5656b3a77d0080775c110b04f2753de7a6 WHIRLPOOL 79cb7e620eb8e838192dc557c7a9ce7e713227d783cc8b63792825559b2145cad70d0af6f99948c1527557bc363feffd846c73893682b4a14fc7d08b9e20c649
+DIST patchbundle-selinux-base-policy-2.20141203-r9.tar.bz2 299602 SHA256 e8518004942a6c57170a609683e22b1410c93a2a195829c41dc8fbc703d941b5 SHA512 ce6484fbca1d2d074e50d1a3953392bd3ce0a4617df98fbac37747b469b4f160a9331586dfe1c3ddccb1ccbee24876a2f05ab49e37c8492a48baf83c2d01d140 WHIRLPOOL 1fd7b956e98e95a64c3a713a944d4531259bd156a7feabf6a89c4b5f33ac846377730eede97889e85183be086f282ebd18e860214f6ca3f01b40f2323470ee04
 DIST refpolicy-2.20140311.tar.bz2 664416 SHA256 f69437db95548c78a5dec44c236397146b144153149009ea554d2e536e5436f7 SHA512 50bacee82ed41ac8b8007ecc33bf51d22303cc2ddd27cfb72cb5520dab5f8e255186e34b89cec492c7a2d4220b200814bdede9b46c19f987a3d3d65a1c9b749a WHIRLPOOL e07480beba6ab1f02ad36b7d0c50c4a71cb39a8ec78bf8d1dc3c82bb9dd1d69d9169d7c937165ea15f60ce1147f256d46644f944107a3a8a800d5bad70d4c255
 DIST refpolicy-2.20141203.tar.bz2 680243 SHA256 f438209c430d8a2d4ddcbe4bdd3edb46f6af7dc4913637af0b73c635e40c1522 SHA512 682e4280c5799e4c12ec7594afc1389f67be35055748d2e0dbdc3419159a16c96d4946ca6178daee8370515951f8653b2e452efe8c962b8d7f9bc192f0b15a0c WHIRLPOOL 74bca232534e7af9051bb1ab9f77c1ff6c425781cf4561f781d6e9a40cc5ca0d9add540249ea5493e8782a9372aea296ead6c165c6c440ae1509eb319d151ee5
diff --git a/sec-policy/selinux-tgtd/selinux-tgtd-2.20141203-r8.ebuild b/sec-policy/selinux-tgtd/selinux-tgtd-2.20141203-r8.ebuild
index ab8e13fb99a0..b1d8d5cfc5b0 100644
--- a/sec-policy/selinux-tgtd/selinux-tgtd-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-tgtd/selinux-tgtd-2.20141203-r8.ebuild
@@ -13,5 +13,5 @@ DESCRIPTION="SELinux policy for tgtd"
 if [[ $PV == 9999* ]] ; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-tgtd/selinux-tgtd-2.20141203-r9.ebuild b/sec-policy/selinux-tgtd/selinux-tgtd-2.20141203-r9.ebuild
new file mode 100644
index 000000000000..ab8e13fb99a0
--- /dev/null
+++ b/sec-policy/selinux-tgtd/selinux-tgtd-2.20141203-r9.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI="5"
+
+IUSE=""
+MODS="tgtd"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for tgtd"
+
+if [[ $PV == 9999* ]] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
diff --git a/sec-policy/selinux-thunderbird/Manifest b/sec-policy/selinux-thunderbird/Manifest
index 8327a635be01..91d204b0021a 100644
--- a/sec-policy/selinux-thunderbird/Manifest
+++ b/sec-policy/selinux-thunderbird/Manifest
@@ -9,5 +9,6 @@ DIST patchbundle-selinux-base-policy-2.20141203-r5.tar.bz2 274136 SHA256 c23d17c
 DIST patchbundle-selinux-base-policy-2.20141203-r6.tar.bz2 293231 SHA256 b686dcc517b97834f66d967afdcc724cb43b5c6dbf9f34043a91cdeda2625cc7 SHA512 a2c486cbe4a1d21ff3fd01bef25ecf5a633a4072646c67cfccf3f7187d95f3d9e3b482a46ba17c55c40a8e7c0dee56e9cf9ddc9f414d3e4511443b62f60d03e9 WHIRLPOOL 3d708e287e3f9b873be647b0327eab6675a8702ee1cffb56e36934cada306e5ccc64397a083dad9e59de37a067e628cacbf896ae99012d5a209e42fd7cd8a4c6
 DIST patchbundle-selinux-base-policy-2.20141203-r7.tar.bz2 295833 SHA256 ba2219b3efc747be65f94c4d8ac3cd6ee530c82c848fa41935a114184678622a SHA512 8e32d9dbfb2f0f3f50200543aadb51ed9834ccd5cdf30bf8e4d9e6d0b645ce44ffaf80f7aa9385e9c9095d9a383b3a348a92356cb5386c06544ab082a9a468c7 WHIRLPOOL 1648ee1be71e45fcf5a264816ce7edc7bab19bd28a68703923eb2d6068f1f0469ae593855231d31f88baecbf29e7cece2d6beeed20b7c04231a6c90e90d35910
 DIST patchbundle-selinux-base-policy-2.20141203-r8.tar.bz2 297919 SHA256 77539eb3d78105f8789cd8205d2698bd27e2abf100163bdd162cda860fd15120 SHA512 2f8a19e1e4bb65f32b480275f49099aed3ae9df543c7de862b3bbd93e81b89cd96dadac3d091e28673d09a6885db8c5656b3a77d0080775c110b04f2753de7a6 WHIRLPOOL 79cb7e620eb8e838192dc557c7a9ce7e713227d783cc8b63792825559b2145cad70d0af6f99948c1527557bc363feffd846c73893682b4a14fc7d08b9e20c649
+DIST patchbundle-selinux-base-policy-2.20141203-r9.tar.bz2 299602 SHA256 e8518004942a6c57170a609683e22b1410c93a2a195829c41dc8fbc703d941b5 SHA512 ce6484fbca1d2d074e50d1a3953392bd3ce0a4617df98fbac37747b469b4f160a9331586dfe1c3ddccb1ccbee24876a2f05ab49e37c8492a48baf83c2d01d140 WHIRLPOOL 1fd7b956e98e95a64c3a713a944d4531259bd156a7feabf6a89c4b5f33ac846377730eede97889e85183be086f282ebd18e860214f6ca3f01b40f2323470ee04
 DIST refpolicy-2.20140311.tar.bz2 664416 SHA256 f69437db95548c78a5dec44c236397146b144153149009ea554d2e536e5436f7 SHA512 50bacee82ed41ac8b8007ecc33bf51d22303cc2ddd27cfb72cb5520dab5f8e255186e34b89cec492c7a2d4220b200814bdede9b46c19f987a3d3d65a1c9b749a WHIRLPOOL e07480beba6ab1f02ad36b7d0c50c4a71cb39a8ec78bf8d1dc3c82bb9dd1d69d9169d7c937165ea15f60ce1147f256d46644f944107a3a8a800d5bad70d4c255
 DIST refpolicy-2.20141203.tar.bz2 680243 SHA256 f438209c430d8a2d4ddcbe4bdd3edb46f6af7dc4913637af0b73c635e40c1522 SHA512 682e4280c5799e4c12ec7594afc1389f67be35055748d2e0dbdc3419159a16c96d4946ca6178daee8370515951f8653b2e452efe8c962b8d7f9bc192f0b15a0c WHIRLPOOL 74bca232534e7af9051bb1ab9f77c1ff6c425781cf4561f781d6e9a40cc5ca0d9add540249ea5493e8782a9372aea296ead6c165c6c440ae1509eb319d151ee5
diff --git a/sec-policy/selinux-thunderbird/selinux-thunderbird-2.20141203-r8.ebuild b/sec-policy/selinux-thunderbird/selinux-thunderbird-2.20141203-r8.ebuild
index c699c974439a..54bc17a54163 100644
--- a/sec-policy/selinux-thunderbird/selinux-thunderbird-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-thunderbird/selinux-thunderbird-2.20141203-r8.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="SELinux policy for thunderbird"
 if [[ $PV == 9999* ]] ; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-xserver
diff --git a/sec-policy/selinux-thunderbird/selinux-thunderbird-2.20141203-r9.ebuild b/sec-policy/selinux-thunderbird/selinux-thunderbird-2.20141203-r9.ebuild
new file mode 100644
index 000000000000..c699c974439a
--- /dev/null
+++ b/sec-policy/selinux-thunderbird/selinux-thunderbird-2.20141203-r9.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI="5"
+
+IUSE=""
+MODS="thunderbird"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for thunderbird"
+
+if [[ $PV == 9999* ]] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
+DEPEND="${DEPEND}
+	sec-policy/selinux-xserver
+"
+RDEPEND="${RDEPEND}
+	sec-policy/selinux-xserver
+"
diff --git a/sec-policy/selinux-timidity/Manifest b/sec-policy/selinux-timidity/Manifest
index 8327a635be01..91d204b0021a 100644
--- a/sec-policy/selinux-timidity/Manifest
+++ b/sec-policy/selinux-timidity/Manifest
@@ -9,5 +9,6 @@ DIST patchbundle-selinux-base-policy-2.20141203-r5.tar.bz2 274136 SHA256 c23d17c
 DIST patchbundle-selinux-base-policy-2.20141203-r6.tar.bz2 293231 SHA256 b686dcc517b97834f66d967afdcc724cb43b5c6dbf9f34043a91cdeda2625cc7 SHA512 a2c486cbe4a1d21ff3fd01bef25ecf5a633a4072646c67cfccf3f7187d95f3d9e3b482a46ba17c55c40a8e7c0dee56e9cf9ddc9f414d3e4511443b62f60d03e9 WHIRLPOOL 3d708e287e3f9b873be647b0327eab6675a8702ee1cffb56e36934cada306e5ccc64397a083dad9e59de37a067e628cacbf896ae99012d5a209e42fd7cd8a4c6
 DIST patchbundle-selinux-base-policy-2.20141203-r7.tar.bz2 295833 SHA256 ba2219b3efc747be65f94c4d8ac3cd6ee530c82c848fa41935a114184678622a SHA512 8e32d9dbfb2f0f3f50200543aadb51ed9834ccd5cdf30bf8e4d9e6d0b645ce44ffaf80f7aa9385e9c9095d9a383b3a348a92356cb5386c06544ab082a9a468c7 WHIRLPOOL 1648ee1be71e45fcf5a264816ce7edc7bab19bd28a68703923eb2d6068f1f0469ae593855231d31f88baecbf29e7cece2d6beeed20b7c04231a6c90e90d35910
 DIST patchbundle-selinux-base-policy-2.20141203-r8.tar.bz2 297919 SHA256 77539eb3d78105f8789cd8205d2698bd27e2abf100163bdd162cda860fd15120 SHA512 2f8a19e1e4bb65f32b480275f49099aed3ae9df543c7de862b3bbd93e81b89cd96dadac3d091e28673d09a6885db8c5656b3a77d0080775c110b04f2753de7a6 WHIRLPOOL 79cb7e620eb8e838192dc557c7a9ce7e713227d783cc8b63792825559b2145cad70d0af6f99948c1527557bc363feffd846c73893682b4a14fc7d08b9e20c649
+DIST patchbundle-selinux-base-policy-2.20141203-r9.tar.bz2 299602 SHA256 e8518004942a6c57170a609683e22b1410c93a2a195829c41dc8fbc703d941b5 SHA512 ce6484fbca1d2d074e50d1a3953392bd3ce0a4617df98fbac37747b469b4f160a9331586dfe1c3ddccb1ccbee24876a2f05ab49e37c8492a48baf83c2d01d140 WHIRLPOOL 1fd7b956e98e95a64c3a713a944d4531259bd156a7feabf6a89c4b5f33ac846377730eede97889e85183be086f282ebd18e860214f6ca3f01b40f2323470ee04
 DIST refpolicy-2.20140311.tar.bz2 664416 SHA256 f69437db95548c78a5dec44c236397146b144153149009ea554d2e536e5436f7 SHA512 50bacee82ed41ac8b8007ecc33bf51d22303cc2ddd27cfb72cb5520dab5f8e255186e34b89cec492c7a2d4220b200814bdede9b46c19f987a3d3d65a1c9b749a WHIRLPOOL e07480beba6ab1f02ad36b7d0c50c4a71cb39a8ec78bf8d1dc3c82bb9dd1d69d9169d7c937165ea15f60ce1147f256d46644f944107a3a8a800d5bad70d4c255
 DIST refpolicy-2.20141203.tar.bz2 680243 SHA256 f438209c430d8a2d4ddcbe4bdd3edb46f6af7dc4913637af0b73c635e40c1522 SHA512 682e4280c5799e4c12ec7594afc1389f67be35055748d2e0dbdc3419159a16c96d4946ca6178daee8370515951f8653b2e452efe8c962b8d7f9bc192f0b15a0c WHIRLPOOL 74bca232534e7af9051bb1ab9f77c1ff6c425781cf4561f781d6e9a40cc5ca0d9add540249ea5493e8782a9372aea296ead6c165c6c440ae1509eb319d151ee5
diff --git a/sec-policy/selinux-timidity/selinux-timidity-2.20141203-r8.ebuild b/sec-policy/selinux-timidity/selinux-timidity-2.20141203-r8.ebuild
index 00d62cb3890a..39a3a2165f15 100644
--- a/sec-policy/selinux-timidity/selinux-timidity-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-timidity/selinux-timidity-2.20141203-r8.ebuild
@@ -13,5 +13,5 @@ DESCRIPTION="SELinux policy for timidity"
 if [[ $PV == 9999* ]] ; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-timidity/selinux-timidity-2.20141203-r9.ebuild b/sec-policy/selinux-timidity/selinux-timidity-2.20141203-r9.ebuild
new file mode 100644
index 000000000000..00d62cb3890a
--- /dev/null
+++ b/sec-policy/selinux-timidity/selinux-timidity-2.20141203-r9.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI="5"
+
+IUSE=""
+MODS="timidity"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for timidity"
+
+if [[ $PV == 9999* ]] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
diff --git a/sec-policy/selinux-tmpreaper/Manifest b/sec-policy/selinux-tmpreaper/Manifest
index 8327a635be01..91d204b0021a 100644
--- a/sec-policy/selinux-tmpreaper/Manifest
+++ b/sec-policy/selinux-tmpreaper/Manifest
@@ -9,5 +9,6 @@ DIST patchbundle-selinux-base-policy-2.20141203-r5.tar.bz2 274136 SHA256 c23d17c
 DIST patchbundle-selinux-base-policy-2.20141203-r6.tar.bz2 293231 SHA256 b686dcc517b97834f66d967afdcc724cb43b5c6dbf9f34043a91cdeda2625cc7 SHA512 a2c486cbe4a1d21ff3fd01bef25ecf5a633a4072646c67cfccf3f7187d95f3d9e3b482a46ba17c55c40a8e7c0dee56e9cf9ddc9f414d3e4511443b62f60d03e9 WHIRLPOOL 3d708e287e3f9b873be647b0327eab6675a8702ee1cffb56e36934cada306e5ccc64397a083dad9e59de37a067e628cacbf896ae99012d5a209e42fd7cd8a4c6
 DIST patchbundle-selinux-base-policy-2.20141203-r7.tar.bz2 295833 SHA256 ba2219b3efc747be65f94c4d8ac3cd6ee530c82c848fa41935a114184678622a SHA512 8e32d9dbfb2f0f3f50200543aadb51ed9834ccd5cdf30bf8e4d9e6d0b645ce44ffaf80f7aa9385e9c9095d9a383b3a348a92356cb5386c06544ab082a9a468c7 WHIRLPOOL 1648ee1be71e45fcf5a264816ce7edc7bab19bd28a68703923eb2d6068f1f0469ae593855231d31f88baecbf29e7cece2d6beeed20b7c04231a6c90e90d35910
 DIST patchbundle-selinux-base-policy-2.20141203-r8.tar.bz2 297919 SHA256 77539eb3d78105f8789cd8205d2698bd27e2abf100163bdd162cda860fd15120 SHA512 2f8a19e1e4bb65f32b480275f49099aed3ae9df543c7de862b3bbd93e81b89cd96dadac3d091e28673d09a6885db8c5656b3a77d0080775c110b04f2753de7a6 WHIRLPOOL 79cb7e620eb8e838192dc557c7a9ce7e713227d783cc8b63792825559b2145cad70d0af6f99948c1527557bc363feffd846c73893682b4a14fc7d08b9e20c649
+DIST patchbundle-selinux-base-policy-2.20141203-r9.tar.bz2 299602 SHA256 e8518004942a6c57170a609683e22b1410c93a2a195829c41dc8fbc703d941b5 SHA512 ce6484fbca1d2d074e50d1a3953392bd3ce0a4617df98fbac37747b469b4f160a9331586dfe1c3ddccb1ccbee24876a2f05ab49e37c8492a48baf83c2d01d140 WHIRLPOOL 1fd7b956e98e95a64c3a713a944d4531259bd156a7feabf6a89c4b5f33ac846377730eede97889e85183be086f282ebd18e860214f6ca3f01b40f2323470ee04
 DIST refpolicy-2.20140311.tar.bz2 664416 SHA256 f69437db95548c78a5dec44c236397146b144153149009ea554d2e536e5436f7 SHA512 50bacee82ed41ac8b8007ecc33bf51d22303cc2ddd27cfb72cb5520dab5f8e255186e34b89cec492c7a2d4220b200814bdede9b46c19f987a3d3d65a1c9b749a WHIRLPOOL e07480beba6ab1f02ad36b7d0c50c4a71cb39a8ec78bf8d1dc3c82bb9dd1d69d9169d7c937165ea15f60ce1147f256d46644f944107a3a8a800d5bad70d4c255
 DIST refpolicy-2.20141203.tar.bz2 680243 SHA256 f438209c430d8a2d4ddcbe4bdd3edb46f6af7dc4913637af0b73c635e40c1522 SHA512 682e4280c5799e4c12ec7594afc1389f67be35055748d2e0dbdc3419159a16c96d4946ca6178daee8370515951f8653b2e452efe8c962b8d7f9bc192f0b15a0c WHIRLPOOL 74bca232534e7af9051bb1ab9f77c1ff6c425781cf4561f781d6e9a40cc5ca0d9add540249ea5493e8782a9372aea296ead6c165c6c440ae1509eb319d151ee5
diff --git a/sec-policy/selinux-tmpreaper/selinux-tmpreaper-2.20141203-r8.ebuild b/sec-policy/selinux-tmpreaper/selinux-tmpreaper-2.20141203-r8.ebuild
index 71b5ea0570a0..bb00b5556fac 100644
--- a/sec-policy/selinux-tmpreaper/selinux-tmpreaper-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-tmpreaper/selinux-tmpreaper-2.20141203-r8.ebuild
@@ -13,5 +13,5 @@ DESCRIPTION="SELinux policy for tmpreaper"
 if [[ $PV == 9999* ]] ; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-tmpreaper/selinux-tmpreaper-2.20141203-r9.ebuild b/sec-policy/selinux-tmpreaper/selinux-tmpreaper-2.20141203-r9.ebuild
new file mode 100644
index 000000000000..71b5ea0570a0
--- /dev/null
+++ b/sec-policy/selinux-tmpreaper/selinux-tmpreaper-2.20141203-r9.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI="5"
+
+IUSE=""
+MODS="tmpreaper"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for tmpreaper"
+
+if [[ $PV == 9999* ]] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
diff --git a/sec-policy/selinux-tor/Manifest b/sec-policy/selinux-tor/Manifest
index 8327a635be01..91d204b0021a 100644
--- a/sec-policy/selinux-tor/Manifest
+++ b/sec-policy/selinux-tor/Manifest
@@ -9,5 +9,6 @@ DIST patchbundle-selinux-base-policy-2.20141203-r5.tar.bz2 274136 SHA256 c23d17c
 DIST patchbundle-selinux-base-policy-2.20141203-r6.tar.bz2 293231 SHA256 b686dcc517b97834f66d967afdcc724cb43b5c6dbf9f34043a91cdeda2625cc7 SHA512 a2c486cbe4a1d21ff3fd01bef25ecf5a633a4072646c67cfccf3f7187d95f3d9e3b482a46ba17c55c40a8e7c0dee56e9cf9ddc9f414d3e4511443b62f60d03e9 WHIRLPOOL 3d708e287e3f9b873be647b0327eab6675a8702ee1cffb56e36934cada306e5ccc64397a083dad9e59de37a067e628cacbf896ae99012d5a209e42fd7cd8a4c6
 DIST patchbundle-selinux-base-policy-2.20141203-r7.tar.bz2 295833 SHA256 ba2219b3efc747be65f94c4d8ac3cd6ee530c82c848fa41935a114184678622a SHA512 8e32d9dbfb2f0f3f50200543aadb51ed9834ccd5cdf30bf8e4d9e6d0b645ce44ffaf80f7aa9385e9c9095d9a383b3a348a92356cb5386c06544ab082a9a468c7 WHIRLPOOL 1648ee1be71e45fcf5a264816ce7edc7bab19bd28a68703923eb2d6068f1f0469ae593855231d31f88baecbf29e7cece2d6beeed20b7c04231a6c90e90d35910
 DIST patchbundle-selinux-base-policy-2.20141203-r8.tar.bz2 297919 SHA256 77539eb3d78105f8789cd8205d2698bd27e2abf100163bdd162cda860fd15120 SHA512 2f8a19e1e4bb65f32b480275f49099aed3ae9df543c7de862b3bbd93e81b89cd96dadac3d091e28673d09a6885db8c5656b3a77d0080775c110b04f2753de7a6 WHIRLPOOL 79cb7e620eb8e838192dc557c7a9ce7e713227d783cc8b63792825559b2145cad70d0af6f99948c1527557bc363feffd846c73893682b4a14fc7d08b9e20c649
+DIST patchbundle-selinux-base-policy-2.20141203-r9.tar.bz2 299602 SHA256 e8518004942a6c57170a609683e22b1410c93a2a195829c41dc8fbc703d941b5 SHA512 ce6484fbca1d2d074e50d1a3953392bd3ce0a4617df98fbac37747b469b4f160a9331586dfe1c3ddccb1ccbee24876a2f05ab49e37c8492a48baf83c2d01d140 WHIRLPOOL 1fd7b956e98e95a64c3a713a944d4531259bd156a7feabf6a89c4b5f33ac846377730eede97889e85183be086f282ebd18e860214f6ca3f01b40f2323470ee04
 DIST refpolicy-2.20140311.tar.bz2 664416 SHA256 f69437db95548c78a5dec44c236397146b144153149009ea554d2e536e5436f7 SHA512 50bacee82ed41ac8b8007ecc33bf51d22303cc2ddd27cfb72cb5520dab5f8e255186e34b89cec492c7a2d4220b200814bdede9b46c19f987a3d3d65a1c9b749a WHIRLPOOL e07480beba6ab1f02ad36b7d0c50c4a71cb39a8ec78bf8d1dc3c82bb9dd1d69d9169d7c937165ea15f60ce1147f256d46644f944107a3a8a800d5bad70d4c255
 DIST refpolicy-2.20141203.tar.bz2 680243 SHA256 f438209c430d8a2d4ddcbe4bdd3edb46f6af7dc4913637af0b73c635e40c1522 SHA512 682e4280c5799e4c12ec7594afc1389f67be35055748d2e0dbdc3419159a16c96d4946ca6178daee8370515951f8653b2e452efe8c962b8d7f9bc192f0b15a0c WHIRLPOOL 74bca232534e7af9051bb1ab9f77c1ff6c425781cf4561f781d6e9a40cc5ca0d9add540249ea5493e8782a9372aea296ead6c165c6c440ae1509eb319d151ee5
diff --git a/sec-policy/selinux-tor/selinux-tor-2.20141203-r8.ebuild b/sec-policy/selinux-tor/selinux-tor-2.20141203-r8.ebuild
index d91e0f1c0085..3fb3b32da6dc 100644
--- a/sec-policy/selinux-tor/selinux-tor-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-tor/selinux-tor-2.20141203-r8.ebuild
@@ -13,5 +13,5 @@ DESCRIPTION="SELinux policy for tor"
 if [[ $PV == 9999* ]] ; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-tor/selinux-tor-2.20141203-r9.ebuild b/sec-policy/selinux-tor/selinux-tor-2.20141203-r9.ebuild
new file mode 100644
index 000000000000..d91e0f1c0085
--- /dev/null
+++ b/sec-policy/selinux-tor/selinux-tor-2.20141203-r9.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI="5"
+
+IUSE=""
+MODS="tor"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for tor"
+
+if [[ $PV == 9999* ]] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
diff --git a/sec-policy/selinux-tripwire/Manifest b/sec-policy/selinux-tripwire/Manifest
index 8327a635be01..91d204b0021a 100644
--- a/sec-policy/selinux-tripwire/Manifest
+++ b/sec-policy/selinux-tripwire/Manifest
@@ -9,5 +9,6 @@ DIST patchbundle-selinux-base-policy-2.20141203-r5.tar.bz2 274136 SHA256 c23d17c
 DIST patchbundle-selinux-base-policy-2.20141203-r6.tar.bz2 293231 SHA256 b686dcc517b97834f66d967afdcc724cb43b5c6dbf9f34043a91cdeda2625cc7 SHA512 a2c486cbe4a1d21ff3fd01bef25ecf5a633a4072646c67cfccf3f7187d95f3d9e3b482a46ba17c55c40a8e7c0dee56e9cf9ddc9f414d3e4511443b62f60d03e9 WHIRLPOOL 3d708e287e3f9b873be647b0327eab6675a8702ee1cffb56e36934cada306e5ccc64397a083dad9e59de37a067e628cacbf896ae99012d5a209e42fd7cd8a4c6
 DIST patchbundle-selinux-base-policy-2.20141203-r7.tar.bz2 295833 SHA256 ba2219b3efc747be65f94c4d8ac3cd6ee530c82c848fa41935a114184678622a SHA512 8e32d9dbfb2f0f3f50200543aadb51ed9834ccd5cdf30bf8e4d9e6d0b645ce44ffaf80f7aa9385e9c9095d9a383b3a348a92356cb5386c06544ab082a9a468c7 WHIRLPOOL 1648ee1be71e45fcf5a264816ce7edc7bab19bd28a68703923eb2d6068f1f0469ae593855231d31f88baecbf29e7cece2d6beeed20b7c04231a6c90e90d35910
 DIST patchbundle-selinux-base-policy-2.20141203-r8.tar.bz2 297919 SHA256 77539eb3d78105f8789cd8205d2698bd27e2abf100163bdd162cda860fd15120 SHA512 2f8a19e1e4bb65f32b480275f49099aed3ae9df543c7de862b3bbd93e81b89cd96dadac3d091e28673d09a6885db8c5656b3a77d0080775c110b04f2753de7a6 WHIRLPOOL 79cb7e620eb8e838192dc557c7a9ce7e713227d783cc8b63792825559b2145cad70d0af6f99948c1527557bc363feffd846c73893682b4a14fc7d08b9e20c649
+DIST patchbundle-selinux-base-policy-2.20141203-r9.tar.bz2 299602 SHA256 e8518004942a6c57170a609683e22b1410c93a2a195829c41dc8fbc703d941b5 SHA512 ce6484fbca1d2d074e50d1a3953392bd3ce0a4617df98fbac37747b469b4f160a9331586dfe1c3ddccb1ccbee24876a2f05ab49e37c8492a48baf83c2d01d140 WHIRLPOOL 1fd7b956e98e95a64c3a713a944d4531259bd156a7feabf6a89c4b5f33ac846377730eede97889e85183be086f282ebd18e860214f6ca3f01b40f2323470ee04
 DIST refpolicy-2.20140311.tar.bz2 664416 SHA256 f69437db95548c78a5dec44c236397146b144153149009ea554d2e536e5436f7 SHA512 50bacee82ed41ac8b8007ecc33bf51d22303cc2ddd27cfb72cb5520dab5f8e255186e34b89cec492c7a2d4220b200814bdede9b46c19f987a3d3d65a1c9b749a WHIRLPOOL e07480beba6ab1f02ad36b7d0c50c4a71cb39a8ec78bf8d1dc3c82bb9dd1d69d9169d7c937165ea15f60ce1147f256d46644f944107a3a8a800d5bad70d4c255
 DIST refpolicy-2.20141203.tar.bz2 680243 SHA256 f438209c430d8a2d4ddcbe4bdd3edb46f6af7dc4913637af0b73c635e40c1522 SHA512 682e4280c5799e4c12ec7594afc1389f67be35055748d2e0dbdc3419159a16c96d4946ca6178daee8370515951f8653b2e452efe8c962b8d7f9bc192f0b15a0c WHIRLPOOL 74bca232534e7af9051bb1ab9f77c1ff6c425781cf4561f781d6e9a40cc5ca0d9add540249ea5493e8782a9372aea296ead6c165c6c440ae1509eb319d151ee5
diff --git a/sec-policy/selinux-tripwire/selinux-tripwire-2.20141203-r8.ebuild b/sec-policy/selinux-tripwire/selinux-tripwire-2.20141203-r8.ebuild
index 0597d25be1d5..9acc80062b18 100644
--- a/sec-policy/selinux-tripwire/selinux-tripwire-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-tripwire/selinux-tripwire-2.20141203-r8.ebuild
@@ -13,5 +13,5 @@ DESCRIPTION="SELinux policy for tripwire"
 if [[ $PV == 9999* ]] ; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-tripwire/selinux-tripwire-2.20141203-r9.ebuild b/sec-policy/selinux-tripwire/selinux-tripwire-2.20141203-r9.ebuild
new file mode 100644
index 000000000000..0597d25be1d5
--- /dev/null
+++ b/sec-policy/selinux-tripwire/selinux-tripwire-2.20141203-r9.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI="5"
+
+IUSE=""
+MODS="tripwire"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for tripwire"
+
+if [[ $PV == 9999* ]] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
diff --git a/sec-policy/selinux-ucspitcp/Manifest b/sec-policy/selinux-ucspitcp/Manifest
index 8327a635be01..91d204b0021a 100644
--- a/sec-policy/selinux-ucspitcp/Manifest
+++ b/sec-policy/selinux-ucspitcp/Manifest
@@ -9,5 +9,6 @@ DIST patchbundle-selinux-base-policy-2.20141203-r5.tar.bz2 274136 SHA256 c23d17c
 DIST patchbundle-selinux-base-policy-2.20141203-r6.tar.bz2 293231 SHA256 b686dcc517b97834f66d967afdcc724cb43b5c6dbf9f34043a91cdeda2625cc7 SHA512 a2c486cbe4a1d21ff3fd01bef25ecf5a633a4072646c67cfccf3f7187d95f3d9e3b482a46ba17c55c40a8e7c0dee56e9cf9ddc9f414d3e4511443b62f60d03e9 WHIRLPOOL 3d708e287e3f9b873be647b0327eab6675a8702ee1cffb56e36934cada306e5ccc64397a083dad9e59de37a067e628cacbf896ae99012d5a209e42fd7cd8a4c6
 DIST patchbundle-selinux-base-policy-2.20141203-r7.tar.bz2 295833 SHA256 ba2219b3efc747be65f94c4d8ac3cd6ee530c82c848fa41935a114184678622a SHA512 8e32d9dbfb2f0f3f50200543aadb51ed9834ccd5cdf30bf8e4d9e6d0b645ce44ffaf80f7aa9385e9c9095d9a383b3a348a92356cb5386c06544ab082a9a468c7 WHIRLPOOL 1648ee1be71e45fcf5a264816ce7edc7bab19bd28a68703923eb2d6068f1f0469ae593855231d31f88baecbf29e7cece2d6beeed20b7c04231a6c90e90d35910
 DIST patchbundle-selinux-base-policy-2.20141203-r8.tar.bz2 297919 SHA256 77539eb3d78105f8789cd8205d2698bd27e2abf100163bdd162cda860fd15120 SHA512 2f8a19e1e4bb65f32b480275f49099aed3ae9df543c7de862b3bbd93e81b89cd96dadac3d091e28673d09a6885db8c5656b3a77d0080775c110b04f2753de7a6 WHIRLPOOL 79cb7e620eb8e838192dc557c7a9ce7e713227d783cc8b63792825559b2145cad70d0af6f99948c1527557bc363feffd846c73893682b4a14fc7d08b9e20c649
+DIST patchbundle-selinux-base-policy-2.20141203-r9.tar.bz2 299602 SHA256 e8518004942a6c57170a609683e22b1410c93a2a195829c41dc8fbc703d941b5 SHA512 ce6484fbca1d2d074e50d1a3953392bd3ce0a4617df98fbac37747b469b4f160a9331586dfe1c3ddccb1ccbee24876a2f05ab49e37c8492a48baf83c2d01d140 WHIRLPOOL 1fd7b956e98e95a64c3a713a944d4531259bd156a7feabf6a89c4b5f33ac846377730eede97889e85183be086f282ebd18e860214f6ca3f01b40f2323470ee04
 DIST refpolicy-2.20140311.tar.bz2 664416 SHA256 f69437db95548c78a5dec44c236397146b144153149009ea554d2e536e5436f7 SHA512 50bacee82ed41ac8b8007ecc33bf51d22303cc2ddd27cfb72cb5520dab5f8e255186e34b89cec492c7a2d4220b200814bdede9b46c19f987a3d3d65a1c9b749a WHIRLPOOL e07480beba6ab1f02ad36b7d0c50c4a71cb39a8ec78bf8d1dc3c82bb9dd1d69d9169d7c937165ea15f60ce1147f256d46644f944107a3a8a800d5bad70d4c255
 DIST refpolicy-2.20141203.tar.bz2 680243 SHA256 f438209c430d8a2d4ddcbe4bdd3edb46f6af7dc4913637af0b73c635e40c1522 SHA512 682e4280c5799e4c12ec7594afc1389f67be35055748d2e0dbdc3419159a16c96d4946ca6178daee8370515951f8653b2e452efe8c962b8d7f9bc192f0b15a0c WHIRLPOOL 74bca232534e7af9051bb1ab9f77c1ff6c425781cf4561f781d6e9a40cc5ca0d9add540249ea5493e8782a9372aea296ead6c165c6c440ae1509eb319d151ee5
diff --git a/sec-policy/selinux-ucspitcp/selinux-ucspitcp-2.20141203-r8.ebuild b/sec-policy/selinux-ucspitcp/selinux-ucspitcp-2.20141203-r8.ebuild
index b20f624079fc..3129727034c8 100644
--- a/sec-policy/selinux-ucspitcp/selinux-ucspitcp-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-ucspitcp/selinux-ucspitcp-2.20141203-r8.ebuild
@@ -13,5 +13,5 @@ DESCRIPTION="SELinux policy for ucspitcp"
 if [[ $PV == 9999* ]] ; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-ucspitcp/selinux-ucspitcp-2.20141203-r9.ebuild b/sec-policy/selinux-ucspitcp/selinux-ucspitcp-2.20141203-r9.ebuild
new file mode 100644
index 000000000000..b20f624079fc
--- /dev/null
+++ b/sec-policy/selinux-ucspitcp/selinux-ucspitcp-2.20141203-r9.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI="5"
+
+IUSE=""
+MODS="ucspitcp"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for ucspitcp"
+
+if [[ $PV == 9999* ]] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
diff --git a/sec-policy/selinux-ulogd/Manifest b/sec-policy/selinux-ulogd/Manifest
index 8327a635be01..91d204b0021a 100644
--- a/sec-policy/selinux-ulogd/Manifest
+++ b/sec-policy/selinux-ulogd/Manifest
@@ -9,5 +9,6 @@ DIST patchbundle-selinux-base-policy-2.20141203-r5.tar.bz2 274136 SHA256 c23d17c
 DIST patchbundle-selinux-base-policy-2.20141203-r6.tar.bz2 293231 SHA256 b686dcc517b97834f66d967afdcc724cb43b5c6dbf9f34043a91cdeda2625cc7 SHA512 a2c486cbe4a1d21ff3fd01bef25ecf5a633a4072646c67cfccf3f7187d95f3d9e3b482a46ba17c55c40a8e7c0dee56e9cf9ddc9f414d3e4511443b62f60d03e9 WHIRLPOOL 3d708e287e3f9b873be647b0327eab6675a8702ee1cffb56e36934cada306e5ccc64397a083dad9e59de37a067e628cacbf896ae99012d5a209e42fd7cd8a4c6
 DIST patchbundle-selinux-base-policy-2.20141203-r7.tar.bz2 295833 SHA256 ba2219b3efc747be65f94c4d8ac3cd6ee530c82c848fa41935a114184678622a SHA512 8e32d9dbfb2f0f3f50200543aadb51ed9834ccd5cdf30bf8e4d9e6d0b645ce44ffaf80f7aa9385e9c9095d9a383b3a348a92356cb5386c06544ab082a9a468c7 WHIRLPOOL 1648ee1be71e45fcf5a264816ce7edc7bab19bd28a68703923eb2d6068f1f0469ae593855231d31f88baecbf29e7cece2d6beeed20b7c04231a6c90e90d35910
 DIST patchbundle-selinux-base-policy-2.20141203-r8.tar.bz2 297919 SHA256 77539eb3d78105f8789cd8205d2698bd27e2abf100163bdd162cda860fd15120 SHA512 2f8a19e1e4bb65f32b480275f49099aed3ae9df543c7de862b3bbd93e81b89cd96dadac3d091e28673d09a6885db8c5656b3a77d0080775c110b04f2753de7a6 WHIRLPOOL 79cb7e620eb8e838192dc557c7a9ce7e713227d783cc8b63792825559b2145cad70d0af6f99948c1527557bc363feffd846c73893682b4a14fc7d08b9e20c649
+DIST patchbundle-selinux-base-policy-2.20141203-r9.tar.bz2 299602 SHA256 e8518004942a6c57170a609683e22b1410c93a2a195829c41dc8fbc703d941b5 SHA512 ce6484fbca1d2d074e50d1a3953392bd3ce0a4617df98fbac37747b469b4f160a9331586dfe1c3ddccb1ccbee24876a2f05ab49e37c8492a48baf83c2d01d140 WHIRLPOOL 1fd7b956e98e95a64c3a713a944d4531259bd156a7feabf6a89c4b5f33ac846377730eede97889e85183be086f282ebd18e860214f6ca3f01b40f2323470ee04
 DIST refpolicy-2.20140311.tar.bz2 664416 SHA256 f69437db95548c78a5dec44c236397146b144153149009ea554d2e536e5436f7 SHA512 50bacee82ed41ac8b8007ecc33bf51d22303cc2ddd27cfb72cb5520dab5f8e255186e34b89cec492c7a2d4220b200814bdede9b46c19f987a3d3d65a1c9b749a WHIRLPOOL e07480beba6ab1f02ad36b7d0c50c4a71cb39a8ec78bf8d1dc3c82bb9dd1d69d9169d7c937165ea15f60ce1147f256d46644f944107a3a8a800d5bad70d4c255
 DIST refpolicy-2.20141203.tar.bz2 680243 SHA256 f438209c430d8a2d4ddcbe4bdd3edb46f6af7dc4913637af0b73c635e40c1522 SHA512 682e4280c5799e4c12ec7594afc1389f67be35055748d2e0dbdc3419159a16c96d4946ca6178daee8370515951f8653b2e452efe8c962b8d7f9bc192f0b15a0c WHIRLPOOL 74bca232534e7af9051bb1ab9f77c1ff6c425781cf4561f781d6e9a40cc5ca0d9add540249ea5493e8782a9372aea296ead6c165c6c440ae1509eb319d151ee5
diff --git a/sec-policy/selinux-ulogd/selinux-ulogd-2.20141203-r8.ebuild b/sec-policy/selinux-ulogd/selinux-ulogd-2.20141203-r8.ebuild
index 722c93a0be55..3405d967dcec 100644
--- a/sec-policy/selinux-ulogd/selinux-ulogd-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-ulogd/selinux-ulogd-2.20141203-r8.ebuild
@@ -13,5 +13,5 @@ DESCRIPTION="SELinux policy for ulogd"
 if [[ $PV == 9999* ]] ; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-ulogd/selinux-ulogd-2.20141203-r9.ebuild b/sec-policy/selinux-ulogd/selinux-ulogd-2.20141203-r9.ebuild
new file mode 100644
index 000000000000..722c93a0be55
--- /dev/null
+++ b/sec-policy/selinux-ulogd/selinux-ulogd-2.20141203-r9.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI="5"
+
+IUSE=""
+MODS="ulogd"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for ulogd"
+
+if [[ $PV == 9999* ]] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
diff --git a/sec-policy/selinux-uml/Manifest b/sec-policy/selinux-uml/Manifest
index 8327a635be01..91d204b0021a 100644
--- a/sec-policy/selinux-uml/Manifest
+++ b/sec-policy/selinux-uml/Manifest
@@ -9,5 +9,6 @@ DIST patchbundle-selinux-base-policy-2.20141203-r5.tar.bz2 274136 SHA256 c23d17c
 DIST patchbundle-selinux-base-policy-2.20141203-r6.tar.bz2 293231 SHA256 b686dcc517b97834f66d967afdcc724cb43b5c6dbf9f34043a91cdeda2625cc7 SHA512 a2c486cbe4a1d21ff3fd01bef25ecf5a633a4072646c67cfccf3f7187d95f3d9e3b482a46ba17c55c40a8e7c0dee56e9cf9ddc9f414d3e4511443b62f60d03e9 WHIRLPOOL 3d708e287e3f9b873be647b0327eab6675a8702ee1cffb56e36934cada306e5ccc64397a083dad9e59de37a067e628cacbf896ae99012d5a209e42fd7cd8a4c6
 DIST patchbundle-selinux-base-policy-2.20141203-r7.tar.bz2 295833 SHA256 ba2219b3efc747be65f94c4d8ac3cd6ee530c82c848fa41935a114184678622a SHA512 8e32d9dbfb2f0f3f50200543aadb51ed9834ccd5cdf30bf8e4d9e6d0b645ce44ffaf80f7aa9385e9c9095d9a383b3a348a92356cb5386c06544ab082a9a468c7 WHIRLPOOL 1648ee1be71e45fcf5a264816ce7edc7bab19bd28a68703923eb2d6068f1f0469ae593855231d31f88baecbf29e7cece2d6beeed20b7c04231a6c90e90d35910
 DIST patchbundle-selinux-base-policy-2.20141203-r8.tar.bz2 297919 SHA256 77539eb3d78105f8789cd8205d2698bd27e2abf100163bdd162cda860fd15120 SHA512 2f8a19e1e4bb65f32b480275f49099aed3ae9df543c7de862b3bbd93e81b89cd96dadac3d091e28673d09a6885db8c5656b3a77d0080775c110b04f2753de7a6 WHIRLPOOL 79cb7e620eb8e838192dc557c7a9ce7e713227d783cc8b63792825559b2145cad70d0af6f99948c1527557bc363feffd846c73893682b4a14fc7d08b9e20c649
+DIST patchbundle-selinux-base-policy-2.20141203-r9.tar.bz2 299602 SHA256 e8518004942a6c57170a609683e22b1410c93a2a195829c41dc8fbc703d941b5 SHA512 ce6484fbca1d2d074e50d1a3953392bd3ce0a4617df98fbac37747b469b4f160a9331586dfe1c3ddccb1ccbee24876a2f05ab49e37c8492a48baf83c2d01d140 WHIRLPOOL 1fd7b956e98e95a64c3a713a944d4531259bd156a7feabf6a89c4b5f33ac846377730eede97889e85183be086f282ebd18e860214f6ca3f01b40f2323470ee04
 DIST refpolicy-2.20140311.tar.bz2 664416 SHA256 f69437db95548c78a5dec44c236397146b144153149009ea554d2e536e5436f7 SHA512 50bacee82ed41ac8b8007ecc33bf51d22303cc2ddd27cfb72cb5520dab5f8e255186e34b89cec492c7a2d4220b200814bdede9b46c19f987a3d3d65a1c9b749a WHIRLPOOL e07480beba6ab1f02ad36b7d0c50c4a71cb39a8ec78bf8d1dc3c82bb9dd1d69d9169d7c937165ea15f60ce1147f256d46644f944107a3a8a800d5bad70d4c255
 DIST refpolicy-2.20141203.tar.bz2 680243 SHA256 f438209c430d8a2d4ddcbe4bdd3edb46f6af7dc4913637af0b73c635e40c1522 SHA512 682e4280c5799e4c12ec7594afc1389f67be35055748d2e0dbdc3419159a16c96d4946ca6178daee8370515951f8653b2e452efe8c962b8d7f9bc192f0b15a0c WHIRLPOOL 74bca232534e7af9051bb1ab9f77c1ff6c425781cf4561f781d6e9a40cc5ca0d9add540249ea5493e8782a9372aea296ead6c165c6c440ae1509eb319d151ee5
diff --git a/sec-policy/selinux-uml/selinux-uml-2.20141203-r8.ebuild b/sec-policy/selinux-uml/selinux-uml-2.20141203-r8.ebuild
index ac16c2fcd830..0120af3ba5b0 100644
--- a/sec-policy/selinux-uml/selinux-uml-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-uml/selinux-uml-2.20141203-r8.ebuild
@@ -13,5 +13,5 @@ DESCRIPTION="SELinux policy for uml"
 if [[ $PV == 9999* ]] ; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-uml/selinux-uml-2.20141203-r9.ebuild b/sec-policy/selinux-uml/selinux-uml-2.20141203-r9.ebuild
new file mode 100644
index 000000000000..ac16c2fcd830
--- /dev/null
+++ b/sec-policy/selinux-uml/selinux-uml-2.20141203-r9.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI="5"
+
+IUSE=""
+MODS="uml"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for uml"
+
+if [[ $PV == 9999* ]] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
diff --git a/sec-policy/selinux-unconfined/Manifest b/sec-policy/selinux-unconfined/Manifest
index 8327a635be01..91d204b0021a 100644
--- a/sec-policy/selinux-unconfined/Manifest
+++ b/sec-policy/selinux-unconfined/Manifest
@@ -9,5 +9,6 @@ DIST patchbundle-selinux-base-policy-2.20141203-r5.tar.bz2 274136 SHA256 c23d17c
 DIST patchbundle-selinux-base-policy-2.20141203-r6.tar.bz2 293231 SHA256 b686dcc517b97834f66d967afdcc724cb43b5c6dbf9f34043a91cdeda2625cc7 SHA512 a2c486cbe4a1d21ff3fd01bef25ecf5a633a4072646c67cfccf3f7187d95f3d9e3b482a46ba17c55c40a8e7c0dee56e9cf9ddc9f414d3e4511443b62f60d03e9 WHIRLPOOL 3d708e287e3f9b873be647b0327eab6675a8702ee1cffb56e36934cada306e5ccc64397a083dad9e59de37a067e628cacbf896ae99012d5a209e42fd7cd8a4c6
 DIST patchbundle-selinux-base-policy-2.20141203-r7.tar.bz2 295833 SHA256 ba2219b3efc747be65f94c4d8ac3cd6ee530c82c848fa41935a114184678622a SHA512 8e32d9dbfb2f0f3f50200543aadb51ed9834ccd5cdf30bf8e4d9e6d0b645ce44ffaf80f7aa9385e9c9095d9a383b3a348a92356cb5386c06544ab082a9a468c7 WHIRLPOOL 1648ee1be71e45fcf5a264816ce7edc7bab19bd28a68703923eb2d6068f1f0469ae593855231d31f88baecbf29e7cece2d6beeed20b7c04231a6c90e90d35910
 DIST patchbundle-selinux-base-policy-2.20141203-r8.tar.bz2 297919 SHA256 77539eb3d78105f8789cd8205d2698bd27e2abf100163bdd162cda860fd15120 SHA512 2f8a19e1e4bb65f32b480275f49099aed3ae9df543c7de862b3bbd93e81b89cd96dadac3d091e28673d09a6885db8c5656b3a77d0080775c110b04f2753de7a6 WHIRLPOOL 79cb7e620eb8e838192dc557c7a9ce7e713227d783cc8b63792825559b2145cad70d0af6f99948c1527557bc363feffd846c73893682b4a14fc7d08b9e20c649
+DIST patchbundle-selinux-base-policy-2.20141203-r9.tar.bz2 299602 SHA256 e8518004942a6c57170a609683e22b1410c93a2a195829c41dc8fbc703d941b5 SHA512 ce6484fbca1d2d074e50d1a3953392bd3ce0a4617df98fbac37747b469b4f160a9331586dfe1c3ddccb1ccbee24876a2f05ab49e37c8492a48baf83c2d01d140 WHIRLPOOL 1fd7b956e98e95a64c3a713a944d4531259bd156a7feabf6a89c4b5f33ac846377730eede97889e85183be086f282ebd18e860214f6ca3f01b40f2323470ee04
 DIST refpolicy-2.20140311.tar.bz2 664416 SHA256 f69437db95548c78a5dec44c236397146b144153149009ea554d2e536e5436f7 SHA512 50bacee82ed41ac8b8007ecc33bf51d22303cc2ddd27cfb72cb5520dab5f8e255186e34b89cec492c7a2d4220b200814bdede9b46c19f987a3d3d65a1c9b749a WHIRLPOOL e07480beba6ab1f02ad36b7d0c50c4a71cb39a8ec78bf8d1dc3c82bb9dd1d69d9169d7c937165ea15f60ce1147f256d46644f944107a3a8a800d5bad70d4c255
 DIST refpolicy-2.20141203.tar.bz2 680243 SHA256 f438209c430d8a2d4ddcbe4bdd3edb46f6af7dc4913637af0b73c635e40c1522 SHA512 682e4280c5799e4c12ec7594afc1389f67be35055748d2e0dbdc3419159a16c96d4946ca6178daee8370515951f8653b2e452efe8c962b8d7f9bc192f0b15a0c WHIRLPOOL 74bca232534e7af9051bb1ab9f77c1ff6c425781cf4561f781d6e9a40cc5ca0d9add540249ea5493e8782a9372aea296ead6c165c6c440ae1509eb319d151ee5
diff --git a/sec-policy/selinux-unconfined/selinux-unconfined-2.20141203-r8.ebuild b/sec-policy/selinux-unconfined/selinux-unconfined-2.20141203-r8.ebuild
index c8667a824184..141e496b772d 100644
--- a/sec-policy/selinux-unconfined/selinux-unconfined-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-unconfined/selinux-unconfined-2.20141203-r8.ebuild
@@ -13,5 +13,5 @@ DESCRIPTION="SELinux policy for unconfined"
 if [[ $PV == 9999* ]] ; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-unconfined/selinux-unconfined-2.20141203-r9.ebuild b/sec-policy/selinux-unconfined/selinux-unconfined-2.20141203-r9.ebuild
new file mode 100644
index 000000000000..c8667a824184
--- /dev/null
+++ b/sec-policy/selinux-unconfined/selinux-unconfined-2.20141203-r9.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI="5"
+
+IUSE=""
+MODS="unconfined"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for unconfined"
+
+if [[ $PV == 9999* ]] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
diff --git a/sec-policy/selinux-uptime/Manifest b/sec-policy/selinux-uptime/Manifest
index 8327a635be01..91d204b0021a 100644
--- a/sec-policy/selinux-uptime/Manifest
+++ b/sec-policy/selinux-uptime/Manifest
@@ -9,5 +9,6 @@ DIST patchbundle-selinux-base-policy-2.20141203-r5.tar.bz2 274136 SHA256 c23d17c
 DIST patchbundle-selinux-base-policy-2.20141203-r6.tar.bz2 293231 SHA256 b686dcc517b97834f66d967afdcc724cb43b5c6dbf9f34043a91cdeda2625cc7 SHA512 a2c486cbe4a1d21ff3fd01bef25ecf5a633a4072646c67cfccf3f7187d95f3d9e3b482a46ba17c55c40a8e7c0dee56e9cf9ddc9f414d3e4511443b62f60d03e9 WHIRLPOOL 3d708e287e3f9b873be647b0327eab6675a8702ee1cffb56e36934cada306e5ccc64397a083dad9e59de37a067e628cacbf896ae99012d5a209e42fd7cd8a4c6
 DIST patchbundle-selinux-base-policy-2.20141203-r7.tar.bz2 295833 SHA256 ba2219b3efc747be65f94c4d8ac3cd6ee530c82c848fa41935a114184678622a SHA512 8e32d9dbfb2f0f3f50200543aadb51ed9834ccd5cdf30bf8e4d9e6d0b645ce44ffaf80f7aa9385e9c9095d9a383b3a348a92356cb5386c06544ab082a9a468c7 WHIRLPOOL 1648ee1be71e45fcf5a264816ce7edc7bab19bd28a68703923eb2d6068f1f0469ae593855231d31f88baecbf29e7cece2d6beeed20b7c04231a6c90e90d35910
 DIST patchbundle-selinux-base-policy-2.20141203-r8.tar.bz2 297919 SHA256 77539eb3d78105f8789cd8205d2698bd27e2abf100163bdd162cda860fd15120 SHA512 2f8a19e1e4bb65f32b480275f49099aed3ae9df543c7de862b3bbd93e81b89cd96dadac3d091e28673d09a6885db8c5656b3a77d0080775c110b04f2753de7a6 WHIRLPOOL 79cb7e620eb8e838192dc557c7a9ce7e713227d783cc8b63792825559b2145cad70d0af6f99948c1527557bc363feffd846c73893682b4a14fc7d08b9e20c649
+DIST patchbundle-selinux-base-policy-2.20141203-r9.tar.bz2 299602 SHA256 e8518004942a6c57170a609683e22b1410c93a2a195829c41dc8fbc703d941b5 SHA512 ce6484fbca1d2d074e50d1a3953392bd3ce0a4617df98fbac37747b469b4f160a9331586dfe1c3ddccb1ccbee24876a2f05ab49e37c8492a48baf83c2d01d140 WHIRLPOOL 1fd7b956e98e95a64c3a713a944d4531259bd156a7feabf6a89c4b5f33ac846377730eede97889e85183be086f282ebd18e860214f6ca3f01b40f2323470ee04
 DIST refpolicy-2.20140311.tar.bz2 664416 SHA256 f69437db95548c78a5dec44c236397146b144153149009ea554d2e536e5436f7 SHA512 50bacee82ed41ac8b8007ecc33bf51d22303cc2ddd27cfb72cb5520dab5f8e255186e34b89cec492c7a2d4220b200814bdede9b46c19f987a3d3d65a1c9b749a WHIRLPOOL e07480beba6ab1f02ad36b7d0c50c4a71cb39a8ec78bf8d1dc3c82bb9dd1d69d9169d7c937165ea15f60ce1147f256d46644f944107a3a8a800d5bad70d4c255
 DIST refpolicy-2.20141203.tar.bz2 680243 SHA256 f438209c430d8a2d4ddcbe4bdd3edb46f6af7dc4913637af0b73c635e40c1522 SHA512 682e4280c5799e4c12ec7594afc1389f67be35055748d2e0dbdc3419159a16c96d4946ca6178daee8370515951f8653b2e452efe8c962b8d7f9bc192f0b15a0c WHIRLPOOL 74bca232534e7af9051bb1ab9f77c1ff6c425781cf4561f781d6e9a40cc5ca0d9add540249ea5493e8782a9372aea296ead6c165c6c440ae1509eb319d151ee5
diff --git a/sec-policy/selinux-uptime/selinux-uptime-2.20141203-r8.ebuild b/sec-policy/selinux-uptime/selinux-uptime-2.20141203-r8.ebuild
index 0b2bcd1d54d9..72317e5a6931 100644
--- a/sec-policy/selinux-uptime/selinux-uptime-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-uptime/selinux-uptime-2.20141203-r8.ebuild
@@ -13,5 +13,5 @@ DESCRIPTION="SELinux policy for uptime"
 if [[ $PV == 9999* ]] ; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-uptime/selinux-uptime-2.20141203-r9.ebuild b/sec-policy/selinux-uptime/selinux-uptime-2.20141203-r9.ebuild
new file mode 100644
index 000000000000..0b2bcd1d54d9
--- /dev/null
+++ b/sec-policy/selinux-uptime/selinux-uptime-2.20141203-r9.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI="5"
+
+IUSE=""
+MODS="uptime"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for uptime"
+
+if [[ $PV == 9999* ]] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
diff --git a/sec-policy/selinux-usbmuxd/Manifest b/sec-policy/selinux-usbmuxd/Manifest
index 8327a635be01..91d204b0021a 100644
--- a/sec-policy/selinux-usbmuxd/Manifest
+++ b/sec-policy/selinux-usbmuxd/Manifest
@@ -9,5 +9,6 @@ DIST patchbundle-selinux-base-policy-2.20141203-r5.tar.bz2 274136 SHA256 c23d17c
 DIST patchbundle-selinux-base-policy-2.20141203-r6.tar.bz2 293231 SHA256 b686dcc517b97834f66d967afdcc724cb43b5c6dbf9f34043a91cdeda2625cc7 SHA512 a2c486cbe4a1d21ff3fd01bef25ecf5a633a4072646c67cfccf3f7187d95f3d9e3b482a46ba17c55c40a8e7c0dee56e9cf9ddc9f414d3e4511443b62f60d03e9 WHIRLPOOL 3d708e287e3f9b873be647b0327eab6675a8702ee1cffb56e36934cada306e5ccc64397a083dad9e59de37a067e628cacbf896ae99012d5a209e42fd7cd8a4c6
 DIST patchbundle-selinux-base-policy-2.20141203-r7.tar.bz2 295833 SHA256 ba2219b3efc747be65f94c4d8ac3cd6ee530c82c848fa41935a114184678622a SHA512 8e32d9dbfb2f0f3f50200543aadb51ed9834ccd5cdf30bf8e4d9e6d0b645ce44ffaf80f7aa9385e9c9095d9a383b3a348a92356cb5386c06544ab082a9a468c7 WHIRLPOOL 1648ee1be71e45fcf5a264816ce7edc7bab19bd28a68703923eb2d6068f1f0469ae593855231d31f88baecbf29e7cece2d6beeed20b7c04231a6c90e90d35910
 DIST patchbundle-selinux-base-policy-2.20141203-r8.tar.bz2 297919 SHA256 77539eb3d78105f8789cd8205d2698bd27e2abf100163bdd162cda860fd15120 SHA512 2f8a19e1e4bb65f32b480275f49099aed3ae9df543c7de862b3bbd93e81b89cd96dadac3d091e28673d09a6885db8c5656b3a77d0080775c110b04f2753de7a6 WHIRLPOOL 79cb7e620eb8e838192dc557c7a9ce7e713227d783cc8b63792825559b2145cad70d0af6f99948c1527557bc363feffd846c73893682b4a14fc7d08b9e20c649
+DIST patchbundle-selinux-base-policy-2.20141203-r9.tar.bz2 299602 SHA256 e8518004942a6c57170a609683e22b1410c93a2a195829c41dc8fbc703d941b5 SHA512 ce6484fbca1d2d074e50d1a3953392bd3ce0a4617df98fbac37747b469b4f160a9331586dfe1c3ddccb1ccbee24876a2f05ab49e37c8492a48baf83c2d01d140 WHIRLPOOL 1fd7b956e98e95a64c3a713a944d4531259bd156a7feabf6a89c4b5f33ac846377730eede97889e85183be086f282ebd18e860214f6ca3f01b40f2323470ee04
 DIST refpolicy-2.20140311.tar.bz2 664416 SHA256 f69437db95548c78a5dec44c236397146b144153149009ea554d2e536e5436f7 SHA512 50bacee82ed41ac8b8007ecc33bf51d22303cc2ddd27cfb72cb5520dab5f8e255186e34b89cec492c7a2d4220b200814bdede9b46c19f987a3d3d65a1c9b749a WHIRLPOOL e07480beba6ab1f02ad36b7d0c50c4a71cb39a8ec78bf8d1dc3c82bb9dd1d69d9169d7c937165ea15f60ce1147f256d46644f944107a3a8a800d5bad70d4c255
 DIST refpolicy-2.20141203.tar.bz2 680243 SHA256 f438209c430d8a2d4ddcbe4bdd3edb46f6af7dc4913637af0b73c635e40c1522 SHA512 682e4280c5799e4c12ec7594afc1389f67be35055748d2e0dbdc3419159a16c96d4946ca6178daee8370515951f8653b2e452efe8c962b8d7f9bc192f0b15a0c WHIRLPOOL 74bca232534e7af9051bb1ab9f77c1ff6c425781cf4561f781d6e9a40cc5ca0d9add540249ea5493e8782a9372aea296ead6c165c6c440ae1509eb319d151ee5
diff --git a/sec-policy/selinux-usbmuxd/selinux-usbmuxd-2.20141203-r8.ebuild b/sec-policy/selinux-usbmuxd/selinux-usbmuxd-2.20141203-r8.ebuild
index fc36f0c2855f..c69788dcda8e 100644
--- a/sec-policy/selinux-usbmuxd/selinux-usbmuxd-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-usbmuxd/selinux-usbmuxd-2.20141203-r8.ebuild
@@ -13,5 +13,5 @@ DESCRIPTION="SELinux policy for usbmuxd"
 if [[ $PV == 9999* ]] ; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-usbmuxd/selinux-usbmuxd-2.20141203-r9.ebuild b/sec-policy/selinux-usbmuxd/selinux-usbmuxd-2.20141203-r9.ebuild
new file mode 100644
index 000000000000..fc36f0c2855f
--- /dev/null
+++ b/sec-policy/selinux-usbmuxd/selinux-usbmuxd-2.20141203-r9.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI="5"
+
+IUSE=""
+MODS="usbmuxd"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for usbmuxd"
+
+if [[ $PV == 9999* ]] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
diff --git a/sec-policy/selinux-uucp/Manifest b/sec-policy/selinux-uucp/Manifest
index 8327a635be01..91d204b0021a 100644
--- a/sec-policy/selinux-uucp/Manifest
+++ b/sec-policy/selinux-uucp/Manifest
@@ -9,5 +9,6 @@ DIST patchbundle-selinux-base-policy-2.20141203-r5.tar.bz2 274136 SHA256 c23d17c
 DIST patchbundle-selinux-base-policy-2.20141203-r6.tar.bz2 293231 SHA256 b686dcc517b97834f66d967afdcc724cb43b5c6dbf9f34043a91cdeda2625cc7 SHA512 a2c486cbe4a1d21ff3fd01bef25ecf5a633a4072646c67cfccf3f7187d95f3d9e3b482a46ba17c55c40a8e7c0dee56e9cf9ddc9f414d3e4511443b62f60d03e9 WHIRLPOOL 3d708e287e3f9b873be647b0327eab6675a8702ee1cffb56e36934cada306e5ccc64397a083dad9e59de37a067e628cacbf896ae99012d5a209e42fd7cd8a4c6
 DIST patchbundle-selinux-base-policy-2.20141203-r7.tar.bz2 295833 SHA256 ba2219b3efc747be65f94c4d8ac3cd6ee530c82c848fa41935a114184678622a SHA512 8e32d9dbfb2f0f3f50200543aadb51ed9834ccd5cdf30bf8e4d9e6d0b645ce44ffaf80f7aa9385e9c9095d9a383b3a348a92356cb5386c06544ab082a9a468c7 WHIRLPOOL 1648ee1be71e45fcf5a264816ce7edc7bab19bd28a68703923eb2d6068f1f0469ae593855231d31f88baecbf29e7cece2d6beeed20b7c04231a6c90e90d35910
 DIST patchbundle-selinux-base-policy-2.20141203-r8.tar.bz2 297919 SHA256 77539eb3d78105f8789cd8205d2698bd27e2abf100163bdd162cda860fd15120 SHA512 2f8a19e1e4bb65f32b480275f49099aed3ae9df543c7de862b3bbd93e81b89cd96dadac3d091e28673d09a6885db8c5656b3a77d0080775c110b04f2753de7a6 WHIRLPOOL 79cb7e620eb8e838192dc557c7a9ce7e713227d783cc8b63792825559b2145cad70d0af6f99948c1527557bc363feffd846c73893682b4a14fc7d08b9e20c649
+DIST patchbundle-selinux-base-policy-2.20141203-r9.tar.bz2 299602 SHA256 e8518004942a6c57170a609683e22b1410c93a2a195829c41dc8fbc703d941b5 SHA512 ce6484fbca1d2d074e50d1a3953392bd3ce0a4617df98fbac37747b469b4f160a9331586dfe1c3ddccb1ccbee24876a2f05ab49e37c8492a48baf83c2d01d140 WHIRLPOOL 1fd7b956e98e95a64c3a713a944d4531259bd156a7feabf6a89c4b5f33ac846377730eede97889e85183be086f282ebd18e860214f6ca3f01b40f2323470ee04
 DIST refpolicy-2.20140311.tar.bz2 664416 SHA256 f69437db95548c78a5dec44c236397146b144153149009ea554d2e536e5436f7 SHA512 50bacee82ed41ac8b8007ecc33bf51d22303cc2ddd27cfb72cb5520dab5f8e255186e34b89cec492c7a2d4220b200814bdede9b46c19f987a3d3d65a1c9b749a WHIRLPOOL e07480beba6ab1f02ad36b7d0c50c4a71cb39a8ec78bf8d1dc3c82bb9dd1d69d9169d7c937165ea15f60ce1147f256d46644f944107a3a8a800d5bad70d4c255
 DIST refpolicy-2.20141203.tar.bz2 680243 SHA256 f438209c430d8a2d4ddcbe4bdd3edb46f6af7dc4913637af0b73c635e40c1522 SHA512 682e4280c5799e4c12ec7594afc1389f67be35055748d2e0dbdc3419159a16c96d4946ca6178daee8370515951f8653b2e452efe8c962b8d7f9bc192f0b15a0c WHIRLPOOL 74bca232534e7af9051bb1ab9f77c1ff6c425781cf4561f781d6e9a40cc5ca0d9add540249ea5493e8782a9372aea296ead6c165c6c440ae1509eb319d151ee5
diff --git a/sec-policy/selinux-uucp/selinux-uucp-2.20141203-r8.ebuild b/sec-policy/selinux-uucp/selinux-uucp-2.20141203-r8.ebuild
index 9806412866d9..e092a9f70045 100644
--- a/sec-policy/selinux-uucp/selinux-uucp-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-uucp/selinux-uucp-2.20141203-r8.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="SELinux policy for uucp"
 if [[ $PV == 9999* ]] ; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-inetd
diff --git a/sec-policy/selinux-uucp/selinux-uucp-2.20141203-r9.ebuild b/sec-policy/selinux-uucp/selinux-uucp-2.20141203-r9.ebuild
new file mode 100644
index 000000000000..9806412866d9
--- /dev/null
+++ b/sec-policy/selinux-uucp/selinux-uucp-2.20141203-r9.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI="5"
+
+IUSE=""
+MODS="uucp"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for uucp"
+
+if [[ $PV == 9999* ]] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
+DEPEND="${DEPEND}
+	sec-policy/selinux-inetd
+"
+RDEPEND="${RDEPEND}
+	sec-policy/selinux-inetd
+"
diff --git a/sec-policy/selinux-uwimap/Manifest b/sec-policy/selinux-uwimap/Manifest
index 8327a635be01..91d204b0021a 100644
--- a/sec-policy/selinux-uwimap/Manifest
+++ b/sec-policy/selinux-uwimap/Manifest
@@ -9,5 +9,6 @@ DIST patchbundle-selinux-base-policy-2.20141203-r5.tar.bz2 274136 SHA256 c23d17c
 DIST patchbundle-selinux-base-policy-2.20141203-r6.tar.bz2 293231 SHA256 b686dcc517b97834f66d967afdcc724cb43b5c6dbf9f34043a91cdeda2625cc7 SHA512 a2c486cbe4a1d21ff3fd01bef25ecf5a633a4072646c67cfccf3f7187d95f3d9e3b482a46ba17c55c40a8e7c0dee56e9cf9ddc9f414d3e4511443b62f60d03e9 WHIRLPOOL 3d708e287e3f9b873be647b0327eab6675a8702ee1cffb56e36934cada306e5ccc64397a083dad9e59de37a067e628cacbf896ae99012d5a209e42fd7cd8a4c6
 DIST patchbundle-selinux-base-policy-2.20141203-r7.tar.bz2 295833 SHA256 ba2219b3efc747be65f94c4d8ac3cd6ee530c82c848fa41935a114184678622a SHA512 8e32d9dbfb2f0f3f50200543aadb51ed9834ccd5cdf30bf8e4d9e6d0b645ce44ffaf80f7aa9385e9c9095d9a383b3a348a92356cb5386c06544ab082a9a468c7 WHIRLPOOL 1648ee1be71e45fcf5a264816ce7edc7bab19bd28a68703923eb2d6068f1f0469ae593855231d31f88baecbf29e7cece2d6beeed20b7c04231a6c90e90d35910
 DIST patchbundle-selinux-base-policy-2.20141203-r8.tar.bz2 297919 SHA256 77539eb3d78105f8789cd8205d2698bd27e2abf100163bdd162cda860fd15120 SHA512 2f8a19e1e4bb65f32b480275f49099aed3ae9df543c7de862b3bbd93e81b89cd96dadac3d091e28673d09a6885db8c5656b3a77d0080775c110b04f2753de7a6 WHIRLPOOL 79cb7e620eb8e838192dc557c7a9ce7e713227d783cc8b63792825559b2145cad70d0af6f99948c1527557bc363feffd846c73893682b4a14fc7d08b9e20c649
+DIST patchbundle-selinux-base-policy-2.20141203-r9.tar.bz2 299602 SHA256 e8518004942a6c57170a609683e22b1410c93a2a195829c41dc8fbc703d941b5 SHA512 ce6484fbca1d2d074e50d1a3953392bd3ce0a4617df98fbac37747b469b4f160a9331586dfe1c3ddccb1ccbee24876a2f05ab49e37c8492a48baf83c2d01d140 WHIRLPOOL 1fd7b956e98e95a64c3a713a944d4531259bd156a7feabf6a89c4b5f33ac846377730eede97889e85183be086f282ebd18e860214f6ca3f01b40f2323470ee04
 DIST refpolicy-2.20140311.tar.bz2 664416 SHA256 f69437db95548c78a5dec44c236397146b144153149009ea554d2e536e5436f7 SHA512 50bacee82ed41ac8b8007ecc33bf51d22303cc2ddd27cfb72cb5520dab5f8e255186e34b89cec492c7a2d4220b200814bdede9b46c19f987a3d3d65a1c9b749a WHIRLPOOL e07480beba6ab1f02ad36b7d0c50c4a71cb39a8ec78bf8d1dc3c82bb9dd1d69d9169d7c937165ea15f60ce1147f256d46644f944107a3a8a800d5bad70d4c255
 DIST refpolicy-2.20141203.tar.bz2 680243 SHA256 f438209c430d8a2d4ddcbe4bdd3edb46f6af7dc4913637af0b73c635e40c1522 SHA512 682e4280c5799e4c12ec7594afc1389f67be35055748d2e0dbdc3419159a16c96d4946ca6178daee8370515951f8653b2e452efe8c962b8d7f9bc192f0b15a0c WHIRLPOOL 74bca232534e7af9051bb1ab9f77c1ff6c425781cf4561f781d6e9a40cc5ca0d9add540249ea5493e8782a9372aea296ead6c165c6c440ae1509eb319d151ee5
diff --git a/sec-policy/selinux-uwimap/selinux-uwimap-2.20141203-r8.ebuild b/sec-policy/selinux-uwimap/selinux-uwimap-2.20141203-r8.ebuild
index d6c25f9dd08a..2f79184024f0 100644
--- a/sec-policy/selinux-uwimap/selinux-uwimap-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-uwimap/selinux-uwimap-2.20141203-r8.ebuild
@@ -13,5 +13,5 @@ DESCRIPTION="SELinux policy for uwimap"
 if [[ $PV == 9999* ]] ; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-uwimap/selinux-uwimap-2.20141203-r9.ebuild b/sec-policy/selinux-uwimap/selinux-uwimap-2.20141203-r9.ebuild
new file mode 100644
index 000000000000..d6c25f9dd08a
--- /dev/null
+++ b/sec-policy/selinux-uwimap/selinux-uwimap-2.20141203-r9.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI="5"
+
+IUSE=""
+MODS="uwimap"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for uwimap"
+
+if [[ $PV == 9999* ]] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
diff --git a/sec-policy/selinux-uwsgi/Manifest b/sec-policy/selinux-uwsgi/Manifest
index 58f612f85f47..9e8e9f5a6a9d 100644
--- a/sec-policy/selinux-uwsgi/Manifest
+++ b/sec-policy/selinux-uwsgi/Manifest
@@ -2,4 +2,5 @@ DIST patchbundle-selinux-base-policy-2.20141203-r5.tar.bz2 274136 SHA256 c23d17c
 DIST patchbundle-selinux-base-policy-2.20141203-r6.tar.bz2 293231 SHA256 b686dcc517b97834f66d967afdcc724cb43b5c6dbf9f34043a91cdeda2625cc7 SHA512 a2c486cbe4a1d21ff3fd01bef25ecf5a633a4072646c67cfccf3f7187d95f3d9e3b482a46ba17c55c40a8e7c0dee56e9cf9ddc9f414d3e4511443b62f60d03e9 WHIRLPOOL 3d708e287e3f9b873be647b0327eab6675a8702ee1cffb56e36934cada306e5ccc64397a083dad9e59de37a067e628cacbf896ae99012d5a209e42fd7cd8a4c6
 DIST patchbundle-selinux-base-policy-2.20141203-r7.tar.bz2 295833 SHA256 ba2219b3efc747be65f94c4d8ac3cd6ee530c82c848fa41935a114184678622a SHA512 8e32d9dbfb2f0f3f50200543aadb51ed9834ccd5cdf30bf8e4d9e6d0b645ce44ffaf80f7aa9385e9c9095d9a383b3a348a92356cb5386c06544ab082a9a468c7 WHIRLPOOL 1648ee1be71e45fcf5a264816ce7edc7bab19bd28a68703923eb2d6068f1f0469ae593855231d31f88baecbf29e7cece2d6beeed20b7c04231a6c90e90d35910
 DIST patchbundle-selinux-base-policy-2.20141203-r8.tar.bz2 297919 SHA256 77539eb3d78105f8789cd8205d2698bd27e2abf100163bdd162cda860fd15120 SHA512 2f8a19e1e4bb65f32b480275f49099aed3ae9df543c7de862b3bbd93e81b89cd96dadac3d091e28673d09a6885db8c5656b3a77d0080775c110b04f2753de7a6 WHIRLPOOL 79cb7e620eb8e838192dc557c7a9ce7e713227d783cc8b63792825559b2145cad70d0af6f99948c1527557bc363feffd846c73893682b4a14fc7d08b9e20c649
+DIST patchbundle-selinux-base-policy-2.20141203-r9.tar.bz2 299602 SHA256 e8518004942a6c57170a609683e22b1410c93a2a195829c41dc8fbc703d941b5 SHA512 ce6484fbca1d2d074e50d1a3953392bd3ce0a4617df98fbac37747b469b4f160a9331586dfe1c3ddccb1ccbee24876a2f05ab49e37c8492a48baf83c2d01d140 WHIRLPOOL 1fd7b956e98e95a64c3a713a944d4531259bd156a7feabf6a89c4b5f33ac846377730eede97889e85183be086f282ebd18e860214f6ca3f01b40f2323470ee04
 DIST refpolicy-2.20141203.tar.bz2 680243 SHA256 f438209c430d8a2d4ddcbe4bdd3edb46f6af7dc4913637af0b73c635e40c1522 SHA512 682e4280c5799e4c12ec7594afc1389f67be35055748d2e0dbdc3419159a16c96d4946ca6178daee8370515951f8653b2e452efe8c962b8d7f9bc192f0b15a0c WHIRLPOOL 74bca232534e7af9051bb1ab9f77c1ff6c425781cf4561f781d6e9a40cc5ca0d9add540249ea5493e8782a9372aea296ead6c165c6c440ae1509eb319d151ee5
diff --git a/sec-policy/selinux-uwsgi/selinux-uwsgi-2.20141203-r8.ebuild b/sec-policy/selinux-uwsgi/selinux-uwsgi-2.20141203-r8.ebuild
index 20ab2229a22b..0bd8ac373a5c 100644
--- a/sec-policy/selinux-uwsgi/selinux-uwsgi-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-uwsgi/selinux-uwsgi-2.20141203-r8.ebuild
@@ -13,5 +13,5 @@ DESCRIPTION="SELinux policy for uWSGI"
 if [[ $PV == 9999* ]] ; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-uwsgi/selinux-uwsgi-2.20141203-r9.ebuild b/sec-policy/selinux-uwsgi/selinux-uwsgi-2.20141203-r9.ebuild
new file mode 100644
index 000000000000..20ab2229a22b
--- /dev/null
+++ b/sec-policy/selinux-uwsgi/selinux-uwsgi-2.20141203-r9.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI="5"
+
+IUSE=""
+MODS="uwsgi"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for uWSGI"
+
+if [[ $PV == 9999* ]] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
diff --git a/sec-policy/selinux-varnishd/Manifest b/sec-policy/selinux-varnishd/Manifest
index 8327a635be01..91d204b0021a 100644
--- a/sec-policy/selinux-varnishd/Manifest
+++ b/sec-policy/selinux-varnishd/Manifest
@@ -9,5 +9,6 @@ DIST patchbundle-selinux-base-policy-2.20141203-r5.tar.bz2 274136 SHA256 c23d17c
 DIST patchbundle-selinux-base-policy-2.20141203-r6.tar.bz2 293231 SHA256 b686dcc517b97834f66d967afdcc724cb43b5c6dbf9f34043a91cdeda2625cc7 SHA512 a2c486cbe4a1d21ff3fd01bef25ecf5a633a4072646c67cfccf3f7187d95f3d9e3b482a46ba17c55c40a8e7c0dee56e9cf9ddc9f414d3e4511443b62f60d03e9 WHIRLPOOL 3d708e287e3f9b873be647b0327eab6675a8702ee1cffb56e36934cada306e5ccc64397a083dad9e59de37a067e628cacbf896ae99012d5a209e42fd7cd8a4c6
 DIST patchbundle-selinux-base-policy-2.20141203-r7.tar.bz2 295833 SHA256 ba2219b3efc747be65f94c4d8ac3cd6ee530c82c848fa41935a114184678622a SHA512 8e32d9dbfb2f0f3f50200543aadb51ed9834ccd5cdf30bf8e4d9e6d0b645ce44ffaf80f7aa9385e9c9095d9a383b3a348a92356cb5386c06544ab082a9a468c7 WHIRLPOOL 1648ee1be71e45fcf5a264816ce7edc7bab19bd28a68703923eb2d6068f1f0469ae593855231d31f88baecbf29e7cece2d6beeed20b7c04231a6c90e90d35910
 DIST patchbundle-selinux-base-policy-2.20141203-r8.tar.bz2 297919 SHA256 77539eb3d78105f8789cd8205d2698bd27e2abf100163bdd162cda860fd15120 SHA512 2f8a19e1e4bb65f32b480275f49099aed3ae9df543c7de862b3bbd93e81b89cd96dadac3d091e28673d09a6885db8c5656b3a77d0080775c110b04f2753de7a6 WHIRLPOOL 79cb7e620eb8e838192dc557c7a9ce7e713227d783cc8b63792825559b2145cad70d0af6f99948c1527557bc363feffd846c73893682b4a14fc7d08b9e20c649
+DIST patchbundle-selinux-base-policy-2.20141203-r9.tar.bz2 299602 SHA256 e8518004942a6c57170a609683e22b1410c93a2a195829c41dc8fbc703d941b5 SHA512 ce6484fbca1d2d074e50d1a3953392bd3ce0a4617df98fbac37747b469b4f160a9331586dfe1c3ddccb1ccbee24876a2f05ab49e37c8492a48baf83c2d01d140 WHIRLPOOL 1fd7b956e98e95a64c3a713a944d4531259bd156a7feabf6a89c4b5f33ac846377730eede97889e85183be086f282ebd18e860214f6ca3f01b40f2323470ee04
 DIST refpolicy-2.20140311.tar.bz2 664416 SHA256 f69437db95548c78a5dec44c236397146b144153149009ea554d2e536e5436f7 SHA512 50bacee82ed41ac8b8007ecc33bf51d22303cc2ddd27cfb72cb5520dab5f8e255186e34b89cec492c7a2d4220b200814bdede9b46c19f987a3d3d65a1c9b749a WHIRLPOOL e07480beba6ab1f02ad36b7d0c50c4a71cb39a8ec78bf8d1dc3c82bb9dd1d69d9169d7c937165ea15f60ce1147f256d46644f944107a3a8a800d5bad70d4c255
 DIST refpolicy-2.20141203.tar.bz2 680243 SHA256 f438209c430d8a2d4ddcbe4bdd3edb46f6af7dc4913637af0b73c635e40c1522 SHA512 682e4280c5799e4c12ec7594afc1389f67be35055748d2e0dbdc3419159a16c96d4946ca6178daee8370515951f8653b2e452efe8c962b8d7f9bc192f0b15a0c WHIRLPOOL 74bca232534e7af9051bb1ab9f77c1ff6c425781cf4561f781d6e9a40cc5ca0d9add540249ea5493e8782a9372aea296ead6c165c6c440ae1509eb319d151ee5
diff --git a/sec-policy/selinux-varnishd/selinux-varnishd-2.20141203-r8.ebuild b/sec-policy/selinux-varnishd/selinux-varnishd-2.20141203-r8.ebuild
index 18713071f12c..5a2f55aa6df5 100644
--- a/sec-policy/selinux-varnishd/selinux-varnishd-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-varnishd/selinux-varnishd-2.20141203-r8.ebuild
@@ -13,5 +13,5 @@ DESCRIPTION="SELinux policy for varnishd"
 if [[ $PV == 9999* ]] ; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-varnishd/selinux-varnishd-2.20141203-r9.ebuild b/sec-policy/selinux-varnishd/selinux-varnishd-2.20141203-r9.ebuild
new file mode 100644
index 000000000000..18713071f12c
--- /dev/null
+++ b/sec-policy/selinux-varnishd/selinux-varnishd-2.20141203-r9.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI="5"
+
+IUSE=""
+MODS="varnishd"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for varnishd"
+
+if [[ $PV == 9999* ]] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
diff --git a/sec-policy/selinux-vbetool/Manifest b/sec-policy/selinux-vbetool/Manifest
index 8327a635be01..91d204b0021a 100644
--- a/sec-policy/selinux-vbetool/Manifest
+++ b/sec-policy/selinux-vbetool/Manifest
@@ -9,5 +9,6 @@ DIST patchbundle-selinux-base-policy-2.20141203-r5.tar.bz2 274136 SHA256 c23d17c
 DIST patchbundle-selinux-base-policy-2.20141203-r6.tar.bz2 293231 SHA256 b686dcc517b97834f66d967afdcc724cb43b5c6dbf9f34043a91cdeda2625cc7 SHA512 a2c486cbe4a1d21ff3fd01bef25ecf5a633a4072646c67cfccf3f7187d95f3d9e3b482a46ba17c55c40a8e7c0dee56e9cf9ddc9f414d3e4511443b62f60d03e9 WHIRLPOOL 3d708e287e3f9b873be647b0327eab6675a8702ee1cffb56e36934cada306e5ccc64397a083dad9e59de37a067e628cacbf896ae99012d5a209e42fd7cd8a4c6
 DIST patchbundle-selinux-base-policy-2.20141203-r7.tar.bz2 295833 SHA256 ba2219b3efc747be65f94c4d8ac3cd6ee530c82c848fa41935a114184678622a SHA512 8e32d9dbfb2f0f3f50200543aadb51ed9834ccd5cdf30bf8e4d9e6d0b645ce44ffaf80f7aa9385e9c9095d9a383b3a348a92356cb5386c06544ab082a9a468c7 WHIRLPOOL 1648ee1be71e45fcf5a264816ce7edc7bab19bd28a68703923eb2d6068f1f0469ae593855231d31f88baecbf29e7cece2d6beeed20b7c04231a6c90e90d35910
 DIST patchbundle-selinux-base-policy-2.20141203-r8.tar.bz2 297919 SHA256 77539eb3d78105f8789cd8205d2698bd27e2abf100163bdd162cda860fd15120 SHA512 2f8a19e1e4bb65f32b480275f49099aed3ae9df543c7de862b3bbd93e81b89cd96dadac3d091e28673d09a6885db8c5656b3a77d0080775c110b04f2753de7a6 WHIRLPOOL 79cb7e620eb8e838192dc557c7a9ce7e713227d783cc8b63792825559b2145cad70d0af6f99948c1527557bc363feffd846c73893682b4a14fc7d08b9e20c649
+DIST patchbundle-selinux-base-policy-2.20141203-r9.tar.bz2 299602 SHA256 e8518004942a6c57170a609683e22b1410c93a2a195829c41dc8fbc703d941b5 SHA512 ce6484fbca1d2d074e50d1a3953392bd3ce0a4617df98fbac37747b469b4f160a9331586dfe1c3ddccb1ccbee24876a2f05ab49e37c8492a48baf83c2d01d140 WHIRLPOOL 1fd7b956e98e95a64c3a713a944d4531259bd156a7feabf6a89c4b5f33ac846377730eede97889e85183be086f282ebd18e860214f6ca3f01b40f2323470ee04
 DIST refpolicy-2.20140311.tar.bz2 664416 SHA256 f69437db95548c78a5dec44c236397146b144153149009ea554d2e536e5436f7 SHA512 50bacee82ed41ac8b8007ecc33bf51d22303cc2ddd27cfb72cb5520dab5f8e255186e34b89cec492c7a2d4220b200814bdede9b46c19f987a3d3d65a1c9b749a WHIRLPOOL e07480beba6ab1f02ad36b7d0c50c4a71cb39a8ec78bf8d1dc3c82bb9dd1d69d9169d7c937165ea15f60ce1147f256d46644f944107a3a8a800d5bad70d4c255
 DIST refpolicy-2.20141203.tar.bz2 680243 SHA256 f438209c430d8a2d4ddcbe4bdd3edb46f6af7dc4913637af0b73c635e40c1522 SHA512 682e4280c5799e4c12ec7594afc1389f67be35055748d2e0dbdc3419159a16c96d4946ca6178daee8370515951f8653b2e452efe8c962b8d7f9bc192f0b15a0c WHIRLPOOL 74bca232534e7af9051bb1ab9f77c1ff6c425781cf4561f781d6e9a40cc5ca0d9add540249ea5493e8782a9372aea296ead6c165c6c440ae1509eb319d151ee5
diff --git a/sec-policy/selinux-vbetool/selinux-vbetool-2.20141203-r8.ebuild b/sec-policy/selinux-vbetool/selinux-vbetool-2.20141203-r8.ebuild
index bafe50dd7ef4..65e6bcc7cb00 100644
--- a/sec-policy/selinux-vbetool/selinux-vbetool-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-vbetool/selinux-vbetool-2.20141203-r8.ebuild
@@ -13,5 +13,5 @@ DESCRIPTION="SELinux policy for vbetool"
 if [[ $PV == 9999* ]] ; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-vbetool/selinux-vbetool-2.20141203-r9.ebuild b/sec-policy/selinux-vbetool/selinux-vbetool-2.20141203-r9.ebuild
new file mode 100644
index 000000000000..bafe50dd7ef4
--- /dev/null
+++ b/sec-policy/selinux-vbetool/selinux-vbetool-2.20141203-r9.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI="5"
+
+IUSE=""
+MODS="vbetool"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for vbetool"
+
+if [[ $PV == 9999* ]] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
diff --git a/sec-policy/selinux-vdagent/Manifest b/sec-policy/selinux-vdagent/Manifest
index 8327a635be01..91d204b0021a 100644
--- a/sec-policy/selinux-vdagent/Manifest
+++ b/sec-policy/selinux-vdagent/Manifest
@@ -9,5 +9,6 @@ DIST patchbundle-selinux-base-policy-2.20141203-r5.tar.bz2 274136 SHA256 c23d17c
 DIST patchbundle-selinux-base-policy-2.20141203-r6.tar.bz2 293231 SHA256 b686dcc517b97834f66d967afdcc724cb43b5c6dbf9f34043a91cdeda2625cc7 SHA512 a2c486cbe4a1d21ff3fd01bef25ecf5a633a4072646c67cfccf3f7187d95f3d9e3b482a46ba17c55c40a8e7c0dee56e9cf9ddc9f414d3e4511443b62f60d03e9 WHIRLPOOL 3d708e287e3f9b873be647b0327eab6675a8702ee1cffb56e36934cada306e5ccc64397a083dad9e59de37a067e628cacbf896ae99012d5a209e42fd7cd8a4c6
 DIST patchbundle-selinux-base-policy-2.20141203-r7.tar.bz2 295833 SHA256 ba2219b3efc747be65f94c4d8ac3cd6ee530c82c848fa41935a114184678622a SHA512 8e32d9dbfb2f0f3f50200543aadb51ed9834ccd5cdf30bf8e4d9e6d0b645ce44ffaf80f7aa9385e9c9095d9a383b3a348a92356cb5386c06544ab082a9a468c7 WHIRLPOOL 1648ee1be71e45fcf5a264816ce7edc7bab19bd28a68703923eb2d6068f1f0469ae593855231d31f88baecbf29e7cece2d6beeed20b7c04231a6c90e90d35910
 DIST patchbundle-selinux-base-policy-2.20141203-r8.tar.bz2 297919 SHA256 77539eb3d78105f8789cd8205d2698bd27e2abf100163bdd162cda860fd15120 SHA512 2f8a19e1e4bb65f32b480275f49099aed3ae9df543c7de862b3bbd93e81b89cd96dadac3d091e28673d09a6885db8c5656b3a77d0080775c110b04f2753de7a6 WHIRLPOOL 79cb7e620eb8e838192dc557c7a9ce7e713227d783cc8b63792825559b2145cad70d0af6f99948c1527557bc363feffd846c73893682b4a14fc7d08b9e20c649
+DIST patchbundle-selinux-base-policy-2.20141203-r9.tar.bz2 299602 SHA256 e8518004942a6c57170a609683e22b1410c93a2a195829c41dc8fbc703d941b5 SHA512 ce6484fbca1d2d074e50d1a3953392bd3ce0a4617df98fbac37747b469b4f160a9331586dfe1c3ddccb1ccbee24876a2f05ab49e37c8492a48baf83c2d01d140 WHIRLPOOL 1fd7b956e98e95a64c3a713a944d4531259bd156a7feabf6a89c4b5f33ac846377730eede97889e85183be086f282ebd18e860214f6ca3f01b40f2323470ee04
 DIST refpolicy-2.20140311.tar.bz2 664416 SHA256 f69437db95548c78a5dec44c236397146b144153149009ea554d2e536e5436f7 SHA512 50bacee82ed41ac8b8007ecc33bf51d22303cc2ddd27cfb72cb5520dab5f8e255186e34b89cec492c7a2d4220b200814bdede9b46c19f987a3d3d65a1c9b749a WHIRLPOOL e07480beba6ab1f02ad36b7d0c50c4a71cb39a8ec78bf8d1dc3c82bb9dd1d69d9169d7c937165ea15f60ce1147f256d46644f944107a3a8a800d5bad70d4c255
 DIST refpolicy-2.20141203.tar.bz2 680243 SHA256 f438209c430d8a2d4ddcbe4bdd3edb46f6af7dc4913637af0b73c635e40c1522 SHA512 682e4280c5799e4c12ec7594afc1389f67be35055748d2e0dbdc3419159a16c96d4946ca6178daee8370515951f8653b2e452efe8c962b8d7f9bc192f0b15a0c WHIRLPOOL 74bca232534e7af9051bb1ab9f77c1ff6c425781cf4561f781d6e9a40cc5ca0d9add540249ea5493e8782a9372aea296ead6c165c6c440ae1509eb319d151ee5
diff --git a/sec-policy/selinux-vdagent/selinux-vdagent-2.20141203-r8.ebuild b/sec-policy/selinux-vdagent/selinux-vdagent-2.20141203-r8.ebuild
index db51541e64f8..dd00a67e066c 100644
--- a/sec-policy/selinux-vdagent/selinux-vdagent-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-vdagent/selinux-vdagent-2.20141203-r8.ebuild
@@ -13,5 +13,5 @@ DESCRIPTION="SELinux policy for vdagent"
 if [[ $PV == 9999* ]] ; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-vdagent/selinux-vdagent-2.20141203-r9.ebuild b/sec-policy/selinux-vdagent/selinux-vdagent-2.20141203-r9.ebuild
new file mode 100644
index 000000000000..db51541e64f8
--- /dev/null
+++ b/sec-policy/selinux-vdagent/selinux-vdagent-2.20141203-r9.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI="5"
+
+IUSE=""
+MODS="vdagent"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for vdagent"
+
+if [[ $PV == 9999* ]] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
diff --git a/sec-policy/selinux-vde/Manifest b/sec-policy/selinux-vde/Manifest
index 8327a635be01..91d204b0021a 100644
--- a/sec-policy/selinux-vde/Manifest
+++ b/sec-policy/selinux-vde/Manifest
@@ -9,5 +9,6 @@ DIST patchbundle-selinux-base-policy-2.20141203-r5.tar.bz2 274136 SHA256 c23d17c
 DIST patchbundle-selinux-base-policy-2.20141203-r6.tar.bz2 293231 SHA256 b686dcc517b97834f66d967afdcc724cb43b5c6dbf9f34043a91cdeda2625cc7 SHA512 a2c486cbe4a1d21ff3fd01bef25ecf5a633a4072646c67cfccf3f7187d95f3d9e3b482a46ba17c55c40a8e7c0dee56e9cf9ddc9f414d3e4511443b62f60d03e9 WHIRLPOOL 3d708e287e3f9b873be647b0327eab6675a8702ee1cffb56e36934cada306e5ccc64397a083dad9e59de37a067e628cacbf896ae99012d5a209e42fd7cd8a4c6
 DIST patchbundle-selinux-base-policy-2.20141203-r7.tar.bz2 295833 SHA256 ba2219b3efc747be65f94c4d8ac3cd6ee530c82c848fa41935a114184678622a SHA512 8e32d9dbfb2f0f3f50200543aadb51ed9834ccd5cdf30bf8e4d9e6d0b645ce44ffaf80f7aa9385e9c9095d9a383b3a348a92356cb5386c06544ab082a9a468c7 WHIRLPOOL 1648ee1be71e45fcf5a264816ce7edc7bab19bd28a68703923eb2d6068f1f0469ae593855231d31f88baecbf29e7cece2d6beeed20b7c04231a6c90e90d35910
 DIST patchbundle-selinux-base-policy-2.20141203-r8.tar.bz2 297919 SHA256 77539eb3d78105f8789cd8205d2698bd27e2abf100163bdd162cda860fd15120 SHA512 2f8a19e1e4bb65f32b480275f49099aed3ae9df543c7de862b3bbd93e81b89cd96dadac3d091e28673d09a6885db8c5656b3a77d0080775c110b04f2753de7a6 WHIRLPOOL 79cb7e620eb8e838192dc557c7a9ce7e713227d783cc8b63792825559b2145cad70d0af6f99948c1527557bc363feffd846c73893682b4a14fc7d08b9e20c649
+DIST patchbundle-selinux-base-policy-2.20141203-r9.tar.bz2 299602 SHA256 e8518004942a6c57170a609683e22b1410c93a2a195829c41dc8fbc703d941b5 SHA512 ce6484fbca1d2d074e50d1a3953392bd3ce0a4617df98fbac37747b469b4f160a9331586dfe1c3ddccb1ccbee24876a2f05ab49e37c8492a48baf83c2d01d140 WHIRLPOOL 1fd7b956e98e95a64c3a713a944d4531259bd156a7feabf6a89c4b5f33ac846377730eede97889e85183be086f282ebd18e860214f6ca3f01b40f2323470ee04
 DIST refpolicy-2.20140311.tar.bz2 664416 SHA256 f69437db95548c78a5dec44c236397146b144153149009ea554d2e536e5436f7 SHA512 50bacee82ed41ac8b8007ecc33bf51d22303cc2ddd27cfb72cb5520dab5f8e255186e34b89cec492c7a2d4220b200814bdede9b46c19f987a3d3d65a1c9b749a WHIRLPOOL e07480beba6ab1f02ad36b7d0c50c4a71cb39a8ec78bf8d1dc3c82bb9dd1d69d9169d7c937165ea15f60ce1147f256d46644f944107a3a8a800d5bad70d4c255
 DIST refpolicy-2.20141203.tar.bz2 680243 SHA256 f438209c430d8a2d4ddcbe4bdd3edb46f6af7dc4913637af0b73c635e40c1522 SHA512 682e4280c5799e4c12ec7594afc1389f67be35055748d2e0dbdc3419159a16c96d4946ca6178daee8370515951f8653b2e452efe8c962b8d7f9bc192f0b15a0c WHIRLPOOL 74bca232534e7af9051bb1ab9f77c1ff6c425781cf4561f781d6e9a40cc5ca0d9add540249ea5493e8782a9372aea296ead6c165c6c440ae1509eb319d151ee5
diff --git a/sec-policy/selinux-vde/selinux-vde-2.20141203-r8.ebuild b/sec-policy/selinux-vde/selinux-vde-2.20141203-r8.ebuild
index ed0d3c74b5b0..19e7ecb5b18a 100644
--- a/sec-policy/selinux-vde/selinux-vde-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-vde/selinux-vde-2.20141203-r8.ebuild
@@ -13,5 +13,5 @@ DESCRIPTION="SELinux policy for vde"
 if [[ $PV == 9999* ]] ; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-vde/selinux-vde-2.20141203-r9.ebuild b/sec-policy/selinux-vde/selinux-vde-2.20141203-r9.ebuild
new file mode 100644
index 000000000000..ed0d3c74b5b0
--- /dev/null
+++ b/sec-policy/selinux-vde/selinux-vde-2.20141203-r9.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI="5"
+
+IUSE=""
+MODS="vde"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for vde"
+
+if [[ $PV == 9999* ]] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
diff --git a/sec-policy/selinux-virt/Manifest b/sec-policy/selinux-virt/Manifest
index 8327a635be01..91d204b0021a 100644
--- a/sec-policy/selinux-virt/Manifest
+++ b/sec-policy/selinux-virt/Manifest
@@ -9,5 +9,6 @@ DIST patchbundle-selinux-base-policy-2.20141203-r5.tar.bz2 274136 SHA256 c23d17c
 DIST patchbundle-selinux-base-policy-2.20141203-r6.tar.bz2 293231 SHA256 b686dcc517b97834f66d967afdcc724cb43b5c6dbf9f34043a91cdeda2625cc7 SHA512 a2c486cbe4a1d21ff3fd01bef25ecf5a633a4072646c67cfccf3f7187d95f3d9e3b482a46ba17c55c40a8e7c0dee56e9cf9ddc9f414d3e4511443b62f60d03e9 WHIRLPOOL 3d708e287e3f9b873be647b0327eab6675a8702ee1cffb56e36934cada306e5ccc64397a083dad9e59de37a067e628cacbf896ae99012d5a209e42fd7cd8a4c6
 DIST patchbundle-selinux-base-policy-2.20141203-r7.tar.bz2 295833 SHA256 ba2219b3efc747be65f94c4d8ac3cd6ee530c82c848fa41935a114184678622a SHA512 8e32d9dbfb2f0f3f50200543aadb51ed9834ccd5cdf30bf8e4d9e6d0b645ce44ffaf80f7aa9385e9c9095d9a383b3a348a92356cb5386c06544ab082a9a468c7 WHIRLPOOL 1648ee1be71e45fcf5a264816ce7edc7bab19bd28a68703923eb2d6068f1f0469ae593855231d31f88baecbf29e7cece2d6beeed20b7c04231a6c90e90d35910
 DIST patchbundle-selinux-base-policy-2.20141203-r8.tar.bz2 297919 SHA256 77539eb3d78105f8789cd8205d2698bd27e2abf100163bdd162cda860fd15120 SHA512 2f8a19e1e4bb65f32b480275f49099aed3ae9df543c7de862b3bbd93e81b89cd96dadac3d091e28673d09a6885db8c5656b3a77d0080775c110b04f2753de7a6 WHIRLPOOL 79cb7e620eb8e838192dc557c7a9ce7e713227d783cc8b63792825559b2145cad70d0af6f99948c1527557bc363feffd846c73893682b4a14fc7d08b9e20c649
+DIST patchbundle-selinux-base-policy-2.20141203-r9.tar.bz2 299602 SHA256 e8518004942a6c57170a609683e22b1410c93a2a195829c41dc8fbc703d941b5 SHA512 ce6484fbca1d2d074e50d1a3953392bd3ce0a4617df98fbac37747b469b4f160a9331586dfe1c3ddccb1ccbee24876a2f05ab49e37c8492a48baf83c2d01d140 WHIRLPOOL 1fd7b956e98e95a64c3a713a944d4531259bd156a7feabf6a89c4b5f33ac846377730eede97889e85183be086f282ebd18e860214f6ca3f01b40f2323470ee04
 DIST refpolicy-2.20140311.tar.bz2 664416 SHA256 f69437db95548c78a5dec44c236397146b144153149009ea554d2e536e5436f7 SHA512 50bacee82ed41ac8b8007ecc33bf51d22303cc2ddd27cfb72cb5520dab5f8e255186e34b89cec492c7a2d4220b200814bdede9b46c19f987a3d3d65a1c9b749a WHIRLPOOL e07480beba6ab1f02ad36b7d0c50c4a71cb39a8ec78bf8d1dc3c82bb9dd1d69d9169d7c937165ea15f60ce1147f256d46644f944107a3a8a800d5bad70d4c255
 DIST refpolicy-2.20141203.tar.bz2 680243 SHA256 f438209c430d8a2d4ddcbe4bdd3edb46f6af7dc4913637af0b73c635e40c1522 SHA512 682e4280c5799e4c12ec7594afc1389f67be35055748d2e0dbdc3419159a16c96d4946ca6178daee8370515951f8653b2e452efe8c962b8d7f9bc192f0b15a0c WHIRLPOOL 74bca232534e7af9051bb1ab9f77c1ff6c425781cf4561f781d6e9a40cc5ca0d9add540249ea5493e8782a9372aea296ead6c165c6c440ae1509eb319d151ee5
diff --git a/sec-policy/selinux-virt/selinux-virt-2.20141203-r8.ebuild b/sec-policy/selinux-virt/selinux-virt-2.20141203-r8.ebuild
index 490dfd3f951d..bcc4f670fd9f 100644
--- a/sec-policy/selinux-virt/selinux-virt-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-virt/selinux-virt-2.20141203-r8.ebuild
@@ -13,5 +13,5 @@ DESCRIPTION="SELinux policy for virt"
 if [[ $PV == 9999* ]] ; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-virt/selinux-virt-2.20141203-r9.ebuild b/sec-policy/selinux-virt/selinux-virt-2.20141203-r9.ebuild
new file mode 100644
index 000000000000..490dfd3f951d
--- /dev/null
+++ b/sec-policy/selinux-virt/selinux-virt-2.20141203-r9.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI="5"
+
+IUSE=""
+MODS="virt"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for virt"
+
+if [[ $PV == 9999* ]] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
diff --git a/sec-policy/selinux-vlock/Manifest b/sec-policy/selinux-vlock/Manifest
index 8327a635be01..91d204b0021a 100644
--- a/sec-policy/selinux-vlock/Manifest
+++ b/sec-policy/selinux-vlock/Manifest
@@ -9,5 +9,6 @@ DIST patchbundle-selinux-base-policy-2.20141203-r5.tar.bz2 274136 SHA256 c23d17c
 DIST patchbundle-selinux-base-policy-2.20141203-r6.tar.bz2 293231 SHA256 b686dcc517b97834f66d967afdcc724cb43b5c6dbf9f34043a91cdeda2625cc7 SHA512 a2c486cbe4a1d21ff3fd01bef25ecf5a633a4072646c67cfccf3f7187d95f3d9e3b482a46ba17c55c40a8e7c0dee56e9cf9ddc9f414d3e4511443b62f60d03e9 WHIRLPOOL 3d708e287e3f9b873be647b0327eab6675a8702ee1cffb56e36934cada306e5ccc64397a083dad9e59de37a067e628cacbf896ae99012d5a209e42fd7cd8a4c6
 DIST patchbundle-selinux-base-policy-2.20141203-r7.tar.bz2 295833 SHA256 ba2219b3efc747be65f94c4d8ac3cd6ee530c82c848fa41935a114184678622a SHA512 8e32d9dbfb2f0f3f50200543aadb51ed9834ccd5cdf30bf8e4d9e6d0b645ce44ffaf80f7aa9385e9c9095d9a383b3a348a92356cb5386c06544ab082a9a468c7 WHIRLPOOL 1648ee1be71e45fcf5a264816ce7edc7bab19bd28a68703923eb2d6068f1f0469ae593855231d31f88baecbf29e7cece2d6beeed20b7c04231a6c90e90d35910
 DIST patchbundle-selinux-base-policy-2.20141203-r8.tar.bz2 297919 SHA256 77539eb3d78105f8789cd8205d2698bd27e2abf100163bdd162cda860fd15120 SHA512 2f8a19e1e4bb65f32b480275f49099aed3ae9df543c7de862b3bbd93e81b89cd96dadac3d091e28673d09a6885db8c5656b3a77d0080775c110b04f2753de7a6 WHIRLPOOL 79cb7e620eb8e838192dc557c7a9ce7e713227d783cc8b63792825559b2145cad70d0af6f99948c1527557bc363feffd846c73893682b4a14fc7d08b9e20c649
+DIST patchbundle-selinux-base-policy-2.20141203-r9.tar.bz2 299602 SHA256 e8518004942a6c57170a609683e22b1410c93a2a195829c41dc8fbc703d941b5 SHA512 ce6484fbca1d2d074e50d1a3953392bd3ce0a4617df98fbac37747b469b4f160a9331586dfe1c3ddccb1ccbee24876a2f05ab49e37c8492a48baf83c2d01d140 WHIRLPOOL 1fd7b956e98e95a64c3a713a944d4531259bd156a7feabf6a89c4b5f33ac846377730eede97889e85183be086f282ebd18e860214f6ca3f01b40f2323470ee04
 DIST refpolicy-2.20140311.tar.bz2 664416 SHA256 f69437db95548c78a5dec44c236397146b144153149009ea554d2e536e5436f7 SHA512 50bacee82ed41ac8b8007ecc33bf51d22303cc2ddd27cfb72cb5520dab5f8e255186e34b89cec492c7a2d4220b200814bdede9b46c19f987a3d3d65a1c9b749a WHIRLPOOL e07480beba6ab1f02ad36b7d0c50c4a71cb39a8ec78bf8d1dc3c82bb9dd1d69d9169d7c937165ea15f60ce1147f256d46644f944107a3a8a800d5bad70d4c255
 DIST refpolicy-2.20141203.tar.bz2 680243 SHA256 f438209c430d8a2d4ddcbe4bdd3edb46f6af7dc4913637af0b73c635e40c1522 SHA512 682e4280c5799e4c12ec7594afc1389f67be35055748d2e0dbdc3419159a16c96d4946ca6178daee8370515951f8653b2e452efe8c962b8d7f9bc192f0b15a0c WHIRLPOOL 74bca232534e7af9051bb1ab9f77c1ff6c425781cf4561f781d6e9a40cc5ca0d9add540249ea5493e8782a9372aea296ead6c165c6c440ae1509eb319d151ee5
diff --git a/sec-policy/selinux-vlock/selinux-vlock-2.20141203-r8.ebuild b/sec-policy/selinux-vlock/selinux-vlock-2.20141203-r8.ebuild
index e436c9d70bde..856e814c340f 100644
--- a/sec-policy/selinux-vlock/selinux-vlock-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-vlock/selinux-vlock-2.20141203-r8.ebuild
@@ -13,5 +13,5 @@ DESCRIPTION="SELinux policy for vlock"
 if [[ $PV == 9999* ]] ; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-vlock/selinux-vlock-2.20141203-r9.ebuild b/sec-policy/selinux-vlock/selinux-vlock-2.20141203-r9.ebuild
new file mode 100644
index 000000000000..e436c9d70bde
--- /dev/null
+++ b/sec-policy/selinux-vlock/selinux-vlock-2.20141203-r9.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI="5"
+
+IUSE=""
+MODS="vlock"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for vlock"
+
+if [[ $PV == 9999* ]] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
diff --git a/sec-policy/selinux-vmware/Manifest b/sec-policy/selinux-vmware/Manifest
index 8327a635be01..91d204b0021a 100644
--- a/sec-policy/selinux-vmware/Manifest
+++ b/sec-policy/selinux-vmware/Manifest
@@ -9,5 +9,6 @@ DIST patchbundle-selinux-base-policy-2.20141203-r5.tar.bz2 274136 SHA256 c23d17c
 DIST patchbundle-selinux-base-policy-2.20141203-r6.tar.bz2 293231 SHA256 b686dcc517b97834f66d967afdcc724cb43b5c6dbf9f34043a91cdeda2625cc7 SHA512 a2c486cbe4a1d21ff3fd01bef25ecf5a633a4072646c67cfccf3f7187d95f3d9e3b482a46ba17c55c40a8e7c0dee56e9cf9ddc9f414d3e4511443b62f60d03e9 WHIRLPOOL 3d708e287e3f9b873be647b0327eab6675a8702ee1cffb56e36934cada306e5ccc64397a083dad9e59de37a067e628cacbf896ae99012d5a209e42fd7cd8a4c6
 DIST patchbundle-selinux-base-policy-2.20141203-r7.tar.bz2 295833 SHA256 ba2219b3efc747be65f94c4d8ac3cd6ee530c82c848fa41935a114184678622a SHA512 8e32d9dbfb2f0f3f50200543aadb51ed9834ccd5cdf30bf8e4d9e6d0b645ce44ffaf80f7aa9385e9c9095d9a383b3a348a92356cb5386c06544ab082a9a468c7 WHIRLPOOL 1648ee1be71e45fcf5a264816ce7edc7bab19bd28a68703923eb2d6068f1f0469ae593855231d31f88baecbf29e7cece2d6beeed20b7c04231a6c90e90d35910
 DIST patchbundle-selinux-base-policy-2.20141203-r8.tar.bz2 297919 SHA256 77539eb3d78105f8789cd8205d2698bd27e2abf100163bdd162cda860fd15120 SHA512 2f8a19e1e4bb65f32b480275f49099aed3ae9df543c7de862b3bbd93e81b89cd96dadac3d091e28673d09a6885db8c5656b3a77d0080775c110b04f2753de7a6 WHIRLPOOL 79cb7e620eb8e838192dc557c7a9ce7e713227d783cc8b63792825559b2145cad70d0af6f99948c1527557bc363feffd846c73893682b4a14fc7d08b9e20c649
+DIST patchbundle-selinux-base-policy-2.20141203-r9.tar.bz2 299602 SHA256 e8518004942a6c57170a609683e22b1410c93a2a195829c41dc8fbc703d941b5 SHA512 ce6484fbca1d2d074e50d1a3953392bd3ce0a4617df98fbac37747b469b4f160a9331586dfe1c3ddccb1ccbee24876a2f05ab49e37c8492a48baf83c2d01d140 WHIRLPOOL 1fd7b956e98e95a64c3a713a944d4531259bd156a7feabf6a89c4b5f33ac846377730eede97889e85183be086f282ebd18e860214f6ca3f01b40f2323470ee04
 DIST refpolicy-2.20140311.tar.bz2 664416 SHA256 f69437db95548c78a5dec44c236397146b144153149009ea554d2e536e5436f7 SHA512 50bacee82ed41ac8b8007ecc33bf51d22303cc2ddd27cfb72cb5520dab5f8e255186e34b89cec492c7a2d4220b200814bdede9b46c19f987a3d3d65a1c9b749a WHIRLPOOL e07480beba6ab1f02ad36b7d0c50c4a71cb39a8ec78bf8d1dc3c82bb9dd1d69d9169d7c937165ea15f60ce1147f256d46644f944107a3a8a800d5bad70d4c255
 DIST refpolicy-2.20141203.tar.bz2 680243 SHA256 f438209c430d8a2d4ddcbe4bdd3edb46f6af7dc4913637af0b73c635e40c1522 SHA512 682e4280c5799e4c12ec7594afc1389f67be35055748d2e0dbdc3419159a16c96d4946ca6178daee8370515951f8653b2e452efe8c962b8d7f9bc192f0b15a0c WHIRLPOOL 74bca232534e7af9051bb1ab9f77c1ff6c425781cf4561f781d6e9a40cc5ca0d9add540249ea5493e8782a9372aea296ead6c165c6c440ae1509eb319d151ee5
diff --git a/sec-policy/selinux-vmware/selinux-vmware-2.20141203-r8.ebuild b/sec-policy/selinux-vmware/selinux-vmware-2.20141203-r8.ebuild
index 3e34b3dcaef9..aa3d3b370f9b 100644
--- a/sec-policy/selinux-vmware/selinux-vmware-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-vmware/selinux-vmware-2.20141203-r8.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="SELinux policy for vmware"
 if [[ $PV == 9999* ]] ; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-xserver
diff --git a/sec-policy/selinux-vmware/selinux-vmware-2.20141203-r9.ebuild b/sec-policy/selinux-vmware/selinux-vmware-2.20141203-r9.ebuild
new file mode 100644
index 000000000000..3e34b3dcaef9
--- /dev/null
+++ b/sec-policy/selinux-vmware/selinux-vmware-2.20141203-r9.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI="5"
+
+IUSE=""
+MODS="vmware"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for vmware"
+
+if [[ $PV == 9999* ]] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
+DEPEND="${DEPEND}
+	sec-policy/selinux-xserver
+"
+RDEPEND="${RDEPEND}
+	sec-policy/selinux-xserver
+"
diff --git a/sec-policy/selinux-vnstatd/Manifest b/sec-policy/selinux-vnstatd/Manifest
index 8327a635be01..91d204b0021a 100644
--- a/sec-policy/selinux-vnstatd/Manifest
+++ b/sec-policy/selinux-vnstatd/Manifest
@@ -9,5 +9,6 @@ DIST patchbundle-selinux-base-policy-2.20141203-r5.tar.bz2 274136 SHA256 c23d17c
 DIST patchbundle-selinux-base-policy-2.20141203-r6.tar.bz2 293231 SHA256 b686dcc517b97834f66d967afdcc724cb43b5c6dbf9f34043a91cdeda2625cc7 SHA512 a2c486cbe4a1d21ff3fd01bef25ecf5a633a4072646c67cfccf3f7187d95f3d9e3b482a46ba17c55c40a8e7c0dee56e9cf9ddc9f414d3e4511443b62f60d03e9 WHIRLPOOL 3d708e287e3f9b873be647b0327eab6675a8702ee1cffb56e36934cada306e5ccc64397a083dad9e59de37a067e628cacbf896ae99012d5a209e42fd7cd8a4c6
 DIST patchbundle-selinux-base-policy-2.20141203-r7.tar.bz2 295833 SHA256 ba2219b3efc747be65f94c4d8ac3cd6ee530c82c848fa41935a114184678622a SHA512 8e32d9dbfb2f0f3f50200543aadb51ed9834ccd5cdf30bf8e4d9e6d0b645ce44ffaf80f7aa9385e9c9095d9a383b3a348a92356cb5386c06544ab082a9a468c7 WHIRLPOOL 1648ee1be71e45fcf5a264816ce7edc7bab19bd28a68703923eb2d6068f1f0469ae593855231d31f88baecbf29e7cece2d6beeed20b7c04231a6c90e90d35910
 DIST patchbundle-selinux-base-policy-2.20141203-r8.tar.bz2 297919 SHA256 77539eb3d78105f8789cd8205d2698bd27e2abf100163bdd162cda860fd15120 SHA512 2f8a19e1e4bb65f32b480275f49099aed3ae9df543c7de862b3bbd93e81b89cd96dadac3d091e28673d09a6885db8c5656b3a77d0080775c110b04f2753de7a6 WHIRLPOOL 79cb7e620eb8e838192dc557c7a9ce7e713227d783cc8b63792825559b2145cad70d0af6f99948c1527557bc363feffd846c73893682b4a14fc7d08b9e20c649
+DIST patchbundle-selinux-base-policy-2.20141203-r9.tar.bz2 299602 SHA256 e8518004942a6c57170a609683e22b1410c93a2a195829c41dc8fbc703d941b5 SHA512 ce6484fbca1d2d074e50d1a3953392bd3ce0a4617df98fbac37747b469b4f160a9331586dfe1c3ddccb1ccbee24876a2f05ab49e37c8492a48baf83c2d01d140 WHIRLPOOL 1fd7b956e98e95a64c3a713a944d4531259bd156a7feabf6a89c4b5f33ac846377730eede97889e85183be086f282ebd18e860214f6ca3f01b40f2323470ee04
 DIST refpolicy-2.20140311.tar.bz2 664416 SHA256 f69437db95548c78a5dec44c236397146b144153149009ea554d2e536e5436f7 SHA512 50bacee82ed41ac8b8007ecc33bf51d22303cc2ddd27cfb72cb5520dab5f8e255186e34b89cec492c7a2d4220b200814bdede9b46c19f987a3d3d65a1c9b749a WHIRLPOOL e07480beba6ab1f02ad36b7d0c50c4a71cb39a8ec78bf8d1dc3c82bb9dd1d69d9169d7c937165ea15f60ce1147f256d46644f944107a3a8a800d5bad70d4c255
 DIST refpolicy-2.20141203.tar.bz2 680243 SHA256 f438209c430d8a2d4ddcbe4bdd3edb46f6af7dc4913637af0b73c635e40c1522 SHA512 682e4280c5799e4c12ec7594afc1389f67be35055748d2e0dbdc3419159a16c96d4946ca6178daee8370515951f8653b2e452efe8c962b8d7f9bc192f0b15a0c WHIRLPOOL 74bca232534e7af9051bb1ab9f77c1ff6c425781cf4561f781d6e9a40cc5ca0d9add540249ea5493e8782a9372aea296ead6c165c6c440ae1509eb319d151ee5
diff --git a/sec-policy/selinux-vnstatd/selinux-vnstatd-2.20141203-r8.ebuild b/sec-policy/selinux-vnstatd/selinux-vnstatd-2.20141203-r8.ebuild
index c2d612b6cbce..7cd6ce79f04f 100644
--- a/sec-policy/selinux-vnstatd/selinux-vnstatd-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-vnstatd/selinux-vnstatd-2.20141203-r8.ebuild
@@ -13,5 +13,5 @@ DESCRIPTION="SELinux policy for vnstatd"
 if [[ $PV == 9999* ]] ; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-vnstatd/selinux-vnstatd-2.20141203-r9.ebuild b/sec-policy/selinux-vnstatd/selinux-vnstatd-2.20141203-r9.ebuild
new file mode 100644
index 000000000000..c2d612b6cbce
--- /dev/null
+++ b/sec-policy/selinux-vnstatd/selinux-vnstatd-2.20141203-r9.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI="5"
+
+IUSE=""
+MODS="vnstatd"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for vnstatd"
+
+if [[ $PV == 9999* ]] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
diff --git a/sec-policy/selinux-vpn/Manifest b/sec-policy/selinux-vpn/Manifest
index 8327a635be01..91d204b0021a 100644
--- a/sec-policy/selinux-vpn/Manifest
+++ b/sec-policy/selinux-vpn/Manifest
@@ -9,5 +9,6 @@ DIST patchbundle-selinux-base-policy-2.20141203-r5.tar.bz2 274136 SHA256 c23d17c
 DIST patchbundle-selinux-base-policy-2.20141203-r6.tar.bz2 293231 SHA256 b686dcc517b97834f66d967afdcc724cb43b5c6dbf9f34043a91cdeda2625cc7 SHA512 a2c486cbe4a1d21ff3fd01bef25ecf5a633a4072646c67cfccf3f7187d95f3d9e3b482a46ba17c55c40a8e7c0dee56e9cf9ddc9f414d3e4511443b62f60d03e9 WHIRLPOOL 3d708e287e3f9b873be647b0327eab6675a8702ee1cffb56e36934cada306e5ccc64397a083dad9e59de37a067e628cacbf896ae99012d5a209e42fd7cd8a4c6
 DIST patchbundle-selinux-base-policy-2.20141203-r7.tar.bz2 295833 SHA256 ba2219b3efc747be65f94c4d8ac3cd6ee530c82c848fa41935a114184678622a SHA512 8e32d9dbfb2f0f3f50200543aadb51ed9834ccd5cdf30bf8e4d9e6d0b645ce44ffaf80f7aa9385e9c9095d9a383b3a348a92356cb5386c06544ab082a9a468c7 WHIRLPOOL 1648ee1be71e45fcf5a264816ce7edc7bab19bd28a68703923eb2d6068f1f0469ae593855231d31f88baecbf29e7cece2d6beeed20b7c04231a6c90e90d35910
 DIST patchbundle-selinux-base-policy-2.20141203-r8.tar.bz2 297919 SHA256 77539eb3d78105f8789cd8205d2698bd27e2abf100163bdd162cda860fd15120 SHA512 2f8a19e1e4bb65f32b480275f49099aed3ae9df543c7de862b3bbd93e81b89cd96dadac3d091e28673d09a6885db8c5656b3a77d0080775c110b04f2753de7a6 WHIRLPOOL 79cb7e620eb8e838192dc557c7a9ce7e713227d783cc8b63792825559b2145cad70d0af6f99948c1527557bc363feffd846c73893682b4a14fc7d08b9e20c649
+DIST patchbundle-selinux-base-policy-2.20141203-r9.tar.bz2 299602 SHA256 e8518004942a6c57170a609683e22b1410c93a2a195829c41dc8fbc703d941b5 SHA512 ce6484fbca1d2d074e50d1a3953392bd3ce0a4617df98fbac37747b469b4f160a9331586dfe1c3ddccb1ccbee24876a2f05ab49e37c8492a48baf83c2d01d140 WHIRLPOOL 1fd7b956e98e95a64c3a713a944d4531259bd156a7feabf6a89c4b5f33ac846377730eede97889e85183be086f282ebd18e860214f6ca3f01b40f2323470ee04
 DIST refpolicy-2.20140311.tar.bz2 664416 SHA256 f69437db95548c78a5dec44c236397146b144153149009ea554d2e536e5436f7 SHA512 50bacee82ed41ac8b8007ecc33bf51d22303cc2ddd27cfb72cb5520dab5f8e255186e34b89cec492c7a2d4220b200814bdede9b46c19f987a3d3d65a1c9b749a WHIRLPOOL e07480beba6ab1f02ad36b7d0c50c4a71cb39a8ec78bf8d1dc3c82bb9dd1d69d9169d7c937165ea15f60ce1147f256d46644f944107a3a8a800d5bad70d4c255
 DIST refpolicy-2.20141203.tar.bz2 680243 SHA256 f438209c430d8a2d4ddcbe4bdd3edb46f6af7dc4913637af0b73c635e40c1522 SHA512 682e4280c5799e4c12ec7594afc1389f67be35055748d2e0dbdc3419159a16c96d4946ca6178daee8370515951f8653b2e452efe8c962b8d7f9bc192f0b15a0c WHIRLPOOL 74bca232534e7af9051bb1ab9f77c1ff6c425781cf4561f781d6e9a40cc5ca0d9add540249ea5493e8782a9372aea296ead6c165c6c440ae1509eb319d151ee5
diff --git a/sec-policy/selinux-vpn/selinux-vpn-2.20141203-r8.ebuild b/sec-policy/selinux-vpn/selinux-vpn-2.20141203-r8.ebuild
index aa9684fba99d..0e2587864189 100644
--- a/sec-policy/selinux-vpn/selinux-vpn-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-vpn/selinux-vpn-2.20141203-r8.ebuild
@@ -13,5 +13,5 @@ DESCRIPTION="SELinux policy for vpn"
 if [[ $PV == 9999* ]] ; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-vpn/selinux-vpn-2.20141203-r9.ebuild b/sec-policy/selinux-vpn/selinux-vpn-2.20141203-r9.ebuild
new file mode 100644
index 000000000000..aa9684fba99d
--- /dev/null
+++ b/sec-policy/selinux-vpn/selinux-vpn-2.20141203-r9.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI="5"
+
+IUSE=""
+MODS="vpn"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for vpn"
+
+if [[ $PV == 9999* ]] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
diff --git a/sec-policy/selinux-watchdog/Manifest b/sec-policy/selinux-watchdog/Manifest
index 8327a635be01..91d204b0021a 100644
--- a/sec-policy/selinux-watchdog/Manifest
+++ b/sec-policy/selinux-watchdog/Manifest
@@ -9,5 +9,6 @@ DIST patchbundle-selinux-base-policy-2.20141203-r5.tar.bz2 274136 SHA256 c23d17c
 DIST patchbundle-selinux-base-policy-2.20141203-r6.tar.bz2 293231 SHA256 b686dcc517b97834f66d967afdcc724cb43b5c6dbf9f34043a91cdeda2625cc7 SHA512 a2c486cbe4a1d21ff3fd01bef25ecf5a633a4072646c67cfccf3f7187d95f3d9e3b482a46ba17c55c40a8e7c0dee56e9cf9ddc9f414d3e4511443b62f60d03e9 WHIRLPOOL 3d708e287e3f9b873be647b0327eab6675a8702ee1cffb56e36934cada306e5ccc64397a083dad9e59de37a067e628cacbf896ae99012d5a209e42fd7cd8a4c6
 DIST patchbundle-selinux-base-policy-2.20141203-r7.tar.bz2 295833 SHA256 ba2219b3efc747be65f94c4d8ac3cd6ee530c82c848fa41935a114184678622a SHA512 8e32d9dbfb2f0f3f50200543aadb51ed9834ccd5cdf30bf8e4d9e6d0b645ce44ffaf80f7aa9385e9c9095d9a383b3a348a92356cb5386c06544ab082a9a468c7 WHIRLPOOL 1648ee1be71e45fcf5a264816ce7edc7bab19bd28a68703923eb2d6068f1f0469ae593855231d31f88baecbf29e7cece2d6beeed20b7c04231a6c90e90d35910
 DIST patchbundle-selinux-base-policy-2.20141203-r8.tar.bz2 297919 SHA256 77539eb3d78105f8789cd8205d2698bd27e2abf100163bdd162cda860fd15120 SHA512 2f8a19e1e4bb65f32b480275f49099aed3ae9df543c7de862b3bbd93e81b89cd96dadac3d091e28673d09a6885db8c5656b3a77d0080775c110b04f2753de7a6 WHIRLPOOL 79cb7e620eb8e838192dc557c7a9ce7e713227d783cc8b63792825559b2145cad70d0af6f99948c1527557bc363feffd846c73893682b4a14fc7d08b9e20c649
+DIST patchbundle-selinux-base-policy-2.20141203-r9.tar.bz2 299602 SHA256 e8518004942a6c57170a609683e22b1410c93a2a195829c41dc8fbc703d941b5 SHA512 ce6484fbca1d2d074e50d1a3953392bd3ce0a4617df98fbac37747b469b4f160a9331586dfe1c3ddccb1ccbee24876a2f05ab49e37c8492a48baf83c2d01d140 WHIRLPOOL 1fd7b956e98e95a64c3a713a944d4531259bd156a7feabf6a89c4b5f33ac846377730eede97889e85183be086f282ebd18e860214f6ca3f01b40f2323470ee04
 DIST refpolicy-2.20140311.tar.bz2 664416 SHA256 f69437db95548c78a5dec44c236397146b144153149009ea554d2e536e5436f7 SHA512 50bacee82ed41ac8b8007ecc33bf51d22303cc2ddd27cfb72cb5520dab5f8e255186e34b89cec492c7a2d4220b200814bdede9b46c19f987a3d3d65a1c9b749a WHIRLPOOL e07480beba6ab1f02ad36b7d0c50c4a71cb39a8ec78bf8d1dc3c82bb9dd1d69d9169d7c937165ea15f60ce1147f256d46644f944107a3a8a800d5bad70d4c255
 DIST refpolicy-2.20141203.tar.bz2 680243 SHA256 f438209c430d8a2d4ddcbe4bdd3edb46f6af7dc4913637af0b73c635e40c1522 SHA512 682e4280c5799e4c12ec7594afc1389f67be35055748d2e0dbdc3419159a16c96d4946ca6178daee8370515951f8653b2e452efe8c962b8d7f9bc192f0b15a0c WHIRLPOOL 74bca232534e7af9051bb1ab9f77c1ff6c425781cf4561f781d6e9a40cc5ca0d9add540249ea5493e8782a9372aea296ead6c165c6c440ae1509eb319d151ee5
diff --git a/sec-policy/selinux-watchdog/selinux-watchdog-2.20141203-r8.ebuild b/sec-policy/selinux-watchdog/selinux-watchdog-2.20141203-r8.ebuild
index 2b7ece3f211b..3c6304bd095b 100644
--- a/sec-policy/selinux-watchdog/selinux-watchdog-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-watchdog/selinux-watchdog-2.20141203-r8.ebuild
@@ -13,5 +13,5 @@ DESCRIPTION="SELinux policy for watchdog"
 if [[ $PV == 9999* ]] ; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-watchdog/selinux-watchdog-2.20141203-r9.ebuild b/sec-policy/selinux-watchdog/selinux-watchdog-2.20141203-r9.ebuild
new file mode 100644
index 000000000000..2b7ece3f211b
--- /dev/null
+++ b/sec-policy/selinux-watchdog/selinux-watchdog-2.20141203-r9.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI="5"
+
+IUSE=""
+MODS="watchdog"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for watchdog"
+
+if [[ $PV == 9999* ]] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
diff --git a/sec-policy/selinux-webalizer/Manifest b/sec-policy/selinux-webalizer/Manifest
index 8327a635be01..91d204b0021a 100644
--- a/sec-policy/selinux-webalizer/Manifest
+++ b/sec-policy/selinux-webalizer/Manifest
@@ -9,5 +9,6 @@ DIST patchbundle-selinux-base-policy-2.20141203-r5.tar.bz2 274136 SHA256 c23d17c
 DIST patchbundle-selinux-base-policy-2.20141203-r6.tar.bz2 293231 SHA256 b686dcc517b97834f66d967afdcc724cb43b5c6dbf9f34043a91cdeda2625cc7 SHA512 a2c486cbe4a1d21ff3fd01bef25ecf5a633a4072646c67cfccf3f7187d95f3d9e3b482a46ba17c55c40a8e7c0dee56e9cf9ddc9f414d3e4511443b62f60d03e9 WHIRLPOOL 3d708e287e3f9b873be647b0327eab6675a8702ee1cffb56e36934cada306e5ccc64397a083dad9e59de37a067e628cacbf896ae99012d5a209e42fd7cd8a4c6
 DIST patchbundle-selinux-base-policy-2.20141203-r7.tar.bz2 295833 SHA256 ba2219b3efc747be65f94c4d8ac3cd6ee530c82c848fa41935a114184678622a SHA512 8e32d9dbfb2f0f3f50200543aadb51ed9834ccd5cdf30bf8e4d9e6d0b645ce44ffaf80f7aa9385e9c9095d9a383b3a348a92356cb5386c06544ab082a9a468c7 WHIRLPOOL 1648ee1be71e45fcf5a264816ce7edc7bab19bd28a68703923eb2d6068f1f0469ae593855231d31f88baecbf29e7cece2d6beeed20b7c04231a6c90e90d35910
 DIST patchbundle-selinux-base-policy-2.20141203-r8.tar.bz2 297919 SHA256 77539eb3d78105f8789cd8205d2698bd27e2abf100163bdd162cda860fd15120 SHA512 2f8a19e1e4bb65f32b480275f49099aed3ae9df543c7de862b3bbd93e81b89cd96dadac3d091e28673d09a6885db8c5656b3a77d0080775c110b04f2753de7a6 WHIRLPOOL 79cb7e620eb8e838192dc557c7a9ce7e713227d783cc8b63792825559b2145cad70d0af6f99948c1527557bc363feffd846c73893682b4a14fc7d08b9e20c649
+DIST patchbundle-selinux-base-policy-2.20141203-r9.tar.bz2 299602 SHA256 e8518004942a6c57170a609683e22b1410c93a2a195829c41dc8fbc703d941b5 SHA512 ce6484fbca1d2d074e50d1a3953392bd3ce0a4617df98fbac37747b469b4f160a9331586dfe1c3ddccb1ccbee24876a2f05ab49e37c8492a48baf83c2d01d140 WHIRLPOOL 1fd7b956e98e95a64c3a713a944d4531259bd156a7feabf6a89c4b5f33ac846377730eede97889e85183be086f282ebd18e860214f6ca3f01b40f2323470ee04
 DIST refpolicy-2.20140311.tar.bz2 664416 SHA256 f69437db95548c78a5dec44c236397146b144153149009ea554d2e536e5436f7 SHA512 50bacee82ed41ac8b8007ecc33bf51d22303cc2ddd27cfb72cb5520dab5f8e255186e34b89cec492c7a2d4220b200814bdede9b46c19f987a3d3d65a1c9b749a WHIRLPOOL e07480beba6ab1f02ad36b7d0c50c4a71cb39a8ec78bf8d1dc3c82bb9dd1d69d9169d7c937165ea15f60ce1147f256d46644f944107a3a8a800d5bad70d4c255
 DIST refpolicy-2.20141203.tar.bz2 680243 SHA256 f438209c430d8a2d4ddcbe4bdd3edb46f6af7dc4913637af0b73c635e40c1522 SHA512 682e4280c5799e4c12ec7594afc1389f67be35055748d2e0dbdc3419159a16c96d4946ca6178daee8370515951f8653b2e452efe8c962b8d7f9bc192f0b15a0c WHIRLPOOL 74bca232534e7af9051bb1ab9f77c1ff6c425781cf4561f781d6e9a40cc5ca0d9add540249ea5493e8782a9372aea296ead6c165c6c440ae1509eb319d151ee5
diff --git a/sec-policy/selinux-webalizer/selinux-webalizer-2.20141203-r8.ebuild b/sec-policy/selinux-webalizer/selinux-webalizer-2.20141203-r8.ebuild
index 87cec7784765..24f84c29380e 100644
--- a/sec-policy/selinux-webalizer/selinux-webalizer-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-webalizer/selinux-webalizer-2.20141203-r8.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="SELinux policy for webalizer"
 if [[ $PV == 9999* ]] ; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 
 DEPEND="${DEPEND}
diff --git a/sec-policy/selinux-webalizer/selinux-webalizer-2.20141203-r9.ebuild b/sec-policy/selinux-webalizer/selinux-webalizer-2.20141203-r9.ebuild
new file mode 100644
index 000000000000..87cec7784765
--- /dev/null
+++ b/sec-policy/selinux-webalizer/selinux-webalizer-2.20141203-r9.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI="5"
+
+IUSE=""
+MODS="webalizer"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for webalizer"
+
+if [[ $PV == 9999* ]] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DEPEND="${DEPEND}
+	sec-policy/selinux-apache
+"
+RDEPEND="${RDEPEND}
+	sec-policy/selinux-apache
+"
diff --git a/sec-policy/selinux-wine/Manifest b/sec-policy/selinux-wine/Manifest
index 8327a635be01..91d204b0021a 100644
--- a/sec-policy/selinux-wine/Manifest
+++ b/sec-policy/selinux-wine/Manifest
@@ -9,5 +9,6 @@ DIST patchbundle-selinux-base-policy-2.20141203-r5.tar.bz2 274136 SHA256 c23d17c
 DIST patchbundle-selinux-base-policy-2.20141203-r6.tar.bz2 293231 SHA256 b686dcc517b97834f66d967afdcc724cb43b5c6dbf9f34043a91cdeda2625cc7 SHA512 a2c486cbe4a1d21ff3fd01bef25ecf5a633a4072646c67cfccf3f7187d95f3d9e3b482a46ba17c55c40a8e7c0dee56e9cf9ddc9f414d3e4511443b62f60d03e9 WHIRLPOOL 3d708e287e3f9b873be647b0327eab6675a8702ee1cffb56e36934cada306e5ccc64397a083dad9e59de37a067e628cacbf896ae99012d5a209e42fd7cd8a4c6
 DIST patchbundle-selinux-base-policy-2.20141203-r7.tar.bz2 295833 SHA256 ba2219b3efc747be65f94c4d8ac3cd6ee530c82c848fa41935a114184678622a SHA512 8e32d9dbfb2f0f3f50200543aadb51ed9834ccd5cdf30bf8e4d9e6d0b645ce44ffaf80f7aa9385e9c9095d9a383b3a348a92356cb5386c06544ab082a9a468c7 WHIRLPOOL 1648ee1be71e45fcf5a264816ce7edc7bab19bd28a68703923eb2d6068f1f0469ae593855231d31f88baecbf29e7cece2d6beeed20b7c04231a6c90e90d35910
 DIST patchbundle-selinux-base-policy-2.20141203-r8.tar.bz2 297919 SHA256 77539eb3d78105f8789cd8205d2698bd27e2abf100163bdd162cda860fd15120 SHA512 2f8a19e1e4bb65f32b480275f49099aed3ae9df543c7de862b3bbd93e81b89cd96dadac3d091e28673d09a6885db8c5656b3a77d0080775c110b04f2753de7a6 WHIRLPOOL 79cb7e620eb8e838192dc557c7a9ce7e713227d783cc8b63792825559b2145cad70d0af6f99948c1527557bc363feffd846c73893682b4a14fc7d08b9e20c649
+DIST patchbundle-selinux-base-policy-2.20141203-r9.tar.bz2 299602 SHA256 e8518004942a6c57170a609683e22b1410c93a2a195829c41dc8fbc703d941b5 SHA512 ce6484fbca1d2d074e50d1a3953392bd3ce0a4617df98fbac37747b469b4f160a9331586dfe1c3ddccb1ccbee24876a2f05ab49e37c8492a48baf83c2d01d140 WHIRLPOOL 1fd7b956e98e95a64c3a713a944d4531259bd156a7feabf6a89c4b5f33ac846377730eede97889e85183be086f282ebd18e860214f6ca3f01b40f2323470ee04
 DIST refpolicy-2.20140311.tar.bz2 664416 SHA256 f69437db95548c78a5dec44c236397146b144153149009ea554d2e536e5436f7 SHA512 50bacee82ed41ac8b8007ecc33bf51d22303cc2ddd27cfb72cb5520dab5f8e255186e34b89cec492c7a2d4220b200814bdede9b46c19f987a3d3d65a1c9b749a WHIRLPOOL e07480beba6ab1f02ad36b7d0c50c4a71cb39a8ec78bf8d1dc3c82bb9dd1d69d9169d7c937165ea15f60ce1147f256d46644f944107a3a8a800d5bad70d4c255
 DIST refpolicy-2.20141203.tar.bz2 680243 SHA256 f438209c430d8a2d4ddcbe4bdd3edb46f6af7dc4913637af0b73c635e40c1522 SHA512 682e4280c5799e4c12ec7594afc1389f67be35055748d2e0dbdc3419159a16c96d4946ca6178daee8370515951f8653b2e452efe8c962b8d7f9bc192f0b15a0c WHIRLPOOL 74bca232534e7af9051bb1ab9f77c1ff6c425781cf4561f781d6e9a40cc5ca0d9add540249ea5493e8782a9372aea296ead6c165c6c440ae1509eb319d151ee5
diff --git a/sec-policy/selinux-wine/selinux-wine-2.20141203-r8.ebuild b/sec-policy/selinux-wine/selinux-wine-2.20141203-r8.ebuild
index a1122bed8733..4a8ced659344 100644
--- a/sec-policy/selinux-wine/selinux-wine-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-wine/selinux-wine-2.20141203-r8.ebuild
@@ -13,5 +13,5 @@ DESCRIPTION="SELinux policy for wine"
 if [[ $PV == 9999* ]] ; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-wine/selinux-wine-2.20141203-r9.ebuild b/sec-policy/selinux-wine/selinux-wine-2.20141203-r9.ebuild
new file mode 100644
index 000000000000..a1122bed8733
--- /dev/null
+++ b/sec-policy/selinux-wine/selinux-wine-2.20141203-r9.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI="5"
+
+IUSE=""
+MODS="wine"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for wine"
+
+if [[ $PV == 9999* ]] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
diff --git a/sec-policy/selinux-wireshark/Manifest b/sec-policy/selinux-wireshark/Manifest
index 8327a635be01..91d204b0021a 100644
--- a/sec-policy/selinux-wireshark/Manifest
+++ b/sec-policy/selinux-wireshark/Manifest
@@ -9,5 +9,6 @@ DIST patchbundle-selinux-base-policy-2.20141203-r5.tar.bz2 274136 SHA256 c23d17c
 DIST patchbundle-selinux-base-policy-2.20141203-r6.tar.bz2 293231 SHA256 b686dcc517b97834f66d967afdcc724cb43b5c6dbf9f34043a91cdeda2625cc7 SHA512 a2c486cbe4a1d21ff3fd01bef25ecf5a633a4072646c67cfccf3f7187d95f3d9e3b482a46ba17c55c40a8e7c0dee56e9cf9ddc9f414d3e4511443b62f60d03e9 WHIRLPOOL 3d708e287e3f9b873be647b0327eab6675a8702ee1cffb56e36934cada306e5ccc64397a083dad9e59de37a067e628cacbf896ae99012d5a209e42fd7cd8a4c6
 DIST patchbundle-selinux-base-policy-2.20141203-r7.tar.bz2 295833 SHA256 ba2219b3efc747be65f94c4d8ac3cd6ee530c82c848fa41935a114184678622a SHA512 8e32d9dbfb2f0f3f50200543aadb51ed9834ccd5cdf30bf8e4d9e6d0b645ce44ffaf80f7aa9385e9c9095d9a383b3a348a92356cb5386c06544ab082a9a468c7 WHIRLPOOL 1648ee1be71e45fcf5a264816ce7edc7bab19bd28a68703923eb2d6068f1f0469ae593855231d31f88baecbf29e7cece2d6beeed20b7c04231a6c90e90d35910
 DIST patchbundle-selinux-base-policy-2.20141203-r8.tar.bz2 297919 SHA256 77539eb3d78105f8789cd8205d2698bd27e2abf100163bdd162cda860fd15120 SHA512 2f8a19e1e4bb65f32b480275f49099aed3ae9df543c7de862b3bbd93e81b89cd96dadac3d091e28673d09a6885db8c5656b3a77d0080775c110b04f2753de7a6 WHIRLPOOL 79cb7e620eb8e838192dc557c7a9ce7e713227d783cc8b63792825559b2145cad70d0af6f99948c1527557bc363feffd846c73893682b4a14fc7d08b9e20c649
+DIST patchbundle-selinux-base-policy-2.20141203-r9.tar.bz2 299602 SHA256 e8518004942a6c57170a609683e22b1410c93a2a195829c41dc8fbc703d941b5 SHA512 ce6484fbca1d2d074e50d1a3953392bd3ce0a4617df98fbac37747b469b4f160a9331586dfe1c3ddccb1ccbee24876a2f05ab49e37c8492a48baf83c2d01d140 WHIRLPOOL 1fd7b956e98e95a64c3a713a944d4531259bd156a7feabf6a89c4b5f33ac846377730eede97889e85183be086f282ebd18e860214f6ca3f01b40f2323470ee04
 DIST refpolicy-2.20140311.tar.bz2 664416 SHA256 f69437db95548c78a5dec44c236397146b144153149009ea554d2e536e5436f7 SHA512 50bacee82ed41ac8b8007ecc33bf51d22303cc2ddd27cfb72cb5520dab5f8e255186e34b89cec492c7a2d4220b200814bdede9b46c19f987a3d3d65a1c9b749a WHIRLPOOL e07480beba6ab1f02ad36b7d0c50c4a71cb39a8ec78bf8d1dc3c82bb9dd1d69d9169d7c937165ea15f60ce1147f256d46644f944107a3a8a800d5bad70d4c255
 DIST refpolicy-2.20141203.tar.bz2 680243 SHA256 f438209c430d8a2d4ddcbe4bdd3edb46f6af7dc4913637af0b73c635e40c1522 SHA512 682e4280c5799e4c12ec7594afc1389f67be35055748d2e0dbdc3419159a16c96d4946ca6178daee8370515951f8653b2e452efe8c962b8d7f9bc192f0b15a0c WHIRLPOOL 74bca232534e7af9051bb1ab9f77c1ff6c425781cf4561f781d6e9a40cc5ca0d9add540249ea5493e8782a9372aea296ead6c165c6c440ae1509eb319d151ee5
diff --git a/sec-policy/selinux-wireshark/selinux-wireshark-2.20141203-r8.ebuild b/sec-policy/selinux-wireshark/selinux-wireshark-2.20141203-r8.ebuild
index 13da42f12f82..64e561bbc93d 100644
--- a/sec-policy/selinux-wireshark/selinux-wireshark-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-wireshark/selinux-wireshark-2.20141203-r8.ebuild
@@ -13,5 +13,5 @@ DESCRIPTION="SELinux policy for wireshark"
 if [[ $PV == 9999* ]] ; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-wireshark/selinux-wireshark-2.20141203-r9.ebuild b/sec-policy/selinux-wireshark/selinux-wireshark-2.20141203-r9.ebuild
new file mode 100644
index 000000000000..13da42f12f82
--- /dev/null
+++ b/sec-policy/selinux-wireshark/selinux-wireshark-2.20141203-r9.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI="5"
+
+IUSE=""
+MODS="wireshark"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for wireshark"
+
+if [[ $PV == 9999* ]] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
diff --git a/sec-policy/selinux-wm/Manifest b/sec-policy/selinux-wm/Manifest
index 8327a635be01..91d204b0021a 100644
--- a/sec-policy/selinux-wm/Manifest
+++ b/sec-policy/selinux-wm/Manifest
@@ -9,5 +9,6 @@ DIST patchbundle-selinux-base-policy-2.20141203-r5.tar.bz2 274136 SHA256 c23d17c
 DIST patchbundle-selinux-base-policy-2.20141203-r6.tar.bz2 293231 SHA256 b686dcc517b97834f66d967afdcc724cb43b5c6dbf9f34043a91cdeda2625cc7 SHA512 a2c486cbe4a1d21ff3fd01bef25ecf5a633a4072646c67cfccf3f7187d95f3d9e3b482a46ba17c55c40a8e7c0dee56e9cf9ddc9f414d3e4511443b62f60d03e9 WHIRLPOOL 3d708e287e3f9b873be647b0327eab6675a8702ee1cffb56e36934cada306e5ccc64397a083dad9e59de37a067e628cacbf896ae99012d5a209e42fd7cd8a4c6
 DIST patchbundle-selinux-base-policy-2.20141203-r7.tar.bz2 295833 SHA256 ba2219b3efc747be65f94c4d8ac3cd6ee530c82c848fa41935a114184678622a SHA512 8e32d9dbfb2f0f3f50200543aadb51ed9834ccd5cdf30bf8e4d9e6d0b645ce44ffaf80f7aa9385e9c9095d9a383b3a348a92356cb5386c06544ab082a9a468c7 WHIRLPOOL 1648ee1be71e45fcf5a264816ce7edc7bab19bd28a68703923eb2d6068f1f0469ae593855231d31f88baecbf29e7cece2d6beeed20b7c04231a6c90e90d35910
 DIST patchbundle-selinux-base-policy-2.20141203-r8.tar.bz2 297919 SHA256 77539eb3d78105f8789cd8205d2698bd27e2abf100163bdd162cda860fd15120 SHA512 2f8a19e1e4bb65f32b480275f49099aed3ae9df543c7de862b3bbd93e81b89cd96dadac3d091e28673d09a6885db8c5656b3a77d0080775c110b04f2753de7a6 WHIRLPOOL 79cb7e620eb8e838192dc557c7a9ce7e713227d783cc8b63792825559b2145cad70d0af6f99948c1527557bc363feffd846c73893682b4a14fc7d08b9e20c649
+DIST patchbundle-selinux-base-policy-2.20141203-r9.tar.bz2 299602 SHA256 e8518004942a6c57170a609683e22b1410c93a2a195829c41dc8fbc703d941b5 SHA512 ce6484fbca1d2d074e50d1a3953392bd3ce0a4617df98fbac37747b469b4f160a9331586dfe1c3ddccb1ccbee24876a2f05ab49e37c8492a48baf83c2d01d140 WHIRLPOOL 1fd7b956e98e95a64c3a713a944d4531259bd156a7feabf6a89c4b5f33ac846377730eede97889e85183be086f282ebd18e860214f6ca3f01b40f2323470ee04
 DIST refpolicy-2.20140311.tar.bz2 664416 SHA256 f69437db95548c78a5dec44c236397146b144153149009ea554d2e536e5436f7 SHA512 50bacee82ed41ac8b8007ecc33bf51d22303cc2ddd27cfb72cb5520dab5f8e255186e34b89cec492c7a2d4220b200814bdede9b46c19f987a3d3d65a1c9b749a WHIRLPOOL e07480beba6ab1f02ad36b7d0c50c4a71cb39a8ec78bf8d1dc3c82bb9dd1d69d9169d7c937165ea15f60ce1147f256d46644f944107a3a8a800d5bad70d4c255
 DIST refpolicy-2.20141203.tar.bz2 680243 SHA256 f438209c430d8a2d4ddcbe4bdd3edb46f6af7dc4913637af0b73c635e40c1522 SHA512 682e4280c5799e4c12ec7594afc1389f67be35055748d2e0dbdc3419159a16c96d4946ca6178daee8370515951f8653b2e452efe8c962b8d7f9bc192f0b15a0c WHIRLPOOL 74bca232534e7af9051bb1ab9f77c1ff6c425781cf4561f781d6e9a40cc5ca0d9add540249ea5493e8782a9372aea296ead6c165c6c440ae1509eb319d151ee5
diff --git a/sec-policy/selinux-wm/selinux-wm-2.20141203-r8.ebuild b/sec-policy/selinux-wm/selinux-wm-2.20141203-r8.ebuild
index d81997c97903..a17df9dc59a0 100644
--- a/sec-policy/selinux-wm/selinux-wm-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-wm/selinux-wm-2.20141203-r8.ebuild
@@ -13,5 +13,5 @@ DESCRIPTION="SELinux policy for wm"
 if [[ $PV == 9999* ]] ; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-wm/selinux-wm-2.20141203-r9.ebuild b/sec-policy/selinux-wm/selinux-wm-2.20141203-r9.ebuild
new file mode 100644
index 000000000000..d81997c97903
--- /dev/null
+++ b/sec-policy/selinux-wm/selinux-wm-2.20141203-r9.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI="5"
+
+IUSE=""
+MODS="wm"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for wm"
+
+if [[ $PV == 9999* ]] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
diff --git a/sec-policy/selinux-xen/Manifest b/sec-policy/selinux-xen/Manifest
index 8327a635be01..91d204b0021a 100644
--- a/sec-policy/selinux-xen/Manifest
+++ b/sec-policy/selinux-xen/Manifest
@@ -9,5 +9,6 @@ DIST patchbundle-selinux-base-policy-2.20141203-r5.tar.bz2 274136 SHA256 c23d17c
 DIST patchbundle-selinux-base-policy-2.20141203-r6.tar.bz2 293231 SHA256 b686dcc517b97834f66d967afdcc724cb43b5c6dbf9f34043a91cdeda2625cc7 SHA512 a2c486cbe4a1d21ff3fd01bef25ecf5a633a4072646c67cfccf3f7187d95f3d9e3b482a46ba17c55c40a8e7c0dee56e9cf9ddc9f414d3e4511443b62f60d03e9 WHIRLPOOL 3d708e287e3f9b873be647b0327eab6675a8702ee1cffb56e36934cada306e5ccc64397a083dad9e59de37a067e628cacbf896ae99012d5a209e42fd7cd8a4c6
 DIST patchbundle-selinux-base-policy-2.20141203-r7.tar.bz2 295833 SHA256 ba2219b3efc747be65f94c4d8ac3cd6ee530c82c848fa41935a114184678622a SHA512 8e32d9dbfb2f0f3f50200543aadb51ed9834ccd5cdf30bf8e4d9e6d0b645ce44ffaf80f7aa9385e9c9095d9a383b3a348a92356cb5386c06544ab082a9a468c7 WHIRLPOOL 1648ee1be71e45fcf5a264816ce7edc7bab19bd28a68703923eb2d6068f1f0469ae593855231d31f88baecbf29e7cece2d6beeed20b7c04231a6c90e90d35910
 DIST patchbundle-selinux-base-policy-2.20141203-r8.tar.bz2 297919 SHA256 77539eb3d78105f8789cd8205d2698bd27e2abf100163bdd162cda860fd15120 SHA512 2f8a19e1e4bb65f32b480275f49099aed3ae9df543c7de862b3bbd93e81b89cd96dadac3d091e28673d09a6885db8c5656b3a77d0080775c110b04f2753de7a6 WHIRLPOOL 79cb7e620eb8e838192dc557c7a9ce7e713227d783cc8b63792825559b2145cad70d0af6f99948c1527557bc363feffd846c73893682b4a14fc7d08b9e20c649
+DIST patchbundle-selinux-base-policy-2.20141203-r9.tar.bz2 299602 SHA256 e8518004942a6c57170a609683e22b1410c93a2a195829c41dc8fbc703d941b5 SHA512 ce6484fbca1d2d074e50d1a3953392bd3ce0a4617df98fbac37747b469b4f160a9331586dfe1c3ddccb1ccbee24876a2f05ab49e37c8492a48baf83c2d01d140 WHIRLPOOL 1fd7b956e98e95a64c3a713a944d4531259bd156a7feabf6a89c4b5f33ac846377730eede97889e85183be086f282ebd18e860214f6ca3f01b40f2323470ee04
 DIST refpolicy-2.20140311.tar.bz2 664416 SHA256 f69437db95548c78a5dec44c236397146b144153149009ea554d2e536e5436f7 SHA512 50bacee82ed41ac8b8007ecc33bf51d22303cc2ddd27cfb72cb5520dab5f8e255186e34b89cec492c7a2d4220b200814bdede9b46c19f987a3d3d65a1c9b749a WHIRLPOOL e07480beba6ab1f02ad36b7d0c50c4a71cb39a8ec78bf8d1dc3c82bb9dd1d69d9169d7c937165ea15f60ce1147f256d46644f944107a3a8a800d5bad70d4c255
 DIST refpolicy-2.20141203.tar.bz2 680243 SHA256 f438209c430d8a2d4ddcbe4bdd3edb46f6af7dc4913637af0b73c635e40c1522 SHA512 682e4280c5799e4c12ec7594afc1389f67be35055748d2e0dbdc3419159a16c96d4946ca6178daee8370515951f8653b2e452efe8c962b8d7f9bc192f0b15a0c WHIRLPOOL 74bca232534e7af9051bb1ab9f77c1ff6c425781cf4561f781d6e9a40cc5ca0d9add540249ea5493e8782a9372aea296ead6c165c6c440ae1509eb319d151ee5
diff --git a/sec-policy/selinux-xen/selinux-xen-2.20141203-r8.ebuild b/sec-policy/selinux-xen/selinux-xen-2.20141203-r8.ebuild
index ad746060667f..b3c68b76deeb 100644
--- a/sec-policy/selinux-xen/selinux-xen-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-xen/selinux-xen-2.20141203-r8.ebuild
@@ -13,5 +13,5 @@ DESCRIPTION="SELinux policy for xen"
 if [[ $PV == 9999* ]] ; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-xen/selinux-xen-2.20141203-r9.ebuild b/sec-policy/selinux-xen/selinux-xen-2.20141203-r9.ebuild
new file mode 100644
index 000000000000..ad746060667f
--- /dev/null
+++ b/sec-policy/selinux-xen/selinux-xen-2.20141203-r9.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI="5"
+
+IUSE=""
+MODS="xen"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for xen"
+
+if [[ $PV == 9999* ]] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
diff --git a/sec-policy/selinux-xfs/Manifest b/sec-policy/selinux-xfs/Manifest
index 8327a635be01..91d204b0021a 100644
--- a/sec-policy/selinux-xfs/Manifest
+++ b/sec-policy/selinux-xfs/Manifest
@@ -9,5 +9,6 @@ DIST patchbundle-selinux-base-policy-2.20141203-r5.tar.bz2 274136 SHA256 c23d17c
 DIST patchbundle-selinux-base-policy-2.20141203-r6.tar.bz2 293231 SHA256 b686dcc517b97834f66d967afdcc724cb43b5c6dbf9f34043a91cdeda2625cc7 SHA512 a2c486cbe4a1d21ff3fd01bef25ecf5a633a4072646c67cfccf3f7187d95f3d9e3b482a46ba17c55c40a8e7c0dee56e9cf9ddc9f414d3e4511443b62f60d03e9 WHIRLPOOL 3d708e287e3f9b873be647b0327eab6675a8702ee1cffb56e36934cada306e5ccc64397a083dad9e59de37a067e628cacbf896ae99012d5a209e42fd7cd8a4c6
 DIST patchbundle-selinux-base-policy-2.20141203-r7.tar.bz2 295833 SHA256 ba2219b3efc747be65f94c4d8ac3cd6ee530c82c848fa41935a114184678622a SHA512 8e32d9dbfb2f0f3f50200543aadb51ed9834ccd5cdf30bf8e4d9e6d0b645ce44ffaf80f7aa9385e9c9095d9a383b3a348a92356cb5386c06544ab082a9a468c7 WHIRLPOOL 1648ee1be71e45fcf5a264816ce7edc7bab19bd28a68703923eb2d6068f1f0469ae593855231d31f88baecbf29e7cece2d6beeed20b7c04231a6c90e90d35910
 DIST patchbundle-selinux-base-policy-2.20141203-r8.tar.bz2 297919 SHA256 77539eb3d78105f8789cd8205d2698bd27e2abf100163bdd162cda860fd15120 SHA512 2f8a19e1e4bb65f32b480275f49099aed3ae9df543c7de862b3bbd93e81b89cd96dadac3d091e28673d09a6885db8c5656b3a77d0080775c110b04f2753de7a6 WHIRLPOOL 79cb7e620eb8e838192dc557c7a9ce7e713227d783cc8b63792825559b2145cad70d0af6f99948c1527557bc363feffd846c73893682b4a14fc7d08b9e20c649
+DIST patchbundle-selinux-base-policy-2.20141203-r9.tar.bz2 299602 SHA256 e8518004942a6c57170a609683e22b1410c93a2a195829c41dc8fbc703d941b5 SHA512 ce6484fbca1d2d074e50d1a3953392bd3ce0a4617df98fbac37747b469b4f160a9331586dfe1c3ddccb1ccbee24876a2f05ab49e37c8492a48baf83c2d01d140 WHIRLPOOL 1fd7b956e98e95a64c3a713a944d4531259bd156a7feabf6a89c4b5f33ac846377730eede97889e85183be086f282ebd18e860214f6ca3f01b40f2323470ee04
 DIST refpolicy-2.20140311.tar.bz2 664416 SHA256 f69437db95548c78a5dec44c236397146b144153149009ea554d2e536e5436f7 SHA512 50bacee82ed41ac8b8007ecc33bf51d22303cc2ddd27cfb72cb5520dab5f8e255186e34b89cec492c7a2d4220b200814bdede9b46c19f987a3d3d65a1c9b749a WHIRLPOOL e07480beba6ab1f02ad36b7d0c50c4a71cb39a8ec78bf8d1dc3c82bb9dd1d69d9169d7c937165ea15f60ce1147f256d46644f944107a3a8a800d5bad70d4c255
 DIST refpolicy-2.20141203.tar.bz2 680243 SHA256 f438209c430d8a2d4ddcbe4bdd3edb46f6af7dc4913637af0b73c635e40c1522 SHA512 682e4280c5799e4c12ec7594afc1389f67be35055748d2e0dbdc3419159a16c96d4946ca6178daee8370515951f8653b2e452efe8c962b8d7f9bc192f0b15a0c WHIRLPOOL 74bca232534e7af9051bb1ab9f77c1ff6c425781cf4561f781d6e9a40cc5ca0d9add540249ea5493e8782a9372aea296ead6c165c6c440ae1509eb319d151ee5
diff --git a/sec-policy/selinux-xfs/selinux-xfs-2.20141203-r8.ebuild b/sec-policy/selinux-xfs/selinux-xfs-2.20141203-r8.ebuild
index 42bed3449033..230aa0bdfffe 100644
--- a/sec-policy/selinux-xfs/selinux-xfs-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-xfs/selinux-xfs-2.20141203-r8.ebuild
@@ -13,5 +13,5 @@ DESCRIPTION="SELinux policy for xfs"
 if [[ $PV == 9999* ]] ; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-xfs/selinux-xfs-2.20141203-r9.ebuild b/sec-policy/selinux-xfs/selinux-xfs-2.20141203-r9.ebuild
new file mode 100644
index 000000000000..42bed3449033
--- /dev/null
+++ b/sec-policy/selinux-xfs/selinux-xfs-2.20141203-r9.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI="5"
+
+IUSE=""
+MODS="xfs"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for xfs"
+
+if [[ $PV == 9999* ]] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
diff --git a/sec-policy/selinux-xprint/Manifest b/sec-policy/selinux-xprint/Manifest
index 8327a635be01..91d204b0021a 100644
--- a/sec-policy/selinux-xprint/Manifest
+++ b/sec-policy/selinux-xprint/Manifest
@@ -9,5 +9,6 @@ DIST patchbundle-selinux-base-policy-2.20141203-r5.tar.bz2 274136 SHA256 c23d17c
 DIST patchbundle-selinux-base-policy-2.20141203-r6.tar.bz2 293231 SHA256 b686dcc517b97834f66d967afdcc724cb43b5c6dbf9f34043a91cdeda2625cc7 SHA512 a2c486cbe4a1d21ff3fd01bef25ecf5a633a4072646c67cfccf3f7187d95f3d9e3b482a46ba17c55c40a8e7c0dee56e9cf9ddc9f414d3e4511443b62f60d03e9 WHIRLPOOL 3d708e287e3f9b873be647b0327eab6675a8702ee1cffb56e36934cada306e5ccc64397a083dad9e59de37a067e628cacbf896ae99012d5a209e42fd7cd8a4c6
 DIST patchbundle-selinux-base-policy-2.20141203-r7.tar.bz2 295833 SHA256 ba2219b3efc747be65f94c4d8ac3cd6ee530c82c848fa41935a114184678622a SHA512 8e32d9dbfb2f0f3f50200543aadb51ed9834ccd5cdf30bf8e4d9e6d0b645ce44ffaf80f7aa9385e9c9095d9a383b3a348a92356cb5386c06544ab082a9a468c7 WHIRLPOOL 1648ee1be71e45fcf5a264816ce7edc7bab19bd28a68703923eb2d6068f1f0469ae593855231d31f88baecbf29e7cece2d6beeed20b7c04231a6c90e90d35910
 DIST patchbundle-selinux-base-policy-2.20141203-r8.tar.bz2 297919 SHA256 77539eb3d78105f8789cd8205d2698bd27e2abf100163bdd162cda860fd15120 SHA512 2f8a19e1e4bb65f32b480275f49099aed3ae9df543c7de862b3bbd93e81b89cd96dadac3d091e28673d09a6885db8c5656b3a77d0080775c110b04f2753de7a6 WHIRLPOOL 79cb7e620eb8e838192dc557c7a9ce7e713227d783cc8b63792825559b2145cad70d0af6f99948c1527557bc363feffd846c73893682b4a14fc7d08b9e20c649
+DIST patchbundle-selinux-base-policy-2.20141203-r9.tar.bz2 299602 SHA256 e8518004942a6c57170a609683e22b1410c93a2a195829c41dc8fbc703d941b5 SHA512 ce6484fbca1d2d074e50d1a3953392bd3ce0a4617df98fbac37747b469b4f160a9331586dfe1c3ddccb1ccbee24876a2f05ab49e37c8492a48baf83c2d01d140 WHIRLPOOL 1fd7b956e98e95a64c3a713a944d4531259bd156a7feabf6a89c4b5f33ac846377730eede97889e85183be086f282ebd18e860214f6ca3f01b40f2323470ee04
 DIST refpolicy-2.20140311.tar.bz2 664416 SHA256 f69437db95548c78a5dec44c236397146b144153149009ea554d2e536e5436f7 SHA512 50bacee82ed41ac8b8007ecc33bf51d22303cc2ddd27cfb72cb5520dab5f8e255186e34b89cec492c7a2d4220b200814bdede9b46c19f987a3d3d65a1c9b749a WHIRLPOOL e07480beba6ab1f02ad36b7d0c50c4a71cb39a8ec78bf8d1dc3c82bb9dd1d69d9169d7c937165ea15f60ce1147f256d46644f944107a3a8a800d5bad70d4c255
 DIST refpolicy-2.20141203.tar.bz2 680243 SHA256 f438209c430d8a2d4ddcbe4bdd3edb46f6af7dc4913637af0b73c635e40c1522 SHA512 682e4280c5799e4c12ec7594afc1389f67be35055748d2e0dbdc3419159a16c96d4946ca6178daee8370515951f8653b2e452efe8c962b8d7f9bc192f0b15a0c WHIRLPOOL 74bca232534e7af9051bb1ab9f77c1ff6c425781cf4561f781d6e9a40cc5ca0d9add540249ea5493e8782a9372aea296ead6c165c6c440ae1509eb319d151ee5
diff --git a/sec-policy/selinux-xprint/selinux-xprint-2.20141203-r8.ebuild b/sec-policy/selinux-xprint/selinux-xprint-2.20141203-r8.ebuild
index 8e3cc26bd8ef..13f6c5832676 100644
--- a/sec-policy/selinux-xprint/selinux-xprint-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-xprint/selinux-xprint-2.20141203-r8.ebuild
@@ -13,5 +13,5 @@ DESCRIPTION="SELinux policy for xprint"
 if [[ $PV == 9999* ]] ; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-xprint/selinux-xprint-2.20141203-r9.ebuild b/sec-policy/selinux-xprint/selinux-xprint-2.20141203-r9.ebuild
new file mode 100644
index 000000000000..8e3cc26bd8ef
--- /dev/null
+++ b/sec-policy/selinux-xprint/selinux-xprint-2.20141203-r9.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI="5"
+
+IUSE=""
+MODS="xprint"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for xprint"
+
+if [[ $PV == 9999* ]] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
diff --git a/sec-policy/selinux-xscreensaver/Manifest b/sec-policy/selinux-xscreensaver/Manifest
index 8327a635be01..91d204b0021a 100644
--- a/sec-policy/selinux-xscreensaver/Manifest
+++ b/sec-policy/selinux-xscreensaver/Manifest
@@ -9,5 +9,6 @@ DIST patchbundle-selinux-base-policy-2.20141203-r5.tar.bz2 274136 SHA256 c23d17c
 DIST patchbundle-selinux-base-policy-2.20141203-r6.tar.bz2 293231 SHA256 b686dcc517b97834f66d967afdcc724cb43b5c6dbf9f34043a91cdeda2625cc7 SHA512 a2c486cbe4a1d21ff3fd01bef25ecf5a633a4072646c67cfccf3f7187d95f3d9e3b482a46ba17c55c40a8e7c0dee56e9cf9ddc9f414d3e4511443b62f60d03e9 WHIRLPOOL 3d708e287e3f9b873be647b0327eab6675a8702ee1cffb56e36934cada306e5ccc64397a083dad9e59de37a067e628cacbf896ae99012d5a209e42fd7cd8a4c6
 DIST patchbundle-selinux-base-policy-2.20141203-r7.tar.bz2 295833 SHA256 ba2219b3efc747be65f94c4d8ac3cd6ee530c82c848fa41935a114184678622a SHA512 8e32d9dbfb2f0f3f50200543aadb51ed9834ccd5cdf30bf8e4d9e6d0b645ce44ffaf80f7aa9385e9c9095d9a383b3a348a92356cb5386c06544ab082a9a468c7 WHIRLPOOL 1648ee1be71e45fcf5a264816ce7edc7bab19bd28a68703923eb2d6068f1f0469ae593855231d31f88baecbf29e7cece2d6beeed20b7c04231a6c90e90d35910
 DIST patchbundle-selinux-base-policy-2.20141203-r8.tar.bz2 297919 SHA256 77539eb3d78105f8789cd8205d2698bd27e2abf100163bdd162cda860fd15120 SHA512 2f8a19e1e4bb65f32b480275f49099aed3ae9df543c7de862b3bbd93e81b89cd96dadac3d091e28673d09a6885db8c5656b3a77d0080775c110b04f2753de7a6 WHIRLPOOL 79cb7e620eb8e838192dc557c7a9ce7e713227d783cc8b63792825559b2145cad70d0af6f99948c1527557bc363feffd846c73893682b4a14fc7d08b9e20c649
+DIST patchbundle-selinux-base-policy-2.20141203-r9.tar.bz2 299602 SHA256 e8518004942a6c57170a609683e22b1410c93a2a195829c41dc8fbc703d941b5 SHA512 ce6484fbca1d2d074e50d1a3953392bd3ce0a4617df98fbac37747b469b4f160a9331586dfe1c3ddccb1ccbee24876a2f05ab49e37c8492a48baf83c2d01d140 WHIRLPOOL 1fd7b956e98e95a64c3a713a944d4531259bd156a7feabf6a89c4b5f33ac846377730eede97889e85183be086f282ebd18e860214f6ca3f01b40f2323470ee04
 DIST refpolicy-2.20140311.tar.bz2 664416 SHA256 f69437db95548c78a5dec44c236397146b144153149009ea554d2e536e5436f7 SHA512 50bacee82ed41ac8b8007ecc33bf51d22303cc2ddd27cfb72cb5520dab5f8e255186e34b89cec492c7a2d4220b200814bdede9b46c19f987a3d3d65a1c9b749a WHIRLPOOL e07480beba6ab1f02ad36b7d0c50c4a71cb39a8ec78bf8d1dc3c82bb9dd1d69d9169d7c937165ea15f60ce1147f256d46644f944107a3a8a800d5bad70d4c255
 DIST refpolicy-2.20141203.tar.bz2 680243 SHA256 f438209c430d8a2d4ddcbe4bdd3edb46f6af7dc4913637af0b73c635e40c1522 SHA512 682e4280c5799e4c12ec7594afc1389f67be35055748d2e0dbdc3419159a16c96d4946ca6178daee8370515951f8653b2e452efe8c962b8d7f9bc192f0b15a0c WHIRLPOOL 74bca232534e7af9051bb1ab9f77c1ff6c425781cf4561f781d6e9a40cc5ca0d9add540249ea5493e8782a9372aea296ead6c165c6c440ae1509eb319d151ee5
diff --git a/sec-policy/selinux-xscreensaver/selinux-xscreensaver-2.20141203-r8.ebuild b/sec-policy/selinux-xscreensaver/selinux-xscreensaver-2.20141203-r8.ebuild
index f66e640cedc9..39d41b6a82d8 100644
--- a/sec-policy/selinux-xscreensaver/selinux-xscreensaver-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-xscreensaver/selinux-xscreensaver-2.20141203-r8.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="SELinux policy for xscreensaver"
 if [[ $PV == 9999* ]] ; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 DEPEND="${DEPEND}
 	sec-policy/selinux-xserver
diff --git a/sec-policy/selinux-xscreensaver/selinux-xscreensaver-2.20141203-r9.ebuild b/sec-policy/selinux-xscreensaver/selinux-xscreensaver-2.20141203-r9.ebuild
new file mode 100644
index 000000000000..f66e640cedc9
--- /dev/null
+++ b/sec-policy/selinux-xscreensaver/selinux-xscreensaver-2.20141203-r9.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI="5"
+
+IUSE=""
+MODS="xscreensaver"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for xscreensaver"
+
+if [[ $PV == 9999* ]] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
+DEPEND="${DEPEND}
+	sec-policy/selinux-xserver
+"
+RDEPEND="${RDEPEND}
+	sec-policy/selinux-xserver
+"
diff --git a/sec-policy/selinux-xserver/Manifest b/sec-policy/selinux-xserver/Manifest
index 8327a635be01..91d204b0021a 100644
--- a/sec-policy/selinux-xserver/Manifest
+++ b/sec-policy/selinux-xserver/Manifest
@@ -9,5 +9,6 @@ DIST patchbundle-selinux-base-policy-2.20141203-r5.tar.bz2 274136 SHA256 c23d17c
 DIST patchbundle-selinux-base-policy-2.20141203-r6.tar.bz2 293231 SHA256 b686dcc517b97834f66d967afdcc724cb43b5c6dbf9f34043a91cdeda2625cc7 SHA512 a2c486cbe4a1d21ff3fd01bef25ecf5a633a4072646c67cfccf3f7187d95f3d9e3b482a46ba17c55c40a8e7c0dee56e9cf9ddc9f414d3e4511443b62f60d03e9 WHIRLPOOL 3d708e287e3f9b873be647b0327eab6675a8702ee1cffb56e36934cada306e5ccc64397a083dad9e59de37a067e628cacbf896ae99012d5a209e42fd7cd8a4c6
 DIST patchbundle-selinux-base-policy-2.20141203-r7.tar.bz2 295833 SHA256 ba2219b3efc747be65f94c4d8ac3cd6ee530c82c848fa41935a114184678622a SHA512 8e32d9dbfb2f0f3f50200543aadb51ed9834ccd5cdf30bf8e4d9e6d0b645ce44ffaf80f7aa9385e9c9095d9a383b3a348a92356cb5386c06544ab082a9a468c7 WHIRLPOOL 1648ee1be71e45fcf5a264816ce7edc7bab19bd28a68703923eb2d6068f1f0469ae593855231d31f88baecbf29e7cece2d6beeed20b7c04231a6c90e90d35910
 DIST patchbundle-selinux-base-policy-2.20141203-r8.tar.bz2 297919 SHA256 77539eb3d78105f8789cd8205d2698bd27e2abf100163bdd162cda860fd15120 SHA512 2f8a19e1e4bb65f32b480275f49099aed3ae9df543c7de862b3bbd93e81b89cd96dadac3d091e28673d09a6885db8c5656b3a77d0080775c110b04f2753de7a6 WHIRLPOOL 79cb7e620eb8e838192dc557c7a9ce7e713227d783cc8b63792825559b2145cad70d0af6f99948c1527557bc363feffd846c73893682b4a14fc7d08b9e20c649
+DIST patchbundle-selinux-base-policy-2.20141203-r9.tar.bz2 299602 SHA256 e8518004942a6c57170a609683e22b1410c93a2a195829c41dc8fbc703d941b5 SHA512 ce6484fbca1d2d074e50d1a3953392bd3ce0a4617df98fbac37747b469b4f160a9331586dfe1c3ddccb1ccbee24876a2f05ab49e37c8492a48baf83c2d01d140 WHIRLPOOL 1fd7b956e98e95a64c3a713a944d4531259bd156a7feabf6a89c4b5f33ac846377730eede97889e85183be086f282ebd18e860214f6ca3f01b40f2323470ee04
 DIST refpolicy-2.20140311.tar.bz2 664416 SHA256 f69437db95548c78a5dec44c236397146b144153149009ea554d2e536e5436f7 SHA512 50bacee82ed41ac8b8007ecc33bf51d22303cc2ddd27cfb72cb5520dab5f8e255186e34b89cec492c7a2d4220b200814bdede9b46c19f987a3d3d65a1c9b749a WHIRLPOOL e07480beba6ab1f02ad36b7d0c50c4a71cb39a8ec78bf8d1dc3c82bb9dd1d69d9169d7c937165ea15f60ce1147f256d46644f944107a3a8a800d5bad70d4c255
 DIST refpolicy-2.20141203.tar.bz2 680243 SHA256 f438209c430d8a2d4ddcbe4bdd3edb46f6af7dc4913637af0b73c635e40c1522 SHA512 682e4280c5799e4c12ec7594afc1389f67be35055748d2e0dbdc3419159a16c96d4946ca6178daee8370515951f8653b2e452efe8c962b8d7f9bc192f0b15a0c WHIRLPOOL 74bca232534e7af9051bb1ab9f77c1ff6c425781cf4561f781d6e9a40cc5ca0d9add540249ea5493e8782a9372aea296ead6c165c6c440ae1509eb319d151ee5
diff --git a/sec-policy/selinux-xserver/selinux-xserver-2.20141203-r8.ebuild b/sec-policy/selinux-xserver/selinux-xserver-2.20141203-r8.ebuild
index 0a9ea124113d..cd88f06624e8 100644
--- a/sec-policy/selinux-xserver/selinux-xserver-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-xserver/selinux-xserver-2.20141203-r8.ebuild
@@ -13,5 +13,5 @@ DESCRIPTION="SELinux policy for xserver"
 if [[ $PV == 9999* ]] ; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-xserver/selinux-xserver-2.20141203-r9.ebuild b/sec-policy/selinux-xserver/selinux-xserver-2.20141203-r9.ebuild
new file mode 100644
index 000000000000..0a9ea124113d
--- /dev/null
+++ b/sec-policy/selinux-xserver/selinux-xserver-2.20141203-r9.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI="5"
+
+IUSE=""
+MODS="xserver"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for xserver"
+
+if [[ $PV == 9999* ]] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
diff --git a/sec-policy/selinux-zabbix/Manifest b/sec-policy/selinux-zabbix/Manifest
index 8327a635be01..91d204b0021a 100644
--- a/sec-policy/selinux-zabbix/Manifest
+++ b/sec-policy/selinux-zabbix/Manifest
@@ -9,5 +9,6 @@ DIST patchbundle-selinux-base-policy-2.20141203-r5.tar.bz2 274136 SHA256 c23d17c
 DIST patchbundle-selinux-base-policy-2.20141203-r6.tar.bz2 293231 SHA256 b686dcc517b97834f66d967afdcc724cb43b5c6dbf9f34043a91cdeda2625cc7 SHA512 a2c486cbe4a1d21ff3fd01bef25ecf5a633a4072646c67cfccf3f7187d95f3d9e3b482a46ba17c55c40a8e7c0dee56e9cf9ddc9f414d3e4511443b62f60d03e9 WHIRLPOOL 3d708e287e3f9b873be647b0327eab6675a8702ee1cffb56e36934cada306e5ccc64397a083dad9e59de37a067e628cacbf896ae99012d5a209e42fd7cd8a4c6
 DIST patchbundle-selinux-base-policy-2.20141203-r7.tar.bz2 295833 SHA256 ba2219b3efc747be65f94c4d8ac3cd6ee530c82c848fa41935a114184678622a SHA512 8e32d9dbfb2f0f3f50200543aadb51ed9834ccd5cdf30bf8e4d9e6d0b645ce44ffaf80f7aa9385e9c9095d9a383b3a348a92356cb5386c06544ab082a9a468c7 WHIRLPOOL 1648ee1be71e45fcf5a264816ce7edc7bab19bd28a68703923eb2d6068f1f0469ae593855231d31f88baecbf29e7cece2d6beeed20b7c04231a6c90e90d35910
 DIST patchbundle-selinux-base-policy-2.20141203-r8.tar.bz2 297919 SHA256 77539eb3d78105f8789cd8205d2698bd27e2abf100163bdd162cda860fd15120 SHA512 2f8a19e1e4bb65f32b480275f49099aed3ae9df543c7de862b3bbd93e81b89cd96dadac3d091e28673d09a6885db8c5656b3a77d0080775c110b04f2753de7a6 WHIRLPOOL 79cb7e620eb8e838192dc557c7a9ce7e713227d783cc8b63792825559b2145cad70d0af6f99948c1527557bc363feffd846c73893682b4a14fc7d08b9e20c649
+DIST patchbundle-selinux-base-policy-2.20141203-r9.tar.bz2 299602 SHA256 e8518004942a6c57170a609683e22b1410c93a2a195829c41dc8fbc703d941b5 SHA512 ce6484fbca1d2d074e50d1a3953392bd3ce0a4617df98fbac37747b469b4f160a9331586dfe1c3ddccb1ccbee24876a2f05ab49e37c8492a48baf83c2d01d140 WHIRLPOOL 1fd7b956e98e95a64c3a713a944d4531259bd156a7feabf6a89c4b5f33ac846377730eede97889e85183be086f282ebd18e860214f6ca3f01b40f2323470ee04
 DIST refpolicy-2.20140311.tar.bz2 664416 SHA256 f69437db95548c78a5dec44c236397146b144153149009ea554d2e536e5436f7 SHA512 50bacee82ed41ac8b8007ecc33bf51d22303cc2ddd27cfb72cb5520dab5f8e255186e34b89cec492c7a2d4220b200814bdede9b46c19f987a3d3d65a1c9b749a WHIRLPOOL e07480beba6ab1f02ad36b7d0c50c4a71cb39a8ec78bf8d1dc3c82bb9dd1d69d9169d7c937165ea15f60ce1147f256d46644f944107a3a8a800d5bad70d4c255
 DIST refpolicy-2.20141203.tar.bz2 680243 SHA256 f438209c430d8a2d4ddcbe4bdd3edb46f6af7dc4913637af0b73c635e40c1522 SHA512 682e4280c5799e4c12ec7594afc1389f67be35055748d2e0dbdc3419159a16c96d4946ca6178daee8370515951f8653b2e452efe8c962b8d7f9bc192f0b15a0c WHIRLPOOL 74bca232534e7af9051bb1ab9f77c1ff6c425781cf4561f781d6e9a40cc5ca0d9add540249ea5493e8782a9372aea296ead6c165c6c440ae1509eb319d151ee5
diff --git a/sec-policy/selinux-zabbix/selinux-zabbix-2.20141203-r8.ebuild b/sec-policy/selinux-zabbix/selinux-zabbix-2.20141203-r8.ebuild
index fa0e3ec11417..377fa85b69b3 100644
--- a/sec-policy/selinux-zabbix/selinux-zabbix-2.20141203-r8.ebuild
+++ b/sec-policy/selinux-zabbix/selinux-zabbix-2.20141203-r8.ebuild
@@ -13,5 +13,5 @@ DESCRIPTION="SELinux policy for zabbix"
 if [[ $PV == 9999* ]] ; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
diff --git a/sec-policy/selinux-zabbix/selinux-zabbix-2.20141203-r9.ebuild b/sec-policy/selinux-zabbix/selinux-zabbix-2.20141203-r9.ebuild
new file mode 100644
index 000000000000..fa0e3ec11417
--- /dev/null
+++ b/sec-policy/selinux-zabbix/selinux-zabbix-2.20141203-r9.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI="5"
+
+IUSE=""
+MODS="zabbix"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for zabbix"
+
+if [[ $PV == 9999* ]] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
diff --git a/sys-apps/baobab/baobab-3.16.1.ebuild b/sys-apps/baobab/baobab-3.16.1.ebuild
index dd274a04f9e0..e5575af2a69a 100644
--- a/sys-apps/baobab/baobab-3.16.1.ebuild
+++ b/sys-apps/baobab/baobab-3.16.1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Baobab"
 LICENSE="GPL-2+ FDL-1.1+"
 SLOT="0"
 IUSE=""
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux"
 
 COMMON_DEPEND="
 	>=dev-libs/glib-2.40:2
diff --git a/sys-apps/chname/metadata.xml b/sys-apps/chname/metadata.xml
index 7d6ebf36c141..a756d5496822 100644
--- a/sys-apps/chname/metadata.xml
+++ b/sys-apps/chname/metadata.xml
@@ -7,5 +7,6 @@
 	<longdescription lang="en">Run a command with a new system hostname. Requires utsname namespaces.</longdescription>
 	<upstream>
 		<remote-id type="google-code">chname</remote-id>
+		<remote-id type="github">marineam/chname</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/sys-apps/dmidecode/Manifest b/sys-apps/dmidecode/Manifest
index 8e527c5702dd..12c581da92ee 100644
--- a/sys-apps/dmidecode/Manifest
+++ b/sys-apps/dmidecode/Manifest
@@ -1 +1,2 @@
 DIST dmidecode-2.12.tar.bz2 55191 SHA256 913ff3055d563a62a420789b8ee33b038de9afa18ea61254760ddf8ab87a5088 SHA512 15d5a6dca04de48267f969f6866079915964a8a3abad083b1720a4425723f9c100770d05c0d475df9609c5b54741f231a587761d1beb1ae6de4b2836d60724c4 WHIRLPOOL 139841a9efd07ecfcb012a24e2c3ea00c79d66828a5d5aa1eeb8b230c1b84f310e5f9282403af9f530f7ead41922f7a3e8a6e8b93e46d7403d69975b95d6a406
+DIST dmidecode-3.0.tar.xz 58704 SHA256 7ec35bb193729c1d593a1460b59d82d24b89102ab23fd0416e6cf4325d077e45 SHA512 fa31190e43ae7a0b61f6313b45f5eba3ab66390accd587129419e48fca931b631cbb331d6893cf0c1bfca94c86ff8c557215166e0881dee93b3af10a86878eb1 WHIRLPOOL 91f8b26c272fbaa06699f3cdb593a731a0d1e777ba81ee432192e41c1f2edda764ed990b570c2dc2fc44d6ce324d5a252c01308811717db1cd2baebe98b7e176
diff --git a/sys-apps/dmidecode/dmidecode-3.0.ebuild b/sys-apps/dmidecode/dmidecode-3.0.ebuild
new file mode 100644
index 000000000000..4cae2bc805ce
--- /dev/null
+++ b/sys-apps/dmidecode/dmidecode-3.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+
+inherit flag-o-matic toolchain-funcs eutils
+
+DESCRIPTION="DMI (Desktop Management Interface) table related utilities"
+HOMEPAGE="http://www.nongnu.org/dmidecode/"
+SRC_URI="http://savannah.nongnu.org/download/${PN}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-solaris"
+IUSE="selinux"
+
+RDEPEND="selinux? ( sec-policy/selinux-dmidecode )"
+DEPEND=""
+
+src_prepare() {
+	sed -i \
+		-e "/^prefix/s:/usr/local:${EPREFIX}/usr:" \
+		-e "/^docdir/s:dmidecode:${PF}:" \
+		-e '/^PROGRAMS !=/d' \
+		Makefile || die
+}
+
+src_compile() {
+	emake \
+		CFLAGS="${CFLAGS} ${CPPFLAGS}" \
+		LDFLAGS="${LDFLAGS}" \
+		CC="$(tc-getCC)"
+}
+
+pkg_postinst() {
+	if [[ ${CHOST} == *-solaris* ]] ; then
+		einfo "dmidecode needs root privileges to read /dev/xsvc"
+		einfo "To make dmidecode useful, either run as root, or chown and setuid the binary."
+		einfo "Note that /usr/sbin/ptrconf and /usr/sbin/ptrdiag give similar"
+		einfo "information without requiring root privileges."
+	fi
+}
diff --git a/sys-apps/gentoo-functions/gentoo-functions-0.10.ebuild b/sys-apps/gentoo-functions/gentoo-functions-0.10.ebuild
index e23f6cf5bac5..c19af4dff15f 100644
--- a/sys-apps/gentoo-functions/gentoo-functions-0.10.ebuild
+++ b/sys-apps/gentoo-functions/gentoo-functions-0.10.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} = 9999* ]]; then
 	EGIT_REPO_URI="git://github.com/gentoo/${PN}.git"
 else
 	SRC_URI="https://github.com/gentoo/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 fi
 
 inherit toolchain-funcs flag-o-matic
diff --git a/sys-apps/gnome-disk-utility/gnome-disk-utility-3.16.2.ebuild b/sys-apps/gnome-disk-utility/gnome-disk-utility-3.16.2.ebuild
index f5953cf5cd27..24fc83798c6b 100644
--- a/sys-apps/gnome-disk-utility/gnome-disk-utility-3.16.2.ebuild
+++ b/sys-apps/gnome-disk-utility/gnome-disk-utility-3.16.2.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://git.gnome.org/browse/gnome-disk-utility"
 LICENSE="GPL-2+"
 SLOT="0"
 IUSE="fat +gnome systemd"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
 
 COMMON_DEPEND="
 	>=dev-libs/glib-2.31:2
diff --git a/sys-apps/inxi/metadata.xml b/sys-apps/inxi/metadata.xml
index 61c052a97a13..a73f9975f49b 100644
--- a/sys-apps/inxi/metadata.xml
+++ b/sys-apps/inxi/metadata.xml
@@ -5,4 +5,7 @@
 		<email>dastergon@gentoo.org</email>
 		<name>Pavlos Ratis</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">smxi/inxi</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/sys-apps/iproute2/Manifest b/sys-apps/iproute2/Manifest
index 5593e6572192..8aa32d2742ba 100644
--- a/sys-apps/iproute2/Manifest
+++ b/sys-apps/iproute2/Manifest
@@ -4,5 +4,5 @@ DIST iproute2-3.19.0.tar.xz 455004 SHA256 e2f9f8c36e166f2ba6c0e1e7a9ad84cdf7c161
 DIST iproute2-3.3.0.tar.bz2 416353 SHA256 f328ec01bac64854f477b9440b0bbeae91895b4ba266821597ceac6bd1501c3b SHA512 825b473e3fb17cf724bc389bb99dabbdabf9c5bfee89890f723027f3412a82a9c7f77ac8b792a218ff50dd552e31105206ccff1897b68fe201d83e5764032feb WHIRLPOOL 7827cb8d447eb86d89dc14dedecb94d7e1a9fc9380ee2130d28047f834f5b96045226409448a8f159501f9bd20b1eebe7c32ae17d5687c4c071459ae9c807ebc
 DIST iproute2-3.8.0.tar.xz 407608 SHA256 579145749f1aaf60e7c7a5de24b7f00fa2200a961094733c792b4ff139181e4f SHA512 0d93070044f573055a7cc58bd006e476f5b0fcb75cb5d49a37417aa7583e637a92e460947434cef9b9449267e4529c655a23b5ed3d549a2aba128148cb8d4ade WHIRLPOOL bfb29c34953f205f7c801a86a38f58d9352b716504649e61665ced6dd48557291412de5fd8987dbab44fbd397dab4a6b55d6c371c7cbaaea3d6e29269df115df
 DIST iproute2-4.0.0.tar.xz 459364 SHA256 5cd06eb1050b858b308b65705725042bb566fd261135e35a73dafb48cd632618 SHA512 8e0587ed484a9697af99b4f37b460fddd28136b3c19898a11809b1e8ca9a75a18dcc83bc512f5b74361e6128732e69a3e66b3a62c38a5ae5f13c3e18af186be4 WHIRLPOOL 6abdf2b4587abd7a73d2b7692a4bb478ac379dc3a27f564ad78e34f25f06ae5dd9e0e4873c6510d30767a398375dcdcd2da777412c725885e0c3d4bd89c71a9b
-DIST iproute2-4.1.0.tar.xz 495312 SHA256 d1326696c6a8f81ba66aaf48d858005cf280c81d3284d8d2c99748e3d0746146 SHA512 81faa393a2c7bf5286d7b54817646fb3763d66fbda8b6902e137061827fa1d54d58e9e4fb4f8415222f5adc1b0bec77b6ecf94d1b7cc11834283593208fb4209 WHIRLPOOL 938f0f68d74c8c1bef1be005b55b1b652bf74e23671d6fde493819058e1464c0f3931d69d7dbc398f0ed99ce42fa2bcd80c5207fabfdad78389e4e19b8051112
 DIST iproute2-4.1.1.tar.xz 496388 SHA256 73077a989efb934450bd655cbd9aaddaa747cb696c64d0c9a3323768a6a8e66f SHA512 af2e4021faf931d17a67c242c66b4f6a6ce93a69cee5408dd3951d488da511c99d693534e91d0a317bd82dfdcb6a543605cecf2514d512004639db8d17afb93e WHIRLPOOL 24542b56275675609aaad69ca68e89145d4da84ddb2429ae546179a249bcc1213f89168673657966122e01e992763fec053c118fbd69b7db1677ad7be97397b6
+DIST iproute2-4.2.0.tar.xz 506120 SHA256 a4101e743e0da36b55f63353ff489699ddcd634ceca854a9a272346588f30f30 SHA512 a2580cab92ee4c3e78e52bd8b742e9a1f2097815022a392241136b5589dd1de2ff1def9f608e4b5464c57d8f3d50c4361897271db2058683dfdc6984172784c5 WHIRLPOOL f6ae4537cafc2dd70640f602195f509e58613787f82b26dd909d7c36f09e6b256abee5fc6772e6129cfd023d95248ce66b2c6bd223186861203ebcbe2965e43c
diff --git a/sys-apps/iproute2/files/iproute2-4.2.0-no-ipv6.patch b/sys-apps/iproute2/files/iproute2-4.2.0-no-ipv6.patch
new file mode 100644
index 000000000000..b29e1aa3e118
--- /dev/null
+++ b/sys-apps/iproute2/files/iproute2-4.2.0-no-ipv6.patch
@@ -0,0 +1,37 @@
+--- iproute2-4.2.0/ip/ipmonitor.c
++++ iproute2-4.2.0/ip/ipmonitor.c
+@@ -115,7 +115,6 @@
+ 	}
+ 	if (n->nlmsg_type == RTM_NEWPREFIX) {
+ 		print_headers(fp, "[PREFIX]", ctrl);
+-		print_prefix(who, n, arg);
+ 		return 0;
+ 	}
+ 	if (n->nlmsg_type == RTM_NEWRULE || n->nlmsg_type == RTM_DELRULE) {
+--- iproute2-4.2.0/ip/iptunnel.c
++++ iproute2-4.2.0/ip/iptunnel.c
+@@ -637,13 +637,6 @@
+ 		break;
+ 	case AF_INET:
+ 		break;
+-	/*
+-	 * This is silly enough but we have no easy way to make it
+-	 * protocol-independent because of unarranged structure between
+-	 * IPv4 and IPv6.
+-	 */
+-	case AF_INET6:
+-		return do_ip6tunnel(argc, argv);
+ 	default:
+ 		fprintf(stderr, "Unsupported protocol family: %d\n", preferred_family);
+ 		exit(-1);
+--- iproute2-4.2.0/ip/Makefile
++++ iproute2-4.2.0/ip/Makefile
+@@ -1,6 +1,6 @@
+ IPOBJ=ip.o ipaddress.o ipaddrlabel.o iproute.o iprule.o ipnetns.o \
+-    rtm_map.o iptunnel.o ip6tunnel.o tunnel.o ipneigh.o ipntable.o iplink.o \
+-    ipmaddr.o ipmonitor.o ipmroute.o ipprefix.o iptuntap.o iptoken.o \
++    rtm_map.o iptunnel.o tunnel.o ipneigh.o ipntable.o iplink.o \
++    ipmaddr.o ipmonitor.o ipmroute.o iptuntap.o iptoken.o \
+     ipxfrm.o xfrm_state.o xfrm_policy.o xfrm_monitor.o \
+     iplink_vlan.o link_veth.o link_gre.o iplink_can.o \
+     iplink_macvlan.o iplink_macvtap.o ipl2tp.o link_vti.o link_vti6.o \
diff --git a/sys-apps/iproute2/iproute2-4.1.0.ebuild b/sys-apps/iproute2/iproute2-4.1.0.ebuild
deleted file mode 100644
index 734e2b1f2f38..000000000000
--- a/sys-apps/iproute2/iproute2-4.1.0.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit eutils toolchain-funcs flag-o-matic multilib
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="git://git.kernel.org/pub/scm/linux/kernel/git/shemminger/iproute2.git"
-	inherit git-2
-else
-	SRC_URI="mirror://kernel/linux/utils/net/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-fi
-
-DESCRIPTION="kernel routing and traffic control utilities"
-HOMEPAGE="http://www.linuxfoundation.org/collaborate/workgroups/networking/iproute2"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="atm berkdb +iptables ipv6 minimal selinux"
-
-RDEPEND="!net-misc/arpd
-	net-libs/libmnl
-	iptables? ( >=net-firewall/iptables-1.4.20:= )
-	berkdb? ( sys-libs/db:= )
-	atm? ( net-dialup/linux-atm )
-	selinux? ( sys-libs/libselinux )"
-# We require newer linux-headers for ipset support #549948 and some defines #553876
-DEPEND="${RDEPEND}
-	app-arch/xz-utils
-	iptables? ( virtual/pkgconfig )
-	sys-devel/bison
-	sys-devel/flex
-	>=sys-kernel/linux-headers-3.16
-	elibc_glibc? ( >=sys-libs/glibc-2.7 )"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-3.1.0-mtu.patch #291907
-	use ipv6 || epatch "${FILESDIR}"/${PN}-3.10.0-no-ipv6.patch #326849
-
-	sed -i \
-		-e '/^CC =/d' \
-		-e "/^LIBDIR/s:=.*:=/$(get_libdir):" \
-		-e "s:-O2:${CFLAGS} ${CPPFLAGS}:" \
-		-e "/^HOSTCC/s:=.*:= $(tc-getBUILD_CC):" \
-		-e "/^WFLAGS/s:-Werror::" \
-		-e "/^DBM_INCLUDE/s:=.*:=${T}:" \
-		Makefile || die
-
-	# Use /run instead of /var/run.
-	sed -i \
-		-e 's:/var/run:/run:g' \
-		include/namespace.h \
-		man/man8/ip-netns.8 || die
-
-	# build against system headers
-	rm -r include/netinet #include/linux include/ip{,6}tables{,_common}.h include/libiptc
-	sed -i 's:TCPI_OPT_ECN_SEEN:16:' misc/ss.c || die
-
-	# don't build arpd if USE=-berkdb #81660
-	use berkdb || sed -i '/^TARGETS=/s: arpd : :' misc/Makefile
-
-	use minimal && sed -i -e '/^SUBDIRS=/s:=.*:=lib tc ip:' Makefile
-}
-
-src_configure() {
-	tc-export AR CC PKG_CONFIG
-
-	# This sure is ugly.  Should probably move into toolchain-funcs at some point.
-	local setns
-	pushd "${T}" >/dev/null
-	echo 'main(){return setns();};' > test.c
-	${CC} ${CFLAGS} ${LDFLAGS} test.c >&/dev/null && setns=y || setns=n
-	echo 'main(){};' > test.c
-	${CC} ${CFLAGS} ${LDFLAGS} test.c -lresolv >&/dev/null || sed -i '/^LDLIBS/s:-lresolv::' "${S}"/Makefile
-	popd >/dev/null
-
-	cat <<-EOF > Config
-	TC_CONFIG_ATM := $(usex atm y n)
-	TC_CONFIG_XT  := $(usex iptables y n)
-	# We've locked in recent enough kernel headers #549948
-	TC_CONFIG_IPSET := y
-	HAVE_SELINUX  := $(usex selinux y n)
-	IP_CONFIG_SETNS := ${setns}
-	# Use correct iptables dir, #144265 #293709
-	IPT_LIB_DIR := $(use iptables && ${PKG_CONFIG} xtables --variable=xtlibdir)
-	EOF
-}
-
-src_install() {
-	if use minimal ; then
-		into /
-		dosbin tc/tc
-		dobin ip/ip
-		return 0
-	fi
-
-	emake \
-		DESTDIR="${D}" \
-		LIBDIR="${EPREFIX}"/$(get_libdir) \
-		SBINDIR="${EPREFIX}"/sbin \
-		CONFDIR="${EPREFIX}"/etc/iproute2 \
-		DOCDIR="${EPREFIX}"/usr/share/doc/${PF} \
-		MANDIR="${EPREFIX}"/usr/share/man \
-		ARPDDIR="${EPREFIX}"/var/lib/arpd \
-		install
-
-	rm "${ED}"/usr/share/doc/${PF}/*.{sgml,tex} || die #455988
-
-	dodir /bin
-	mv "${ED}"/{s,}bin/ip || die #330115
-
-	dolib.a lib/libnetlink.a
-	insinto /usr/include
-	doins include/libnetlink.h
-	# This local header pulls in a lot of linux headers it
-	# doesn't directly need.  Delete this header that requires
-	# linux-headers-3.8 until that goes stable.  #467716
-	sed -i '/linux\/netconf.h/d' "${ED}"/usr/include/libnetlink.h || die
-
-	if use berkdb ; then
-		dodir /var/lib/arpd
-		# bug 47482, arpd doesn't need to be in /sbin
-		dodir /usr/bin
-		mv "${ED}"/sbin/arpd "${ED}"/usr/bin/ || die
-	fi
-}
diff --git a/sys-apps/iproute2/iproute2-4.2.0.ebuild b/sys-apps/iproute2/iproute2-4.2.0.ebuild
new file mode 100644
index 000000000000..7ab34a159f19
--- /dev/null
+++ b/sys-apps/iproute2/iproute2-4.2.0.ebuild
@@ -0,0 +1,131 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit eutils toolchain-funcs flag-o-matic multilib
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="git://git.kernel.org/pub/scm/linux/kernel/git/shemminger/iproute2.git"
+	inherit git-2
+else
+	SRC_URI="mirror://kernel/linux/utils/net/${PN}/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+fi
+
+DESCRIPTION="kernel routing and traffic control utilities"
+HOMEPAGE="http://www.linuxfoundation.org/collaborate/workgroups/networking/iproute2"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="atm berkdb +iptables ipv6 minimal selinux"
+
+# We could make libmnl optional, but it's tiny, so eh
+RDEPEND="!net-misc/arpd
+	!minimal? ( net-libs/libmnl )
+	iptables? ( >=net-firewall/iptables-1.4.20:= )
+	berkdb? ( sys-libs/db:= )
+	atm? ( net-dialup/linux-atm )
+	selinux? ( sys-libs/libselinux )"
+# We require newer linux-headers for ipset support #549948 and some defines #553876
+DEPEND="${RDEPEND}
+	app-arch/xz-utils
+	iptables? ( virtual/pkgconfig )
+	sys-devel/bison
+	sys-devel/flex
+	>=sys-kernel/linux-headers-3.16
+	elibc_glibc? ( >=sys-libs/glibc-2.7 )"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-3.1.0-mtu.patch #291907
+	use ipv6 || epatch "${FILESDIR}"/${PN}-4.2.0-no-ipv6.patch #326849
+
+	sed -i \
+		-e '/^CC =/d' \
+		-e "/^LIBDIR/s:=.*:=/$(get_libdir):" \
+		-e "s:-O2:${CFLAGS} ${CPPFLAGS}:" \
+		-e "/^HOSTCC/s:=.*:= $(tc-getBUILD_CC):" \
+		-e "/^WFLAGS/s:-Werror::" \
+		-e "/^DBM_INCLUDE/s:=.*:=${T}:" \
+		Makefile || die
+
+	# Use /run instead of /var/run.
+	sed -i \
+		-e 's:/var/run:/run:g' \
+		include/namespace.h \
+		man/man8/ip-netns.8 || die
+
+	# build against system headers
+	rm -r include/netinet #include/linux include/ip{,6}tables{,_common}.h include/libiptc
+	sed -i 's:TCPI_OPT_ECN_SEEN:16:' misc/ss.c || die
+
+	# don't build arpd if USE=-berkdb #81660
+	use berkdb || sed -i '/^TARGETS=/s: arpd : :' misc/Makefile
+
+	use minimal && sed -i -e '/^SUBDIRS=/s:=.*:=lib tc ip:' Makefile
+}
+
+src_configure() {
+	tc-export AR CC PKG_CONFIG
+
+	# This sure is ugly.  Should probably move into toolchain-funcs at some point.
+	local setns
+	pushd "${T}" >/dev/null
+	echo 'main(){return setns();};' > test.c
+	${CC} ${CFLAGS} ${LDFLAGS} test.c >&/dev/null && setns=y || setns=n
+	echo 'main(){};' > test.c
+	${CC} ${CFLAGS} ${LDFLAGS} test.c -lresolv >&/dev/null || sed -i '/^LDLIBS/s:-lresolv::' "${S}"/Makefile
+	popd >/dev/null
+
+	cat <<-EOF > Config
+	TC_CONFIG_ATM := $(usex atm y n)
+	TC_CONFIG_XT  := $(usex iptables y n)
+	# We've locked in recent enough kernel headers #549948
+	TC_CONFIG_IPSET := y
+	HAVE_MNL      := $(usex minimal n y)
+	HAVE_SELINUX  := $(usex selinux y n)
+	IP_CONFIG_SETNS := ${setns}
+	# Use correct iptables dir, #144265 #293709
+	IPT_LIB_DIR := $(use iptables && ${PKG_CONFIG} xtables --variable=xtlibdir)
+	EOF
+}
+
+src_install() {
+	if use minimal ; then
+		into /
+		dosbin tc/tc
+		dobin ip/ip
+		return 0
+	fi
+
+	emake \
+		DESTDIR="${D}" \
+		LIBDIR="${EPREFIX}"/$(get_libdir) \
+		SBINDIR="${EPREFIX}"/sbin \
+		CONFDIR="${EPREFIX}"/etc/iproute2 \
+		DOCDIR="${EPREFIX}"/usr/share/doc/${PF} \
+		MANDIR="${EPREFIX}"/usr/share/man \
+		ARPDDIR="${EPREFIX}"/var/lib/arpd \
+		install
+
+	rm "${ED}"/usr/share/doc/${PF}/*.{sgml,tex} || die #455988
+
+	dodir /bin
+	mv "${ED}"/{s,}bin/ip || die #330115
+
+	dolib.a lib/libnetlink.a
+	insinto /usr/include
+	doins include/libnetlink.h
+	# This local header pulls in a lot of linux headers it
+	# doesn't directly need.  Delete this header that requires
+	# linux-headers-3.8 until that goes stable.  #467716
+	sed -i '/linux\/netconf.h/d' "${ED}"/usr/include/libnetlink.h || die
+
+	if use berkdb ; then
+		dodir /var/lib/arpd
+		# bug 47482, arpd doesn't need to be in /sbin
+		dodir /usr/bin
+		mv "${ED}"/sbin/arpd "${ED}"/usr/bin/ || die
+	fi
+}
diff --git a/sys-apps/likwid/Manifest b/sys-apps/likwid/Manifest
index 448cb7b7aacf..2b503e55f988 100644
--- a/sys-apps/likwid/Manifest
+++ b/sys-apps/likwid/Manifest
@@ -1,2 +1,2 @@
 DIST likwid-3.1.3.tar.gz 605675 SHA256 05078ec55dce3d4cf1c94832bd289ccbcaee7bdee9a1ea9f6681ccd3f59ece5b SHA512 e31b4498e702d4ddf61e3c123d43f0804ef4cef149bb3732b61e3894aa9d76feb7a2654bbb0467dd30323031122ea01cf17e4f01a33f193e750cdbdfc09741d7 WHIRLPOOL bccfcc68e792f09a66eab99affa81250fbe34d4759a81a4e0bd0af2535e5bb09229bee4bc165986559d14101183e5be9a933273ec9f1a7c5c8da3f97f07f9e8e
-DIST likwid-4.0.1.tar.gz 1429223 SHA256 c04551a2264389f4a88cb2757efdcb0a8d3c3fd9851020d0827a90b68b8c36e3 SHA512 fdc0eaf102814d53efdabb12d90f4baeec9d190f9808e3fcf5a6785136a7cf9fd0789cf64417cd52c7288a50a4284f8e44463c16410c2b0e4ef3ce3790c61b86 WHIRLPOOL 9a944b77ebb60d5283c2c42c44dabeb6dc8837d64a4e2d90d0878ab60c5b3b3d7e55cbfbbe7fcc075edcc83d4d980f689a8ed6b5f3a5051c6af824d624b1dbd6
+DIST likwid-4.0.1.tar.gz 1409079 SHA256 ab384e585d99a7404075c48f78a08e892a75db12c348da6622ed0536a0a05c7f SHA512 f164a244e56afdc4409790b75f3cb4ea49cc91f7a210590de426f429db5717eed9691263580008cf69997be56a63009224012ee48c55f05b112f96cfca81c52e WHIRLPOOL 59392e6a2057fb9f9aa70b7cc0594ca7a665171b8a2302ddd9350930571596f14e5c9753d132eddb750ef8503330b4f456158fae7a99705c36e7aac80afa6bb2
diff --git a/sys-apps/likwid/likwid-4.0.1.ebuild b/sys-apps/likwid/likwid-4.0.1.ebuild
index 52c115ce41c3..0c25cb3f99c9 100644
--- a/sys-apps/likwid/likwid-4.0.1.ebuild
+++ b/sys-apps/likwid/likwid-4.0.1.ebuild
@@ -10,7 +10,8 @@ inherit eutils fcaps linux-info multilib fortran-2
 
 DESCRIPTION="A performance-oriented tool suite for x86 multicore environments"
 HOMEPAGE="https://github.com/rrze-likwid/likwid"
-SRC_URI="https://github.com/rrze-likwid/likwid/archive/likwid-${PV}.tar.gz"
+# Upstream have made a habit of making changes to the tagged realesed tarball
+SRC_URI="https://dev.gentoo.org/~idella4/tarballs/likwid-${PV}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
@@ -24,6 +25,8 @@ DEPEND="${RDEPEND}
 	fortran? ( sys-devel/gcc:*[fortran] )
 	dev-lang/lua:0"
 
+RESTRICT="mirror"
+
 CONFIG_CHECK="~X86_MSR"
 
 FILECAPS=(
diff --git a/sys-apps/lm_sensors/lm_sensors-3.3.5.ebuild b/sys-apps/lm_sensors/lm_sensors-3.3.5.ebuild
index 8c69ed406394..9dd93ac1b5e5 100644
--- a/sys-apps/lm_sensors/lm_sensors-3.3.5.ebuild
+++ b/sys-apps/lm_sensors/lm_sensors-3.3.5.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://dl.lm-sensors.org/lm-sensors/releases/${P}.tar.bz2"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha ~amd64 arm ~mips ~ppc ~ppc64 sparc x86 ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="alpha ~amd64 arm ~mips ppc ~ppc64 sparc x86 ~amd64-linux ~arm-linux ~x86-linux"
 IUSE="sensord static-libs"
 
 RDEPEND="
diff --git a/sys-apps/man-db/Manifest b/sys-apps/man-db/Manifest
index 3dc49d5062e4..2856d8f65330 100644
--- a/sys-apps/man-db/Manifest
+++ b/sys-apps/man-db/Manifest
@@ -1,4 +1,4 @@
 DIST man-db-2.6.6.tar.xz 1448576 SHA256 7da90f8d8df91e0e682769d50f4bdb905f525b5d0f01e7e5b8cc3c6da45f66c3 SHA512 7abb8609e1113dd1852076c4c71557c3b376fefa7e42fa39198f7b882f4b3fe733983045742c4b3903be2c953c09c724f735619b4396283a4ed2ad7816aaf4ec WHIRLPOOL e5c7b41afd7374bb1df3024134f9bd8a1af42b5ad63d4e516e946b0e8ccc88bafc055fdba707b0c764030e92748b225a72672bfe07e2bc3e8d78526d17f5ff72
 DIST man-db-2.6.7.1.tar.xz 1452280 SHA256 8d65559838fccca774e3ef7c15c073180c786e728785c735e136297facca41fc SHA512 91e1036701174c5623a4cf4208a93130822dc9c61ffd9c6bf0dddaf7c4c5b2401e6238f60578dfa81a11d67d360cbc4d45af920542fb4a0624c7169b17a618f8 WHIRLPOOL 30c510289d1444b3231704c22ddf2c17b58d4aa8b9e8a94552537fbc971b23f16b2c43a32fa9f85fb7b8eca2fd71a73d52955fcd0ab24ef49d3903832eafecf7
-DIST man-db-2.7.1.tar.xz 1498272 SHA256 c4876204a3fafb4d8ccc1d172c0431ee581d95558cbd6c4e79caca7717049e0e SHA512 246d833bd456a6dd178035b4be37dc810872b6480145d6c2c605deeb664d105b285f61827b739717d6936de28c4275a99ed8fae2d173b16c1c0673b1171a65ce WHIRLPOOL 10c56b861411674f4ca92bafe7c0faf4f6c2cbcc6b2db8f87f2e2ee59152797667619e60ae50cae33ee21ff3e58cb7b10627ce2f16adf65fd8794b0fabb71290
 DIST man-db-2.7.2.tar.xz 1501264 SHA256 22674eaf51dce8bcc83fd86b1c8d11f99de5c6d8962d7fad7b02307c4ad6e492 SHA512 fd0659f002980ba902bcd1186de09f82d840b039cbeea3457377926991ce5aaa602fe228c0969ea643140a4d5e7bdfbdab7c747943ac93b51c17a591677a7b84 WHIRLPOOL 51ad5e4580b5ff9ede9a0c2e17d579ed2a14c5ef1b11a43b92f99e5467db3e1627eed58c76040710e6fb7ae24258a4904142db8951c21e0981318082710dd772
+DIST man-db-2.7.3.tar.xz 1502928 SHA256 9d4744c9956007e7aad59efcc6bb8b6da410ee507df46f9e81311431f80114ea SHA512 0b265b52d8278f80dfbe34cd3ae13382ecea42a8e55046ddd9be3d552b1b404eb7afc6956001ecdb4500ce352a4cded6a4875bba935ca4dbaaed0b51e9b3119e WHIRLPOOL 77c6fd8df3aec6bf40ab8d7cabb0e1aeb53f63db8d2b015f529333972d0792bad49b36b7ec9481dfffefd2b3b079c0701c6164ce4ee616bfa6d2b0f73b5b34e8
diff --git a/sys-apps/man-db/man-db-2.7.1.ebuild b/sys-apps/man-db/man-db-2.7.1.ebuild
deleted file mode 100644
index 30b5a8bd6873..000000000000
--- a/sys-apps/man-db/man-db-2.7.1.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-
-inherit eutils user versionator
-
-DESCRIPTION="a man replacement that utilizes berkdb instead of flat files"
-HOMEPAGE="http://www.nongnu.org/man-db/"
-SRC_URI="mirror://nongnu/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~arm-linux ~x86-linux"
-IUSE="berkdb +gdbm nls selinux static-libs zlib"
-
-CDEPEND=">=dev-libs/libpipeline-1.4.0
-	berkdb? ( sys-libs/db )
-	gdbm? ( sys-libs/gdbm )
-	!berkdb? ( !gdbm? ( sys-libs/gdbm ) )
-	sys-apps/groff
-	zlib? ( sys-libs/zlib )
-	!sys-apps/man"
-DEPEND="${CDEPEND}
-	app-arch/xz-utils
-	virtual/pkgconfig
-	nls? (
-		>=app-text/po4a-0.45
-		sys-devel/gettext
-	)"
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-mandb )
-"
-
-pkg_setup() {
-	# Create user now as Makefile in src_install does setuid/chown
-	enewgroup man 15
-	enewuser man 13 -1 /usr/share/man man
-
-	if (use gdbm && use berkdb) || (use !gdbm && use !berkdb) ; then #496150
-		ewarn "Defaulting to USE=gdbm due to ambiguous berkdb/gdbm USE flag settings"
-	fi
-}
-
-src_configure() {
-	export ac_cv_lib_z_gzopen=$(usex zlib)
-	econf \
-		--docdir='$(datarootdir)'/doc/${PF} \
-		--with-systemdtmpfilesdir="${EPREFIX}"/usr/lib/tmpfiles.d \
-		--enable-setuid \
-		--with-sections="1 1p 8 2 3 3p 4 5 6 7 9 0p tcl n l p o 1x 2x 3x 4x 5x 6x 7x 8x" \
-		$(use_enable nls) \
-		$(use_enable static-libs static) \
-		--with-db=$(usex gdbm gdbm $(usex berkdb db gdbm))
-}
-
-src_install() {
-	default
-	dodoc docs/{HACKING,TODO}
-	prune_libtool_files
-
-	exeinto /etc/cron.daily
-	newexe "${FILESDIR}"/man-db.cron man-db #289884
-
-	keepdir /var/cache/man
-	fowners man:0 /var/cache/man
-	fperms 2755 /var/cache/man
-}
-
-pkg_preinst() {
-	if [[ -f ${EROOT}var/cache/man/whatis ]] ; then
-		einfo "Cleaning ${EROOT}var/cache/man from sys-apps/man"
-		find "${EROOT}"var/cache/man -type f '!' '(' -name index.bt -o -name index.db ')' -delete
-	fi
-	if [[ ! -g ${EROOT}var/cache/man ]] ; then
-		einfo "Resetting permissions on ${EROOT}var/cache/man" #447944
-		mkdir -p "${EROOT}var/cache/man"
-		chown -R man:0 "${EROOT}"var/cache/man
-		find "${EROOT}"var/cache/man -type d '!' -perm /g=s -exec chmod 2755 {} +
-	fi
-}
-
-pkg_postinst() {
-	if [[ $(get_version_component_range 2 ${REPLACING_VERSIONS}) -lt 7 ]] ; then
-		einfo "Rebuilding man-db from scratch with new database format!"
-		mandb --quiet --create
-	fi
-}
diff --git a/sys-apps/man-db/man-db-2.7.2.ebuild b/sys-apps/man-db/man-db-2.7.2.ebuild
index fbaeba164d4a..be0b23936a81 100644
--- a/sys-apps/man-db/man-db-2.7.2.ebuild
+++ b/sys-apps/man-db/man-db-2.7.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://nongnu/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~arm-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~arm-linux ~x86-linux"
 IUSE="berkdb +gdbm nls selinux static-libs zlib"
 
 CDEPEND=">=dev-libs/libpipeline-1.4.0
diff --git a/sys-apps/man-db/man-db-2.7.3.ebuild b/sys-apps/man-db/man-db-2.7.3.ebuild
new file mode 100644
index 000000000000..bf66d3865377
--- /dev/null
+++ b/sys-apps/man-db/man-db-2.7.3.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+
+inherit eutils user versionator
+
+DESCRIPTION="a man replacement that utilizes berkdb instead of flat files"
+HOMEPAGE="http://www.nongnu.org/man-db/"
+SRC_URI="mirror://nongnu/${PN}/${P}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~arm-linux ~x86-linux"
+IUSE="berkdb +gdbm +manpager nls selinux static-libs zlib"
+
+CDEPEND=">=dev-libs/libpipeline-1.4.0
+	berkdb? ( sys-libs/db )
+	gdbm? ( sys-libs/gdbm )
+	!berkdb? ( !gdbm? ( sys-libs/gdbm ) )
+	sys-apps/groff
+	zlib? ( sys-libs/zlib )
+	!sys-apps/man"
+DEPEND="${CDEPEND}
+	app-arch/xz-utils
+	virtual/pkgconfig
+	nls? (
+		>=app-text/po4a-0.45
+		sys-devel/gettext
+	)"
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-mandb )
+"
+PDEPEND="manpager? ( app-text/manpager )"
+
+pkg_setup() {
+	# Create user now as Makefile in src_install does setuid/chown
+	enewgroup man 15
+	enewuser man 13 -1 /usr/share/man man
+
+	if (use gdbm && use berkdb) || (use !gdbm && use !berkdb) ; then #496150
+		ewarn "Defaulting to USE=gdbm due to ambiguous berkdb/gdbm USE flag settings"
+	fi
+}
+
+src_configure() {
+	export ac_cv_lib_z_gzopen=$(usex zlib)
+	econf \
+		--docdir='$(datarootdir)'/doc/${PF} \
+		--with-systemdtmpfilesdir="${EPREFIX}"/usr/lib/tmpfiles.d \
+		--enable-setuid \
+		--with-sections="1 1p 8 2 3 3p 4 5 6 7 9 0p tcl n l p o 1x 2x 3x 4x 5x 6x 7x 8x" \
+		$(use_enable nls) \
+		$(use_enable static-libs static) \
+		--with-db=$(usex gdbm gdbm $(usex berkdb db gdbm))
+
+	# Disable color output from groff so that the manpager can add it. #184604
+	sed -i \
+		-e '/^#DEFINE.*\<[nt]roff\>/{s:^#::;s:$: -c:}' \
+		src/man_db.conf || die
+}
+
+src_install() {
+	default
+	dodoc docs/{HACKING,TODO}
+	prune_libtool_files
+
+	exeinto /etc/cron.daily
+	newexe "${FILESDIR}"/man-db.cron man-db #289884
+
+	keepdir /var/cache/man
+	fowners man:0 /var/cache/man
+	fperms 2755 /var/cache/man
+}
+
+pkg_preinst() {
+	if [[ -f ${EROOT}var/cache/man/whatis ]] ; then
+		einfo "Cleaning ${EROOT}var/cache/man from sys-apps/man"
+		find "${EROOT}"var/cache/man -type f '!' '(' -name index.bt -o -name index.db ')' -delete
+	fi
+	if [[ ! -g ${EROOT}var/cache/man ]] ; then
+		einfo "Resetting permissions on ${EROOT}var/cache/man" #447944
+		mkdir -p "${EROOT}var/cache/man"
+		chown -R man:0 "${EROOT}"var/cache/man
+		find "${EROOT}"var/cache/man -type d '!' -perm /g=s -exec chmod 2755 {} +
+	fi
+}
+
+pkg_postinst() {
+	if [[ $(get_version_component_range 2 ${REPLACING_VERSIONS}) -lt 7 ]] ; then
+		einfo "Rebuilding man-db from scratch with new database format!"
+		mandb --quiet --create
+	fi
+}
diff --git a/sys-apps/mlocate/files/mlocate.cron-r2 b/sys-apps/mlocate/files/mlocate.cron-r2
index 51cb504977e2..cf42104a45a1 100644
--- a/sys-apps/mlocate/files/mlocate.cron-r2
+++ b/sys-apps/mlocate/files/mlocate.cron-r2
@@ -28,7 +28,7 @@ fi
 # check the config file
 NODEVS=""
 if [ ! -f /etc/updatedb.conf ]; then
-	NODEVS=$(< /proc/filesystems awk '$1 == "nodev" && $2 != "rootfs" { print $2 }')
+	NODEVS=$(awk '$1 == "nodev" && $2 != "rootfs" { print $2 }' /proc/filesystems)
 fi
 
 # alter the priority of the updatedb process
diff --git a/sys-apps/mtree/metadata.xml b/sys-apps/mtree/metadata.xml
index 659da0ca93c2..3bdc7d730dd6 100644
--- a/sys-apps/mtree/metadata.xml
+++ b/sys-apps/mtree/metadata.xml
@@ -2,4 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>base-system</herd>
+	<upstream>
+		<remote-id type="github">archiecobbs/mtree-port</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/sys-apps/pciutils/pciutils-3.3.1.ebuild b/sys-apps/pciutils/pciutils-3.3.1.ebuild
index 73d5ce1fad82..7ac8a27286b7 100644
--- a/sys-apps/pciutils/pciutils-3.3.1.ebuild
+++ b/sys-apps/pciutils/pciutils-3.3.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ~ppc ppc64 s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~amd64-linux ~arm-linux ~x86-linux"
 IUSE="dns +kmod static-libs +udev zlib"
 
 # Have the sub-libs in RDEPEND with [static-libs] since, logically,
diff --git a/sys-apps/sandbox/Manifest b/sys-apps/sandbox/Manifest
index 42aa4b15b3b0..42c825a90c91 100644
--- a/sys-apps/sandbox/Manifest
+++ b/sys-apps/sandbox/Manifest
@@ -3,3 +3,4 @@ DIST sandbox-2.3.tar.xz 344260 SHA256 8670f7508453c2fd300ca29ad2eb457691c3df01c4
 DIST sandbox-2.4.tar.xz 344664 SHA256 450599cb3052296d42f81a04dbbda82d220415fc2d16f5dc6e26b042d580fd3e SHA512 c0f8b789bcabd48e03a20a97c9daa82c48f264d7641ecfa51dff7a2d2c34be398cf1db6235eb0211bf0fa78b07bd6e633e06bc102904bf9dd8a95f9fde1ca615 WHIRLPOOL 22f0f55f6e638275781ab5afa29b1a7f5e7f3335a3d2ff37d9fcce0bf9284b271bf1d69b98bcd4b06fdb9ff1528d044f9fb111a58c2a1a5ce33cbe28c0cb869d
 DIST sandbox-2.5.tar.xz 355680 SHA256 c0e98767fb70750d79591a6d08f81d5c2f13ce783bf94bd90677022e9103878a SHA512 7b870295bb78c1da5550b650a3983d93e503935a8e8452a29a5c6310cc2c2d569a898ea1534e2c670b4a3e5607504fac55f69da6878e0adc9c2c65a5476b4fb0 WHIRLPOOL 887d36638111b09d77674002c07ebad84c24bc4f645d9fb78e180a6c6e7407eb3fb6857877bc152e0cefb676f01df60b20857b8487ce28ff3e4438aef744fe53
 DIST sandbox-2.6.tar.xz 366356 SHA256 95615c5879dfc419713f22ba5506a2802a50ea0ce8a2f57c656354f2e50b1c4d SHA512 32ba7fb675c67fdc8bc52da1db7ed6878e5fea8753accb30d9aca00f708e0dde03287b5962caf5ef031bea6934d6ef3e18404b015c70ebd551d3fd8109ad2371 WHIRLPOOL bab2d015fb0de92a2266408ca7941c8fb66b599179040cfc727ffce5b2424a9722dc55ba89d198e3361044d8cb357314205488d2a980c7b8af063fd8940f0c03
+DIST sandbox-2.7.tar.xz 390304 SHA256 d6e1230180d84fb64c9788dd372a73a1cd2496ead91cad333a211320d3041149 SHA512 81056460afabe3f9163594f662f5faf87b6dfe8511a001fc4d6ce0171492eb29f3b645a45320032d34475bb2c24bf212d1d05b50878a340f1e2ca580f8f8f38a WHIRLPOOL ad070df6351537e49f939ba195f27ccf5e4566bb8b6e4ba391ab8174771eacf909571284c6fa873d5b55e8540605d2766a3de5d451b6af132c0ff6d96e43f554
diff --git a/sys-apps/sandbox/sandbox-2.7.ebuild b/sys-apps/sandbox/sandbox-2.7.ebuild
new file mode 100644
index 000000000000..2550852a27ae
--- /dev/null
+++ b/sys-apps/sandbox/sandbox-2.7.ebuild
@@ -0,0 +1,123 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+#
+# don't monkey with this ebuild unless contacting portage devs.
+# period.
+#
+
+inherit eutils flag-o-matic toolchain-funcs multilib unpacker multiprocessing
+
+DESCRIPTION="sandbox'd LD_PRELOAD hack"
+HOMEPAGE="https://www.gentoo.org/proj/en/portage/sandbox/"
+SRC_URI="mirror://gentoo/${P}.tar.xz
+	https://dev.gentoo.org/~vapier/dist/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
+IUSE="multilib"
+
+DEPEND="app-arch/xz-utils
+	>=app-misc/pax-utils-0.1.19" #265376
+RDEPEND=""
+
+EMULTILIB_PKG="true"
+has sandbox_death_notice ${EBUILD_DEATH_HOOKS} || EBUILD_DEATH_HOOKS="${EBUILD_DEATH_HOOKS} sandbox_death_notice"
+
+sandbox_death_notice() {
+	ewarn "If configure failed with a 'cannot run C compiled programs' error, try this:"
+	ewarn "FEATURES=-sandbox emerge sandbox"
+}
+
+sb_get_install_abis() { use multilib && get_install_abis || echo ${ABI:-default} ; }
+
+sb_foreach_abi() {
+	local OABI=${ABI}
+	for ABI in $(sb_get_install_abis) ; do
+		cd "${WORKDIR}/build-${ABI}"
+		einfo "Running $1 for ABI=${ABI}..."
+		"$@"
+	done
+	ABI=${OABI}
+}
+
+src_unpack() {
+	unpacker
+	cd "${S}"
+	epatch_user
+}
+
+sb_configure() {
+	mkdir "${WORKDIR}/build-${ABI}"
+	cd "${WORKDIR}/build-${ABI}"
+
+	use multilib && multilib_toolchain_setup ${ABI}
+
+	einfo "Configuring sandbox for ABI=${ABI}..."
+	ECONF_SOURCE="${S}" \
+	econf ${myconf} || die
+}
+
+sb_compile() {
+	emake || die
+}
+
+src_compile() {
+	filter-lfs-flags #90228
+
+	# Run configures in parallel!
+	multijob_init
+	local OABI=${ABI}
+	for ABI in $(sb_get_install_abis) ; do
+		multijob_child_init sb_configure
+	done
+	ABI=${OABI}
+	multijob_finish
+
+	sb_foreach_abi sb_compile
+}
+
+sb_test() {
+	emake check TESTSUITEFLAGS="--jobs=$(makeopts_jobs)" || die
+}
+
+src_test() {
+	sb_foreach_abi sb_test
+}
+
+sb_install() {
+	emake DESTDIR="${D}" install || die
+	insinto /etc/sandbox.d #333131
+	doins etc/sandbox.d/00default || die
+}
+
+src_install() {
+	sb_foreach_abi sb_install
+
+	doenvd "${FILESDIR}"/09sandbox
+
+	keepdir /var/log/sandbox
+	fowners root:portage /var/log/sandbox
+	fperms 0770 /var/log/sandbox
+
+	cd "${S}"
+	dodoc AUTHORS ChangeLog* NEWS README
+}
+
+pkg_preinst() {
+	chown root:portage "${D}"/var/log/sandbox
+	chmod 0770 "${D}"/var/log/sandbox
+
+	local old=$(find "${ROOT}"/lib* -maxdepth 1 -name 'libsandbox*')
+	if [[ -n ${old} ]] ; then
+		elog "Removing old sandbox libraries for you:"
+		elog ${old//${ROOT}}
+		find "${ROOT}"/lib* -maxdepth 1 -name 'libsandbox*' -exec rm -fv {} \;
+	fi
+}
+
+pkg_postinst() {
+	chmod 0755 "${ROOT}"/etc/sandbox.d #265376
+}
diff --git a/sys-apps/smartmontools/smartmontools-6.4.ebuild b/sys-apps/smartmontools/smartmontools-6.4.ebuild
index 92e8c863e8b7..3ce5fc1f1666 100644
--- a/sys-apps/smartmontools/smartmontools-6.4.ebuild
+++ b/sys-apps/smartmontools/smartmontools-6.4.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit subversion autotools
 else
 	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-	KEYWORDS="alpha amd64 arm hppa ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~x64-macos"
+	KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~x64-macos"
 fi
 
 DESCRIPTION="Self-Monitoring, Analysis and Reporting Technology System (S.M.A.R.T.) monitoring tools"
diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest
index 063c12c3597f..c8d71ba5b0fd 100644
--- a/sys-apps/systemd/Manifest
+++ b/sys-apps/systemd/Manifest
@@ -2,4 +2,5 @@ DIST systemd-218.tar.xz 3782276 SHA256 1b0768b53b6c6d813a93a4b8fe1f80cf53561b090
 DIST systemd-219_p112.tar.xz 3944604 SHA256 8394ca0d55b05cb07c2187da8b614f3cb4eacc297c501dd09a31dad18acf28ea SHA512 480526ff45a8588b3a572ccc455d6357208093f5dae858947182f6e9e4595c1f612d1b661eff41f39f5df6ad0dcb6b0a08b08c15125baf1cf07402ac18a5130b WHIRLPOOL cf1ea60dc59a2a3f54cb66d24a529b742bd403f996a9e8f132fd9f9dc551308ee233fec4fec3e8feb7a657ccdd25e56a6e0756633a1c76a9c427588b262558d9
 DIST systemd-224.tar.gz 3868075 SHA256 0d7ac1532a57639fbc828f8a5051a090883c6ad2908618a7a13ab386db831bfc SHA512 7717d340c6de11afd589234b7ec8952fe2ffcd05829622bd7ea8e008870c0e3b83eb1eaf20e85ffffa7adafc9c0c0b94fd93784510792109240e22e6b963f198 WHIRLPOOL 645b08ff0c20994b17b8ed585fb0eef682336961d7fedf25031fa4dc89a4d9a2b58c254e0f9baeedcb228435316fdfb562f9fefd21e5a63f94499d2f1040e093
 DIST systemd-225.tar.gz 3878442 SHA256 b2f576bb3688e9315f2f49b98e141ac6f964567370e98ebd8fd7332a0a6f9701 SHA512 35b3946509c7b01660da4370d3c51ff0e6a537dadd9dbb0a039c4f7ed552fd4e02ebac6eb8a788f61f1e3ba99444238d959051dd004c174b027729a80368ac19 WHIRLPOOL 47cd3b5690dafdf3c0ef6a9767e947666b1853541f8aefd17eb5c07eee1477daf32f3b249b04327b1c56d8ec430745725383750b97755bb6cf594d354a7ffdf8
+DIST systemd-226.tar.gz 3914162 SHA256 baff6a938c5579769330d0224280bf1a1ff5920151d7201545fc9880b6326c67 SHA512 565331661e7d144dcdf1505f9a1a70b20a9b904567478593a8fa47ed18f9eb68a9339cf32f117ede994676a84d0cfe3fcedbc9b8d8c964445b741a32271e5584 WHIRLPOOL 9f0d7b761ad84f0bb557a22738d7fcc1b6515340db776790d9199401017747a62c24de214300c1f00fb33f86284f3498cadbece713d6e66a30903475f6bce273
 DIST systemd.conf.m4-v219 1493 SHA256 90ee489b6e34945e5cda27a269e1247644382084f5a145a2df691282007c6768 SHA512 a117c40229af3ba2a0cec4c3db01728c3cab49bb6403fc84cb34f8a09979d98f7a200cd28bf2bbc7a71cbad856edf31190fba30a9d5810c55911746457bbf31a WHIRLPOOL a1604a4fdf5e2d4a4505252859c64d0a3c131b4bb371cff8c75331438f291f138d2732d939947988ab95b040e377412db84fbf6c45866fee028a2aac70e8eb9f
diff --git a/sys-apps/systemd/systemd-225.ebuild b/sys-apps/systemd/systemd-225.ebuild
index a7df2642b7cb..8e44315bcf96 100644
--- a/sys-apps/systemd/systemd-225.ebuild
+++ b/sys-apps/systemd/systemd-225.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/systemd/systemd/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~ia64 ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 fi
 
 inherit autotools-utils bash-completion-r1 linux-info multilib \
@@ -164,6 +164,9 @@ src_configure() {
 	# Fix systems broken by bug #509454.
 	[[ ${MY_UDEVDIR} ]] || MY_UDEVDIR=/lib/udev
 
+	# Prevent conflicts with i686 cross toolchain, bug 559726
+	tc-export AR CC NM OBJCOPY RANLIB
+
 	multilib-minimal_src_configure
 }
 
diff --git a/sys-apps/systemd/systemd-226.ebuild b/sys-apps/systemd/systemd-226.ebuild
new file mode 100644
index 000000000000..f84a4d74ed6f
--- /dev/null
+++ b/sys-apps/systemd/systemd-226.ebuild
@@ -0,0 +1,470 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://github.com/systemd/systemd.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/systemd/systemd/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+fi
+
+inherit autotools bash-completion-r1 linux-info multilib \
+	multilib-minimal pam systemd toolchain-funcs udev user
+
+DESCRIPTION="System and service manager for Linux"
+HOMEPAGE="http://www.freedesktop.org/wiki/Software/systemd"
+
+LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
+SLOT="0/2"
+IUSE="acl apparmor audit cryptsetup curl elfutils gcrypt gnuefi http
+	idn importd +kdbus +kmod +lz4 lzma nat pam policykit
+	qrcode +seccomp selinux ssl sysv-utils test vanilla xkb"
+
+REQUIRED_USE="importd? ( curl gcrypt lzma )"
+
+MINKV="3.11"
+
+COMMON_DEPEND=">=sys-apps/util-linux-2.26:0=[${MULTILIB_USEDEP}]
+	sys-libs/libcap:0=[${MULTILIB_USEDEP}]
+	!<sys-libs/glibc-2.16
+	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}] )
+	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=
+	)
+	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:= )
+	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 )
+	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-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-20150417[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}
+	virtual/pkgconfig
+	gnuefi? ( >=sys-boot/gnu-efi-3.0.2 )
+	test? ( >=sys-apps/dbus-1.6.8-r1:0 )
+	app-text/docbook-xml-dtd:4.2
+	app-text/docbook-xml-dtd:4.5
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt:0
+	>=dev-libs/libgcrypt-1.4.5: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() {
+	:
+}
+
+src_unpack() {
+	default
+	[[ ${PV} != 9999 ]] || git-r3_src_unpack
+}
+
+src_prepare() {
+	# Bug 463376
+	sed -i -e 's/GROUP="dialout"/GROUP="uucp"/' rules/*.rules || die
+	epatch "${FILESDIR}/218-Dont-enable-audit-by-default.patch"
+	epatch_user
+	eautoreconf
+}
+
+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
+
+	# Prevent conflicts with i686 cross toolchain, bug 559726
+	tc-export AR CC NM OBJCOPY RANLIB
+
+	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 gcc-4.7, bug 554454.
+		cc_cv_CFLAGS__Werror_shadow=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
+		--without-python
+
+		# 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 elfutils)
+		$(use_enable gcrypt)
+		$(multilib_native_use_enable gnuefi)
+		$(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)
+		$(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_enable qrcode qrencode)
+		$(multilib_native_use_enable seccomp)
+		$(multilib_native_use_enable selinux)
+		$(multilib_native_use_enable test tests)
+		$(multilib_native_use_enable test dbus)
+		$(multilib_native_use_enable xkb xkbcommon)
+
+		# hardcode a few paths to spare some deps
+		QUOTAON=/usr/sbin/quotaon
+		QUOTACHECK=/usr/sbin/quotacheck
+
+		# TODO: we may need to restrict this to gcc
+		EFI_CC="$(tc-getCC)"
+
+		# 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"
+	)
+
+	# Work around bug 463846.
+	tc-export CC
+
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_compile() {
+	local mymakeopts=(
+		udevlibexecdir="${MY_UDEVDIR}"
+	)
+
+	if multilib_is_native_abi; then
+		emake "${mymakeopts[@]}"
+	else
+		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-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/sockets.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
+}
+
+reenable_unit() {
+	if systemctl is-enabled --root="${ROOT}" "$1" &> /dev/null; then
+		ebegin "Re-enabling $1"
+		systemctl reenable --root="${ROOT}" "$1"
+		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
+
+	# Re-enable systemd-networkd for socket activation
+	reenable_unit systemd-networkd.service
+
+	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 [[ $(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
+}
+
+pkg_prerm() {
+	# If removing systemd completely, remove the catalog database.
+	if [[ ! ${REPLACED_BY_VERSION} ]]; then
+		rm -f -v "${EROOT}"/var/lib/systemd/catalog/database
+	fi
+}
diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild
index a7df2642b7cb..f84a4d74ed6f 100644
--- a/sys-apps/systemd/systemd-9999.ebuild
+++ b/sys-apps/systemd/systemd-9999.ebuild
@@ -4,18 +4,15 @@
 
 EAPI=5
 
-AUTOTOOLS_AUTORECONF=yes
-AUTOTOOLS_PRUNE_LIBTOOL_FILES=all
-
 if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/systemd/systemd.git"
 	inherit git-r3
 else
 	SRC_URI="https://github.com/systemd/systemd/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~ia64 ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 fi
 
-inherit autotools-utils bash-completion-r1 linux-info multilib \
+inherit autotools bash-completion-r1 linux-info multilib \
 	multilib-minimal pam systemd toolchain-funcs udev user
 
 DESCRIPTION="System and service manager for Linux"
@@ -29,7 +26,7 @@ IUSE="acl apparmor audit cryptsetup curl elfutils gcrypt gnuefi http
 
 REQUIRED_USE="importd? ( curl gcrypt lzma )"
 
-MINKV="3.8"
+MINKV="3.11"
 
 COMMON_DEPEND=">=sys-apps/util-linux-2.26:0=[${MULTILIB_USEDEP}]
 	sys-libs/libcap:0=[${MULTILIB_USEDEP}]
@@ -88,21 +85,14 @@ DEPEND="${COMMON_DEPEND}
 	>=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
 	gnuefi? ( >=sys-boot/gnu-efi-3.0.2 )
-	test? ( >=sys-apps/dbus-1.6.8-r1:0 )"
-
-if [[ -n ${AUTOTOOLS_AUTORECONF} ]]; then
-	DEPEND+="
-		app-text/docbook-xml-dtd:4.2
-		app-text/docbook-xml-dtd:4.5
-		app-text/docbook-xsl-stylesheets
-		dev-libs/libxslt:0
-		>=dev-libs/libgcrypt-1.4.5:0"
-fi
-
-PATCHES=( "${FILESDIR}/218-Dont-enable-audit-by-default.patch" )
+	test? ( >=sys-apps/dbus-1.6.8-r1:0 )
+	app-text/docbook-xml-dtd:4.2
+	app-text/docbook-xml-dtd:4.5
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt:0
+	>=dev-libs/libgcrypt-1.4.5:0"
 
 pkg_pretend() {
 	local CONFIG_CHECK="~AUTOFS4_FS ~BLK_DEV_BSG ~CGROUPS
@@ -154,8 +144,9 @@ src_unpack() {
 src_prepare() {
 	# Bug 463376
 	sed -i -e 's/GROUP="dialout"/GROUP="uucp"/' rules/*.rules || die
-
-	autotools-utils_src_prepare
+	epatch "${FILESDIR}/218-Dont-enable-audit-by-default.patch"
+	epatch_user
+	eautoreconf
 }
 
 src_configure() {
@@ -164,6 +155,9 @@ src_configure() {
 	# Fix systems broken by bug #509454.
 	[[ ${MY_UDEVDIR} ]] || MY_UDEVDIR=/lib/udev
 
+	# Prevent conflicts with i686 cross toolchain, bug 559726
+	tc-export AR CC NM OBJCOPY RANLIB
+
 	multilib-minimal_src_configure
 }
 
@@ -244,7 +238,7 @@ multilib_src_configure() {
 	# Work around bug 463846.
 	tc-export CC
 
-	autotools-utils_src_configure
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
 }
 
 multilib_src_compile() {
diff --git a/sys-apps/texinfo/texinfo-6.0.ebuild b/sys-apps/texinfo/texinfo-6.0.ebuild
index baccda5bbe87..d3fa36130298 100644
--- a/sys-apps/texinfo/texinfo-6.0.ebuild
+++ b/sys-apps/texinfo/texinfo-6.0.ebuild
@@ -2,6 +2,10 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
+# Note: if your package uses the texi2dvi utility, it must depend on the
+# virtual/texi2dvi package to pull in all the right deps.  The tool is not
+# usable out-of-the-box because it requires the large tex packages.
+
 EAPI="5"
 
 inherit flag-o-matic
diff --git a/sys-apps/util-linux/Manifest b/sys-apps/util-linux/Manifest
index 2fa166266b13..435eed7bf2af 100644
--- a/sys-apps/util-linux/Manifest
+++ b/sys-apps/util-linux/Manifest
@@ -1,7 +1,5 @@
 DIST util-linux-2.24.1.tar.xz 3543692 SHA256 835eb6232cfab0118ef2e4fd649de0ba9f5bd1b8cbf9a7d4d84594541dec8410 SHA512 5636e1c57bd57954518e90ff0f079810cc2927f52bb925dde556ce2744a088577f8adbc19c19b2bd079efd253406767faa44d1de5f557e024762522e647f044b WHIRLPOOL 25862a85788eb1c275c7e06f3d2be8e6a9605811665e06a4b21d1e274fc4a5e19dd03e5c52061ee5d98ce8c86ba757a7f8076683edb603ad0c43c05ab5e52a51
 DIST util-linux-2.24.2.tar.xz 3586580 SHA256 1243d6c07f1c5b38aa4c3814c81a71c24cba7dafe08942916bf216a90a460ff0 SHA512 a0c03876ef19fa09e434e3e5362fb3f3e0a254b3b39a623ac7a9a207d06afce00366792244ed0fac86931f8340c046620660f33c3444a07a12037182fc191240 WHIRLPOOL 4b8185e1832145c050a8aa0761ae017d846ed58cd7e07710e4c32bf92a8f6e530bddb56dab70c8025eddb4cafafed79e658b0aced3a190b61b508078a438a9ed
-DIST util-linux-2.25.1.tar.xz 3695172 SHA256 4701305ae22790c3a92ce48e50794fa05b7ee01f4227f419a171c100d08986e8 SHA512 a670cb4318beed0a455efb339ebea6ec7c5d672e15877e7e25cae2ec9c0795fbe4275b6c85a590467c3de92ab2f64cdcd0427c9a2a6e4c6b76f563592fb7be8d WHIRLPOOL 44c17bd3ad0b05c47bb955b934011b460c3992ea5d5b43977d2001b245820b775e16bedbaa10ff9c223d59b0809674884c76f0dc34d707864d17b49b4deaab9d
 DIST util-linux-2.25.2.tar.xz 3703644 SHA256 e0457f715b73f4a349e1acb08cb410bf0edc9a74a3f75c357070f31f70e33cd6 SHA512 cf8c5bde78f844425150c2a81bdecb87aa57bcd5cebd177a78160835627f58037fa2cfe4db26fd8f35eedb3beb499a91492a297a27d065465e2ea0c6218dc387 WHIRLPOOL dd1685f2e694bf3de95acc3ba3170d231426c18c3395a867c815bbd3ab5ee0f07567b49d0ae083ce669c89db711e39fd2b990bc7321985ec2279d78816ec5258
-DIST util-linux-2.26.1.tar.xz 3859740 SHA256 22dc1c957262e2cbdfb4d524a63d5cd4f219d3ac9b5eab570fc771076799bb6e SHA512 9321793b3fa219ffc46e10639b9e45094c3cae6c48be4b80e652d9768f40dcedbd49342e17345b61c85f46540a7bd93d118a8e226c315e112bb2e959e2855ad9 WHIRLPOOL 1bcd5c3c14c278ec3b10535546706b6830a283fd72e7d1933101bf1ab6ec5b03d9ff7a53745d34a97cbb4d7d1b0e35852bb841be4b53a55c2aca07624bf06fbd
 DIST util-linux-2.26.2.tar.xz 3863868 SHA256 0e29bda142528a48a0a953c39ff63093651a4809042e1790fbd6aa8663fd9666 SHA512 1cb8e2f32882b3f496d31c250a45cfb61bedb79f7a2802b358c23134d4257fa9bc9cde8888cfa1aaba12109f82b93345c6dc0bec2d11629ffa084f2a4476a91b WHIRLPOOL 699ff057f9930fe53f44090817c64ffe089345e7aba4c836e18cd3d2088881add805640b0e41b8d60bc08e3632be919025417feb9c2ddda454c87821a59122ed
-DIST util-linux-2.26.tar.xz 3847960 SHA256 a23c6f39dea0ed215ccd589509ffc7bb6f706f6e1a04760f493fb0fd7e93c489 SHA512 af07d49a433fce683da7bdf9aea5693ad108aa16166e0147716175bd779fe5090029617dd7db153bc0f5efcf7bdd377761a616efd4cca90a87bf317132ede88c WHIRLPOOL 4f7c9463bfe1523819671824de26e051c496c86884ca34b25208762179345c799fe61e566228ebfcbca2f2b63163539e37b06e438a58f562cf7b53f954564150
+DIST util-linux-2.27.tar.xz 3968872 SHA256 fcbf04e3ef8377fc8369af7f9afee341c5eef9b02dd5a7ce71532d0957e86dc7 SHA512 06ee17f4801fd3e35fb4cf3717722ea3f709e3dd9f9153510c399742a5cfca341e3a3a400d35a091b74f0de3636e62c7a14b7dd91d63482b7b98b1991aa6fa3c WHIRLPOOL da19c56dfe424c59bc982096f08c02d864718f030bbad79661968f1da972ea10e0eacaa2477cda45ec9a3c688d220740ca2c8823918dae5139a943f6c9d8e2a4
diff --git a/sys-apps/util-linux/files/crypto-loop.confd b/sys-apps/util-linux/files/crypto-loop.confd
deleted file mode 100644
index 6a8843462082..000000000000
--- a/sys-apps/util-linux/files/crypto-loop.confd
+++ /dev/null
@@ -1,9 +0,0 @@
-# /etc/conf.d/crypto-loop: Configuration file for /etc/init.d/crypto-loop
-
-# More info can be found in the init.d script
-
-# Specify loopback configurations here.  The format of this file is
-# shown in the following commented-out example.  One line per loopback
-# configuration.  For possible hash values, see `man hashalot`.
-
-# loop=/dev/loop0 hash='' cipher=serpent keysize=256 device=/dev/system/test other=''
diff --git a/sys-apps/util-linux/files/crypto-loop.initd b/sys-apps/util-linux/files/crypto-loop.initd
deleted file mode 100644
index 2f6470d6b7bf..000000000000
--- a/sys-apps/util-linux/files/crypto-loop.initd
+++ /dev/null
@@ -1,70 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-depend() {
-	if [ -x /etc/init.d/root ]; then
-		need root
-	else
-		need checkroot
-	fi
-	need modules
-	before localmount
-}
-
-start() {
-	local status="0"
-
-	ebegin "Starting crypto loop devices"
-
-	if [ -e /etc/conf.d/crypto-loop ] ; then
-		egrep "^loop" /etc/conf.d/crypto-loop | \
-		while read loopline ; do
-			eval ${loopline}
-
-			local configured=$(awk -v MOUNT="${device}" \
-				'($2 == MOUNT) { print "yes" }' /proc/mounts)
-
-			if [ "${configured}" != "yes" ] ; then
-				einfo "  Loop ${loop} on device ${device} (cipher ${cipher}, key size ${keysize}): "
-
-				if [ -n "${hash}" ] ; then
-					/usr/sbin/hashalot -n ${keysize} ${hash} </dev/tty|\
-					/sbin/losetup -p 0 -e ${cipher}-${keysize} ${loop} ${device} ${other}
-				else
-					/sbin/losetup -e ${cipher}-${keysize} ${loop} ${device} ${other}
-				fi
-
-				if [ $? -ne 0 ] ; then
-					ewarn "Failure configuring ${loop}.  Skipping."
-					status=1
-				fi
-			else
-				ewarn "  Loop ${loop} on device ${device} are already configured"
-			fi
-		done
-	fi
-	ewend ${status} "Failed to start some loop devices."
-
-	# We do not fail if some loop devices did not start ...
-	return 0
-}
-
-stop() {
-	local status="0"
-	for loop in $(ls /dev/loop[0-9] 2>/dev/null) ; do
-		losetup ${loop} > /dev/null 2>&1
-		if [ $? -eq 0 ] ; then
-			( umount ${loop} || swapoff "${loop}" ) >/dev/null 2>&1
-			if ! /sbin/losetup -d ${loop} > /dev/null 2>&1; then
-				ewarn "Failure deconfiguring ${loop}."
-				status=1
-			fi
-		fi
-	done
-	ewend ${status}
-}
-
-
-# vim:ts=4
diff --git a/sys-apps/util-linux/files/util-linux-2.25.1-blkid-probe-fix.patch b/sys-apps/util-linux/files/util-linux-2.25.1-blkid-probe-fix.patch
deleted file mode 100644
index f994a74a6696..000000000000
--- a/sys-apps/util-linux/files/util-linux-2.25.1-blkid-probe-fix.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 00749bc366fe6106df918660a92a388cfff4f35f Mon Sep 17 00:00:00 2001
-From: Karel Zak <kzak@redhat.com>
-Date: Tue, 7 Oct 2014 12:44:34 +0200
-Subject: [PATCH] libblkid: zeroize errno on blkid_probe_get_buffer() success
-
-Since 37f4060225df0591ab8e1dd676dbc8115d900d4f prober functions are
-sensitive to errno, it seems more robust to set errno=0 with in
-blkid_probe_get_buffer() on success than set the zero on all places
-where we call blkid_probe_get_buffer().
-
-Addresses: https://github.com/karelzak/util-linux/issues/119
-Signed-off-by: Karel Zak <kzak@redhat.com>
----
- libblkid/src/probe.c | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/libblkid/src/probe.c b/libblkid/src/probe.c
-index 4fea3cc..3f7e43b 100644
---- a/libblkid/src/probe.c
-+++ b/libblkid/src/probe.c
-@@ -539,8 +539,10 @@ unsigned char *blkid_probe_get_buffer(blkid_probe pr,
- 	struct list_head *p;
- 	struct blkid_bufinfo *bf = NULL;
- 
--	if (pr->size <= 0)
-+	if (pr->size <= 0) {
-+		errno = EINVAL;
- 		return NULL;
-+	}
- 
- 	if (pr->parent &&
- 	    pr->parent->devno == pr->devno &&
-@@ -602,6 +604,7 @@ unsigned char *blkid_probe_get_buffer(blkid_probe pr,
- 		list_add_tail(&bf->bufs, &pr->buffers);
- 	}
- 
-+	errno = 0;
- 	return off ? bf->data + (off - bf->off) : bf->data;
- }
- 
--- 
-2.1.2
-
diff --git a/sys-apps/util-linux/util-linux-2.24.1-r2.ebuild b/sys-apps/util-linux/util-linux-2.24.1-r2.ebuild
deleted file mode 100644
index b835660c2e46..000000000000
--- a/sys-apps/util-linux/util-linux-2.24.1-r2.ebuild
+++ /dev/null
@@ -1,147 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-
-PYTHON_COMPAT=( python2_7 python3_{3,4} )
-
-inherit eutils toolchain-funcs libtool flag-o-matic bash-completion-r1 python-single-r1
-
-MY_PV=${PV/_/-}
-MY_P=${PN}-${MY_PV}
-
-if [[ ${PV} == 9999 ]] ; then
-	inherit git-2 autotools
-	EGIT_REPO_URI="git://git.kernel.org/pub/scm/utils/util-linux/util-linux.git"
-else
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ~ppc ~ppc64 s390 sh ~sparc x86 ~amd64-linux ~arm-linux ~x86-linux"
-	SRC_URI="mirror://kernel/linux/utils/util-linux/v${PV:0:4}/${MY_P}.tar.xz"
-fi
-
-DESCRIPTION="Various useful Linux utilities"
-HOMEPAGE="https://www.kernel.org/pub/linux/utils/util-linux/"
-
-LICENSE="GPL-2 LGPL-2.1 BSD-4 MIT public-domain"
-SLOT="0"
-IUSE="bash-completion caps +cramfs cytune fdformat ncurses nls pam python selinux slang static-libs +suid test tty-helpers udev unicode"
-
-RDEPEND="!sys-process/schedutils
-	!sys-apps/setarch
-	!<sys-apps/sysvinit-2.88-r7
-	!sys-block/eject
-	!<sys-libs/e2fsprogs-libs-1.41.8
-	!<sys-fs/e2fsprogs-1.41.8
-	!<app-shells/bash-completion-1.3-r2
-	caps? ( sys-libs/libcap-ng )
-	cramfs? ( sys-libs/zlib )
-	ncurses? ( >=sys-libs/ncurses-5.2-r2 )
-	pam? ( sys-libs/pam )
-	python? ( ${PYTHON_DEPS} )
-	selinux? ( sys-libs/libselinux )
-	slang? ( sys-libs/slang )
-	udev? ( virtual/udev )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-	test? ( sys-devel/bc )
-	virtual/os-headers"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	if [[ ${PV} == 9999 ]] ; then
-		po/update-potfiles
-		eautoreconf
-	fi
-	epatch "${FILESDIR}"/${PN}-2.24-skip-last-tests.patch #491742
-	epatch "${FILESDIR}"/${PN}-2.24-last-tests.patch #501408
-	# http://marc.info/?l=util-linux-ng&m=140223032032288&w=2
-	epatch "${FILESDIR}"/${PN}-2.24-fix-fdisk-on-alpha.patch
-	find tests/ -name bigyear -delete #489794
-	elibtoolize
-}
-
-lfs_fallocate_test() {
-	# Make sure we can use fallocate with LFS #300307
-	cat <<-EOF > "${T}"/fallocate.c
-		#define _GNU_SOURCE
-		#include <fcntl.h>
-		main() { return fallocate(0, 0, 0, 0); }
-	EOF
-	append-lfs-flags
-	$(tc-getCC) ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} "${T}"/fallocate.c -o /dev/null >/dev/null 2>&1 \
-		|| export ac_cv_func_fallocate=no
-	rm -f "${T}"/fallocate.c
-}
-
-src_configure() {
-	lfs_fallocate_test
-	export ac_cv_header_security_pam_misc_h=$(usex pam) #485486
-	econf \
-		--docdir="/usr/share/doc/${PF}" \
-		--enable-fs-paths-extra=/usr/sbin:/bin:/usr/bin \
-		$(use_enable nls) \
-		--enable-agetty \
-		--with-bashcompletiondir="$(get_bashcompdir)" \
-		$(use_enable bash-completion) \
-		$(use_enable caps setpriv) \
-		$(use_enable cramfs) \
-		$(use_enable cytune) \
-		$(use_enable fdformat) \
-		--with-ncurses=$(usex ncurses $(usex unicode auto yes) no) \
-		--disable-kill \
-		--disable-login \
-		$(use_enable tty-helpers mesg) \
-		--disable-nologin \
-		--enable-partx \
-		$(use_with python) \
-		--enable-raw \
-		--enable-rename \
-		--disable-reset \
-		--enable-schedutils \
-		--disable-su \
-		$(use_enable tty-helpers wall) \
-		$(use_enable tty-helpers write) \
-		$(use_enable suid makeinstall-chown) \
-		$(use_enable suid makeinstall-setuid) \
-		$(use_with selinux) \
-		$(use_with slang) \
-		$(use_enable static-libs static) \
-		$(use_with udev) \
-		$(tc-has-tls || echo --disable-tls)
-}
-
-src_test() {
-	emake check
-}
-
-src_install() {
-	default
-	dodoc AUTHORS NEWS README* Documentation/{TODO,*.txt,releases/*}
-
-	use python && python_optimize
-
-	# need the libs in /
-	gen_usr_ldscript -a blkid mount uuid
-
-	# e2fsprogs-libs didnt install .la files, and .pc work fine
-	prune_libtool_files
-}
-
-pkg_postinst() {
-	if ! use tty-helpers; then
-		elog "The mesg/wall/write tools have been disabled due to USE=-tty-helpers."
-	fi
-
-	if [[ -z ${REPLACING_VERSIONS} ]]; then
-		elog "The agetty util now clears the terminal by default. You"
-		elog "might want to add --noclear to your /etc/inittab lines."
-	fi
-}
diff --git a/sys-apps/util-linux/util-linux-2.25.1-r1.ebuild b/sys-apps/util-linux/util-linux-2.25.1-r1.ebuild
deleted file mode 100644
index c32bfd47fb93..000000000000
--- a/sys-apps/util-linux/util-linux-2.25.1-r1.ebuild
+++ /dev/null
@@ -1,174 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-
-PYTHON_COMPAT=( python2_7 python3_{3,4} )
-
-inherit eutils toolchain-funcs libtool flag-o-matic bash-completion-r1 \
-	python-single-r1 multilib-minimal
-
-MY_PV=${PV/_/-}
-MY_P=${PN}-${MY_PV}
-
-if [[ ${PV} == 9999 ]] ; then
-	inherit git-2 autotools
-	EGIT_REPO_URI="git://git.kernel.org/pub/scm/utils/util-linux/util-linux.git"
-else
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux"
-	SRC_URI="mirror://kernel/linux/utils/util-linux/v${PV:0:4}/${MY_P}.tar.xz"
-fi
-
-DESCRIPTION="Various useful Linux utilities"
-HOMEPAGE="https://www.kernel.org/pub/linux/utils/util-linux/"
-
-LICENSE="GPL-2 LGPL-2.1 BSD-4 MIT public-domain"
-SLOT="0"
-IUSE="caps +cramfs fdformat ncurses nls pam python selinux slang static-libs +suid test tty-helpers udev unicode"
-
-RDEPEND="!sys-process/schedutils
-	!sys-apps/setarch
-	!<sys-apps/sysvinit-2.88-r7
-	!sys-block/eject
-	!<sys-libs/e2fsprogs-libs-1.41.8
-	!<sys-fs/e2fsprogs-1.41.8
-	!<app-shells/bash-completion-1.3-r2
-	caps? ( sys-libs/libcap-ng )
-	cramfs? ( sys-libs/zlib )
-	ncurses? ( >=sys-libs/ncurses-5.2-r2 )
-	pam? ( sys-libs/pam )
-	python? ( ${PYTHON_DEPS} )
-	selinux? ( >=sys-libs/libselinux-2.2.2-r4[${MULTILIB_USEDEP}] )
-	slang? ( sys-libs/slang )
-	udev? ( virtual/udev )
-	abi_x86_32? (
-		!<=app-emulation/emul-linux-x86-baselibs-20140406-r2
-		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32]
-	)"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-	test? ( sys-devel/bc )
-	virtual/os-headers"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-blkid-probe-fix.patch
-	if [[ ${PV} == 9999 ]] ; then
-		po/update-potfiles
-		eautoreconf
-	fi
-	elibtoolize
-}
-
-lfs_fallocate_test() {
-	# Make sure we can use fallocate with LFS #300307
-	cat <<-EOF > "${T}"/fallocate.${ABI}.c
-		#define _GNU_SOURCE
-		#include <fcntl.h>
-		main() { return fallocate(0, 0, 0, 0); }
-	EOF
-	append-lfs-flags
-	$(tc-getCC) ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} "${T}"/fallocate.${ABI}.c -o /dev/null >/dev/null 2>&1 \
-		|| export ac_cv_func_fallocate=no
-	rm -f "${T}"/fallocate.${ABI}.c
-}
-
-multilib_src_configure() {
-	lfs_fallocate_test
-	export ac_cv_header_security_pam_misc_h=$(multilib_native_usex pam) #485486
-	# We manually set --libdir to the default since on prefix, econf will set it to
-	# a value which the configure script does not recognize.  This makes it set the
-	# usrlib_execdir to a bad value. bug #518898#c2, fixed upstream for >2.25
-	ECONF_SOURCE=${S} \
-	econf \
-		--enable-fs-paths-extra="${EPREFIX}/usr/sbin:${EPREFIX}/bin:${EPREFIX}/usr/bin" \
-		--libdir='${prefix}/'"$(get_libdir)" \
-		$(multilib_native_use_enable nls) \
-		--enable-agetty \
-		--with-bashcompletiondir="$(get_bashcompdir)" \
-		--enable-bash-completion \
-		$(multilib_native_use_enable caps setpriv) \
-		--disable-chfn-chsh \
-		$(multilib_native_use_enable cramfs) \
-		$(multilib_native_use_enable fdformat) \
-		--with-ncurses=$(multilib_native_usex ncurses $(usex unicode auto yes) no) \
-		--disable-kill \
-		--disable-login \
-		$(multilib_native_use_enable tty-helpers mesg) \
-		--disable-nologin \
-		--enable-partx \
-		$(multilib_native_use_with python) \
-		--enable-raw \
-		--enable-rename \
-		--disable-reset \
-		--enable-schedutils \
-		--disable-su \
-		$(multilib_native_use_enable tty-helpers wall) \
-		$(multilib_native_use_enable tty-helpers write) \
-		$(multilib_native_use_enable suid makeinstall-chown) \
-		$(multilib_native_use_enable suid makeinstall-setuid) \
-		$(use_with selinux) \
-		$(multilib_native_use_with slang) \
-		$(use_enable static-libs static) \
-		$(multilib_native_use_with udev) \
-		$(tc-has-tls || echo --disable-tls)
-}
-
-multilib_src_compile() {
-	if multilib_is_native_abi; then
-		default
-	else
-		# build libraries only
-		emake -f Makefile -f - mylibs \
-			<<< 'mylibs: $(usrlib_exec_LTLIBRARIES) $(pkgconfig_DATA)'
-	fi
-}
-
-multilib_src_test() {
-	multilib_is_native_abi && emake check
-}
-
-multilib_src_install() {
-	if multilib_is_native_abi; then
-		default
-	else
-		emake DESTDIR="${D}" install-usrlib_execLTLIBRARIES \
-			install-pkgconfigDATA install-uuidincHEADERS \
-			install-nodist_blkidincHEADERS install-nodist_mountincHEADERS \
-			install-nodist_smartcolsincHEADERS
-	fi
-
-	if multilib_is_native_abi; then
-		# need the libs in /
-		gen_usr_ldscript -a blkid mount smartcols uuid
-
-		use python && python_optimize
-	fi
-}
-
-multilib_src_install_all() {
-	dodoc AUTHORS NEWS README* Documentation/{TODO,*.txt,releases/*}
-
-	# e2fsprogs-libs didnt install .la files, and .pc work fine
-	prune_libtool_files
-}
-
-pkg_postinst() {
-	if ! use tty-helpers; then
-		elog "The mesg/wall/write tools have been disabled due to USE=-tty-helpers."
-	fi
-
-	if [[ -z ${REPLACING_VERSIONS} ]]; then
-		elog "The agetty util now clears the terminal by default. You"
-		elog "might want to add --noclear to your /etc/inittab lines."
-	fi
-}
diff --git a/sys-apps/util-linux/util-linux-2.25.1.ebuild b/sys-apps/util-linux/util-linux-2.25.1.ebuild
deleted file mode 100644
index 5303ad009535..000000000000
--- a/sys-apps/util-linux/util-linux-2.25.1.ebuild
+++ /dev/null
@@ -1,173 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-
-PYTHON_COMPAT=( python2_7 python3_{3,4} )
-
-inherit eutils toolchain-funcs libtool flag-o-matic bash-completion-r1 \
-	python-single-r1 multilib-minimal
-
-MY_PV=${PV/_/-}
-MY_P=${PN}-${MY_PV}
-
-if [[ ${PV} == 9999 ]] ; then
-	inherit git-2 autotools
-	EGIT_REPO_URI="git://git.kernel.org/pub/scm/utils/util-linux/util-linux.git"
-else
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux"
-	SRC_URI="mirror://kernel/linux/utils/util-linux/v${PV:0:4}/${MY_P}.tar.xz"
-fi
-
-DESCRIPTION="Various useful Linux utilities"
-HOMEPAGE="https://www.kernel.org/pub/linux/utils/util-linux/"
-
-LICENSE="GPL-2 LGPL-2.1 BSD-4 MIT public-domain"
-SLOT="0"
-IUSE="caps +cramfs fdformat ncurses nls pam python selinux slang static-libs +suid test tty-helpers udev unicode"
-
-RDEPEND="!sys-process/schedutils
-	!sys-apps/setarch
-	!<sys-apps/sysvinit-2.88-r7
-	!sys-block/eject
-	!<sys-libs/e2fsprogs-libs-1.41.8
-	!<sys-fs/e2fsprogs-1.41.8
-	!<app-shells/bash-completion-1.3-r2
-	caps? ( sys-libs/libcap-ng )
-	cramfs? ( sys-libs/zlib )
-	ncurses? ( >=sys-libs/ncurses-5.2-r2 )
-	pam? ( sys-libs/pam )
-	python? ( ${PYTHON_DEPS} )
-	selinux? ( >=sys-libs/libselinux-2.2.2-r4[${MULTILIB_USEDEP}] )
-	slang? ( sys-libs/slang )
-	udev? ( virtual/udev )
-	abi_x86_32? (
-		!<=app-emulation/emul-linux-x86-baselibs-20140406-r2
-		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32]
-	)"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-	test? ( sys-devel/bc )
-	virtual/os-headers"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	if [[ ${PV} == 9999 ]] ; then
-		po/update-potfiles
-		eautoreconf
-	fi
-	elibtoolize
-}
-
-lfs_fallocate_test() {
-	# Make sure we can use fallocate with LFS #300307
-	cat <<-EOF > "${T}"/fallocate.${ABI}.c
-		#define _GNU_SOURCE
-		#include <fcntl.h>
-		main() { return fallocate(0, 0, 0, 0); }
-	EOF
-	append-lfs-flags
-	$(tc-getCC) ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} "${T}"/fallocate.${ABI}.c -o /dev/null >/dev/null 2>&1 \
-		|| export ac_cv_func_fallocate=no
-	rm -f "${T}"/fallocate.${ABI}.c
-}
-
-multilib_src_configure() {
-	lfs_fallocate_test
-	export ac_cv_header_security_pam_misc_h=$(multilib_native_usex pam) #485486
-	# We manually set --libdir to the default since on prefix, econf will set it to
-	# a value which the configure script does not recognize.  This makes it set the
-	# usrlib_execdir to a bad value. bug #518898#c2, fixed upstream for >2.25
-	ECONF_SOURCE=${S} \
-	econf \
-		--enable-fs-paths-extra="${EPREFIX}/usr/sbin:${EPREFIX}/bin:${EPREFIX}/usr/bin" \
-		--libdir='${prefix}/'"$(get_libdir)" \
-		$(multilib_native_use_enable nls) \
-		--enable-agetty \
-		--with-bashcompletiondir="$(get_bashcompdir)" \
-		--enable-bash-completion \
-		$(multilib_native_use_enable caps setpriv) \
-		--disable-chfn-chsh \
-		$(multilib_native_use_enable cramfs) \
-		$(multilib_native_use_enable fdformat) \
-		--with-ncurses=$(multilib_native_usex ncurses $(usex unicode auto yes) no) \
-		--disable-kill \
-		--disable-login \
-		$(multilib_native_use_enable tty-helpers mesg) \
-		--disable-nologin \
-		--enable-partx \
-		$(multilib_native_use_with python) \
-		--enable-raw \
-		--enable-rename \
-		--disable-reset \
-		--enable-schedutils \
-		--disable-su \
-		$(multilib_native_use_enable tty-helpers wall) \
-		$(multilib_native_use_enable tty-helpers write) \
-		$(multilib_native_use_enable suid makeinstall-chown) \
-		$(multilib_native_use_enable suid makeinstall-setuid) \
-		$(use_with selinux) \
-		$(multilib_native_use_with slang) \
-		$(use_enable static-libs static) \
-		$(multilib_native_use_with udev) \
-		$(tc-has-tls || echo --disable-tls)
-}
-
-multilib_src_compile() {
-	if multilib_is_native_abi; then
-		default
-	else
-		# build libraries only
-		emake -f Makefile -f - mylibs \
-			<<< 'mylibs: $(usrlib_exec_LTLIBRARIES) $(pkgconfig_DATA)'
-	fi
-}
-
-multilib_src_test() {
-	multilib_is_native_abi && emake check
-}
-
-multilib_src_install() {
-	if multilib_is_native_abi; then
-		default
-	else
-		emake DESTDIR="${D}" install-usrlib_execLTLIBRARIES \
-			install-pkgconfigDATA install-uuidincHEADERS \
-			install-nodist_blkidincHEADERS install-nodist_mountincHEADERS \
-			install-nodist_smartcolsincHEADERS
-	fi
-
-	if multilib_is_native_abi; then
-		# need the libs in /
-		gen_usr_ldscript -a blkid mount smartcols uuid
-
-		use python && python_optimize
-	fi
-}
-
-multilib_src_install_all() {
-	dodoc AUTHORS NEWS README* Documentation/{TODO,*.txt,releases/*}
-
-	# e2fsprogs-libs didnt install .la files, and .pc work fine
-	prune_libtool_files
-}
-
-pkg_postinst() {
-	if ! use tty-helpers; then
-		elog "The mesg/wall/write tools have been disabled due to USE=-tty-helpers."
-	fi
-
-	if [[ -z ${REPLACING_VERSIONS} ]]; then
-		elog "The agetty util now clears the terminal by default. You"
-		elog "might want to add --noclear to your /etc/inittab lines."
-	fi
-}
diff --git a/sys-apps/util-linux/util-linux-2.25.2-r1.ebuild b/sys-apps/util-linux/util-linux-2.25.2-r1.ebuild
deleted file mode 100644
index cbeb96a386d1..000000000000
--- a/sys-apps/util-linux/util-linux-2.25.2-r1.ebuild
+++ /dev/null
@@ -1,177 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-
-PYTHON_COMPAT=( python2_7 python3_{3,4} )
-
-inherit eutils toolchain-funcs libtool flag-o-matic bash-completion-r1 \
-	python-single-r1 multilib-minimal systemd
-
-MY_PV=${PV/_/-}
-MY_P=${PN}-${MY_PV}
-
-if [[ ${PV} == 9999 ]] ; then
-	inherit git-2 autotools
-	EGIT_REPO_URI="git://git.kernel.org/pub/scm/utils/util-linux/util-linux.git"
-else
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux"
-	SRC_URI="mirror://kernel/linux/utils/util-linux/v${PV:0:4}/${MY_P}.tar.xz"
-fi
-
-DESCRIPTION="Various useful Linux utilities"
-HOMEPAGE="https://www.kernel.org/pub/linux/utils/util-linux/"
-
-LICENSE="GPL-2 LGPL-2.1 BSD-4 MIT public-domain"
-SLOT="0"
-IUSE="caps +cramfs fdformat ncurses nls pam python selinux slang static-libs +suid systemd test tty-helpers udev unicode"
-
-RDEPEND="!sys-process/schedutils
-	!sys-apps/setarch
-	!<sys-apps/sysvinit-2.88-r7
-	!sys-block/eject
-	!<sys-libs/e2fsprogs-libs-1.41.8
-	!<sys-fs/e2fsprogs-1.41.8
-	!<app-shells/bash-completion-1.3-r2
-	caps? ( sys-libs/libcap-ng )
-	cramfs? ( sys-libs/zlib )
-	ncurses? ( >=sys-libs/ncurses-5.2-r2 )
-	pam? ( sys-libs/pam )
-	python? ( ${PYTHON_DEPS} )
-	selinux? ( >=sys-libs/libselinux-2.2.2-r4[${MULTILIB_USEDEP}] )
-	slang? ( sys-libs/slang )
-	systemd? ( sys-apps/systemd )
-	udev? ( virtual/udev )
-	abi_x86_32? (
-		!<=app-emulation/emul-linux-x86-baselibs-20140406-r2
-		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32]
-	)"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-	test? ( sys-devel/bc )
-	virtual/os-headers"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-runuser-bash-completion.patch #522288
-	if [[ ${PV} == 9999 ]] ; then
-		po/update-potfiles
-		eautoreconf
-	fi
-	elibtoolize
-}
-
-lfs_fallocate_test() {
-	# Make sure we can use fallocate with LFS #300307
-	cat <<-EOF > "${T}"/fallocate.${ABI}.c
-		#define _GNU_SOURCE
-		#include <fcntl.h>
-		main() { return fallocate(0, 0, 0, 0); }
-	EOF
-	append-lfs-flags
-	$(tc-getCC) ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} "${T}"/fallocate.${ABI}.c -o /dev/null >/dev/null 2>&1 \
-		|| export ac_cv_func_fallocate=no
-	rm -f "${T}"/fallocate.${ABI}.c
-}
-
-multilib_src_configure() {
-	lfs_fallocate_test
-	export ac_cv_header_security_pam_misc_h=$(multilib_native_usex pam) #485486
-	# We manually set --libdir to the default since on prefix, econf will set it to
-	# a value which the configure script does not recognize.  This makes it set the
-	# usrlib_execdir to a bad value. bug #518898#c2, fixed upstream for >2.25
-	ECONF_SOURCE=${S} \
-	econf \
-		--enable-fs-paths-extra="${EPREFIX}/usr/sbin:${EPREFIX}/bin:${EPREFIX}/usr/bin" \
-		--libdir='${prefix}/'"$(get_libdir)" \
-		$(multilib_native_use_enable nls) \
-		--enable-agetty \
-		--with-bashcompletiondir="$(get_bashcompdir)" \
-		--enable-bash-completion \
-		$(multilib_native_use_enable caps setpriv) \
-		--disable-chfn-chsh \
-		$(multilib_native_use_enable cramfs) \
-		$(multilib_native_use_enable fdformat) \
-		--with-ncurses=$(multilib_native_usex ncurses $(usex unicode auto yes) no) \
-		--disable-kill \
-		--disable-login \
-		$(multilib_native_use_enable tty-helpers mesg) \
-		--disable-nologin \
-		--enable-partx \
-		$(multilib_native_use_with python) \
-		--enable-raw \
-		--enable-rename \
-		--disable-reset \
-		--enable-schedutils \
-		--disable-su \
-		$(multilib_native_use_enable tty-helpers wall) \
-		$(multilib_native_use_enable tty-helpers write) \
-		$(multilib_native_use_enable suid makeinstall-chown) \
-		$(multilib_native_use_enable suid makeinstall-setuid) \
-		$(use_with selinux) \
-		$(multilib_native_use_with slang) \
-		$(use_enable static-libs static) \
-		$(multilib_native_use_with systemd) \
-		--with-systemdsystemunitdir=$(multilib_native_usex systemd "$(systemd_get_unitdir)" "no") \
-		$(multilib_native_use_with udev) \
-		$(tc-has-tls || echo --disable-tls)
-}
-
-multilib_src_compile() {
-	if multilib_is_native_abi; then
-		default
-	else
-		# build libraries only
-		emake -f Makefile -f - mylibs \
-			<<< 'mylibs: $(usrlib_exec_LTLIBRARIES) $(pkgconfig_DATA)'
-	fi
-}
-
-multilib_src_test() {
-	multilib_is_native_abi && emake check
-}
-
-multilib_src_install() {
-	if multilib_is_native_abi; then
-		default
-	else
-		emake DESTDIR="${D}" install-usrlib_execLTLIBRARIES \
-			install-pkgconfigDATA install-uuidincHEADERS \
-			install-nodist_blkidincHEADERS install-nodist_mountincHEADERS \
-			install-nodist_smartcolsincHEADERS
-	fi
-
-	if multilib_is_native_abi; then
-		# need the libs in /
-		gen_usr_ldscript -a blkid mount smartcols uuid
-
-		use python && python_optimize
-	fi
-}
-
-multilib_src_install_all() {
-	dodoc AUTHORS NEWS README* Documentation/{TODO,*.txt,releases/*}
-
-	# e2fsprogs-libs didnt install .la files, and .pc work fine
-	prune_libtool_files
-}
-
-pkg_postinst() {
-	if ! use tty-helpers; then
-		elog "The mesg/wall/write tools have been disabled due to USE=-tty-helpers."
-	fi
-
-	if [[ -z ${REPLACING_VERSIONS} ]]; then
-		elog "The agetty util now clears the terminal by default. You"
-		elog "might want to add --noclear to your /etc/inittab lines."
-	fi
-}
diff --git a/sys-apps/util-linux/util-linux-2.25.2.ebuild b/sys-apps/util-linux/util-linux-2.25.2.ebuild
deleted file mode 100644
index 01f6f78a8a39..000000000000
--- a/sys-apps/util-linux/util-linux-2.25.2.ebuild
+++ /dev/null
@@ -1,174 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-
-PYTHON_COMPAT=( python2_7 python3_{3,4} )
-
-inherit eutils toolchain-funcs libtool flag-o-matic bash-completion-r1 \
-	python-single-r1 multilib-minimal
-
-MY_PV=${PV/_/-}
-MY_P=${PN}-${MY_PV}
-
-if [[ ${PV} == 9999 ]] ; then
-	inherit git-2 autotools
-	EGIT_REPO_URI="git://git.kernel.org/pub/scm/utils/util-linux/util-linux.git"
-else
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux"
-	SRC_URI="mirror://kernel/linux/utils/util-linux/v${PV:0:4}/${MY_P}.tar.xz"
-fi
-
-DESCRIPTION="Various useful Linux utilities"
-HOMEPAGE="https://www.kernel.org/pub/linux/utils/util-linux/"
-
-LICENSE="GPL-2 LGPL-2.1 BSD-4 MIT public-domain"
-SLOT="0"
-IUSE="caps +cramfs fdformat ncurses nls pam python selinux slang static-libs +suid test tty-helpers udev unicode"
-
-RDEPEND="!sys-process/schedutils
-	!sys-apps/setarch
-	!<sys-apps/sysvinit-2.88-r7
-	!sys-block/eject
-	!<sys-libs/e2fsprogs-libs-1.41.8
-	!<sys-fs/e2fsprogs-1.41.8
-	!<app-shells/bash-completion-1.3-r2
-	caps? ( sys-libs/libcap-ng )
-	cramfs? ( sys-libs/zlib )
-	ncurses? ( >=sys-libs/ncurses-5.2-r2 )
-	pam? ( sys-libs/pam )
-	python? ( ${PYTHON_DEPS} )
-	selinux? ( >=sys-libs/libselinux-2.2.2-r4[${MULTILIB_USEDEP}] )
-	slang? ( sys-libs/slang )
-	udev? ( virtual/udev )
-	abi_x86_32? (
-		!<=app-emulation/emul-linux-x86-baselibs-20140406-r2
-		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32]
-	)"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-	test? ( sys-devel/bc )
-	virtual/os-headers"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-runuser-bash-completion.patch #522288
-	if [[ ${PV} == 9999 ]] ; then
-		po/update-potfiles
-		eautoreconf
-	fi
-	elibtoolize
-}
-
-lfs_fallocate_test() {
-	# Make sure we can use fallocate with LFS #300307
-	cat <<-EOF > "${T}"/fallocate.${ABI}.c
-		#define _GNU_SOURCE
-		#include <fcntl.h>
-		main() { return fallocate(0, 0, 0, 0); }
-	EOF
-	append-lfs-flags
-	$(tc-getCC) ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} "${T}"/fallocate.${ABI}.c -o /dev/null >/dev/null 2>&1 \
-		|| export ac_cv_func_fallocate=no
-	rm -f "${T}"/fallocate.${ABI}.c
-}
-
-multilib_src_configure() {
-	lfs_fallocate_test
-	export ac_cv_header_security_pam_misc_h=$(multilib_native_usex pam) #485486
-	# We manually set --libdir to the default since on prefix, econf will set it to
-	# a value which the configure script does not recognize.  This makes it set the
-	# usrlib_execdir to a bad value. bug #518898#c2, fixed upstream for >2.25
-	ECONF_SOURCE=${S} \
-	econf \
-		--enable-fs-paths-extra="${EPREFIX}/usr/sbin:${EPREFIX}/bin:${EPREFIX}/usr/bin" \
-		--libdir='${prefix}/'"$(get_libdir)" \
-		$(multilib_native_use_enable nls) \
-		--enable-agetty \
-		--with-bashcompletiondir="$(get_bashcompdir)" \
-		--enable-bash-completion \
-		$(multilib_native_use_enable caps setpriv) \
-		--disable-chfn-chsh \
-		$(multilib_native_use_enable cramfs) \
-		$(multilib_native_use_enable fdformat) \
-		--with-ncurses=$(multilib_native_usex ncurses $(usex unicode auto yes) no) \
-		--disable-kill \
-		--disable-login \
-		$(multilib_native_use_enable tty-helpers mesg) \
-		--disable-nologin \
-		--enable-partx \
-		$(multilib_native_use_with python) \
-		--enable-raw \
-		--enable-rename \
-		--disable-reset \
-		--enable-schedutils \
-		--disable-su \
-		$(multilib_native_use_enable tty-helpers wall) \
-		$(multilib_native_use_enable tty-helpers write) \
-		$(multilib_native_use_enable suid makeinstall-chown) \
-		$(multilib_native_use_enable suid makeinstall-setuid) \
-		$(use_with selinux) \
-		$(multilib_native_use_with slang) \
-		$(use_enable static-libs static) \
-		$(multilib_native_use_with udev) \
-		$(tc-has-tls || echo --disable-tls)
-}
-
-multilib_src_compile() {
-	if multilib_is_native_abi; then
-		default
-	else
-		# build libraries only
-		emake -f Makefile -f - mylibs \
-			<<< 'mylibs: $(usrlib_exec_LTLIBRARIES) $(pkgconfig_DATA)'
-	fi
-}
-
-multilib_src_test() {
-	multilib_is_native_abi && emake check
-}
-
-multilib_src_install() {
-	if multilib_is_native_abi; then
-		default
-	else
-		emake DESTDIR="${D}" install-usrlib_execLTLIBRARIES \
-			install-pkgconfigDATA install-uuidincHEADERS \
-			install-nodist_blkidincHEADERS install-nodist_mountincHEADERS \
-			install-nodist_smartcolsincHEADERS
-	fi
-
-	if multilib_is_native_abi; then
-		# need the libs in /
-		gen_usr_ldscript -a blkid mount smartcols uuid
-
-		use python && python_optimize
-	fi
-}
-
-multilib_src_install_all() {
-	dodoc AUTHORS NEWS README* Documentation/{TODO,*.txt,releases/*}
-
-	# e2fsprogs-libs didnt install .la files, and .pc work fine
-	prune_libtool_files
-}
-
-pkg_postinst() {
-	if ! use tty-helpers; then
-		elog "The mesg/wall/write tools have been disabled due to USE=-tty-helpers."
-	fi
-
-	if [[ -z ${REPLACING_VERSIONS} ]]; then
-		elog "The agetty util now clears the terminal by default. You"
-		elog "might want to add --noclear to your /etc/inittab lines."
-	fi
-}
diff --git a/sys-apps/util-linux/util-linux-2.26.1-r1.ebuild b/sys-apps/util-linux/util-linux-2.26.1-r1.ebuild
deleted file mode 100644
index 367cbdfdc0bd..000000000000
--- a/sys-apps/util-linux/util-linux-2.26.1-r1.ebuild
+++ /dev/null
@@ -1,178 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-PYTHON_COMPAT=( python2_7 python3_{3,4} )
-
-inherit eutils toolchain-funcs libtool flag-o-matic bash-completion-r1 \
-	python-single-r1 multilib-minimal systemd
-
-MY_PV=${PV/_/-}
-MY_P=${PN}-${MY_PV}
-
-if [[ ${PV} == 9999 ]] ; then
-	inherit git-2 autotools
-	EGIT_REPO_URI="git://git.kernel.org/pub/scm/utils/util-linux/util-linux.git"
-else
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux"
-	SRC_URI="mirror://kernel/linux/utils/util-linux/v${PV:0:4}/${MY_P}.tar.xz"
-fi
-
-DESCRIPTION="Various useful Linux utilities"
-HOMEPAGE="https://www.kernel.org/pub/linux/utils/util-linux/"
-
-LICENSE="GPL-2 LGPL-2.1 BSD-4 MIT public-domain"
-SLOT="0"
-IUSE="caps +cramfs fdformat ncurses nls pam python selinux slang static-libs +suid systemd test tty-helpers udev unicode"
-
-RDEPEND="!sys-process/schedutils
-	!sys-apps/setarch
-	!<sys-apps/sysvinit-2.88-r7
-	!sys-block/eject
-	!<sys-libs/e2fsprogs-libs-1.41.8
-	!<sys-fs/e2fsprogs-1.41.8
-	!<app-shells/bash-completion-1.3-r2
-	caps? ( sys-libs/libcap-ng )
-	cramfs? ( sys-libs/zlib )
-	ncurses? ( >=sys-libs/ncurses-5.2-r2:0= )
-	pam? ( sys-libs/pam )
-	python? ( ${PYTHON_DEPS} )
-	selinux? ( >=sys-libs/libselinux-2.2.2-r4[${MULTILIB_USEDEP}] )
-	slang? ( sys-libs/slang )
-	systemd? ( sys-apps/systemd )
-	udev? ( virtual/libudev )
-	abi_x86_32? (
-		!<=app-emulation/emul-linux-x86-baselibs-20150406-r2
-		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32]
-	)"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-	test? ( sys-devel/bc )
-	virtual/os-headers"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	if [[ ${PV} == 9999 ]] ; then
-		po/update-potfiles
-		eautoreconf
-	fi
-	elibtoolize
-}
-
-lfs_fallocate_test() {
-	# Make sure we can use fallocate with LFS #300307
-	cat <<-EOF > "${T}"/fallocate.${ABI}.c
-		#define _GNU_SOURCE
-		#include <fcntl.h>
-		main() { return fallocate(0, 0, 0, 0); }
-	EOF
-	append-lfs-flags
-	$(tc-getCC) ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} "${T}"/fallocate.${ABI}.c -o /dev/null >/dev/null 2>&1 \
-		|| export ac_cv_func_fallocate=no
-	rm -f "${T}"/fallocate.${ABI}.c
-}
-
-multilib_src_configure() {
-	lfs_fallocate_test
-	export ac_cv_header_security_pam_misc_h=$(multilib_native_usex pam) #485486
-	export ac_cv_header_security_pam_appl_h=$(multilib_native_usex pam) #545042
-	# We manually set --libdir to the default since on prefix, econf will set it to
-	# a value which the configure script does not recognize.  This makes it set the
-	# usrlib_execdir to a bad value. bug #518898#c2, fixed upstream for >2.25
-	ECONF_SOURCE=${S} \
-	econf \
-		--enable-fs-paths-extra="${EPREFIX}/usr/sbin:${EPREFIX}/bin:${EPREFIX}/usr/bin" \
-		--libdir='${prefix}/'"$(get_libdir)" \
-		--docdir='${datarootdir}'/doc/${PF} \
-		$(multilib_native_use_enable nls) \
-		--enable-agetty \
-		--with-bashcompletiondir="$(get_bashcompdir)" \
-		--enable-bash-completion \
-		$(multilib_native_use_enable caps setpriv) \
-		--disable-chfn-chsh \
-		$(multilib_native_use_enable cramfs) \
-		$(multilib_native_use_enable fdformat) \
-		--with-ncurses=$(multilib_native_usex ncurses $(usex unicode auto yes) no) \
-		--disable-kill \
-		--disable-login \
-		$(multilib_native_use_enable tty-helpers mesg) \
-		--disable-nologin \
-		--enable-partx \
-		$(multilib_native_use_with python) \
-		--enable-raw \
-		--enable-rename \
-		--disable-reset \
-		--enable-schedutils \
-		--disable-su \
-		$(multilib_native_use_enable tty-helpers wall) \
-		$(multilib_native_use_enable tty-helpers write) \
-		$(multilib_native_use_enable suid makeinstall-chown) \
-		$(multilib_native_use_enable suid makeinstall-setuid) \
-		$(use_with selinux) \
-		$(multilib_native_use_with slang) \
-		$(use_enable static-libs static) \
-		$(multilib_native_use_with systemd) \
-		--with-systemdsystemunitdir=$(multilib_native_usex systemd "$(systemd_get_unitdir)" "no") \
-		$(multilib_native_use_with udev) \
-		$(tc-has-tls || echo --disable-tls)
-}
-
-multilib_src_compile() {
-	if multilib_is_native_abi; then
-		default
-	else
-		# build libraries only
-		emake -f Makefile -f - mylibs \
-			<<< 'mylibs: $(usrlib_exec_LTLIBRARIES) $(pkgconfig_DATA)'
-	fi
-}
-
-multilib_src_test() {
-	multilib_is_native_abi && emake check
-}
-
-multilib_src_install() {
-	if multilib_is_native_abi; then
-		default
-	else
-		emake DESTDIR="${D}" install-usrlib_execLTLIBRARIES \
-			install-pkgconfigDATA install-uuidincHEADERS \
-			install-nodist_blkidincHEADERS install-nodist_mountincHEADERS \
-			install-nodist_smartcolsincHEADERS install-nodist_fdiskincHEADERS
-	fi
-
-	if multilib_is_native_abi; then
-		# need the libs in /
-		gen_usr_ldscript -a blkid mount smartcols uuid
-
-		use python && python_optimize
-	fi
-}
-
-multilib_src_install_all() {
-	dodoc AUTHORS NEWS README* Documentation/{TODO,*.txt,releases/*}
-
-	# e2fsprogs-libs didnt install .la files, and .pc work fine
-	prune_libtool_files
-}
-
-pkg_postinst() {
-	if ! use tty-helpers; then
-		elog "The mesg/wall/write tools have been disabled due to USE=-tty-helpers."
-	fi
-
-	if [[ -z ${REPLACING_VERSIONS} ]]; then
-		elog "The agetty util now clears the terminal by default. You"
-		elog "might want to add --noclear to your /etc/inittab lines."
-	fi
-}
diff --git a/sys-apps/util-linux/util-linux-2.26.1.ebuild b/sys-apps/util-linux/util-linux-2.26.1.ebuild
deleted file mode 100644
index 232048387e6d..000000000000
--- a/sys-apps/util-linux/util-linux-2.26.1.ebuild
+++ /dev/null
@@ -1,177 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-
-PYTHON_COMPAT=( python2_7 python3_{3,4} )
-
-inherit eutils toolchain-funcs libtool flag-o-matic bash-completion-r1 \
-	python-single-r1 multilib-minimal systemd
-
-MY_PV=${PV/_/-}
-MY_P=${PN}-${MY_PV}
-
-if [[ ${PV} == 9999 ]] ; then
-	inherit git-2 autotools
-	EGIT_REPO_URI="git://git.kernel.org/pub/scm/utils/util-linux/util-linux.git"
-else
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux"
-	SRC_URI="mirror://kernel/linux/utils/util-linux/v${PV:0:4}/${MY_P}.tar.xz"
-fi
-
-DESCRIPTION="Various useful Linux utilities"
-HOMEPAGE="https://www.kernel.org/pub/linux/utils/util-linux/"
-
-LICENSE="GPL-2 LGPL-2.1 BSD-4 MIT public-domain"
-SLOT="0"
-IUSE="caps +cramfs fdformat ncurses nls pam python selinux slang static-libs +suid systemd test tty-helpers udev unicode"
-
-RDEPEND="!sys-process/schedutils
-	!sys-apps/setarch
-	!<sys-apps/sysvinit-2.88-r7
-	!sys-block/eject
-	!<sys-libs/e2fsprogs-libs-1.41.8
-	!<sys-fs/e2fsprogs-1.41.8
-	!<app-shells/bash-completion-1.3-r2
-	caps? ( sys-libs/libcap-ng )
-	cramfs? ( sys-libs/zlib )
-	ncurses? ( >=sys-libs/ncurses-5.2-r2 )
-	pam? ( sys-libs/pam )
-	python? ( ${PYTHON_DEPS} )
-	selinux? ( >=sys-libs/libselinux-2.2.2-r4[${MULTILIB_USEDEP}] )
-	slang? ( sys-libs/slang )
-	systemd? ( sys-apps/systemd )
-	udev? ( virtual/libudev )
-	abi_x86_32? (
-		!<=app-emulation/emul-linux-x86-baselibs-20140406-r2
-		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32]
-	)"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-	test? ( sys-devel/bc )
-	virtual/os-headers"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	if [[ ${PV} == 9999 ]] ; then
-		po/update-potfiles
-		eautoreconf
-	fi
-	elibtoolize
-}
-
-lfs_fallocate_test() {
-	# Make sure we can use fallocate with LFS #300307
-	cat <<-EOF > "${T}"/fallocate.${ABI}.c
-		#define _GNU_SOURCE
-		#include <fcntl.h>
-		main() { return fallocate(0, 0, 0, 0); }
-	EOF
-	append-lfs-flags
-	$(tc-getCC) ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} "${T}"/fallocate.${ABI}.c -o /dev/null >/dev/null 2>&1 \
-		|| export ac_cv_func_fallocate=no
-	rm -f "${T}"/fallocate.${ABI}.c
-}
-
-multilib_src_configure() {
-	lfs_fallocate_test
-	export ac_cv_header_security_pam_misc_h=$(multilib_native_usex pam) #485486
-	# We manually set --libdir to the default since on prefix, econf will set it to
-	# a value which the configure script does not recognize.  This makes it set the
-	# usrlib_execdir to a bad value. bug #518898#c2, fixed upstream for >2.25
-	ECONF_SOURCE=${S} \
-	econf \
-		--enable-fs-paths-extra="${EPREFIX}/usr/sbin:${EPREFIX}/bin:${EPREFIX}/usr/bin" \
-		--libdir='${prefix}/'"$(get_libdir)" \
-		--docdir='${datarootdir}'/doc/${PF} \
-		$(multilib_native_use_enable nls) \
-		--enable-agetty \
-		--with-bashcompletiondir="$(get_bashcompdir)" \
-		--enable-bash-completion \
-		$(multilib_native_use_enable caps setpriv) \
-		--disable-chfn-chsh \
-		$(multilib_native_use_enable cramfs) \
-		$(multilib_native_use_enable fdformat) \
-		--with-ncurses=$(multilib_native_usex ncurses $(usex unicode auto yes) no) \
-		--disable-kill \
-		--disable-login \
-		$(multilib_native_use_enable tty-helpers mesg) \
-		--disable-nologin \
-		--enable-partx \
-		$(multilib_native_use_with python) \
-		--enable-raw \
-		--enable-rename \
-		--disable-reset \
-		--enable-schedutils \
-		--disable-su \
-		$(multilib_native_use_enable tty-helpers wall) \
-		$(multilib_native_use_enable tty-helpers write) \
-		$(multilib_native_use_enable suid makeinstall-chown) \
-		$(multilib_native_use_enable suid makeinstall-setuid) \
-		$(use_with selinux) \
-		$(multilib_native_use_with slang) \
-		$(use_enable static-libs static) \
-		$(multilib_native_use_with systemd) \
-		--with-systemdsystemunitdir=$(multilib_native_usex systemd "$(systemd_get_unitdir)" "no") \
-		$(multilib_native_use_with udev) \
-		$(tc-has-tls || echo --disable-tls)
-}
-
-multilib_src_compile() {
-	if multilib_is_native_abi; then
-		default
-	else
-		# build libraries only
-		emake -f Makefile -f - mylibs \
-			<<< 'mylibs: $(usrlib_exec_LTLIBRARIES) $(pkgconfig_DATA)'
-	fi
-}
-
-multilib_src_test() {
-	multilib_is_native_abi && emake check
-}
-
-multilib_src_install() {
-	if multilib_is_native_abi; then
-		default
-	else
-		emake DESTDIR="${D}" install-usrlib_execLTLIBRARIES \
-			install-pkgconfigDATA install-uuidincHEADERS \
-			install-nodist_blkidincHEADERS install-nodist_mountincHEADERS \
-			install-nodist_smartcolsincHEADERS install-nodist_fdiskincHEADERS
-	fi
-
-	if multilib_is_native_abi; then
-		# need the libs in /
-		gen_usr_ldscript -a blkid mount smartcols uuid
-
-		use python && python_optimize
-	fi
-}
-
-multilib_src_install_all() {
-	dodoc AUTHORS NEWS README* Documentation/{TODO,*.txt,releases/*}
-
-	# e2fsprogs-libs didnt install .la files, and .pc work fine
-	prune_libtool_files
-}
-
-pkg_postinst() {
-	if ! use tty-helpers; then
-		elog "The mesg/wall/write tools have been disabled due to USE=-tty-helpers."
-	fi
-
-	if [[ -z ${REPLACING_VERSIONS} ]]; then
-		elog "The agetty util now clears the terminal by default. You"
-		elog "might want to add --noclear to your /etc/inittab lines."
-	fi
-}
diff --git a/sys-apps/util-linux/util-linux-2.26.ebuild b/sys-apps/util-linux/util-linux-2.26.ebuild
deleted file mode 100644
index 232048387e6d..000000000000
--- a/sys-apps/util-linux/util-linux-2.26.ebuild
+++ /dev/null
@@ -1,177 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-
-PYTHON_COMPAT=( python2_7 python3_{3,4} )
-
-inherit eutils toolchain-funcs libtool flag-o-matic bash-completion-r1 \
-	python-single-r1 multilib-minimal systemd
-
-MY_PV=${PV/_/-}
-MY_P=${PN}-${MY_PV}
-
-if [[ ${PV} == 9999 ]] ; then
-	inherit git-2 autotools
-	EGIT_REPO_URI="git://git.kernel.org/pub/scm/utils/util-linux/util-linux.git"
-else
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux"
-	SRC_URI="mirror://kernel/linux/utils/util-linux/v${PV:0:4}/${MY_P}.tar.xz"
-fi
-
-DESCRIPTION="Various useful Linux utilities"
-HOMEPAGE="https://www.kernel.org/pub/linux/utils/util-linux/"
-
-LICENSE="GPL-2 LGPL-2.1 BSD-4 MIT public-domain"
-SLOT="0"
-IUSE="caps +cramfs fdformat ncurses nls pam python selinux slang static-libs +suid systemd test tty-helpers udev unicode"
-
-RDEPEND="!sys-process/schedutils
-	!sys-apps/setarch
-	!<sys-apps/sysvinit-2.88-r7
-	!sys-block/eject
-	!<sys-libs/e2fsprogs-libs-1.41.8
-	!<sys-fs/e2fsprogs-1.41.8
-	!<app-shells/bash-completion-1.3-r2
-	caps? ( sys-libs/libcap-ng )
-	cramfs? ( sys-libs/zlib )
-	ncurses? ( >=sys-libs/ncurses-5.2-r2 )
-	pam? ( sys-libs/pam )
-	python? ( ${PYTHON_DEPS} )
-	selinux? ( >=sys-libs/libselinux-2.2.2-r4[${MULTILIB_USEDEP}] )
-	slang? ( sys-libs/slang )
-	systemd? ( sys-apps/systemd )
-	udev? ( virtual/libudev )
-	abi_x86_32? (
-		!<=app-emulation/emul-linux-x86-baselibs-20140406-r2
-		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32]
-	)"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-	test? ( sys-devel/bc )
-	virtual/os-headers"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	if [[ ${PV} == 9999 ]] ; then
-		po/update-potfiles
-		eautoreconf
-	fi
-	elibtoolize
-}
-
-lfs_fallocate_test() {
-	# Make sure we can use fallocate with LFS #300307
-	cat <<-EOF > "${T}"/fallocate.${ABI}.c
-		#define _GNU_SOURCE
-		#include <fcntl.h>
-		main() { return fallocate(0, 0, 0, 0); }
-	EOF
-	append-lfs-flags
-	$(tc-getCC) ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} "${T}"/fallocate.${ABI}.c -o /dev/null >/dev/null 2>&1 \
-		|| export ac_cv_func_fallocate=no
-	rm -f "${T}"/fallocate.${ABI}.c
-}
-
-multilib_src_configure() {
-	lfs_fallocate_test
-	export ac_cv_header_security_pam_misc_h=$(multilib_native_usex pam) #485486
-	# We manually set --libdir to the default since on prefix, econf will set it to
-	# a value which the configure script does not recognize.  This makes it set the
-	# usrlib_execdir to a bad value. bug #518898#c2, fixed upstream for >2.25
-	ECONF_SOURCE=${S} \
-	econf \
-		--enable-fs-paths-extra="${EPREFIX}/usr/sbin:${EPREFIX}/bin:${EPREFIX}/usr/bin" \
-		--libdir='${prefix}/'"$(get_libdir)" \
-		--docdir='${datarootdir}'/doc/${PF} \
-		$(multilib_native_use_enable nls) \
-		--enable-agetty \
-		--with-bashcompletiondir="$(get_bashcompdir)" \
-		--enable-bash-completion \
-		$(multilib_native_use_enable caps setpriv) \
-		--disable-chfn-chsh \
-		$(multilib_native_use_enable cramfs) \
-		$(multilib_native_use_enable fdformat) \
-		--with-ncurses=$(multilib_native_usex ncurses $(usex unicode auto yes) no) \
-		--disable-kill \
-		--disable-login \
-		$(multilib_native_use_enable tty-helpers mesg) \
-		--disable-nologin \
-		--enable-partx \
-		$(multilib_native_use_with python) \
-		--enable-raw \
-		--enable-rename \
-		--disable-reset \
-		--enable-schedutils \
-		--disable-su \
-		$(multilib_native_use_enable tty-helpers wall) \
-		$(multilib_native_use_enable tty-helpers write) \
-		$(multilib_native_use_enable suid makeinstall-chown) \
-		$(multilib_native_use_enable suid makeinstall-setuid) \
-		$(use_with selinux) \
-		$(multilib_native_use_with slang) \
-		$(use_enable static-libs static) \
-		$(multilib_native_use_with systemd) \
-		--with-systemdsystemunitdir=$(multilib_native_usex systemd "$(systemd_get_unitdir)" "no") \
-		$(multilib_native_use_with udev) \
-		$(tc-has-tls || echo --disable-tls)
-}
-
-multilib_src_compile() {
-	if multilib_is_native_abi; then
-		default
-	else
-		# build libraries only
-		emake -f Makefile -f - mylibs \
-			<<< 'mylibs: $(usrlib_exec_LTLIBRARIES) $(pkgconfig_DATA)'
-	fi
-}
-
-multilib_src_test() {
-	multilib_is_native_abi && emake check
-}
-
-multilib_src_install() {
-	if multilib_is_native_abi; then
-		default
-	else
-		emake DESTDIR="${D}" install-usrlib_execLTLIBRARIES \
-			install-pkgconfigDATA install-uuidincHEADERS \
-			install-nodist_blkidincHEADERS install-nodist_mountincHEADERS \
-			install-nodist_smartcolsincHEADERS install-nodist_fdiskincHEADERS
-	fi
-
-	if multilib_is_native_abi; then
-		# need the libs in /
-		gen_usr_ldscript -a blkid mount smartcols uuid
-
-		use python && python_optimize
-	fi
-}
-
-multilib_src_install_all() {
-	dodoc AUTHORS NEWS README* Documentation/{TODO,*.txt,releases/*}
-
-	# e2fsprogs-libs didnt install .la files, and .pc work fine
-	prune_libtool_files
-}
-
-pkg_postinst() {
-	if ! use tty-helpers; then
-		elog "The mesg/wall/write tools have been disabled due to USE=-tty-helpers."
-	fi
-
-	if [[ -z ${REPLACING_VERSIONS} ]]; then
-		elog "The agetty util now clears the terminal by default. You"
-		elog "might want to add --noclear to your /etc/inittab lines."
-	fi
-}
diff --git a/sys-apps/util-linux/util-linux-2.27.ebuild b/sys-apps/util-linux/util-linux-2.27.ebuild
new file mode 100644
index 000000000000..ee2ab6a9764f
--- /dev/null
+++ b/sys-apps/util-linux/util-linux-2.27.ebuild
@@ -0,0 +1,182 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+PYTHON_COMPAT=( python2_7 python3_{3,4} )
+
+inherit eutils toolchain-funcs libtool flag-o-matic bash-completion-r1 \
+	python-single-r1 multilib-minimal systemd
+
+MY_PV=${PV/_/-}
+MY_P=${PN}-${MY_PV}
+
+if [[ ${PV} == 9999 ]] ; then
+	inherit git-2 autotools
+	EGIT_REPO_URI="git://git.kernel.org/pub/scm/utils/util-linux/util-linux.git"
+else
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux"
+	SRC_URI="mirror://kernel/linux/utils/util-linux/v${PV:0:4}/${MY_P}.tar.xz"
+fi
+
+DESCRIPTION="Various useful Linux utilities"
+HOMEPAGE="https://www.kernel.org/pub/linux/utils/util-linux/"
+
+LICENSE="GPL-2 LGPL-2.1 BSD-4 MIT public-domain"
+SLOT="0"
+IUSE="caps +cramfs fdformat ncurses nls pam python selinux slang static-libs +suid systemd test tty-helpers udev unicode"
+
+RDEPEND="!sys-process/schedutils
+	!sys-apps/setarch
+	!<sys-apps/sysvinit-2.88-r7
+	!sys-block/eject
+	!<sys-libs/e2fsprogs-libs-1.41.8
+	!<sys-fs/e2fsprogs-1.41.8
+	!<app-shells/bash-completion-1.3-r2
+	caps? ( sys-libs/libcap-ng )
+	cramfs? ( sys-libs/zlib )
+	ncurses? ( >=sys-libs/ncurses-5.2-r2:0=[unicode?] )
+	pam? ( sys-libs/pam )
+	python? ( ${PYTHON_DEPS} )
+	selinux? ( >=sys-libs/libselinux-2.2.2-r4[${MULTILIB_USEDEP}] )
+	slang? ( sys-libs/slang )
+	systemd? ( sys-apps/systemd )
+	udev? ( virtual/libudev:= )
+	abi_x86_32? (
+		!<=app-emulation/emul-linux-x86-baselibs-20150406-r2
+		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32]
+	)"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+	test? ( sys-devel/bc )
+	virtual/os-headers"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	if [[ ${PV} == 9999 ]] ; then
+		po/update-potfiles
+		eautoreconf
+	fi
+	elibtoolize
+}
+
+lfs_fallocate_test() {
+	# Make sure we can use fallocate with LFS #300307
+	cat <<-EOF > "${T}"/fallocate.${ABI}.c
+		#define _GNU_SOURCE
+		#include <fcntl.h>
+		main() { return fallocate(0, 0, 0, 0); }
+	EOF
+	append-lfs-flags
+	$(tc-getCC) ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} "${T}"/fallocate.${ABI}.c -o /dev/null >/dev/null 2>&1 \
+		|| export ac_cv_func_fallocate=no
+	rm -f "${T}"/fallocate.${ABI}.c
+}
+
+multilib_src_configure() {
+	lfs_fallocate_test
+	# The scanf test in a run-time test which fails while cross-compiling.
+	# Blindly assume a POSIX setup since we require libmount, and libmount
+	# itself fails when the scanf test fails. #531856
+	tc-is-cross-compiler && export scanf_cv_alloc_modifier=ms
+	export ac_cv_header_security_pam_misc_h=$(multilib_native_usex pam) #485486
+	export ac_cv_header_security_pam_appl_h=$(multilib_native_usex pam) #545042
+	# We manually set --libdir to the default since on prefix, econf will set it to
+	# a value which the configure script does not recognize.  This makes it set the
+	# usrlib_execdir to a bad value. bug #518898#c2, fixed upstream for >2.25
+	ECONF_SOURCE=${S} \
+	econf \
+		--enable-fs-paths-extra="${EPREFIX}/usr/sbin:${EPREFIX}/bin:${EPREFIX}/usr/bin" \
+		--libdir='${prefix}/'"$(get_libdir)" \
+		--docdir='${datarootdir}'/doc/${PF} \
+		$(multilib_native_use_enable nls) \
+		--enable-agetty \
+		--with-bashcompletiondir="$(get_bashcompdir)" \
+		--enable-bash-completion \
+		$(multilib_native_use_enable caps setpriv) \
+		--disable-chfn-chsh \
+		$(multilib_native_use_enable cramfs) \
+		$(multilib_native_use_enable fdformat) \
+		--with-ncurses=$(multilib_native_usex ncurses $(usex unicode auto yes) no) \
+		--disable-kill \
+		--disable-login \
+		$(multilib_native_use_enable tty-helpers mesg) \
+		--disable-nologin \
+		--enable-partx \
+		$(multilib_native_use_with python) \
+		--enable-raw \
+		--enable-rename \
+		--disable-reset \
+		--enable-schedutils \
+		--disable-su \
+		$(multilib_native_use_enable tty-helpers wall) \
+		$(multilib_native_use_enable tty-helpers write) \
+		$(multilib_native_use_enable suid makeinstall-chown) \
+		$(multilib_native_use_enable suid makeinstall-setuid) \
+		$(use_with selinux) \
+		$(multilib_native_use_with slang) \
+		$(use_enable static-libs static) \
+		$(multilib_native_use_with systemd) \
+		--with-systemdsystemunitdir=$(multilib_native_usex systemd "$(systemd_get_unitdir)" "no") \
+		$(multilib_native_use_with udev) \
+		$(tc-has-tls || echo --disable-tls)
+}
+
+multilib_src_compile() {
+	if multilib_is_native_abi; then
+		default
+	else
+		# build libraries only
+		emake -f Makefile -f - mylibs \
+			<<< 'mylibs: $(usrlib_exec_LTLIBRARIES) $(pkgconfig_DATA)'
+	fi
+}
+
+multilib_src_test() {
+	multilib_is_native_abi && emake check
+}
+
+multilib_src_install() {
+	if multilib_is_native_abi; then
+		default
+	else
+		emake DESTDIR="${D}" install-usrlib_execLTLIBRARIES \
+			install-pkgconfigDATA install-uuidincHEADERS \
+			install-nodist_blkidincHEADERS install-nodist_mountincHEADERS \
+			install-nodist_smartcolsincHEADERS install-nodist_fdiskincHEADERS
+	fi
+
+	if multilib_is_native_abi; then
+		# need the libs in /
+		gen_usr_ldscript -a blkid mount smartcols uuid
+
+		use python && python_optimize
+	fi
+}
+
+multilib_src_install_all() {
+	dodoc AUTHORS NEWS README* Documentation/{TODO,*.txt,releases/*}
+
+	# e2fsprogs-libs didnt install .la files, and .pc work fine
+	prune_libtool_files
+}
+
+pkg_postinst() {
+	if ! use tty-helpers; then
+		elog "The mesg/wall/write tools have been disabled due to USE=-tty-helpers."
+	fi
+
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
+		elog "The agetty util now clears the terminal by default. You"
+		elog "might want to add --noclear to your /etc/inittab lines."
+	fi
+}
diff --git a/sys-auth/bioapi/metadata.xml b/sys-auth/bioapi/metadata.xml
index 9a34902f8fa6..edc31edb93e9 100644
--- a/sys-auth/bioapi/metadata.xml
+++ b/sys-auth/bioapi/metadata.xml
@@ -7,5 +7,6 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="google-code">bioapi-linux</remote-id>
+		<remote-id type="github">mr-c/bioapi-linux</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/sys-auth/consolekit/Manifest b/sys-auth/consolekit/Manifest
index cd51411f5080..0cd5d78aac6e 100644
--- a/sys-auth/consolekit/Manifest
+++ b/sys-auth/consolekit/Manifest
@@ -1,5 +1,3 @@
 DIST ConsoleKit-0.4.6.tar.xz 366572 SHA256 b41d17e06f80059589fbeefe96ad07bcc564c49e65516da1caf975146475565c SHA512 54955e3e83778a9216846104da8762fd50a37190e209127dd5d211e2227da617e14f6f5c1359905396d299656e526d14e1187b28eaff7d0ae1d7563dc8d9b46d WHIRLPOOL ebf36b109b4c646d0b874f6b8e2ae9e2d190022ee9b6feff6cbb6b9203c80401c538cc3ca674fa7bde4f07e658d5460864e9784c1e0249d49b4784725a4e05c7
-DIST ConsoleKit2-0.9.4.tar.bz2 1184927 SHA256 b3e9554472f1a431576c317536d93ba1ef292916ea8447667deee0b555980e2e SHA512 8bbd04e5d084a4b7d3a9324b21909728d3d358c4fcb7a741f02baa354f8ce5afe2ec1a0613aa140adc754322ad00f2cd57eac8fedc500236a167c356c5a3ae04 WHIRLPOOL f02ebfb8b33c36650d6a57d09200d2d13c48e1b521de6a088399fe2a8af623434f539fa5bd343c720bf0174ab90a8d9d8a2c1a33b8aded0c76367e31b4a1accf
-DIST ConsoleKit2-0.9.5.tar.bz2 1250075 SHA256 2a857a304b6792a59f1cd43be51bfb570b06e3659dc71acc59dc1c2ac99fdb42 SHA512 afde7f668088d0b3a78a28ec6d01e00f705b628824e94ae8082dcd6cded24b69ddaf7ccf8c12a2f87bfa60836769d1947209d63bbbbcb17ac668c0c27bf70df5 WHIRLPOOL 80ccc3ff807dae1d3110c1923d1720d4c9ff66e9d8f233af8d6e56c2388088fda9c51279e48e7e81861c8ce9fb7246cfd0bed7c916bd1b86fda4b473c7607f80
 DIST ConsoleKit2-1.0.0.tar.bz2 1288174 SHA256 30b8026e62246593637bacf99ab9cbea18e7fea6ee07c45ae2a351912aacda4b SHA512 311cfc0aa945dcf50b4a98e1b19bd25cef84e89e4d849aa0b4b084b6cd8c52931a3af1c56243af00ff0a27b20230ab126de0cc0f08ea861f12a813399478bafa WHIRLPOOL fa834d0cf22a14844277c9f7333b89596c84368c1803fab119acc7799520a5078487351f23e3a66dd47000e09c447f70c03c2244601faf5236275641eeb3d040
 DIST consolekit_0.4.6-4.debian.tar.gz 12192 SHA256 6d4dd5e13a76454b4bab27ab6b407718cd77616afd2b1af7cb8d947c1323b802 SHA512 f7fc5965b1f495d16a8ca167940431bc2569e9bde9e4a356b9c9ed00c2825db61da7b6db3d434d977fff72b3aaef30c455a365b9eba282a887a523753613b58f WHIRLPOOL 961a918c21259e24c68c7a5bf93964825b891ea207c088fecab61f81434012dc8925fca83b74518cfc9cf42f2c4a87eba7518c0829f663716ca0e11e38c856c9
diff --git a/sys-auth/consolekit/consolekit-0.9.4.ebuild b/sys-auth/consolekit/consolekit-0.9.4.ebuild
deleted file mode 100644
index af9516517196..000000000000
--- a/sys-auth/consolekit/consolekit-0.9.4.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit eutils linux-info pam
-
-MY_PN=ConsoleKit2
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Framework for defining and tracking users, login sessions and seats"
-HOMEPAGE="https://github.com/ConsoleKit2/ConsoleKit2 http://www.freedesktop.org/wiki/Software/ConsoleKit"
-SRC_URI="https://github.com/${MY_PN}/${MY_PN}/releases/download/${PV}/${MY_P}.tar.bz2
-	mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_0.4.6-4.debian.tar.gz" # for logrotate file"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux"
-IUSE="acl debug doc kernel_linux pam policykit selinux test"
-
-COMMON_DEPEND=">=dev-libs/glib-2.40:2=
-	sys-libs/zlib:=
-	x11-libs/libX11:=
-	acl? (
-		sys-apps/acl:=
-		>=virtual/udev-200
-		)
-	pam? ( virtual/pam )
-	policykit? ( >=sys-auth/polkit-0.110 )"
-RDEPEND="${COMMON_DEPEND}
-	kernel_linux? ( sys-apps/coreutils[acl?] )
-	selinux? ( sec-policy/selinux-consolekit )
-	sys-power/pm-utils"
-DEPEND="${COMMON_DEPEND}
-	dev-libs/libxslt
-	virtual/pkgconfig
-	doc? ( app-text/xmlto )
-	test? (
-		app-text/docbook-xml-dtd:4.1.2
-		app-text/xmlto
-		)"
-
-S=${WORKDIR}/${MY_P}
-
-QA_MULTILIB_PATHS="usr/lib/ConsoleKit/.*"
-
-pkg_setup() {
-	if use kernel_linux; then
-		# This is from https://bugs.gentoo.org/376939
-		use acl && CONFIG_CHECK="~TMPFS_POSIX_ACL"
-		# This is required to get login-session-id string with pam_ck_connector.so
-		use pam && CONFIG_CHECK+=" ~AUDITSYSCALL"
-		linux-info_pkg_setup
-	fi
-}
-
-src_prepare() {
-	sed -i -e '/SystemdService/d' data/org.freedesktop.ConsoleKit.service.in || die
-}
-
-src_configure() {
-	econf \
-		XMLTO_FLAGS='--skip-validation' \
-		--libexecdir="${EPREFIX}"/usr/lib/ConsoleKit \
-		--localstatedir="${EPREFIX}"/var \
-		$(use_enable pam pam-module) \
-		$(use_enable doc docbook-docs) \
-		$(use_enable test docbook-docs) \
-		$(use_enable debug) \
-		$(use_enable policykit polkit) \
-		$(use_enable acl udev-acl) \
-		--with-dbus-services="${EPREFIX}"/usr/share/dbus-1/services \
-		--with-pam-module-dir="$(getpam_mod_dir)" \
-		--with-xinitrc-dir=/etc/X11/xinit/xinitrc.d \
-		--without-systemdsystemunitdir
-}
-
-src_install() {
-	emake \
-		DESTDIR="${D}" \
-		htmldocdir="${EPREFIX}"/usr/share/doc/${PF}/html \
-		install
-
-	dosym /usr/lib/ConsoleKit /usr/lib/${PN}
-
-	dodoc AUTHORS HACKING NEWS README TODO
-
-	newinitd "${FILESDIR}"/${PN}-0.2.rc consolekit
-
-	keepdir /usr/lib/ConsoleKit/run-seat.d
-	keepdir /usr/lib/ConsoleKit/run-session.d
-	keepdir /etc/ConsoleKit/run-session.d
-	keepdir /var/log/ConsoleKit
-
-	exeinto /etc/X11/xinit/xinitrc.d
-	newexe "${FILESDIR}"/90-consolekit-3 90-consolekit
-
-	prune_libtool_files --all # --all for pam_ck_connector.la
-
-	rm -rf "${ED}"/var/run # let the init script create the directory
-
-	insinto /etc/logrotate.d
-	newins "${WORKDIR}"/debian/${PN}.logrotate ${PN} #374513
-}
diff --git a/sys-auth/consolekit/consolekit-0.9.5.ebuild b/sys-auth/consolekit/consolekit-0.9.5.ebuild
deleted file mode 100644
index 67d0c3a056ee..000000000000
--- a/sys-auth/consolekit/consolekit-0.9.5.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit eutils linux-info pam
-
-MY_PN=ConsoleKit2
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Framework for defining and tracking users, login sessions and seats"
-HOMEPAGE="https://github.com/ConsoleKit2/ConsoleKit2 http://www.freedesktop.org/wiki/Software/ConsoleKit"
-SRC_URI="https://github.com/${MY_PN}/${MY_PN}/releases/download/${PV}/${MY_P}.tar.bz2
-	mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_0.4.6-4.debian.tar.gz" # for logrotate file"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux"
-IUSE="acl debug doc kernel_linux pam policykit selinux test"
-
-COMMON_DEPEND=">=dev-libs/glib-2.40:2=
-	sys-libs/zlib:=
-	x11-libs/libX11:=
-	acl? (
-		sys-apps/acl:=
-		>=virtual/udev-200
-		)
-	pam? ( virtual/pam )
-	policykit? ( >=sys-auth/polkit-0.110 )"
-RDEPEND="${COMMON_DEPEND}
-	kernel_linux? ( sys-apps/coreutils[acl?] )
-	selinux? ( sec-policy/selinux-consolekit )
-	sys-power/pm-utils"
-DEPEND="${COMMON_DEPEND}
-	dev-libs/libxslt
-	virtual/pkgconfig
-	doc? ( app-text/xmlto )
-	test? (
-		app-text/docbook-xml-dtd:4.1.2
-		app-text/xmlto
-		)"
-
-S=${WORKDIR}/${MY_P}
-
-QA_MULTILIB_PATHS="usr/lib/ConsoleKit/.*"
-
-pkg_setup() {
-	if use kernel_linux; then
-		# This is from https://bugs.gentoo.org/376939
-		use acl && CONFIG_CHECK="~TMPFS_POSIX_ACL"
-		# This is required to get login-session-id string with pam_ck_connector.so
-		use pam && CONFIG_CHECK+=" ~AUDITSYSCALL"
-		linux-info_pkg_setup
-	fi
-}
-
-src_prepare() {
-	sed -i -e '/SystemdService/d' data/org.freedesktop.ConsoleKit.service.in || die
-}
-
-src_configure() {
-	econf \
-		XMLTO_FLAGS='--skip-validation' \
-		--libexecdir="${EPREFIX}"/usr/lib/ConsoleKit \
-		--localstatedir="${EPREFIX}"/var \
-		$(use_enable pam pam-module) \
-		$(use_enable doc docbook-docs) \
-		$(use_enable test docbook-docs) \
-		$(use_enable debug) \
-		$(use_enable policykit polkit) \
-		$(use_enable acl udev-acl) \
-		$(use_enable test tests) \
-		--with-dbus-services="${EPREFIX}"/usr/share/dbus-1/services \
-		--with-pam-module-dir="$(getpam_mod_dir)" \
-		--with-xinitrc-dir=/etc/X11/xinit/xinitrc.d \
-		--without-systemdsystemunitdir
-}
-
-src_install() {
-	emake \
-		DESTDIR="${D}" \
-		htmldocdir="${EPREFIX}"/usr/share/doc/${PF}/html \
-		install
-
-	dosym /usr/lib/ConsoleKit /usr/lib/${PN}
-
-	dodoc AUTHORS HACKING NEWS README TODO
-
-	newinitd "${FILESDIR}"/${PN}-0.2.rc consolekit
-
-	keepdir /usr/lib/ConsoleKit/run-seat.d
-	keepdir /usr/lib/ConsoleKit/run-session.d
-	keepdir /etc/ConsoleKit/run-session.d
-	keepdir /var/log/ConsoleKit
-
-	exeinto /etc/X11/xinit/xinitrc.d
-	newexe "${FILESDIR}"/90-consolekit-3 90-consolekit
-
-	prune_libtool_files --all # --all for pam_ck_connector.la
-
-	rm -rf "${ED}"/var/run || die # let the init script create the directory
-
-	insinto /etc/logrotate.d
-	newins "${WORKDIR}"/debian/${PN}.logrotate ${PN} #374513
-}
diff --git a/sys-auth/consolekit/consolekit-1.0.0.ebuild b/sys-auth/consolekit/consolekit-1.0.0.ebuild
index fcd88b0141ec..8bbb4978f0a4 100644
--- a/sys-auth/consolekit/consolekit-1.0.0.ebuild
+++ b/sys-auth/consolekit/consolekit-1.0.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/${MY_PN}/${MY_PN}/releases/download/${PV}/${MY_P}.ta
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux"
+KEYWORDS="~amd64 ~hppa ~x86"
 IUSE="acl cgroups debug doc kernel_linux pam policykit selinux test"
 
 COMMON_DEPEND=">=dev-libs/glib-2.40:2=
diff --git a/sys-auth/consolekit/metadata.xml b/sys-auth/consolekit/metadata.xml
index 47e5fd752138..e8e6572a99fe 100644
--- a/sys-auth/consolekit/metadata.xml
+++ b/sys-auth/consolekit/metadata.xml
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<maintainer>
+		<email>perfinion@gentoo.org</email>
+		<name>Jason Zaman</name>
+	</maintainer>
 	<herd>freedesktop</herd>
 	<maintainer>
 		<email>freedesktop-bugs@gentoo.org</email>
diff --git a/sys-auth/libnss-cache/metadata.xml b/sys-auth/libnss-cache/metadata.xml
index b38a94f524aa..fc8e73d671a5 100644
--- a/sys-auth/libnss-cache/metadata.xml
+++ b/sys-auth/libnss-cache/metadata.xml
@@ -11,5 +11,6 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="google-code">nsscache</remote-id>
+		<remote-id type="github">google/nsscache</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/sys-auth/polkit/polkit-0.113.ebuild b/sys-auth/polkit/polkit-0.113.ebuild
index 5cce334f84b3..8d35298a34cb 100644
--- a/sys-auth/polkit/polkit-0.113.ebuild
+++ b/sys-auth/polkit/polkit-0.113.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.freedesktop.org/software/${PN}/releases/${P}.tar.gz"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE="examples gtk +introspection jit kde nls pam selinux systemd test"
 
 CDEPEND="
diff --git a/sys-auth/skey/skey-1.1.5-r9.ebuild b/sys-auth/skey/skey-1.1.5-r9.ebuild
index dc3dba20f454..0c6103b7a108 100644
--- a/sys-auth/skey/skey-1.1.5-r9.ebuild
+++ b/sys-auth/skey/skey-1.1.5-r9.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2
 
 LICENSE="BSD MIT RSA BEER-WARE"
 SLOT="0"
-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"
 IUSE="static-libs"
 
 DEPEND="dev-lang/perl
diff --git a/sys-block/gparted/Manifest b/sys-block/gparted/Manifest
index 710ee3c55999..e6cd891a8e28 100644
--- a/sys-block/gparted/Manifest
+++ b/sys-block/gparted/Manifest
@@ -1,2 +1,2 @@
-DIST gparted-0.21.0.tar.bz2 2123932 SHA256 398fc34ce8ffc3b3cfe6b423029646e7c7f40ed1a1bbb737b4d8524bef3565a9 SHA512 038ae6472e2499109559f4c1ed2314556dc3d7b1424a1448b684a1b5625ee6843703eda350d72ed1653d1cd516553a248dc41eee9627f5e4b18aee5bd62d38b1 WHIRLPOOL 778239331bead13e7f9e44e65509f06c057eb9c227ac12a881639153abf9125e21041208408cca8b06706dd64ad924635bb4f93e4a567f1564da1d7709cc5033
 DIST gparted-0.22.0.tar.bz2 2185652 SHA256 aa755e1a6e84c8eaac8b3c44416cbe9c202a4993ceaba22f293d20b83b2d6f27 SHA512 4cc6868dd182e00d1f3afc261009a5ebca81d1b7319f97c9b3c3267c5a11f043bbad644e14245a5c5b342971b2fd7705cbf7b159d8e800f7877de42c30c6581b WHIRLPOOL 4752197e8060dd24852a7c5ad2799cc19e9dde2e6694656392ce0703c6c2da1cfeffd2a3625f8da9ab02fdc3db66cb33608b3c52c9a6d369e0106a367efe7859
+DIST gparted-0.23.0.tar.bz2 2264376 SHA256 7fd1dddf29814c2982f55ab765b8918561e1b5dabf792012c66b4d3ba25da754 SHA512 5ac03da1b13b23ee36006a4e785fd9b67968763305b5b0657948ac5c68391ba9643d53d44ff29703fa78a5df877a95a5be4ef41e83da524d8362a46bc15cbf06 WHIRLPOOL 2a24d6dfb3aa52f9c0e42b6897d06e8911620f6ddd2cea44b61b49b80244c147104e01356c3c300c56f62975df94fb4112ef4682e365988f729138fd202c5b26
diff --git a/sys-block/gparted/gparted-0.21.0.ebuild b/sys-block/gparted/gparted-0.21.0.ebuild
deleted file mode 100644
index 6737d8175f32..000000000000
--- a/sys-block/gparted/gparted-0.21.0.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="no"
-
-inherit gnome2
-
-DESCRIPTION="Gnome Partition Editor"
-HOMEPAGE="http://gparted.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2+ FDL-1.2+"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc x86"
-IUSE="btrfs dmraid f2fs fat hfs jfs kde mdadm ntfs policykit reiserfs reiser4 xfs"
-
-# FIXME: add gpart support
-COMMON_DEPEND="
-	>=dev-cpp/glibmm-2.14:2
-	>=dev-cpp/gtkmm-2.22:2.4
-	>=dev-libs/glib-2:2
-	>=sys-block/parted-3.2:=
-"
-RDEPEND="${COMMON_DEPEND}
-	!policykit? (
-		kde? ( kde-apps/kdesu ) )
-	policykit? ( sys-auth/polkit )
-
-	>=sys-apps/util-linux-2.20
-	>=sys-fs/e2fsprogs-1.41
-	btrfs? ( sys-fs/btrfs-progs )
-	dmraid? (
-		>=sys-fs/lvm2-2.02.45
-		sys-fs/dmraid
-		sys-fs/multipath-tools )
-	f2fs? ( sys-fs/f2fs-tools )
-	fat? (
-		sys-fs/dosfstools
-		sys-fs/mtools )
-	hfs? (
-		sys-fs/diskdev_cmds
-		virtual/udev
-		sys-fs/hfsutils )
-	jfs? ( sys-fs/jfsutils )
-	mdadm? ( sys-fs/mdadm )
-	ntfs? ( >=sys-fs/ntfs3g-2011.4.12[ntfsprogs] )
-	reiserfs? ( sys-fs/reiserfsprogs )
-	reiser4? ( sys-fs/reiser4progs )
-	xfs? ( sys-fs/xfsprogs sys-fs/xfsdump )
-"
-DEPEND="${COMMON_DEPEND}
-	app-text/docbook-xml-dtd:4.1.2
-	app-text/gnome-doc-utils
-	app-text/rarian
-	dev-util/intltool
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	sed -i -e 's:Exec=@gksuprog@ :Exec=:' gparted.desktop.in.in || die
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-		--enable-doc \
-		--enable-online-resize \
-		GKSUPROG=$(type -P true)
-}
-
-src_install() {
-	gnome2_src_install
-
-	local _ddir="${D}"/usr/share/applications
-
-	if use policykit; then
-		sed -i -e 's:/usr/sbin/gparted %f:gparted-pkexec:' "${_ddir}"/gparted.desktop
-		insinto /usr/share/polkit-1/actions/
-		doins "${FILESDIR}"/org.gentoo.pkexec.gparted.policy
-		dobin "${FILESDIR}"/gparted-pkexec
-	else
-		if use kde; then
-			cp "${_ddir}"/gparted{,-kde}.desktop
-			sed -i -e 's:Exec=:Exec=kdesu :' "${_ddir}"/gparted-kde.desktop
-			echo 'OnlyShowIn=KDE;' >> "${_ddir}"/gparted-kde.desktop
-		fi
-	fi
-}
diff --git a/sys-block/gparted/gparted-0.23.0.ebuild b/sys-block/gparted/gparted-0.23.0.ebuild
new file mode 100644
index 000000000000..352bbc5b10c7
--- /dev/null
+++ b/sys-block/gparted/gparted-0.23.0.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+
+inherit gnome2
+
+DESCRIPTION="Gnome Partition Editor"
+HOMEPAGE="http://gparted.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2+ FDL-1.2+"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~ppc ~x86"
+IUSE="btrfs dmraid f2fs fat hfs jfs kde mdadm ntfs policykit reiserfs reiser4 xfs"
+
+# FIXME: add gpart support
+COMMON_DEPEND="
+	>=dev-cpp/glibmm-2.14:2
+	>=dev-cpp/gtkmm-2.22:2.4
+	>=dev-libs/glib-2:2
+	>=sys-block/parted-3.2:=
+"
+RDEPEND="${COMMON_DEPEND}
+	!policykit? (
+		kde? ( kde-apps/kdesu ) )
+	policykit? ( sys-auth/polkit )
+
+	>=sys-apps/util-linux-2.20
+	>=sys-fs/e2fsprogs-1.41
+	btrfs? ( sys-fs/btrfs-progs )
+	dmraid? (
+		>=sys-fs/lvm2-2.02.45
+		sys-fs/dmraid
+		sys-fs/multipath-tools )
+	f2fs? ( sys-fs/f2fs-tools )
+	fat? (
+		sys-fs/dosfstools
+		sys-fs/mtools )
+	hfs? (
+		sys-fs/diskdev_cmds
+		virtual/udev
+		sys-fs/hfsutils )
+	jfs? ( sys-fs/jfsutils )
+	mdadm? ( sys-fs/mdadm )
+	ntfs? ( >=sys-fs/ntfs3g-2011.4.12[ntfsprogs] )
+	reiserfs? ( sys-fs/reiserfsprogs )
+	reiser4? ( sys-fs/reiser4progs )
+	xfs? ( sys-fs/xfsprogs sys-fs/xfsdump )
+"
+DEPEND="${COMMON_DEPEND}
+	app-text/docbook-xml-dtd:4.1.2
+	app-text/gnome-doc-utils
+	dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	sed -i -e 's:Exec=@gksuprog@ :Exec=:' gparted.desktop.in.in || die
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure \
+		--enable-doc \
+		--enable-online-resize \
+		GKSUPROG=$(type -P true)
+}
+
+src_install() {
+	gnome2_src_install
+
+	local _ddir="${D}"/usr/share/applications
+
+	if use policykit; then
+		sed -i -e 's:/usr/sbin/gparted %f:gparted-pkexec:' "${_ddir}"/gparted.desktop
+		insinto /usr/share/polkit-1/actions/
+		doins "${FILESDIR}"/org.gentoo.pkexec.gparted.policy
+		dobin "${FILESDIR}"/gparted-pkexec
+	else
+		if use kde; then
+			cp "${_ddir}"/gparted{,-kde}.desktop
+			sed -i -e 's:Exec=:Exec=kdesu :' "${_ddir}"/gparted-kde.desktop
+			echo 'OnlyShowIn=KDE;' >> "${_ddir}"/gparted-kde.desktop
+		fi
+	fi
+}
diff --git a/sys-block/mbuffer/mbuffer-20150412.ebuild b/sys-block/mbuffer/mbuffer-20150412.ebuild
index 5c4565629a74..96d44991c1c7 100644
--- a/sys-block/mbuffer/mbuffer-20150412.ebuild
+++ b/sys-block/mbuffer/mbuffer-20150412.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://www.maier-komor.de/software/mbuffer/${P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
+KEYWORDS="amd64 ppc x86"
 IUSE="debug ssl"
 
 DEPEND="ssl? ( dev-libs/openssl )"
diff --git a/sys-boot/gnu-efi/gnu-efi-3.0.2.ebuild b/sys-boot/gnu-efi/gnu-efi-3.0.2.ebuild
index 508f0a9b236b..f79b3b2961d5 100644
--- a/sys-boot/gnu-efi/gnu-efi-3.0.2.ebuild
+++ b/sys-boot/gnu-efi/gnu-efi-3.0.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/gnu-efi/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="-* ~amd64 ~arm ~arm64 ~ia64 ~x86"
+KEYWORDS="-* ~amd64 ~ia64 ~x86"
 IUSE=""
 
 DEPEND="sys-apps/pciutils"
diff --git a/sys-boot/gnu-efi/gnu-efi-3.0.3.ebuild b/sys-boot/gnu-efi/gnu-efi-3.0.3.ebuild
index 508f0a9b236b..9c6a09fcff1d 100644
--- a/sys-boot/gnu-efi/gnu-efi-3.0.3.ebuild
+++ b/sys-boot/gnu-efi/gnu-efi-3.0.3.ebuild
@@ -12,8 +12,8 @@ SRC_URI="mirror://sourceforge/gnu-efi/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="-* ~amd64 ~arm ~arm64 ~ia64 ~x86"
-IUSE=""
+KEYWORDS="-* ~amd64 ~ia64 ~x86"
+IUSE="abi_x86_32 abi_x86_64"
 
 DEPEND="sys-apps/pciutils"
 RDEPEND=""
@@ -21,29 +21,48 @@ RDEPEND=""
 # These objects get run early boot (i.e. not inside of Linux),
 # so doing these QA checks on them doesn't make sense.
 QA_EXECSTACK="usr/*/lib*efi.a:* usr/*/crt*.o"
+RESTRICT="strip"
 
-_emake() {
-	emake \
-		prefix=${CHOST}- \
-		ARCH=${iarch} \
-		PREFIX="${EPREFIX}/usr" \
-		LIBDIR='$(PREFIX)/'"$(get_libdir)" \
-		"$@"
+efimake() {
+	local arch=
+	case ${CHOST} in
+		arm*) arch=arm ;;
+		aarch64*) arch=aarch64 ;;
+		ia64*) arch=ia64 ;;
+		i?86*) arch=ia32 ;;
+		x86_64*) arch=x86_64 ;;
+		*) die "Unknown CHOST" ;;
+	esac
+
+	local args=(
+		ARCH="${arch}"
+		HOSTCC="${BUILD_CC}"
+		CC="${CC}"
+		AS="${AS}"
+		LD="${LD}"
+		AR="${AR}"
+		PREFIX="${EPREFIX}/usr"
+		LIBDIR='$(PREFIX)'/$(get_libdir)
+	)
+	emake -j1 "${args[@]}" "$@"
 }
 
 src_compile() {
-	case ${ARCH} in
-		ia64)  iarch=ia64 ;;
-		x86)   iarch=ia32 ;;
-		amd64) iarch=x86_64 ;;
-		*)     die "unknown architecture: $ARCH" ;;
-	esac
-	# The lib subdir uses unsafe archive targets, and
-	# the apps subdir needs gnuefi subdir
-	_emake -j1
+	tc-export BUILD_CC AR AS CC LD
+	if [[ ${CHOST} == x86_64* ]]; then
+		use abi_x86_32 && CHOST=i686 ABI=x86 efimake
+		use abi_x86_64 && efimake
+	else
+		efimake
+	fi
 }
 
 src_install() {
-	_emake install PREFIX=/usr INSTALLROOT="${D}"
+	if [[ ${CHOST} == x86_64* ]]; then
+		use abi_x86_32 && CHOST=i686 ABI=x86 efimake INSTALLROOT="${D}" install
+		use abi_x86_64 && efimake INSTALLROOT="${D}" install
+	else
+		efimake INSTALLROOT="${D}" install
+	fi
 	dodoc README* ChangeLog
 }
diff --git a/sys-cluster/corosync/metadata.xml b/sys-cluster/corosync/metadata.xml
index 08d3ba8b7302..28abf004bf72 100644
--- a/sys-cluster/corosync/metadata.xml
+++ b/sys-cluster/corosync/metadata.xml
@@ -3,10 +3,6 @@
 <pkgmetadata>
 	<herd>cluster</herd>
 	<maintainer>
-		<email>cardoe@gentoo.org</email>
-		<name>Doug Goldstein</name>
-	</maintainer>
-	<maintainer>
 		<email>robbat2@gentoo.org</email>
 		<name>Robin Johnson</name>
 	</maintainer>
diff --git a/sys-cluster/glusterfs/Manifest b/sys-cluster/glusterfs/Manifest
index 3115e9bca3aa..a1cfb400276d 100644
--- a/sys-cluster/glusterfs/Manifest
+++ b/sys-cluster/glusterfs/Manifest
@@ -1,3 +1,4 @@
 DIST glusterfs-3.1.2.tar.gz 2086469 SHA256 9a4e910431f572aa180a3ad1821f7524773ec1e8f06342c4040f26619f832838 SHA512 69b61af7c6cd9f54f615f7cd50c6ffda670800c6045604449b130eaa43c90c9adcb518c1312134890cccf3a301066a5af3e97bd7ec9775b7f70ea6d0a4a67cd6 WHIRLPOOL 0ecc86ac943f4c8d9575b8b0ae2ef72002d6510945e1a687409277165eb7688c2e4db50532ae10777828646b782561dfd4314fa766d7a3bcf4762e8be7c34c79
 DIST glusterfs-3.5.4.tar.gz 5199067 SHA256 8e8bf9ff6b3884c420653dbf7549f8240cb30aa4a55c852ebb8f293f8089ad35 SHA512 eac2e5eacf33a04c574d495ea532703222faa559e34702f5939e9300936064d0867e4de9653be64dd3fa7fc1976e32915521a0ba07dc3c16c03b598a64dc12da WHIRLPOOL b597b677d6284e0419b6d1574d24bc6677bffec120c2ff37fc83f51b0fd048ec9bae8873b530e44cad10e85c109f8a97f3e67f85a4709207d488f64d561fc068
 DIST glusterfs-3.6.5.tar.gz 6091408 SHA256 20d912ef35fb8350c50c39c15134a3558ee90d012203f049799c8eb67a61fd2a SHA512 7ca41855239818fc4c84cdb86e1f1d39502e781d5117a5ee50ea134f03f0823a8640ee9bda28f05463e8504aba9ddb12ac72e118f0ce7c3755c083033f5677ca WHIRLPOOL 9fc0592052d976d65fcc769c69d910fa6d909695162bccf80c1e799a2c54c531ab03a4afd3788951c231a214a22e5f8bb3613a83277858627425b86fd532ab5e
+DIST glusterfs-3.7.4.tar.gz 7552110 SHA256 f98f448117d1de7666ae425eddd8d7d87b02c57f6627234ce96ba60566f47173 SHA512 f9a281f3a37835f9f54679740ddb19b307babe576a8f14c9ef24d256f483789c227d7e7c5b0ed4ef5c13a257bcf00d0c17b6108fa60c5e45d0175df6e236b3a5 WHIRLPOOL 7b0320936de078234228cb691f3e381da3cc89c638d6246aba63695aa36cb114afca6e53d12d23de441b8da0b3a594ac1702b450d5d14720254af73e689c4ab8
diff --git a/sys-cluster/glusterfs/glusterfs-3.7.4.ebuild b/sys-cluster/glusterfs/glusterfs-3.7.4.ebuild
new file mode 100644
index 000000000000..63405a2c576a
--- /dev/null
+++ b/sys-cluster/glusterfs/glusterfs-3.7.4.ebuild
@@ -0,0 +1,206 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+AUTOTOOLS_AUTORECONF=1
+
+inherit autotools-utils elisp-common eutils multilib python-single-r1 systemd versionator
+
+DESCRIPTION="GlusterFS is a powerful network/cluster filesystem"
+HOMEPAGE="http://www.gluster.org/"
+SRC_URI="http://download.gluster.org/pub/gluster/${PN}/$(get_version_component_range '1-2')/${PV}/${P}.tar.gz"
+
+LICENSE="|| ( GPL-2 LGPL-3+ )"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="bd-xlator crypt-xlator debug emacs +fuse +georeplication glupy infiniband qemu-block rsyslog static-libs +syslog systemtap test +tiering vim-syntax +xml"
+
+REQUIRED_USE="georeplication? ( ${PYTHON_REQUIRED_USE} )
+	glupy? ( ${PYTHON_REQUIRED_USE} )"
+
+# the tests must be run as root
+RESTRICT="test"
+
+# sys-apps/util-linux is required for libuuid
+RDEPEND="bd-xlator? ( sys-fs/lvm2 )
+	emacs? ( virtual/emacs )
+	fuse? ( >=sys-fs/fuse-2.7.0 )
+	georeplication? ( ${PYTHON_DEPS} )
+	infiniband? ( sys-infiniband/libibverbs:* sys-infiniband/librdmacm:* )
+	qemu-block? ( dev-libs/glib:2 )
+	systemtap? ( dev-util/systemtap )
+	tiering? ( dev-db/sqlite:3 )
+	xml? ( dev-libs/libxml2 )
+	sys-libs/readline:=
+	dev-libs/libaio
+	dev-libs/openssl:=
+	dev-libs/userspace-rcu:=
+	|| ( sys-libs/glibc sys-libs/argp-standalone )
+	sys-apps/util-linux"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	sys-devel/bison
+	sys-devel/flex
+	test? ( >=dev-util/cmocka-1.0.1
+		app-benchmarks/dbench
+		dev-vcs/git
+		net-fs/nfs-utils
+		virtual/perl-Test-Harness
+		dev-libs/yajl
+		sys-fs/xfsprogs
+		sys-apps/attr )"
+
+SITEFILE="50${PN}-mode-gentoo.el"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-3.4.0-silent_rules.patch"
+)
+
+DOCS=( AUTHORS ChangeLog NEWS README.md THANKS )
+
+# Maintainer notes:
+# * The build system will always configure & build argp-standalone but it'll never use it
+#   if the argp.h header is found in the system. Which should be the case with
+#   glibc or if argp-standalone is installed.
+
+pkg_setup() {
+	( use georeplication || use glupy ) && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	# build rpc-transport and xlators only once as shared libs
+	find rpc/rpc-transport xlators -name Makefile.am -print0 \
+		| xargs -0 sed -i -e 's|.*_la_LDFLAGS = .*|\0 -shared|'
+
+	autotools-utils_src_prepare
+}
+
+src_configure() {
+	local myeconfargs=(
+		--disable-dependency-tracking
+		--disable-silent-rules
+		--disable-fusermount
+		$(use_enable debug)
+		$(use_enable bd-xlator)
+		$(use_enable crypt-xlator)
+		$(use_enable fuse fuse-client)
+		$(use_enable georeplication)
+		$(use_enable glupy)
+		$(use_enable infiniband ibverbs)
+		$(use_enable qemu-block)
+		$(use_enable static-libs static)
+		$(use_enable syslog)
+		$(use_enable systemtap)
+		$(use_enable test cmocka)
+		$(use_enable tiering)
+		$(use_enable xml xml-output)
+		--docdir=/usr/share/doc/${PF}
+		--localstatedir=/var
+	)
+	autotools-utils_src_configure
+}
+
+src_compile() {
+	autotools-utils_src_compile
+
+	use emacs && elisp-compile extras/glusterfs-mode.el
+}
+
+src_install() {
+	autotools-utils_src_install
+
+	rm \
+		"${D}"/etc/glusterfs/glusterfs-{georep-,}logrotate \
+		"${D}"/etc/glusterfs/gluster-rsyslog-*.conf \
+		"${D}"/usr/share/doc/${PF}/glusterfs{-mode.el,.vim} || die "removing false files failed"
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/glusterfs.logrotate glusterfs
+
+	if use rsyslog ; then
+		insinto /etc/rsyslog.d
+		newins extras/gluster-rsyslog-7.2.conf 60-gluster.conf
+	fi
+
+	if use emacs ; then
+		elisp-install ${PN} extras/glusterfs-mode.el*
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+	fi
+
+	if use vim-syntax ; then
+		insinto /usr/share/vim/vimfiles/ftdetect; doins "${FILESDIR}"/${PN}.vim
+		insinto /usr/share/vim/vimfiles/syntax; doins extras/${PN}.vim
+	fi
+
+	# insert some other tools which might be useful
+	insinto /usr/share/glusterfs/scripts
+	doins \
+		extras/backend-{cleanup,xattr-sanitize}.sh \
+		extras/clear_xattrs.sh \
+		extras/migrate-unify-to-distribute.sh
+
+	# correct permissions on installed scripts
+	# fperms 0755 /usr/share/glusterfs/scripts/*.sh
+	chmod 0755 "${ED}"/usr/share/glusterfs/scripts/*.sh || die
+
+	if use georeplication ; then
+		# move the gsync-sync-gfid tool to a binary path
+		# and set a symlink to be compliant with all other distros
+		mv "${ED}"/usr/{share/glusterfs/scripts/gsync-sync-gfid,libexec/glusterfs/} || die
+		dosym ../../../libexec/glusterfs/gsync-sync-gfid /usr/share/glusterfs/scripts/gsync-sync-gfid
+	fi
+
+	newinitd "${FILESDIR}/${PN}-r1.initd" glusterfsd
+	newinitd "${FILESDIR}/glusterd-r2.initd" glusterd
+	newconfd "${FILESDIR}/${PN}.confd" glusterfsd
+
+	keepdir /var/log/${PN}
+	keepdir /var/lib/glusterd
+
+	# QA
+	rm -rf "${ED}/var/run/" || die
+	use static-libs || find "${ED}"/usr/$(get_libdir)/ -type f -name '*.la' -delete
+
+	use georeplication && python_fix_shebang "${ED}"
+
+	# upstream already has a patch ready, to be removed once available, http://review.gluster.org/#/c/9458/
+	echo "d /run/gluster 0755 root root -" > "${T}/gluster.tmpfiles" || die
+	systemd_newtmpfilesd "${T}/gluster.tmpfiles" gluster.conf
+}
+
+src_test() {
+	./run-tests.sh || die
+}
+
+pkg_postinst() {
+	elog "Starting with ${PN}-3.1.0, you can use the glusterd daemon to configure your"
+	elog "volumes dynamically. To do so, simply use the gluster CLI after running:"
+	elog "  /etc/init.d/glusterd start"
+	echo
+	elog "For static configurations, the glusterfsd startup script can be multiplexed."
+	elog "The default startup script uses /etc/conf.d/glusterfsd to configure the"
+	elog "separate service.  To create additional instances of the glusterfsd service"
+	elog "simply create a symlink to the glusterfsd startup script."
+	echo
+	elog "Example:"
+	elog "    # ln -s glusterfsd /etc/init.d/glusterfsd2"
+	elog "    # ${EDITOR} /etc/glusterfs/glusterfsd2.vol"
+	elog "You can now treat glusterfsd2 like any other service"
+	echo
+	ewarn "You need to use a ntp client to keep the clocks synchronized across all"
+	ewarn "of your servers. Setup a NTP synchronizing service before attempting to"
+	ewarn "run GlusterFS."
+
+	elog
+	elog "If you are upgrading from a previous version of ${PN}, please read:"
+	elog "  http://www.gluster.org/community/documentation/index.php/Upgrade_to_3.5"
+
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/sys-cluster/glusterfs/metadata.xml b/sys-cluster/glusterfs/metadata.xml
index 7ca776b6ff2c..f994b7843b52 100644
--- a/sys-cluster/glusterfs/metadata.xml
+++ b/sys-cluster/glusterfs/metadata.xml
@@ -17,5 +17,6 @@
     <flag name="rsyslog">Install configuration snippet for <pkg>app-admin/rsyslog</pkg></flag>
     <flag name="qemu-block">Transparently create files as QCow2/QED images in the backend, including the possibility to snapshot.</flag>
     <flag name="systemtap">Enable support for <pkg>dev-util/systemtap</pkg></flag>
+    <flag name="tiering">Enable support for data classification/tiering (requires <pkg>dev-db/sqlite:3</pkg>)</flag>
   </use>
 </pkgmetadata>
diff --git a/sys-cluster/neutron/files/CVE-2015-5240_2015.1.1.patch b/sys-cluster/neutron/files/CVE-2015-5240_2015.1.1.patch
new file mode 100644
index 000000000000..ccb2a66bce9b
--- /dev/null
+++ b/sys-cluster/neutron/files/CVE-2015-5240_2015.1.1.patch
@@ -0,0 +1,155 @@
+From 8138e2fe38ad2cde5963685df47b1e4286776352 Mon Sep 17 00:00:00 2001
+From: Kevin Benton <blak111@gmail.com>
+Date: Tue, 25 Aug 2015 22:03:27 -0700
+Subject: [PATCH] Stop device_owner from being set to 'network:*'
+
+This patch adjusts the FieldCheck class in the policy engine to
+allow a regex rule. It then leverages that to prevent users from
+setting the device_owner field to anything that starts with
+'network:' on networks which they do not own.
+
+This policy adjustment is necessary because any ports with a
+device_owner that starts with 'network:' will not have any security
+group rules applied because it is assumed they are trusted network
+devices (e.g. router ports, DHCP ports, etc). These security rules
+include the anti-spoofing protection for DHCP, IPv6 ICMP messages,
+and IP headers.
+
+Without this policy adjustment, tenants can abuse this trust when
+connected to a shared network with other tenants by setting their
+VM port's device_owner field to 'network:<anything>' and hijack other
+tenants' traffic via DHCP spoofing or MAC/IP spoofing.
+
+Closes-Bug: #1489111
+Change-Id: Ia64cf16142e0e4be44b5b0ed72c8e00792d770f9
+(cherry picked from commit 959a2f28cbbfc309381ea9ffb55090da6fb9c78f)
+---
+ etc/policy.json                   |  3 +++
+ neutron/api/v2/attributes.py      |  2 +-
+ neutron/policy.py                 |  3 +++
+ neutron/tests/etc/policy.json     |  3 +++
+ neutron/tests/unit/test_policy.py | 16 ++++++++++++++++
+ 5 files changed, 26 insertions(+), 1 deletion(-)
+
+diff --git a/etc/policy.json b/etc/policy.json
+index 8a5de9b..0f04eb2 100644
+--- a/etc/policy.json
++++ b/etc/policy.json
+@@ -46,7 +46,9 @@
+     "update_network:router:external": "rule:admin_only",
+     "delete_network": "rule:admin_or_owner",
+ 
++    "network_device": "field:port:device_owner=~^network:",
+     "create_port": "",
++    "create_port:device_owner": "not rule:network_device or rule:admin_or_network_owner or rule:context_is_advsvc",
+     "create_port:mac_address": "rule:admin_or_network_owner or rule:context_is_advsvc",
+     "create_port:fixed_ips": "rule:admin_or_network_owner or rule:context_is_advsvc",
+     "create_port:port_security_enabled": "rule:admin_or_network_owner or rule:context_is_advsvc",
+@@ -61,6 +63,7 @@
+     "get_port:binding:host_id": "rule:admin_only",
+     "get_port:binding:profile": "rule:admin_only",
+     "update_port": "rule:admin_or_owner or rule:context_is_advsvc",
++    "update_port:device_owner": "not rule:network_device or rule:admin_or_network_owner or rule:context_is_advsvc",
+     "update_port:mac_address": "rule:admin_only or rule:context_is_advsvc",
+     "update_port:fixed_ips": "rule:admin_or_network_owner or rule:context_is_advsvc",
+     "update_port:port_security_enabled": "rule:admin_or_network_owner or rule:context_is_advsvc",
+diff --git a/neutron/api/v2/attributes.py b/neutron/api/v2/attributes.py
+index b9c179a..9ceee78 100644
+--- a/neutron/api/v2/attributes.py
++++ b/neutron/api/v2/attributes.py
+@@ -766,7 +766,7 @@ RESOURCE_ATTRIBUTE_MAP = {
+                       'is_visible': True},
+         'device_owner': {'allow_post': True, 'allow_put': True,
+                          'validate': {'type:string': DEVICE_OWNER_MAX_LEN},
+-                         'default': '',
++                         'default': '', 'enforce_policy': True,
+                          'is_visible': True},
+         'tenant_id': {'allow_post': True, 'allow_put': False,
+                       'validate': {'type:string': TENANT_ID_MAX_LEN},
+diff --git a/neutron/policy.py b/neutron/policy.py
+index 9e586dd..961ae21 100644
+--- a/neutron/policy.py
++++ b/neutron/policy.py
+@@ -335,6 +335,7 @@ class FieldCheck(policy.Check):
+ 
+         self.field = field
+         self.value = conv_func(value)
++        self.regex = re.compile(value[1:]) if value.startswith('~') else None
+ 
+     def __call__(self, target_dict, cred_dict, enforcer):
+         target_value = target_dict.get(self.field)
+@@ -344,6 +345,8 @@ class FieldCheck(policy.Check):
+                       "%(target_dict)s",
+                       {'field': self.field, 'target_dict': target_dict})
+             return False
++        if self.regex:
++            return bool(self.regex.match(target_value))
+         return target_value == self.value
+ 
+ 
+diff --git a/neutron/tests/etc/policy.json b/neutron/tests/etc/policy.json
+index 8a5de9b..0f04eb2 100644
+--- a/neutron/tests/etc/policy.json
++++ b/neutron/tests/etc/policy.json
+@@ -46,7 +46,9 @@
+     "update_network:router:external": "rule:admin_only",
+     "delete_network": "rule:admin_or_owner",
+ 
++    "network_device": "field:port:device_owner=~^network:",
+     "create_port": "",
++    "create_port:device_owner": "not rule:network_device or rule:admin_or_network_owner or rule:context_is_advsvc",
+     "create_port:mac_address": "rule:admin_or_network_owner or rule:context_is_advsvc",
+     "create_port:fixed_ips": "rule:admin_or_network_owner or rule:context_is_advsvc",
+     "create_port:port_security_enabled": "rule:admin_or_network_owner or rule:context_is_advsvc",
+@@ -61,6 +63,7 @@
+     "get_port:binding:host_id": "rule:admin_only",
+     "get_port:binding:profile": "rule:admin_only",
+     "update_port": "rule:admin_or_owner or rule:context_is_advsvc",
++    "update_port:device_owner": "not rule:network_device or rule:admin_or_network_owner or rule:context_is_advsvc",
+     "update_port:mac_address": "rule:admin_only or rule:context_is_advsvc",
+     "update_port:fixed_ips": "rule:admin_or_network_owner or rule:context_is_advsvc",
+     "update_port:port_security_enabled": "rule:admin_or_network_owner or rule:context_is_advsvc",
+diff --git a/neutron/tests/unit/test_policy.py b/neutron/tests/unit/test_policy.py
+index 3888ce3..4be404f 100644
+--- a/neutron/tests/unit/test_policy.py
++++ b/neutron/tests/unit/test_policy.py
+@@ -232,6 +232,7 @@ class NeutronPolicyTestCase(base.BaseTestCase):
+             "regular_user": "role:user",
+             "shared": "field:networks:shared=True",
+             "external": "field:networks:router:external=True",
++            "network_device": "field:port:device_owner=~^network:",
+             "default": '@',
+ 
+             "create_network": "rule:admin_or_owner",
+@@ -243,6 +244,7 @@ class NeutronPolicyTestCase(base.BaseTestCase):
+             "create_subnet": "rule:admin_or_network_owner",
+             "create_port:mac": "rule:admin_or_network_owner or "
+                                "rule:context_is_advsvc",
++            "create_port:device_owner": "not rule:network_device",
+             "update_port": "rule:admin_or_owner or rule:context_is_advsvc",
+             "get_port": "rule:admin_or_owner or rule:context_is_advsvc",
+             "delete_port": "rule:admin_or_owner or rule:context_is_advsvc",
+@@ -312,6 +314,20 @@ class NeutronPolicyTestCase(base.BaseTestCase):
+         self._test_nonadmin_action_on_attr('create', 'shared', True,
+                                            common_policy.PolicyNotAuthorized)
+ 
++    def test_create_port_device_owner_regex(self):
++        blocked_values = ('network:', 'network:abdef', 'network:dhcp',
++                          'network:router_interface')
++        for val in blocked_values:
++            self._test_advsvc_action_on_attr(
++                'create', 'port', 'device_owner', val,
++                common_policy.PolicyNotAuthorized
++            )
++        ok_values = ('network', 'networks', 'my_network:test', 'my_network:')
++        for val in ok_values:
++            self._test_advsvc_action_on_attr(
++                'create', 'port', 'device_owner', val
++            )
++
+     def test_advsvc_get_network_works(self):
+         self._test_advsvc_action_on_attr('get', 'network', 'shared', False)
+ 
+-- 
+1.9.1
+
diff --git a/sys-cluster/neutron/files/cve-2015-3221_2015.1.0.patch b/sys-cluster/neutron/files/cve-2015-3221_2015.1.0.patch
deleted file mode 100644
index c6c2230c9bd3..000000000000
--- a/sys-cluster/neutron/files/cve-2015-3221_2015.1.0.patch
+++ /dev/null
@@ -1,127 +0,0 @@
-From e0c8cbc5dd610b4c580935ea56436495a6d4eb26 Mon Sep 17 00:00:00 2001
-From: Aaron Rosen <aaronorosen@gmail.com>
-Date: Wed, 3 Jun 2015 16:19:39 -0700
-Subject: [PATCH] Provide work around for 0.0.0.0/0 ::/0 for ipset
-
-Previously, the ipset_manager would pass in 0.0.0.0/0 or ::/0 if
-these addresses were inputted as allowed address pairs. This causes
-ipset to raise an error as it does not work with zero prefix sizes.
-To solve this problem we use two ipset rules to represent this:
-
-Ipv4: 0.0.0.0/1 and 128.0.0.1/1
-IPv6: ::/1' and '8000::/1
-
-All of this logic is handled via _sanitize_addresses() in the ipset_manager
-which is called to convert the input.
-
-Closes-bug: 1461054
-
-Conflicts:
-	neutron/agent/linux/ipset_manager.py
-	neutron/tests/unit/agent/linux/test_ipset_manager.py
-
-(cherry picked from commit 80a0fc3ba063e036b76e05e89b0cc54fc2d47c81)
----
- neutron/agent/linux/ipset_manager.py               | 23 ++++++++++++++++++++++
- .../tests/unit/agent/linux/test_ipset_manager.py   | 19 +++++++++++++++---
- 2 files changed, 39 insertions(+), 3 deletions(-)
-
-diff --git a/neutron/agent/linux/ipset_manager.py b/neutron/agent/linux/ipset_manager.py
-index 0f76418..af59f1f 100644
---- a/neutron/agent/linux/ipset_manager.py
-+++ b/neutron/agent/linux/ipset_manager.py
-@@ -11,6 +11,8 @@
- #    See the License for the specific language governing permissions and
- #    limitations under the License.
- 
-+import netaddr
-+
- from neutron.agent.linux import utils as linux_utils
- from neutron.common import utils
- 
-@@ -31,6 +33,26 @@ class IpsetManager(object):
-         self.namespace = namespace
-         self.ipset_sets = {}
- 
-+    def _sanitize_addresses(self, addresses):
-+        """This method converts any address to ipset format.
-+
-+        If an address has a mask of /0 we need to cover to it to a mask of
-+        /1 as ipset does not support /0 length addresses. Instead we use two
-+        /1's to represent the /0.
-+        """
-+        sanitized_addresses = []
-+        for ip in addresses:
-+            if (netaddr.IPNetwork(ip).prefixlen == 0):
-+                if(netaddr.IPNetwork(ip).version == 4):
-+                    sanitized_addresses.append('0.0.0.0/1')
-+                    sanitized_addresses.append('128.0.0.0/1')
-+                elif (netaddr.IPNetwork(ip).version == 6):
-+                    sanitized_addresses.append('::/1')
-+                    sanitized_addresses.append('8000::/1')
-+            else:
-+                sanitized_addresses.append(ip)
-+        return sanitized_addresses
-+
-     @staticmethod
-     def get_name(id, ethertype):
-         """Returns the given ipset name for an id+ethertype pair.
-@@ -51,6 +73,7 @@ class IpsetManager(object):
-         add / remove new members, or swapped atomically if
-         that's faster.
-         """
-+        member_ips = self._sanitize_addresses(member_ips)
-         set_name = self.get_name(id, ethertype)
-         if not self.set_exists(id, ethertype):
-             # The initial creation is handled with create/refresh to
-diff --git a/neutron/tests/unit/agent/linux/test_ipset_manager.py b/neutron/tests/unit/agent/linux/test_ipset_manager.py
-index 4484008..a1c6dc5 100644
---- a/neutron/tests/unit/agent/linux/test_ipset_manager.py
-+++ b/neutron/tests/unit/agent/linux/test_ipset_manager.py
-@@ -38,7 +38,7 @@ class BaseIpsetManagerTest(base.BaseTestCase):
-     def expect_set(self, addresses):
-         temp_input = ['create NETIPv4fake_sgid-new hash:net family inet']
-         temp_input.extend('add NETIPv4fake_sgid-new %s' % ip
--                          for ip in addresses)
-+                          for ip in self.ipset._sanitize_addresses(addresses))
-         input = '\n'.join(temp_input)
-         self.expected_calls.extend([
-             mock.call(['ipset', 'restore', '-exist'],
-@@ -55,13 +55,16 @@ class BaseIpsetManagerTest(base.BaseTestCase):
-         self.expected_calls.extend(
-             mock.call(['ipset', 'add', '-exist', TEST_SET_NAME, ip],
-                       process_input=None,
--                      run_as_root=True) for ip in addresses)
-+                      run_as_root=True)
-+            for ip in self.ipset._sanitize_addresses(addresses))
- 
-     def expect_del(self, addresses):
-+
-         self.expected_calls.extend(
-             mock.call(['ipset', 'del', TEST_SET_NAME, ip],
-                       process_input=None,
--                      run_as_root=True) for ip in addresses)
-+                      run_as_root=True)
-+            for ip in self.ipset._sanitize_addresses(addresses))
- 
-     def expect_create(self):
-         self.expected_calls.append(
-@@ -113,6 +116,16 @@ class IpsetManagerTestCase(BaseIpsetManagerTest):
-         self.ipset.set_members(TEST_SET_ID, ETHERTYPE, FAKE_IPS)
-         self.verify_mock_calls()
- 
-+    def test_set_members_adding_all_zero_ipv4(self):
-+        self.expect_set(['0.0.0.0/0'])
-+        self.ipset.set_members(TEST_SET_ID, ETHERTYPE, ['0.0.0.0/0'])
-+        self.verify_mock_calls()
-+
-+    def test_set_members_adding_all_zero_ipv6(self):
-+        self.expect_set(['::/0'])
-+        self.ipset.set_members(TEST_SET_ID, ETHERTYPE, ['::/0'])
-+        self.verify_mock_calls()
-+
-     def test_destroy(self):
-         self.add_first_ip()
-         self.expect_destroy()
--- 
-1.9.1
diff --git a/sys-cluster/neutron/neutron-2015.1.1-r1.ebuild b/sys-cluster/neutron/neutron-2015.1.1-r1.ebuild
new file mode 100644
index 000000000000..bf60b1a63cb5
--- /dev/null
+++ b/sys-cluster/neutron/neutron-2015.1.1-r1.ebuild
@@ -0,0 +1,253 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1 linux-info user
+
+DESCRIPTION="A virtual network service for Openstack"
+HOMEPAGE="https://launchpad.net/neutron"
+SRC_URI="https://launchpad.net/${PN}/kilo/${PV}/+download/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="compute-only dhcp doc ipv6 l3 metadata openvswitch linuxbridge server test sqlite mysql postgres"
+REQUIRED_USE="!compute-only? ( || ( mysql postgres sqlite ) )
+						compute-only? ( !mysql !postgres !sqlite !dhcp !l3 !metadata !server
+						|| ( openvswitch linuxbridge ) )"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/pbr-0.8[${PYTHON_USEDEP}]
+	<dev-python/pbr-1.0[${PYTHON_USEDEP}]
+	app-admin/sudo
+	test? (
+		${RDEPEND}
+		>=dev-python/hacking-0.10.0[${PYTHON_USEDEP}]
+		<dev-python/hacking-0.11[${PYTHON_USEDEP}]
+		>=dev-python/cliff-1.10.0[${PYTHON_USEDEP}]
+		<dev-python/cliff-1.11.0[${PYTHON_USEDEP}]
+		>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
+		>=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}]
+		<dev-python/fixtures-1.3.0[${PYTHON_USEDEP}]
+		>=dev-python/mock-1.0[${PYTHON_USEDEP}]
+		<dev-python/mock-1.1.0[${PYTHON_USEDEP}]
+		>=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
+		>=dev-python/requests-mock-0.6.0[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
+		!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
+		<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
+		>=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
+		<dev-python/oslo-sphinx-2.6.0[${PYTHON_USEDEP}]
+		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
+		>=dev-python/testtools-0.9.36[${PYTHON_USEDEP}]
+		!~dev-python/testtools-1.2.0[${PYTHON_USEDEP}]
+		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
+		>=dev-python/webtest-2.0[${PYTHON_USEDEP}]
+		>=dev-python/oslotest-1.5.1[${PYTHON_USEDEP}]
+		<dev-python/oslotest-1.6.0[${PYTHON_USEDEP}]
+		>=dev-python/tempest-lib-0.4.0[${PYTHON_USEDEP}]
+		<dev-python/tempest-lib-0.5.0[${PYTHON_USEDEP}]
+	)"
+
+RDEPEND="
+	dev-python/paste[${PYTHON_USEDEP}]
+	>=dev-python/pastedeploy-1.5.0-r1[${PYTHON_USEDEP}]
+	>=dev-python/routes-1.12.3[${PYTHON_USEDEP}]
+	!~dev-python/routes-2.0[${PYTHON_USEDEP}]
+	>=dev-python/eventlet-0.16.1[${PYTHON_USEDEP}]
+	!~dev-python/eventlet-0.17.0[${PYTHON_USEDEP}]
+	>=dev-python/greenlet-0.3.2[${PYTHON_USEDEP}]
+	>=dev-python/httplib2-0.7.5[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.2.0[${PYTHON_USEDEP}]
+	!~dev-python/requests-2.4.0[${PYTHON_USEDEP}]
+	dev-python/jsonrpclib[${PYTHON_USEDEP}]
+	>=dev-python/jinja-2.6[${PYTHON_USEDEP}]
+	>=dev-python/keystonemiddleware-1.5.0[${PYTHON_USEDEP}]
+	<dev-python/keystonemiddleware-1.6.0[${PYTHON_USEDEP}]
+	>=dev-python/netaddr-0.7.12[${PYTHON_USEDEP}]
+	>=dev-python/python-neutronclient-2.3.11[${PYTHON_USEDEP}]
+	<dev-python/python-neutronclient-2.5.0[${PYTHON_USEDEP}]
+	>=dev-python/retrying-1.2.3[${PYTHON_USEDEP}]
+	!~dev-python/retrying-1.3.0[${PYTHON_USEDEP}]
+	compute-only? (
+		>=dev-python/sqlalchemy-0.9.7[${PYTHON_USEDEP}]
+		<=dev-python/sqlalchemy-0.9.99[${PYTHON_USEDEP}]
+	)
+	sqlite? (
+		>=dev-python/sqlalchemy-0.9.7[sqlite,${PYTHON_USEDEP}]
+		<=dev-python/sqlalchemy-0.9.99[sqlite,${PYTHON_USEDEP}]
+	)
+	mysql? (
+		dev-python/mysql-python
+		>=dev-python/sqlalchemy-0.9.7[${PYTHON_USEDEP}]
+		<=dev-python/sqlalchemy-0.9.99[${PYTHON_USEDEP}]
+	)
+	postgres? (
+		dev-python/psycopg:2
+		>=dev-python/sqlalchemy-0.9.7[${PYTHON_USEDEP}]
+		<=dev-python/sqlalchemy-0.9.99[${PYTHON_USEDEP}]
+	)
+	>=dev-python/webob-1.2.3[${PYTHON_USEDEP}]
+	>=dev-python/python-keystoneclient-1.2.0[${PYTHON_USEDEP}]
+	<dev-python/python-keystoneclient-1.4.0[${PYTHON_USEDEP}]
+	>=dev-python/alembic-0.7.2[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-1.3.0[${PYTHON_USEDEP}]
+	<dev-python/stevedore-1.4.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-concurrency-1.8.0[${PYTHON_USEDEP}]
+	<dev-python/oslo-concurrency-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-config-1.9.3[${PYTHON_USEDEP}]
+	<dev-python/oslo-config-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-context-0.2.0[${PYTHON_USEDEP}]
+	<dev-python/oslo-context-0.3.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-db-1.7.0[${PYTHON_USEDEP}]
+	<dev-python/oslo-db-1.8.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-1.5.0[${PYTHON_USEDEP}]
+	<dev-python/oslo-i18n-1.6.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-log-1.0.0[${PYTHON_USEDEP}]
+	<dev-python/oslo-log-1.1.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-messaging-1.8.0[${PYTHON_USEDEP}]
+	<dev-python/oslo-messaging-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-middleware-1.0.0[${PYTHON_USEDEP}]
+	<dev-python/oslo-middleware-1.1.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-rootwrap-1.6.0[${PYTHON_USEDEP}]
+	<dev-python/oslo-rootwrap-1.7.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-serialization-1.4.0[${PYTHON_USEDEP}]
+	<dev-python/oslo-serialization-1.5.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-1.4.0[${PYTHON_USEDEP}]
+	<dev-python/oslo-utils-1.5.0[${PYTHON_USEDEP}]
+	>=dev-python/python-novaclient-2.22.0[${PYTHON_USEDEP}]
+	<dev-python/python-novaclient-2.24.0[${PYTHON_USEDEP}]
+	dev-python/pyudev[${PYTHON_USEDEP}]
+	sys-apps/iproute2
+	net-misc/bridge-utils
+	net-firewall/ipset
+	net-firewall/iptables
+	net-firewall/ebtables
+	openvswitch? ( net-misc/openvswitch )
+	ipv6? ( net-misc/radvd )
+	dhcp? ( net-dns/dnsmasq[dhcp-tools] )"
+
+PATCHES=(
+	"${FILESDIR}/CVE-2015-5240_2015.1.1.patch"
+)
+
+pkg_setup() {
+	linux-info_pkg_setup
+	CONFIG_CHECK_MODULES="VLAN_8021Q IP6_NF_FILTER IP6_NF_IPTABLES IP_NF_TARGET_REJECT \
+	IP_NF_MANGLE IP_NF_TARGET_MASQUERADE NF_NAT_IPV4 NF_CONNTRACK_IPV4 NF_DEFRAG_IPV4 \
+	NF_NAT_IPV4 NF_NAT NF_CONNTRACK IP_NF_FILTER IP_NF_IPTABLES NETFILTER_XTABLES"
+	if linux_config_exists; then
+		for module in ${CONFIG_CHECK_MODULES}; do
+			linux_chkconfig_present ${module} || ewarn "${module} needs to be enabled in kernel"
+		done
+	fi
+	enewgroup neutron
+	enewuser neutron -1 -1 /var/lib/neutron neutron
+}
+
+pkg_config() {
+	fperms 0700 /var/log/neutron
+	fowners neutron:neutron /var/log neutron
+}
+
+src_prepare() {
+	#it's /bin/ip not /sbin/ip
+	sed -i 's/sbin\/ip\,/bin\/ip\,/g' etc/neutron/rootwrap.d/*
+	distutils-r1_src_prepare
+}
+
+python_compile_all() {
+	use doc && make -C doc html
+}
+
+python_test() {
+	# https://bugs.launchpad.net/neutron/+bug/1234857
+	# https://bugs.launchpad.net/swift/+bug/1249727
+	# https://bugs.launchpad.net/neutron/+bug/1251657
+	# turn multiprocessing off, testr will use it --parallel
+	local DISTUTILS_NO_PARALLEL_BUILD=1
+	# Move tests out that attempt net connection, have failures
+	mv $(find . -name test_ovs_tunnel.py) . || die
+	sed -e 's:test_app_using_ipv6_and_ssl:_&:' \
+		-e 's:test_start_random_port_with_ipv6:_&:' \
+		-i neutron/tests/unit/test_wsgi.py || die
+	testr init
+	testr run --parallel || die "failed testsuite under python2.7"
+}
+
+python_install() {
+	distutils-r1_python_install
+	if use server; then
+		newinitd "${FILESDIR}/neutron.initd" "neutron-server"
+		newconfd "${FILESDIR}/neutron-server.confd" "neutron-server"
+		dosym /etc/neutron/plugin.ini /etc/neutron/plugins/ml2/ml2_conf.ini
+	fi
+	if use dhcp; then
+		newinitd "${FILESDIR}/neutron.initd" "neutron-dhcp-agent"
+		newconfd "${FILESDIR}/neutron-dhcp-agent.confd" "neutron-dhcp-agent"
+	fi
+	if use l3; then
+		newinitd "${FILESDIR}/neutron.initd" "neutron-l3-agent"
+		newconfd "${FILESDIR}/neutron-l3-agent.confd" "neutron-l3-agent"
+	fi
+	if use metadata; then
+		newinitd "${FILESDIR}/neutron.initd" "neutron-metadata-agent"
+		newconfd "${FILESDIR}/neutron-metadata-agent.confd" "neutron-metadata-agent"
+	fi
+	if use openvswitch; then
+		newinitd "${FILESDIR}/neutron.initd" "neutron-openvswitch-agent"
+		newconfd "${FILESDIR}/neutron-openvswitch-agent.confd" "neutron-openvswitch-agent"
+		newinitd "${FILESDIR}/neutron.initd" "neutron-ovs-cleanup"
+		newconfd "${FILESDIR}/neutron-openvswitch-agent.confd" "neutron-ovs-cleanup"
+	fi
+	if use linuxbridge; then
+		newinitd "${FILESDIR}/neutron.initd" "neutron-linuxbridge-agent"
+		newconfd "${FILESDIR}/neutron-linuxbridge-agent.confd" "neutron-linuxbridge-agent"
+	fi
+	diropts -m 755 -o neutron -g neutron
+	dodir /var/log/neutron /var/lib/neutron
+	keepdir /etc/neutron
+	insinto /etc/neutron
+	insopts -m 0640 -o neutron -g neutron
+
+	doins etc/*
+	# stupid renames
+	rm "${D}etc/neutron/quantum"
+	insinto /etc/neutron
+	doins -r "etc/neutron/plugins"
+	insopts -m 0640 -o root -g root
+	doins "etc/rootwrap.conf"
+	doins -r "etc/neutron/rootwrap.d"
+
+	insopts -m 0644
+	insinto "/usr/lib64/python2.7/site-packages/neutron/db/migration/alembic_migrations/"
+	doins -r "neutron/db/migration/alembic_migrations/versions"
+
+	#add sudoers definitions for user neutron
+	insinto /etc/sudoers.d/
+	insopts -m 0440 -o root -g root
+	newins "${FILESDIR}/neutron.sudoersd" neutron
+
+	#remove superfluous stuff
+	rm -R "${D}/usr/etc/"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/build/html/. )
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	elog
+	elog "neutron-server's conf.d file may need updating to include additional ini files"
+	elog "We currently assume the ml2 plugin will be used but do not make assumptions"
+	elog "on if you will use openvswitch or linuxbridge (or something else)"
+	elog
+	elog "Other conf.d files may need updating too, but should be good for the default use case"
+	elog
+}
diff --git a/sys-cluster/neutron/neutron-2015.1.1.ebuild b/sys-cluster/neutron/neutron-2015.1.1.ebuild
deleted file mode 100644
index 826b55e7a5d7..000000000000
--- a/sys-cluster/neutron/neutron-2015.1.1.ebuild
+++ /dev/null
@@ -1,252 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 linux-info user
-
-DESCRIPTION="A virtual network service for Openstack"
-HOMEPAGE="https://launchpad.net/neutron"
-SRC_URI="https://launchpad.net/${PN}/kilo/${PV}/+download/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="compute-only dhcp doc l3 metadata openvswitch linuxbridge server test sqlite mysql postgres"
-REQUIRED_USE="!compute-only? ( || ( mysql postgres sqlite ) )
-						compute-only? ( !mysql !postgres !sqlite !dhcp !l3 !metadata !server
-						|| ( openvswitch linuxbridge ) )"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/pbr-0.8[${PYTHON_USEDEP}]
-	<dev-python/pbr-1.0[${PYTHON_USEDEP}]
-	app-admin/sudo
-	test? (
-		${RDEPEND}
-		>=dev-python/hacking-0.10.0[${PYTHON_USEDEP}]
-		<dev-python/hacking-0.11[${PYTHON_USEDEP}]
-		>=dev-python/cliff-1.10.0[${PYTHON_USEDEP}]
-		<dev-python/cliff-1.11.0[${PYTHON_USEDEP}]
-		>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
-		>=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}]
-		<dev-python/fixtures-1.3.0[${PYTHON_USEDEP}]
-		>=dev-python/mock-1.0[${PYTHON_USEDEP}]
-		<dev-python/mock-1.1.0[${PYTHON_USEDEP}]
-		>=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/requests-mock-0.6.0[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
-		!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
-		<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
-		>=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
-		<dev-python/oslo-sphinx-2.6.0[${PYTHON_USEDEP}]
-		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testtools-0.9.36[${PYTHON_USEDEP}]
-		!~dev-python/testtools-1.2.0[${PYTHON_USEDEP}]
-		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-		>=dev-python/webtest-2.0[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-1.5.1[${PYTHON_USEDEP}]
-		<dev-python/oslotest-1.6.0[${PYTHON_USEDEP}]
-		>=dev-python/tempest-lib-0.4.0[${PYTHON_USEDEP}]
-		<dev-python/tempest-lib-0.5.0[${PYTHON_USEDEP}]
-	)"
-
-RDEPEND="
-	dev-python/paste[${PYTHON_USEDEP}]
-	>=dev-python/pastedeploy-1.5.0-r1[${PYTHON_USEDEP}]
-	>=dev-python/routes-1.12.3[${PYTHON_USEDEP}]
-	!~dev-python/routes-2.0[${PYTHON_USEDEP}]
-	>=dev-python/eventlet-0.16.1[${PYTHON_USEDEP}]
-	!~dev-python/eventlet-0.17.0[${PYTHON_USEDEP}]
-	>=dev-python/greenlet-0.3.2[${PYTHON_USEDEP}]
-	>=dev-python/httplib2-0.7.5[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.2.0[${PYTHON_USEDEP}]
-	!~dev-python/requests-2.4.0[${PYTHON_USEDEP}]
-	dev-python/jsonrpclib[${PYTHON_USEDEP}]
-	>=dev-python/jinja-2.6[${PYTHON_USEDEP}]
-	>=dev-python/keystonemiddleware-1.5.0[${PYTHON_USEDEP}]
-	<dev-python/keystonemiddleware-1.6.0[${PYTHON_USEDEP}]
-	>=dev-python/netaddr-0.7.12[${PYTHON_USEDEP}]
-	>=dev-python/python-neutronclient-2.3.11[${PYTHON_USEDEP}]
-	<dev-python/python-neutronclient-2.5.0[${PYTHON_USEDEP}]
-	>=dev-python/retrying-1.2.3[${PYTHON_USEDEP}]
-	!~dev-python/retrying-1.3.0[${PYTHON_USEDEP}]
-	compute-only? (
-		>=dev-python/sqlalchemy-0.9.7[${PYTHON_USEDEP}]
-		<=dev-python/sqlalchemy-0.9.99[${PYTHON_USEDEP}]
-	)
-	sqlite? (
-		>=dev-python/sqlalchemy-0.9.7[sqlite,${PYTHON_USEDEP}]
-		<=dev-python/sqlalchemy-0.9.99[sqlite,${PYTHON_USEDEP}]
-	)
-	mysql? (
-		dev-python/mysql-python
-		>=dev-python/sqlalchemy-0.9.7[${PYTHON_USEDEP}]
-		<=dev-python/sqlalchemy-0.9.99[${PYTHON_USEDEP}]
-	)
-	postgres? (
-		dev-python/psycopg:2
-		>=dev-python/sqlalchemy-0.9.7[${PYTHON_USEDEP}]
-		<=dev-python/sqlalchemy-0.9.99[${PYTHON_USEDEP}]
-	)
-	>=dev-python/webob-1.2.3[${PYTHON_USEDEP}]
-	>=dev-python/python-keystoneclient-1.2.0[${PYTHON_USEDEP}]
-	<dev-python/python-keystoneclient-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/alembic-0.7.2[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.3.0[${PYTHON_USEDEP}]
-	<dev-python/stevedore-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-concurrency-1.8.0[${PYTHON_USEDEP}]
-	<dev-python/oslo-concurrency-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-1.9.3[${PYTHON_USEDEP}]
-	<dev-python/oslo-config-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-context-0.2.0[${PYTHON_USEDEP}]
-	<dev-python/oslo-context-0.3.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-db-1.7.0[${PYTHON_USEDEP}]
-	<dev-python/oslo-db-1.8.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-1.5.0[${PYTHON_USEDEP}]
-	<dev-python/oslo-i18n-1.6.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-log-1.0.0[${PYTHON_USEDEP}]
-	<dev-python/oslo-log-1.1.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-messaging-1.8.0[${PYTHON_USEDEP}]
-	<dev-python/oslo-messaging-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-middleware-1.0.0[${PYTHON_USEDEP}]
-	<dev-python/oslo-middleware-1.1.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-rootwrap-1.6.0[${PYTHON_USEDEP}]
-	<dev-python/oslo-rootwrap-1.7.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-1.4.0[${PYTHON_USEDEP}]
-	<dev-python/oslo-serialization-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-1.4.0[${PYTHON_USEDEP}]
-	<dev-python/oslo-utils-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/python-novaclient-2.22.0[${PYTHON_USEDEP}]
-	<dev-python/python-novaclient-2.24.0[${PYTHON_USEDEP}]
-	dev-python/pyudev[${PYTHON_USEDEP}]
-	sys-apps/iproute2
-	net-misc/bridge-utils
-	net-firewall/ipset
-	net-firewall/iptables
-	net-firewall/ebtables
-	openvswitch? ( net-misc/openvswitch )
-	dhcp? ( net-dns/dnsmasq[dhcp-tools] )"
-
-PATCHES=(
-
-)
-
-pkg_setup() {
-	linux-info_pkg_setup
-	CONFIG_CHECK_MODULES="VLAN_8021Q IP6_NF_FILTER IP6_NF_IPTABLES IP_NF_TARGET_REJECT \
-	IP_NF_MANGLE IP_NF_TARGET_MASQUERADE NF_NAT_IPV4 NF_CONNTRACK_IPV4 NF_DEFRAG_IPV4 \
-	NF_NAT_IPV4 NF_NAT NF_CONNTRACK IP_NF_FILTER IP_NF_IPTABLES NETFILTER_XTABLES"
-	if linux_config_exists; then
-		for module in ${CONFIG_CHECK_MODULES}; do
-			linux_chkconfig_present ${module} || ewarn "${module} needs to be enabled in kernel"
-		done
-	fi
-	enewgroup neutron
-	enewuser neutron -1 -1 /var/lib/neutron neutron
-}
-
-pkg_config() {
-	fperms 0700 /var/log/neutron
-	fowners neutron:neutron /var/log neutron
-}
-
-src_prepare() {
-	#it's /bin/ip not /sbin/ip
-	sed -i 's/sbin\/ip\,/bin\/ip\,/g' etc/neutron/rootwrap.d/*
-	distutils-r1_src_prepare
-}
-
-python_compile_all() {
-	use doc && make -C doc html
-}
-
-python_test() {
-	# https://bugs.launchpad.net/neutron/+bug/1234857
-	# https://bugs.launchpad.net/swift/+bug/1249727
-	# https://bugs.launchpad.net/neutron/+bug/1251657
-	# turn multiprocessing off, testr will use it --parallel
-	local DISTUTILS_NO_PARALLEL_BUILD=1
-	# Move tests out that attempt net connection, have failures
-	mv $(find . -name test_ovs_tunnel.py) . || die
-	sed -e 's:test_app_using_ipv6_and_ssl:_&:' \
-		-e 's:test_start_random_port_with_ipv6:_&:' \
-		-i neutron/tests/unit/test_wsgi.py || die
-	testr init
-	testr run --parallel || die "failed testsuite under python2.7"
-}
-
-python_install() {
-	distutils-r1_python_install
-	if use server; then
-		newinitd "${FILESDIR}/neutron.initd" "neutron-server"
-		newconfd "${FILESDIR}/neutron-server.confd" "neutron-server"
-		dosym /etc/neutron/plugin.ini /etc/neutron/plugins/ml2/ml2_conf.ini
-	fi
-	if use dhcp; then
-		newinitd "${FILESDIR}/neutron.initd" "neutron-dhcp-agent"
-		newconfd "${FILESDIR}/neutron-dhcp-agent.confd" "neutron-dhcp-agent"
-	fi
-	if use l3; then
-		newinitd "${FILESDIR}/neutron.initd" "neutron-l3-agent"
-		newconfd "${FILESDIR}/neutron-l3-agent.confd" "neutron-l3-agent"
-	fi
-	if use metadata; then
-		newinitd "${FILESDIR}/neutron.initd" "neutron-metadata-agent"
-		newconfd "${FILESDIR}/neutron-metadata-agent.confd" "neutron-metadata-agent"
-	fi
-	if use openvswitch; then
-		newinitd "${FILESDIR}/neutron.initd" "neutron-openvswitch-agent"
-		newconfd "${FILESDIR}/neutron-openvswitch-agent.confd" "neutron-openvswitch-agent"
-		newinitd "${FILESDIR}/neutron.initd" "neutron-ovs-cleanup"
-		newconfd "${FILESDIR}/neutron-openvswitch-agent.confd" "neutron-ovs-cleanup"
-	fi
-	if use linuxbridge; then
-		newinitd "${FILESDIR}/neutron.initd" "neutron-linuxbridge-agent"
-		newconfd "${FILESDIR}/neutron-linuxbridge-agent.confd" "neutron-linuxbridge-agent"
-	fi
-	diropts -m 755 -o neutron -g neutron
-	dodir /var/log/neutron /var/lib/neutron
-	keepdir /etc/neutron
-	insinto /etc/neutron
-	insopts -m 0640 -o neutron -g neutron
-
-	doins etc/*
-	# stupid renames
-	rm "${D}etc/neutron/quantum"
-	insinto /etc/neutron
-	doins -r "etc/neutron/plugins"
-	insopts -m 0640 -o root -g root
-	doins "etc/rootwrap.conf"
-	doins -r "etc/neutron/rootwrap.d"
-
-	insopts -m 0644
-	insinto "/usr/lib64/python2.7/site-packages/neutron/db/migration/alembic_migrations/"
-	doins -r "neutron/db/migration/alembic_migrations/versions"
-
-	#add sudoers definitions for user neutron
-	insinto /etc/sudoers.d/
-	insopts -m 0440 -o root -g root
-	newins "${FILESDIR}/neutron.sudoersd" neutron
-
-	#remove superfluous stuff
-	rm -R "${D}/usr/etc/"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/build/html/. )
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	elog
-	elog "neutron-server's conf.d file may need updating to include additional ini files"
-	elog "We currently assume the ml2 plugin will be used but do not make assumptions"
-	elog "on if you will use openvswitch or linuxbridge (or something else)"
-	elog
-	elog "Other conf.d files may need updating too, but should be good for the default use case"
-	elog
-}
diff --git a/sys-cluster/neutron/neutron-2015.1.9999.ebuild b/sys-cluster/neutron/neutron-2015.1.9999.ebuild
index 70e1e43e5b51..0c103b718b37 100644
--- a/sys-cluster/neutron/neutron-2015.1.9999.ebuild
+++ b/sys-cluster/neutron/neutron-2015.1.9999.ebuild
@@ -15,7 +15,7 @@ EGIT_BRANCH="stable/kilo"
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS=""
-IUSE="compute-only dhcp doc l3 metadata openvswitch linuxbridge server test sqlite mysql postgres"
+IUSE="compute-only dhcp doc ipv6 l3 metadata openvswitch linuxbridge server test sqlite mysql postgres"
 REQUIRED_USE="!compute-only? ( || ( mysql postgres sqlite ) )
 						compute-only? ( !mysql !postgres !sqlite !dhcp !l3 !metadata !server
 						|| ( openvswitch linuxbridge ) )"
@@ -130,6 +130,7 @@ RDEPEND="
 	net-firewall/iptables
 	net-firewall/ebtables
 	openvswitch? ( net-misc/openvswitch )
+	ipv6? ( net-misc/radvd )
 	dhcp? ( net-dns/dnsmasq[dhcp-tools] )"
 
 PATCHES=(
diff --git a/sys-cluster/openstack-meta/openstack-meta-2014.2.9999.ebuild b/sys-cluster/openstack-meta/openstack-meta-2014.2.9999.ebuild
deleted file mode 100644
index 48f79a3532ce..000000000000
--- a/sys-cluster/openstack-meta/openstack-meta-2014.2.9999.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-DESCRIPTION="A openstack meta-package for installing the various openstack pieces"
-HOMEPAGE="https://openstack.org"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS=""
-IUSE="keystone swift neutron glance cinder nova"
-
-DEPEND=""
-RDEPEND="keystone? ( ~sys-auth/keystone-2014.2.9999 )
-		swift? ( ~sys-cluster/swift-2.2.2 )
-		neutron? ( ~sys-cluster/neutron-2014.2.9999 )
-		glance? ( ~app-admin/glance-2014.2.9999 )
-		cinder? ( ~sys-cluster/cinder-2014.2.9999 )
-		nova? ( ~sys-cluster/nova-2014.2.9999 )"
diff --git a/sys-cluster/swift/Manifest b/sys-cluster/swift/Manifest
index 52acb519068d..5f51ec96f144 100644
--- a/sys-cluster/swift/Manifest
+++ b/sys-cluster/swift/Manifest
@@ -1 +1,2 @@
 DIST swift-2.3.0.tar.gz 1346492 SHA256 7225061f92597e7eaf6196c9336c5e590c7626b7e84126c51e8ca5bf5b7bdae1 SHA512 cf8e1e640f1f679516ce1af772c93f860d7d1f1b6712fa9b89dda1688a4b02cd3fdadc443f4911be5927544f0cffe365ff4174ef6e44d118cb56c7b05cd630b9 WHIRLPOOL aade05a7b8f23e680aa932150e8edbc2e9b6bb83528ffa62becdf4d29c8597b20e873017c3c6a95e66448c13c60531abee6ed0bd9b524b6319642c0436ad5e4c
+DIST swift-2.4.0.tar.gz 1418193 SHA256 082b436e58684b5cf7682a175e56c3d7dbd24d72c0251ddf3074a8596e4abd40 SHA512 f4ac4f0f866106d2c2bb8f38c0c3810efebf47738c000488041722250745e4d3f4d4a4c710388021c1cc44b6b372a5f6fd03fe9670e005345669bf6199e6e311 WHIRLPOOL e3293d304a8a52146efa04d7fadd0ab11fed5d62127e1757b8701452719fa2839dbfe7a452e0677071c78eb32b832a732c978f6229b8c927c76632df4df44990
diff --git a/sys-cluster/swift/swift-2.4.0.ebuild b/sys-cluster/swift/swift-2.4.0.ebuild
new file mode 100644
index 000000000000..e8772d4eb126
--- /dev/null
+++ b/sys-cluster/swift/swift-2.4.0.ebuild
@@ -0,0 +1,123 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1 eutils linux-info user
+
+DESCRIPTION="A highly available, distributed, and eventually consistent object/blob store"
+HOMEPAGE="https://launchpad.net/swift"
+SRC_URI="https://launchpad.net/${PN}/liberty/${PV}/+download/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="proxy account container object test +memcached"
+REQUIRED_USE="|| ( proxy account container object )"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/pbr-0.8.0[${PYTHON_USEDEP}]
+	<dev-python/pbr-1.0[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		dev-python/coverage[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/nosexcover[${PYTHON_USEDEP}]
+		dev-python/nosehtmloutput[${PYTHON_USEDEP}]
+		dev-python/oslo-sphinx[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
+		<dev-python/sphinx-1.2[${PYTHON_USEDEP}]
+		>=dev-python/mock-1.0[${PYTHON_USEDEP}]
+		dev-python/python-swiftclient[${PYTHON_USEDEP}]
+		>=dev-python/python-keystoneclient-1.3.0[${PYTHON_USEDEP}]
+		>=dev-python/bandit-0.10.1[${PYTHON_USEDEP}]
+	)"
+
+RDEPEND="
+	>=dev-python/dnspython-1.9.4[${PYTHON_USEDEP}]
+	>=dev-python/eventlet-0.16.1[${PYTHON_USEDEP}]
+	!~dev-python/eventlet-0.17.0[${PYTHON_USEDEP}]
+	>=dev-python/greenlet-0.3.1[${PYTHON_USEDEP}]
+	>=dev-python/netifaces-0.5[${PYTHON_USEDEP}]
+	!~dev-python/netifaces-0.10.0[${PYTHON_USEDEP}]
+	!~dev-python/netifaces-0.10.1[${PYTHON_USEDEP}]
+	>=dev-python/pastedeploy-1.3.3[${PYTHON_USEDEP}]
+	>=dev-python/simplejson-2.0.9[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	dev-python/pyxattr[${PYTHON_USEDEP}]
+	~dev-python/PyECLib-1.0.7[${PYTHON_USEDEP}]
+	memcached? ( net-misc/memcached )
+	net-misc/rsync[xattr]"
+
+CONFIG_CHECK="~EXT3_FS_XATTR ~SQUASHFS_XATTR ~CIFS_XATTR ~JFFS2_FS_XATTR
+~TMPFS_XATTR ~UBIFS_FS_XATTR ~EXT2_FS_XATTR ~REISERFS_FS_XATTR ~EXT4_FS_XATTR
+~ZFS"
+
+PATCHES=(
+)
+
+pkg_setup() {
+	enewuser swift
+	enewgroup swift
+}
+
+src_prepare() {
+	sed -i 's/xattr/pyxattr/g' swift.egg-info/requires.txt || die
+	sed -i 's/xattr/pyxattr/g' requirements.txt || die
+	sed -i '/^hacking/d' test-requirements.txt || die
+	distutils-r1_python_prepare_all
+}
+
+src_test () {
+	# https://bugs.launchpad.net/swift/+bug/1249727
+	find . \( -name test_wsgi.py -o -name test_locale.py -o -name test_utils.py \) -delete || die
+	SKIP_PIP_INSTALL=1 PBR_VERSION=0.6.0 sh .unittests || die
+}
+
+python_install() {
+	distutils-r1_python_install
+	keepdir /etc/swift
+	insinto /etc/swift
+
+	newins "etc/swift.conf-sample" "swift.conf"
+	newins "etc/rsyncd.conf-sample" "rsyncd.conf"
+	newins "etc/mime.types-sample" "mime.types-sample"
+	newins "etc/memcache.conf-sample" "memcache.conf-sample"
+	newins "etc/drive-audit.conf-sample" "drive-audit.conf-sample"
+	newins "etc/dispersion.conf-sample" "dispersion.conf-sample"
+
+	if use proxy; then
+		newinitd "${FILESDIR}/swift-proxy.initd" "swift-proxy"
+		newins "etc/proxy-server.conf-sample" "proxy-server.conf"
+		if use memcached; then
+			sed -i '/depend/a\
+    need memcached' "${D}/etc/init.d/swift-proxy"
+		fi
+	fi
+	if use account; then
+		newinitd "${FILESDIR}/swift-account.initd" "swift-account"
+		newins "etc/account-server.conf-sample" "account-server.conf"
+	fi
+	if use container; then
+		newinitd "${FILESDIR}/swift-container.initd" "swift-container"
+		newins "etc/container-server.conf-sample" "container-server.conf"
+	fi
+	if use object; then
+		newinitd "${FILESDIR}/swift-object.initd" "swift-object"
+		newins "etc/object-server.conf-sample" "object-server.conf"
+		newins "etc/object-expirer.conf-sample" "object-expirer.conf"
+	fi
+
+	fowners swift:swift "/etc/swift" || die "fowners failed"
+}
+
+pkg_postinst() {
+	elog "Openstack swift will default to using insecure http unless a"
+	elog "certificate is created in /etc/swift/cert.crt and the associated key"
+	elog "in /etc/swift/cert.key.  These can be created with the following:"
+	elog "  * cd /etc/swift"
+	elog "  * openssl req -new -x509 -nodes -out cert.crt -keyout cert.key"
+}
diff --git a/sys-cluster/util-vserver/util-vserver-0.30.216_pre3120.ebuild b/sys-cluster/util-vserver/util-vserver-0.30.216_pre3120.ebuild
index 84f7ca5c4842..6a706d80af5b 100644
--- a/sys-cluster/util-vserver/util-vserver-0.30.216_pre3120.ebuild
+++ b/sys-cluster/util-vserver/util-vserver-0.30.216_pre3120.ebuild
@@ -15,7 +15,7 @@ SRC_URI="http://people.linux-vserver.org/~dhozac/t/uv-testing/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~sparc x86"
 
 IUSE=""
 
diff --git a/sys-devel/gdb/gdb-7.9.1.ebuild b/sys-devel/gdb/gdb-7.9.1.ebuild
index 39fb296344a8..727fcdeed93f 100644
--- a/sys-devel/gdb/gdb-7.9.1.ebuild
+++ b/sys-devel/gdb/gdb-7.9.1.ebuild
@@ -57,7 +57,7 @@ SRC_URI="${SRC_URI} ${PATCH_VER:+mirror://gentoo/${P}-patches-${PATCH_VER}.tar.x
 LICENSE="GPL-2 LGPL-2"
 SLOT="0"
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 IUSE="+client expat lzma multitarget nls +python +server test vanilla zlib"
 REQUIRED_USE="
diff --git a/sys-devel/gettext/Manifest b/sys-devel/gettext/Manifest
index caeed8c20afd..b343363fe105 100644
--- a/sys-devel/gettext/Manifest
+++ b/sys-devel/gettext/Manifest
@@ -1,3 +1,4 @@
 DIST gettext-0.19.4.tar.gz 17717034 SHA256 8ac9f1ed1a5f8c4e656a2f37f5ba6b9ee04c4df79a575e876b0b6946aa417f3f SHA512 274e00fe0149468e3073562f8f3b292597e9dbd82dfe8d068e4a1983914d25b603bb26f3fa4aa10e9fcd65826e3552c1871218342270927481e95eb64288ad97 WHIRLPOOL 2eb56c47d76f63b6557ae825538a35ae59f3f77da35321688547d9c420f47879c79ca1ab8ebd6bc6b4a3a8ce59ed620648884cd46455f6218213587f76967918
 DIST gettext-0.19.5.1.tar.gz 18353792 SHA256 a198d53b0c1fb11421ead197b7e76b144e887c9ef5a685323e92cbc950227731 SHA512 c2c1dc51d9c24c92b86619ec613b87266eae08a21280855e5b0d44c09e7efc8390341ded85dd85270c5a933ee21a6179373cc5cf275b6bc80cb510c7830d0ef4 WHIRLPOOL 2a2143edc4f3fdb37109aeb762072aa49f88045d55913ae282d203d5a7b3e848df5318c9e4f5e44f63a9f9a7c61c6018900df55b3bdfe06fa975a709322656d6
 DIST gettext-0.19.5.tar.gz 18352722 SHA256 1258814ba174e4783194be2dc93648bd630d4dda166eae034e4ad54489dcf73a SHA512 10b435bba4fcdcf15be3182b3c9756eef5b6ef6ec1416c1b12af35345fc1668c26dce81081e2616b7e2b0d174051fddd6fe6266e4709652a751a91fcf241e610 WHIRLPOOL 94db59cc7a1f3bf833e23a9c9aa25524c571b9585928d083438e7357d034236493584c0137f0c2bb58120f2e55f35055bc36731736162d9ad3e01aa6a1cf270e
+DIST gettext-0.19.6.tar.gz 18619659 SHA256 ed4b4c19bd3a3034eb6769500a3592ff616759ef43cf30586dbb7a17c9dd695d SHA512 46adfd4a6d0038aba999658bebe51117e3ab3dc149a9054c1087d3e79ec7ba3371a7e78a8ca30a8872d162c2dc44aba6e67e4d64808c4f92e1e2bd674174f1db WHIRLPOOL 1988f9ddfd603734b4a632291925c8e5b31e7384eea1c6641d52aa58cb6b8f892e7664dd145a53435b7d2a4540ac65aeae1cb528a004c35832087c2820dafbcb
diff --git a/sys-devel/gettext/gettext-0.19.6.ebuild b/sys-devel/gettext/gettext-0.19.6.ebuild
new file mode 100644
index 000000000000..c024c12229fe
--- /dev/null
+++ b/sys-devel/gettext/gettext-0.19.6.ebuild
@@ -0,0 +1,143 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+
+inherit flag-o-matic eutils multilib toolchain-funcs mono-env libtool java-pkg-opt-2 multilib-minimal
+
+DESCRIPTION="GNU locale utilities"
+HOMEPAGE="https://www.gnu.org/software/gettext/"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3 LGPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+IUSE="acl -cvs doc emacs git java nls +cxx ncurses openmp static-libs elibc_glibc elibc_musl"
+
+# only runtime goes multilib
+DEPEND=">=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
+	dev-libs/libxml2
+	dev-libs/expat
+	acl? ( virtual/acl )
+	ncurses? ( sys-libs/ncurses )
+	java? ( >=virtual/jdk-1.4 )"
+RDEPEND="${DEPEND}
+	!git? ( cvs? ( dev-vcs/cvs ) )
+	git? ( dev-vcs/git )
+	java? ( >=virtual/jre-1.4 )
+	abi_x86_32? (
+		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
+		!<=app-emulation/emul-linux-x86-baselibs-20131008-r11
+	)"
+PDEPEND="emacs? ( app-emacs/po-mode )"
+
+MULTILIB_WRAPPED_HEADERS=(
+	# only installed for native ABI
+	/usr/include/gettext-po.h
+)
+
+src_prepare() {
+	java-pkg-opt-2_src_prepare
+
+	epunt_cxx
+	elibtoolize
+}
+
+multilib_src_configure() {
+	local myconf=(
+		# switches common to runtime and top-level
+		--cache-file="${BUILD_DIR}"/config.cache
+		--docdir="/usr/share/doc/${PF}"
+
+		$(use_enable cxx libasprintf)
+		$(use_enable java)
+		$(use_enable static-libs static)
+	)
+
+	# Build with --without-included-gettext (on glibc systems)
+	if use elibc_glibc || use elibc_musl ; then
+		myconf+=(
+			--without-included-gettext
+			$(use_enable nls)
+		)
+	else
+		myconf+=(
+			--with-included-gettext
+			--enable-nls
+		)
+	fi
+	use cxx || export CXX=$(tc-getCC)
+
+	# Should be able to drop this hack in next release. #333887
+	tc-is-cross-compiler && export gl_cv_func_working_acl_get_file=yes
+
+	local ECONF_SOURCE=${S}
+	if ! multilib_is_native_abi ; then
+		# for non-native ABIs, we build runtime only
+		ECONF_SOURCE+=/gettext-runtime
+	else
+		# remaining switches
+		myconf+=(
+			# Emacs support is now in a separate package
+			--without-emacs
+			--without-lispdir
+			# glib depends on us so avoid circular deps
+			--with-included-glib
+			# libcroco depends on glib which ... ^^^
+			--with-included-libcroco
+			# this will _disable_ libunistring (since it is not bundled),
+			# see bug #326477
+			--with-included-libunistring
+
+			$(use_enable acl)
+			$(use_enable ncurses curses)
+			$(use_enable openmp)
+			$(use_with git)
+			$(usex git --without-cvs $(use_with cvs))
+		)
+	fi
+
+	econf "${myconf[@]}"
+}
+
+multilib_src_install() {
+	default
+
+	if multilib_is_native_abi ; then
+		dosym msgfmt /usr/bin/gmsgfmt #43435
+		dobin gettext-tools/misc/gettextize
+
+		[[ ${USERLAND} == "BSD" ]] && gen_usr_ldscript -a intl
+	fi
+}
+
+multilib_src_install_all() {
+	use nls || rm -r "${D}"/usr/share/locale
+	use static-libs || prune_libtool_files --all
+
+	rm -f "${D}"/usr/share/locale/locale.alias "${D}"/usr/lib/charset.alias
+
+	if use java ; then
+		java-pkg_dojar "${D}"/usr/share/${PN}/*.jar
+		rm -f "${D}"/usr/share/${PN}/*.jar
+		rm -f "${D}"/usr/share/${PN}/*.class
+		if use doc ; then
+			java-pkg_dojavadoc "${D}"/usr/share/doc/${PF}/javadoc2
+			rm -rf "${D}"/usr/share/doc/${PF}/javadoc2
+		fi
+	fi
+
+	if use doc ; then
+		dohtml "${D}"/usr/share/doc/${PF}/*.html
+	else
+		rm -rf "${D}"/usr/share/doc/${PF}/{csharpdoc,examples,javadoc2,javadoc1}
+	fi
+	rm -f "${D}"/usr/share/doc/${PF}/*.html
+
+	dodoc AUTHORS ChangeLog NEWS README THANKS
+}
+
+pkg_preinst() {
+	java-pkg-opt-2_pkg_preinst
+}
diff --git a/sys-devel/kgcc64/Manifest b/sys-devel/kgcc64/Manifest
index 685777dde8fc..a47a084bdff2 100644
--- a/sys-devel/kgcc64/Manifest
+++ b/sys-devel/kgcc64/Manifest
@@ -28,6 +28,8 @@ DIST gcc-4.8.2-patches-1.0.tar.bz2 15931 SHA256 868723027ed356a9ea69771e3232aa53
 DIST gcc-4.8.2.tar.bz2 85999682 SHA256 09dc2276c73424bbbfda1dbddc62bbbf900c9f185acf7f3e1d773ce2d7e3cdc8 SHA512 2a3927481707b3bb7171076b596d9b69084edac82460df6fb35395592dd1e8fc5665577702ca746d5b454dec68b1c4e31b9de6adc9865d482f4b8736ec648b10 WHIRLPOOL 5ebe564faf13634e7f2744dc13421ce0a3faa06b35d425f4b6983e74a4e93b4c21955823013f7a5530e7ea9e9d0ecfd68cb79950e94333ed3e44aaa4dfbdefe7
 DIST gcc-4.8.3-patches-1.1.tar.bz2 19882 SHA256 019cbe76f20f4e294b900ccb99a6b52553ed04fa0d2993798b3a07b0e4a8f90a SHA512 8512ec54fb2d482e08ca54042e11c6334d653ec850cc7c920ed95654575222ac0303caa35cd46e80f1985d86cd229f35e26e0eaca1ae623fd8d336940148801c WHIRLPOOL d7b8d6278b6f79aa00fcd29ed6142cad3002def33edb0be44e638d50cb3b1fa8da72fa62a7276c81c94cd873c872dd0e7fd602022420d9601fde8f2b04872ece
 DIST gcc-4.8.3.tar.bz2 86126808 SHA256 6a8e4f11b185f4fe2ed9d7fc053e80f8c7e73f800c045f51f9d8bea33f080f1e SHA512 2b40d231e8445f9c1654137df509f09ce1187b475138ca7f648f710d922a1718f740b2d8a37c26e16b5e27900c60358be98229ae884a6f1f70e9df44ad24d02b WHIRLPOOL 6dd3bd4b51bb9b8c52fb743bba28cde8612ff7090b71e56bf02d3613b91cd4c3c4dd91dbcb672985f22400d776870ba55550e1fc44afae9737092ceca5f83ebd
+DIST gcc-4.8.5-patches-1.3.tar.bz2 26025 SHA256 4a165e6a387421f581f49c742243bf013c9fb7c91f44514be7b38292178ebbb4 SHA512 8d190f81ca0d25281250dbf0a670fcf12334b0811a5bf664e6450942a2996d02b979c6e8f8760b287edad06df3d1f8e2fe5cb0c3dcf9677c3420457d841d9506 WHIRLPOOL d31b3f48e13e5a9292b704afc745cbea038e61eedc4dba0d659558b56feeafec118043f3430457f71dc938760d72860e4318b2238b3bee9fba069c740327b78a
+DIST gcc-4.8.5.tar.bz2 86165587 SHA256 22fb1e7e0f68a63cee631d85b20461d1ea6bda162f03096350e38c8d427ecf23 SHA512 47fdfeca0c0a624cdec9c4ae47137d056c918d5c386d4b96985bb3c8172aba377cb66cbcc30e80832fd244a7d98f562c20198056915c70cfef0977545073a8ea WHIRLPOOL 026253cd2f3706871dfe2525c0302b38b3f513f6a62666d0ba0ca2e62d6513f09ad5c1177f2a63ae3bad660fe60e7909b6930d26df2b367b9ec68e14552c6e11
 DIST gcc-4.9.1-patches-1.0.tar.bz2 18918 SHA256 5addded7684318fd7ad16dba5a1407c27938ba803cec29b5376c32aaf432a36e SHA512 ade6f02a5d26f201c9d5a01da1174f803309358e49e9b93c848a4239f90b6301bc863951af25daf0188d68088fe8a02653391453158c1846751ddf2f286ee9da WHIRLPOOL 3b5f0f39c925d379a2db35b5335ed3fd7d456fd19fdeb315c87ba307e3ab6e8e8ebf29f8db894c43e3ea26a4318d4ca7ff47c635351a7f38aaa2afc33e3016cc
 DIST gcc-4.9.1.tar.bz2 89854120 SHA256 d334781a124ada6f38e63b545e2a3b8c2183049515a1abab6d513f109f1d717e SHA512 8598106a4b7c03bb4d6e29fa1bfa9ee6b6390d1f1bca86c1ccd27aed830ae1d126daa50c4041016cbfa76090dd66c51f1ce06958b8ccd6c3be51eae875125593 WHIRLPOOL 45c663aca6fe3212cf6ff34611df3041204b942aedf5005b133f6ab4c40c994d405a9356429a06279b533706960d8ef80f363dd4ee7e78848052e621c49ad681
 DIST gcc-4.9.2-patches-1.2.tar.bz2 19658 SHA256 8cc5f7a82aca3fdee3c4f8b3542ba7a4431dfe5e511b6c11232d830bfa01d998 SHA512 9fca6ee31c817d667f01954bc517a4c4d5bd13b796253f111ef87a5a0eab01ae9b19c8f60c9074fbdfc81763886bc05fa2aae4cb3c5cbe01901e4a5791cecf6f WHIRLPOOL ea46cf1f779aff553beb28a4118a223af10ec44ff67cfdbc50514202b40799ccf641bb8d45e67c3935eaf231b03c738ca965bd16b2c2569b6f184a240d3bc56f
diff --git a/sys-devel/kgcc64/kgcc64-4.8.5.ebuild b/sys-devel/kgcc64/kgcc64-4.8.5.ebuild
new file mode 100644
index 000000000000..b7dd9fd58911
--- /dev/null
+++ b/sys-devel/kgcc64/kgcc64-4.8.5.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+case ${CHOST} in
+	hppa*)    CTARGET=hppa64-${CHOST#*-};;
+	mips*)    CTARGET=${CHOST/mips/mips64};;
+	powerpc*) CTARGET=${CHOST/powerpc/powerpc64};;
+	s390*)    CTARGET=${CHOST/s390/s390x};;
+	sparc*)   CTARGET=${CHOST/sparc/sparc64};;
+	i?86*)    CTARGET=x86_64-${CHOST#*-};;
+esac
+export CTARGET
+TOOLCHAIN_ALLOWED_LANGS="c"
+GCC_TARGET_NO_MULTILIB=true
+
+PATCH_VER="1.3"
+GCC_FILESDIR=${FILESDIR/${PN}/gcc}
+
+inherit eutils toolchain
+
+DESCRIPTION="64bit kernel compiler"
+
+# Works on mips and sparc; all other archs, refer to bug #228115
+KEYWORDS="~hppa ~sparc"
+
+RDEPEND=">=dev-libs/gmp-4.3.2
+	>=dev-libs/mpfr-2.4.2
+	>=dev-libs/mpc-0.8.1
+	>=sys-devel/gcc-config-1.4"
+# unlike every other target, hppa has not unified the 32/64 bit
+# ports in binutils yet
+DEPEND="${RDEPEND}
+	hppa? ( sys-devel/binutils-hppa64 )
+	!sys-devel/gcc-hppa64
+	!sys-devel/gcc-mips64
+	!sys-devel/gcc-powerpc64
+	!sys-devel/gcc-sparc64
+	>=sys-apps/texinfo-4.8
+	>=sys-devel/bison-1.875"
+
+pkg_postinst() {
+	toolchain_pkg_postinst
+
+	cd "${ROOT}"/usr/bin
+	local x
+	for x in gcc cpp ; do
+		cat <<-EOF >${CTARGET%%-*}-linux-${x}
+		#!/bin/sh
+		exec ${CTARGET}-${x} "\$@"
+		EOF
+		chmod a+rx ${CTARGET%%-*}-linux-${x}
+	done
+}
diff --git a/sys-devel/libtool/files/libtool-2.4.6-fuse-ld.patch b/sys-devel/libtool/files/libtool-2.4.6-fuse-ld.patch
index eb8ee07b6c9a..c352d52aac3b 100644
--- a/sys-devel/libtool/files/libtool-2.4.6-fuse-ld.patch
+++ b/sys-devel/libtool/files/libtool-2.4.6-fuse-ld.patch
@@ -29,6 +29,25 @@ index d5cf07a..0fc8279 100644
          func_quote_for_eval "$arg"
  	arg=$func_quote_for_eval_result
          func_append compile_command " $arg"
+
+patch the generated file too to keep help2man from generating man pages
+https://bugs.gentoo.org/556512
+
+--- a/build-aux/ltmain.sh
++++ b/build-aux/ltmain.sh
+@@ -5360,10 +5360,12 @@ func_mode_link ()
+       # -tp=*                Portland pgcc target processor selection
+       # --sysroot=*          for sysroot support
+       # -O*, -g*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization
++      # -fuse-ld=*           Linker select flags for GCC
+       # -stdlib=*            select c++ std lib with clang
+       -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
+       -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \
+-      -O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*)
++      -O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*| \
++      -fuse-ld=*)
+         func_quote_for_eval "$arg"
+ 	arg=$func_quote_for_eval_result
+         func_append compile_command " $arg"
 -- 
 2.3.2
-
diff --git a/sys-devel/libtool/libtool-2.4.6-r1.ebuild b/sys-devel/libtool/libtool-2.4.6-r1.ebuild
index 5dbc9f92a2a1..677db335de65 100644
--- a/sys-devel/libtool/libtool-2.4.6-r1.ebuild
+++ b/sys-devel/libtool/libtool-2.4.6-r1.ebuild
@@ -53,6 +53,12 @@ src_prepare() {
 	popd >/dev/null
 	AT_NOELIBTOOLIZE=yes eautoreconf
 	epunt_cxx
+
+	# Make sure timestamps don't trigger a rebuild of man pages. #556512
+	if [[ ${PV} != "9999" ]] ; then
+		touch doc/*.1
+		export HELP2MAN=false
+	fi
 }
 
 src_configure() {
diff --git a/sys-devel/libtool/libtool-9999.ebuild b/sys-devel/libtool/libtool-9999.ebuild
index 923f8b49ee57..8b6ede52b1cf 100644
--- a/sys-devel/libtool/libtool-9999.ebuild
+++ b/sys-devel/libtool/libtool-9999.ebuild
@@ -50,6 +50,12 @@ src_prepare() {
 	popd >/dev/null
 	AT_NOELIBTOOLIZE=yes eautoreconf
 	epunt_cxx
+
+	# Make sure timestamps don't trigger a rebuild of man pages. #556512
+	if [[ ${PV} != "9999" ]] ; then
+		touch doc/*.1
+		export HELP2MAN=false
+	fi
 }
 
 src_configure() {
diff --git a/sys-devel/llvm/llvm-3.7.0-r1.ebuild b/sys-devel/llvm/llvm-3.7.0-r1.ebuild
new file mode 100644
index 000000000000..068f1b80eaae
--- /dev/null
+++ b/sys-devel/llvm/llvm-3.7.0-r1.ebuild
@@ -0,0 +1,498 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
+PYTHON_COMPAT=( python2_7 pypy )
+
+inherit check-reqs cmake-utils eutils flag-o-matic multilib \
+	multilib-minimal python-r1 toolchain-funcs pax-utils
+
+DESCRIPTION="Low Level Virtual Machine"
+HOMEPAGE="http://llvm.org/"
+SRC_URI="http://llvm.org/releases/${PV}/${P}.src.tar.xz
+	clang? ( http://llvm.org/releases/${PV}/compiler-rt-${PV}.src.tar.xz
+		http://llvm.org/releases/${PV}/cfe-${PV}.src.tar.xz
+		http://llvm.org/releases/${PV}/clang-tools-extra-${PV}.src.tar.xz )
+	lldb? ( http://llvm.org/releases/${PV}/lldb-${PV}.src.tar.xz )
+	!doc? ( http://dev.gentoo.org/~voyageur/distfiles/${P}-manpages.tar.bz2 )"
+
+LICENSE="UoI-NCSA"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="clang debug doc gold libedit +libffi lldb multitarget ncurses ocaml
+	python +static-analyzer test xml video_cards_radeon kernel_Darwin"
+
+COMMON_DEPEND="
+	sys-libs/zlib:0=
+	clang? (
+		python? ( ${PYTHON_DEPS} )
+		static-analyzer? (
+			dev-lang/perl:*
+			${PYTHON_DEPS}
+		)
+		xml? ( dev-libs/libxml2:2=[${MULTILIB_USEDEP}] )
+	)
+	gold? ( >=sys-devel/binutils-2.22:*[cxx] )
+	libedit? ( dev-libs/libedit:0=[${MULTILIB_USEDEP}] )
+	libffi? ( >=virtual/libffi-3.0.13-r1:0=[${MULTILIB_USEDEP}] )
+	ncurses? ( >=sys-libs/ncurses-5.9-r3:0=[${MULTILIB_USEDEP}] )
+	ocaml? (
+		dev-lang/ocaml:0=
+		dev-ml/findlib
+		dev-ml/ocaml-ctypes )"
+# configparser-3.2 breaks the build (3.3 or none at all are fine)
+DEPEND="${COMMON_DEPEND}
+	dev-lang/perl
+	>=sys-devel/make-3.81
+	>=sys-devel/flex-2.5.4
+	>=sys-devel/bison-1.875d
+	|| ( >=sys-devel/gcc-3.0 >=sys-devel/llvm-3.5
+		( >=sys-freebsd/freebsd-lib-9.1-r10 sys-libs/libcxx )
+	)
+	|| ( >=sys-devel/binutils-2.18 >=sys-devel/binutils-apple-5.1 )
+	kernel_Darwin? ( sys-libs/libcxx )
+	clang? ( xml? ( virtual/pkgconfig ) )
+	doc? ( dev-python/sphinx )
+	libffi? ( virtual/pkgconfig )
+	lldb? ( dev-lang/swig )
+	!!<dev-python/configparser-3.3.0.2
+	ocaml? ( test? ( dev-ml/ounit ) )
+	${PYTHON_DEPS}"
+RDEPEND="${COMMON_DEPEND}
+	clang? ( !<=sys-devel/clang-${PV}-r99 )
+	abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r2
+		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )"
+PDEPEND="clang? ( =sys-devel/clang-${PV}-r100 )"
+
+# pypy gives me around 1700 unresolved tests due to open file limit
+# being exceeded. probably GC does not close them fast enough.
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	lldb? ( clang )
+	test? ( || ( $(python_gen_useflags 'python*') ) )"
+
+S=${WORKDIR}/${P/_}.src
+
+pkg_pretend() {
+	# in megs
+	# !clang !debug !multitarget -O2       400
+	# !clang !debug  multitarget -O2       550
+	#  clang !debug !multitarget -O2       950
+	#  clang !debug  multitarget -O2      1200
+	# !clang  debug  multitarget -O2      5G
+	#  clang !debug  multitarget -O0 -g  12G
+	#  clang  debug  multitarget -O2     16G
+	#  clang  debug  multitarget -O0 -g  14G
+
+	local build_size=550
+	use clang && build_size=1200
+
+	if use debug; then
+		ewarn "USE=debug is known to increase the size of package considerably"
+		ewarn "and cause the tests to fail."
+		ewarn
+
+		(( build_size *= 14 ))
+	elif is-flagq '-g?(gdb)?([1-9])'; then
+		ewarn "The C++ compiler -g option is known to increase the size of the package"
+		ewarn "considerably. If you run out of space, please consider removing it."
+		ewarn
+
+		(( build_size *= 10 ))
+	fi
+
+	# Multiply by number of ABIs :).
+	local abis=( $(multilib_get_enabled_abis) )
+	(( build_size *= ${#abis[@]} ))
+
+	local CHECKREQS_DISK_BUILD=${build_size}M
+	check-reqs_pkg_pretend
+
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		echo 'int main() {return 0;}' > "${T}"/test.cxx || die
+		ebegin "Trying to build a C++11 test program"
+		if ! $(tc-getCXX) -std=c++11 -o /dev/null "${T}"/test.cxx; then
+			eerror "LLVM-${PV} requires C++11-capable C++ compiler. Your current compiler"
+			eerror "does not seem to support -std=c++11 option. Please upgrade your compiler"
+			eerror "to gcc-4.7 or an equivalent version supporting C++11."
+			die "Currently active compiler does not support -std=c++11"
+		fi
+		eend ${?}
+	fi
+}
+
+pkg_setup() {
+	pkg_pretend
+}
+
+src_unpack() {
+	default
+
+	if use clang; then
+		mv "${WORKDIR}"/cfe-${PV/_}.src "${S}"/tools/clang \
+			|| die "clang source directory move failed"
+		mv "${WORKDIR}"/compiler-rt-${PV/_}.src "${S}"/projects/compiler-rt \
+			|| die "compiler-rt source directory move failed"
+		mv "${WORKDIR}"/clang-tools-extra-${PV/_}.src "${S}"/tools/clang/tools/extra \
+			|| die "clang-tools-extra source directory move failed"
+	fi
+
+	if use lldb; then
+		mv "${WORKDIR}"/lldb-${PV/_}.src "${S}"/tools/lldb \
+			|| die "lldb source directory move failed"
+	fi
+}
+
+src_prepare() {
+	# Make ocaml warnings non-fatal, bug #537308
+	sed -e "/RUN/s/-warn-error A//" -i test/Bindings/OCaml/*ml  || die
+	# Fix libdir for ocaml bindings install, bug #559134
+	epatch "${FILESDIR}"/cmake/${P}-ocaml-multilib.patch
+
+	# Make it possible to override Sphinx HTML install dirs
+	# https://llvm.org/bugs/show_bug.cgi?id=23780
+	epatch "${FILESDIR}"/cmake/0002-cmake-Support-overriding-Sphinx-HTML-doc-install-dir.patch
+
+	# Prevent race conditions with parallel Sphinx runs
+	# https://llvm.org/bugs/show_bug.cgi?id=23781
+	epatch "${FILESDIR}"/cmake/0003-cmake-Add-an-ordering-dep-between-HTML-man-Sphinx-ta.patch
+
+	# Prevent installing libgtest
+	# https://llvm.org/bugs/show_bug.cgi?id=18341
+	epatch "${FILESDIR}"/cmake/0004-cmake-Do-not-install-libgtest.patch
+
+	if use clang; then
+		# Automatically select active system GCC's libraries, bugs #406163 and #417913
+		epatch "${FILESDIR}"/clang-3.5-gentoo-runtime-gcc-detection-v3.patch
+
+		epatch "${FILESDIR}"/clang-3.6-gentoo-install.patch
+
+		sed -i -e "s^@EPREFIX@^${EPREFIX}^" \
+			tools/clang/tools/scan-build/scan-build || die
+
+		# Install clang runtime into /usr/lib/clang
+		# https://llvm.org/bugs/show_bug.cgi?id=23792
+		epatch "${FILESDIR}"/cmake/clang-0001-Install-clang-runtime-into-usr-lib-without-suffix.patch
+		epatch "${FILESDIR}"/cmake/compiler-rt-0001-cmake-Install-compiler-rt-into-usr-lib-without-suffi.patch
+
+		# Make it possible to override CLANG_LIBDIR_SUFFIX
+		# (that is used only to find LLVMgold.so)
+		# https://llvm.org/bugs/show_bug.cgi?id=23793
+		epatch "${FILESDIR}"/cmake/clang-0002-cmake-Make-CLANG_LIBDIR_SUFFIX-overridable.patch
+
+		# Fix WX sections, bug #421527
+		find "${S}"/projects/compiler-rt/lib/builtins -type f -name \*.S -exec sed \
+			 -e '$a\\n#if defined(__linux__) && defined(__ELF__)\n.section .note.GNU-stack,"",%progbits\n#endif' \
+			 -i {} \; || die
+	fi
+
+	if use lldb; then
+		# Do not install dummy readline.so module from
+		# https://llvm.org/bugs/show_bug.cgi?id=18841
+		sed -e 's/add_subdirectory(readline)/#&/' \
+			-i tools/lldb/scripts/Python/modules/CMakeLists.txt || die
+	fi
+
+	# User patches
+	epatch_user
+
+	python_setup
+
+	# Native libdir is used to hold LLVMgold.so
+	NATIVE_LIBDIR=$(get_libdir)
+}
+
+multilib_src_configure() {
+	local targets
+	if use multitarget; then
+		targets=all
+	else
+		targets='host;CppBackend'
+		use video_cards_radeon && targets+=';AMDGPU'
+	fi
+
+	local ffi_cflags ffi_ldflags
+	if use libffi; then
+		ffi_cflags=$(pkg-config --cflags-only-I libffi)
+		ffi_ldflags=$(pkg-config --libs-only-L libffi)
+	fi
+
+	local libdir=$(get_libdir)
+	local mycmakeargs=(
+		"${mycmakeargs[@]}"
+		-DLLVM_LIBDIR_SUFFIX=${libdir#lib}
+
+		-DBUILD_SHARED_LIBS=ON
+		-DLLVM_ENABLE_TIMESTAMPS=OFF
+		-DLLVM_TARGETS_TO_BUILD="${targets}"
+		-DLLVM_BUILD_TESTS=$(usex test)
+
+		-DLLVM_ENABLE_FFI=$(usex libffi)
+		-DLLVM_ENABLE_TERMINFO=$(usex ncurses)
+		-DLLVM_ENABLE_ASSERTIONS=$(usex debug)
+		-DLLVM_ENABLE_EH=ON
+		-DLLVM_ENABLE_RTTI=ON
+
+		-DWITH_POLLY=OFF # TODO
+
+		-DLLVM_HOST_TRIPLE="${CHOST}"
+
+		-DFFI_INCLUDE_DIR="${ffi_cflags#-I}"
+		-DFFI_LIBRARY_DIR="${ffi_ldflags#-L}"
+
+		-DHAVE_HISTEDIT_H=$(usex libedit)
+	)
+
+	if use lldb; then
+		mycmakeargs+=(
+			-DLLDB_DISABLE_LIBEDIT=$(usex !libedit)
+			-DLLDB_DISABLE_CURSES=$(usex !ncurses)
+			-DLLDB_ENABLE_TERMINFO=$(usex ncurses)
+		)
+	fi
+
+	if ! multilib_is_native_abi || ! use ocaml; then
+		mycmakeargs+=(
+			-DOCAMLFIND=NO
+		)
+	fi
+#	Note: go bindings have no CMake rules at the moment
+#	but let's kill the check in case they are introduced
+#	if ! multilib_is_native_abi || ! use go; then
+		mycmakeargs+=(
+			-DGO_EXECUTABLE=GO_EXECUTABLE-NOTFOUND
+		)
+#	fi
+
+	if multilib_is_native_abi; then
+		mycmakeargs+=(
+			-DLLVM_BUILD_DOCS=$(usex doc)
+			-DLLVM_ENABLE_SPHINX=$(usex doc)
+			-DLLVM_ENABLE_DOXYGEN=OFF
+			-DLLVM_INSTALL_HTML="${EPREFIX}/usr/share/doc/${PF}/html"
+			-DSPHINX_WARNINGS_AS_ERRORS=OFF
+			-DLLVM_INSTALL_UTILS=ON
+		)
+
+		if use clang; then
+			mycmakeargs+=(
+				-DCLANG_INSTALL_HTML="${EPREFIX}/usr/share/doc/${PF}/clang"
+			)
+		fi
+
+		if use gold; then
+			mycmakeargs+=(
+				-DLLVM_BINUTILS_INCDIR="${EPREFIX}"/usr/include
+			)
+		fi
+
+		if use lldb; then
+			mycmakeargs+=(
+				-DLLDB_DISABLE_PYTHON=$(usex !python)
+			)
+		fi
+
+	else
+		if use clang; then
+			mycmakeargs+=(
+				# disable compiler-rt on non-native ABI because:
+				# 1. it fails to configure because of -m32
+				# 2. it is shared between ABIs so no point building
+				# it multiple times
+				-DLLVM_EXTERNAL_COMPILER_RT_BUILD=OFF
+				-DLLVM_EXTERNAL_CLANG_TOOLS_EXTRA_BUILD=OFF
+			)
+		fi
+		if use lldb; then
+			mycmakeargs+=(
+				# only run swig on native abi
+				-DLLDB_DISABLE_PYTHON=ON
+			)
+		fi
+	fi
+
+	if use clang; then
+		mycmakeargs+=(
+			-DCLANG_ENABLE_ARCMT=$(usex static-analyzer)
+			-DCLANG_ENABLE_STATIC_ANALYZER=$(usex static-analyzer)
+			-DCLANG_LIBDIR_SUFFIX="${NATIVE_LIBDIR#lib}"
+		)
+
+		# -- not needed when compiler-rt is built with host compiler --
+		# cmake passes host C*FLAGS to compiler-rt build
+		# which is performed using clang, so we need to filter out
+		# some flags clang does not support
+		# (if you know some more flags that don't work, let us know)
+		#filter-flags -msahf -frecord-gcc-switches
+	fi
+
+	cmake-utils_src_configure
+}
+
+multilib_src_compile() {
+	cmake-utils_src_compile
+	# TODO: not sure why this target is not correctly called
+	multilib_is_native_abi && use doc && use ocaml && cmake-utils_src_make docs/ocaml_doc
+
+	pax-mark m "${BUILD_DIR}"/bin/llvm-rtdyld
+	pax-mark m "${BUILD_DIR}"/bin/lli
+	pax-mark m "${BUILD_DIR}"/bin/lli-child-target
+
+	if use test; then
+		pax-mark m "${BUILD_DIR}"/unittests/ExecutionEngine/Orc/OrcJITTests
+		pax-mark m "${BUILD_DIR}"/unittests/ExecutionEngine/MCJIT/MCJITTests
+		pax-mark m "${BUILD_DIR}"/unittests/Support/SupportTests
+	fi
+}
+
+multilib_src_test() {
+	# respect TMPDIR!
+	local -x LIT_PRESERVES_TMP=1
+	local test_targets=( check )
+	# clang tests won't work on non-native ABI because we skip compiler-rt
+	multilib_is_native_abi && use clang && test_targets+=( check-clang )
+	cmake-utils_src_make "${test_targets[@]}"
+}
+
+src_install() {
+	local MULTILIB_CHOST_TOOLS=(
+		/usr/bin/llvm-config
+	)
+
+	local MULTILIB_WRAPPED_HEADERS=(
+		/usr/include/llvm/Config/config.h
+		/usr/include/llvm/Config/llvm-config.h
+	)
+
+	if use clang; then
+		# note: magic applied in multilib_src_install()!
+		CLANG_VERSION=${PV%.*}
+
+		MULTILIB_CHOST_TOOLS+=(
+			/usr/bin/clang
+			/usr/bin/clang++
+			/usr/bin/clang-cl
+			/usr/bin/clang-${CLANG_VERSION}
+			/usr/bin/clang++-${CLANG_VERSION}
+			/usr/bin/clang-cl-${CLANG_VERSION}
+		)
+
+		MULTILIB_WRAPPED_HEADERS+=(
+			/usr/include/clang/Config/config.h
+		)
+	fi
+
+	multilib-minimal_src_install
+}
+
+multilib_src_install() {
+	cmake-utils_src_install
+
+	if multilib_is_native_abi; then
+		# Install man pages.
+		use doc || doman "${WORKDIR}"/${P}-manpages/*.1
+
+		# Symlink the gold plugin.
+		if use gold; then
+			dodir "/usr/${CHOST}/binutils-bin/lib/bfd-plugins"
+			dosym "../../../../$(get_libdir)/LLVMgold.so" \
+				"/usr/${CHOST}/binutils-bin/lib/bfd-plugins/LLVMgold.so"
+		fi
+	fi
+
+	# apply CHOST and CLANG_VERSION to clang executables
+	# they're statically linked so we don't have to worry about the lib
+	if use clang; then
+		local clang_tools=( clang clang++ clang-cl )
+		local i
+
+		# cmake gives us:
+		# - clang-X.Y
+		# - clang -> clang-X.Y
+		# - clang++, clang-cl -> clang
+		# we want to have:
+		# - clang-X.Y
+		# - clang++-X.Y, clang-cl-X.Y -> clang-X.Y
+		# - clang, clang++, clang-cl -> clang*-X.Y
+		# so we need to fix the two tools
+		for i in "${clang_tools[@]:1}"; do
+			rm "${ED%/}/usr/bin/${i}" || die
+			dosym "clang-${CLANG_VERSION}" "/usr/bin/${i}-${CLANG_VERSION}"
+			dosym "${i}-${CLANG_VERSION}" "/usr/bin/${i}"
+		done
+
+		# now prepend ${CHOST} and let the multilib-build.eclass symlink it
+		if ! multilib_is_native_abi; then
+			# non-native? let's replace it with a simple wrapper
+			for i in "${clang_tools[@]}"; do
+				rm "${ED%/}/usr/bin/${i}-${CLANG_VERSION}" || die
+				cat > "${T}"/wrapper.tmp <<-_EOF_
+					#!${EPREFIX}/bin/sh
+					exec "${i}-${CLANG_VERSION}" $(get_abi_CFLAGS) "\${@}"
+				_EOF_
+				newbin "${T}"/wrapper.tmp "${i}-${CLANG_VERSION}"
+			done
+		fi
+	fi
+}
+
+multilib_src_install_all() {
+	insinto /usr/share/vim/vimfiles
+	doins -r utils/vim/*/
+	# some users may find it useful
+	dodoc utils/vim/vimrc
+
+	if use clang; then
+		pushd tools/clang >/dev/null || die
+
+		if use static-analyzer ; then
+			pushd tools/scan-build >/dev/null || die
+
+			dobin ccc-analyzer scan-build
+			dosym ccc-analyzer /usr/bin/c++-analyzer
+			doman scan-build.1
+
+			insinto /usr/share/llvm
+			doins scanview.css sorttable.js
+
+			popd >/dev/null || die
+		fi
+
+		python_inst() {
+			if use static-analyzer ; then
+				pushd tools/scan-view >/dev/null || die
+
+				python_doscript scan-view
+
+				touch __init__.py || die
+				python_moduleinto clang
+				python_domodule *.py Resources
+
+				popd >/dev/null || die
+			fi
+
+			if use python ; then
+				pushd bindings/python/clang >/dev/null || die
+
+				python_moduleinto clang
+				python_domodule *.py
+
+				popd >/dev/null || die
+			fi
+
+			# AddressSanitizer symbolizer (currently separate)
+			python_doscript "${S}"/projects/compiler-rt/lib/asan/scripts/asan_symbolize.py
+		}
+		python_foreach_impl python_inst
+		popd >/dev/null || die
+	fi
+}
+
+pkg_postinst() {
+	if use clang; then
+		elog "To enable OpenMP support in clang, install sys-libs/libomp"
+		elog "and use the '-fopenmp=libomp' command line option"
+	fi
+}
diff --git a/sys-devel/llvm/llvm-9999.ebuild b/sys-devel/llvm/llvm-9999.ebuild
index 325a857ef1d6..1d0a6e61a795 100644
--- a/sys-devel/llvm/llvm-9999.ebuild
+++ b/sys-devel/llvm/llvm-9999.ebuild
@@ -30,7 +30,7 @@ COMMON_DEPEND="
 			dev-lang/perl:*
 			${PYTHON_DEPS}
 		)
-		xml? ( dev-libs/libxml2:2= )
+		xml? ( dev-libs/libxml2:2=[${MULTILIB_USEDEP}] )
 	)
 	gold? ( >=sys-devel/binutils-2.22:*[cxx] )
 	libedit? ( dev-libs/libedit:0=[${MULTILIB_USEDEP}] )
@@ -196,9 +196,6 @@ src_prepare() {
 		find "${S}"/projects/compiler-rt/lib/builtins -type f -name \*.S -exec sed \
 			 -e '$a\\n#if defined(__linux__) && defined(__ELF__)\n.section .note.GNU-stack,"",%progbits\n#endif' \
 			 -i {} \; || die
-
-		# Workaround bug #553416 until upstream fixes it
-		epatch "${FILESDIR}"/clang-3.7-strip_doc_refs.patch
 	fi
 
 	if use lldb; then
@@ -285,6 +282,8 @@ multilib_src_configure() {
 			-DLLVM_ENABLE_SPHINX=$(usex doc)
 			-DLLVM_ENABLE_DOXYGEN=OFF
 			-DLLVM_INSTALL_HTML="${EPREFIX}/usr/share/doc/${PF}/html"
+			-DSPHINX_WARNINGS_AS_ERRORS=OFF
+			-DLLVM_INSTALL_UTILS=ON
 		)
 
 		if use clang; then
@@ -500,3 +499,10 @@ multilib_src_install_all() {
 		popd >/dev/null || die
 	fi
 }
+
+pkg_postinst() {
+	if use clang; then
+		elog "To enable OpenMP support in clang, install sys-libs/libomp"
+		elog "and use the '-fopenmp=libomp' command line option"
+	fi
+}
diff --git a/sys-firmware/seabios/seabios-1.8.2.ebuild b/sys-firmware/seabios/seabios-1.8.2.ebuild
index 23e935b8e815..b2ad1f299115 100644
--- a/sys-firmware/seabios/seabios-1.8.2.ebuild
+++ b/sys-firmware/seabios/seabios-1.8.2.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} = *9999* || ! -z "${EGIT_COMMIT}" ]]; then
 	EGIT_REPO_URI="git://git.seabios.org/seabios.git"
 	inherit git-2
 else
-	KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd"
+	KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-fbsd ~x86-fbsd"
 	# Upstream hasn't released a new binary.  We snipe ours from Fedora for now.
 	# http://code.coreboot.org/p/seabios/downloads/get/bios.bin-${PV}.gz
 	SRC_URI="!binary? ( http://code.coreboot.org/p/seabios/downloads/get/${P}.tar.gz )
diff --git a/sys-freebsd/boot0/Manifest b/sys-freebsd/boot0/Manifest
index 4c9fda783eb8..982e5c6a97f7 100644
--- a/sys-freebsd/boot0/Manifest
+++ b/sys-freebsd/boot0/Manifest
@@ -1,6 +1,5 @@
 DIST freebsd-contrib-9.1.tar.bz2 54751432 SHA256 e7ffa056d4050ce03ee8e23e276e2a9a494326a98d60c43bee2afcc59576deb8 SHA512 71be13049258c6e6b5e4f63cc16da5d349a89d68f04d87446e4ad33ae8bf2a93ea67d9c256b7bec60b61e65db0487268070cfb77a484c3ac0f8ba368b48c2438 WHIRLPOOL a2a84423175499208d34809e802284d6ba649f317c3a9ad8b7312fa19efe142ebadab0048bac0db8e988e59f9a7468ac7c5d0d25e78b82bdb269a20d18153cee
 DIST freebsd-lib-9.1.tar.bz2 3206685 SHA256 f31fa8107b4de711c548f6d0c1bb1f81d09f51bcc3b14a1e9e90bb0e7cc4a35d SHA512 40d0c36b6b889c404fa0e0afa38ba4e84a55bc88ffa2f98a70afbd7a32c4f32c158617ba770567d082a986d62c09b3ec8db3dc5ab853ee1c9bbe0b90bb82396e WHIRLPOOL 581878bf9c43184b043b4293409b85901c9ed1f9bd279e965414aca41ba50950848ebda3ee10a503a028135dfd2765e95a11acd4e62a11c528e104392bbbd8d0
-DIST freebsd-src-10.1.tar.xz 115049476 SHA256 f919287a5ef51d4f133f27c99c54f2e8054f408d3dd53bc60f4e233cc75ec03d SHA512 4ded32b451e2807e24a06305502f88ea633b2899a7ccd9cab3dc98fc865ef91324c93c512a08cf6e295313a8d7e79aa9d7af07da40e7276d986b06419b984152 WHIRLPOOL 1eff9419d89b8a70f064171883d92e160b250cd637972eb9107a19d7b3c904b554c4f51eaa9ff9642ef2c4234bde05cf9aef16d0c39280b55084f831700dea80
 DIST freebsd-src-10.2.tar.xz 124551336 SHA256 6a59ea716bae96135983ad70cd7123e3b35ec91b191a82fe282ade88a61560b1 SHA512 fba4588fdaa94fa4582a8de566a84cf4f2badc87c7b2e0745d7a31c1e349b2d5f59dbdbb16a9d43421155c1ac4bdec8db24c5d32ac5a92be687d4ed70fe35835 WHIRLPOOL e325db3c07118762021d802c4f20c7a5fd4b816f08cab6f92b408399f1b3bf8ad89728d51c354ab21478265a4539463c94aae9ae49f0ac10cd3c3f8f640dc186
 DIST freebsd-sys-8.2.tar.bz2 25835329 SHA256 0c6c7b61aae94db2931f985d5899f3bca78fc8ffab6b598fbaa158142d676f16 SHA512 6ea4516a5c52e25c4f993f7acb875463a5caea93dbdf250c5d48eee95fff226956e9f030cab7e341b5e6a132325bc3dbf93dcb4b1185acb011918e50b1a22be3 WHIRLPOOL 870deeff877c6b9fc812a4260e4fdbb6715a5dc2065cab3bfbf2a42d876f6654703ccb124275a4e2c410cef48f3db02b63cc76059eccf9cf90244826f35b7a15
 DIST freebsd-sys-9.1.tar.bz2 32588103 SHA256 b93a7ac8334ac16cc9f60665048e5ef812c0a6c62f10d0b0a674aec3f56516a8 SHA512 7dc9d9e00dde8f592bb171f4386d02b655b73cb4f153fe5ec063d010a148ef0639eae0dcdb3eeb09ecd1e3653c69e49a2d261329fa6d0381d2ddabe258ddde6d WHIRLPOOL c8348344dfb14bad64bd3a78ee615ddd29203175b292233254f8ba175e7a3fb7218af6f95f7b4dbf394c0354bafe9d8bb0c21cdf0ceaeb697214964b280469b3
diff --git a/sys-freebsd/boot0/boot0-10.1.ebuild b/sys-freebsd/boot0/boot0-10.1.ebuild
deleted file mode 100644
index ad1175e410d4..000000000000
--- a/sys-freebsd/boot0/boot0-10.1.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit bsdmk freebsd flag-o-matic toolchain-funcs
-
-DESCRIPTION="FreeBSD's bootloader"
-SLOT="0"
-
-IUSE="bzip2 ieee1394 tftp zfs"
-
-if [[ ${PV} != *9999* ]]; then
-	KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-fi
-
-EXTRACTONLY="
-	sys/
-	lib/
-	contrib/bzip2/
-"
-
-RDEPEND=""
-DEPEND="=sys-freebsd/freebsd-mk-defs-${RV}*
-	=sys-freebsd/freebsd-lib-${RV}*"
-
-S="${WORKDIR}/sys/boot"
-
-PATCHES=( "${FILESDIR}/${PN}-10.1-gcc46.patch"
-	"${FILESDIR}/${PN}-10.1-drop-unsupport-cflags.patch"
-	"${FILESDIR}/${PN}-add-nossp-cflags.patch" )
-
-boot0_use_enable() {
-	use ${1} && mymakeopts="${mymakeopts} LOADER_${2}_SUPPORT=\"yes\""
-	use ${1} || mymakeopts="${mymakeopts} WITHOUT_${2}= "
-}
-
-pkg_setup() {
-	boot0_use_enable ieee1394 FIREWIRE
-	boot0_use_enable zfs ZFS
-	boot0_use_enable tftp TFTP
-	boot0_use_enable bzip2 BZIP2
-}
-
-src_prepare() {
-	sed -e '/-mno-align-long-strings/d' \
-		-i "${S}"/i386/boot2/Makefile \
-		-i "${S}"/i386/gptboot/Makefile \
-		-i "${S}"/i386/gptzfsboot/Makefile \
-		-i "${S}"/i386/zfsboot/Makefile || die
-}
-
-src_compile() {
-	strip-flags
-	append-flags "-fno-strict-aliasing"
-
-	if use amd64-fbsd; then
-		cd "${S}/userboot/libstand" || die
-		freebsd_src_compile
-		cd "${S}/userboot/zfs" || die
-		freebsd_src_compile
-	fi
-
-	cd "${S}/libstand32" || die
-	freebsd_src_compile
-
-	# bug542676
-	if [[ $(tc-getCC) == *clang* ]]; then
-		cd "${S}/i386/btx" || die
-		freebsd_src_compile
-		cd "${S}/i386/boot2" || die
-		CC=${CHOST}-gcc freebsd_src_compile
-	fi
-
-	cd "${WORKDIR}/lib/libstand" || die
-	freebsd_src_compile
-
-	cd "${S}"
-	CFLAGS="${CFLAGS} -I${WORKDIR}/lib/libstand"
-	LDFLAGS="${LDFLAGS} -L${WORKDIR}/lib/libstand"
-	export LIBSTAND="${WORKDIR}/lib/libstand/libstand.a"
-	NOFLAGSTRIP="yes" freebsd_src_compile
-}
-
-src_install() {
-	dodir /boot/defaults
-	mkinstall FILESDIR=/boot || die "mkinstall failed"
-
-	cd "${WORKDIR}/sys/$(tc-arch-kernel)/conf" || die
-	insinto /boot
-	newins GENERIC.hints device.hints
-
-	echo 'CONFIG_PROTECT="/boot/device.hints"' > "${T}"/50boot0
-	doenvd "${T}"/50boot0
-}
diff --git a/sys-freebsd/freebsd-bin/Manifest b/sys-freebsd/freebsd-bin/Manifest
index 5d0346683aeb..1ebf881d0201 100644
--- a/sys-freebsd/freebsd-bin/Manifest
+++ b/sys-freebsd/freebsd-bin/Manifest
@@ -4,6 +4,5 @@ DIST freebsd-lib-8.2.tar.bz2 3323878 SHA256 e3590c12794fcb5ba8eb7a1f58b497587cf1
 DIST freebsd-lib-9.1.tar.bz2 3206685 SHA256 f31fa8107b4de711c548f6d0c1bb1f81d09f51bcc3b14a1e9e90bb0e7cc4a35d SHA512 40d0c36b6b889c404fa0e0afa38ba4e84a55bc88ffa2f98a70afbd7a32c4f32c158617ba770567d082a986d62c09b3ec8db3dc5ab853ee1c9bbe0b90bb82396e WHIRLPOOL 581878bf9c43184b043b4293409b85901c9ed1f9bd279e965414aca41ba50950848ebda3ee10a503a028135dfd2765e95a11acd4e62a11c528e104392bbbd8d0
 DIST freebsd-sbin-8.2.tar.bz2 1211665 SHA256 8b7e21a66b4696e8763d29b8b02b2d35f29fc51820a194d1e469e7cace84c527 SHA512 c6643c29ab62344c98d8991708798730ee1c17e6478071718beeaa79788300a1f4ed2e6aeb8e39e3c216877d4ed2ac85b2a9531d534f1ac5125a508927898959 WHIRLPOOL 2a21cd0f15f95d66718031680ac87f1fe73f1e1b03cb012e1db1dd1bd2fe2bb7897457a8ba2f5a28c8806775611dca542cbadec16566c47ab9efa673e2cb53f3
 DIST freebsd-sbin-9.1.tar.bz2 1273913 SHA256 45008b0733b232ef03707ef5fa3e5c889e3b3728393d736bd9a869ea83be6447 SHA512 9f186602b7de96f268c352ca386986652fddf5570e7eca1afa8c0d2bdc83b57df1198efe47f36dd5c7a6abf4f9c935f1c8207a4a12a6b2153bd6c3c6292719dc WHIRLPOOL 20920dfa9607a0ce854319cef29bbd77fb1b31f6f6cfd5ac60cbd678169e43929e215743fe636d0c224443f3e6149a8f07c292d647f7f901592795ac292699f9
-DIST freebsd-src-10.1.tar.xz 115049476 SHA256 f919287a5ef51d4f133f27c99c54f2e8054f408d3dd53bc60f4e233cc75ec03d SHA512 4ded32b451e2807e24a06305502f88ea633b2899a7ccd9cab3dc98fc865ef91324c93c512a08cf6e295313a8d7e79aa9d7af07da40e7276d986b06419b984152 WHIRLPOOL 1eff9419d89b8a70f064171883d92e160b250cd637972eb9107a19d7b3c904b554c4f51eaa9ff9642ef2c4234bde05cf9aef16d0c39280b55084f831700dea80
 DIST freebsd-src-10.2.tar.xz 124551336 SHA256 6a59ea716bae96135983ad70cd7123e3b35ec91b191a82fe282ade88a61560b1 SHA512 fba4588fdaa94fa4582a8de566a84cf4f2badc87c7b2e0745d7a31c1e349b2d5f59dbdbb16a9d43421155c1ac4bdec8db24c5d32ac5a92be687d4ed70fe35835 WHIRLPOOL e325db3c07118762021d802c4f20c7a5fd4b816f08cab6f92b408399f1b3bf8ad89728d51c354ab21478265a4539463c94aae9ae49f0ac10cd3c3f8f640dc186
 DIST freebsd-ubin-9.1.tar.bz2 1910472 SHA256 ff6e586f213534b6ec2e65002c0dee64063d76ddad515c12221b1a80a1815e48 SHA512 74ae0aceec8597aa66c3f1ab313f0685a3c63d7273c36ae7baf8794275ad9bca241c60c3f6281cccf6d531d250d7611099977d3b1a27279cef3586401b6af05e WHIRLPOOL c85a3c9cf2bceff2c60ff03556bcc81d3aca22b0bce3c9538990071ac0a907236eee5ae7743ad22c5fd309b047ebf392aaaf2fe177ef5790ea869aff3da7e2fe
diff --git a/sys-freebsd/freebsd-bin/freebsd-bin-10.1.ebuild b/sys-freebsd/freebsd-bin/freebsd-bin-10.1.ebuild
deleted file mode 100644
index 31f008b6127b..000000000000
--- a/sys-freebsd/freebsd-bin/freebsd-bin-10.1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit bsdmk freebsd
-
-DESCRIPTION="FreeBSD /bin tools"
-SLOT="0"
-
-IUSE=""
-
-if [[ ${PV} != *9999* ]]; then
-	KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-fi
-
-EXTRACTONLY="
-	bin/
-	usr.bin/
-	sbin/
-	lib/
-"
-
-RDEPEND="=sys-freebsd/freebsd-lib-${RV}*
-	>=dev-libs/libedit-20120311.3.0-r1
-	sys-libs/ncurses
-	sys-apps/ed
-	!app-misc/realpath
-	!<sys-freebsd/freebsd-ubin-8"
-DEPEND="${RDEPEND}
-	=sys-freebsd/freebsd-mk-defs-${RV}*
-	>=sys-devel/flex-2.5.31-r2"
-
-S=${WORKDIR}/bin
-
-# csh and tcsh are provided by tcsh package, rmail is sendmail stuff.
-REMOVE_SUBDIRS="csh rmail ed freebsd-version"
-
-pkg_setup() {
-	mymakeopts="${mymakeopts} WITHOUT_TCSH= WITHOUT_SENDMAIL= WITHOUT_RCMDS= "
-}
diff --git a/sys-freebsd/freebsd-cddl/Manifest b/sys-freebsd/freebsd-cddl/Manifest
index 6798c8918f5c..cecfe17d0852 100644
--- a/sys-freebsd/freebsd-cddl/Manifest
+++ b/sys-freebsd/freebsd-cddl/Manifest
@@ -8,7 +8,6 @@ DIST freebsd-lib-8.2.tar.bz2 3323878 SHA256 e3590c12794fcb5ba8eb7a1f58b497587cf1
 DIST freebsd-lib-9.1.tar.bz2 3206685 SHA256 f31fa8107b4de711c548f6d0c1bb1f81d09f51bcc3b14a1e9e90bb0e7cc4a35d SHA512 40d0c36b6b889c404fa0e0afa38ba4e84a55bc88ffa2f98a70afbd7a32c4f32c158617ba770567d082a986d62c09b3ec8db3dc5ab853ee1c9bbe0b90bb82396e WHIRLPOOL 581878bf9c43184b043b4293409b85901c9ed1f9bd279e965414aca41ba50950848ebda3ee10a503a028135dfd2765e95a11acd4e62a11c528e104392bbbd8d0
 DIST freebsd-sbin-8.2.tar.bz2 1211665 SHA256 8b7e21a66b4696e8763d29b8b02b2d35f29fc51820a194d1e469e7cace84c527 SHA512 c6643c29ab62344c98d8991708798730ee1c17e6478071718beeaa79788300a1f4ed2e6aeb8e39e3c216877d4ed2ac85b2a9531d534f1ac5125a508927898959 WHIRLPOOL 2a21cd0f15f95d66718031680ac87f1fe73f1e1b03cb012e1db1dd1bd2fe2bb7897457a8ba2f5a28c8806775611dca542cbadec16566c47ab9efa673e2cb53f3
 DIST freebsd-sbin-9.1.tar.bz2 1273913 SHA256 45008b0733b232ef03707ef5fa3e5c889e3b3728393d736bd9a869ea83be6447 SHA512 9f186602b7de96f268c352ca386986652fddf5570e7eca1afa8c0d2bdc83b57df1198efe47f36dd5c7a6abf4f9c935f1c8207a4a12a6b2153bd6c3c6292719dc WHIRLPOOL 20920dfa9607a0ce854319cef29bbd77fb1b31f6f6cfd5ac60cbd678169e43929e215743fe636d0c224443f3e6149a8f07c292d647f7f901592795ac292699f9
-DIST freebsd-src-10.1.tar.xz 115049476 SHA256 f919287a5ef51d4f133f27c99c54f2e8054f408d3dd53bc60f4e233cc75ec03d SHA512 4ded32b451e2807e24a06305502f88ea633b2899a7ccd9cab3dc98fc865ef91324c93c512a08cf6e295313a8d7e79aa9d7af07da40e7276d986b06419b984152 WHIRLPOOL 1eff9419d89b8a70f064171883d92e160b250cd637972eb9107a19d7b3c904b554c4f51eaa9ff9642ef2c4234bde05cf9aef16d0c39280b55084f831700dea80
 DIST freebsd-src-10.2.tar.xz 124551336 SHA256 6a59ea716bae96135983ad70cd7123e3b35ec91b191a82fe282ade88a61560b1 SHA512 fba4588fdaa94fa4582a8de566a84cf4f2badc87c7b2e0745d7a31c1e349b2d5f59dbdbb16a9d43421155c1ac4bdec8db24c5d32ac5a92be687d4ed70fe35835 WHIRLPOOL e325db3c07118762021d802c4f20c7a5fd4b816f08cab6f92b408399f1b3bf8ad89728d51c354ab21478265a4539463c94aae9ae49f0ac10cd3c3f8f640dc186
 DIST freebsd-sys-8.2.tar.bz2 25835329 SHA256 0c6c7b61aae94db2931f985d5899f3bca78fc8ffab6b598fbaa158142d676f16 SHA512 6ea4516a5c52e25c4f993f7acb875463a5caea93dbdf250c5d48eee95fff226956e9f030cab7e341b5e6a132325bc3dbf93dcb4b1185acb011918e50b1a22be3 WHIRLPOOL 870deeff877c6b9fc812a4260e4fdbb6715a5dc2065cab3bfbf2a42d876f6654703ccb124275a4e2c410cef48f3db02b63cc76059eccf9cf90244826f35b7a15
 DIST freebsd-sys-9.1.tar.bz2 32588103 SHA256 b93a7ac8334ac16cc9f60665048e5ef812c0a6c62f10d0b0a674aec3f56516a8 SHA512 7dc9d9e00dde8f592bb171f4386d02b655b73cb4f153fe5ec063d010a148ef0639eae0dcdb3eeb09ecd1e3653c69e49a2d261329fa6d0381d2ddabe258ddde6d WHIRLPOOL c8348344dfb14bad64bd3a78ee615ddd29203175b292233254f8ba175e7a3fb7218af6f95f7b4dbf394c0354bafe9d8bb0c21cdf0ceaeb697214964b280469b3
diff --git a/sys-freebsd/freebsd-cddl/files/freebsd-cddl-10.1-underlink.patch b/sys-freebsd/freebsd-cddl/files/freebsd-cddl-10.1-underlink.patch
deleted file mode 100644
index 62d53267acdc..000000000000
--- a/sys-freebsd/freebsd-cddl/files/freebsd-cddl-10.1-underlink.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff --git a/cddl/lib/libzfs/Makefile b/cddl/lib/libzfs/Makefile
-index cc0f363..065281f 100644
---- a/cddl/lib/libzfs/Makefile
-+++ b/cddl/lib/libzfs/Makefile
-@@ -8,7 +8,8 @@
- LIB=	zfs
- DPADD=	${LIBMD} ${LIBPTHREAD} ${LIBUMEM} ${LIBUTIL} ${LIBM} ${LIBNVPAIR} \
- 	${LIBAVL} ${LIBZFS_CORE}
--LDADD=	-lmd -lpthread -lumem -lutil -lm -lnvpair -lavl -lzfs_core
-+LDADD=	-lmd -lpthread -lumem -lutil -lm -lnvpair -lavl -lzfs_core -lgeom -luutil
-+LDFLAGS+= -L${.CURDIR}/../../lib/libavl
- 
- SRCS=	deviceid.c \
- 	fsshare.c \
-diff --git a/cddl/lib/libzpool/Makefile b/cddl/lib/libzpool/Makefile
-index 61c4788..4888cc7 100644
---- a/cddl/lib/libzpool/Makefile
-+++ b/cddl/lib/libzpool/Makefile
-@@ -61,7 +61,7 @@ LDFLAGS+=	-L${.CURDIR}/../../lib/libnvpair
- LDFLAGS+=	-L${.CURDIR}/../../lib/libumem
- 
- DPADD=		${LIBMD} ${LIBPTHREAD} ${LIBZ}
--LDADD=		-lmd -lpthread -lz
-+LDADD=		-lmd -lpthread -lz -lumem -lavl
- 
- # atomic.S doesn't like profiling.
- NO_PROFILE=
diff --git a/sys-freebsd/freebsd-cddl/freebsd-cddl-10.1.ebuild b/sys-freebsd/freebsd-cddl/freebsd-cddl-10.1.ebuild
deleted file mode 100644
index 785ef67e30bc..000000000000
--- a/sys-freebsd/freebsd-cddl/freebsd-cddl-10.1.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit bsdmk freebsd toolchain-funcs multilib
-
-DESCRIPTION="FreeBSD CDDL (opensolaris/zfs) extra software"
-SLOT="0"
-
-IUSE="build"
-LICENSE="CDDL GPL-2"
-
-if [[ ${PV} != *9999* ]]; then
-	KEYWORDS="~amd64-fbsd ~x86-fbsd"
-fi
-
-# sys is required.
-EXTRACTONLY="
-	cddl/
-	contrib/
-	usr.bin/
-	lib/
-	sbin/
-	sys/
-"
-use build && EXTRACTONLY+="include/"
-
-RDEPEND="=sys-freebsd/freebsd-lib-${RV}*
-	=sys-freebsd/freebsd-libexec-${RV}*
-	build? ( sys-apps/baselayout )"
-
-DEPEND="${RDEPEND}
-	=sys-freebsd/freebsd-mk-defs-${RV}*
-	!build? ( =sys-freebsd/freebsd-sources-${RV}* )"
-
-S="${WORKDIR}/cddl"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-9.2-libpaths.patch"
-	"${FILESDIR}/${PN}-10.1-underlink.patch"
-	)
-
-src_prepare() {
-	if [[ ! -e "${WORKDIR}/include" ]]; then
-		# Link in include headers.
-		ln -s "/usr/include" "${WORKDIR}/include" || die "Symlinking /usr/include.."
-	fi
-}
-
-src_install() {
-	# Install libraries proper place
-	local mylibdir=$(get_libdir)
-	mkinstall SHLIBDIR="/usr/${mylibdir}" LIBDIR="/usr/${mylibdir}" || die
-
-	gen_usr_ldscript -a avl nvpair umem uutil zfs zpool zfs_core
-
-	# Install zfs volinit script.
-	newinitd "${FILESDIR}"/zvol.initd-9.0 zvol
-
-	# Install zfs script
-	newinitd "${FILESDIR}"/zfs.initd zfs
-
-	keepdir /etc/zfs
-}
diff --git a/sys-freebsd/freebsd-lib/Manifest b/sys-freebsd/freebsd-lib/Manifest
index 06951e89dfc2..fc5e1afe3356 100644
--- a/sys-freebsd/freebsd-lib/Manifest
+++ b/sys-freebsd/freebsd-lib/Manifest
@@ -11,12 +11,8 @@ DIST freebsd-include-8.2.tar.bz2 138992 SHA256 fade90621a8e4880c9583c1ee49965400
 DIST freebsd-include-9.1.tar.bz2 146881 SHA256 861dce3f39e6806762b102361017cbe148f0e2b768b3fca152f8426f44a2942f SHA512 779c8315ce2b10b343bb62e331525d510b0d68ce5d665a1672bd6f4d1eff6445bc6b7a0f178b319828aa203c4e4c04c561ce793052703f4f936ce9711280a0c9 WHIRLPOOL e16ba45d380591ba007ca59579d45f61ffc1aa1a4c08fc11ed2794979b0a189a346c81b4f70a44ee199d50a72024930f28587ad62a9cd6854fc937eb466ec115
 DIST freebsd-lib-8.2.tar.bz2 3323878 SHA256 e3590c12794fcb5ba8eb7a1f58b497587cf19f9200b3254c194a793da3b5bfb0 SHA512 c059cfdd1099bb519b2a5c43fb7e7104c500ef8906229ed7eb9e420cb3a217cdaf8655e9e7a9f45cfadc5491f8115e0e738fd49251d9f0c3a83780845b09f007 WHIRLPOOL 95f98a372f44a89bc8ac3029ec065dbbfec338e6f889d057d75644bfcdfb9d27fdc0421d7e392cad5a823712b97f0857297ec3d321580254c63032c22b95792e
 DIST freebsd-lib-9.1.tar.bz2 3206685 SHA256 f31fa8107b4de711c548f6d0c1bb1f81d09f51bcc3b14a1e9e90bb0e7cc4a35d SHA512 40d0c36b6b889c404fa0e0afa38ba4e84a55bc88ffa2f98a70afbd7a32c4f32c158617ba770567d082a986d62c09b3ec8db3dc5ab853ee1c9bbe0b90bb82396e WHIRLPOOL 581878bf9c43184b043b4293409b85901c9ed1f9bd279e965414aca41ba50950848ebda3ee10a503a028135dfd2765e95a11acd4e62a11c528e104392bbbd8d0
-DIST freebsd-lib-EN-1509-xlocale.patch 1711 SHA256 41f723413cd28b95bd5512d118e81a5ee9297cfd5e87eb1e7e32c845a108e35c SHA512 e4c3299725d0f306ef8fad3d289c777d600f9db02dd0c73c93e4c77d5d3c3ff3345733a341e5a000495588316ee5f67ade144e35323868177681b8bcbfa01fc2 WHIRLPOOL f1e2b48444035751bd927d785842dc237367aefa3f77d0b9dccaeec4408b7d7d3967d4e786a5aa600fc2749b7333434dd81ac712bae52f9ed4144710a326341f
-DIST freebsd-lib-EN-1510-iconv.patch 3000 SHA256 adcf65f7263c0d981d93e301070abbbb0cac1330f1c012f1fba7f361daf3fe98 SHA512 0634e552a14603888bb2f1f4b981ae6b1413508a495c44917321846b232988fdb2e8e5c169d61f91c7f9b8c515bedf0e6b5092c5c4e90164469fe75468c6cf77 WHIRLPOOL f6c1cf09482cb691015b5b50c36c58d69ec6e97fccf1c45f068559ec818db7a9fcae402d559b081e7a06865f774ffd8eaec3ae0041103c077a44ab47eeffd756
-DIST freebsd-lib-SA-1427-stdio.patch 605 SHA256 f8e3556e82a9d256bd42be796dd1a8672b84259087369087ecf8fb2ddcdbdbd7 SHA512 9462e5e4a8a04999b0d434e47bd6891e638281d13f2aba1ff7e2fd6f2b3a698f1339aac2b257404eb52498b14bcdb7b512b82ea203b176a0cb42891da292e691 WHIRLPOOL 942287e5fe27452d1c5c046d00d1e33cf57052ad3429a81ef5da2b4eb93d96aad734d31f0e1c196278a9ab232ec6efc4217c2ff28b271ed63878c6677f4753dc
 DIST freebsd-libexec-8.2.tar.bz2 289147 SHA256 10b996d1d8cd044ee2e7a877e5e6ad2bf050cce9b3bd402a5e0dea7d290b595d SHA512 abe6cf5a268675d7dcb1c214c46fef47a3fb09b31947f5d8a0b938d352295efe0249beb5007649c52187bf4c221b6ebf074d18dfe9bafd168cae09ee02ab608d WHIRLPOOL 27e854fe465eb933dd8e27c5a09b063e4d3798b54e0914c79a9120dcdc34cc5d525a0c92da7b645ff7ab2ab4f34c7f7b2783012dfa5004407acd11150062b7ad
 DIST freebsd-libexec-9.1.tar.bz2 304592 SHA256 71e6e9e41328c2148c54b81ad9b59f912a1d5f0d52e17ac07f223aa7a94b82be SHA512 7baa4160dda2610250dd52f445e24478e0f1ea10bce21fcd0e5d1b856f399b896adc334114de0c7f61a5637e4349bb1688fdbe5c72798d8568ae791114710b92 WHIRLPOOL d800f477ac5c9ad6dae3e0091c83e107609b5a1e3aa79e9533fcd10a8dd34ff7733ab9523eae7c292310fe94f6a529209cae6b9e8bac6b47244e59834593e74b
-DIST freebsd-src-10.1.tar.xz 115049476 SHA256 f919287a5ef51d4f133f27c99c54f2e8054f408d3dd53bc60f4e233cc75ec03d SHA512 4ded32b451e2807e24a06305502f88ea633b2899a7ccd9cab3dc98fc865ef91324c93c512a08cf6e295313a8d7e79aa9d7af07da40e7276d986b06419b984152 WHIRLPOOL 1eff9419d89b8a70f064171883d92e160b250cd637972eb9107a19d7b3c904b554c4f51eaa9ff9642ef2c4234bde05cf9aef16d0c39280b55084f831700dea80
 DIST freebsd-src-10.2.tar.xz 124551336 SHA256 6a59ea716bae96135983ad70cd7123e3b35ec91b191a82fe282ade88a61560b1 SHA512 fba4588fdaa94fa4582a8de566a84cf4f2badc87c7b2e0745d7a31c1e349b2d5f59dbdbb16a9d43421155c1ac4bdec8db24c5d32ac5a92be687d4ed70fe35835 WHIRLPOOL e325db3c07118762021d802c4f20c7a5fd4b816f08cab6f92b408399f1b3bf8ad89728d51c354ab21478265a4539463c94aae9ae49f0ac10cd3c3f8f640dc186
 DIST freebsd-sys-8.2.tar.bz2 25835329 SHA256 0c6c7b61aae94db2931f985d5899f3bca78fc8ffab6b598fbaa158142d676f16 SHA512 6ea4516a5c52e25c4f993f7acb875463a5caea93dbdf250c5d48eee95fff226956e9f030cab7e341b5e6a132325bc3dbf93dcb4b1185acb011918e50b1a22be3 WHIRLPOOL 870deeff877c6b9fc812a4260e4fdbb6715a5dc2065cab3bfbf2a42d876f6654703ccb124275a4e2c410cef48f3db02b63cc76059eccf9cf90244826f35b7a15
 DIST freebsd-sys-9.1.tar.bz2 32588103 SHA256 b93a7ac8334ac16cc9f60665048e5ef812c0a6c62f10d0b0a674aec3f56516a8 SHA512 7dc9d9e00dde8f592bb171f4386d02b655b73cb4f153fe5ec063d010a148ef0639eae0dcdb3eeb09ecd1e3653c69e49a2d261329fa6d0381d2ddabe258ddde6d WHIRLPOOL c8348344dfb14bad64bd3a78ee615ddd29203175b292233254f8ba175e7a3fb7218af6f95f7b4dbf394c0354bafe9d8bb0c21cdf0ceaeb697214964b280469b3
diff --git a/sys-freebsd/freebsd-lib/freebsd-lib-10.1-r1.ebuild b/sys-freebsd/freebsd-lib/freebsd-lib-10.1-r1.ebuild
deleted file mode 100644
index 3829ae4b948b..000000000000
--- a/sys-freebsd/freebsd-lib/freebsd-lib-10.1-r1.ebuild
+++ /dev/null
@@ -1,640 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit bsdmk freebsd flag-o-matic multilib toolchain-funcs eutils multibuild multilib-build
-
-DESCRIPTION="FreeBSD's base system libraries"
-SLOT="0"
-
-# Security Advisory and Errata patches.
-UPSTREAM_PATCHES=( "SA-14:27/stdio.patch"
-	"EN-15:09/xlocale.patch"
-	"EN-15:10/iconv.patch" )
-
-# Crypto is needed to have an internal OpenSSL header
-# sys is needed for libalias, probably we can just extract that instead of
-# extracting the whole tarball
-if [[ ${PV} != *9999* ]]; then
-	KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-	SRC_URI="${SRC_URI}
-			$(freebsd_upstream_patches)"
-fi
-
-EXTRACTONLY="
-	lib/
-	contrib/
-	crypto/
-	libexec/
-	etc/
-	include/
-	usr.sbin/
-	gnu/
-	secure/
-"
-use build && EXTRACTONLY+="sys/"
-use zfs && EXTRACTONLY+="cddl/"
-
-if [ "${CATEGORY#*cross-}" = "${CATEGORY}" ]; then
-	RDEPEND="ssl? ( dev-libs/openssl )
-		hesiod? ( net-dns/hesiod )
-		kerberos? ( app-crypt/heimdal )
-		usb? ( !dev-libs/libusb )
-		zfs? ( =sys-freebsd/freebsd-cddl-${RV}* )
-		>=dev-libs/expat-2.0.1
-		=sys-freebsd/freebsd-libexec-${RV}*
-		!sys-libs/libutempter
-		!dev-libs/libelf
-		!dev-libs/libexecinfo
-		!dev-libs/libiconv
-		!sys-freebsd/freebsd-headers"
-	DEPEND="${RDEPEND}
-		>=sys-devel/flex-2.5.31-r2
-		=sys-freebsd/freebsd-sources-${RV}*"
-	RDEPEND="${RDEPEND}
-		=sys-freebsd/freebsd-share-${RV}*
-		>=virtual/libiconv-0-r2"
-else
-	EXTRACTONLY+="sys/"
-fi
-
-DEPEND="${DEPEND}
-		userland_GNU? ( sys-apps/mtree )
-		=sys-freebsd/freebsd-mk-defs-${RV}*"
-
-S="${WORKDIR}/lib"
-
-export CTARGET=${CTARGET:-${CHOST}}
-if [ "${CTARGET}" = "${CHOST}" -a "${CATEGORY#*cross-}" != "${CATEGORY}" ]; then
-	export CTARGET=${CATEGORY/cross-}
-fi
-
-IUSE="atm bluetooth ssl hesiod ipv6 kerberos usb netware
-	build crosscompile_opts_headers-only zfs
-	userland_GNU userland_BSD"
-
-QA_DT_NEEDED="lib/libc.so.7 usr/lib32/libc.so.7"
-
-pkg_setup() {
-	[ -c /dev/zero ] || \
-		die "You forgot to mount /dev; the compiled libc would break."
-
-	if ! use ssl && use kerberos; then
-		eerror "If you want kerberos support you need to enable ssl support, too."
-	fi
-
-	use atm || mymakeopts="${mymakeopts} WITHOUT_ATM= "
-	use bluetooth || mymakeopts="${mymakeopts} WITHOUT_BLUETOOTH= "
-	use hesiod || mymakeopts="${mymakeopts} WITHOUT_HESIOD= "
-	use ipv6 || mymakeopts="${mymakeopts} WITHOUT_INET6_SUPPORT= "
-	use kerberos || mymakeopts="${mymakeopts} WITHOUT_KERBEROS_SUPPORT= WITHOUT_GSSAPI= "
-	use netware || mymakeopts="${mymakeopts} WITHOUT_IPX= WITHOUT_IPX_SUPPORT= WITHOUT_NCP= "
-	use ssl || mymakeopts="${mymakeopts} WITHOUT_OPENSSL= "
-	use usb || mymakeopts="${mymakeopts} WITHOUT_USB= "
-	use zfs || mymakeopts="${mymakeopts} WITHOUT_CDDL= "
-
-	mymakeopts="${mymakeopts} WITHOUT_SENDMAIL= WITHOUT_CLANG= WITHOUT_LIBCPLUSPLUS= WITHOUT_LDNS= WITHOUT_UNBOUND= "
-
-	if [ "${CTARGET}" != "${CHOST}" ]; then
-		mymakeopts="${mymakeopts} MACHINE=$(tc-arch-kernel ${CTARGET})"
-		mymakeopts="${mymakeopts} MACHINE_ARCH=$(tc-arch-kernel ${CTARGET})"
-	fi
-}
-
-PATCHES=(
-	"${FILESDIR}/${PN}-6.0-pmc.patch"
-	"${FILESDIR}/${PN}-6.1-csu.patch"
-	"${FILESDIR}/${PN}-10.0-liblink.patch"
-	"${FILESDIR}/${PN}-10.0-atfcxx.patch"
-	"${FILESDIR}/${PN}-10.0-libusb.patch"
-	"${FILESDIR}/${PN}-10.0-libproc-libcxx.patch"
-	"${FILESDIR}/${PN}-bsdxml2expat.patch"
-	"${FILESDIR}/${PN}-9.0-bluetooth.patch"
-	"${FILESDIR}/${PN}-9.1-.eh_frame_hdr-fix.patch"
-	"${FILESDIR}/${PN}-add-nossp-cflags.patch"
-	)
-
-# Here we disable and remove source which we don't need or want
-# In order:
-# - ncurses stuff
-# - libexpat creates a bsdxml library which is the same as expat
-# - archiving libraries (have their own ebuild)
-# - sendmail libraries (they are installed by sendmail)
-# - SNMP library and dependency (have their own ebuilds)
-# - libstand: static library, 32bits on amd64 used for boot0, we build it from
-# boot0 instead.
-#
-# The rest are libraries we already have somewhere else because
-# they are contribution.
-REMOVE_SUBDIRS="ncurses \
-	libexpat \
-	libz libbz2 libarchive liblzma \
-	libsm libsmdb libsmutil \
-	libbegemot libbsnmp \
-	libpam libpcap libwrap libmagic \
-	libcom_err
-	libedit
-	libstand
-	libgssapi"
-
-# Are we building a cross-compiler?
-is_crosscompile() {
-	[ "${CATEGORY#*cross-}" != "${CATEGORY}" ]
-}
-
-src_prepare() {
-	sed -i.bak -e 's:-o/dev/stdout:-t:' "${S}/libc/net/Makefile.inc"
-
-	# Upstream Display Managers default to using VT7
-	# We should make FreeBSD allow this by default
-	local x=
-	for x in "${WORKDIR}"/etc/etc.*/ttys ; do
-		sed -i.bak \
-			-e '/ttyv5[[:space:]]/ a\
-# Display Managers default to VT7.\
-# If you use the xdm init script, keep ttyv6 commented out\
-# unless you force a different VT for the DM being used.' \
-			-e '/^ttyv[678][[:space:]]/ s/^/# /' "${x}" \
-			|| die "Failed to sed ${x}"
-		rm "${x}".bak
-	done
-
-	# This one is here because it also
-	# patches "${WORKDIR}/include"
-	cd "${WORKDIR}"
-	epatch "${FILESDIR}/${PN}-includes.patch"
-	epatch "${FILESDIR}/${PN}-8.0-gcc45.patch"
-	epatch "${FILESDIR}/${PN}-9.0-opieincludes.patch"
-
-	# Don't install the hesiod man page or header
-	rm "${WORKDIR}"/include/hesiod.h || die
-	sed -i.bak -e 's:hesiod.h::' "${WORKDIR}"/include/Makefile || die
-	sed -i.bak -e 's:hesiod.c::' -e 's:hesiod.3::' \
-	"${WORKDIR}"/lib/libc/net/Makefile.inc || die
-
-	# Fix the Makefiles of these few libraries that will overwrite our LDADD.
-	cd "${S}"
-	for dir in libradius libtacplus libcam libdevstat libfetch libgeom libmemstat libopie \
-		libsmb libprocstat libulog; do sed -i.bak -e 's:LDADD=:LDADD+=:g' "${dir}/Makefile" || \
-		die "Problem fixing \"${dir}/Makefile"
-	done
-	# Call LD with LDFLAGS, rename them to RAW_LDFLAGS
-	sed -e 's/LDFLAGS/RAW_LDFLAGS/g' \
-		-i "${S}/csu/i386-elf/Makefile" \
-		-i "${S}/csu/ia64/Makefile" || die
-	if use build; then
-		cd "${WORKDIR}"
-		# This patch has to be applied on ${WORKDIR}/sys, so we do it here since it
-		# shouldn't be a symlink to /usr/src/sys (which should be already patched)
-		epatch "${FILESDIR}"/${PN}-7.1-types.h-fix.patch
-		epatch "${FILESDIR}"/freebsd-sources-9.0-sysctluint.patch
-		return 0
-	fi
-
-	if ! is_crosscompile ; then
-		if [[ ! -e "${WORKDIR}/sys" ]]; then
-			ln -s "/usr/src/sys" "${WORKDIR}/sys" || die "Couldn't make sys symlink!"
-		fi
-	else
-		sed -i.bak -e "s:/usr/include:/usr/${CTARGET}/usr/include:g" \
-			"${S}/libc/rpc/Makefile.inc" \
-			"${S}/libc/yp/Makefile.inc"
-	fi
-
-	if install --version 2> /dev/null | grep -q GNU; then
-		sed -i.bak -e 's:${INSTALL} -C:${INSTALL}:' "${WORKDIR}/include/Makefile"
-	fi
-
-	# Try to fix sed calls for GNU sed. Do it only with GNU userland and force
-	# BSD's sed on BSD.
-	cd "${S}"
-	if use userland_GNU; then
-		find . -name Makefile -exec sed -ibak 's/sed -i /sed -i/' {} \;
-	fi
-}
-
-bootstrap_lib() {
-	for i ; do
-		cd "${WORKDIR}/${i}" || die "missing ${i}"
-		freebsd_src_compile
-		append-ldflags "-L${MAKEOBJDIRPREFIX}/${WORKDIR}/${i}"
-	done
-}
-
-get_csudir() {
-	if [ -d "${WORKDIR}/lib/csu/$1-elf" ]; then
-		echo "lib/csu/$1-elf"
-	else
-		echo "lib/csu/$1"
-	fi
-}
-
-bootstrap_csu() {
-	local csudir="$(get_csudir $(tc-arch-kernel ${CTARGET}))"
-	export RAW_LDFLAGS=$(raw-ldflags)
-	bootstrap_lib "${csudir}"
-
-	CFLAGS="${CFLAGS} -B ${MAKEOBJDIRPREFIX}/${WORKDIR}/${csudir}"
-	append-ldflags "-B ${MAKEOBJDIRPREFIX}/${WORKDIR}/${csudir}"
-
-	bootstrap_lib "gnu/lib/csu"
-
-	cd "${MAKEOBJDIRPREFIX}/${WORKDIR}/gnu/lib/csu"
-	for i in *.So ; do
-		ln -s $i ${i%.So}S.o
-	done
-	CFLAGS="${CFLAGS} -B ${MAKEOBJDIRPREFIX}/${WORKDIR}/gnu/lib/csu"
-	append-ldflags "-B ${MAKEOBJDIRPREFIX}/${WORKDIR}/gnu/lib/csu"
-}
-
-# Compile libssp_nonshared.a and add it's path to LDFLAGS.
-bootstrap_libssp_nonshared() {
-	bootstrap_lib "gnu/lib/libssp/libssp_nonshared"
-	export LDADD="-lssp_nonshared"
-}
-
-bootstrap_libgcc() {
-	bootstrap_lib "lib/libcompiler_rt"
-	cd "${MAKEOBJDIRPREFIX}/${WORKDIR}/lib/libcompiler_rt" || die
-	ln -s libcompiler_rt.a libgcc.a || die
-
-	bootstrap_lib "lib/libc" "gnu/lib/libgcc"
-}
-
-bootstrap_libthr() {
-	bootstrap_lib "lib/libthr"
-	cd "${MAKEOBJDIRPREFIX}/${WORKDIR}/lib/libthr" || die
-	ln -s libthr.so libpthread.so
-}
-
-# What to build for a cross-compiler.
-# We also need the csu but this has to be handled separately.
-CROSS_SUBDIRS="lib/libc lib/msun gnu/lib/libssp/libssp_nonshared lib/libthr lib/libutil lib/librt lib/libc_nonshared"
-
-# What to build for non-default ABIs.
-NON_NATIVE_SUBDIRS="${CROSS_SUBDIRS} gnu/lib/csu lib/libcompiler_rt gnu/lib/libgcc lib/libmd lib/libcrypt lib/libsbuf lib/libcam lib/libelf lib/libiconv_modules"
-
-# Subdirs for a native build:
-NATIVE_SUBDIRS="lib gnu/lib/libssp/libssp_nonshared gnu/lib/libregex gnu/lib/csu gnu/lib/libgcc lib/libiconv_modules"
-
-# Is my $ABI native ?
-is_native_abi() {
-	is_crosscompile && return 1
-	multilib_is_native_abi
-}
-
-# Do we need to bootstrap the csu and libssp_nonshared?
-need_bootstrap() {
-	is_crosscompile || use build || { ! is_native_abi && ! has_version '>=sys-freebsd/freebsd-lib-9.1-r8[multilib]' && ! has_version ">=sys-freebsd/freebsd-lib-9.1-r11[${MULTILIB_USEDEP}]" ; } || has_version "<${CATEGORY}/${P}"
-}
-
-# Get the subdirs we are building.
-get_subdirs() {
-	local ret=""
-	if is_native_abi ; then
-		# If we are building for the native ABI, build everything
-		ret="${NATIVE_SUBDIRS}"
-	elif is_crosscompile ; then
-		# With a cross-compiler we only build the very core parts.
-		ret="${CROSS_SUBDIRS}"
-		if [ "${EBUILD_PHASE}" = "install" ]; then
-			# Add the csu dir first when installing. We treat it separately for
-			# compiling.
-			ret="$(get_csudir $(tc-arch-kernel ${CTARGET})) ${ret}"
-		fi
-	else
-		# For the non-native ABIs we only build the csu parts and very core
-		# libraries for now.
-		ret="${NON_NATIVE_SUBDIRS} $(get_csudir $(tc-arch-kernel ${CHOST}))"
-	fi
-	echo "${ret}"
-}
-
-# Bootstrap the core libraries and setup the flags so that the other parts can
-# build against it.
-do_bootstrap() {
-	einfo "Bootstrapping on ${CHOST} for ${CTARGET}"
-	if ! is_crosscompile ; then
-		# Pre-install headers, but not when building a cross-compiler since we
-		# assume they have been installed in the previous pass.
-		einfo "Pre-installing includes in include_proper_${ABI}"
-		mkdir "${WORKDIR}/include_proper_${ABI}" || die
-		CTARGET="${CHOST}" install_includes "/include_proper_${ABI}"
-		CFLAGS="${CFLAGS} -isystem ${WORKDIR}/include_proper_${ABI}"
-		CXXFLAGS="${CXXFLAGS} -isystem ${WORKDIR}/include_proper_${ABI}"
-	fi
-	bootstrap_csu
-	bootstrap_libssp_nonshared
-	is_crosscompile && bootstrap_lib "lib/libc"
-	is_crosscompile || is_native_abi || bootstrap_libgcc
-	is_native_abi   || bootstrap_libthr
-}
-
-# Compile it. Assume we have the toolchain setup correctly.
-do_compile() {
-	# Bootstrap if needed, otherwise assume the system headers are in
-	# /usr/include.
-	if need_bootstrap ; then
-		do_bootstrap
-	else
-		CFLAGS="${CFLAGS} -isystem /usr/include"
-		CXXFLAGS="${CXXFLAGS} -isystem /usr/include"
-	fi
-
-	export RAW_LDFLAGS=$(raw-ldflags)
-
-	# Everything is now setup, build it!
-	for i in $(get_subdirs) ; do
-		einfo "Building in ${i}... with CC=${CC} and CFLAGS=${CFLAGS}"
-		cd "${WORKDIR}/${i}/" || die "missing ${i}."
-		freebsd_src_compile || die "make ${i} failed"
-	done
-}
-
-src_compile() {
-	# Does not work with GNU sed
-	# Force BSD's sed on BSD.
-	if use userland_BSD ; then
-		export ESED=/usr/bin/sed
-		unalias sed
-	fi
-
-	use usb && export NON_NATIVE_SUBDIRS="${NON_NATIVE_SUBDIRS} lib/libusb lib/libusbhid"
-
-	cd "${WORKDIR}/include"
-	$(freebsd_get_bmake) CC="$(tc-getCC)" || die "make include failed"
-
-	use crosscompile_opts_headers-only && return 0
-
-	# Bug #270098
-	append-flags $(test-flags -fno-strict-aliasing)
-
-	# Bug #324445
-	append-flags $(test-flags -fno-strict-overflow)
-
-	# strip flags and do not do it later, we only add safe, and in fact
-	# needed flags after all
-	strip-flags
-	export NOFLAGSTRIP=yes
-	if is_crosscompile ; then
-		export YACC='yacc -by'
-		CHOST=${CTARGET} tc-export CC LD CXX RANLIB
-		mymakeopts="${mymakeopts} NLS="
-		CFLAGS="${CFLAGS} -isystem /usr/${CTARGET}/usr/include"
-		CXXFLAGS="${CXXFLAGS} -isystem /usr/${CTARGET}/usr/include"
-		append-ldflags "-L${WORKDIR}/${CHOST}/${WORKDIR}/lib/libc"
-	fi
-
-	if is_crosscompile ; then
-		do_compile
-	else
-		local MULTIBUILD_VARIANTS=( $(multilib_get_enabled_abis) )
-		multibuild_foreach_variant freebsd_multilib_multibuild_wrapper do_compile
-	fi
-}
-
-gen_libc_ldscript() {
-	# Parameters:
-	#   $1 = target libdir
-	#   $2 = source libc dir
-	#   $3 = source libssp_nonshared dir
-
-	# Clear the symlink.
-	rm -f "${D}/$2/libc.so" || die
-
-	# Move the library if needed
-	if [ "$1" != "$2" ] ; then
-		mv "${D}/$2/libc.so.7" "${D}/$1/" || die
-	fi
-
-	# Generate libc.so ldscript for inclusion of libssp_nonshared.a when linking
-	# this is done to avoid having to touch gcc spec file as it is currently
-	# done on FreeBSD upstream, mostly because their binutils aren't able to
-	# cope with linker scripts yet.
-	# Taken from toolchain-funcs.eclass:
-	local output_format
-	output_format=$($(tc-getCC) ${CFLAGS} ${LDFLAGS} -Wl,--verbose 2>&1 | sed -n 's/^OUTPUT_FORMAT("\([^"]*\)",.*/\1/p')
-	[[ -n ${output_format} ]] && output_format="OUTPUT_FORMAT ( ${output_format} )"
-
-	# iconv symbol provided by libc_nonshared.a.
-	# http://svnweb.freebsd.org/base?view=revision&amp;revision=258283
-	cat > "${D}/$2/libc.so" <<-END_LDSCRIPT
-/* GNU ld script
-   SSP (-fstack-protector) requires __stack_chk_fail_local to be local.
-   GCC invokes this symbol in a non-PIC way, which results in TEXTRELs if
-   this symbol was provided by a shared libc. So we link in
-   libssp_nonshared.a from here.
- */
-${output_format}
-GROUP ( /$1/libc.so.7 /$3/libc_nonshared.a /$3/libssp_nonshared.a )
-END_LDSCRIPT
-}
-
-header_list=""
-
-move_header() {
-	local dirname=$(dirname ${1})
-	local filename=$(basename ${1})
-
-	if [ ! -d "${dirname}/${ABI}" ] ; then
-		mkdir "${dirname}/${ABI}" || die
-	fi
-
-	mv "${1}" "${dirname}/${ABI}/" || die
-
-	export header_list="${header_list} ${1}"
-}
-
-make_header_template() {
-	cat <<-END_HEADER
-/*
- * Wrapped header for multilib support.
- * See the real headers included below.
- */
-
-#if defined(__x86_64__)
-  @ABI_amd64_fbsd@
-#elif defined(__i386__)
-  @ABI_x86_fbsd@
-#else
-  @ABI_${DEFAULT_ABI}@
-#endif
-END_HEADER
-}
-
-wrap_header() {
-	local dirname=$(dirname ${1})
-	local filename=$(basename ${1})
-
-	if [ -n "${dirname#.}" ] ; then
-		dirname="${dirname}/${2}"
-	else
-		dirname="${2}"
-	fi
-
-	if [ -f "${dirname}/${filename}" ] ; then
-		sed -e "s:@ABI_${2}@:#include <${dirname}/${filename}>:" ${1}
-	else
-		cat ${1}
-	fi
-}
-
-wrap_header_end() {
-	sed -e "s:@ABI_.*@:#error \"Sorry, no support for your ABI.\":" ${1}
-}
-
-do_install() {
-	if is_crosscompile ; then
-		INCLUDEDIR="/usr/${CTARGET}/usr/include"
-	else
-		INCLUDEDIR="/usr/include"
-	fi
-
-	dodir ${INCLUDEDIR}
-	CTARGET="${CHOST}" \
-		install_includes ${INCLUDEDIR}
-
-	is_crosscompile && use crosscompile_opts_headers-only && return 0
-
-	# Install a libusb.pc for better compat with Linux's libusb
-	if use usb ; then
-		dodir /usr/$(get_libdir)/pkgconfig
-		sed -i.bkp "s:^libdir=.*:libdir=/usr/$(get_libdir):g" "${S}"/libusb/libusb-*.pc
-	fi
-
-	for i in $(get_subdirs) ; do
-		if [[ ${i} != *libiconv_modules* ]] ; then
-			einfo "Installing in ${i}..."
-			cd "${WORKDIR}/${i}/" || die "missing ${i}."
-			freebsd_src_install || die "Install ${i} failed"
-		fi
-	done
-
-	if ! is_crosscompile; then
-		local mymakeopts_save="${mymakeopts}"
-		mymakeopts="${mymakeopts} SHLIBDIR=/usr/$(get_libdir)/i18n LIBDIR=/usr/$(get_libdir)/i18n"
-
-		einfo "Installing in lib/libiconv_modules..."
-		cd "${WORKDIR}/lib/libiconv_modules/" || die "missing libiconv_modules."
-		freebsd_src_install || die "Install lib/libiconv_modules failed"
-
-		mymakeopts="${mymakeopts_save}"
-	fi
-
-	if ! is_crosscompile ; then
-		if ! multilib_is_native_abi ; then
-			gen_libc_ldscript "usr/$(get_libdir)" "usr/$(get_libdir)" "usr/$(get_libdir)"
-		else
-			dodir "$(get_libdir)"
-			gen_libc_ldscript "$(get_libdir)" "usr/$(get_libdir)" "usr/$(get_libdir)"
-		fi
-	else
-		CHOST=${CTARGET} gen_libc_ldscript "usr/${CTARGET}/usr/lib" "usr/${CTARGET}/usr/lib" "usr/${CTARGET}/usr/lib"
-		# We're done for the cross libc here.
-		return 0
-	fi
-
-	# Generate ldscripts for core libraries that will go in /
-	multilib_is_native_abi && \
-		gen_usr_ldscript -a alias cam geom ipsec jail kiconv \
-			kvm m md procstat sbuf thr ufs util elf
-
-	if [[ ${#MULTIBUILD_VARIANTS[@]} -gt 1 ]] ; then
-		cd "${D}/usr/include"
-		for i in machine/*.h fenv.h ; do
-			move_header ${i}
-		done
-		if multilib_is_native_abi ; then
-			# Supposedly the last one!
-			local uniq_headers="$(echo ${header_list} | tr ' ' '\n' | sort | uniq | tr '\n' ' ')"
-			for j in ${uniq_headers} ; do
-				make_header_template > ${j}
-				for i in $(get_all_abis) ; do
-					wrap_header ${j} ${i} > ${j}.new
-					cp ${j}.new ${j}
-					rm -f ${j}.new
-				done
-				wrap_header_end ${j} > ${j}.new
-				cp ${j}.new ${j}
-				rm -f ${j}.new
-			done
-		fi
-	fi
-}
-
-src_install() {
-	if is_crosscompile ; then
-		einfo "Installing for ${CTARGET} in ${CHOST}.."
-		# From this point we need to force: get stripped with the correct tools,
-		# get tc-arch-kernel to return the right value, etc.
-		export CHOST=${CTARGET}
-
-		mymakeopts="${mymakeopts} NO_MAN= \
-			INCLUDEDIR=/usr/${CTARGET}/usr/include \
-			SHLIBDIR=/usr/${CTARGET}/usr/lib \
-			LIBDIR=/usr/${CTARGET}/usr/lib"
-
-		dosym "usr/include" "/usr/${CTARGET}/sys-include"
-		do_install
-
-		return 0
-	else
-		export STRIP_MASK="*/usr/lib*/*crt*.o"
-		local MULTIBUILD_VARIANTS=( $(multilib_get_enabled_abis) )
-		multibuild_foreach_variant freebsd_multilib_multibuild_wrapper do_install
-	fi
-
-	cd "${WORKDIR}/etc/"
-	insinto /etc
-	doins nls.alias mac.conf netconfig
-
-	# Install ttys file
-	local MACHINE="$(tc-arch-kernel)"
-	doins "etc.${MACHINE}"/*
-}
-
-install_includes()
-{
-	local INCLUDEDIR="$1"
-
-	# The idea is to be called from either install or unpack.
-	# During unpack it's required to install them as portage's user.
-	if [[ "${EBUILD_PHASE}" == "install" ]]; then
-		local DESTDIR="${D}"
-		BINOWN="root"
-		BINGRP="wheel"
-	else
-		local DESTDIR="${WORKDIR}"
-		[[ -z "${USER}" ]] && USER="portage"
-		BINOWN="${USER}"
-		[[ -z "${GROUPS}" ]] && GROUPS="portage"
-		BINGRP="${GROUPS}"
-	fi
-
-	# Must exist before we use it.
-	[[ -d "${DESTDIR}${INCLUDEDIR}" ]] || die "dodir or mkdir ${INCLUDEDIR} before using install_includes."
-	cd "${WORKDIR}/include"
-
-	local MACHINE="$(tc-arch-kernel)"
-
-	einfo "Installing includes into ${INCLUDEDIR} as ${BINOWN}:${BINGRP}..."
-	$(freebsd_get_bmake) installincludes \
-		MACHINE=${MACHINE} MACHINE_ARCH=${MACHINE} \
-		DESTDIR="${DESTDIR}" \
-		INCLUDEDIR="${INCLUDEDIR}" BINOWN="${BINOWN}" \
-		BINGRP="${BINGRP}" \
-		WITHOUT_GSSAPI= || die "install_includes() failed"
-	einfo "includes installed ok."
-	EXTRA_INCLUDES="lib/librtld_db lib/libutil lib/msun gnu/lib/libregex"
-	for i in $EXTRA_INCLUDES; do
-		einfo "Installing $i includes into ${INCLUDEDIR} as ${BINOWN}:${BINGRP}..."
-		cd "${WORKDIR}/$i" || die
-		$(freebsd_get_bmake) installincludes DESTDIR="${DESTDIR}" \
-			MACHINE=${MACHINE} MACHINE_ARCH=${MACHINE} \
-			INCLUDEDIR="${INCLUDEDIR}" BINOWN="${BINOWN}" \
-			BINGRP="${BINGRP}" || die "problem installing $i includes."
-		einfo "$i includes installed ok."
-	done
-}
diff --git a/sys-freebsd/freebsd-libexec/Manifest b/sys-freebsd/freebsd-libexec/Manifest
index d4bc80dbd7b0..30aef2a0d87b 100644
--- a/sys-freebsd/freebsd-libexec/Manifest
+++ b/sys-freebsd/freebsd-libexec/Manifest
@@ -8,7 +8,6 @@ DIST freebsd-lib-8.2.tar.bz2 3323878 SHA256 e3590c12794fcb5ba8eb7a1f58b497587cf1
 DIST freebsd-lib-9.1.tar.bz2 3206685 SHA256 f31fa8107b4de711c548f6d0c1bb1f81d09f51bcc3b14a1e9e90bb0e7cc4a35d SHA512 40d0c36b6b889c404fa0e0afa38ba4e84a55bc88ffa2f98a70afbd7a32c4f32c158617ba770567d082a986d62c09b3ec8db3dc5ab853ee1c9bbe0b90bb82396e WHIRLPOOL 581878bf9c43184b043b4293409b85901c9ed1f9bd279e965414aca41ba50950848ebda3ee10a503a028135dfd2765e95a11acd4e62a11c528e104392bbbd8d0
 DIST freebsd-libexec-8.2.tar.bz2 289147 SHA256 10b996d1d8cd044ee2e7a877e5e6ad2bf050cce9b3bd402a5e0dea7d290b595d SHA512 abe6cf5a268675d7dcb1c214c46fef47a3fb09b31947f5d8a0b938d352295efe0249beb5007649c52187bf4c221b6ebf074d18dfe9bafd168cae09ee02ab608d WHIRLPOOL 27e854fe465eb933dd8e27c5a09b063e4d3798b54e0914c79a9120dcdc34cc5d525a0c92da7b645ff7ab2ab4f34c7f7b2783012dfa5004407acd11150062b7ad
 DIST freebsd-libexec-9.1.tar.bz2 304592 SHA256 71e6e9e41328c2148c54b81ad9b59f912a1d5f0d52e17ac07f223aa7a94b82be SHA512 7baa4160dda2610250dd52f445e24478e0f1ea10bce21fcd0e5d1b856f399b896adc334114de0c7f61a5637e4349bb1688fdbe5c72798d8568ae791114710b92 WHIRLPOOL d800f477ac5c9ad6dae3e0091c83e107609b5a1e3aa79e9533fcd10a8dd34ff7733ab9523eae7c292310fe94f6a529209cae6b9e8bac6b47244e59834593e74b
-DIST freebsd-src-10.1.tar.xz 115049476 SHA256 f919287a5ef51d4f133f27c99c54f2e8054f408d3dd53bc60f4e233cc75ec03d SHA512 4ded32b451e2807e24a06305502f88ea633b2899a7ccd9cab3dc98fc865ef91324c93c512a08cf6e295313a8d7e79aa9d7af07da40e7276d986b06419b984152 WHIRLPOOL 1eff9419d89b8a70f064171883d92e160b250cd637972eb9107a19d7b3c904b554c4f51eaa9ff9642ef2c4234bde05cf9aef16d0c39280b55084f831700dea80
 DIST freebsd-src-10.2.tar.xz 124551336 SHA256 6a59ea716bae96135983ad70cd7123e3b35ec91b191a82fe282ade88a61560b1 SHA512 fba4588fdaa94fa4582a8de566a84cf4f2badc87c7b2e0745d7a31c1e349b2d5f59dbdbb16a9d43421155c1ac4bdec8db24c5d32ac5a92be687d4ed70fe35835 WHIRLPOOL e325db3c07118762021d802c4f20c7a5fd4b816f08cab6f92b408399f1b3bf8ad89728d51c354ab21478265a4539463c94aae9ae49f0ac10cd3c3f8f640dc186
 DIST freebsd-ubin-8.2.tar.bz2 1808012 SHA256 6b99554f3ad6ee052069b347eb6e6219b71598d7b222acb90a24cbfc805c7b68 SHA512 48d0103323e820c431aa4f62d3be40cb3b200fb62e3de01f36c88760395bf2ba3367c51f3fa72da4dbccc2812176a051a12ca5cb7e84125c3e0fc78d4cab2c29 WHIRLPOOL ea8f3a29a37b42c2b5bcc0f2c343fa1538522157ef075363c94606a4620a590e9a03f856ce2494e3e727935b62431991d0aa9fde71de699e78b4fe225bdf1c2c
 DIST freebsd-ubin-9.1.tar.bz2 1910472 SHA256 ff6e586f213534b6ec2e65002c0dee64063d76ddad515c12221b1a80a1815e48 SHA512 74ae0aceec8597aa66c3f1ab313f0685a3c63d7273c36ae7baf8794275ad9bca241c60c3f6281cccf6d531d250d7611099977d3b1a27279cef3586401b6af05e WHIRLPOOL c85a3c9cf2bceff2c60ff03556bcc81d3aca22b0bce3c9538990071ac0a907236eee5ae7743ad22c5fd309b047ebf392aaaf2fe177ef5790ea869aff3da7e2fe
diff --git a/sys-freebsd/freebsd-libexec/files/freebsd-libexec-10.0-atf-check.patch b/sys-freebsd/freebsd-libexec/files/freebsd-libexec-10.0-atf-check.patch
deleted file mode 100644
index c7bb6864f3c9..000000000000
--- a/sys-freebsd/freebsd-libexec/files/freebsd-libexec-10.0-atf-check.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff --git a/libexec/atf/Makefile.inc b/libexec/atf/Makefile.inc
-index a28f546..9f55937 100644
---- a/libexec/atf/Makefile.inc
-+++ b/libexec/atf/Makefile.inc
-@@ -27,6 +27,6 @@
- 
- ATF = ${.CURDIR}/../../../contrib/atf
- 
--CFLAGS+=	-DHAVE_CONFIG_H
-+CXXFLAGS+=	-DHAVE_CONFIG_H
- 
- WARNS?=		3
-diff --git a/libexec/atf/atf-check/Makefile b/libexec/atf/atf-check/Makefile
-index fafb1e4..3710403 100644
---- a/libexec/atf/atf-check/Makefile
-+++ b/libexec/atf/atf-check/Makefile
-@@ -34,7 +34,7 @@ PROG_CXX=	atf-check
- SRCS=		atf-check.cpp
- MAN=		atf-check.1
- 
--CFLAGS+=	-I${ATF}
-+CXXFLAGS+=	-I${ATF}
- 
- DPADD+=		${LIBATF_CXX} ${LIBATF_C}
- 
diff --git a/sys-freebsd/freebsd-libexec/freebsd-libexec-10.1.ebuild b/sys-freebsd/freebsd-libexec/freebsd-libexec-10.1.ebuild
deleted file mode 100644
index 838d6c0b7665..000000000000
--- a/sys-freebsd/freebsd-libexec/freebsd-libexec-10.1.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit bsdmk freebsd pam multilib multibuild multilib-build
-
-DESCRIPTION="FreeBSD libexec things"
-SLOT="0"
-
-if [[ ${PV} != *9999* ]]; then
-	KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-fi
-
-EXTRACTONLY="
-	libexec/
-	usr.bin/
-	bin/
-	contrib/hyperv/
-	lib/
-	etc/
-	usr.sbin/
-"
-
-RDEPEND="=sys-freebsd/freebsd-lib-${RV}*
-	>=sys-freebsd/freebsd-lib-9.1-r11[${MULTILIB_USEDEP}]
-	pam? ( virtual/pam )"
-DEPEND="${RDEPEND}
-	=sys-freebsd/freebsd-mk-defs-${RV}*
-	=sys-freebsd/freebsd-sources-${RV}*"
-RDEPEND="${RDEPEND}
-	xinetd? ( sys-apps/xinetd )"
-
-S="${WORKDIR}/libexec"
-
-# Remove sendmail, tcp_wrapper and other useless stuff
-REMOVE_SUBDIRS="smrsh mail.local tcpd telnetd rshd rlogind ftpd"
-
-IUSE="pam ssl kerberos ipv6 nis xinetd"
-
-PATCHES=( "${FILESDIR}/${PN}-9.2-no_ld32.patch"
-	"${FILESDIR}/${PN}-10.0-atf-check.patch" )
-
-pkg_setup() {
-	use ipv6 || mymakeopts="${mymakeopts} WITHOUT_INET6= WITHOUT_INET6_SUPPORT= "
-	use kerberos || mymakeopts="${mymakeopts} WITHOUT_KERBEROS_SUPPORT= "
-	use nis || mymakeopts="${mymakeopts} WITHOUT_NIS= "
-	use pam || mymakeopts="${mymakeopts} WITHOUT_PAM_SUPPORT= "
-	use ssl || mymakeopts="${mymakeopts} WITHOUT_OPENSSL= "
-
-	mymakeopts="${mymakeopts} WITHOUT_SENDMAIL= WITHOUT_PF= WITHOUT_RCMDS= "
-}
-
-src_prepare() {
-	if [[ ! -e "${WORKDIR}/include" ]]; then
-		ln -s /usr/include "${WORKDIR}/include" || die "Symlinking /usr/include.."
-	fi
-	# allow upgrade directly from 9.x to 10.1.
-	if has_version "<sys-freebsd/freebsd-lib-10.0"; then
-		# taken from sys/sys/elf_common.h
-		echo "#define DF_1_INTERPOSE 0x00000400" >> "${S}"/rtld-elf/rtld.h
-		echo "#define STT_GNU_IFUNC 10" >> "${S}"/rtld-elf/rtld.h
-		echo "#define R_386_IRELATIVE 42" >> "${S}"/rtld-elf/rtld.h
-		echo "#define PT_GNU_RELRO 0x6474e552" >> "${S}"/rtld-elf/rtld.h
-		echo "#define DF_1_NODEFLIB 0x00000800" >> "${S}"/rtld-elf/rtld.h
-		# taken from sys/sys/fcntl.h
-		echo "#define F_DUPFD_CLOEXEC 17" >> "${S}"/rtld-elf/rtld.h
-		# taken from sys/sys/cdefs.h
-		echo '#define __compiler_membar()  __asm __volatile(" " : : : "memory")' >> "${S}"/rtld-elf/rtld.h
-	fi
-}
-
-setup_multilib_vars() {
-	if ! multilib_is_native_abi ; then
-		cd "${WORKDIR}/libexec/rtld-elf" || die
-		export mymakeopts="${mymakeopts} PROG=ld-elf32.so.1"
-	else
-		cd "${S}"
-	fi
-	"$@"
-}
-
-src_compile() {
-	local MULTIBUILD_VARIANTS=( $(multilib_get_enabled_abis) )
-	multibuild_foreach_variant freebsd_multilib_multibuild_wrapper setup_multilib_vars freebsd_src_compile
-}
-
-src_install() {
-	local MULTIBUILD_VARIANTS=( $(multilib_get_enabled_abis) )
-	multibuild_foreach_variant freebsd_multilib_multibuild_wrapper setup_multilib_vars freebsd_src_install
-
-	insinto /etc
-	doins "${WORKDIR}/etc/gettytab"
-	newinitd "${FILESDIR}/bootpd.initd" bootpd
-	newconfd "${FILESDIR}/bootpd.confd" bootpd
-
-	if use xinetd; then
-		for rpcd in rstatd rusersd walld rquotad sprayd; do
-			insinto /etc/xinetd.d
-			newins "${FILESDIR}/${rpcd}.xinetd" ${rpcd}
-		done
-	fi
-}
diff --git a/sys-freebsd/freebsd-mk-defs/Manifest b/sys-freebsd/freebsd-mk-defs/Manifest
index e01e29fc31d6..b65e23f53678 100644
--- a/sys-freebsd/freebsd-mk-defs/Manifest
+++ b/sys-freebsd/freebsd-mk-defs/Manifest
@@ -1,4 +1,3 @@
 DIST freebsd-share-8.2.tar.bz2 3797560 SHA256 dd082c6ddbf8e08ec91d9810d51af4111339bed912b0f74d05be283780292ba0 SHA512 b3f964253f80e58cde12f26e48a23aa75c17b9ab2810f91a4bd2d7efbe902af7c73c219f8373a4fc97ee0a35d25627b8815c79c136ef18620acc8bd0ee5bd6c4 WHIRLPOOL 42326ad6139feadf80509f5e810f6a86009ad3a69aad9550c6355389773c28d5b2f7930eaa852f8442808485d13e5b758ed3420e39048bb3966785e6953119ea
 DIST freebsd-share-9.1.tar.bz2 6733003 SHA256 2bbd8aa05d52b18a1780772a8518d79d375c1eeae98f52fb6aded233ac2491d7 SHA512 9665e3d5253f49a55921012bd21a8688210a1993ba6be4ad17b5ba5619104a50f3199d49a0eb83cf29db5a06c407beb15616bfe71338c680fe34ec47564c4b43 WHIRLPOOL 7d15596888ac42af1a0c125591283524ff794dccbf9f6592963602f046a45ca073b10bda43c2d0d662fd3414753de64c05293788e03c4eea67de55d9bc083c11
-DIST freebsd-src-10.1.tar.xz 115049476 SHA256 f919287a5ef51d4f133f27c99c54f2e8054f408d3dd53bc60f4e233cc75ec03d SHA512 4ded32b451e2807e24a06305502f88ea633b2899a7ccd9cab3dc98fc865ef91324c93c512a08cf6e295313a8d7e79aa9d7af07da40e7276d986b06419b984152 WHIRLPOOL 1eff9419d89b8a70f064171883d92e160b250cd637972eb9107a19d7b3c904b554c4f51eaa9ff9642ef2c4234bde05cf9aef16d0c39280b55084f831700dea80
 DIST freebsd-src-10.2.tar.xz 124551336 SHA256 6a59ea716bae96135983ad70cd7123e3b35ec91b191a82fe282ade88a61560b1 SHA512 fba4588fdaa94fa4582a8de566a84cf4f2badc87c7b2e0745d7a31c1e349b2d5f59dbdbb16a9d43421155c1ac4bdec8db24c5d32ac5a92be687d4ed70fe35835 WHIRLPOOL e325db3c07118762021d802c4f20c7a5fd4b816f08cab6f92b408399f1b3bf8ad89728d51c354ab21478265a4539463c94aae9ae49f0ac10cd3c3f8f640dc186
diff --git a/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-10.0-gentoo.patch b/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-10.0-gentoo.patch
deleted file mode 100644
index 2b997540d5d8..000000000000
--- a/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-10.0-gentoo.patch
+++ /dev/null
@@ -1,352 +0,0 @@
-tested revision 255489
-
-diff --git a/share/mk/bsd.compiler.mk b/share/mk/bsd.compiler.mk
-index 2d648de..e456a4b 100644
---- a/share/mk/bsd.compiler.mk
-+++ b/share/mk/bsd.compiler.mk
-@@ -1,7 +1,7 @@
- # $FreeBSD$
- 
- .if !defined(COMPILER_TYPE)
--. if ${CC:T:Mgcc*}
-+. if ${CC:T:M*gcc*}
- COMPILER_TYPE:=	gcc  
- . elif ${CC:T:Mclang}
- COMPILER_TYPE:=	clang
-diff --git a/share/mk/bsd.doc.mk b/share/mk/bsd.doc.mk
-index 49b2d9b..c2a8c5c 100644
---- a/share/mk/bsd.doc.mk
-+++ b/share/mk/bsd.doc.mk
-@@ -135,10 +135,12 @@ CLEANFILES+=	${DOC}.ascii ${DOC}.ascii${DCOMPRESS_EXT} \
- realinstall:
- .for _dev in ${PRINTERDEVICE:Mhtml}
- 	cd ${SRCDIR}; \
-+	    ${INSTALL} -d ${DESTDIR}${BINDIR}/${VOLUME}; \
- 	    ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
- 	    ${DOC}*.html ${DESTDIR}${BINDIR}/${VOLUME}
- .endfor
- .for _dev in ${PRINTERDEVICE:Nhtml}
-+	${INSTALL} -d ${DESTDIR}${BINDIR}/${VOLUME}; \
- 	${INSTALL} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
- 	    ${DFILE.${_dev}} ${DESTDIR}${BINDIR}/${VOLUME}
- .endfor
-diff --git a/share/mk/bsd.files.mk b/share/mk/bsd.files.mk
-index 240f958..67f0cf9 100644
---- a/share/mk/bsd.files.mk
-+++ b/share/mk/bsd.files.mk
-@@ -39,6 +39,7 @@ ${group}NAME_${file:T}?=	${file:T}
- .endif
- installfiles: _${group}INS_${file:T}
- _${group}INS_${file:T}: ${file}
-+	${INSTALL} -d ${DESTDIR}${${group}DIR_${.ALLSRC:T}}
- 	${INSTALL} -o ${${group}OWN_${.ALLSRC:T}} \
- 	    -g ${${group}GRP_${.ALLSRC:T}} -m ${${group}MODE_${.ALLSRC:T}} \
- 	    ${.ALLSRC} \
-@@ -51,10 +52,12 @@ _${group}FILES+= ${file}
- installfiles: _${group}INS
- _${group}INS: ${_${group}FILES}
- .if defined(${group}NAME)
-+	${INSTALL} -d ${DESTDIR}${${group}DIR}/${${group}NAME}
- 	${INSTALL} -o ${${group}OWN} -g ${${group}GRP} \
- 	    -m ${${group}MODE} ${.ALLSRC} \
- 	    ${DESTDIR}${${group}DIR}/${${group}NAME}
- .else
-+	${INSTALL} -d ${DESTDIR}${${group}DIR}
- 	${INSTALL} -o ${${group}OWN} -g ${${group}GRP} \
- 	    -m ${${group}MODE} ${.ALLSRC} ${DESTDIR}${${group}DIR}
- .endif
-diff --git a/share/mk/bsd.incs.mk b/share/mk/bsd.incs.mk
-index 74c378b..7d2c7a0 100644
---- a/share/mk/bsd.incs.mk
-+++ b/share/mk/bsd.incs.mk
-@@ -41,6 +41,9 @@ ${group}NAME_${header:T}?=	${header:T}
- .endif
- installincludes: _${group}INS_${header:T}
- _${group}INS_${header:T}: ${header}
-+	${INSTALL} -d -o ${${group}OWN_${.ALLSRC:T}} \
-+		 -g ${${group}GRP_${.ALLSRC:T}} \
-+		 ${DESTDIR}${${group}DIR_${.ALLSRC:T}}
- 	${INSTALL} -C -o ${${group}OWN_${.ALLSRC:T}} \
- 	    -g ${${group}GRP_${.ALLSRC:T}} -m ${${group}MODE_${.ALLSRC:T}} \
- 	    ${.ALLSRC} \
-@@ -53,9 +56,13 @@ _${group}INCS+= ${header}
- installincludes: _${group}INS
- _${group}INS: ${_${group}INCS}
- .if defined(${group}NAME)
-+	${INSTALL} -d -o ${${group}OWN} -g ${${group}GRP} \
-+		${DESTDIR}${${group}DIR}
- 	${INSTALL} -C -o ${${group}OWN} -g ${${group}GRP} -m ${${group}MODE} \
- 	    ${.ALLSRC} ${DESTDIR}${${group}DIR}/${${group}NAME}
- .else
-+	${INSTALL} -d -o ${${group}OWN} -g ${${group}GRP} \
-+		${DESTDIR}${${group}DIR}
- 	${INSTALL} -C -o ${${group}OWN} -g ${${group}GRP} -m ${${group}MODE} \
- 	    ${.ALLSRC} ${DESTDIR}${${group}DIR}
- .endif
-diff --git a/share/mk/bsd.info.mk b/share/mk/bsd.info.mk
-index c54b435..d283240 100644
---- a/share/mk/bsd.info.mk
-+++ b/share/mk/bsd.info.mk
-@@ -83,6 +83,7 @@ INFO2HTML?=	info2html
- TEX?=		tex
- DVIPS?=		dvips
- DVIPS2ASCII?=	dvips2ascii
-+INSTALL?=	install
- 
- .SUFFIXES: ${ICOMPRESS_EXT} .info .texi .texinfo .dvi .ps .latin1 .html
- 
-@@ -144,15 +145,17 @@ ${x:S/$/${ICOMPRESS_EXT}/}:	${x}
- INSTALLINFODIRS+= ${x:S/$/-install/}
- ${x:S/$/-install/}:
- .if !empty(.MAKEFLAGS:M-j)
-+	${INSTALL} -d ${DESTDIR}${INFODIR}
- 	lockf -k ${DESTDIR}${INFODIR}/${INFODIRFILE} \
- 	${INSTALLINFO} ${INSTALLINFOFLAGS} \
--	    --defsection=${INFOSECTION} \
--	    --defentry=${INFOENTRY_${x}} \
-+	    --section=${INFOSECTION} \
-+	    --entry=${INFOENTRY_${x}} \
- 	    ${x}.info ${DESTDIR}${INFODIR}/${INFODIRFILE}
- .else
-+	${INSTALL} -d ${DESTDIR}${INFODIR}
- 	${INSTALLINFO} ${INSTALLINFOFLAGS} \
--	    --defsection=${INFOSECTION} \
--	    --defentry=${INFOENTRY_${x}} \
-+	    --section=${INFOSECTION} \
-+	    --entry=${INFOENTRY_${x}} \
- 	    ${x}.info ${DESTDIR}${INFODIR}/${INFODIRFILE}
- .endif
- .endfor
-diff --git a/share/mk/bsd.lib.mk b/share/mk/bsd.lib.mk
-index bb3db64..dbb9bf4 100644
---- a/share/mk/bsd.lib.mk
-+++ b/share/mk/bsd.lib.mk
-@@ -39,8 +39,6 @@ CFLAGS+= ${DEBUG_FLAGS}
- .if ${MK_CTF} != "no" && ${DEBUG_FLAGS:M-g} != ""
- CTFFLAGS+= -g
- .endif
--.else
--STRIP?=	-s
- .endif
- 
- .if ${MK_DEBUG_FILES} != "no" && empty(DEBUG_FLAGS:M-g) && \
-@@ -302,14 +300,17 @@ realinstall: _libinstall
- .ORDER: beforeinstall _libinstall
- _libinstall:
- .if defined(LIB) && !empty(LIB) && ${MK_INSTALLLIB} != "no"
-+	${INSTALL} -d ${DESTDIR}${_LIBDIR}
- 	${INSTALL} -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
- 	    ${_INSTALLFLAGS} lib${LIB}.a ${DESTDIR}${_LIBDIR}
- .endif
- .if ${MK_PROFILE} != "no" && defined(LIB) && !empty(LIB)
-+	${INSTALL} -d ${DESTDIR}${_LIBDIR}
- 	${INSTALL} -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
- 	    ${_INSTALLFLAGS} lib${LIB}_p.a ${DESTDIR}${_LIBDIR}
- .endif
- .if defined(SHLIB_NAME)
-+	${INSTALL} -d ${DESTDIR}${_SHLIBDIR}
- 	${INSTALL} ${STRIP} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
- 	    ${_INSTALLFLAGS} ${_SHLINSTALLFLAGS} \
- 	    ${SHLIB_NAME} ${DESTDIR}${_SHLIBDIR}
-@@ -363,10 +364,12 @@ _libinstall:
- .endif # SHLIB_LINK
- .endif # SHIB_NAME
- .if defined(INSTALL_PIC_ARCHIVE) && defined(LIB) && !empty(LIB) && ${MK_TOOLCHAIN} != "no"
-+	${INSTALL} -d ${DESTDIR}${_LIBDIR}
- 	${INSTALL} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
- 	    ${_INSTALLFLAGS} lib${LIB}_pic.a ${DESTDIR}${_LIBDIR}
- .endif
- .if defined(WANT_LINT) && !defined(NO_LINT) && defined(LIB) && !empty(LIB)
-+	${INSTALL} -d ${DESTDIR}${LINTLIBDIR}
- 	${INSTALL} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
- 	    ${_INSTALLFLAGS} ${LINTLIB} ${DESTDIR}${LINTLIBDIR}
- .endif
-diff --git a/share/mk/bsd.libnames.mk b/share/mk/bsd.libnames.mk
-index 00d38ff..86792f4 100644
---- a/share/mk/bsd.libnames.mk
-+++ b/share/mk/bsd.libnames.mk
-@@ -53,7 +53,7 @@ LIBEDIT?=	${DESTDIR}${LIBDIR}/libedit.a
- LIBELF?=	${DESTDIR}${LIBDIR}/libelf.a
- LIBEXECINFO?=	${DESTDIR}${LIBDIR}/libexecinfo.a
- LIBFETCH?=	${DESTDIR}${LIBDIR}/libfetch.a
--LIBFL?=		"don't use LIBFL, use LIBL"
-+LIBFL?=		${DESTDIR}${LIBDIR}/libfl.a
- LIBFORM?=	${DESTDIR}${LIBDIR}/libform.a
- LIBG2C?=	${DESTDIR}${LIBDIR}/libg2c.a
- LIBGCC?=	${DESTDIR}${LIBDIR}/libgcc.a
-@@ -88,7 +88,7 @@ LIBKEYCAP?=	${DESTDIR}${LIBDIR}/libkeycap.a
- LIBKICONV?=	${DESTDIR}${LIBDIR}/libkiconv.a
- LIBKRB5?=	${DESTDIR}${LIBDIR}/libkrb5.a
- LIBKVM?=	${DESTDIR}${LIBDIR}/libkvm.a
--LIBL?=		${DESTDIR}${LIBDIR}/libl.a
-+LIBL?=		${DESTDIR}${LIBDIR}/libfl.a
- .if ${MK_LDNS} != "no"
- LIBLDNS?=	${DESTDIR}${LIBPRIVATEDIR}/libldns.a
- .endif
-diff --git a/share/mk/bsd.links.mk b/share/mk/bsd.links.mk
-index 1e4d57e..fcb81fe 100644
---- a/share/mk/bsd.links.mk
-+++ b/share/mk/bsd.links.mk
-@@ -15,6 +15,8 @@ _installlinks:
- 		t=${DESTDIR}$$1; \
- 		shift; \
- 		${ECHO} $$t -\> $$l; \
-+		d=`dirname $$t`; \
-+		test -d $$d || mkdir $$d; \
- 		${INSTALL_LINK} $$l $$t; \
- 	done; true
- .endif
-@@ -26,6 +28,8 @@ _installlinks:
- 		t=${DESTDIR}$$1; \
- 		shift; \
- 		${ECHO} $$t -\> $$l; \
-+		d=`dirname $$t`; \
-+		test -d $$d || mkdir $$d; \
- 		${INSTALL_SYMLINK} $$l $$t; \
- 	done; true
- .endif
-diff --git a/share/mk/bsd.man.mk b/share/mk/bsd.man.mk
-index 6445ba3..fabffa2 100644
---- a/share/mk/bsd.man.mk
-+++ b/share/mk/bsd.man.mk
-@@ -165,9 +165,11 @@ _maninstall: ${MAN}
- .if defined(NO_MANCOMPRESS)
- .if defined(MANFILTER)
- .for __page in ${MAN}
-+	${INSTALL} -d ${DESTDIR}${MANDIR}${page:E}${MANSUBDIR}/${page}
- 	${MINSTALL} ${__page:T:S/$/${FILTEXTENSION}/g} \
- 		${DESTDIR}${MANDIR}${__page:E}${MANSUBDIR}/${__page}
- .if defined(MANBUILDCAT) && !empty(MANBUILDCAT)
-+	${INSTALL} -d ${DESTDIR}${CATDIR}${page:E}${MANSUBDIR}/${page}
- 	${MINSTALL} ${__page:T:S/$/${CATEXT}${FILTEXTENSION}/g} \
- 		${DESTDIR}${CATDIR}${__page:E}${MANSUBDIR}/${__page}
- .endif
-@@ -181,11 +183,14 @@ _maninstall: ${MAN}
- 		esac; \
- 		page=$$1; shift; sect=$$1; shift; \
- 		d=${DESTDIR}${MANDIR}$${sect}${MANSUBDIR}; \
-+		${ECHO} ${INSTALL} -d $${d}; \
-+		${INSTALL} -d $${d}; \
- 		${ECHO} ${MINSTALL} $${page} $${d}; \
- 		${MINSTALL} $${page} $${d}; \
- 	done
- .if defined(MANBUILDCAT) && !empty(MANBUILDCAT)
- .for __page in ${MAN}
-+	${INSTALL} -d ${DESTDIR}${CATDIR}${page:E}${MANSUBDIR}/${page:T}
- 	${MINSTALL} ${__page:T:S/$/${CATEXT}/} \
- 		${DESTDIR}${CATDIR}${__page:E}${MANSUBDIR}/${__page:T}
- .endfor
-@@ -193,9 +198,11 @@ _maninstall: ${MAN}
- .endif
- .else
- .for __page in ${MAN}
-+	${INSTALL} -d ${DESTDIR}${MANDIR}${page:E}${MANSUBDIR}
- 	${MINSTALL} ${__page:T:S/$/${MCOMPRESS_EXT}/g} \
- 		${DESTDIR}${MANDIR}${__page:E}${MANSUBDIR}
- .if defined(MANBUILDCAT) && !empty(MANBUILDCAT)
-+	${INSTALL} -d ${DESTDIR}${CATDIR}${page:E}${MANSUBDIR}/${page:T:S/$/${MCOMPRESS_EXT}
- 	${MINSTALL} ${__page:T:S/$/${CATEXT}${MCOMPRESS_EXT}/g} \
- 		${DESTDIR}${CATDIR}${__page:E}${MANSUBDIR}/${__page:T:S/$/${MCOMPRESS_EXT}/}
- .endif
-diff --git a/share/mk/bsd.nls.mk b/share/mk/bsd.nls.mk
-index 48093eb..69f56bc 100644
---- a/share/mk/bsd.nls.mk
-+++ b/share/mk/bsd.nls.mk
-@@ -62,7 +62,8 @@ NLSDIR?=	${SHAREDIR}/nls
- # installation rules
- #
- .for file in ${NLS}
--NLSNAME_${file:T}= ${file:T:R}/${NLSNAME}.cat
-+NLSDIR_${file:T}= ${SHAREDIR}/nls/${file:T:R}/
-+NLSNAME_${file:T}= ${NLSNAME}.cat
- .if defined(NLSLINKS_${file:R}) && !empty(NLSLINKS_${file:R})
- NLSLINKS+=	${file:R}
- .endif
-diff --git a/share/mk/bsd.own.mk b/share/mk/bsd.own.mk
-index 8f7f0b9..189ccec 100644
---- a/share/mk/bsd.own.mk
-+++ b/share/mk/bsd.own.mk
-@@ -202,9 +202,6 @@ INSTALL_LINK?=		${INSTALL} ${HRDLINK}
- INSTALL_SYMLINK?=	${INSTALL} ${SYMLINK}
- 
- # Common variables
--.if !defined(DEBUG_FLAGS)
--STRIP?=		-s
--.endif
- 
- COMPRESS_CMD?=	gzip -cn
- COMPRESS_EXT?=	.gz
-diff --git a/share/mk/bsd.prog.mk b/share/mk/bsd.prog.mk
-index 22ddfb5..f6a4939 100644
---- a/share/mk/bsd.prog.mk
-+++ b/share/mk/bsd.prog.mk
-@@ -44,10 +44,6 @@ CTFFLAGS+= -g
- .endif
- .endif
- 
--.if !defined(DEBUG_FLAGS)
--STRIP?=	-s
--.endif
--
- .if defined(NO_SHARED) && (${NO_SHARED} != "no" && ${NO_SHARED} != "NO")
- LDFLAGS+= -static
- .endif
-@@ -201,6 +197,7 @@ realinstall: _proginstall
- .ORDER: beforeinstall _proginstall
- _proginstall:
- .if defined(PROG)
-+	${INSTALL} -d ${DESTDIR}${BINDIR}
- 	${INSTALL} ${STRIP} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
- 	    ${_INSTALLFLAGS} ${PROG} ${DESTDIR}${BINDIR}/${PROGNAME}
- .if ${MK_DEBUG_FILES} != "no"
-@@ -234,6 +231,7 @@ SCRIPTSGRP_${script:T}?=	${SCRIPTSGRP}
- SCRIPTSMODE_${script:T}?=	${SCRIPTSMODE}
- _scriptsinstall: _SCRIPTSINS_${script:T}
- _SCRIPTSINS_${script:T}: ${script}
-+	${INSTALL} -d ${DESTDIR}${SCRIPTSDIR_${.ALLSRC:T}}
- 	${INSTALL} -o ${SCRIPTSOWN_${.ALLSRC:T}} \
- 	    -g ${SCRIPTSGRP_${.ALLSRC:T}} -m ${SCRIPTSMODE_${.ALLSRC:T}} \
- 	    ${.ALLSRC} \
-diff --git a/share/mk/bsd.sys.mk b/share/mk/bsd.sys.mk
-index 72dfa61..4f21af4 100644
---- a/share/mk/bsd.sys.mk
-+++ b/share/mk/bsd.sys.mk
-@@ -30,10 +30,6 @@ CFLAGS+=	-std=${CSTD}
- .if defined(WARNS)
- .if ${WARNS} >= 1
- CWARNFLAGS+=	-Wsystem-headers
--.if !defined(NO_WERROR) && (${COMPILER_TYPE} != "clang" \
--    || !defined(NO_WERROR.clang))
--CWARNFLAGS+=	-Werror
--.endif # !NO_WERROR && (!CLANG || !NO_WERROR.clang)
- .endif # WARNS >= 1
- .if ${WARNS} >= 2
- CWARNFLAGS+=	-Wall -Wno-format-y2k
-@@ -99,10 +95,6 @@ CWARNFLAGS+=	-Wformat=2 -Wno-format-extra-args
- CWARNFLAGS+=	-Wno-format-nonliteral
- .endif # WARNS <= 3
- .endif # CLANG
--.if !defined(NO_WERROR) && (${COMPILER_TYPE} != "clang" \
--    || !defined(NO_WERROR.clang))
--CWARNFLAGS+=	-Werror
--.endif # !NO_WERROR && (!CLANG || !NO_WERROR.clang)
- .endif # WFORMAT > 0
- .endif # WFORMAT
- .if defined(NO_WFORMAT) || (${COMPILER_TYPE} == "clang" && defined(NO_WFORMAT.clang))
-diff --git a/share/mk/sys.mk b/share/mk/sys.mk
-index eb9f2ca..09ad4cf 100644
---- a/share/mk/sys.mk
-+++ b/share/mk/sys.mk
-@@ -321,12 +321,6 @@ YFLAGS		?=	-d
- 	rm -f ${.PREFIX}.tmp.c
- 	${CTFCONVERT_CMD}
- 
--# FreeBSD build pollution.  Hide it in the non-POSIX part of the ifdef.
--__MAKE_CONF?=/etc/make.conf
--.if exists(${__MAKE_CONF})
--.include "${__MAKE_CONF}"
--.endif
--
- .if defined(__MAKE_SHELL) && !empty(__MAKE_SHELL)
- SHELL=	${__MAKE_SHELL}
- .SHELL: path=${__MAKE_SHELL}
diff --git a/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-10.1-gnu.patch b/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-10.1-gnu.patch
deleted file mode 100644
index e566e6235a3a..000000000000
--- a/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-10.1-gnu.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-diff --git a/share/mk/bsd.lib.mk b/share/mk/bsd.lib.mk
-index a5eacf9..01d1045 100644
---- a/share/mk/bsd.lib.mk
-+++ b/share/mk/bsd.lib.mk
-@@ -166,11 +166,7 @@ _LIBS=		lib${LIB}.a
- lib${LIB}.a: ${OBJS} ${STATICOBJS}
- 	@${ECHO} building static ${LIB} library
- 	@rm -f ${.TARGET}
--.if !defined(NM)
--	@${AR} ${ARFLAGS} ${.TARGET} `lorder ${OBJS} ${STATICOBJS} | tsort -q` ${ARADD}
--.else
--	@${AR} ${ARFLAGS} ${.TARGET} `NM='${NM}' lorder ${OBJS} ${STATICOBJS} | tsort -q` ${ARADD}
--.endif
-+	@${AR} ${ARFLAGS} ${.TARGET} ${OBJS} ${STATICOBJS} ${ARADD}
- 	${RANLIB} ${RANLIBFLAGS} ${.TARGET}
- .endif
- 
-@@ -183,11 +179,7 @@ POBJS+=		${OBJS:.o=.po} ${STATICOBJS:.o=.po}
- lib${LIB}_p.a: ${POBJS}
- 	@${ECHO} building profiled ${LIB} library
- 	@rm -f ${.TARGET}
--.if !defined(NM)
--	@${AR} ${ARFLAGS} ${.TARGET} `lorder ${POBJS} | tsort -q` ${ARADD}
--.else
--	@${AR} ${ARFLAGS} ${.TARGET} `NM='${NM}' lorder ${POBJS} | tsort -q` ${ARADD}
--.endif
-+	@${AR} ${ARFLAGS} ${.TARGET} ${POBJS} ${ARADD}
- 	${RANLIB} ${RANLIBFLAGS} ${.TARGET}
- .endif
- 
-@@ -214,15 +206,9 @@ ${SHLIB_NAME_FULL}: ${SOBJS}
- .if defined(SHLIB_LINK)
- 	@${INSTALL_SYMLINK} ${SHLIB_NAME} ${SHLIB_LINK}
- .endif
--.if !defined(NM)
- 	@${CC} ${LDFLAGS} ${SSP_CFLAGS} ${SOLINKOPTS} \
- 	    -o ${.TARGET} -Wl,-soname,${SONAME} \
--	    `lorder ${SOBJS} | tsort -q` ${LDADD}
--.else
--	@${CC} ${LDFLAGS} ${SSP_CFLAGS} ${SOLINKOPTS} \
--	    -o ${.TARGET} -Wl,-soname,${SONAME} \
--	    `NM='${NM}' lorder ${SOBJS} | tsort -q` ${LDADD}
--.endif
-+	    `echo ${SOBJS} | xargs -n 1 echo | sort -u` ${LDADD}
- .if ${MK_CTF} != "no"
- 	${CTFMERGE} ${CTFFLAGS} -o ${.TARGET} ${SOBJS}
- .endif
-@@ -280,13 +266,6 @@ _EXTRADEPEND:
- 
- .if !target(install)
- 
--.if defined(PRECIOUSLIB)
--.if !defined(NO_FSCHG)
--SHLINSTALLFLAGS+= -fschg
--.endif
--SHLINSTALLFLAGS+= -S
--.endif
--
- _INSTALLFLAGS:=	${INSTALLFLAGS}
- .for ie in ${INSTALLFLAGS_EDIT}
- _INSTALLFLAGS:=	${_INSTALLFLAGS${ie}}
-diff --git a/share/mk/bsd.prog.mk b/share/mk/bsd.prog.mk
-index a53ea14..af3f37c 100644
---- a/share/mk/bsd.prog.mk
-+++ b/share/mk/bsd.prog.mk
-@@ -179,13 +179,6 @@ _EXTRADEPEND:
- 
- .if !target(install)
- 
--.if defined(PRECIOUSPROG)
--.if !defined(NO_FSCHG)
--INSTALLFLAGS+= -fschg
--.endif
--INSTALLFLAGS+= -S
--.endif
--
- _INSTALLFLAGS:=	${INSTALLFLAGS}
- .for ie in ${INSTALLFLAGS_EDIT}
- _INSTALLFLAGS:=	${_INSTALLFLAGS${ie}}
diff --git a/sys-freebsd/freebsd-mk-defs/freebsd-mk-defs-10.1.ebuild b/sys-freebsd/freebsd-mk-defs/freebsd-mk-defs-10.1.ebuild
deleted file mode 100644
index c2fe42072c4b..000000000000
--- a/sys-freebsd/freebsd-mk-defs/freebsd-mk-defs-10.1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit bsdmk freebsd
-
-DESCRIPTION="Makefiles definitions used for building and installing libraries and system files"
-SLOT="0"
-
-IUSE="userland_GNU"
-
-if [[ ${PV} != *9999* ]]; then
-	KEYWORDS="~amd64 ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-fi
-
-EXTRACTONLY="share/"
-
-RDEPEND=""
-DEPEND=""
-
-RESTRICT="strip"
-
-S="${WORKDIR}/share/mk"
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-10.0-gentoo.patch"
-	epatch "${FILESDIR}/${PN}-add-nossp-cflags.patch"
-	use userland_GNU && epatch "${FILESDIR}/${PN}-10.1-gnu.patch"
-}
-
-src_compile() { :; }
-
-src_install() {
-	if [[ ${CHOST} != *-freebsd* ]]; then
-		insinto /usr/share/mk/freebsd
-	else
-		insinto /usr/share/mk
-	fi
-	doins *.mk *.awk
-}
diff --git a/sys-freebsd/freebsd-pam-modules/Manifest b/sys-freebsd/freebsd-pam-modules/Manifest
index f9ca7ac53f23..eabc2d3465a5 100644
--- a/sys-freebsd/freebsd-pam-modules/Manifest
+++ b/sys-freebsd/freebsd-pam-modules/Manifest
@@ -1,4 +1,3 @@
 DIST freebsd-lib-8.2.tar.bz2 3323878 SHA256 e3590c12794fcb5ba8eb7a1f58b497587cf19f9200b3254c194a793da3b5bfb0 SHA512 c059cfdd1099bb519b2a5c43fb7e7104c500ef8906229ed7eb9e420cb3a217cdaf8655e9e7a9f45cfadc5491f8115e0e738fd49251d9f0c3a83780845b09f007 WHIRLPOOL 95f98a372f44a89bc8ac3029ec065dbbfec338e6f889d057d75644bfcdfb9d27fdc0421d7e392cad5a823712b97f0857297ec3d321580254c63032c22b95792e
 DIST freebsd-lib-9.1.tar.bz2 3206685 SHA256 f31fa8107b4de711c548f6d0c1bb1f81d09f51bcc3b14a1e9e90bb0e7cc4a35d SHA512 40d0c36b6b889c404fa0e0afa38ba4e84a55bc88ffa2f98a70afbd7a32c4f32c158617ba770567d082a986d62c09b3ec8db3dc5ab853ee1c9bbe0b90bb82396e WHIRLPOOL 581878bf9c43184b043b4293409b85901c9ed1f9bd279e965414aca41ba50950848ebda3ee10a503a028135dfd2765e95a11acd4e62a11c528e104392bbbd8d0
-DIST freebsd-src-10.1.tar.xz 115049476 SHA256 f919287a5ef51d4f133f27c99c54f2e8054f408d3dd53bc60f4e233cc75ec03d SHA512 4ded32b451e2807e24a06305502f88ea633b2899a7ccd9cab3dc98fc865ef91324c93c512a08cf6e295313a8d7e79aa9d7af07da40e7276d986b06419b984152 WHIRLPOOL 1eff9419d89b8a70f064171883d92e160b250cd637972eb9107a19d7b3c904b554c4f51eaa9ff9642ef2c4234bde05cf9aef16d0c39280b55084f831700dea80
 DIST freebsd-src-10.2.tar.xz 124551336 SHA256 6a59ea716bae96135983ad70cd7123e3b35ec91b191a82fe282ade88a61560b1 SHA512 fba4588fdaa94fa4582a8de566a84cf4f2badc87c7b2e0745d7a31c1e349b2d5f59dbdbb16a9d43421155c1ac4bdec8db24c5d32ac5a92be687d4ed70fe35835 WHIRLPOOL e325db3c07118762021d802c4f20c7a5fd4b816f08cab6f92b408399f1b3bf8ad89728d51c354ab21478265a4539463c94aae9ae49f0ac10cd3c3f8f640dc186
diff --git a/sys-freebsd/freebsd-pam-modules/freebsd-pam-modules-10.1.ebuild b/sys-freebsd/freebsd-pam-modules/freebsd-pam-modules-10.1.ebuild
deleted file mode 100644
index 9b3f99277fdb..000000000000
--- a/sys-freebsd/freebsd-pam-modules/freebsd-pam-modules-10.1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit bsdmk freebsd multilib pam
-
-DESCRIPTION="FreeBSD's PAM authentication modules"
-SLOT="0"
-
-IUSE="kerberos nis"
-
-if [[ ${PV} != *9999* ]]; then
-	KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-fi
-
-EXTRACTONLY="lib/"
-
-RDEPEND=">=sys-auth/openpam-20050201-r1
-	kerberos? ( dev-libs/openssl
-		virtual/krb5 )"
-DEPEND="${RDEPEND}
-	=sys-freebsd/freebsd-mk-defs-${RV}*
-	=sys-freebsd/freebsd-sources-${RV}*"
-
-S=${WORKDIR}/lib/libpam/modules
-
-PATCHES=( "${FILESDIR}"/${PN}-9.0-gentoo.patch )
-
-pkg_setup() {
-	# Avoid installing pam_ssh as that has its own ebuild.
-	mymakeopts="${mymakeopts} WITHOUT_OPENSSH= "
-	use kerberos || mymakeopts="${mymakeopts} WITHOUT_KERBEROS= "
-	use nis || mymakeopts="${mymakeopts} WITHOUT_NIS= "
-}
-
-src_prepare() {
-	for module in pam_deny pam_passwdqc pam_permit pam_krb5; do
-		sed -i -e "s:${module}::" "${S}"/modules.inc
-	done
-}
-
-src_install() {
-	mkinstall "LIBDIR=/$(get_libdir)/security" || die "install failed"
-
-	dodoc "${FILESDIR}/README.pamd"
-}
diff --git a/sys-freebsd/freebsd-pf/Manifest b/sys-freebsd/freebsd-pf/Manifest
index 93ebb1470b00..552ed4dbf415 100644
--- a/sys-freebsd/freebsd-pf/Manifest
+++ b/sys-freebsd/freebsd-pf/Manifest
@@ -4,7 +4,6 @@ DIST freebsd-etc-8.2.tar.bz2 188629 SHA256 6bc745fa259f9fa2b65df865d45443a7b23c2
 DIST freebsd-etc-9.1.tar.bz2 207776 SHA256 a317bf85532d6192f5506e8d7bd5d5c201fe24017700e3a974a7712c2c69cdb8 SHA512 4fbe56fde519cf2f44e39a8869efa26c34f703cf540f4a83389da8d170873d7c6fb18e4010e643b8d793cfc5c55d15eeb198057a5b2a8da9d9e8f791801bf314 WHIRLPOOL 0c27019fe140fe96f870697acbaa89ac2f281f55b892c5791b08abf1cfa4da94d9d42a1df1c2091317573ed7234253857aecb797065f911a0a5d57bbf64349a5
 DIST freebsd-sbin-8.2.tar.bz2 1211665 SHA256 8b7e21a66b4696e8763d29b8b02b2d35f29fc51820a194d1e469e7cace84c527 SHA512 c6643c29ab62344c98d8991708798730ee1c17e6478071718beeaa79788300a1f4ed2e6aeb8e39e3c216877d4ed2ac85b2a9531d534f1ac5125a508927898959 WHIRLPOOL 2a21cd0f15f95d66718031680ac87f1fe73f1e1b03cb012e1db1dd1bd2fe2bb7897457a8ba2f5a28c8806775611dca542cbadec16566c47ab9efa673e2cb53f3
 DIST freebsd-sbin-9.1.tar.bz2 1273913 SHA256 45008b0733b232ef03707ef5fa3e5c889e3b3728393d736bd9a869ea83be6447 SHA512 9f186602b7de96f268c352ca386986652fddf5570e7eca1afa8c0d2bdc83b57df1198efe47f36dd5c7a6abf4f9c935f1c8207a4a12a6b2153bd6c3c6292719dc WHIRLPOOL 20920dfa9607a0ce854319cef29bbd77fb1b31f6f6cfd5ac60cbd678169e43929e215743fe636d0c224443f3e6149a8f07c292d647f7f901592795ac292699f9
-DIST freebsd-src-10.1.tar.xz 115049476 SHA256 f919287a5ef51d4f133f27c99c54f2e8054f408d3dd53bc60f4e233cc75ec03d SHA512 4ded32b451e2807e24a06305502f88ea633b2899a7ccd9cab3dc98fc865ef91324c93c512a08cf6e295313a8d7e79aa9d7af07da40e7276d986b06419b984152 WHIRLPOOL 1eff9419d89b8a70f064171883d92e160b250cd637972eb9107a19d7b3c904b554c4f51eaa9ff9642ef2c4234bde05cf9aef16d0c39280b55084f831700dea80
 DIST freebsd-src-10.2.tar.xz 124551336 SHA256 6a59ea716bae96135983ad70cd7123e3b35ec91b191a82fe282ade88a61560b1 SHA512 fba4588fdaa94fa4582a8de566a84cf4f2badc87c7b2e0745d7a31c1e349b2d5f59dbdbb16a9d43421155c1ac4bdec8db24c5d32ac5a92be687d4ed70fe35835 WHIRLPOOL e325db3c07118762021d802c4f20c7a5fd4b816f08cab6f92b408399f1b3bf8ad89728d51c354ab21478265a4539463c94aae9ae49f0ac10cd3c3f8f640dc186
 DIST freebsd-usbin-8.2.tar.bz2 2443024 SHA256 aa7cabf10f5c3a9daabea32e4de24d04ec312247842981476da666eff5054603 SHA512 bcb8ff3df54848b9107bbb52e5ced7a91e24bb181f06769b6997221729b8064ec17652eaf7500de3268cbcb63ff5760beb54d15fc78c27b02687b5b1067c74a6 WHIRLPOOL 20f5278e2a1dd387a75b44f10507958d6c0e84a2faa1bddbf808c14ab86d8dd14a956192911bbc1880f5f5f7bd05972dcbb4aec85d241f0dcf91bf4246883f0a
 DIST freebsd-usbin-9.1.tar.bz2 2670916 SHA256 b938c20b8c09aa9a610e13b69b9afeea72f561ab3636a59fba2bdac290f4db75 SHA512 21c234312f70eb35cd2926519efc1f61592892f5d0940786dbeb959c3c5ec7819a51ae95c6e8a1a06aa01f669350fe0fd3dd7c4ec8a84dd6b90f24cb192356ca WHIRLPOOL 7f6ad2eb5410cc5e685881654a788807848af026b1277a974682755ab7c9db28f576bfd1576441ea10c5f1e9edb7d30a4a23fb8eccd6d69d86ecc9ce4c9adc7e
diff --git a/sys-freebsd/freebsd-pf/freebsd-pf-10.1.ebuild b/sys-freebsd/freebsd-pf/freebsd-pf-10.1.ebuild
deleted file mode 100644
index 237bb73782f8..000000000000
--- a/sys-freebsd/freebsd-pf/freebsd-pf-10.1.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit bsdmk freebsd user
-
-DESCRIPTION="FreeBSD's base system libraries"
-SLOT="0"
-
-IUSE=""
-
-# Crypto is needed to have an internal OpenSSL header
-if [[ ${PV} != *9999* ]]; then
-	KEYWORDS="~amd64-fbsd ~x86-fbsd"
-fi
-
-EXTRACTONLY="
-	usr.sbin/
-	sbin/
-	contrib/pf/
-	etc/
-"
-
-RDEPEND="net-libs/libpcap"
-DEPEND="${RDEPEND}
-	dev-libs/libevent
-	=sys-freebsd/freebsd-mk-defs-${RV}*
-	=sys-freebsd/freebsd-sources-${RV}*"
-
-S="${WORKDIR}"
-
-SUBDIRS="usr.sbin/authpf sbin/pfctl sbin/pflogd usr.sbin/ftp-proxy/ftp-proxy"
-
-pkg_setup() {
-	enewgroup authpf 63
-	mymakeopts="${mymakeopts} NO_MANCOMPRESS= NO_INFOCOMPRESS= "
-}
-
-src_prepare() {
-	# pcap-int.h redefines snprintf as pcap_snprintf
-	epatch "${FILESDIR}/${PN}-9.0-pcap_pollution.patch"
-	# Use system's libevent
-	epatch "${FILESDIR}/${PN}-10.0-libevent.patch"
-	epatch "${FILESDIR}/${PN}-10.0-pflogd.patch"
-	epatch "${FILESDIR}/${PN}-9.0-bpf.patch"
-	epatch "${FILESDIR}/${PN}-9.0-getline.patch"
-	# Link in kernel sources
-	[[ ! -e "${WORKDIR}/sys" ]] && ln -s "/usr/src/sys" "${WORKDIR}/sys"
-}
-
-src_compile() {
-	for dir in ${SUBDIRS}; do
-		einfo "Starting make in ${dir}"
-		cd "${S}/${dir}"
-		mkmake || die "Make ${dir} failed"
-	done
-}
-
-src_install() {
-	for dir in ${SUBDIRS}; do
-		einfo "Starting install in ${dir}"
-		cd "${S}/${dir}"
-		mkinstall || die "Install ${dir} failed"
-	done
-
-	cd "${WORKDIR}"/etc
-	insinto /etc
-	doins pf.os
-	# pf.initd provided by openrc, but no pf.confd
-	newconfd "${FILESDIR}/pf.confd" pf
-}
diff --git a/sys-freebsd/freebsd-rescue/Manifest b/sys-freebsd/freebsd-rescue/Manifest
index 54806aea9e90..5282ded00432 100644
--- a/sys-freebsd/freebsd-rescue/Manifest
+++ b/sys-freebsd/freebsd-rescue/Manifest
@@ -14,7 +14,6 @@ DIST freebsd-rescue-8.2.tar.bz2 5041 SHA256 82f05e98c977771c87f416be80e3634df231
 DIST freebsd-rescue-9.1.tar.bz2 3939 SHA256 15794c65e2977a2623f0a09090f835c67e6ec49e13996b2d69a018ff4185be4e SHA512 93015a725cea428fd6f4813370eab460979bbae3aac2e6688319a06012b4e0fe1f7b847f9e0d4da423835e59ba5a3842057b61d110d24f79109a50133e5e23bb WHIRLPOOL c303a26b2594e87ea9f9c5a05b1f46cdf9712aa521d21a210e5b452c883fd7e2d36b1ece7d6c9988860a909d00e77825367b0a6f33e5938a8fa23e02e58aeec2
 DIST freebsd-sbin-8.2.tar.bz2 1211665 SHA256 8b7e21a66b4696e8763d29b8b02b2d35f29fc51820a194d1e469e7cace84c527 SHA512 c6643c29ab62344c98d8991708798730ee1c17e6478071718beeaa79788300a1f4ed2e6aeb8e39e3c216877d4ed2ac85b2a9531d534f1ac5125a508927898959 WHIRLPOOL 2a21cd0f15f95d66718031680ac87f1fe73f1e1b03cb012e1db1dd1bd2fe2bb7897457a8ba2f5a28c8806775611dca542cbadec16566c47ab9efa673e2cb53f3
 DIST freebsd-sbin-9.1.tar.bz2 1273913 SHA256 45008b0733b232ef03707ef5fa3e5c889e3b3728393d736bd9a869ea83be6447 SHA512 9f186602b7de96f268c352ca386986652fddf5570e7eca1afa8c0d2bdc83b57df1198efe47f36dd5c7a6abf4f9c935f1c8207a4a12a6b2153bd6c3c6292719dc WHIRLPOOL 20920dfa9607a0ce854319cef29bbd77fb1b31f6f6cfd5ac60cbd678169e43929e215743fe636d0c224443f3e6149a8f07c292d647f7f901592795ac292699f9
-DIST freebsd-src-10.1.tar.xz 115049476 SHA256 f919287a5ef51d4f133f27c99c54f2e8054f408d3dd53bc60f4e233cc75ec03d SHA512 4ded32b451e2807e24a06305502f88ea633b2899a7ccd9cab3dc98fc865ef91324c93c512a08cf6e295313a8d7e79aa9d7af07da40e7276d986b06419b984152 WHIRLPOOL 1eff9419d89b8a70f064171883d92e160b250cd637972eb9107a19d7b3c904b554c4f51eaa9ff9642ef2c4234bde05cf9aef16d0c39280b55084f831700dea80
 DIST freebsd-src-10.2.tar.xz 124551336 SHA256 6a59ea716bae96135983ad70cd7123e3b35ec91b191a82fe282ade88a61560b1 SHA512 fba4588fdaa94fa4582a8de566a84cf4f2badc87c7b2e0745d7a31c1e349b2d5f59dbdbb16a9d43421155c1ac4bdec8db24c5d32ac5a92be687d4ed70fe35835 WHIRLPOOL e325db3c07118762021d802c4f20c7a5fd4b816f08cab6f92b408399f1b3bf8ad89728d51c354ab21478265a4539463c94aae9ae49f0ac10cd3c3f8f640dc186
 DIST freebsd-sys-8.2.tar.bz2 25835329 SHA256 0c6c7b61aae94db2931f985d5899f3bca78fc8ffab6b598fbaa158142d676f16 SHA512 6ea4516a5c52e25c4f993f7acb875463a5caea93dbdf250c5d48eee95fff226956e9f030cab7e341b5e6a132325bc3dbf93dcb4b1185acb011918e50b1a22be3 WHIRLPOOL 870deeff877c6b9fc812a4260e4fdbb6715a5dc2065cab3bfbf2a42d876f6654703ccb124275a4e2c410cef48f3db02b63cc76059eccf9cf90244826f35b7a15
 DIST freebsd-sys-9.1.tar.bz2 32588103 SHA256 b93a7ac8334ac16cc9f60665048e5ef812c0a6c62f10d0b0a674aec3f56516a8 SHA512 7dc9d9e00dde8f592bb171f4386d02b655b73cb4f153fe5ec063d010a148ef0639eae0dcdb3eeb09ecd1e3653c69e49a2d261329fa6d0381d2ddabe258ddde6d WHIRLPOOL c8348344dfb14bad64bd3a78ee615ddd29203175b292233254f8ba175e7a3fb7218af6f95f7b4dbf394c0354bafe9d8bb0c21cdf0ceaeb697214964b280469b3
diff --git a/sys-freebsd/freebsd-rescue/freebsd-rescue-10.1.ebuild b/sys-freebsd/freebsd-rescue/freebsd-rescue-10.1.ebuild
deleted file mode 100644
index 9a9eb1138b12..000000000000
--- a/sys-freebsd/freebsd-rescue/freebsd-rescue-10.1.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit bsdmk freebsd toolchain-funcs
-
-DESCRIPTION="FreeBSD's rescue binaries"
-SLOT="0"
-LICENSE="BSD zfs? ( CDDL )"
-
-IUSE="atm netware nis zfs"
-
-if [[ ${PV} != *9999* ]]; then
-	KEYWORDS="~amd64-fbsd ~x86-fbsd"
-fi
-
-EXTRACTONLY="
-	usr.bin/
-	contrib/
-	lib/
-	bin/
-	sbin/
-	usr.sbin/
-	gnu/
-	sys/
-	libexec/
-	rescue/
-"
-use zfs && EXTRACTONLY+="cddl/"
-
-RDEPEND=""
-DEPEND="sys-devel/flex
-	app-arch/xz-utils[static-libs]
-	sys-libs/ncurses[static-libs]
-	dev-libs/expat[static-libs]
-	app-arch/bzip2[static-libs]
-	dev-libs/libedit[static-libs]
-	dev-libs/libxml2:2[static-libs]
-	dev-libs/openssl[static-libs]
-	sys-libs/zlib[static-libs]
-	sys-libs/readline[static-libs]
-	=sys-freebsd/freebsd-lib-${RV}*[atm?,netware?]
-	=sys-freebsd/freebsd-sources-${RV}*
-	=sys-freebsd/freebsd-mk-defs-${RV}*
-	zfs? ( =sys-freebsd/freebsd-cddl-${RV}* )"
-
-S="${WORKDIR}/rescue"
-
-pkg_setup() {
-	use atm || mymakeopts="${mymakeopts} WITHOUT_ATM= "
-	use netware || mymakeopts="${mymakeopts} WITHOUT_IPX= "
-	use nis || mymakeopts="${mymakeopts} WITHOUT_NIS= "
-	use zfs || mymakeopts="${mymakeopts} WITHOUT_CDDL= "
-	mymakeopts="${mymakeopts} NO_PIC= "
-}
-
-src_prepare() {
-	# As they are patches from ${WORKDIR} apply them by hand
-	cd "${WORKDIR}"
-	epatch "${FILESDIR}/${PN}"-10.0-zlib.patch
-	epatch "${FILESDIR}/freebsd-sbin-bsdxml2expat.patch"
-}
-
-src_compile() {
-	tc-export CC
-	# crunchgen is now checks env MAKE.
-	# Use to force BSD's make
-	export MAKE=/usr/bin/make
-
-	cd "${WORKDIR}/lib/libarchive"
-	echo "#include <expat.h>" > bsdxml.h
-	freebsd_src_compile
-	export CC="${CC} -L${WORKDIR}/lib/libarchive"
-
-	cd "${S}"
-	freebsd_src_compile
-}
diff --git a/sys-freebsd/freebsd-sbin/Manifest b/sys-freebsd/freebsd-sbin/Manifest
index e64ca142685b..6ccc074f43e3 100644
--- a/sys-freebsd/freebsd-sbin/Manifest
+++ b/sys-freebsd/freebsd-sbin/Manifest
@@ -8,8 +8,6 @@ DIST freebsd-libexec-8.2.tar.bz2 289147 SHA256 10b996d1d8cd044ee2e7a877e5e6ad2bf
 DIST freebsd-libexec-9.1.tar.bz2 304592 SHA256 71e6e9e41328c2148c54b81ad9b59f912a1d5f0d52e17ac07f223aa7a94b82be SHA512 7baa4160dda2610250dd52f445e24478e0f1ea10bce21fcd0e5d1b856f399b896adc334114de0c7f61a5637e4349bb1688fdbe5c72798d8568ae791114710b92 WHIRLPOOL d800f477ac5c9ad6dae3e0091c83e107609b5a1e3aa79e9533fcd10a8dd34ff7733ab9523eae7c292310fe94f6a529209cae6b9e8bac6b47244e59834593e74b
 DIST freebsd-sbin-8.2.tar.bz2 1211665 SHA256 8b7e21a66b4696e8763d29b8b02b2d35f29fc51820a194d1e469e7cace84c527 SHA512 c6643c29ab62344c98d8991708798730ee1c17e6478071718beeaa79788300a1f4ed2e6aeb8e39e3c216877d4ed2ac85b2a9531d534f1ac5125a508927898959 WHIRLPOOL 2a21cd0f15f95d66718031680ac87f1fe73f1e1b03cb012e1db1dd1bd2fe2bb7897457a8ba2f5a28c8806775611dca542cbadec16566c47ab9efa673e2cb53f3
 DIST freebsd-sbin-9.1.tar.bz2 1273913 SHA256 45008b0733b232ef03707ef5fa3e5c889e3b3728393d736bd9a869ea83be6447 SHA512 9f186602b7de96f268c352ca386986652fddf5570e7eca1afa8c0d2bdc83b57df1198efe47f36dd5c7a6abf4f9c935f1c8207a4a12a6b2153bd6c3c6292719dc WHIRLPOOL 20920dfa9607a0ce854319cef29bbd77fb1b31f6f6cfd5ac60cbd678169e43929e215743fe636d0c224443f3e6149a8f07c292d647f7f901592795ac292699f9
-DIST freebsd-sbin-SA-1519-routed.patch 554 SHA256 e4f90b10ddb18f046ff340ec1bf1d5fdf0c330fe4966bd9e47fb0cb0a1fbe842 SHA512 6d09c517bd10f9f19b220ae11100d7cdd41e7943a48632c77c254dbc86e4b4a72f8d34925ee65e0a192c37fc49ef0718ad16556de8ca508c118060e286087192 WHIRLPOOL a9ad3c2bdc968e71b7c21e0897d5ab10b9f1e178116f71a77c6c389a25c256165908ae0862f975c2c491e9bf0d509f6c4fd75452853234e96e69f55fabc14e8e
-DIST freebsd-src-10.1.tar.xz 115049476 SHA256 f919287a5ef51d4f133f27c99c54f2e8054f408d3dd53bc60f4e233cc75ec03d SHA512 4ded32b451e2807e24a06305502f88ea633b2899a7ccd9cab3dc98fc865ef91324c93c512a08cf6e295313a8d7e79aa9d7af07da40e7276d986b06419b984152 WHIRLPOOL 1eff9419d89b8a70f064171883d92e160b250cd637972eb9107a19d7b3c904b554c4f51eaa9ff9642ef2c4234bde05cf9aef16d0c39280b55084f831700dea80
 DIST freebsd-src-10.2.tar.xz 124551336 SHA256 6a59ea716bae96135983ad70cd7123e3b35ec91b191a82fe282ade88a61560b1 SHA512 fba4588fdaa94fa4582a8de566a84cf4f2badc87c7b2e0745d7a31c1e349b2d5f59dbdbb16a9d43421155c1ac4bdec8db24c5d32ac5a92be687d4ed70fe35835 WHIRLPOOL e325db3c07118762021d802c4f20c7a5fd4b816f08cab6f92b408399f1b3bf8ad89728d51c354ab21478265a4539463c94aae9ae49f0ac10cd3c3f8f640dc186
 DIST freebsd-sys-8.2.tar.bz2 25835329 SHA256 0c6c7b61aae94db2931f985d5899f3bca78fc8ffab6b598fbaa158142d676f16 SHA512 6ea4516a5c52e25c4f993f7acb875463a5caea93dbdf250c5d48eee95fff226956e9f030cab7e341b5e6a132325bc3dbf93dcb4b1185acb011918e50b1a22be3 WHIRLPOOL 870deeff877c6b9fc812a4260e4fdbb6715a5dc2065cab3bfbf2a42d876f6654703ccb124275a4e2c410cef48f3db02b63cc76059eccf9cf90244826f35b7a15
 DIST freebsd-sys-9.1.tar.bz2 32588103 SHA256 b93a7ac8334ac16cc9f60665048e5ef812c0a6c62f10d0b0a674aec3f56516a8 SHA512 7dc9d9e00dde8f592bb171f4386d02b655b73cb4f153fe5ec063d010a148ef0639eae0dcdb3eeb09ecd1e3653c69e49a2d261329fa6d0381d2ddabe258ddde6d WHIRLPOOL c8348344dfb14bad64bd3a78ee615ddd29203175b292233254f8ba175e7a3fb7218af6f95f7b4dbf394c0354bafe9d8bb0c21cdf0ceaeb697214964b280469b3
diff --git a/sys-freebsd/freebsd-sbin/freebsd-sbin-10.1-r1.ebuild b/sys-freebsd/freebsd-sbin/freebsd-sbin-10.1-r1.ebuild
deleted file mode 100644
index 490bd63bf3eb..000000000000
--- a/sys-freebsd/freebsd-sbin/freebsd-sbin-10.1-r1.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit bsdmk freebsd multilib
-
-DESCRIPTION="FreeBSD sbin utils"
-SLOT="0"
-
-# Security Advisory and Errata patches.
-UPSTREAM_PATCHES=( "SA-15:19/routed.patch" )
-
-if [[ ${PV} != *9999* ]]; then
-	KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-	SRC_URI="${SRC_URI}
-		$(freebsd_upstream_patches)"
-fi
-
-EXTRACTONLY="
-	sbin/
-	contrib/
-	lib/
-	libexec/
-	usr.sbin/
-	etc/
-"
-use build && EXTRACTONLY+="sys/"
-
-RDEPEND="=sys-freebsd/freebsd-lib-${RV}*[ipv6?,atm?,netware?]
-	=sys-freebsd/freebsd-libexec-${RV}*
-	>=dev-libs/expat-2.0.1
-	ssl? ( dev-libs/openssl )
-	>=dev-libs/libedit-20120311.3.0-r1
-	sys-libs/readline
-	|| (
-		sys-process/cronie
-		sys-process/vixie-cron
-	)
-	atm? ( net-analyzer/bsnmp )"
-DEPEND="${RDEPEND}
-	!build? ( =sys-freebsd/freebsd-sources-${RV}* )
-	=sys-freebsd/freebsd-mk-defs-${RV}*"
-
-S="${WORKDIR}/sbin"
-
-IUSE="atm ipfilter +pf ipv6 build ssl +cxx netware"
-
-pkg_setup() {
-	use atm || mymakeopts="${mymakeopts} WITHOUT_ATM= "
-	use cxx || mymakeopts="${mymakeopts} WITHOUT_CXX="
-	use ipfilter || mymakeopts="${mymakeopts} WITHOUT_IPFILTER= "
-	use ipv6 || mymakeopts="${mymakeopts} WITHOUT_INET6= WITHOUT_INET6_SUPPORT="
-	use netware || mymakeopts="${mymakeopts} WITHOUT_IPX= WITHOUT_IPX_SUPPORT= WITHOUT_NCP= "
-	use pf || mymakeopts="${mymakeopts} WITHOUT_PF= "
-	use ssl || mymakeopts="${mymakeopts} WITHOUT_OPENSSL="
-}
-
-REMOVE_SUBDIRS="dhclient pfctl pflogd rcorder resolvconf"
-
-PATCHES=( "${FILESDIR}/${PN}-setXid.patch"
-	"${FILESDIR}/${PN}-10.0-zlib.patch"
-	"${FILESDIR}/${PN}-6.2-ldconfig.patch"
-	"${FILESDIR}/${PN}-6.1-pr102701.patch"
-	"${FILESDIR}/${PN}-bsdxml2expat.patch" )
-
-src_prepare() {
-	if [[ ! -e "${WORKDIR}/sys" ]]; then
-		use build || ln -s "/usr/src/sys" "${WORKDIR}/sys"
-	fi
-}
-
-src_install() {
-	mymakeopts="${mymakeopts} GEOM_CLASS_DIR=/$(get_libdir)/geom "
-	freebsd_src_install
-	keepdir /var/log
-	# Needed by ldconfig:
-	keepdir /var/run
-
-	# Maybe ship our own sysctl.conf so things like radvd work out of the box.
-	# New wireless config method requires regdomain.xml in /etc
-	cd "${WORKDIR}/etc/"
-	insinto /etc
-	doins minfree sysctl.conf regdomain.xml || die
-
-	# Install a crontab for adjkerntz
-	insinto /etc/cron.d
-	newins "${FILESDIR}/adjkerntz-crontab" adjkerntz
-
-	# Install the periodic stuff (needs probably to be ported in a more
-	# gentooish way)
-	cd "${WORKDIR}/etc/periodic"
-
-	doperiodic security \
-		security/*.ipfwlimit \
-		security/*.ipfwdenied || die
-
-	use ipfilter && { doperiodic security \
-		security/*.ipfdenied || die ; }
-
-	use pf && { doperiodic security \
-		security/*.pfdenied || die ; }
-}
diff --git a/sys-freebsd/freebsd-share/Manifest b/sys-freebsd/freebsd-share/Manifest
index 00df912a437b..e705e7ef3881 100644
--- a/sys-freebsd/freebsd-share/Manifest
+++ b/sys-freebsd/freebsd-share/Manifest
@@ -12,7 +12,6 @@ DIST freebsd-sbin-8.2.tar.bz2 1211665 SHA256 8b7e21a66b4696e8763d29b8b02b2d35f29
 DIST freebsd-sbin-9.1.tar.bz2 1273913 SHA256 45008b0733b232ef03707ef5fa3e5c889e3b3728393d736bd9a869ea83be6447 SHA512 9f186602b7de96f268c352ca386986652fddf5570e7eca1afa8c0d2bdc83b57df1198efe47f36dd5c7a6abf4f9c935f1c8207a4a12a6b2153bd6c3c6292719dc WHIRLPOOL 20920dfa9607a0ce854319cef29bbd77fb1b31f6f6cfd5ac60cbd678169e43929e215743fe636d0c224443f3e6149a8f07c292d647f7f901592795ac292699f9
 DIST freebsd-share-8.2.tar.bz2 3797560 SHA256 dd082c6ddbf8e08ec91d9810d51af4111339bed912b0f74d05be283780292ba0 SHA512 b3f964253f80e58cde12f26e48a23aa75c17b9ab2810f91a4bd2d7efbe902af7c73c219f8373a4fc97ee0a35d25627b8815c79c136ef18620acc8bd0ee5bd6c4 WHIRLPOOL 42326ad6139feadf80509f5e810f6a86009ad3a69aad9550c6355389773c28d5b2f7930eaa852f8442808485d13e5b758ed3420e39048bb3966785e6953119ea
 DIST freebsd-share-9.1.tar.bz2 6733003 SHA256 2bbd8aa05d52b18a1780772a8518d79d375c1eeae98f52fb6aded233ac2491d7 SHA512 9665e3d5253f49a55921012bd21a8688210a1993ba6be4ad17b5ba5619104a50f3199d49a0eb83cf29db5a06c407beb15616bfe71338c680fe34ec47564c4b43 WHIRLPOOL 7d15596888ac42af1a0c125591283524ff794dccbf9f6592963602f046a45ca073b10bda43c2d0d662fd3414753de64c05293788e03c4eea67de55d9bc083c11
-DIST freebsd-src-10.1.tar.xz 115049476 SHA256 f919287a5ef51d4f133f27c99c54f2e8054f408d3dd53bc60f4e233cc75ec03d SHA512 4ded32b451e2807e24a06305502f88ea633b2899a7ccd9cab3dc98fc865ef91324c93c512a08cf6e295313a8d7e79aa9d7af07da40e7276d986b06419b984152 WHIRLPOOL 1eff9419d89b8a70f064171883d92e160b250cd637972eb9107a19d7b3c904b554c4f51eaa9ff9642ef2c4234bde05cf9aef16d0c39280b55084f831700dea80
 DIST freebsd-src-10.2.tar.xz 124551336 SHA256 6a59ea716bae96135983ad70cd7123e3b35ec91b191a82fe282ade88a61560b1 SHA512 fba4588fdaa94fa4582a8de566a84cf4f2badc87c7b2e0745d7a31c1e349b2d5f59dbdbb16a9d43421155c1ac4bdec8db24c5d32ac5a92be687d4ed70fe35835 WHIRLPOOL e325db3c07118762021d802c4f20c7a5fd4b816f08cab6f92b408399f1b3bf8ad89728d51c354ab21478265a4539463c94aae9ae49f0ac10cd3c3f8f640dc186
 DIST freebsd-ubin-8.2.tar.bz2 1808012 SHA256 6b99554f3ad6ee052069b347eb6e6219b71598d7b222acb90a24cbfc805c7b68 SHA512 48d0103323e820c431aa4f62d3be40cb3b200fb62e3de01f36c88760395bf2ba3367c51f3fa72da4dbccc2812176a051a12ca5cb7e84125c3e0fc78d4cab2c29 WHIRLPOOL ea8f3a29a37b42c2b5bcc0f2c343fa1538522157ef075363c94606a4620a590e9a03f856ce2494e3e727935b62431991d0aa9fde71de699e78b4fe225bdf1c2c
 DIST freebsd-ubin-9.1.tar.bz2 1910472 SHA256 ff6e586f213534b6ec2e65002c0dee64063d76ddad515c12221b1a80a1815e48 SHA512 74ae0aceec8597aa66c3f1ab313f0685a3c63d7273c36ae7baf8794275ad9bca241c60c3f6281cccf6d531d250d7611099977d3b1a27279cef3586401b6af05e WHIRLPOOL c85a3c9cf2bceff2c60ff03556bcc81d3aca22b0bce3c9538990071ac0a907236eee5ae7743ad22c5fd309b047ebf392aaaf2fe177ef5790ea869aff3da7e2fe
diff --git a/sys-freebsd/freebsd-share/freebsd-share-10.1.ebuild b/sys-freebsd/freebsd-share/freebsd-share-10.1.ebuild
deleted file mode 100644
index 14406a92dfe8..000000000000
--- a/sys-freebsd/freebsd-share/freebsd-share-10.1.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit bsdmk freebsd
-
-DESCRIPTION="FreeBSD shared tools/files"
-SLOT="0"
-
-IUSE="doc zfs"
-
-if [[ ${PV} != *9999* ]]; then
-	KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-fi
-
-EXTRACTONLY="
-	share/
-	contrib/
-	gnu/
-	usr.bin/
-	usr.sbin/
-	sbin/
-	bin/
-	lib/
-	etc/
-"
-use zfs && EXTRACTONLY+="cddl/"
-
-DEPEND="=sys-freebsd/freebsd-mk-defs-${RV}*
-		=sys-freebsd/freebsd-sources-${RV}*"
-RDEPEND="sys-apps/miscfiles"
-
-RESTRICT="strip"
-
-S="${WORKDIR}/share"
-
-pkg_setup() {
-	use doc || mymakeopts="${mymakeopts} NO_SHAREDOCS= "
-	use zfs || mymakeopts="${mymakeopts} WITHOUT_CDDL= "
-	[[ ! -e /usr/bin/vtfontcvt ]] && mymakeopts="${mymakeopts} WITHOUT_VT= "
-
-	mymakeopts="${mymakeopts} NO_SENDMAIL= NO_MANCOMPRESS= NO_INFOCOMPRESS= "
-}
-
-REMOVE_SUBDIRS="mk termcap zoneinfo tabset"
-
-PATCHES=( "${FILESDIR}/${PN}-5.3-doc-locations.patch"
-	"${FILESDIR}/${PN}-5.4-gentoo-skel.patch"
-	"${FILESDIR}/${PN}-9.2-gnu-miscfiles.patch"
-	"${FILESDIR}/${PN}-10.0-gentoo-eapi3.patch" )
-
-src_prepare() {
-	# Remove make.conf manpage as it describes bsdmk's make.conf.
-	sed -i -e 's:make.conf.5::' "${S}/man/man5/Makefile"
-	# Remove rc.conf manpage as it describes bsd's rc.conf.
-	sed -i -e 's:\brc.conf.5::' "${S}/man/man5/Makefile"
-	sed -i -e 's:\brc.conf.local.5::' "${S}/man/man5/Makefile"
-	# Remove mailer.conf manpage
-	sed -i -e 's:mailer.conf.5::' "${S}/man/man5/Makefile"
-	# Remove pbm and moduli(ssh) manpages
-	sed -i -e 's:pbm.5::' -e 's:moduli.5::' "${S}/man/man5/Makefile"
-	# Remove builtins manpage
-	sed -i -e '/builtins\.1/d' "${S}/man/man1/Makefile"
-	# Remove rc manpages
-	sed -i -e '/rc.8/d' "${S}/man/man8/Makefile"
-	# Remove hv_kvp_daemon.8 manpage. It's provided by freebsd-usbin.
-	sed -i -e '/hv_kvp_daemon.8/d' "${S}/man/man8/Makefile"
-
-	# Don't install the arch-specific directories in subdirectories
-	sed -i -e '/MANSUBDIR/d' "${S}"/man/man4/man4.{i386,sparc64}/Makefile
-
-	# Remove them so that they can't be included by error
-	rm -rf "${S}"/mk/*.mk
-
-	# Make proper symlinks by defining the full target.
-	local sdir
-	for sdir in colldef mklocale monetdef msgdef numericdef timedef
-	do
-		sed -e 's:\${enc2}$:\${enc2}/\${FILESNAME}:g' -i \
-			"${S}/${sdir}/Makefile" || \
-			die "Error fixing ${sdir}/Makefile"
-	done
-	if [[ ! -e "${WORKDIR}/sys" ]]; then
-		ln -s "/usr/src/sys" "${WORKDIR}/sys" || die "failed to set sys symlink"
-	fi
-}
-
-src_compile() {
-	export ESED="/usr/bin/sed"
-
-	# libiconv support.
-	# i18n/csmapper/APPLE requires mkcsmapper_static
-	# i18n/esdb/APPLE requires mkesdb_static
-	for pkg in mkcsmapper_static mkesdb_static
-	do
-		cd "${WORKDIR}"/usr.bin/${pkg}
-		freebsd_src_compile
-	done
-
-	# This is a groff problem and not a -shared problem.
-	cd "${S}"
-	export GROFF_TMAC_PATH="/usr/share/tmac/:/usr/share/groff/1.22.2/tmac/"
-	freebsd_src_compile -j1 || die "emake failed"
-}
-
-src_install() {
-	mkmake -j1 DESTDIR="${D}" DOCDIR=/usr/share/doc/${PF} install || die "Install failed"
-}
diff --git a/sys-freebsd/freebsd-sources/Manifest b/sys-freebsd/freebsd-sources/Manifest
index 594b7ae73bb0..ef6558af7ca0 100644
--- a/sys-freebsd/freebsd-sources/Manifest
+++ b/sys-freebsd/freebsd-sources/Manifest
@@ -1,15 +1,4 @@
 DIST freebsd-sources-9.1-en-13-03.patch 32571 SHA256 8bafbaba1b23f4651a9e578dbbb3b8d9b4a0a28dc1702f6dc17a40728b861595 SHA512 013a21da3618da9098020c85abe42d99e4eeb8d6b9b818cd5c6d27ee2ea2d31b60ad4521e73cb996f2f5c99fd0f34bd4a35458977264c51e79f4f53bfca6e7cc WHIRLPOOL c7b0a56efd9cebecde56590cacb1ee743845ce13577505255deca44c167d679ce94c759cfb363c26a5f2a9fc16dfc06d17eea18d638fd72c21ec0fdd81a71c5f
-DIST freebsd-sources-EN-1501-vt.patch 877 SHA256 0dccdea4622599a50010a5dc7ebd411ad4c662e4a0f387f6faf43550269e9c61 SHA512 caf4b7587d3555aea8291578de03bb158e71ffa42ec323fd8736ea9b690eeac42084d8909a97ea39352573bb78e97fb4f367f2968e70970d68006c82726329a1 WHIRLPOOL a4ca24f7a91e98a97ba2b0d9a5e7c6297baf7ed501582d3f70b180cf596d6d4ccf058b1843abb60c448f17e95ed68ae0d1efa7deff0269c76abadfd3ede0533a
-DIST freebsd-sources-EN-1505-ufs.patch 9811 SHA256 a589df05e8532bbe302282ba11e9d6caa50107b1673291218be48241ac3bcc3a SHA512 f24786afa6fafce28ec7221a71cc879119d0fa06a63e3c051aa7ecd609ed58360421b41918208d5182ab95a81da6ecdff6070d7b7ca6a2263aff3ce95c87ca26 WHIRLPOOL 0618d6c72c6980efe4169a02fc221aed072c0fdca22499457f90b64b31248390d2de2b5d845fed33f328cd3a36a03899a6b19857047f8ee1e087f03e7b4559a4
-DIST freebsd-sources-EN-1507-zfs.patch 9487 SHA256 53746175c99e358473c4d299a808b1c686c0ebc6b6d205b6f0a90bd70de17c47 SHA512 bac26f621406a3e372f8f1be6bc69d096657e95294b3fc603bf60d786d6968f2661e7a1e4321d745afdbe02193b676c6a855ce11d45a9742f7c1977572ed682a WHIRLPOOL 83b8724089df65365c2c5c53c351241958bb33408cc9f70588a028090a097302774d910b9c4509823c6f2091b4296dde600f2546c3207f6ea4f8fc699d4cede2
-DIST freebsd-sources-SA-1502-sctp.patch 2097 SHA256 c8ade882a39dd8f65c34b175457cdd93be6eafea67ffb5f977435d48a19b6b68 SHA512 b233ae1d249bdbf516aba611d081a5a6ccaaab32f9e281cce65136c68c6a47362eac33398d6849a45e4e1c30f02a482287d6339069d29ece0aa5c4d9101e24a4 WHIRLPOOL 4713b4d896c561d47686b9f1d53a7e3c912fc58c8039529f0ae244b2cc533aabf20f386a1f9bc8632849ebd084d3739b6be55d4f39a00d484d5d230755497b69
-DIST freebsd-sources-SA-1503-sctp.patch 4181 SHA256 61b5e717e88671ecc3da9c2b11d4c6d5ddc26f529ed19cb8ce588743cd00af9d SHA512 30deeb82af385abb0b57cc02752e72d8dda37688df99038910f04558ab064624cb576b1989ba8a7674e3a9046f9607be90596d9bdfb2f28900568291b0f96717 WHIRLPOOL 1073a364805b0ef8377dae6e3cd1665de6e4e99612549081fd794a4d92b4b4ee583a68e66f089340dc35129e3fb0bcf00b14b5b71304b6dac744d9a852530fbe
-DIST freebsd-sources-SA-1504-igmp-errata.patch 1105 SHA256 de2a7a42a8212754f716629e52e1572f7bd7b274dfd999bda680ba813bcbf54e SHA512 89f3627bdbaa31c5e3b189bc6bb914bff69e54d3f6bf8caaa24f4067db3aba48d8b901146c7eeb186da5426ff7c9e9229ff9ef197bbd45f8bf1011348c30343c WHIRLPOOL aea0b508c992740094599c516aa6987c1a47c302ffb4a3a0f31b66148f63a21b76921be393caf9c10840152dc6bb4aa4d64e7e65725cc9c00a643e8f3d926957
-DIST freebsd-sources-SA-1504-igmp.patch 463 SHA256 969674297e3afbacbd3e15fc6621c813149ab044964d47b936761f04f8ff0bd6 SHA512 5668d18c0abcaad53547394bca18fa1060372cd7f59fd35265778ad74bd331ed08fd8c0b0e48fb338bf8d08c427af1b40315855c7d83c9e3c1917b2f22de1f92 WHIRLPOOL ca93b5f794aac22a23c0e14853813439ce9e0a26847aeec3498bf01c7e10cc1829ddde1a2d5d1291bf2a610773846bfef9217199da1a249d4e7df9f4e44a3e46
-DIST freebsd-sources-SA-1509-ipv6.patch 872 SHA256 318babf3961a2b99ea5453a5e2b65e4918279110b8c59ee54741ec4d689de227 SHA512 15a938c0c092bd7d40417d18c57401b0e0fea3c9a5976dea55e1fd2329ac5987016a719c7d8a078ce950b49b2096a26a058b5f7c7ba525430a975ab8fe68cb64 WHIRLPOOL 271b0750ddd3a8a88c18dc4e97e601f68419b6ff3ba9d4c0f5611153e945ecbcaea586ed8bb740ab00836370951ba977dc65739b55984fa5e08ecb70079d309d
-DIST freebsd-sources-SA-1513-tcp.patch 1083 SHA256 7ce30ae71433508c056366bdd91b62e0e6ad03bd8a1f41e71355506226a8df20 SHA512 5b76aec9844f83e1570392acef5f7336bcf12dc3582ea7ef7327c749941c6cd84d5000c482b4cfcd1d5af0a258c5b91623e4c0dd6edc010e518ee81b5e0ee2dd WHIRLPOOL ccc00d6f196d907f234fe1add9b2bc487e950ec0fa94de531762ddc10364a2491e6055f0bd587ec9e669d8a83b2d640e4e1fe125bacf475002b8efc1285e5a3b
-DIST freebsd-sources-SA-1515-tcp-9.3-10.1.patch 6546 SHA256 8173a1a7f28140ba9876da3bc26ad2ccf48af388e88619fafefc3e07b28fe09c SHA512 391a365098ea18815619d9fecdc452a49e1ab0546a9c0fb3666f7240539b309dcb583db5a58dbc43b729dfcaaac259effe13a00601c2771f35f3757d251b62ae WHIRLPOOL d0385a5106330a4bc374e10bca73a2678eec4adb8ba01656449004e139c370a9535960dd3d7ee4c051035fe6fc77d4bd39b4a14fd961eaed8ebb64089deace84
-DIST freebsd-src-10.1.tar.xz 115049476 SHA256 f919287a5ef51d4f133f27c99c54f2e8054f408d3dd53bc60f4e233cc75ec03d SHA512 4ded32b451e2807e24a06305502f88ea633b2899a7ccd9cab3dc98fc865ef91324c93c512a08cf6e295313a8d7e79aa9d7af07da40e7276d986b06419b984152 WHIRLPOOL 1eff9419d89b8a70f064171883d92e160b250cd637972eb9107a19d7b3c904b554c4f51eaa9ff9642ef2c4234bde05cf9aef16d0c39280b55084f831700dea80
 DIST freebsd-src-10.2.tar.xz 124551336 SHA256 6a59ea716bae96135983ad70cd7123e3b35ec91b191a82fe282ade88a61560b1 SHA512 fba4588fdaa94fa4582a8de566a84cf4f2badc87c7b2e0745d7a31c1e349b2d5f59dbdbb16a9d43421155c1ac4bdec8db24c5d32ac5a92be687d4ed70fe35835 WHIRLPOOL e325db3c07118762021d802c4f20c7a5fd4b816f08cab6f92b408399f1b3bf8ad89728d51c354ab21478265a4539463c94aae9ae49f0ac10cd3c3f8f640dc186
 DIST freebsd-sys-8.2.tar.bz2 25835329 SHA256 0c6c7b61aae94db2931f985d5899f3bca78fc8ffab6b598fbaa158142d676f16 SHA512 6ea4516a5c52e25c4f993f7acb875463a5caea93dbdf250c5d48eee95fff226956e9f030cab7e341b5e6a132325bc3dbf93dcb4b1185acb011918e50b1a22be3 WHIRLPOOL 870deeff877c6b9fc812a4260e4fdbb6715a5dc2065cab3bfbf2a42d876f6654703ccb124275a4e2c410cef48f3db02b63cc76059eccf9cf90244826f35b7a15
 DIST freebsd-sys-9.1.tar.bz2 32588103 SHA256 b93a7ac8334ac16cc9f60665048e5ef812c0a6c62f10d0b0a674aec3f56516a8 SHA512 7dc9d9e00dde8f592bb171f4386d02b655b73cb4f153fe5ec063d010a148ef0639eae0dcdb3eeb09ecd1e3653c69e49a2d261329fa6d0381d2ddabe258ddde6d WHIRLPOOL c8348344dfb14bad64bd3a78ee615ddd29203175b292233254f8ba175e7a3fb7218af6f95f7b4dbf394c0354bafe9d8bb0c21cdf0ceaeb697214964b280469b3
diff --git a/sys-freebsd/freebsd-sources/freebsd-sources-10.1-r6.ebuild b/sys-freebsd/freebsd-sources/freebsd-sources-10.1-r6.ebuild
deleted file mode 100644
index 709554c6a222..000000000000
--- a/sys-freebsd/freebsd-sources/freebsd-sources-10.1-r6.ebuild
+++ /dev/null
@@ -1,166 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit bsdmk freebsd flag-o-matic toolchain-funcs
-
-DESCRIPTION="FreeBSD kernel sources"
-SLOT="0"
-
-IUSE="+build-kernel debug dtrace zfs"
-
-# Security Advisory and Errata patches.
-UPSTREAM_PATCHES=( "SA-15:02/sctp.patch"
-	"SA-15:03/sctp.patch"
-	"SA-15:04/igmp.patch"
-	"SA-15:04/igmp-errata.patch"
-	"SA-15:09/ipv6.patch"
-	"SA-15:13/tcp.patch"
-	"SA-15:15/tcp-9.3-10.1.patch"
-	"EN-15:01/vt.patch"
-	"EN-15:05/ufs.patch"
-	"EN-15:07/zfs.patch" )
-
-if [[ ${PV} != *9999* ]]; then
-	KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-	SRC_URI="${SRC_URI}
-		$(freebsd_upstream_patches)"
-fi
-
-EXTRACTONLY="
-	sys/
-	contrib/bmake/
-	usr.bin/bmake/
-"
-use zfs && EXTRACTONLY+="cddl/"
-
-RDEPEND="dtrace? ( >=sys-freebsd/freebsd-cddl-9.2_rc1 )
-	=sys-freebsd/freebsd-mk-defs-${RV}*
-	!sys-freebsd/virtio-kmod
-	!sys-fs/fuse4bsd
-	!<sys-freebsd/freebsd-sources-9.2_beta1"
-DEPEND="build-kernel? (
-		dtrace? ( >=sys-freebsd/freebsd-cddl-9.2_rc1 )
-		>=sys-freebsd/freebsd-usbin-9.1
-		=sys-freebsd/freebsd-mk-defs-${RV}*
-	)"
-
-RESTRICT="strip binchecks"
-
-S="${WORKDIR}/sys"
-
-KERN_BUILD=GENTOO
-
-PATCHES=( "${FILESDIR}/${PN}-9.0-disable-optimization.patch"
-	"${FILESDIR}/${PN}-10.0-gentoo.patch"
-	"${FILESDIR}/${PN}-6.0-flex-2.5.31.patch"
-	"${FILESDIR}/${PN}-7.1-types.h-fix.patch"
-	"${FILESDIR}/${PN}-8.0-subnet-route-pr40133.patch"
-	"${FILESDIR}/${PN}-7.1-includes.patch"
-	"${FILESDIR}/${PN}-9.0-sysctluint.patch"
-	"${FILESDIR}/${PN}-9.2-gentoo-gcc.patch"
-	"${FILESDIR}/${PN}-10.1-gcc48.patch" )
-
-pkg_setup() {
-	# WITHOUT_SSP= is required to boot kernel that compiled with newer gcc, bug #477914
-	[[ $(tc-getCC) == *gcc* ]] && mymakeopts="${mymakeopts} WITHOUT_SSP="
-	use zfs || mymakeopts="${mymakeopts} WITHOUT_CDDL="
-}
-
-src_prepare() {
-	local conf="${S}/$(tc-arch-kernel)/conf/${KERN_BUILD}"
-
-	# This replaces the gentoover patch, it doesn't need reapply every time.
-	sed -i -e 's:^REVISION=.*:REVISION="'${PVR}'":' \
-		-e 's:^BRANCH=.*:BRANCH="Gentoo":' \
-		-e 's:^VERSION=.*:VERSION="${TYPE} ${BRANCH} ${REVISION}":' \
-		"${S}/conf/newvers.sh"
-
-	# __FreeBSD_cc_version comes from FreeBSD's gcc.
-	# on 10.0-RELEASE it's 1000001.
-	# FYI, can get it from gnu/usr.bin/cc/cc_tools/freebsd-native.h.
-	sed -e "s:-D_KERNEL:-D_KERNEL -D__FreeBSD_cc_version=1000001:g" \
-		-i "${S}/conf/kern.pre.mk" \
-		-i "${S}/conf/kmod.mk" || die "Couldn't set __FreeBSD_cc_version"
-
-	# Remove -Werror
-	sed -e "s:-Werror:-Wno-error:g" \
-		-i "${S}/conf/kern.pre.mk" \
-		-i "${S}/conf/kmod.mk" || die
-
-	# Set the kernel configuration using USE flags.
-	cp -f "${FILESDIR}/config-GENTOO" "${conf}" || die
-	use debug || echo 'nomakeoptions DEBUG' >> "${conf}"
-	use dtrace || echo 'nomakeoptions WITH_CTF' >> "${conf}"
-
-	# Only used with USE=build-kernel, let the kernel build with its own flags, its safer.
-	unset LDFLAGS CFLAGS CXXFLAGS ASFLAGS KERNEL
-}
-
-src_configure() {
-	if use build-kernel ; then
-		tc-export CC
-		cd "${S}/$(tc-arch-kernel)/conf" || die
-		config ${KERN_BUILD} || die
-	fi
-}
-
-src_compile() {
-	if use build-kernel ; then
-		if has_version "<sys-freebsd/freebsd-ubin-10.0"; then
-			cd "${WORKDIR}"/usr.bin/bmake || die
-			CC=${CHOST}-gcc freebsd_src_compile
-			export BMAKE="${WORKDIR}/usr.bin/bmake/make"
-		fi
-		cd "${S}/$(tc-arch-kernel)/compile/${KERN_BUILD}" || die
-		freebsd_src_compile depend
-		freebsd_src_compile
-	else
-		einfo "Nothing to compile.."
-	fi
-}
-
-src_install() {
-	if use build-kernel ; then
-		cd "${S}/$(tc-arch-kernel)/compile/${KERN_BUILD}" || die
-		freebsd_src_install
-		rm -rf "${S}/$(tc-arch-kernel)/compile/${KERN_BUILD}"
-		cd "${S}"
-	fi
-
-	insinto "/usr/src/sys"
-	doins -r "${S}/".
-	if use zfs ; then
-		insinto "/usr/src/cddl"
-		doins -r "${WORKDIR}/cddl/".
-	fi
-}
-
-pkg_preinst() {
-	if [[ -L "${ROOT}/usr/src/sys" ]]; then
-		einfo "/usr/src/sys is a symlink, removing it..."
-		rm -f "${ROOT}/usr/src/sys"
-	fi
-
-	if use sparc-fbsd ; then
-		ewarn "WARNING: kldload currently causes kernel panics"
-		ewarn "on sparc64. This is probably a gcc-4.1 issue, but"
-		ewarn "we need gcc-4.1 to compile the kernel correctly :/"
-		ewarn "Please compile all modules you need into the kernel"
-	fi
-
-	ewarn "If you want manual compile (not recommended), please don't forget the following step."
-	if ! use sparc-fbsd ; then
-		ewarn "export CC=clang"
-		ewarn "export CXX=clang++"
-	fi
-	if ! use zfs ; then
-		ewarn "export WITHOUT_CDDL="
-		ewarn "Note, Please set USE=zfs if you want to enable modules of CDDL license."
-	fi
-	if ! use dtrace && ! has_version '>=sys-freebsd/freebsd-cddl-9.2_beta1' ; then
-		ewarn "GENERIC config require sys-freebsd/freebsd-cddl. Please emerge it."
-	fi
-}
diff --git a/sys-freebsd/freebsd-ubin/Manifest b/sys-freebsd/freebsd-ubin/Manifest
index 8ab7b38b3be2..a899e23647ce 100644
--- a/sys-freebsd/freebsd-ubin/Manifest
+++ b/sys-freebsd/freebsd-ubin/Manifest
@@ -10,12 +10,9 @@ DIST freebsd-include-8.2.tar.bz2 138992 SHA256 fade90621a8e4880c9583c1ee49965400
 DIST freebsd-include-9.1.tar.bz2 146881 SHA256 861dce3f39e6806762b102361017cbe148f0e2b768b3fca152f8426f44a2942f SHA512 779c8315ce2b10b343bb62e331525d510b0d68ce5d665a1672bd6f4d1eff6445bc6b7a0f178b319828aa203c4e4c04c561ce793052703f4f936ce9711280a0c9 WHIRLPOOL e16ba45d380591ba007ca59579d45f61ffc1aa1a4c08fc11ed2794979b0a189a346c81b4f70a44ee199d50a72024930f28587ad62a9cd6854fc937eb466ec115
 DIST freebsd-lib-8.2.tar.bz2 3323878 SHA256 e3590c12794fcb5ba8eb7a1f58b497587cf19f9200b3254c194a793da3b5bfb0 SHA512 c059cfdd1099bb519b2a5c43fb7e7104c500ef8906229ed7eb9e420cb3a217cdaf8655e9e7a9f45cfadc5491f8115e0e738fd49251d9f0c3a83780845b09f007 WHIRLPOOL 95f98a372f44a89bc8ac3029ec065dbbfec338e6f889d057d75644bfcdfb9d27fdc0421d7e392cad5a823712b97f0857297ec3d321580254c63032c22b95792e
 DIST freebsd-lib-9.1.tar.bz2 3206685 SHA256 f31fa8107b4de711c548f6d0c1bb1f81d09f51bcc3b14a1e9e90bb0e7cc4a35d SHA512 40d0c36b6b889c404fa0e0afa38ba4e84a55bc88ffa2f98a70afbd7a32c4f32c158617ba770567d082a986d62c09b3ec8db3dc5ab853ee1c9bbe0b90bb82396e WHIRLPOOL 581878bf9c43184b043b4293409b85901c9ed1f9bd279e965414aca41ba50950848ebda3ee10a503a028135dfd2765e95a11acd4e62a11c528e104392bbbd8d0
-DIST freebsd-src-10.1.tar.xz 115049476 SHA256 f919287a5ef51d4f133f27c99c54f2e8054f408d3dd53bc60f4e233cc75ec03d SHA512 4ded32b451e2807e24a06305502f88ea633b2899a7ccd9cab3dc98fc865ef91324c93c512a08cf6e295313a8d7e79aa9d7af07da40e7276d986b06419b984152 WHIRLPOOL 1eff9419d89b8a70f064171883d92e160b250cd637972eb9107a19d7b3c904b554c4f51eaa9ff9642ef2c4234bde05cf9aef16d0c39280b55084f831700dea80
 DIST freebsd-src-10.2.tar.xz 124551336 SHA256 6a59ea716bae96135983ad70cd7123e3b35ec91b191a82fe282ade88a61560b1 SHA512 fba4588fdaa94fa4582a8de566a84cf4f2badc87c7b2e0745d7a31c1e349b2d5f59dbdbb16a9d43421155c1ac4bdec8db24c5d32ac5a92be687d4ed70fe35835 WHIRLPOOL e325db3c07118762021d802c4f20c7a5fd4b816f08cab6f92b408399f1b3bf8ad89728d51c354ab21478265a4539463c94aae9ae49f0ac10cd3c3f8f640dc186
 DIST freebsd-sys-8.2.tar.bz2 25835329 SHA256 0c6c7b61aae94db2931f985d5899f3bca78fc8ffab6b598fbaa158142d676f16 SHA512 6ea4516a5c52e25c4f993f7acb875463a5caea93dbdf250c5d48eee95fff226956e9f030cab7e341b5e6a132325bc3dbf93dcb4b1185acb011918e50b1a22be3 WHIRLPOOL 870deeff877c6b9fc812a4260e4fdbb6715a5dc2065cab3bfbf2a42d876f6654703ccb124275a4e2c410cef48f3db02b63cc76059eccf9cf90244826f35b7a15
 DIST freebsd-sys-9.1.tar.bz2 32588103 SHA256 b93a7ac8334ac16cc9f60665048e5ef812c0a6c62f10d0b0a674aec3f56516a8 SHA512 7dc9d9e00dde8f592bb171f4386d02b655b73cb4f153fe5ec063d010a148ef0639eae0dcdb3eeb09ecd1e3653c69e49a2d261329fa6d0381d2ddabe258ddde6d WHIRLPOOL c8348344dfb14bad64bd3a78ee615ddd29203175b292233254f8ba175e7a3fb7218af6f95f7b4dbf394c0354bafe9d8bb0c21cdf0ceaeb697214964b280469b3
 DIST freebsd-ubin-8.2.tar.bz2 1808012 SHA256 6b99554f3ad6ee052069b347eb6e6219b71598d7b222acb90a24cbfc805c7b68 SHA512 48d0103323e820c431aa4f62d3be40cb3b200fb62e3de01f36c88760395bf2ba3367c51f3fa72da4dbccc2812176a051a12ca5cb7e84125c3e0fc78d4cab2c29 WHIRLPOOL ea8f3a29a37b42c2b5bcc0f2c343fa1538522157ef075363c94606a4620a590e9a03f856ce2494e3e727935b62431991d0aa9fde71de699e78b4fe225bdf1c2c
 DIST freebsd-ubin-9.1.tar.bz2 1910472 SHA256 ff6e586f213534b6ec2e65002c0dee64063d76ddad515c12221b1a80a1815e48 SHA512 74ae0aceec8597aa66c3f1ab313f0685a3c63d7273c36ae7baf8794275ad9bca241c60c3f6281cccf6d531d250d7611099977d3b1a27279cef3586401b6af05e WHIRLPOOL c85a3c9cf2bceff2c60ff03556bcc81d3aca22b0bce3c9538990071ac0a907236eee5ae7743ad22c5fd309b047ebf392aaaf2fe177ef5790ea869aff3da7e2fe
 DIST freebsd-ubin-EN-1512-netstat.patch 983 SHA256 42c31b11f4a5f2ffeb713a1cb35fca40cda83a820d255ce3c43b178ad97bba3d SHA512 7fc34362682dbaa60d2a0ef54cd6efc290010bd170880211222a7a2a60187948481d149b6f202fb3673d443d57f69bc712b45044e87e2166d6f70e96fbaf783b WHIRLPOOL 8dfbd5a225a243004d42fba4768aaa532db0c0d627bf265b7000405130dcca9916805a8167fe45416b5c8601e23c67936071fb20d0dc1a8c6882db34361817a4
-DIST freebsd-ubin-SA-1514-bsdpatch.patch 5692 SHA256 46c8f1d59e74660749e68c18ab688e4a36bef08390ecb8ded1910a1ec6616996 SHA512 eecc880909255eac05c0189fa40839fc9b76359f82de3a71320df417bea7ddb53aa0fcaca3c738755615f439c5d7158bcd6c217041ad6d64965c5fc644da5fa9 WHIRLPOOL 50e86baf24331417c207d25a57c339156efba87164a9026098cb76044a5130e454ab41da0980a9917c82cf07e95cf55435d992583ed2504443c8979d5e69a1fd
-DIST freebsd-ubin-SA-1518-bsdpatch.patch 1617 SHA256 4a0a30ee8369d09f5136edf127933892808d55b739b59cfba381a538d6f01ead SHA512 d18a6b65d9210cef2e3efa48c1eab5ec757cacf471bfeefb0bc59c6a3fca9b6ec32534a6e34d6f915b0e407d75e26073bc83d2ff9bd9bf24cdf57dbf19f2c657 WHIRLPOOL 04afc52ee73667432554482c232f604f96f948a7e1abce9f7b3ecf0d3f581819f50ad57f1eaa5ccf09fbc037ce5712a761a42aa153528d10cc1bef0eabad059a
diff --git a/sys-freebsd/freebsd-ubin/freebsd-ubin-10.1-r2.ebuild b/sys-freebsd/freebsd-ubin/freebsd-ubin-10.1-r2.ebuild
deleted file mode 100644
index 956e6c5c4abb..000000000000
--- a/sys-freebsd/freebsd-ubin/freebsd-ubin-10.1-r2.ebuild
+++ /dev/null
@@ -1,206 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit bsdmk freebsd flag-o-matic pam multilib multibuild multilib-build
-
-DESCRIPTION="FreeBSD's base system source for /usr/bin"
-SLOT="0"
-IUSE="ar atm audit bluetooth ipv6 kerberos netware nis ssl usb build zfs"
-LICENSE="BSD zfs? ( CDDL )"
-
-# Security Advisory and Errata patches.
-UPSTREAM_PATCHES=( "SA-15:14/bsdpatch.patch"
-	"SA-15:18/bsdpatch.patch" )
-
-if [[ ${PV} != *9999* ]]; then
-	KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-	SRC_URI="${SRC_URI}
-		$(freebsd_upstream_patches)"
-fi
-
-EXTRACTONLY="
-	usr.bin/
-	contrib/
-	lib/
-	etc/
-	bin/
-	include/
-"
-use zfs && EXTRACTONLY+="cddl/"
-use build && EXTRACTONLY+="sys/"
-
-RDEPEND="=sys-freebsd/freebsd-lib-${RV}*[usb?,bluetooth?,${MULTILIB_USEDEP}]
-	ssl? ( dev-libs/openssl )
-	kerberos? ( virtual/krb5 )
-	ar? ( >=app-arch/libarchive-3 )
-	virtual/pam
-	sys-libs/zlib
-	>=sys-libs/ncurses-5.9
-	!sys-process/fuser-bsd
-	!dev-util/csup
-	!dev-libs/libiconv
-	!sys-freebsd/freebsd-contrib"
-
-DEPEND="${RDEPEND}
-	sys-devel/flex
-	!build? ( =sys-freebsd/freebsd-sources-${RV}* )
-	=sys-freebsd/freebsd-mk-defs-${RV}*"
-
-RDEPEND="${RDEPEND}
-	>=sys-auth/pambase-20080219.1
-	sys-process/cronbase"
-
-S="${WORKDIR}/usr.bin"
-
-PATCHES=( "${FILESDIR}/${PN}-6.0-bsdcmp.patch"
-	"${FILESDIR}/${PN}-9.0-fixmakefiles.patch"
-	"${FILESDIR}/${PN}-setXid.patch"
-	"${FILESDIR}/${PN}-lint-stdarg.patch"
-	"${FILESDIR}/${PN}-8.0-xinstall.patch"
-	"${FILESDIR}/${PN}-9.1-bsdar.patch"
-	"${FILESDIR}/${PN}-9.1-minigzip.patch"
-	"${FILESDIR}/${PN}-10.0-atf.patch"
-	"${FILESDIR}/${PN}-10.0-dtc-gcc46.patch"
-	"${FILESDIR}/${PN}-10.0-kdump-ioctl.patch"
-	"${FILESDIR}/${PN}-10.0-mandoc.patch"
-	"${FILESDIR}/${PN}-10.1-kdump-workaround.patch" )
-
-# Here we remove some sources we don't need because they are already
-# provided by portage's packages or similar. In order:
-# - Archiving tools, provided by their own ebuilds
-# - ncurses stuff
-# - less stuff
-# - bind utils
-# - rsh stuff
-# - binutils gprof
-# - dc stuff
-# and the rest are misc utils we already provide somewhere else.
-REMOVE_SUBDIRS="bzip2 bzip2recover tar cpio
-	gzip gprof
-	lzmainfo xz xzdec
-	unzip
-	tput tset tabs
-	less lessecho lesskey
-	hesinfo host
-	rsh rlogin rusers rwho ruptime
-	compile_et lex vi smbutil file vacation nc ftp telnet
-	c99 c89
-	bc dc
-	whois tftp man"
-
-pkg_setup() {
-	use atm || mymakeopts="${mymakeopts} WITHOUT_ATM= "
-	use audit || mymakeopts="${mymakeopts} WITHOUT_AUDIT= "
-	use bluetooth || mymakeopts="${mymakeopts} WITHOUT_BLUETOOTH= "
-	use ipv6 || mymakeopts="${mymakeopts} WITHOUT_INET6= WITHOUT_INET6_SUPPORT= "
-	use kerberos || mymakeopts="${mymakeopts} WITHOUT_KERBEROS_SUPPORT= "
-	use netware || mymakeopts="${mymakeopts} WITHOUT_IPX= WITHOUT_IPX_SUPPORT= WITHOUT_NCP= "
-	use nis || mymakeopts="${mymakeopts} WITHOUT_NIS= "
-	use ssl || mymakeopts="${mymakeopts} WITHOUT_OPENSSL= "
-	use usb || mymakeopts="${mymakeopts} WITHOUT_USB= "
-	use zfs || mymakeopts="${mymakeopts} WITHOUT_CDDL= "
-	mymakeopts="${mymakeopts} WITHOUT_CLANG= WITHOUT_LZMA_SUPPORT= WITHOUT_SVN= WITHOUT_SVNLITE= WITHOUT_OPENSSH= WITHOUT_LDNS_UTILS= "
-}
-
-pkg_preinst() {
-	# bison installs a /usr/bin/yacc symlink ...
-	# we need to remove it to avoid triggering
-	# collision-protect errors
-	if [[ -L ${ROOT}/usr/bin/yacc ]] ; then
-		rm -f "${ROOT}"/usr/bin/yacc
-	fi
-}
-
-src_prepare() {
-	if [[ ! -e "${WORKDIR}/sys" ]]; then
-		use build || ln -s "/usr/src/sys" "${WORKDIR}/sys"
-	fi
-
-	# Rename manpage for renamed cmp
-	mv "${S}"/cmp/cmp.1 "${S}"/cmp/bsdcmp.1 || die
-	# Rename manpage for renamed ar
-	mv "${S}"/ar/ar.1 "${S}"/ar/freebsd-ar.1 || die
-	# Fix whereis(1) manpath search.
-	sed -i -e 's:"manpath -q":"manpath":' "${S}/whereis/pathnames.h"
-
-	# Build a dynamic make
-	sed -i -e '/^NO_SHARED/ s/^/#/' "${S}"/make/Makefile || die
-
-	# Disable it here otherwise our patch wont apply
-	use ar || dummy_mk ar
-
-	# Preparing to build xlint
-	export LINT=xlint
-}
-
-setup_multilib_vars() {
-	if ! multilib_is_native_abi ; then
-		cd "${WORKDIR}/usr.bin/ldd" || die
-		export mymakeopts="${mymakeopts} PROG=ldd32 WITHOUT_MAN="
-	else
-		cd "${S}"
-	fi
-	"$@"
-}
-
-src_compile() {
-	# Preparing to build mandoc
-	cd "${WORKDIR}/lib/libmandoc"
-	freebsd_src_compile
-
-	cd "${S}"
-	local MULTIBUILD_VARIANTS=( $(multilib_get_enabled_abis) )
-	multibuild_foreach_variant freebsd_multilib_multibuild_wrapper setup_multilib_vars freebsd_src_compile
-}
-
-src_install() {
-	local MULTIBUILD_VARIANTS=( $(multilib_get_enabled_abis) )
-	multibuild_foreach_variant freebsd_multilib_multibuild_wrapper setup_multilib_vars freebsd_src_install
-
-	# baselayout requires these in /bin
-	dodir /bin
-	for bin in sed printf ; do
-		mv "${D}/usr/bin/${bin}" "${D}/bin/" || die "mv ${bin} failed"
-		dosym /bin/${bin} /usr/bin/${bin} || die "dosym ${bin} failed"
-	done
-
-	for pamdfile in login passwd su; do
-		newpamd "${FILESDIR}/${pamdfile}.1.pamd" ${pamdfile} || die
-	done
-
-	cd "${WORKDIR}/etc"
-	insinto /etc
-	doins remote phones opieaccess fbtab || die
-
-	exeinto /etc/cron.daily
-	newexe "${FILESDIR}/locate-updatedb-cron" locate.updatedb || die
-
-	# tip requires /var/spool/lock/, bug #200700
-	keepdir /var/spool/lock
-
-	# create locate database #472468
-	local f=/var/db/locate.database
-	mkdir "${ED}${f%/*}" || die
-	touch "${ED}${f}" || die
-	fowners nobody:nobody ${f}
-}
-
-pkg_postinst() {
-	# We need to ensure that login.conf.db is up-to-date.
-	if [[ -e "${ROOT}"etc/login.conf ]] ; then
-		einfo "Updating ${ROOT}etc/login.conf.db"
-		"${ROOT}"usr/bin/cap_mkdb	-f "${ROOT}"etc/login.conf "${ROOT}"etc/login.conf
-		elog "Remember to run cap_mkdb /etc/login.conf after making changes to it"
-	fi
-}
-
-pkg_postrm() {
-	# and if we uninstall yacc but keep bison,
-	# lets restore the /usr/bin/yacc symlink
-	if [[ ! -e ${ROOT}/usr/bin/yacc ]] && [[ -e ${ROOT}/usr/bin/yacc.bison ]] ; then
-		ln -s yacc.bison "${ROOT}"/usr/bin/yacc
-	fi
-}
diff --git a/sys-freebsd/freebsd-usbin/Manifest b/sys-freebsd/freebsd-usbin/Manifest
index e015080a4900..5d32b87e2366 100644
--- a/sys-freebsd/freebsd-usbin/Manifest
+++ b/sys-freebsd/freebsd-usbin/Manifest
@@ -12,7 +12,6 @@ DIST freebsd-libexec-8.2.tar.bz2 289147 SHA256 10b996d1d8cd044ee2e7a877e5e6ad2bf
 DIST freebsd-libexec-9.1.tar.bz2 304592 SHA256 71e6e9e41328c2148c54b81ad9b59f912a1d5f0d52e17ac07f223aa7a94b82be SHA512 7baa4160dda2610250dd52f445e24478e0f1ea10bce21fcd0e5d1b856f399b896adc334114de0c7f61a5637e4349bb1688fdbe5c72798d8568ae791114710b92 WHIRLPOOL d800f477ac5c9ad6dae3e0091c83e107609b5a1e3aa79e9533fcd10a8dd34ff7733ab9523eae7c292310fe94f6a529209cae6b9e8bac6b47244e59834593e74b
 DIST freebsd-sbin-8.2.tar.bz2 1211665 SHA256 8b7e21a66b4696e8763d29b8b02b2d35f29fc51820a194d1e469e7cace84c527 SHA512 c6643c29ab62344c98d8991708798730ee1c17e6478071718beeaa79788300a1f4ed2e6aeb8e39e3c216877d4ed2ac85b2a9531d534f1ac5125a508927898959 WHIRLPOOL 2a21cd0f15f95d66718031680ac87f1fe73f1e1b03cb012e1db1dd1bd2fe2bb7897457a8ba2f5a28c8806775611dca542cbadec16566c47ab9efa673e2cb53f3
 DIST freebsd-sbin-9.1.tar.bz2 1273913 SHA256 45008b0733b232ef03707ef5fa3e5c889e3b3728393d736bd9a869ea83be6447 SHA512 9f186602b7de96f268c352ca386986652fddf5570e7eca1afa8c0d2bdc83b57df1198efe47f36dd5c7a6abf4f9c935f1c8207a4a12a6b2153bd6c3c6292719dc WHIRLPOOL 20920dfa9607a0ce854319cef29bbd77fb1b31f6f6cfd5ac60cbd678169e43929e215743fe636d0c224443f3e6149a8f07c292d647f7f901592795ac292699f9
-DIST freebsd-src-10.1.tar.xz 115049476 SHA256 f919287a5ef51d4f133f27c99c54f2e8054f408d3dd53bc60f4e233cc75ec03d SHA512 4ded32b451e2807e24a06305502f88ea633b2899a7ccd9cab3dc98fc865ef91324c93c512a08cf6e295313a8d7e79aa9d7af07da40e7276d986b06419b984152 WHIRLPOOL 1eff9419d89b8a70f064171883d92e160b250cd637972eb9107a19d7b3c904b554c4f51eaa9ff9642ef2c4234bde05cf9aef16d0c39280b55084f831700dea80
 DIST freebsd-src-10.2.tar.xz 124551336 SHA256 6a59ea716bae96135983ad70cd7123e3b35ec91b191a82fe282ade88a61560b1 SHA512 fba4588fdaa94fa4582a8de566a84cf4f2badc87c7b2e0745d7a31c1e349b2d5f59dbdbb16a9d43421155c1ac4bdec8db24c5d32ac5a92be687d4ed70fe35835 WHIRLPOOL e325db3c07118762021d802c4f20c7a5fd4b816f08cab6f92b408399f1b3bf8ad89728d51c354ab21478265a4539463c94aae9ae49f0ac10cd3c3f8f640dc186
 DIST freebsd-sys-8.2.tar.bz2 25835329 SHA256 0c6c7b61aae94db2931f985d5899f3bca78fc8ffab6b598fbaa158142d676f16 SHA512 6ea4516a5c52e25c4f993f7acb875463a5caea93dbdf250c5d48eee95fff226956e9f030cab7e341b5e6a132325bc3dbf93dcb4b1185acb011918e50b1a22be3 WHIRLPOOL 870deeff877c6b9fc812a4260e4fdbb6715a5dc2065cab3bfbf2a42d876f6654703ccb124275a4e2c410cef48f3db02b63cc76059eccf9cf90244826f35b7a15
 DIST freebsd-sys-9.1.tar.bz2 32588103 SHA256 b93a7ac8334ac16cc9f60665048e5ef812c0a6c62f10d0b0a674aec3f56516a8 SHA512 7dc9d9e00dde8f592bb171f4386d02b655b73cb4f153fe5ec063d010a148ef0639eae0dcdb3eeb09ecd1e3653c69e49a2d261329fa6d0381d2ddabe258ddde6d WHIRLPOOL c8348344dfb14bad64bd3a78ee615ddd29203175b292233254f8ba175e7a3fb7218af6f95f7b4dbf394c0354bafe9d8bb0c21cdf0ceaeb697214964b280469b3
diff --git a/sys-freebsd/freebsd-usbin/freebsd-usbin-10.1.ebuild b/sys-freebsd/freebsd-usbin/freebsd-usbin-10.1.ebuild
deleted file mode 100644
index 42db3781d3e8..000000000000
--- a/sys-freebsd/freebsd-usbin/freebsd-usbin-10.1.ebuild
+++ /dev/null
@@ -1,183 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit bsdmk freebsd flag-o-matic eutils
-
-DESCRIPTION="FreeBSD /usr/sbin tools"
-SLOT="0"
-
-if [[ ${PV} != *9999* ]]; then
-	KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-fi
-
-EXTRACTONLY="
-	usr.sbin/
-	contrib/
-	usr.bin/
-	lib/
-	sbin/
-	etc/
-	gnu/
-"
-use nis && EXTRACTONLY+="libexec/"
-if use build ; then
-	EXTRACTONLY+="
-		sys/
-		include/
-	"
-fi
-
-RDEPEND="=sys-freebsd/freebsd-lib-${RV}*[usb?,bluetooth?,netware?]
-	=sys-freebsd/freebsd-libexec-${RV}*
-	build? ( sys-apps/baselayout )
-	ssl? ( dev-libs/openssl )
-	>=app-arch/libarchive-3
-	sys-apps/tcp-wrappers
-	dev-util/dialog
-	>=dev-libs/libedit-20120311.3.0-r1
-	net-libs/libpcap
-	kerberos? ( app-crypt/heimdal )"
-DEPEND="${RDEPEND}
-	=sys-freebsd/freebsd-mk-defs-${RV}*
-	=sys-freebsd/freebsd-ubin-${RV}*
-	!build? ( =sys-freebsd/freebsd-sources-${RV}* )
-	sys-apps/texinfo
-	sys-devel/flex"
-
-S="${WORKDIR}/usr.sbin"
-
-IUSE="acpi atm audit bluetooth floppy ipv6 kerberos minimal netware nis pam ssl usb build"
-
-pkg_setup() {
-	# Release crunch is something like minimal. It seems to remove everything
-	# which is not needed to work.
-	use minimal && mymakeopts="${mymakeopts} RELEASE_CRUNCH= "
-
-	use acpi || mymakeopts="${mymakeopts} WITHOUT_ACPI= "
-	use atm || mymakeopts="${mymakeopts} WITHOUT_ATM= "
-	use audit || mymakeopts="${mymakeopts} WITHOUT_AUDIT= "
-	use bluetooth || mymakeopts="${mymakeopts} WITHOUT_BLUETOOTH= "
-	use ipv6 || mymakeopts="${mymakeopts} WITHOUT_INET6= WITHOUT_INET6_SUPPORT= "
-	use netware || mymakeopts="${mymakeopts} WITHOUT_IPX= WITHOUT_IPX_SUPPORT= WITHOUT_NCP= "
-	use nis || mymakeopts="${mymakeopts} WITHOUT_NIS= "
-	use pam || mymakeopts="${mymakeopts} WITHOUT_PAM_SUPPORT= "
-	use ssl || mymakeopts="${mymakeopts} WITHOUT_OPENSSL= "
-	use usb || mymakeopts="${mymakeopts} WITHOUT_USB= "
-	use floppy || mymakeopts="${mymakeopts} WITHOUT_FLOPPY= "
-	use kerberos || mymakeopts="${mymakeopts} WITHOUT_GSSAPI= "
-
-	mymakeopts="${mymakeopts} WITHOUT_PF= WITHOUT_LPR= WITHOUT_SENDMAIL= WITHOUT_AUTHPF= WITHOUT_MAILWRAPPER= WITHOUT_UNBOUND= "
-
-	append-flags $(test-flags -fno-strict-aliasing)
-}
-
-PATCHES=(
-	"${FILESDIR}/${PN}-adduser.patch"
-	"${FILESDIR}/${PN}-9.0-newsyslog.patch"
-	"${FILESDIR}/${PN}-10.0-bsdxml2expat.patch"
-	)
-
-REMOVE_SUBDIRS="
-	tcpdchk tcpdmatch
-	sendmail praliases editmap mailstats makemap
-	pc-sysinstall cron mailwrapper ntp bsnmpd
-	tcpdump ndp inetd
-	wpa/wpa_supplicant wpa/hostapd wpa/hostapd_cli wpa/wpa_cli wpa/wpa_passphrase
-	zic amd
-	pkg pkg_install freebsd-update service sysrc"
-
-src_prepare() {
-	if ! use build; then
-		[[ ! -e "${WORKDIR}/sys" ]] && ln -s "/usr/src/sys" "${WORKDIR}/sys"
-		[[ ! -e "${WORKDIR}/include" ]] && ln -s "/usr/include" "${WORKDIR}/include"
-	else
-		dummy_mk mount_smbfs
-	fi
-	# Don't install mtree format manpage
-	# it's installed by libarchive.
-	sed -e "s: mtree.5::g" -i "${S}"/mtree/Makefile
-}
-
-src_compile() {
-	# Preparing to build nmtree
-	cd "${WORKDIR}/lib/libnetbsd"
-	freebsd_src_compile
-
-	cd "${S}"
-	freebsd_src_compile
-}
-
-src_install() {
-	# By creating these directories we avoid having to do a
-	# more complex hack
-	dodir /usr/share/doc
-	dodir /sbin
-	dodir /usr/libexec
-	dodir /usr/bin
-
-	# FILESDIR is used by some makefiles which will install files
-	# in the wrong place, just put it in the doc directory.
-	mkinstall DOCDIR=/usr/share/doc/${PF} || die "Install failed"
-
-	# Most of these now come from openrc.
-	for util in iscsid nfs nfsuserd rpc.statd rpc.lockd; do
-		newinitd "${FILESDIR}/"${util}.initd ${util} || die
-		if [[ -e "${FILESDIR}"/${util}.confd ]]; then \
-			newconfd "${FILESDIR}"/${util}.confd ${util} || die
-		fi
-	done
-
-	for class in daily monthly weekly; do
-		cat - > "${T}/periodic.${class}" <<EOS
-#!/bin/sh
-/usr/sbin/periodic ${class}
-EOS
-		exeinto /etc/cron.${class}
-		newexe "${T}/periodic.${class}" periodic
-	done
-
-	# Install the pw.conf file to let pw use Gentoo's skel location
-	insinto /etc
-	doins "${FILESDIR}/pw.conf" || die
-
-	cd "${WORKDIR}/etc"
-	doins apmd.conf syslog.conf newsyslog.conf nscd.conf || die
-
-	insinto /etc/ppp
-	doins ppp/ppp.conf || die
-
-	if use bluetooth; then
-		insinto /etc/bluetooth
-		doins bluetooth/* || die
-		rm -f "${D}"/etc/bluetooth/Makefile
-	fi
-
-	# Install the periodic stuff (needs probably to be ported in a more
-	# gentooish way)
-	cd "${WORKDIR}/etc/periodic"
-
-	doperiodic daily daily/*.accounting
-	doperiodic monthly monthly/*.accounting
-}
-
-pkg_postinst() {
-	# We need to run pwd_mkdb if key files are not present
-	# If they are, then there is no need to run pwd_mkdb
-	if [[ ! -e "${ROOT}etc/passwd" || ! -e "${ROOT}etc/pwd.db" || ! -e "${ROOT}etc/spwd.db" ]] ; then
-		if [[ -e "${ROOT}etc/master.passwd" ]] ; then
-			einfo "Generating passwd files from ${ROOT}etc/master.passwd"
-			"${ROOT}"usr/sbin/pwd_mkdb -p -d "${ROOT}etc" "${ROOT}etc/master.passwd"
-		else
-			eerror "${ROOT}etc/master.passwd does not exist!"
-			eerror "You will no be able to log into your system!"
-		fi
-	fi
-
-	for logfile in messages security auth.log maillog lpd-errs xferlog cron \
-		debug.log slip.log ppp.log; do
-		[[ -f "${ROOT}/var/log/${logfile}" ]] || touch "${ROOT}/var/log/${logfile}"
-	done
-}
diff --git a/sys-fs/btrfs-progs/Manifest b/sys-fs/btrfs-progs/Manifest
index c4f414568d2c..9be8a95c6c18 100644
--- a/sys-fs/btrfs-progs/Manifest
+++ b/sys-fs/btrfs-progs/Manifest
@@ -7,3 +7,4 @@ DIST btrfs-progs-v4.0.1.tar.xz 1104340 SHA256 2c2e10e79edd16a92effe8619c527fd130
 DIST btrfs-progs-v4.0.tar.xz 1102500 SHA256 179cf1acc1b0061548b8f1d9cf973a8338bf96f192cecad99ecdace9ae065a1f SHA512 895d6c27bd82c4b320c705c32613b28e601f316c0881080d8c376d0045162eaab6c91431dee73b391fc608e6d7c16f3a744ef6b9c85adb4beaa4376fbbe36d9a WHIRLPOOL cf71cc4ab6c85e8673143bb779c7b252caf1bfabc14fb2d7dd3477bd842b491ac3d7f121c3dcbecec023c5873c4b4400a5f2087e55bbee14217982f9712d5c2f
 DIST btrfs-progs-v4.1.2.tar.xz 1123080 SHA256 62db60c6a0868afb6302112cea54c756873bc30b826696b167ec03ecd61b2f12 SHA512 dd159bcc3adb65efd4f612d75f5a6b30df8ad9fa06ef952dd03dac965256de37eab26f4cc2fb3840178403ccbb7368cae11638e27eadb9b1835b636c4b126e2e WHIRLPOOL 819e6d61ecbb0f2d099abcda70ae9ab53b3311a28131fdedbbad7cc033c4984309a460f704d2f2ce7cf36cf0e034e82618c1b45002fdfbb5eced648883e12a29
 DIST btrfs-progs-v4.1.tar.xz 1119564 SHA256 abc6ff9dbbf948e7358edd34db32103cba8b86c5cb9e3ed7eb3b5630e2feb7e8 SHA512 0c596bab3276d1dc6de010ce94a1d7758c80fe21d540b2d4b3487e0a5cf0a63b27fdba3e1af42aa349447a0be459f2087f9b4ae03fdc0dfcc4f316e570893346 WHIRLPOOL 97ae77f578f162ec114e137899f195ec0e28097902e2f2ae5e1f37db359cd6c1bae2f0fb6641b0365df80defb844d58603623db27dc63c1576437efcaf19d3e6
+DIST btrfs-progs-v4.2.tar.xz 1130488 SHA256 25233c3e94c52bf433e8749c17dad2acd8004c6dbc93e2bff9397c4e9fa58fbe SHA512 ba322478c1ce4df5548a953de581053c9fb9d60d1626639dc543065847a0c92ea6712728479dcb59487e02ab6aaea9f688fe1e3ef5087517e55d346b02d36065 WHIRLPOOL 54cd45554c15bedac3baac6939e6e91965b59c1c6cc0b7ca10d4c910dfe56811a278f9ee6026a9cc61286544370a45f0c0ccccfb08d7958d7a0c4b2964751bd4
diff --git a/sys-fs/btrfs-progs/btrfs-progs-4.2.ebuild b/sys-fs/btrfs-progs/btrfs-progs-4.2.ebuild
new file mode 100644
index 000000000000..4f0cc37e6ccd
--- /dev/null
+++ b/sys-fs/btrfs-progs/btrfs-progs-4.2.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit bash-completion-r1 eutils multilib toolchain-funcs
+
+libbtrfs_soname=0
+
+if [[ ${PV} != 9999 ]]; then
+	MY_PV=v${PV}
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+	SRC_URI="https://www.kernel.org/pub/linux/kernel/people/kdave/${PN}/${PN}-${MY_PV}.tar.xz"
+	S="${WORKDIR}"/${PN}-${MY_PV}
+else
+	WANT_LIBTOOL=none
+	inherit autotools git-r3
+	EGIT_REPO_URI="git://git.kernel.org/pub/scm/linux/kernel/git/kdave/btrfs-progs.git
+		https://git.kernel.org/pub/scm/linux/kernel/git/kdave/btrfs-progs.git"
+	EGIT_BRANCH="devel"
+fi
+
+DESCRIPTION="Btrfs filesystem utilities"
+HOMEPAGE="https://btrfs.wiki.kernel.org"
+
+LICENSE="GPL-2"
+SLOT="0/${libbtrfs_soname}"
+IUSE="+convert"
+
+RESTRICT=test # tries to mount repared filesystems
+
+RDEPEND="
+	dev-libs/lzo:2=
+	sys-libs/zlib:0=
+	convert? (
+		sys-fs/e2fsprogs:0=
+		sys-libs/e2fsprogs-libs:0=
+	)
+"
+DEPEND="${RDEPEND}
+	convert? ( sys-apps/acl )
+	app-text/asciidoc
+	app-text/docbook-xml-dtd:4.5
+	app-text/xmlto
+"
+
+if [[ ${PV} == 9999 ]]; then
+	DEPEND+=" sys-devel/gnuconfig"
+fi
+
+src_prepare() {
+	epatch_user
+	if [[ ${PV} == 9999 ]]; then
+		eautoreconf
+		mkdir config || die
+		local automakedir="$(autotools_run_tool --at-output automake --print-libdir)"
+		[[ -e ${automakedir} ]] || die "Could not locate automake directory"
+		ln -s "${automakedir}"/install-sh config/install-sh || die
+		ln -s "${EPREFIX}"/usr/share/gnuconfig/config.guess config/config.guess || die
+		ln -s "${EPREFIX}"/usr/share/gnuconfig/config.sub config/config.sub || die
+	fi
+}
+
+src_configure() {
+	local myeconfargs=(
+		--bindir="${EPREFIX}"/sbin
+		$(use_enable convert)
+		$(use_enable elibc_glibc backtrace)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	emake V=1
+}
+
+src_install() {
+	default
+	newbashcomp btrfs-completion btrfs
+}
diff --git a/sys-fs/cryptsetup/Manifest b/sys-fs/cryptsetup/Manifest
index 9ce574e0e98b..cee324f0751c 100644
--- a/sys-fs/cryptsetup/Manifest
+++ b/sys-fs/cryptsetup/Manifest
@@ -1,4 +1,4 @@
 DIST cryptsetup-1.6.2.tar.bz2 1189584 SHA256 15723f0198303d4bcb99d480b7a773918e2d319f0348457988c063bdd03e109a SHA512 59fb835ef8bcd6d0c704a021055032639840ef4bb7be6ade8ff91d347ae74d8e6cba4583d8ced7a4a8c6f09ebc16c4eff3549c13c4327d92fd9234db58e18c10 WHIRLPOOL 3ab24572ea42dfdd0d5176dfa4621520cd0bccda53c3a01676d400a7a841ab9643c979c4942daa774658602bd8cdf659376cbc94c553e2097c5eb3c51a7edb31
 DIST cryptsetup-1.6.5.tar.xz 1136892 SHA256 267973f20be43f9d685f7193aa23954b60768c74a1d330243114d4b8bc17ca9a SHA512 c77ac590d28954e7bd430d1069b820a288c4668857a7ced7f81546ea39676f2b536abbcda06f20440e31c205b7ada68bcfa5aab220b102a2b62198a788d9b65e WHIRLPOOL 74a597abbdcc1225bb811597e53737eab2348a328f3ba30e7eb519a0621b06e6c898e320db8e24a16decfd4706b6a2e68b06894dde91124e4c089e952dbff9c1
-DIST cryptsetup-1.6.6.tar.xz 1145940 SHA256 2d2ce28e4e1137dd599d87884b62ef6dbf14fd7848b2a2bf7d61cf125fbd8e6f SHA512 6ee6b4e8fe4f721bb97d1cf47c5e2d1c96001dd3ac48154d414f64d23620ac3ec3eeea2ad584a1a3111e07a086c8a4fdbfabdf4859cda58ba2bd6765b1f009a8 WHIRLPOOL 07bb6b7f5153cfcd3a585f111733a05926d1f6f0ec190e0b0dc1777591bd0fec3c8782dc79f43bafd3829da28efbdd2d8f97daef8186392787c22c7f5e454376
 DIST cryptsetup-1.6.7.tar.xz 1188876 SHA256 c23c24c8d662032da8650c1c84985221be8bbedf4737c1540bba7e4517dfe820 SHA512 d6cecd2f3f5d468d4337d4e8407c8c3315e8972c0fc72cd1f93fb67f02a632b56ad293f08f6682f24c9ad0b5ad5967be751e5679413109692ade5823aafd1d19 WHIRLPOOL 95611938ddbf3520f1a2a2891e3103f6bf1699a210f7902bd65d1e61357ed44c9b6f344f567d1d5f1b88adb40154831e34014f3e22ec141f9101b707295007a0
+DIST cryptsetup-1.6.8.tar.xz 1221232 SHA256 45a6ccd3c65b7d904e58e1cb3656a7e997190b6a05b5ff7c6887e4a41c5f19bc SHA512 db189a98da6329f4d4c2ae92dbdc08ccffdf6ae41c964186ebf48a612bf0aa9731653ef6b7549b5feee0043edfa171874c3609418499902e6339b48481c621d7 WHIRLPOOL 8873d14fc2a54d97ed7d065ad4a0c63b057d9085c2cfd99c0b97aba78d49566bd7c9b47e56033992ac1f3892369bebf2165aaccc6ca3f933c0c33c2e6ef8c1e4
diff --git a/sys-fs/cryptsetup/cryptsetup-1.6.6.ebuild b/sys-fs/cryptsetup/cryptsetup-1.6.6.ebuild
deleted file mode 100644
index 2e48b990ed2e..000000000000
--- a/sys-fs/cryptsetup/cryptsetup-1.6.6.ebuild
+++ /dev/null
@@ -1,130 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
-
-inherit autotools python-single-r1 linux-info libtool eutils versionator
-
-DESCRIPTION="Tool to setup encrypted devices with dm-crypt"
-HOMEPAGE="https://code.google.com/p/cryptsetup/"
-SRC_URI="https://cryptsetup.googlecode.com/files/${P}.tar.xz"
-SRC_URI="mirror://kernel/linux/utils/${PN}/v$(get_version_component_range 1-2)/${P}.tar.xz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-CRYPTO_BACKENDS="+gcrypt kernel nettle openssl"
-# we don't support nss since it doesn't allow cryptsetup to be built statically
-# and it's missing ripemd160 support so it can't provide full backward compatibility
-IUSE="${CRYPTO_BACKENDS} nls pwquality python reencrypt static static-libs udev urandom"
-REQUIRED_USE="^^ ( ${CRYPTO_BACKENDS//+/} )
-	python? ( ${PYTHON_REQUIRED_USE} )
-	static? ( !gcrypt )" #496612
-
-LIB_DEPEND="dev-libs/libgpg-error[static-libs(+)]
-	dev-libs/popt[static-libs(+)]
-	sys-apps/util-linux[static-libs(+)]
-	gcrypt? ( dev-libs/libgcrypt:0=[static-libs(+)] )
-	nettle? ( >=dev-libs/nettle-2.4[static-libs(+)] )
-	openssl? ( dev-libs/openssl[static-libs(+)] )
-	pwquality? ( dev-libs/libpwquality[static-libs(+)] )
-	sys-fs/lvm2[static-libs(+)]
-	udev? ( virtual/libudev[static-libs(+)] )"
-# We have to always depend on ${LIB_DEPEND} rather than put behind
-# !static? () because we provide a shared library which links against
-# these other packages. #414665
-RDEPEND="static-libs? ( ${LIB_DEPEND} )
-	${LIB_DEPEND//\[static-libs\(+\)\]}
-	python? ( ${PYTHON_DEPS} )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	static? ( ${LIB_DEPEND} )"
-
-pkg_setup() {
-	local CONFIG_CHECK="~DM_CRYPT ~CRYPTO ~CRYPTO_CBC"
-	local WARNING_DM_CRYPT="CONFIG_DM_CRYPT:\tis not set (required for cryptsetup)\n"
-	local WARNING_CRYPTO_CBC="CONFIG_CRYPTO_CBC:\tis not set (required for kernel 2.6.19)\n"
-	local WARNING_CRYPTO="CONFIG_CRYPTO:\tis not set (required for cryptsetup)\n"
-	check_extra_config
-
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	sed -i '/^LOOPDEV=/s:$: || exit 0:' tests/{compat,mode}-test || die
-	epatch_user && eautoreconf
-}
-
-src_configure() {
-	if use kernel ; then
-		ewarn "Note that kernel backend is very slow for this type of operation"
-		ewarn "and is provided mainly for embedded systems wanting to avoid"
-		ewarn "userspace crypto libraries."
-	fi
-
-	econf \
-		--sbindir=/sbin \
-		--enable-shared \
-		$(use_enable static static-cryptsetup) \
-		$(use_enable static-libs static) \
-		$(use_enable nls) \
-		$(use_enable pwquality) \
-		$(use_enable python) \
-		$(use_enable reencrypt cryptsetup-reencrypt) \
-		$(use_enable udev) \
-		$(use_enable !urandom dev-random) \
-		--with-crypto_backend=$(for x in ${CRYPTO_BACKENDS//+/}; do use ${x} && echo ${x} ; done)
-}
-
-src_test() {
-	if [[ ! -e /dev/mapper/control ]] ; then
-		ewarn "No /dev/mapper/control found -- skipping tests"
-		return 0
-	fi
-	local p
-	for p in /dev/mapper /dev/loop* ; do
-		addwrite ${p}
-	done
-	default
-}
-
-src_install() {
-	default
-	if use static ; then
-		mv "${ED}"/sbin/cryptsetup{.static,} || die
-		mv "${ED}"/sbin/veritysetup{.static,} || die
-		use reencrypt && { mv "${ED}"/sbin/cryptsetup-reencrypt{.static,} || die ; }
-	fi
-	prune_libtool_files --modules
-
-	newconfd "${FILESDIR}"/1.0.6-dmcrypt.confd dmcrypt
-	newinitd "${FILESDIR}"/1.5.1-dmcrypt.rc dmcrypt
-}
-
-pkg_postinst() {
-	if use gcrypt ; then
-		elog "If you were using the whirlpool hash with libgcrypt, you might be impacted"
-		elog "by broken code in <libgcrypt-1.6.0 versions.  See this page for more details:"
-		elog "https://code.google.com/p/cryptsetup/wiki/FrequentlyAskedQuestions#8._Issues_with_Specific_Versions_of_cryptsetup"
-	fi
-
-	if [[ -z ${REPLACING_VERSIONS} ]] ; then
-		elog "Please see the example for configuring a LUKS mountpoint"
-		elog "in /etc/conf.d/dmcrypt"
-		elog
-		elog "If you are using baselayout-2 then please do:"
-		elog "rc-update add dmcrypt boot"
-		elog "This version introduces a command line arguement 'key_timeout'."
-		elog "If you want the search for the removable key device to timeout"
-		elog "after 10 seconds add the following to your bootloader config:"
-		elog "key_timeout=10"
-		elog "A timeout of 0 will mean it will wait indefinitely."
-		elog
-		elog "Users using cryptsetup-1.0.x (dm-crypt plain) volumes must use"
-		elog "a compatibility mode when using cryptsetup-1.1.x. This can be"
-		elog "done by specifying the cipher (-c), key size (-s) and hash (-h)."
-		elog "For more info, see https://code.google.com/p/cryptsetup/wiki/FrequentlyAskedQuestions#6._Issues_with_Specific_Versions_of_cryptsetup"
-	fi
-}
diff --git a/sys-fs/cryptsetup/cryptsetup-1.6.8.ebuild b/sys-fs/cryptsetup/cryptsetup-1.6.8.ebuild
new file mode 100644
index 000000000000..36607d9560fd
--- /dev/null
+++ b/sys-fs/cryptsetup/cryptsetup-1.6.8.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+
+inherit autotools python-single-r1 linux-info libtool eutils versionator
+
+DESCRIPTION="Tool to setup encrypted devices with dm-crypt"
+HOMEPAGE="https://gitlab.com/cryptsetup/cryptsetup/blob/master/README.md"
+SRC_URI="mirror://kernel/linux/utils/${PN}/v$(get_version_component_range 1-2)/${P}.tar.xz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+CRYPTO_BACKENDS="+gcrypt kernel nettle openssl"
+# we don't support nss since it doesn't allow cryptsetup to be built statically
+# and it's missing ripemd160 support so it can't provide full backward compatibility
+IUSE="${CRYPTO_BACKENDS} nls pwquality python reencrypt static static-libs udev urandom"
+REQUIRED_USE="^^ ( ${CRYPTO_BACKENDS//+/} )
+	python? ( ${PYTHON_REQUIRED_USE} )
+	static? ( !gcrypt )" #496612
+
+LIB_DEPEND="dev-libs/libgpg-error[static-libs(+)]
+	dev-libs/popt[static-libs(+)]
+	sys-apps/util-linux[static-libs(+)]
+	gcrypt? ( dev-libs/libgcrypt:0=[static-libs(+)] )
+	nettle? ( >=dev-libs/nettle-2.4[static-libs(+)] )
+	openssl? ( dev-libs/openssl:0=[static-libs(+)] )
+	pwquality? ( dev-libs/libpwquality[static-libs(+)] )
+	sys-fs/lvm2[static-libs(+)]
+	udev? ( virtual/libudev[static-libs(+)] )"
+# We have to always depend on ${LIB_DEPEND} rather than put behind
+# !static? () because we provide a shared library which links against
+# these other packages. #414665
+RDEPEND="static-libs? ( ${LIB_DEPEND} )
+	${LIB_DEPEND//\[static-libs\(+\)\]}
+	python? ( ${PYTHON_DEPS} )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	static? ( ${LIB_DEPEND} )"
+
+pkg_setup() {
+	local CONFIG_CHECK="~DM_CRYPT ~CRYPTO ~CRYPTO_CBC"
+	local WARNING_DM_CRYPT="CONFIG_DM_CRYPT:\tis not set (required for cryptsetup)\n"
+	local WARNING_CRYPTO_CBC="CONFIG_CRYPTO_CBC:\tis not set (required for kernel 2.6.19)\n"
+	local WARNING_CRYPTO="CONFIG_CRYPTO:\tis not set (required for cryptsetup)\n"
+	check_extra_config
+
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	sed -i '/^LOOPDEV=/s:$: || exit 0:' tests/{compat,mode}-test || die
+	epatch_user && eautoreconf
+}
+
+src_configure() {
+	if use kernel ; then
+		ewarn "Note that kernel backend is very slow for this type of operation"
+		ewarn "and is provided mainly for embedded systems wanting to avoid"
+		ewarn "userspace crypto libraries."
+	fi
+
+	econf \
+		--sbindir=/sbin \
+		--enable-shared \
+		$(use_enable static static-cryptsetup) \
+		$(use_enable static-libs static) \
+		$(use_enable nls) \
+		$(use_enable pwquality) \
+		$(use_enable python) \
+		$(use_enable reencrypt cryptsetup-reencrypt) \
+		$(use_enable udev) \
+		$(use_enable !urandom dev-random) \
+		--with-crypto_backend=$(for x in ${CRYPTO_BACKENDS//+/} ; do usev ${x} ; done)
+}
+
+src_test() {
+	if [[ ! -e /dev/mapper/control ]] ; then
+		ewarn "No /dev/mapper/control found -- skipping tests"
+		return 0
+	fi
+	local p
+	for p in /dev/mapper /dev/loop* ; do
+		addwrite ${p}
+	done
+	default
+}
+
+src_install() {
+	default
+	if use static ; then
+		mv "${ED}"/sbin/cryptsetup{.static,} || die
+		mv "${ED}"/sbin/veritysetup{.static,} || die
+		use reencrypt && { mv "${ED}"/sbin/cryptsetup-reencrypt{.static,} || die ; }
+	fi
+	prune_libtool_files --modules
+
+	newconfd "${FILESDIR}"/1.6.7-dmcrypt.confd dmcrypt
+	newinitd "${FILESDIR}"/1.6.7-dmcrypt.rc dmcrypt
+}
diff --git a/sys-fs/dd-rescue/Manifest b/sys-fs/dd-rescue/Manifest
index 6c917590c385..de9ebaa7b126 100644
--- a/sys-fs/dd-rescue/Manifest
+++ b/sys-fs/dd-rescue/Manifest
@@ -1,6 +1,3 @@
 DIST dd_rescue-1.28.tar.gz 22093 SHA256 4adcc368a1d4ad62577eaf8609809be1678335d54ef565a5a0fa6e1210489f03 SHA512 64a6eb2d6efbe79ca078b8de727ce551acd3a43bc6258b633a4de9ee51933944badc370855c27f05f306d8d3e95332c4b8884f7c11af321a9ac6797f9b02a3a3 WHIRLPOOL 138149efa98d0ade917d10eb6e64bae5cca0e60685eb4e804773e97cd31389f645544a969fd52747aa957260f01fa89db642929a8c36106b915d13eb87715fd4
-DIST dd_rescue-1.33.tar.gz 36923 SHA256 630b4524c0df2109851b9cf2112ce1c5f53c53d3ca11145bb98892ae4a9f8102 SHA512 6e9bab7baa8a723cb459d28575724972df963e7632d588ac06ab2a2a1ea775beb8c88dd3c3db7faf5d3653c8df58f2f29ea01c936a1862017ece1b686ef26936 WHIRLPOOL e81ee54612baedffa58fdc583bf3d8fcbacdfb9188e4540641336d614562dde76323d51854d71a07fee1ac0a350f71a3f09a41188bd5618aeffee5b4abed50c7
-DIST dd_rescue-1.40.tar.gz 47107 SHA256 54545ebbe2be00597d8c9ba3d51abcfdd7ba89f17d51974629e612c2619730ff SHA512 a518f632c24161310bb03265c60d20bc08472b15888c167f8a28ceaaeb67fe5c942f6a320b7a4cce4c9e0fff9e73b549d64ba13bd26f015286698ad5f8c5fed4 WHIRLPOOL 55c091e63d7226d328616835c8aa0a0551a89eb7a708d4a30130fb78fc7ec2e14b93c2d91280de6565bc58e5ec9722f6f7843656fae5d4efebdbb71cce900b26
-DIST dd_rescue-1.44.tar.gz 114799 SHA256 744fa857fff7beed6d00644ea5786ce0d2e83df315b04f7578008e0a9b2853a3 SHA512 16e9072aeda04fe898d36e13d1dfc871642c7d1d1ac79b787f3ffd24ced2e13c605b4b36f66334ee4e258d01eee286ef74862e498a5a9ea5f9bd65a66a6ec213 WHIRLPOOL 5f4bfbb4b952552d0418054015fe5940d1a83050a282fad3a42b708caa26501d41ded98024acf9919acb63604e066008ee695ff616a7c9be5abf38613815e5d6
-DIST dd_rescue-1.45.tar.gz 121426 SHA256 2626fa2842916f6861b4e1ce72284c81e1b6e7323a842911aad4082bdaa4f663 SHA512 88022f38ad0e1ea171f1db014ba5e3f421fe9c35782f01220e27beb03618998860694df6b5d2e96ea4927640952c57153f2a1633dee9c13a2227e17ddd46b160 WHIRLPOOL cbe7d227e70c1314ab15c90f4b5ba3f451f421769ebbb13589f8e66f8d09ca0986d50c0cfecdcce53fbd5a70c3aa027a5b20ea4f8c56ee05b5fc9c7be895fa18
 DIST dd_rescue-1.46.tar.gz 126790 SHA256 9e09b5583f778fe43b6c473998fe0455486d5ffeacbb72b022d6cf5ba8241aba SHA512 efd1bf5d80d4bafa6e6971caa84205dc5df4456a29a9fa3bb56aa984d68675ae3418e8ba3a355906f491f0f2e750c38fd695e37dbd193e554cd41afec3841e28 WHIRLPOOL ac965019d38539962018bcc5a6d32cbf303b4d00d5ed91d643655a820f17bfa1ca81b5123f95220663823e6622d55099a2da08aaacf60cefc37097aa3354c729
+DIST dd_rescue-1.99.tar.bz2 168200 SHA256 5545f54a5e5bee2b9ac69959b1bc81aafae24939393efb8cc581e68ab1b2e47d SHA512 f484f1a86b3bd7c098eb568e193888d98def35b1bec2f553eb3543a5ae22417dbddb562a5c809613a1493ecac3689dcc2a45e26446a3e16036a19e716e38bd11 WHIRLPOOL 94ca6b49636c3f8b0a0901141a3ca16945f0cb5364b97d5d0d759ee1b034f33019ee0bf4f43f7977f0176832d95cecc0aab9cb89e783eabac14290ada4c9f1e1
diff --git a/sys-fs/dd-rescue/dd-rescue-1.33.ebuild b/sys-fs/dd-rescue/dd-rescue-1.33.ebuild
deleted file mode 100644
index e5c0bde05c7e..000000000000
--- a/sys-fs/dd-rescue/dd-rescue-1.33.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit toolchain-funcs flag-o-matic
-
-MY_PN=${PN/-/_}
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Similar to dd but can copy from source with errors"
-HOMEPAGE="http://www.garloff.de/kurt/linux/ddrescue/"
-SRC_URI="http://www.garloff.de/kurt/linux/ddrescue/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~mips ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="static kernel_linux elibc_glibc"
-
-S=${WORKDIR}/${MY_PN}
-
-src_compile() {
-	use static && append-ldflags -static
-
-	# Passing LDFLAGS together with CFLAGS is not often a good idea, but
-	# in this case it makes it possible to avoid patching; after all it
-	# only builds the progrma whole, not with object files.
-	#
-	# The falloc target creates a dd_rescue binary that uses the
-	# fallocate() function, present in Kernel 2.6.23 and later and GLIBC
-	# 2.10 and later. If somebody can think of a better way to
-	# optionally use it, suggestions are welcome.
-	emake RPM_OPT_FLAGS="${CFLAGS} ${LDFLAGS}" CC="$(tc-getCC)" \
-		$(use kernel_linux && use elibc_glibc && echo "falloc")
-}
-
-src_install() {
-	# easier to install by hand than trying to make sense of the
-	# Makefile.
-	into /
-	dobin dd_rescue
-	dodoc README.dd_rescue
-	doman dd_rescue.1
-}
diff --git a/sys-fs/dd-rescue/dd-rescue-1.40.ebuild b/sys-fs/dd-rescue/dd-rescue-1.40.ebuild
deleted file mode 100644
index d29d995dca5b..000000000000
--- a/sys-fs/dd-rescue/dd-rescue-1.40.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit toolchain-funcs flag-o-matic autotools
-
-MY_PN=${PN/-/_}
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Similar to dd but can copy from source with errors"
-HOMEPAGE="http://www.garloff.de/kurt/linux/ddrescue/"
-SRC_URI="http://www.garloff.de/kurt/linux/ddrescue/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~mips ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="static"
-
-S=${WORKDIR}/${MY_PN}
-
-src_prepare() {
-	sed -i \
-		-e 's:-ldl:$(LDFLAGS) -ldl:' \
-		Makefile
-	eautoreconf
-}
-
-src_compile() {
-	use static && append-ldflags -static
-
-	# The Makefile is a mess.  Override a few vars rather than patch it.
-	emake \
-		RPM_OPT_FLAGS="${CFLAGS} ${CPPFLAGS}" \
-		CFLAGS_OPT='$(CFLAGS)' \
-		CC="$(tc-getCC)"
-}
-
-src_install() {
-	# easier to install by hand than trying to make sense of the Makefile.
-	dobin dd_rescue
-	dodoc README.dd_rescue
-	doman dd_rescue.1
-}
diff --git a/sys-fs/dd-rescue/dd-rescue-1.44.ebuild b/sys-fs/dd-rescue/dd-rescue-1.44.ebuild
deleted file mode 100644
index 9cb127e12d22..000000000000
--- a/sys-fs/dd-rescue/dd-rescue-1.44.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit toolchain-funcs flag-o-matic autotools
-
-MY_PN=${PN/-/_}
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Similar to dd but can copy from source with errors"
-HOMEPAGE="http://www.garloff.de/kurt/linux/ddrescue/"
-SRC_URI="http://www.garloff.de/kurt/linux/ddrescue/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~mips ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="static"
-
-S=${WORKDIR}/${MY_PN}
-
-src_prepare() {
-	sed -i \
-		-e 's:-ldl:$(LDFLAGS) -ldl:' \
-		Makefile
-	eautoreconf
-}
-
-src_compile() {
-	use static && append-ldflags -static
-
-	# The Makefile is a mess.  Override a few vars rather than patch it.
-	emake \
-		RPM_OPT_FLAGS="${CFLAGS} ${CPPFLAGS}" \
-		CFLAGS_OPT='$(CFLAGS)' \
-		CC="$(tc-getCC)"
-}
-
-src_install() {
-	# easier to install by hand than trying to make sense of the Makefile.
-	dobin dd_rescue
-	dodoc README.dd_rescue
-	doman dd_rescue.1
-}
diff --git a/sys-fs/dd-rescue/dd-rescue-1.45.ebuild b/sys-fs/dd-rescue/dd-rescue-1.45.ebuild
deleted file mode 100644
index 60a67ebe1505..000000000000
--- a/sys-fs/dd-rescue/dd-rescue-1.45.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit toolchain-funcs flag-o-matic multilib autotools
-
-MY_PN=${PN/-/_}
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Similar to dd but can copy from source with errors"
-HOMEPAGE="http://www.garloff.de/kurt/linux/ddrescue/"
-SRC_URI="http://www.garloff.de/kurt/linux/ddrescue/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~mips ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="cpu_flags_x86_avx2 lzo cpu_flags_x86_sse4_2 static xattr"
-
-RDEPEND="lzo? ( dev-libs/lzo )
-	xattr? ( sys-apps/attr )"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/${MY_PN}
-
-src_prepare() {
-	sed -i \
-		-e 's:-ldl:$(LDFLAGS) -ldl:' \
-		-e 's:-shared:$(CFLAGS) $(LDFLAGS) -shared:' \
-		Makefile
-	eautoreconf
-}
-
-src_configure() {
-	use static && append-ldflags -static
-	ac_cv_header_attr_xattr_h=$(usex xattr) \
-	ac_cv_lib_lzo2_lzo1x_1_compress=$(usex lzo) \
-	econf
-}
-
-_emake() {
-	local arch
-	case ${ARCH} in
-	x86)   arch=i386;;
-	amd64) arch=x86_64;;
-	arm)   arch=arm;;
-	arm64) arch=aarch64;;
-	esac
-
-	local os=$(usex kernel_linux Linux IDK)
-
-	# The Makefile is a mess.  Override a few vars rather than patch it.
-	emake \
-		MACH="${arch}" \
-		OS="${os}" \
-		HAVE_SSE42=$(usex cpu_flags_x86_sse4_2 1 0) \
-		HAVE_AVX2=$(usex cpu_flags_x86_avx2 1 0) \
-		RPM_OPT_FLAGS="${CFLAGS} ${CPPFLAGS}" \
-		CFLAGS_OPT='$(CFLAGS)' \
-		LDFLAGS="${LDFLAGS} -Wl,-rpath,${EPREFIX}/usr/$(get_libdir)/${PN}" \
-		CC="$(tc-getCC)" \
-		"$@"
-}
-
-src_compile() {
-	_emake
-}
-
-src_test() {
-	_emake check
-}
-
-src_install() {
-	# easier to install by hand than trying to make sense of the Makefile.
-	dobin dd_rescue
-	dodir /usr/$(get_libdir)/${PN}
-	cp -pPR libddr_*.so "${ED}"/usr/$(get_libdir)/${PN}/ || die
-	dodoc README.dd_rescue
-	doman dd_rescue.1
-	use lzo && doman ddr_lzo.1
-}
diff --git a/sys-fs/dd-rescue/dd-rescue-1.99.ebuild b/sys-fs/dd-rescue/dd-rescue-1.99.ebuild
new file mode 100644
index 000000000000..60021df22e14
--- /dev/null
+++ b/sys-fs/dd-rescue/dd-rescue-1.99.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit toolchain-funcs flag-o-matic multilib autotools
+
+MY_PN=${PN/-/_}
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Similar to dd but can copy from source with errors"
+HOMEPAGE="http://www.garloff.de/kurt/linux/ddrescue/"
+SRC_URI="http://www.garloff.de/kurt/linux/ddrescue/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="cpu_flags_x86_avx2 lzo cpu_flags_x86_sse4_2 static xattr"
+
+RDEPEND="lzo? ( dev-libs/lzo )
+	xattr? ( sys-apps/attr )"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	epatch "${FILESDIR}/${MY_PN}-1.99-test_fix.patch"
+
+	sed -i \
+		-e 's:-ldl:$(LDFLAGS) -ldl:' \
+		-e 's:-shared:$(CFLAGS) $(LDFLAGS) -shared:' \
+		Makefile
+	eautoreconf
+}
+
+src_configure() {
+	use static && append-ldflags -static
+	# OpenSSL is only used by a random helper tool we don't install.
+	ac_cv_header_attr_xattr_h=$(usex xattr) \
+	ac_cv_header_openssl_evp_h=no \
+	ac_cv_lib_lzo2_lzo1x_1_compress=$(usex lzo) \
+	econf
+}
+
+_emake() {
+	local arch
+	case ${ARCH} in
+	x86)   arch=i386;;
+	amd64) arch=x86_64;;
+	arm)   arch=arm;;
+	arm64) arch=aarch64;;
+	esac
+
+	local os=$(usex kernel_linux Linux IDK)
+
+	# The Makefile is a mess.  Override a few vars rather than patch it.
+	emake \
+		MACH="${arch}" \
+		OS="${os}" \
+		HAVE_SSE42=$(usex cpu_flags_x86_sse4_2 1 0) \
+		HAVE_AVX2=$(usex cpu_flags_x86_avx2 1 0) \
+		RPM_OPT_FLAGS="${CFLAGS} ${CPPFLAGS}" \
+		CFLAGS_OPT='$(CFLAGS)' \
+		LDFLAGS="${LDFLAGS} -Wl,-rpath,${EPREFIX}/usr/$(get_libdir)/${PN}" \
+		CC="$(tc-getCC)" \
+		"$@"
+}
+
+src_compile() {
+	_emake
+}
+
+src_test() {
+	_emake check
+}
+
+src_install() {
+	# easier to install by hand than trying to make sense of the Makefile.
+	dobin dd_rescue
+	dodir /usr/$(get_libdir)/${PN}
+	cp -pPR libddr_*.so "${ED}"/usr/$(get_libdir)/${PN}/ || die
+	dodoc README.dd_rescue
+	doman dd_rescue.1
+	use lzo && doman ddr_lzo.1
+}
diff --git a/sys-fs/dd-rescue/files/dd_rescue-1.99-test_fix.patch b/sys-fs/dd-rescue/files/dd_rescue-1.99-test_fix.patch
new file mode 100644
index 000000000000..6ddf7116f9fb
--- /dev/null
+++ b/sys-fs/dd-rescue/files/dd_rescue-1.99-test_fix.patch
@@ -0,0 +1,11 @@
+--- dd_rescue-1.99/test_crypt.sh
++++ dd_rescue-1.99/test_crypt.sh
+@@ -97,7 +97,7 @@
+ $VG ./dd_rescue -t -m 4096 urandom urandom.new || exit 1
+ # Ensure that we don't have 01 or 02 02 or ... at the end,
+ # which would trip pad=asneeded
+-echo -n "a" | dd_rescue -S 4095 -m 1 - urandom.new
++echo -n "a" | ./dd_rescue -S 4095 -m 1 - urandom.new
+ mv urandom.new urandom
+ enc_dec_compare_keys urandom AES192-CBC "" pad=always "" "-qpt"
+ enc_dec_compare_keys urandom AES192-CBC "" pad=asneeded "" "-qpt"
diff --git a/sys-fs/dosfstools/dosfstools-3.0.28.ebuild b/sys-fs/dosfstools/dosfstools-3.0.28.ebuild
index f23770ffa106..39399ea3de87 100644
--- a/sys-fs/dosfstools/dosfstools-3.0.28.ebuild
+++ b/sys-fs/dosfstools/dosfstools-3.0.28.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/dosfstools/dosfstools/releases/download/v${PV}/${P}.
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~arm-linux ~x86-linux"
 IUSE=""
 
 RESTRICT="test" # there is no test target #239071
diff --git a/sys-fs/eudev/eudev-3.1.2.ebuild b/sys-fs/eudev/eudev-3.1.2.ebuild
index d72ff9b1b529..ff77e978d62c 100644
--- a/sys-fs/eudev/eudev-3.1.2.ebuild
+++ b/sys-fs/eudev/eudev-3.1.2.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} = 9999* ]]; then
 	inherit git-2
 else
 	SRC_URI="https://dev.gentoo.org/~blueness/${PN}/${P}.tar.gz"
-	KEYWORDS="alpha amd64 arm hppa ia64 ~mips ~ppc ppc64 sparc x86"
+	KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86"
 fi
 
 DESCRIPTION="Linux dynamic and persistent device naming support (aka userspace devfs)"
diff --git a/sys-fs/exfat-utils/metadata.xml b/sys-fs/exfat-utils/metadata.xml
index 7b05b18e4457..26c5b26cf2bc 100644
--- a/sys-fs/exfat-utils/metadata.xml
+++ b/sys-fs/exfat-utils/metadata.xml
@@ -8,5 +8,6 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="google-code">exfat</remote-id>
+		<remote-id type="github">relan/exfat</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/sys-fs/fuse-exfat/metadata.xml b/sys-fs/fuse-exfat/metadata.xml
index 7b05b18e4457..26c5b26cf2bc 100644
--- a/sys-fs/fuse-exfat/metadata.xml
+++ b/sys-fs/fuse-exfat/metadata.xml
@@ -8,5 +8,6 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="google-code">exfat</remote-id>
+		<remote-id type="github">relan/exfat</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/sys-fs/fuse-zip/metadata.xml b/sys-fs/fuse-zip/metadata.xml
index 37f5c95810cb..196300228e33 100644
--- a/sys-fs/fuse-zip/metadata.xml
+++ b/sys-fs/fuse-zip/metadata.xml
@@ -9,5 +9,6 @@
 	</longdescription>
 	<upstream>
 		<remote-id type="google-code">fuse-zip</remote-id>
+		<remote-id type="bitbucket">agalanin/fuse-zip</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/sys-fs/s3backer/metadata.xml b/sys-fs/s3backer/metadata.xml
index 45fcce25c7e2..368e18c40a07 100644
--- a/sys-fs/s3backer/metadata.xml
+++ b/sys-fs/s3backer/metadata.xml
@@ -6,5 +6,6 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="google-code">s3backer</remote-id>
+		<remote-id type="github">archiecobbs/s3backer</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/sys-fs/udev/Manifest b/sys-fs/udev/Manifest
index e21e8297d655..e4d813597232 100644
--- a/sys-fs/udev/Manifest
+++ b/sys-fs/udev/Manifest
@@ -9,3 +9,4 @@ DIST udev-218-patches-1.tar.xz 616 SHA256 80c0e57caa2845164b3fda1a9a74d07763a6b1
 DIST udev-220-patches-4.tar.xz 3432 SHA256 b17c676c7984d90bcafb57d087e77bc9e435a3244187f51e8c5ce1b3d4248ac9 SHA512 747e6d36faaed145bbe630e794bdd636d4e39d55fc2fc422d815cee3ab4aa579f15abbd1ff88c0448667546c8b04f72663cffa46d07861199076912bd009d25d WHIRLPOOL 0a349daae71b6ac95afc7414aa931f8aaa7328d2a0e7058cf6099b794531a1148bcd198f404d5d4bab7b250b1390adeb6938e8771da90fb7f56114560fd03a82
 DIST udev-222.tar.gz 4015599 SHA256 b49f51f9855127987adc98aad3b6d608e4e53eaa029b629f2ea2089ce0234f34 SHA512 83f0acf0ca90c89c902c268af6eef4b61380a30380013cbe89c929357959f51682cd3961a6a4f772abc09d5ca09404ae290edf2c3253fab1b20dc2b5b3ecde47 WHIRLPOOL dd0151034de374b072e70448e7a9ff47693df0190e8a2a11488593400d3d7e53e0a91d86037d027c750584089e6c68e58c437647d608a72f8826f091e3253879
 DIST udev-224.tar.gz 3868075 SHA256 0d7ac1532a57639fbc828f8a5051a090883c6ad2908618a7a13ab386db831bfc SHA512 7717d340c6de11afd589234b7ec8952fe2ffcd05829622bd7ea8e008870c0e3b83eb1eaf20e85ffffa7adafc9c0c0b94fd93784510792109240e22e6b963f198 WHIRLPOOL 645b08ff0c20994b17b8ed585fb0eef682336961d7fedf25031fa4dc89a4d9a2b58c254e0f9baeedcb228435316fdfb562f9fefd21e5a63f94499d2f1040e093
+DIST udev-225.tar.gz 3878442 SHA256 b2f576bb3688e9315f2f49b98e141ac6f964567370e98ebd8fd7332a0a6f9701 SHA512 35b3946509c7b01660da4370d3c51ff0e6a537dadd9dbb0a039c4f7ed552fd4e02ebac6eb8a788f61f1e3ba99444238d959051dd004c174b027729a80368ac19 WHIRLPOOL 47cd3b5690dafdf3c0ef6a9767e947666b1853541f8aefd17eb5c07eee1477daf32f3b249b04327b1c56d8ec430745725383750b97755bb6cf594d354a7ffdf8
diff --git a/sys-fs/udev/udev-225.ebuild b/sys-fs/udev/udev-225.ebuild
new file mode 100644
index 000000000000..96cc496e3673
--- /dev/null
+++ b/sys-fs/udev/udev-225.ebuild
@@ -0,0 +1,439 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit autotools bash-completion-r1 eutils linux-info multilib multilib-minimal toolchain-funcs udev user versionator
+
+if [[ ${PV} = 9999* ]]; then
+	EGIT_REPO_URI="git://anongit.freedesktop.org/systemd/systemd"
+	inherit git-r3
+else
+	patchset=
+	SRC_URI="https://github.com/systemd/systemd/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	if [[ -n "${patchset}" ]]; then
+				SRC_URI="${SRC_URI}
+					https://dev.gentoo.org/~ssuominen/${P}-patches-${patchset}.tar.xz
+					https://dev.gentoo.org/~williamh/dist/${P}-patches-${patchset}.tar.xz"
+			fi
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+fi
+
+DESCRIPTION="Linux dynamic and persistent device naming support (aka userspace devfs)"
+HOMEPAGE="http://www.freedesktop.org/wiki/Software/systemd"
+
+LICENSE="LGPL-2.1 MIT GPL-2"
+SLOT="0"
+IUSE="acl +kmod selinux static-libs"
+
+RESTRICT="test"
+
+COMMON_DEPEND=">=sys-apps/util-linux-2.24
+	sys-libs/libcap[${MULTILIB_USEDEP}]
+	acl? ( sys-apps/acl )
+	kmod? ( >=sys-apps/kmod-16 )
+	selinux? ( >=sys-libs/libselinux-2.1.9 )
+	!<sys-libs/glibc-2.11
+	!sys-apps/gentoo-systemd-integration
+	!sys-apps/systemd
+	abi_x86_32? (
+		!<=app-emulation/emul-linux-x86-baselibs-20130224-r7
+		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
+	)"
+# Force new make >= -r4 to skip some parallel build issues
+DEPEND="${COMMON_DEPEND}
+	dev-util/gperf
+	>=dev-util/intltool-0.50
+	>=sys-apps/coreutils-8.16
+	virtual/os-headers
+	virtual/pkgconfig
+	>=sys-devel/make-3.82-r4
+	>=sys-kernel/linux-headers-3.9
+	app-text/docbook-xml-dtd:4.2
+	app-text/docbook-xml-dtd:4.5
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt"
+RDEPEND="${COMMON_DEPEND}
+	!<sys-fs/lvm2-2.02.103
+	!<sec-policy/selinux-base-2.20120725-r10"
+PDEPEND=">=sys-apps/hwids-20140304[udev]
+	>=sys-fs/udev-init-scripts-26"
+
+S=${WORKDIR}/systemd-${PV}
+
+# The multilib-build.eclass doesn't handle situation where the installed headers
+# are different in ABIs. In this case, we install libgudev headers in native
+# ABI but not for non-native ABI.
+multilib_check_headers() { :; }
+
+check_default_rules() {
+	# Make sure there are no sudden changes to upstream rules file
+	# (more for my own needs than anything else ...)
+	local udev_rules_md5=b8ad860dccae0ca51656b33c405ea2ca
+	MD5=$(md5sum < "${S}"/rules/50-udev-default.rules)
+	MD5=${MD5/  -/}
+	if [[ ${MD5} != ${udev_rules_md5} ]]; then
+		eerror "50-udev-default.rules has been updated, please validate!"
+		eerror "md5sum: ${MD5}"
+		die "50-udev-default.rules has been updated, please validate!"
+	fi
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != buildonly ]]; then
+		CONFIG_CHECK="~BLK_DEV_BSG ~DEVTMPFS ~!IDE ~INOTIFY_USER ~!SYSFS_DEPRECATED ~!SYSFS_DEPRECATED_V2 ~SIGNALFD ~EPOLL ~FHANDLE ~NET ~!FW_LOADER_USER_HELPER"
+		linux-info_pkg_setup
+
+		# CONFIG_FHANDLE was introduced by 2.6.39
+		local MINKV=2.6.39
+
+		if kernel_is -lt ${MINKV//./ }; then
+			eerror "Your running kernel is too old to run this version of ${P}"
+			eerror "You need to upgrade kernel at least to ${MINKV}"
+		fi
+
+		if kernel_is -lt 3 7; then
+			ewarn "Your running kernel is too old to have firmware loader and"
+			ewarn "this version of ${P} doesn't have userspace firmware loader"
+			ewarn "If you need firmware support, you need to upgrade kernel at least to 3.7"
+		fi
+	fi
+}
+
+src_prepare() {
+	if ! [[ ${PV} = 9999* ]]; then
+		# secure_getenv() disable for non-glibc systems wrt bug #443030
+		if ! [[ $(grep -r secure_getenv * | wc -l) -eq 25 ]]; then
+			eerror "The line count for secure_getenv() failed, see bug #443030"
+			die
+		fi
+	fi
+
+	# backport some patches
+	if [[ -n "${patchset}" ]]; then
+		EPATCH_SUFFIX=patch EPATCH_FORCE=yes epatch
+	fi
+
+	cat <<-EOF > "${T}"/40-gentoo.rules
+	# Gentoo specific floppy and usb groups
+	SUBSYSTEM=="block", KERNEL=="fd[0-9]", GROUP="floppy"
+	SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", GROUP="usb"
+	EOF
+
+	# change rules back to group uucp instead of dialout for now wrt #454556
+	sed -i -e 's/GROUP="dialout"/GROUP="uucp"/' rules/*.rules || die
+
+	# stub out the am_path_libcrypt function
+	echo 'AC_DEFUN([AM_PATH_LIBGCRYPT],[:])' > m4/gcrypt.m4
+
+	# apply user patches
+	epatch_user
+
+	eautoreconf
+
+	if ! [[ ${PV} = 9999* ]]; then
+		check_default_rules
+	fi
+
+	# Restore possibility of running --enable-static wrt #472608
+	sed -i \
+		-e '/--enable-static is not supported by systemd/s:as_fn_error:echo:' \
+		configure || die
+
+	if ! use elibc_glibc; then #443030
+		echo '#define secure_getenv(x) NULL' >> config.h.in
+		sed -i -e '/error.*secure_getenv/s:.*:#define secure_getenv(x) NULL:' src/shared/missing.h || die
+	fi
+}
+
+src_configure() {
+	# Prevent conflicts with i686 cross toolchain, bug 559726
+	tc-export AR CC NM OBJCOPY RANLIB
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	tc-export CC #463846
+	export cc_cv_CFLAGS__flto=no #502950
+	export cc_cv_CFLAGS__Werror_shadow=no #554454
+
+	# Keep sorted by ./configure --help and only pass --disable flags
+	# when *required* to avoid external deps or unnecessary compile
+	local econf_args
+	econf_args=(
+		--libdir=/usr/$(get_libdir)
+		--docdir=/usr/share/doc/${PF}
+		$(multilib_native_use_enable static-libs static)
+		--disable-nls
+		--disable-dbus
+		$(multilib_native_use_enable kmod)
+		--disable-xkbcommon
+		--disable-seccomp
+		$(multilib_native_use_enable selinux)
+		--disable-xz
+		--disable-lz4
+		--disable-pam
+		$(multilib_native_use_enable acl)
+		--disable-gcrypt
+		--disable-audit
+		--disable-libcryptsetup
+		--disable-qrencode
+		--disable-microhttpd
+		--disable-gnuefi
+		--disable-gnutls
+		--disable-libcurl
+		--disable-libidn
+		--disable-quotacheck
+		--disable-logind
+		--disable-polkit
+		--disable-myhostname
+		$(multilib_is_native_abi || echo "--disable-manpages")
+		--enable-split-usr
+		--without-python
+		--with-bashcompletiondir="$(get_bashcompdir)"
+		--with-rootprefix=
+		$(multilib_is_native_abi && echo "--with-rootlibdir=/$(get_libdir)")
+		--disable-elfutils
+	)
+
+	if ! multilib_is_native_abi; then
+		econf_args+=(
+			MOUNT_{CFLAGS,LIBS}=' '
+		)
+	fi
+
+	ECONF_SOURCE=${S} econf "${econf_args[@]}"
+}
+
+multilib_src_compile() {
+	echo 'BUILT_SOURCES: $(BUILT_SOURCES)' > "${T}"/Makefile.extra
+	emake -f Makefile -f "${T}"/Makefile.extra BUILT_SOURCES
+
+	# Most of the parallel build problems were solved by >=sys-devel/make-3.82-r4,
+	# but not everything -- separate building of the binaries as a workaround,
+	# which will force internal libraries required for the helpers to be built
+	# early enough, like eg. libsystemd-shared.la
+	if multilib_is_native_abi; then
+		local lib_targets=( libudev.la )
+		emake "${lib_targets[@]}"
+
+		local exec_targets=(
+			systemd-udevd
+			udevadm
+		)
+		emake "${exec_targets[@]}"
+
+		local helper_targets=(
+			ata_id
+			cdrom_id
+			collect
+			scsi_id
+			v4l_id
+			mtd_probe
+		)
+		emake "${helper_targets[@]}"
+
+		local man_targets=(
+			man/udev.conf.5
+			man/systemd.link.5
+			man/udev.7
+			man/systemd-udevd.service.8
+			man/udevadm.8
+		)
+		emake "${man_targets[@]}"
+	else
+		local lib_targets=( libudev.la )
+		emake "${lib_targets[@]}"
+	fi
+}
+
+multilib_src_install() {
+	if multilib_is_native_abi; then
+		local lib_LTLIBRARIES="libudev.la" \
+			pkgconfiglib_DATA="src/libudev/libudev.pc"
+
+		local targets=(
+			install-libLTLIBRARIES
+			install-includeHEADERS
+			install-rootbinPROGRAMS
+			install-rootlibexecPROGRAMS
+			install-udevlibexecPROGRAMS
+			install-dist_udevconfDATA
+			install-dist_udevrulesDATA
+			install-pkgconfiglibDATA
+			install-pkgconfigdataDATA
+			install-dist_docDATA
+			libudev-install-hook
+			install-directories-hook
+			install-dist_bashcompletionDATA
+			install-dist_networkDATA
+		)
+
+		# add final values of variables:
+		targets+=(
+			rootlibexec_PROGRAMS=systemd-udevd
+			rootbin_PROGRAMS=udevadm
+			lib_LTLIBRARIES="${lib_LTLIBRARIES}"
+			pkgconfiglib_DATA="${pkgconfiglib_DATA}"
+			pkgconfigdata_DATA="src/udev/udev.pc"
+			INSTALL_DIRS='$(sysconfdir)/udev/rules.d \
+					$(sysconfdir)/udev/hwdb.d \
+					$(sysconfdir)/systemd/network'
+			dist_bashcompletion_DATA="shell-completion/bash/udevadm"
+			dist_network_DATA="network/99-default.link"
+		)
+		emake -j1 DESTDIR="${D}" "${targets[@]}"
+		doman man/{udev.conf.5,systemd.link.5,udev.7,systemd-udevd.service.8,udevadm.8}
+	else
+		local lib_LTLIBRARIES="libudev.la" \
+			pkgconfiglib_DATA="src/libudev/libudev.pc" \
+			include_HEADERS="src/libudev/libudev.h"
+
+		local targets=(
+			install-libLTLIBRARIES
+			install-includeHEADERS
+			install-pkgconfiglibDATA
+		)
+
+		targets+=(
+			lib_LTLIBRARIES="${lib_LTLIBRARIES}"
+			pkgconfiglib_DATA="${pkgconfiglib_DATA}"
+			include_HEADERS="${include_HEADERS}"
+			)
+		emake -j1 DESTDIR="${D}" "${targets[@]}"
+	fi
+}
+
+multilib_src_install_all() {
+	dodoc TODO
+
+	prune_libtool_files --all
+	rm -f \
+		"${D}"/lib/udev/rules.d/99-systemd.rules \
+		"${D}"/usr/share/doc/${PF}/{LICENSE.*,GVARIANT-SERIALIZATION,DIFFERENCES,PORTING-DBUS1,sd-shutdown.h}
+
+	# see src_prepare() for content of 40-gentoo.rules
+	insinto /lib/udev/rules.d
+	doins "${T}"/40-gentoo.rules
+
+	# maintainer note: by not letting the upstream build-sys create the .so
+	# link, you also avoid a parallel make problem
+	mv "${D}"/usr/share/man/man8/systemd-udevd{.service,}.8
+}
+
+pkg_postinst() {
+	mkdir -p "${ROOT%/}"/run
+
+	# "losetup -f" is confused if there is an empty /dev/loop/, Bug #338766
+	# So try to remove it here (will only work if empty).
+	rmdir "${ROOT%/}"/dev/loop 2>/dev/null
+	if [[ -d ${ROOT%/}/dev/loop ]]; then
+		ewarn "Please make sure your remove /dev/loop,"
+		ewarn "else losetup may be confused when looking for unused devices."
+	fi
+
+	local fstab="${ROOT%/}"/etc/fstab dev path fstype rest
+	while read -r dev path fstype rest; do
+		if [[ ${path} == /dev && ${fstype} != devtmpfs ]]; then
+			ewarn "You need to edit your /dev line in ${fstab} to have devtmpfs"
+			ewarn "filesystem. Otherwise udev won't be able to boot."
+			ewarn "See, https://bugs.gentoo.org/453186"
+		fi
+	done < "${fstab}"
+
+	if [[ -d ${ROOT%/}/usr/lib/udev ]]; then
+		ewarn
+		ewarn "Please re-emerge all packages on your system which install"
+		ewarn "rules and helpers in /usr/lib/udev. They should now be in"
+		ewarn "/lib/udev."
+		ewarn
+		ewarn "One way to do this is to run the following command:"
+		ewarn "emerge -av1 \$(qfile -q -S -C /usr/lib/udev)"
+		ewarn "Note that qfile can be found in app-portage/portage-utils"
+	fi
+
+	local old_cd_rules="${ROOT%/}"/etc/udev/rules.d/70-persistent-cd.rules
+	local old_net_rules="${ROOT%/}"/etc/udev/rules.d/70-persistent-net.rules
+	for old_rules in "${old_cd_rules}" "${old_net_rules}"; do
+		if [[ -f ${old_rules} ]]; then
+			ewarn
+			ewarn "File ${old_rules} is from old udev installation but if you still use it,"
+			ewarn "rename it to something else starting with 70- to silence this deprecation"
+			ewarn "warning."
+		fi
+	done
+
+	elog
+	elog "Starting from version >= 197 the new predictable network interface names are"
+	elog "used by default, see:"
+	elog "http://www.freedesktop.org/wiki/Software/systemd/PredictableNetworkInterfaceNames"
+	elog "http://cgit.freedesktop.org/systemd/systemd/tree/src/udev/udev-builtin-net_id.c"
+	elog
+	elog "Example command to get the information for the new interface name before booting"
+	elog "(replace <ifname> with, for example, eth0):"
+	elog "# udevadm test-builtin net_id /sys/class/net/<ifname> 2> /dev/null"
+	elog
+	elog "You can use either kernel parameter \"net.ifnames=0\", create empty"
+	elog "file /etc/systemd/network/99-default.link, or symlink it to /dev/null"
+	elog "to disable the feature."
+
+	if has_version 'sys-apps/biosdevname'; then
+		ewarn
+		ewarn "You can replace the functionality of sys-apps/biosdevname which has been"
+		ewarn "detected to be installed with the new predictable network interface names."
+	fi
+
+	ewarn
+	ewarn "You need to restart udev as soon as possible to make the upgrade go"
+	ewarn "into effect."
+	ewarn "The method you use to do this depends on your init system."
+	if has_version 'sys-apps/openrc'; then
+		ewarn "For sys-apps/openrc users it is:"
+		ewarn "# /etc/init.d/udev --nodeps restart"
+	fi
+
+	elog
+	elog "For more information on udev on Gentoo, upgrading, writing udev rules, and"
+	elog "fixing known issues visit:"
+	elog "https://wiki.gentoo.org/wiki/Udev"
+	elog "https://wiki.gentoo.org/wiki/Udev/upgrade"
+
+	# 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="${ROOT%/}"/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
+		[[ -f ${net_name_slot} && $(sed -e "/^#/d" -e "/^\W*$/d" ${net_name_slot} | wc -l) == 0 ]] && net_move=yes
+		if [[ -L ${net_name_slot} && $(readlink ${net_name_slot}) == /dev/null ]]; then
+			net_move=yes
+			net_name_slot_sym=yes
+		fi
+	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 $?
+	fi
+
+	# http://cgit.freedesktop.org/systemd/systemd/commit/rules/50-udev-default.rules?id=3dff3e00e044e2d53c76fa842b9a4759d4a50e69
+	# https://bugs.gentoo.org/246847
+	# https://bugs.gentoo.org/514174
+	enewgroup input
+
+	# Update hwdb database in case the format is changed by udev version.
+	if has_version 'sys-apps/hwids[udev]'; then
+		udevadm hwdb --update --root="${ROOT%/}"
+		# Only reload when we are not upgrading to avoid potential race w/ incompatible hwdb.bin and the running udevd
+		# http://cgit.freedesktop.org/systemd/systemd/commit/?id=1fab57c209035f7e66198343074e9cee06718bda
+		[[ -z ${REPLACING_VERSIONS} ]] && udev_reload
+	fi
+}
diff --git a/sys-fs/udev/udev-9999.ebuild b/sys-fs/udev/udev-9999.ebuild
index e69fa2d876ab..96cc496e3673 100644
--- a/sys-fs/udev/udev-9999.ebuild
+++ b/sys-fs/udev/udev-9999.ebuild
@@ -147,6 +147,12 @@ src_prepare() {
 	fi
 }
 
+src_configure() {
+	# Prevent conflicts with i686 cross toolchain, bug 559726
+	tc-export AR CC NM OBJCOPY RANLIB
+	multilib-minimal_src_configure
+}
+
 multilib_src_configure() {
 	tc-export CC #463846
 	export cc_cv_CFLAGS__flto=no #502950
diff --git a/sys-fs/xfsprogs/Manifest b/sys-fs/xfsprogs/Manifest
index 120b49ff8ef0..514ee0e959bf 100644
--- a/sys-fs/xfsprogs/Manifest
+++ b/sys-fs/xfsprogs/Manifest
@@ -1,5 +1,4 @@
 DIST xfsprogs-3.1.10.tar.gz 1375721 SHA256 9ec8dc77bf3bc114c3ba89f87316a32e3097efb3e7fc44df23421614bb21aa6c SHA512 c5ff72978e13fc74e4b0e5294d2a7e2efffda088051cd39c7f71629bbc5f9f4c694c4aff6b50e57d60d3bd0c15a90ddd18afc3697336cd8d2429939cc82554bb WHIRLPOOL 9c0f9b36de3314e8add80a20a227ec36cd582cf4f98eafaf55ad5fe14521eceaf9d202c9ac46968f73ce1c97233cbec45d8c421127ff31819f72bf0f9f18276a
 DIST xfsprogs-3.1.11.tar.gz 1399833 SHA256 adf4980177b5c890c1ca86b9c0e3e4d69a3f95bfc01746844280c2393cf4d6be SHA512 6de16f0904709e53e6ceea8239e23b7e109375733fd712fd97bfbbf74ec7f1376147e61d1fbe498f1d5be2148bf8ca233c0577d5b88e9201bfd4bb87e696c28a WHIRLPOOL d52f177d172940e46c813575459917d73042739629f83537932eff38b28a524956484ad6ebbbd2d5d698f1a4b60c1a0f127ca1dd22bba86dcd74c5b94bf51962
-DIST xfsprogs-3.2.2.tar.gz 1477667 SHA256 1a525ce21dc39d4ad3d775fa3c12c2dd4fb7a85e1e05ddd4530dcf773ed65fab SHA512 6316ce6da87bc3d70c1a887b7c5558b594fa6960105d6a51ad0e8072d5533444f69da174f370907738a15bd50f785f715f71947de916940daf0df2845f4a700e WHIRLPOOL a3e1d57e3dd77f91361ff710306a5579a5d99204849291d6730f672e65febe18a5957646cfcda60d02684a24333dca45f742637256b423a7756d4f28556594cf
-DIST xfsprogs-3.2.3.tar.gz 1479757 SHA256 7a5124a880997939551b519610a2e54bd4cd0b0adfd563ce3f4de30827109ac9 SHA512 8f0a95624ccbc71aa6911b62ee5a1cfc56795a581eb746e1bbef8a6385633d9dc15c913a4fd73b1e46c54820a3d36914045e603ef18c506666442b8a2def0a3b WHIRLPOOL af4950cd719717e023756028cf73b0a2e7ae738dab184bedd81a81d82431baa67915dc0d6b58bdc7afc1450156d3a64078bb0b70583fa07b8cc3b02ad96dd2ce
 DIST xfsprogs-3.2.4.tar.gz 1482424 SHA256 dde65ead82d3cbfa9b4ded9796b6d22095d7d759a22d41ae6f1a4ec458bb0465 SHA512 fb1ea5beb933b86970cac198fa4e296457f0f5b30bd72fda54452644730277929dee28f11f35a154910e4a19857455ecffdd21b3df456023e0da95e2fd0aa0eb WHIRLPOOL dec87905b5a5af053e71e88f1670470c00b94a758dbb77773adbc601db61b4efaaba306f344a4334b11680973d5153fcc7f8b5d59c4698f21d654570e8355fe9
+DIST xfsprogs-4.2.0.tar.gz 1487831 SHA256 3deab1ad0f4635e54053aa45add27bd48cd87a188c16ac60f4789e01730e5260 SHA512 1bafa9b8eeb834126d02e6e4d582e3ac637ca81c3dc262e3cd742fcc43679ac11a8aa160964264267bc2793822b6af8de87cc7a09c8a9e28826458b17b430620 WHIRLPOOL a608a1b5cad9d22deb26836432730b47ec7a270bbb0e7ff1e41e5a169b5bae5baf143d63129a0ea1936d73a9c479e8787701f9437fdcea2680a41097d64a3437
diff --git a/sys-fs/xfsprogs/files/xfsprogs-4.2.0-sharedlibs.patch b/sys-fs/xfsprogs/files/xfsprogs-4.2.0-sharedlibs.patch
new file mode 100644
index 000000000000..86eb6f818690
--- /dev/null
+++ b/sys-fs/xfsprogs/files/xfsprogs-4.2.0-sharedlibs.patch
@@ -0,0 +1,80 @@
+--- xfsprogs-4.2.0/include/buildmacros
++++ xfsprogs-4.2.0/include/buildmacros
+@@ -70,18 +70,9 @@
+ # /usr/lib.
+ ifeq ($(ENABLE_SHARED),yes)
+ INSTALL_LTLIB_DEV = \
+-	cd $(TOPDIR)/$(LIBNAME)/.libs; \
+-	../$(INSTALL) -m 755 -d $(PKG_LIB_DIR); \
+-	../$(INSTALL) -m 644 -T old_lib $(LIBNAME).lai $(PKG_LIB_DIR); \
+-	../$(INSTALL) -m 644 $(LIBNAME).lai $(PKG_LIB_DIR)/$(LIBNAME).la ; \
+-	../$(INSTALL) -m 755 -d $(PKG_ROOT_LIB_DIR); \
+-	../$(INSTALL) -T so_base $(LIBNAME).lai $(PKG_ROOT_LIB_DIR); \
+-	if [ "x$(shell readlink -f $(PKG_LIB_DIR))" != \
+-	     "x$(shell readlink -f $(PKG_ROOT_LIB_DIR))" ]; then \
+-		../$(INSTALL) -S $(PKG_LIB_DIR)/$(LIBNAME).a $(PKG_ROOT_LIB_DIR)/$(LIBNAME).a; \
+-		../$(INSTALL) -S $(PKG_LIB_DIR)/$(LIBNAME).la $(PKG_ROOT_LIB_DIR)/$(LIBNAME).la; \
+-		../$(INSTALL) -S $(PKG_ROOT_LIB_DIR)/$(LIBNAME).so $(PKG_LIB_DIR)/$(LIBNAME).so; \
+-	fi
++	set -e; cd $(TOPDIR)/$(LIBNAME); \
++	$(INSTALL) -m 755 -d $(PKG_LIB_DIR); \
++	env -uDIST_ROOT $(LTINSTALL) $(TOPDIR)/$(LIBNAME)/$(LIBNAME).la $(DIST_ROOT)$(PKG_LIB_DIR)/$(LIBNAME).la
+ else
+ INSTALL_LTLIB_DEV = $(INSTALL_LTLIB_STATIC)
+ endif
+--- xfsprogs-4.2.0/libxcmd/Makefile
++++ xfsprogs-4.2.0/libxcmd/Makefile
+@@ -34,6 +34,9 @@
+ 
+ include $(BUILDRULES)
+ 
+-install install-dev: default
++install: default
++
++install-dev: default
++	$(INSTALL_LTLIB_DEV)
+ 
+ -include .ltdep
+--- xfsprogs-4.2.0/libxfs/Makefile
++++ xfsprogs-4.2.0/libxfs/Makefile
+@@ -138,6 +138,7 @@
+ 
+ install-dev: install
+ 	$(INSTALL) -m 644 $(PKGHFILES) $(PKG_INC_DIR)
++	$(INSTALL_LTLIB_DEV)
+ 
+ # We need to install the headers before building the dependencies.  If we
+ # include the .ltdep file, the makefile decides that it needs to build the
+--- xfsprogs-4.2.0/libxlog/Makefile
++++ xfsprogs-4.2.0/libxlog/Makefile
+@@ -12,6 +12,8 @@
+ 
+ CFILES = xfs_log_recover.c util.c
+ 
++LTLIBS = $(LIBUUID) $(LIBXFS)
++
+ # don't want to link xfs_repair with a debug libxlog.
+ DEBUG = -DNDEBUG
+ 
+@@ -19,6 +21,9 @@
+ 
+ include $(BUILDRULES)
+ 
+-install install-dev: default
++install: default
++
++install-dev: default
++	$(INSTALL_LTLIB_DEV)
+ 
+ -include .ltdep
+--- xfsprogs-4.2.0/Makefile
++++ xfsprogs-4.2.0/Makefile
+@@ -81,6 +81,8 @@
+ io: libxcmd libhandle
+ quota: libxcmd
+ repair: libxlog
++libxlog: libxfs
++libxlog-install-dev: libxfs-install-dev
+ 
+ 
+ ifeq ($(HAVE_BUILDDEFS), yes)
diff --git a/sys-fs/xfsprogs/xfsprogs-3.2.2.ebuild b/sys-fs/xfsprogs/xfsprogs-3.2.2.ebuild
deleted file mode 100644
index e3e46bd58fd2..000000000000
--- a/sys-fs/xfsprogs/xfsprogs-3.2.2.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-
-inherit eutils toolchain-funcs multilib
-
-DESCRIPTION="xfs filesystem utilities"
-HOMEPAGE="http://oss.sgi.com/projects/xfs/"
-SRC_URI="ftp://oss.sgi.com/projects/xfs/cmd_tars/${P}.tar.gz
-	ftp://oss.sgi.com/projects/xfs/previous/cmd_tars/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
-IUSE="libedit nls readline static static-libs"
-REQUIRED_USE="static? ( static-libs )"
-
-LIB_DEPEND=">=sys-apps/util-linux-2.17.2[static-libs(+)]
-	readline? ( sys-libs/readline[static-libs(+)] )
-	!readline? ( libedit? ( dev-libs/libedit[static-libs(+)] ) )"
-RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
-	!<sys-fs/xfsdump-3"
-DEPEND="${RDEPEND}
-	static? (
-		${LIB_DEPEND}
-		readline? ( sys-libs/ncurses[static-libs] )
-	)
-	nls? ( sys-devel/gettext )"
-
-pkg_setup() {
-	if use readline && use libedit ; then
-		ewarn "You have USE='readline libedit' but these are exclusive."
-		ewarn "Defaulting to readline; please disable this USE flag if you want libedit."
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-3.2.2-sharedlibs.patch
-
-	sed -i \
-		-e "/^PKG_DOC_DIR/s:@pkg_name@:${PF}:" \
-		include/builddefs.in || die
-	sed -i \
-		-e '1iLLDFLAGS = -static' \
-		{estimate,fsr}/Makefile || die
-	sed -i \
-		-e "/LLDFLAGS/s:-static:$(use static && echo -all-static):" \
-		$(find -name Makefile) || die
-
-	# libdisk has broken blkid conditional checking
-	sed -i \
-		-e '/LIB_SUBDIRS/s:libdisk::' \
-		Makefile || die
-
-	# TODO: write a patch for configure.in to use pkg-config for the uuid-part
-	if use static && use readline ; then
-		sed -i \
-			-e 's|-lreadline|\0 -lncurses|' \
-			-e 's|-lblkid|\0 -luuid|' \
-			configure || die
-	fi
-}
-
-src_configure() {
-	export DEBUG=-DNDEBUG
-	export OPTIMIZER=${CFLAGS}
-	unset PLATFORM # if set in user env, this breaks configure
-
-	local myconf
-	if use static || use static-libs ; then
-		myconf+=" --enable-static"
-	else
-		myconf+=" --disable-static"
-	fi
-
-	econf \
-		--bindir=/usr/bin \
-		--libexecdir=/usr/$(get_libdir) \
-		$(use_enable nls gettext) \
-		$(use_enable readline) \
-		$(usex readline --disable-editline $(use_enable libedit editline)) \
-		${myconf}
-
-	MAKEOPTS+=" V=1"
-}
-
-src_install() {
-	emake DIST_ROOT="${ED}" install
-	# parallel install fails on these targets for >=xfsprogs-3.2.0
-	emake -j1 DIST_ROOT="${ED}" install-{dev,qa}
-
-	# handle is for xfsdump, the rest for xfsprogs
-	gen_usr_ldscript -a xfs xlog
-	# removing unnecessary .la files if not needed
-	use static-libs || find "${ED}" -name '*.la' -delete
-}
diff --git a/sys-fs/xfsprogs/xfsprogs-3.2.3.ebuild b/sys-fs/xfsprogs/xfsprogs-3.2.3.ebuild
deleted file mode 100644
index 463f6d33a8f4..000000000000
--- a/sys-fs/xfsprogs/xfsprogs-3.2.3.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-
-inherit eutils toolchain-funcs multilib
-
-DESCRIPTION="xfs filesystem utilities"
-HOMEPAGE="http://oss.sgi.com/projects/xfs/"
-SRC_URI="ftp://oss.sgi.com/projects/xfs/cmd_tars/${P}.tar.gz
-	ftp://oss.sgi.com/projects/xfs/previous/cmd_tars/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="libedit nls readline static static-libs"
-REQUIRED_USE="static? ( static-libs )"
-
-LIB_DEPEND=">=sys-apps/util-linux-2.17.2[static-libs(+)]
-	readline? ( sys-libs/readline[static-libs(+)] )
-	!readline? ( libedit? ( dev-libs/libedit[static-libs(+)] ) )"
-RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
-	!<sys-fs/xfsdump-3"
-DEPEND="${RDEPEND}
-	static? (
-		${LIB_DEPEND}
-		readline? ( sys-libs/ncurses[static-libs] )
-	)
-	nls? ( sys-devel/gettext )"
-
-pkg_setup() {
-	if use readline && use libedit ; then
-		ewarn "You have USE='readline libedit' but these are exclusive."
-		ewarn "Defaulting to readline; please disable this USE flag if you want libedit."
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-3.2.2-sharedlibs.patch
-
-	sed -i \
-		-e "/^PKG_DOC_DIR/s:@pkg_name@:${PF}:" \
-		include/builddefs.in || die
-	sed -i \
-		-e '1iLLDFLAGS = -static' \
-		{estimate,fsr}/Makefile || die
-	sed -i \
-		-e "/LLDFLAGS/s:-static-libtool-libs:$(use static && echo -all-static):" \
-		$(find -name Makefile) || die
-
-	# libdisk has broken blkid conditional checking
-	sed -i \
-		-e '/LIB_SUBDIRS/s:libdisk::' \
-		Makefile || die
-
-	# TODO: write a patch for configure.in to use pkg-config for the uuid-part
-	if use static && use readline ; then
-		sed -i \
-			-e 's|-lreadline|\0 -lncurses|' \
-			-e 's|-lblkid|\0 -luuid|' \
-			configure || die
-	fi
-}
-
-src_configure() {
-	export DEBUG=-DNDEBUG
-	export OPTIMIZER=${CFLAGS}
-	unset PLATFORM # if set in user env, this breaks configure
-
-	local myconf
-	if use static || use static-libs ; then
-		myconf+=" --enable-static"
-	else
-		myconf+=" --disable-static"
-	fi
-
-	econf \
-		--bindir=/usr/bin \
-		--libexecdir=/usr/$(get_libdir) \
-		$(use_enable nls gettext) \
-		$(use_enable readline) \
-		$(usex readline --disable-editline $(use_enable libedit editline)) \
-		${myconf}
-
-	MAKEOPTS+=" V=1"
-}
-
-src_install() {
-	emake DIST_ROOT="${ED}" install
-	# parallel install fails on these targets for >=xfsprogs-3.2.0
-	emake -j1 DIST_ROOT="${ED}" install-{dev,qa}
-
-	# handle is for xfsdump, the rest for xfsprogs
-	gen_usr_ldscript -a xfs xlog
-	# removing unnecessary .la files if not needed
-	use static-libs || find "${ED}" -name '*.la' -delete
-}
diff --git a/sys-fs/xfsprogs/xfsprogs-3.2.4.ebuild b/sys-fs/xfsprogs/xfsprogs-3.2.4.ebuild
index 5d6111f02fd9..f94f0102f61e 100644
--- a/sys-fs/xfsprogs/xfsprogs-3.2.4.ebuild
+++ b/sys-fs/xfsprogs/xfsprogs-3.2.4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="ftp://oss.sgi.com/projects/xfs/cmd_tars/${P}.tar.gz
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
 IUSE="libedit nls readline static static-libs"
 REQUIRED_USE="static? ( static-libs )"
 
diff --git a/sys-fs/xfsprogs/xfsprogs-4.2.0.ebuild b/sys-fs/xfsprogs/xfsprogs-4.2.0.ebuild
new file mode 100644
index 000000000000..35a490f370b9
--- /dev/null
+++ b/sys-fs/xfsprogs/xfsprogs-4.2.0.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+
+inherit eutils toolchain-funcs multilib
+
+DESCRIPTION="xfs filesystem utilities"
+HOMEPAGE="http://oss.sgi.com/projects/xfs/"
+SRC_URI="ftp://oss.sgi.com/projects/xfs/cmd_tars/${P}.tar.gz
+	ftp://oss.sgi.com/projects/xfs/previous/cmd_tars/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="libedit nls readline static static-libs"
+REQUIRED_USE="static? ( static-libs )"
+
+LIB_DEPEND=">=sys-apps/util-linux-2.17.2[static-libs(+)]
+	readline? ( sys-libs/readline[static-libs(+)] )
+	!readline? ( libedit? ( dev-libs/libedit[static-libs(+)] ) )"
+RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
+	!<sys-fs/xfsdump-3"
+DEPEND="${RDEPEND}
+	static? (
+		${LIB_DEPEND}
+		readline? ( sys-libs/ncurses[static-libs] )
+	)
+	nls? ( sys-devel/gettext )"
+
+pkg_setup() {
+	if use readline && use libedit ; then
+		ewarn "You have USE='readline libedit' but these are exclusive."
+		ewarn "Defaulting to readline; please disable this USE flag if you want libedit."
+	fi
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-4.2.0-sharedlibs.patch
+
+	sed -i \
+		-e "/^PKG_DOC_DIR/s:@pkg_name@:${PF}:" \
+		include/builddefs.in || die
+	sed -i \
+		-e '1iLLDFLAGS = -static' \
+		{estimate,fsr}/Makefile || die
+	sed -i \
+		-e "/LLDFLAGS/s:-static-libtool-libs:$(use static && echo -all-static):" \
+		$(find -name Makefile) || die
+
+	# libdisk has broken blkid conditional checking
+	sed -i \
+		-e '/LIB_SUBDIRS/s:libdisk::' \
+		Makefile || die
+
+	# TODO: write a patch for configure.in to use pkg-config for the uuid-part
+	if use static && use readline ; then
+		sed -i \
+			-e 's|-lreadline|\0 -lncurses|' \
+			-e 's|-lblkid|\0 -luuid|' \
+			configure || die
+	fi
+}
+
+src_configure() {
+	export DEBUG=-DNDEBUG
+	export OPTIMIZER=${CFLAGS}
+	unset PLATFORM # if set in user env, this breaks configure
+
+	local myconf
+	if use static || use static-libs ; then
+		myconf+=" --enable-static"
+	else
+		myconf+=" --disable-static"
+	fi
+
+	econf \
+		--bindir=/usr/bin \
+		--libexecdir=/usr/$(get_libdir) \
+		$(use_enable nls gettext) \
+		$(use_enable readline) \
+		$(usex readline --disable-editline $(use_enable libedit editline)) \
+		${myconf}
+
+	MAKEOPTS+=" V=1"
+}
+
+src_install() {
+	emake DIST_ROOT="${ED}" install
+	# parallel install fails on this target for >=xfsprogs-3.2.0
+	emake -j1 DIST_ROOT="${ED}" install-dev
+
+	# handle is for xfsdump, the rest for xfsprogs
+	gen_usr_ldscript -a xfs xlog
+	# removing unnecessary .la files if not needed
+	use static-libs || find "${ED}" -name '*.la' -delete
+}
diff --git a/sys-kernel/gentoo-sources/Manifest b/sys-kernel/gentoo-sources/Manifest
index ece13217f338..223c975a1e04 100644
--- a/sys-kernel/gentoo-sources/Manifest
+++ b/sys-kernel/gentoo-sources/Manifest
@@ -29,6 +29,9 @@ DIST genpatches-3.18-17.extras.tar.xz 16184 SHA256 cadde114f6229bbb92092ae76a0db
 DIST genpatches-3.18-20.base.tar.xz 604232 SHA256 94272b175e3d21f31c2b54cd425461f94e3a51f106e2cfb1c9cbbd80f2ad6b95 SHA512 3148d43f393833016489cfb2c1e2e65a559251eea083a1ac7d0b4ce0c422a102c433fd7d9d14a58aee968874df95f8170c0941e9d6469033f760737e3f2ec545 WHIRLPOOL 88a3020a65c60beedc73e4524a585f282b997f7a945497ffa7668b13db6b5f6a989d60d77855af56e5ce21d659f7d615976610b6688080e169c3726521ebf8bc
 DIST genpatches-3.18-20.experimental.tar.xz 61632 SHA256 32daadb53fb41765769d4434b576a840e534ce8f27cbee9243a5e192d729d9e0 SHA512 d312040611fdd6d1c7cba3b05d2935bca20c7bb3b8ef7ef99778e3425b22e511bb559627546bea50dae7dd68ef1fab645140dec5372db5b89355454acd3718ae WHIRLPOOL 89aca68b23cf3fee89db746e9c8ec52a6221d08ac8d30a4803712625268ca4c587d252b3830140efc49ceb7d57dd0b78114710e9a5fe7934ac49cc3944087da2
 DIST genpatches-3.18-20.extras.tar.xz 16176 SHA256 9bf1da691b63936b577a8e80d0faa531cf11192bcb466672fd9810bd27d6225d SHA512 39f484c780edd8e6b52c3b431bf24976cde78b9a188836c5df436c752b25cc23ae17796892162da2577ad301a9495843302bcae1ebb8e3f301ff3ec3a0d8e112 WHIRLPOOL 44124899803ab18031f5ac7f70ea3dc297980d1d31f9329f8813c94becc104f90e0678b9cda077cabc797fbb6980448391b0ac32e1740ec75dacf1623f44181f
+DIST genpatches-3.18-21.base.tar.xz 632956 SHA256 f657997b05dc52e215c22fde16cb227895d072ac2716d25481654849a9e373f1 SHA512 f1dac401caf1cd6282fc47670ad9e3540855542d7eee77f27231bdb9679d3da07b7b09f675ce5998aa777024817546ba8747c7d75aa45cbeb2789dbabf5c5602 WHIRLPOOL 26d19e9302ffd72123c897f7012ae6d81cbab7a7d1b498d10b6aef27fd5e7f4d466fb510c6e72ef3c5f855eb9c88e80f8adbf436e80d52dcbcf1ac1f3e1bf684
+DIST genpatches-3.18-21.experimental.tar.xz 61600 SHA256 ebee995e505d68dcf95f39986b73185b353cc64627b048f230e755195a910094 SHA512 d7866e7948e8d6c83a452f99ca50ed06951f68b7552d9dc182c5686d43abe3dc76e3773c8325a87b65e8bf1fa4c09db75fc1af27b7837bb60918e82273cc17e4 WHIRLPOOL 01f897a369a036624364de57b1ea213b8bbe1b1e9bea792e45e0e5b921c3cff0a88174c3284359466059e3dc3793a51ea92a1aa4a5c7b0dd79d98e99693ccd80
+DIST genpatches-3.18-21.extras.tar.xz 16192 SHA256 76e21081cdcb3c1b38632ec5375b456287ed572c1a3cb64cc036471a4ae4f726 SHA512 c1e98a5d2350b07a5d939863386027765c8820e32a45a9c68201beb6de811aadcd32c82ef8ef0627290f6fef7ad5751418b2aa7ab4e2d8f3e5b6683e40fbc80a WHIRLPOOL b39979d760f0695fb2632bf7fbed16070e24efa03992c0575bbd13185ab33f0e2d05e35071e9f352f0eaa83e15015550229c33df2294beebe2ef6d24fa2b755e
 DIST genpatches-3.4-90.base.tar.xz 1325696 SHA256 77764d0afc0e3a9db3b4e3314c86505ed8703834f8364fabf7bc21004d14425b SHA512 df2583e5a939a2ae9a2fade243b128ad3b1d4f7370407bca15ad1dca2defde271ede16daa8c01f844053af5da7a5cfbb7ea04839fe93a4a21fe87d1d8551374f WHIRLPOOL 17050e7e73b15106fb1831290a685810e65e41a345669e401ab324a3fa27576d02cb17e22b3f8c36961b501b31254cef82d849cac005504b8feb5b4113d9cbc3
 DIST genpatches-3.4-90.extras.tar.xz 18236 SHA256 787d5a43bbadfcb40ac5f7aed21aca6bba239bcf495b0d051380f675487ecb42 SHA512 9917f83e64c0705e0c810723ada2f14109d29cee03576027fb234229796c024d8092abbb91406e2ff9594e9e1840f718885e9e0ff294cdb2bfb0ef76fbcfde0d WHIRLPOOL 255b4f46bd3f0685f6903eb04be187dfa3f821318c7bb8ae48fb17c35eabd88d0f14684f6031326cea4935246acd0766abe6e7363f1a527af686c7fa965cf9d3
 DIST genpatches-4.0-11.base.tar.xz 234968 SHA256 49cfd38bb97a92984c0d8b955c2f795701897544a4bfea4d2d2932543abca31a SHA512 059a049248c2eaaae4c4201235586306f846b12503fa1aa3bdea9ad31b4522f030beb057926cf79ffa9468e2940a68b6f6089511a60005dd339e4775c8a682cd WHIRLPOOL a5a31fa2a1db39fd01ed72e9917481a7c4f406c8168a2dac078df5a46c41d0be69df6ef532aae0f06fbf81a5a5e2262a9ba4785bdb13c48b21e338347d6be1ee
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-3.18.21.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-3.18.21.ebuild
new file mode 100644
index 000000000000..1e9781bdb83a
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-3.18.21.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="21"
+K_DEBLOB_AVAILABLE="1"
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 -hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+IUSE="deblob experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/kergen/Manifest b/sys-kernel/kergen/Manifest
index e8245abb3337..a19637764ac0 100644
--- a/sys-kernel/kergen/Manifest
+++ b/sys-kernel/kergen/Manifest
@@ -1 +1,2 @@
 DIST kergen-0.1.1.tar.gz 109207 SHA256 a618cb8918fb4849c76eeb73211471829633d03ac36b31d6bc35cafee248a5f9 SHA512 6667b630c850b93d1edca554d8dc22f834a38d7fcdd222721973593c4272d65034db4bfe3983b53135ae02e3fda9c29af208168e38ea82048792c6a791afd4fe WHIRLPOOL 1acb14be792554682dc93b9712914495d9ef4013bc68317873d8fe97ef6147c1148dfb459e2ef0491d6ef2a699f15b25cc60025a35b5b42d7c1e48e4fa6421fe
+DIST kergen-0.1.3.tar.gz 109717 SHA256 6b3b90478321946e988a1b74932c748743389b82e181d51020ceed5f5b85c4c0 SHA512 decc5cc832f8741bb7f2e058b23c165c458bc9bce0e854d46292e741f33aadc731a9c0f428567b9143134d874b6bdd20defeb1377eabc51b347c0de3066e4aae WHIRLPOOL 854e5fafc406e01f1eee5a4f079d8f6af6684b01dd39affb918c5908174b924d9f50da0dcf2f1894e4d7884d0703b87906f5b74a73d46977aeb3fefecba625d6
diff --git a/sys-kernel/kergen/kergen-0.1.3.ebuild b/sys-kernel/kergen/kergen-0.1.3.ebuild
new file mode 100644
index 000000000000..dc0e6c156473
--- /dev/null
+++ b/sys-kernel/kergen/kergen-0.1.3.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python3_{3,4} )
+
+inherit distutils-r1
+
+DESCRIPTION="Kernel config generator"
+HOMEPAGE="https://github.com/nichoski/kergen"
+SRC_URI="http://whatishacking.org/${PN}/downloads/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
diff --git a/sys-kernel/mips-sources/Manifest b/sys-kernel/mips-sources/Manifest
index 65729af0cd8c..aa091dea1f1c 100644
--- a/sys-kernel/mips-sources/Manifest
+++ b/sys-kernel/mips-sources/Manifest
@@ -1,7 +1,7 @@
 DIST linux-4.1.tar.xz 83017828 SHA256 caf51f085aac1e1cea4d00dbbf3093ead07b551fc07b31b2a989c05f8ea72d9f SHA512 168ef84a4e67619f9f53f3574e438542a5747f9b43443363cb83597fcdac9f40d201625c66e375a23226745eaada9176eb006ca023613cec089349e91751f3c0 WHIRLPOOL 85fcfdb67ea7f865272a85d3b4c3ec1f5a1267f4664bf073c562bb3875e9d96ad68486259d8866a9aced98c95de16840ec531d89745aec75b7315a64ebe650b8
 DIST linux-4.2.tar.xz 85507784 SHA256 cf20e044f17588d2a42c8f2a450b0fd84dfdbd579b489d93e9ab7d0e8b45dbeb SHA512 a87bbce3c0c6d810a41bbba1c0dcaae80dc38dded9f8571e97fa4ee5a468d655daf52d260911412f7c7da3171a5114e89d63da14b1753b9a3eb2cc38fd89b9ee WHIRLPOOL 2058e664ee287cc03119ff3dd0155b7018b9c789a13a1012f190e516172f845dcb2d977c8e6a6951e9bd720e5e8cdfa3b888cce392c9b02780520e77475870d0
-DIST mips-sources-4.1.0-patches-v1.tar.xz 155512 SHA256 4093fa9a36ed3ac513d3a1d2f321362ee1552361fcbffbfe666e9907bb8fe7b0 SHA512 6a16f2461fed92686bdbcd86ae10c4a6ebcd1c0e38f7da9727f587bf4d129d1dec1e3c45fddc3c337d6ba9e0c07ac16f42b8eab4ecaa2c02f33786b5cc8cbcea WHIRLPOOL 492076e979e017887ce545d8a1633a129d86ecd85d4e0221ea8a5d6271b959d3a1f02bf4d5045df97d7432787e4302db7226bc282733d56d119b4933646e8338
-DIST mips-sources-4.2.0-patches-v1.tar.xz 154572 SHA256 5b22bdab634ebfabef9b680e1334ed600c36d0f2bac2692f763e538562aa3546 SHA512 2c1d749f8bc20fdc62eb8f157e3a86e25fd2cb0d20b250a913bb99c14b3c693a726a99a082f8f3524f4c4da16ec89e62e244bcfe4285641d1e285188d7a3a42a WHIRLPOOL e4508a6a093add3a18d87b1e8762199a904365bb7b2173d53a2bd1798516221c56a5a24708478bba130bc3288e595167c59b2bea88b754c6c4431ee84c8ba2c4
+DIST mips-sources-4.1.0-patches-v2.tar.xz 155172 SHA256 ee3dc9b0f21011a4304f90347568cf39faf97344b4ec22d3becbd1d10ca368bf SHA512 ce385fbf4c82e0d09911cd411a1ba822066d750f6306c3fdfac35bfae23a61b8685fd873a5dd62255accee098fb29dbecf64d717de29f9fcf617c5fbf9468eda WHIRLPOOL fe90dd8e9a7bbf17615ec359ebee170d0a4efb9a1480d4ed6dbf29f945d6983fad2a991f455e3c28fddf2f0bd6eb49b637666cb6bf44ccc9f19ce1419a943396
+DIST mips-sources-4.2.0-patches-v2.tar.xz 154356 SHA256 b0cbcdc1477afe9c80d03729463dff0f9bc0d47b14a2044e11643b6d2bf3ff64 SHA512 09d09f5df4c47f4e097df5fe85c6af6412b40d52c7f66047dea002acb28faf7de5b26025526f976fcd57798ad8e976b044e58b669cb1ca7e32e8b3b92c3e0c16 WHIRLPOOL 39da84458e3e5e8069937697dfc4d4ccbd67aeb6a0971b2fc64757f01860c049d1babd06e5494675453cbc954c6750f702d87bbbb8e98bc607028b6455ffdeb4
 DIST mipsgit-4.1.0-20150830.diff.xz 2172 SHA256 1dc6449311b607f21f64f8051bb1b5a318c4827b71a1fbe619fec4198500e76e SHA512 8f2724313e4a41a0492146ca9da8b7772688d4f71be4d4f75e0dc6e33ba0c8c47ecd2f1ca7916375afb8db9abae07fb19714e51c55a10f14a6a87488666a4870 WHIRLPOOL 41c51c3d40ee64f1a584e2d2ef08bf04c41b951a2d1db955edb65f2f3461573f9bb6226b646a8a0dbe812e112fdbab80915915c67d9f5c08c52e9e37704c0a7d
 DIST mipsgit-4.2.0-20150830.diff.xz 6676 SHA256 15a45b998a3dae1adfc0a1efe8681f3dd006537d5a33e6dc9b1b0160e6fe7503 SHA512 6d16263d34cb6865647d89ac6933f37fe063d74fd55e1db6911533dc8de5a55f9731d1e5b55eea030d51244e8d59244a0e9f8bda4c283d8684b74738a8dadf0d WHIRLPOOL 7baa008a100e7dab569dbe9e234bf2d11408389db0e9d2eaef9b8823b4aeb0a39f713d28a4ca74606fdcafec2ba95a0c4eaf492ae0c5a7ec570440c35e35fd0f
 DIST patch-4.1.6.xz 201836 SHA256 64e4deb16a279e233b0c91463b131bd0f3de6aabdb49efded8314bcf5dbfe070 SHA512 1b725c2051d7dd9129c927fdb90d8d7a2e13149a2dd1175c5efacfc516e664af3647bca83d847197f8c19ef140bf07ea856868e27bef4a1cad9607e40b527424 WHIRLPOOL cc685876a4bf84903720a7a311854b4b469d29e8f09303b8e05e82501c6bb105fe149eed78f14084bbd748bfbd13ad55a22277ac1ab17c497b6c5e0db64af0d6
diff --git a/sys-kernel/mips-sources/mips-sources-4.1.6-r1.ebuild b/sys-kernel/mips-sources/mips-sources-4.1.6-r1.ebuild
new file mode 100644
index 000000000000..64ca1f089fcd
--- /dev/null
+++ b/sys-kernel/mips-sources/mips-sources-4.1.6-r1.ebuild
@@ -0,0 +1,167 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+# EAPI Version
+EAPI="5"
+
+#//------------------------------------------------------------------------------
+
+# Version Data
+GITDATE="20150830"			# Date of diff between kernel.org and lmo GIT
+GENPATCHREV="2"				# Tarball revision for patches
+
+# Directories
+S="${WORKDIR}/linux-${OKV}-${GITDATE}"
+MIPS_PATCHES="${WORKDIR}/mips-patches"
+
+# Kernel-2 Vars
+K_SECURITY_UNSUPPORTED="yes"
+K_NOUSENAME="yes"
+K_NOSETEXTRAVERSION="yes"
+K_NOUSEPR="yes"
+K_BASE_VER="4.0"
+ETYPE="sources"
+
+# Inherit Eclasses
+inherit kernel-2 eutils
+detect_version
+
+# Version Data
+F_KV="${PVR}"
+BASE_KV="$(get_version_component_range 1-2).0"
+[[ "${EXTRAVERSION}" = -rc* ]] && KVE="${EXTRAVERSION}"
+
+# Portage Vars
+HOMEPAGE="http://www.linux-mips.org/ http://www.gentoo.org/"
+KEYWORDS="-* ~mips"
+IUSE="cobalt ip27 ip28 ip30"
+DEPEND=">=sys-devel/gcc-4.6.0"
+RDEPEND=""
+
+# Machine Support Control Variables
+DO_IP22="test"				# If "yes", enable IP22 support		(SGI Indy, Indigo2 R4x00)
+DO_IP27="yes"				# 		   IP27 support		(SGI Origin)
+DO_IP28="test"				# 		   IP28 support		(SGI Indigo2 Impact R10000)
+DO_IP30="yes"				# 		   IP30 support		(SGI Octane)
+DO_IP32="yes"				# 		   IP32 support		(SGI O2, R5000/RM5200 Only)
+DO_CBLT="test"				# 		   Cobalt Support	(Cobalt Microsystems)
+
+# Machine Stable Version Variables
+SV_IP22=""				# If set && DO_IP22 == "no", indicates last "good" IP22 version
+SV_IP27=""				# 	    DO_IP27 == "no", 			   IP27
+SV_IP28=""				# 	    DO_IP28 == "no", 			   IP28
+SV_IP30=""				# 	    DO_IP30 == "no", 			   IP30
+SV_IP32=""				# 	    DO_IP32 == "no", 			   IP32
+SV_CBLT=""				# 	    DO_CBLT == "no", 			   Cobalt
+
+DESCRIPTION="Linux-Mips GIT sources for MIPS-based machines, dated ${GITDATE}"
+SRC_URI="${KERNEL_URI}
+	 mirror://gentoo/mipsgit-${BASE_KV}${KVE}-${GITDATE}.diff.xz
+	 mirror://gentoo/${PN}-${BASE_KV}-patches-v${GENPATCHREV}.tar.xz"
+
+UNIPATCH_STRICTORDER="1"
+UNIPATCH_LIST="${DISTDIR}/mipsgit-${BASE_KV}${KVE}-${GITDATE}.diff.xz"
+
+#//------------------------------------------------------------------------------
+
+# Eblit Handling Functions
+#
+# They'll likely be superseded someday by better ideas, possibly elibs.
+
+# eblit-core
+# Usage: <function> [version]
+# Main eblit engine
+eblit-core() {
+	local e v func=$1 ver=$2
+	for v in ${ver:+-}${ver} -${PVR} -${PV} "" ; do
+		e="${FILESDIR}/eblits/${func}${v}.eblit"
+		if [[ -e ${e} ]] ; then
+			. "${e}"
+			[[ ${func} == pkg_* ]] && eval "${func}() { eblit-run ${func} ${ver} ; }"
+			return 0
+		fi
+	done
+	return 1
+}
+
+# eblit-include
+# Usage: [--skip] <function> [version]
+# Includes an "eblit" -- a chunk of common code among ebuilds in a given
+# package so that its functions can be sourced and utilized within the
+# ebuild.
+eblit-include() {
+	local skipable=false r=0
+	[[ $1 == "--skip" ]] && skipable=true && shift
+	[[ $1 == pkg_* ]] && skipable=true
+
+	[[ -z $1 ]] && die "Usage: eblit-include <function> [version]"
+	eblit-core $1 $2
+	r="$?"
+	${skipable} && return 0
+	[[ "$r" -gt "0" ]] && die "Could not locate requested eblit '$1' in ${FILESDIR}/eblits/"
+}
+
+# eblit-run-maybe
+# Usage: <function>
+# Runs a function if it is defined in an eblit
+eblit-run-maybe() {
+	[[ $(type -t "$@") == "function" ]] && "$@"
+}
+
+# eblit-run
+# Usage: <function> [version]
+# Runs a function defined in an eblit
+eblit-run() {
+	eblit-include --skip common "${*:2}"
+	eblit-include "$@"
+	eblit-run-maybe eblit-$1-pre
+	eblit-${PN}-$1
+	eblit-run-maybe eblit-$1-post
+}
+
+# eblit-pkg
+# Usage: <phase> [version]
+# Runs the pkg_* functions AND evals them so they're included in the binpkgs
+eblit-pkg() {
+	[[ -z $1 ]] && die "Usage: eblit-pkg <phase> [version]"
+	eblit-core pkg_$1 $2
+}
+
+#//------------------------------------------------------------------------------
+
+load_eblit_funcs() {
+	# This is a sanity check to avoid QA issues.  It prevents
+	# eblits from being referenced during metadata operations.
+	[ -n "${MIPS_SOURCES_EBLITS_LOADED}" ] && return
+
+	# All are in ${FILESDIR}/eblits
+	# If a message for a given machine needs to change,
+	# then we create a new eblit and increment the
+	# version and reference it here.
+	eblit-include err_disabled_mach v1
+	eblit-include err_only_one_mach_allowed v1
+	eblit-include show_ip22_info v3
+	eblit-include show_ip27_info v3
+	eblit-include show_ip28_info v1
+	eblit-include show_ip30_info v4
+	eblit-include show_ip32_info v4
+	eblit-include show_cobalt_info v1
+
+	# This makes sure pkg_setup & pkg_postinst gets into any binpkg.
+	# Neccessary because we can't guarantee FILESDIR is around for binpkgs.
+	eblit-pkg setup v1
+	eblit-pkg postinst v1
+
+	# Eblit load complete
+	MIPS_SOURCES_EBLITS_LOADED=1
+}
+
+pkg_setup() {
+	load_eblit_funcs
+	pkg_setup
+}
+
+src_unpack() { eblit-run src_unpack v6 ; }
+
+#//------------------------------------------------------------------------------
diff --git a/sys-kernel/mips-sources/mips-sources-4.1.6.ebuild b/sys-kernel/mips-sources/mips-sources-4.1.6.ebuild
deleted file mode 100644
index f18e0d49f431..000000000000
--- a/sys-kernel/mips-sources/mips-sources-4.1.6.ebuild
+++ /dev/null
@@ -1,167 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-# EAPI Version
-EAPI="5"
-
-#//------------------------------------------------------------------------------
-
-# Version Data
-GITDATE="20150830"			# Date of diff between kernel.org and lmo GIT
-GENPATCHREV="1"				# Tarball revision for patches
-
-# Directories
-S="${WORKDIR}/linux-${OKV}-${GITDATE}"
-MIPS_PATCHES="${WORKDIR}/mips-patches"
-
-# Kernel-2 Vars
-K_SECURITY_UNSUPPORTED="yes"
-K_NOUSENAME="yes"
-K_NOSETEXTRAVERSION="yes"
-K_NOUSEPR="yes"
-K_BASE_VER="4.0"
-ETYPE="sources"
-
-# Inherit Eclasses
-inherit kernel-2 eutils
-detect_version
-
-# Version Data
-F_KV="${PVR}"
-BASE_KV="$(get_version_component_range 1-2).0"
-[[ "${EXTRAVERSION}" = -rc* ]] && KVE="${EXTRAVERSION}"
-
-# Portage Vars
-HOMEPAGE="http://www.linux-mips.org/ http://www.gentoo.org/"
-KEYWORDS="-* ~mips"
-IUSE="cobalt ip27 ip28 ip30"
-DEPEND=">=sys-devel/gcc-4.6.0"
-RDEPEND=""
-
-# Machine Support Control Variables
-DO_IP22="test"				# If "yes", enable IP22 support		(SGI Indy, Indigo2 R4x00)
-DO_IP27="yes"				# 		   IP27 support		(SGI Origin)
-DO_IP28="test"				# 		   IP28 support		(SGI Indigo2 Impact R10000)
-DO_IP30="yes"				# 		   IP30 support		(SGI Octane)
-DO_IP32="yes"				# 		   IP32 support		(SGI O2, R5000/RM5200 Only)
-DO_CBLT="test"				# 		   Cobalt Support	(Cobalt Microsystems)
-
-# Machine Stable Version Variables
-SV_IP22=""				# If set && DO_IP22 == "no", indicates last "good" IP22 version
-SV_IP27=""				# 	    DO_IP27 == "no", 			   IP27
-SV_IP28=""				# 	    DO_IP28 == "no", 			   IP28
-SV_IP30=""				# 	    DO_IP30 == "no", 			   IP30
-SV_IP32=""				# 	    DO_IP32 == "no", 			   IP32
-SV_CBLT=""				# 	    DO_CBLT == "no", 			   Cobalt
-
-DESCRIPTION="Linux-Mips GIT sources for MIPS-based machines, dated ${GITDATE}"
-SRC_URI="${KERNEL_URI}
-	 mirror://gentoo/mipsgit-${BASE_KV}${KVE}-${GITDATE}.diff.xz
-	 mirror://gentoo/${PN}-${BASE_KV}-patches-v${GENPATCHREV}.tar.xz"
-
-UNIPATCH_STRICTORDER="1"
-UNIPATCH_LIST="${DISTDIR}/mipsgit-${BASE_KV}${KVE}-${GITDATE}.diff.xz"
-
-#//------------------------------------------------------------------------------
-
-# Eblit Handling Functions
-#
-# They'll likely be superseded someday by better ideas, possibly elibs.
-
-# eblit-core
-# Usage: <function> [version]
-# Main eblit engine
-eblit-core() {
-	local e v func=$1 ver=$2
-	for v in ${ver:+-}${ver} -${PVR} -${PV} "" ; do
-		e="${FILESDIR}/eblits/${func}${v}.eblit"
-		if [[ -e ${e} ]] ; then
-			. "${e}"
-			[[ ${func} == pkg_* ]] && eval "${func}() { eblit-run ${func} ${ver} ; }"
-			return 0
-		fi
-	done
-	return 1
-}
-
-# eblit-include
-# Usage: [--skip] <function> [version]
-# Includes an "eblit" -- a chunk of common code among ebuilds in a given
-# package so that its functions can be sourced and utilized within the
-# ebuild.
-eblit-include() {
-	local skipable=false r=0
-	[[ $1 == "--skip" ]] && skipable=true && shift
-	[[ $1 == pkg_* ]] && skipable=true
-
-	[[ -z $1 ]] && die "Usage: eblit-include <function> [version]"
-	eblit-core $1 $2
-	r="$?"
-	${skipable} && return 0
-	[[ "$r" -gt "0" ]] && die "Could not locate requested eblit '$1' in ${FILESDIR}/eblits/"
-}
-
-# eblit-run-maybe
-# Usage: <function>
-# Runs a function if it is defined in an eblit
-eblit-run-maybe() {
-	[[ $(type -t "$@") == "function" ]] && "$@"
-}
-
-# eblit-run
-# Usage: <function> [version]
-# Runs a function defined in an eblit
-eblit-run() {
-	eblit-include --skip common "${*:2}"
-	eblit-include "$@"
-	eblit-run-maybe eblit-$1-pre
-	eblit-${PN}-$1
-	eblit-run-maybe eblit-$1-post
-}
-
-# eblit-pkg
-# Usage: <phase> [version]
-# Runs the pkg_* functions AND evals them so they're included in the binpkgs
-eblit-pkg() {
-	[[ -z $1 ]] && die "Usage: eblit-pkg <phase> [version]"
-	eblit-core pkg_$1 $2
-}
-
-#//------------------------------------------------------------------------------
-
-load_eblit_funcs() {
-	# This is a sanity check to avoid QA issues.  It prevents
-	# eblits from being referenced during metadata operations.
-	[ -n "${MIPS_SOURCES_EBLITS_LOADED}" ] && return
-
-	# All are in ${FILESDIR}/eblits
-	# If a message for a given machine needs to change,
-	# then we create a new eblit and increment the
-	# version and reference it here.
-	eblit-include err_disabled_mach v1
-	eblit-include err_only_one_mach_allowed v1
-	eblit-include show_ip22_info v3
-	eblit-include show_ip27_info v3
-	eblit-include show_ip28_info v1
-	eblit-include show_ip30_info v4
-	eblit-include show_ip32_info v4
-	eblit-include show_cobalt_info v1
-
-	# This makes sure pkg_setup & pkg_postinst gets into any binpkg.
-	# Neccessary because we can't guarantee FILESDIR is around for binpkgs.
-	eblit-pkg setup v1
-	eblit-pkg postinst v1
-
-	# Eblit load complete
-	MIPS_SOURCES_EBLITS_LOADED=1
-}
-
-pkg_setup() {
-	load_eblit_funcs
-	pkg_setup
-}
-
-src_unpack() { eblit-run src_unpack v6 ; }
-
-#//------------------------------------------------------------------------------
diff --git a/sys-kernel/mips-sources/mips-sources-4.2.0-r1.ebuild b/sys-kernel/mips-sources/mips-sources-4.2.0-r1.ebuild
new file mode 100644
index 000000000000..64ca1f089fcd
--- /dev/null
+++ b/sys-kernel/mips-sources/mips-sources-4.2.0-r1.ebuild
@@ -0,0 +1,167 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+# EAPI Version
+EAPI="5"
+
+#//------------------------------------------------------------------------------
+
+# Version Data
+GITDATE="20150830"			# Date of diff between kernel.org and lmo GIT
+GENPATCHREV="2"				# Tarball revision for patches
+
+# Directories
+S="${WORKDIR}/linux-${OKV}-${GITDATE}"
+MIPS_PATCHES="${WORKDIR}/mips-patches"
+
+# Kernel-2 Vars
+K_SECURITY_UNSUPPORTED="yes"
+K_NOUSENAME="yes"
+K_NOSETEXTRAVERSION="yes"
+K_NOUSEPR="yes"
+K_BASE_VER="4.0"
+ETYPE="sources"
+
+# Inherit Eclasses
+inherit kernel-2 eutils
+detect_version
+
+# Version Data
+F_KV="${PVR}"
+BASE_KV="$(get_version_component_range 1-2).0"
+[[ "${EXTRAVERSION}" = -rc* ]] && KVE="${EXTRAVERSION}"
+
+# Portage Vars
+HOMEPAGE="http://www.linux-mips.org/ http://www.gentoo.org/"
+KEYWORDS="-* ~mips"
+IUSE="cobalt ip27 ip28 ip30"
+DEPEND=">=sys-devel/gcc-4.6.0"
+RDEPEND=""
+
+# Machine Support Control Variables
+DO_IP22="test"				# If "yes", enable IP22 support		(SGI Indy, Indigo2 R4x00)
+DO_IP27="yes"				# 		   IP27 support		(SGI Origin)
+DO_IP28="test"				# 		   IP28 support		(SGI Indigo2 Impact R10000)
+DO_IP30="yes"				# 		   IP30 support		(SGI Octane)
+DO_IP32="yes"				# 		   IP32 support		(SGI O2, R5000/RM5200 Only)
+DO_CBLT="test"				# 		   Cobalt Support	(Cobalt Microsystems)
+
+# Machine Stable Version Variables
+SV_IP22=""				# If set && DO_IP22 == "no", indicates last "good" IP22 version
+SV_IP27=""				# 	    DO_IP27 == "no", 			   IP27
+SV_IP28=""				# 	    DO_IP28 == "no", 			   IP28
+SV_IP30=""				# 	    DO_IP30 == "no", 			   IP30
+SV_IP32=""				# 	    DO_IP32 == "no", 			   IP32
+SV_CBLT=""				# 	    DO_CBLT == "no", 			   Cobalt
+
+DESCRIPTION="Linux-Mips GIT sources for MIPS-based machines, dated ${GITDATE}"
+SRC_URI="${KERNEL_URI}
+	 mirror://gentoo/mipsgit-${BASE_KV}${KVE}-${GITDATE}.diff.xz
+	 mirror://gentoo/${PN}-${BASE_KV}-patches-v${GENPATCHREV}.tar.xz"
+
+UNIPATCH_STRICTORDER="1"
+UNIPATCH_LIST="${DISTDIR}/mipsgit-${BASE_KV}${KVE}-${GITDATE}.diff.xz"
+
+#//------------------------------------------------------------------------------
+
+# Eblit Handling Functions
+#
+# They'll likely be superseded someday by better ideas, possibly elibs.
+
+# eblit-core
+# Usage: <function> [version]
+# Main eblit engine
+eblit-core() {
+	local e v func=$1 ver=$2
+	for v in ${ver:+-}${ver} -${PVR} -${PV} "" ; do
+		e="${FILESDIR}/eblits/${func}${v}.eblit"
+		if [[ -e ${e} ]] ; then
+			. "${e}"
+			[[ ${func} == pkg_* ]] && eval "${func}() { eblit-run ${func} ${ver} ; }"
+			return 0
+		fi
+	done
+	return 1
+}
+
+# eblit-include
+# Usage: [--skip] <function> [version]
+# Includes an "eblit" -- a chunk of common code among ebuilds in a given
+# package so that its functions can be sourced and utilized within the
+# ebuild.
+eblit-include() {
+	local skipable=false r=0
+	[[ $1 == "--skip" ]] && skipable=true && shift
+	[[ $1 == pkg_* ]] && skipable=true
+
+	[[ -z $1 ]] && die "Usage: eblit-include <function> [version]"
+	eblit-core $1 $2
+	r="$?"
+	${skipable} && return 0
+	[[ "$r" -gt "0" ]] && die "Could not locate requested eblit '$1' in ${FILESDIR}/eblits/"
+}
+
+# eblit-run-maybe
+# Usage: <function>
+# Runs a function if it is defined in an eblit
+eblit-run-maybe() {
+	[[ $(type -t "$@") == "function" ]] && "$@"
+}
+
+# eblit-run
+# Usage: <function> [version]
+# Runs a function defined in an eblit
+eblit-run() {
+	eblit-include --skip common "${*:2}"
+	eblit-include "$@"
+	eblit-run-maybe eblit-$1-pre
+	eblit-${PN}-$1
+	eblit-run-maybe eblit-$1-post
+}
+
+# eblit-pkg
+# Usage: <phase> [version]
+# Runs the pkg_* functions AND evals them so they're included in the binpkgs
+eblit-pkg() {
+	[[ -z $1 ]] && die "Usage: eblit-pkg <phase> [version]"
+	eblit-core pkg_$1 $2
+}
+
+#//------------------------------------------------------------------------------
+
+load_eblit_funcs() {
+	# This is a sanity check to avoid QA issues.  It prevents
+	# eblits from being referenced during metadata operations.
+	[ -n "${MIPS_SOURCES_EBLITS_LOADED}" ] && return
+
+	# All are in ${FILESDIR}/eblits
+	# If a message for a given machine needs to change,
+	# then we create a new eblit and increment the
+	# version and reference it here.
+	eblit-include err_disabled_mach v1
+	eblit-include err_only_one_mach_allowed v1
+	eblit-include show_ip22_info v3
+	eblit-include show_ip27_info v3
+	eblit-include show_ip28_info v1
+	eblit-include show_ip30_info v4
+	eblit-include show_ip32_info v4
+	eblit-include show_cobalt_info v1
+
+	# This makes sure pkg_setup & pkg_postinst gets into any binpkg.
+	# Neccessary because we can't guarantee FILESDIR is around for binpkgs.
+	eblit-pkg setup v1
+	eblit-pkg postinst v1
+
+	# Eblit load complete
+	MIPS_SOURCES_EBLITS_LOADED=1
+}
+
+pkg_setup() {
+	load_eblit_funcs
+	pkg_setup
+}
+
+src_unpack() { eblit-run src_unpack v6 ; }
+
+#//------------------------------------------------------------------------------
diff --git a/sys-kernel/mips-sources/mips-sources-4.2.0.ebuild b/sys-kernel/mips-sources/mips-sources-4.2.0.ebuild
deleted file mode 100644
index f18e0d49f431..000000000000
--- a/sys-kernel/mips-sources/mips-sources-4.2.0.ebuild
+++ /dev/null
@@ -1,167 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-# EAPI Version
-EAPI="5"
-
-#//------------------------------------------------------------------------------
-
-# Version Data
-GITDATE="20150830"			# Date of diff between kernel.org and lmo GIT
-GENPATCHREV="1"				# Tarball revision for patches
-
-# Directories
-S="${WORKDIR}/linux-${OKV}-${GITDATE}"
-MIPS_PATCHES="${WORKDIR}/mips-patches"
-
-# Kernel-2 Vars
-K_SECURITY_UNSUPPORTED="yes"
-K_NOUSENAME="yes"
-K_NOSETEXTRAVERSION="yes"
-K_NOUSEPR="yes"
-K_BASE_VER="4.0"
-ETYPE="sources"
-
-# Inherit Eclasses
-inherit kernel-2 eutils
-detect_version
-
-# Version Data
-F_KV="${PVR}"
-BASE_KV="$(get_version_component_range 1-2).0"
-[[ "${EXTRAVERSION}" = -rc* ]] && KVE="${EXTRAVERSION}"
-
-# Portage Vars
-HOMEPAGE="http://www.linux-mips.org/ http://www.gentoo.org/"
-KEYWORDS="-* ~mips"
-IUSE="cobalt ip27 ip28 ip30"
-DEPEND=">=sys-devel/gcc-4.6.0"
-RDEPEND=""
-
-# Machine Support Control Variables
-DO_IP22="test"				# If "yes", enable IP22 support		(SGI Indy, Indigo2 R4x00)
-DO_IP27="yes"				# 		   IP27 support		(SGI Origin)
-DO_IP28="test"				# 		   IP28 support		(SGI Indigo2 Impact R10000)
-DO_IP30="yes"				# 		   IP30 support		(SGI Octane)
-DO_IP32="yes"				# 		   IP32 support		(SGI O2, R5000/RM5200 Only)
-DO_CBLT="test"				# 		   Cobalt Support	(Cobalt Microsystems)
-
-# Machine Stable Version Variables
-SV_IP22=""				# If set && DO_IP22 == "no", indicates last "good" IP22 version
-SV_IP27=""				# 	    DO_IP27 == "no", 			   IP27
-SV_IP28=""				# 	    DO_IP28 == "no", 			   IP28
-SV_IP30=""				# 	    DO_IP30 == "no", 			   IP30
-SV_IP32=""				# 	    DO_IP32 == "no", 			   IP32
-SV_CBLT=""				# 	    DO_CBLT == "no", 			   Cobalt
-
-DESCRIPTION="Linux-Mips GIT sources for MIPS-based machines, dated ${GITDATE}"
-SRC_URI="${KERNEL_URI}
-	 mirror://gentoo/mipsgit-${BASE_KV}${KVE}-${GITDATE}.diff.xz
-	 mirror://gentoo/${PN}-${BASE_KV}-patches-v${GENPATCHREV}.tar.xz"
-
-UNIPATCH_STRICTORDER="1"
-UNIPATCH_LIST="${DISTDIR}/mipsgit-${BASE_KV}${KVE}-${GITDATE}.diff.xz"
-
-#//------------------------------------------------------------------------------
-
-# Eblit Handling Functions
-#
-# They'll likely be superseded someday by better ideas, possibly elibs.
-
-# eblit-core
-# Usage: <function> [version]
-# Main eblit engine
-eblit-core() {
-	local e v func=$1 ver=$2
-	for v in ${ver:+-}${ver} -${PVR} -${PV} "" ; do
-		e="${FILESDIR}/eblits/${func}${v}.eblit"
-		if [[ -e ${e} ]] ; then
-			. "${e}"
-			[[ ${func} == pkg_* ]] && eval "${func}() { eblit-run ${func} ${ver} ; }"
-			return 0
-		fi
-	done
-	return 1
-}
-
-# eblit-include
-# Usage: [--skip] <function> [version]
-# Includes an "eblit" -- a chunk of common code among ebuilds in a given
-# package so that its functions can be sourced and utilized within the
-# ebuild.
-eblit-include() {
-	local skipable=false r=0
-	[[ $1 == "--skip" ]] && skipable=true && shift
-	[[ $1 == pkg_* ]] && skipable=true
-
-	[[ -z $1 ]] && die "Usage: eblit-include <function> [version]"
-	eblit-core $1 $2
-	r="$?"
-	${skipable} && return 0
-	[[ "$r" -gt "0" ]] && die "Could not locate requested eblit '$1' in ${FILESDIR}/eblits/"
-}
-
-# eblit-run-maybe
-# Usage: <function>
-# Runs a function if it is defined in an eblit
-eblit-run-maybe() {
-	[[ $(type -t "$@") == "function" ]] && "$@"
-}
-
-# eblit-run
-# Usage: <function> [version]
-# Runs a function defined in an eblit
-eblit-run() {
-	eblit-include --skip common "${*:2}"
-	eblit-include "$@"
-	eblit-run-maybe eblit-$1-pre
-	eblit-${PN}-$1
-	eblit-run-maybe eblit-$1-post
-}
-
-# eblit-pkg
-# Usage: <phase> [version]
-# Runs the pkg_* functions AND evals them so they're included in the binpkgs
-eblit-pkg() {
-	[[ -z $1 ]] && die "Usage: eblit-pkg <phase> [version]"
-	eblit-core pkg_$1 $2
-}
-
-#//------------------------------------------------------------------------------
-
-load_eblit_funcs() {
-	# This is a sanity check to avoid QA issues.  It prevents
-	# eblits from being referenced during metadata operations.
-	[ -n "${MIPS_SOURCES_EBLITS_LOADED}" ] && return
-
-	# All are in ${FILESDIR}/eblits
-	# If a message for a given machine needs to change,
-	# then we create a new eblit and increment the
-	# version and reference it here.
-	eblit-include err_disabled_mach v1
-	eblit-include err_only_one_mach_allowed v1
-	eblit-include show_ip22_info v3
-	eblit-include show_ip27_info v3
-	eblit-include show_ip28_info v1
-	eblit-include show_ip30_info v4
-	eblit-include show_ip32_info v4
-	eblit-include show_cobalt_info v1
-
-	# This makes sure pkg_setup & pkg_postinst gets into any binpkg.
-	# Neccessary because we can't guarantee FILESDIR is around for binpkgs.
-	eblit-pkg setup v1
-	eblit-pkg postinst v1
-
-	# Eblit load complete
-	MIPS_SOURCES_EBLITS_LOADED=1
-}
-
-pkg_setup() {
-	load_eblit_funcs
-	pkg_setup
-}
-
-src_unpack() { eblit-run src_unpack v6 ; }
-
-#//------------------------------------------------------------------------------
diff --git a/sys-libs/libcap-ng/libcap-ng-0.7.7.ebuild b/sys-libs/libcap-ng/libcap-ng-0.7.7.ebuild
index 850702b50461..d75c556118ac 100644
--- a/sys-libs/libcap-ng/libcap-ng-0.7.7.ebuild
+++ b/sys-libs/libcap-ng/libcap-ng-0.7.7.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://people.redhat.com/sgrubb/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~arm-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~arm-linux ~x86-linux"
 IUSE="python static-libs"
 
 RDEPEND="python? ( ${PYTHON_DEPS} )"
diff --git a/sys-libs/libcap/libcap-2.24-r2.ebuild b/sys-libs/libcap/libcap-2.24-r2.ebuild
index 7a58eea5d87a..12b39cdc70a5 100644
--- a/sys-libs/libcap/libcap-2.24-r2.ebuild
+++ b/sys-libs/libcap/libcap-2.24-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://kernel/linux/libs/security/linux-privs/libcap2/${P}.tar.xz"
 # it's available under either of the licenses
 LICENSE="|| ( GPL-2 BSD )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux"
 IUSE="pam static-libs"
 
 RDEPEND=">=sys-apps/attr-2.4.47-r1[${MULTILIB_USEDEP}]
diff --git a/sys-libs/libnih/libnih-1.0.3-r1.ebuild b/sys-libs/libnih/libnih-1.0.3-r1.ebuild
deleted file mode 100644
index 17294ea7b38c..000000000000
--- a/sys-libs/libnih/libnih-1.0.3-r1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-
-inherit versionator eutils autotools toolchain-funcs multilib
-
-DESCRIPTION="Light-weight 'standard library' of C functions"
-HOMEPAGE="https://launchpad.net/libnih"
-SRC_URI="https://launchpad.net/${PN}/$(get_version_component_range 1-2)/${PV}/+download/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="+dbus nls static-libs test +threads"
-
-RDEPEND="dbus? ( dev-libs/expat >=sys-apps/dbus-1.2.16 )"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	virtual/pkgconfig
-	test? ( dev-util/valgrind )"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.0.3-optional-dbus.patch
-	epatch "${FILESDIR}"/${PN}-1.0.3-pkg-config.patch
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_with dbus) \
-		$(use_enable nls) \
-		$(use_enable static-libs static) \
-		$(use_enable threads) \
-		$(use_enable threads threading)
-}
-
-src_install() {
-	default
-
-	# we need to be in / because upstart needs libnih
-	gen_usr_ldscript -a nih $(use dbus && echo nih-dbus)
-	use static-libs || rm "${ED}"/usr/$(get_libdir)/*.la
-}
diff --git a/sys-libs/libnih/libnih-1.0.3-r2.ebuild b/sys-libs/libnih/libnih-1.0.3-r2.ebuild
deleted file mode 100644
index a1f3a5cd0961..000000000000
--- a/sys-libs/libnih/libnih-1.0.3-r2.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-
-inherit versionator eutils autotools toolchain-funcs multilib flag-o-matic
-
-DESCRIPTION="Light-weight 'standard library' of C functions"
-HOMEPAGE="https://launchpad.net/libnih"
-SRC_URI="https://launchpad.net/${PN}/$(get_version_component_range 1-2)/${PV}/+download/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="+dbus nls static-libs test +threads"
-
-RDEPEND="dbus? ( dev-libs/expat >=sys-apps/dbus-1.2.16 )"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	virtual/pkgconfig
-	test? ( dev-util/valgrind )"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.0.3-optional-dbus.patch
-	epatch "${FILESDIR}"/${PN}-1.0.3-pkg-config.patch
-	eautoreconf
-}
-
-src_configure() {
-	append-lfs-flags
-	econf \
-		$(use_with dbus) \
-		$(use_enable nls) \
-		$(use_enable static-libs static) \
-		$(use_enable threads) \
-		$(use_enable threads threading)
-}
-
-src_install() {
-	default
-
-	# we need to be in / because upstart needs libnih
-	gen_usr_ldscript -a nih $(use dbus && echo nih-dbus)
-	use static-libs || rm "${ED}"/usr/$(get_libdir)/*.la
-}
diff --git a/sys-libs/libnih/libnih-1.0.3-r3.ebuild b/sys-libs/libnih/libnih-1.0.3-r3.ebuild
index 1f8d2acaccfe..dd1ab1ccb982 100644
--- a/sys-libs/libnih/libnih-1.0.3-r3.ebuild
+++ b/sys-libs/libnih/libnih-1.0.3-r3.ebuild
@@ -12,14 +12,17 @@ SRC_URI="https://launchpad.net/${PN}/$(get_version_component_range 1-2)/${PV}/+d
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
-IUSE="+dbus nls static-libs test +threads"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~x86"
+IUSE="+dbus nls static-libs +threads"
 
+# The configure phase will check for valgrind headers, and the tests will use
+# that header, but only to do dynamic valgrind detection.  The tests aren't
+# run directly through valgrind, only by developers directly.  So don't bother
+# depending on valgrind here. #559830
 RDEPEND="dbus? ( dev-libs/expat >=sys-apps/dbus-1.2.16 )"
 DEPEND="${RDEPEND}
 	sys-devel/gettext
-	virtual/pkgconfig
-	test? ( dev-util/valgrind )"
+	virtual/pkgconfig"
 
 src_prepare() {
 	epatch "${FILESDIR}"/${PN}-1.0.3-optional-dbus.patch
diff --git a/sys-libs/libnih/libnih-1.0.3.ebuild b/sys-libs/libnih/libnih-1.0.3.ebuild
deleted file mode 100644
index bae14208cb19..000000000000
--- a/sys-libs/libnih/libnih-1.0.3.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="2"
-
-inherit versionator eutils autotools toolchain-funcs
-
-DESCRIPTION="Light-weight 'standard library' of C functions"
-HOMEPAGE="https://launchpad.net/libnih"
-SRC_URI="https://launchpad.net/${PN}/$(get_version_component_range 1-2)/${PV}/+download/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="+dbus nls static-libs test +threads"
-
-RDEPEND="dbus? ( dev-libs/expat >=sys-apps/dbus-1.2.16 )"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	virtual/pkgconfig
-	test? ( dev-util/valgrind )"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.0.3-optional-dbus.patch
-	epatch "${FILESDIR}"/${PN}-1.0.3-pkg-config.patch
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_with dbus) \
-		$(use_enable nls) \
-		$(use_enable static-libs static) \
-		$(use_enable threads) \
-		$(use_enable threads threading)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-
-	# we need to be in / because upstart needs libnih
-	gen_usr_ldscript -a nih $(use dbus && echo nih-dbus)
-	use static-libs || rm "${D}"/usr/lib*/*.la
-
-	dodoc AUTHORS ChangeLog HACKING NEWS README TODO
-}
diff --git a/sys-libs/libomp/Manifest b/sys-libs/libomp/Manifest
new file mode 100644
index 000000000000..6599e4c5e5bb
--- /dev/null
+++ b/sys-libs/libomp/Manifest
@@ -0,0 +1 @@
+DIST openmp-3.7.0.src.tar.xz 2251108 SHA256 8d8a224e5689596a35652fda87e4be29853c4b85fbc7a6562019badfad779f2a SHA512 70862733fbfe934cb676291d21855b4b52dfb8d5a38690551bc623777381f9fec2a567bc6f55d7122a3be862d170ac1abd6fe0e95e334006469e8c11f28d4402 WHIRLPOOL 432732b64b3ba5570f6914fcfed11813524350cce3096dae885d73579bae5cd85ea64ec51405b64adab6ff72b2c835ef639c0f14b7652defdfb8510dbd3b072b
diff --git a/sys-libs/libomp/files/libomp-3.7.0-no_compat_symlinks.patch b/sys-libs/libomp/files/libomp-3.7.0-no_compat_symlinks.patch
new file mode 100644
index 000000000000..c8b56e2bc89d
--- /dev/null
+++ b/sys-libs/libomp/files/libomp-3.7.0-no_compat_symlinks.patch
@@ -0,0 +1,17 @@
+diff -Naur openmp-3.7.0.src.orig/runtime/src/CMakeLists.txt openmp-3.7.0.src/runtime/src/CMakeLists.txt
+--- openmp-3.7.0.src.orig/runtime/src/CMakeLists.txt	2015-07-15 23:41:36.000000000 +0200
++++ openmp-3.7.0.src/runtime/src/CMakeLists.txt	2015-09-05 23:41:17.105242541 +0200
+@@ -288,13 +288,6 @@
+   endforeach()
+ else()
+   install(TARGETS omp LIBRARY DESTINATION lib${LIBOMP_LIBDIR_SUFFIX})
+-  # Create aliases (symlinks) of the library for backwards compatibility
+-  set(LIBOMP_ALIASES "libgomp;libiomp5")
+-  foreach(alias IN LISTS LIBOMP_ALIASES)
+-    install(CODE "execute_process(COMMAND \"\${CMAKE_COMMAND}\" -E create_symlink \"${LIBOMP_LIB_FILE}\"
+-      \"${alias}${CMAKE_SHARED_LIBRARY_SUFFIX}\" WORKING_DIRECTORY
+-      \$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/lib${LIBOMP_LIBDIR_SUFFIX})")
+-  endforeach()
+ endif()
+ install(
+   FILES
diff --git a/sys-libs/libomp/files/libomp-3.7.0-os_detection.patch b/sys-libs/libomp/files/libomp-3.7.0-os_detection.patch
new file mode 100644
index 000000000000..a0b2aad375f1
--- /dev/null
+++ b/sys-libs/libomp/files/libomp-3.7.0-os_detection.patch
@@ -0,0 +1,19 @@
+diff -Naur openmp-3.7.0.src.orig/runtime/tools/lib/Uname.pm openmp-3.7.0.src/runtime/tools/lib/Uname.pm
+--- openmp-3.7.0.src.orig/runtime/tools/lib/Uname.pm	2015-01-19 19:29:35.000000000 +0100
++++ openmp-3.7.0.src/runtime/tools/lib/Uname.pm	2015-09-04 19:30:25.821746740 +0200
+@@ -236,15 +236,6 @@
+         $bulk =~ m{^DISTRIB_ID\s*=\s*(.*?)\s*$}m
+             or runtime_error( "$release: There is no DISTRIB_ID:", $bulk, "(eof)" );
+         $values{ operating_system_name } = $1;
+-        $bulk =~ m{^DISTRIB_RELEASE\s*=\s*(.*?)\s*$}m
+-            or runtime_error( "$release: There is no DISTRIB_RELEASE:", $bulk, "(eof)" );
+-        $values{ operating_system_release } = $1;
+-        $bulk =~ m{^DISTRIB_CODENAME\s*=\s*(.*?)\s*$}m
+-            or runtime_error( "$release: There is no DISTRIB_CODENAME:", $bulk, "(eof)" );
+-        $values{ operating_system_codename } = $1;
+-        $bulk =~ m{^DISTRIB_DESCRIPTION\s*="?\s*(.*?)"?\s*$}m
+-            or runtime_error( "$release: There is no DISTRIB_DESCRIPTION:", $bulk, "(eof)" );
+-        $values{ operating_system_description } = $1;
+     } else {
+         # Oops. lsb-release is missed or not informative. Try other *-release files.
+         $release = "/etc/system-release";
diff --git a/sys-libs/libomp/libomp-3.7.0.ebuild b/sys-libs/libomp/libomp-3.7.0.ebuild
new file mode 100644
index 000000000000..f3ea5052ffbe
--- /dev/null
+++ b/sys-libs/libomp/libomp-3.7.0.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
+
+inherit cmake-utils multilib-minimal
+
+MY_P=openmp-${PV}
+DESCRIPTION="OpenMP runtime library for LLVM/clang compiler"
+HOMEPAGE="http://openmp.llvm.org"
+SRC_URI="http://llvm.org/releases/${PV}/${MY_P}.src.tar.xz"
+
+LICENSE="UoI-NCSA"
+SLOT="0/3.7"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}.src"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-os_detection.patch
+	"${FILESDIR}"/${P}-no_compat_symlinks.patch
+	)
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		if ! test-flag-CXX -std=c++11; then
+			eerror "${P} requires C++11-capable C++ compiler. Your current compiler"
+			eerror "does not seem to support -std=c++11 option. Please upgrade your compiler"
+			eerror "to gcc-4.7 or an equivalent version supporting C++11."
+			die "Currently active compiler does not support -std=c++11"
+		fi
+	fi
+}
+
+multilib_src_configure() {
+	local libdir="$(get_libdir)"
+	local mycmakeargs=( "-DLIBOMP_LIBDIR_SUFFIX=${libdir#lib}" )
+	cmake-utils_src_configure
+}
+
+multilib_src_compile() {
+	cmake-utils_src_compile
+}
+
+multilib_src_install() {
+	cmake-utils_src_install
+}
diff --git a/sys-libs/libomp/metadata.xml b/sys-libs/libomp/metadata.xml
new file mode 100644
index 000000000000..5c00ac4bf07b
--- /dev/null
+++ b/sys-libs/libomp/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>voyageur@gentoo.org</email>
+		<name>Bernard Cafarelli</name>
+	</maintainer>
+	<longdescription>The OpenMP subproject of LLVM is intended to contain all of the components required to build an executing OpenMP program that are outside the compiler itself.</longdescription>
+</pkgmetadata>
diff --git a/sys-libs/musl/files/musl-1.1.11-fix-codeset.patch b/sys-libs/musl/files/musl-1.1.11-fix-codeset.patch
new file mode 100644
index 000000000000..e846f5f32a78
--- /dev/null
+++ b/sys-libs/musl/files/musl-1.1.11-fix-codeset.patch
@@ -0,0 +1,12 @@
+diff -Naur musl-1.1.11.orig/src/locale/langinfo.c musl-1.1.11/src/locale/langinfo.c
+--- musl-1.1.11.orig/src/locale/langinfo.c	2015-08-30 00:15:56.000000000 -0400
++++ musl-1.1.11/src/locale/langinfo.c	2015-09-08 15:46:26.717980251 -0400
+@@ -34,7 +34,7 @@
+ 	const char *str;
+ 
+ 	if (item == CODESET)
+-		return MB_CUR_MAX==1 ? "UTF-8-CODE-UNITS" : "UTF-8";
++		return "UTF-8";
+ 	
+ 	switch (cat) {
+ 	case LC_NUMERIC:
diff --git a/sys-libs/musl/musl-1.1.11-r1.ebuild b/sys-libs/musl/musl-1.1.11-r1.ebuild
new file mode 100644
index 000000000000..018860e49203
--- /dev/null
+++ b/sys-libs/musl/musl-1.1.11-r1.ebuild
@@ -0,0 +1,129 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils flag-o-matic multilib toolchain-funcs
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="git://git.musl-libc.org/musl"
+	inherit git-2
+fi
+
+export CBUILD=${CBUILD:-${CHOST}}
+export CTARGET=${CTARGET:-${CHOST}}
+if [[ ${CTARGET} == ${CHOST} ]] ; then
+	if [[ ${CATEGORY} == cross-* ]] ; then
+		export CTARGET=${CATEGORY#cross-}
+	fi
+fi
+
+DESCRIPTION="Lightweight, fast and simple C library focused on standards-conformance and safety"
+HOMEPAGE="http://www.musl-libc.org/"
+if [[ ${PV} != "9999" ]] ; then
+	PATCH_VER=""
+	SRC_URI="http://www.musl-libc.org/releases/${P}.tar.gz"
+	KEYWORDS="-* amd64 arm ~mips ppc x86"
+fi
+
+LICENSE="MIT LGPL-2 GPL-2"
+SLOT="0"
+IUSE="crosscompile_opts_headers-only"
+
+RDEPEND="!sys-apps/getent"
+
+is_crosscompile() {
+	[[ ${CHOST} != ${CTARGET} ]]
+}
+
+just_headers() {
+	use crosscompile_opts_headers-only && is_crosscompile
+}
+
+musl_endian() {
+	# XXX: this wont work for bi-endian, but we dont have any
+	touch "${T}"/endian.s
+	$(tc-getAS ${CTARGET}) "${T}"/endian.s -o "${T}"/endian.o
+	case $(file "${T}"/endian.o) in
+		*" MSB "*) echo "";;
+		*" LSB "*) echo "el";;
+		*)         echo "nfc";; # We shouldn't be here
+	esac
+}
+
+pkg_setup() {
+	if [ ${CTARGET} == ${CHOST} ] ; then
+		case ${CHOST} in
+		*-musl*) ;;
+		*) die "Use sys-devel/crossdev to build a musl toolchain" ;;
+		esac
+	fi
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-fix-codeset.patch
+	epatch_user
+}
+
+src_configure() {
+	tc-getCC ${CTARGET}
+	just_headers && export CC=true
+
+	local sysroot
+	is_crosscompile && sysroot=/usr/${CTARGET}
+	./configure \
+		--target=${CTARGET} \
+		--prefix=${sysroot}/usr \
+		--syslibdir=${sysroot}/lib \
+		--disable-gcc-wrapper
+}
+
+src_compile() {
+	emake include/bits/alltypes.h || die
+	just_headers && return 0
+
+	emake || die
+}
+
+src_install() {
+	local target="install"
+	just_headers && target="install-headers"
+	emake DESTDIR="${D}" ${target} || die
+	just_headers && return 0
+
+	# musl provides ldd via a sym link to its ld.so
+	local sysroot
+	is_crosscompile && sysroot=/usr/${CTARGET}
+	local ldso=$(basename "${D}"${sysroot}/lib/ld-musl-*)
+	dosym ${sysroot}/lib/${ldso} ${sysroot}/usr/bin/ldd
+
+	if [[ ${CATEGORY} != cross-* ]] ; then
+		local target=$(tc-arch) arch
+		local endian=$(musl_endian)
+		case ${target} in
+			amd64) arch="x86_64";;
+			arm)   arch="armhf";; # We only have hardfloat right now
+			mips)  arch="mips${endian}";;
+			ppc)   arch="powerpc";;
+			x86)   arch="i386";;
+		esac
+		cp "${FILESDIR}"/ldconfig.in "${T}"
+		sed -e "s|@@ARCH@@|${arch}|" "${T}"/ldconfig.in > "${T}"/ldconfig
+		into /
+		dosbin "${T}"/ldconfig
+		into /usr
+		dobin "${FILESDIR}"/getent
+		echo 'LDPATH="include ld.so.conf.d/*.conf"' > "${T}"/00musl
+		doenvd "${T}"/00musl || die
+	fi
+}
+
+pkg_postinst() {
+	is_crosscompile && return 0
+
+	[ "${ROOT}" != "/" ] && return 0
+
+	ldconfig
+	# reload init ...
+	/sbin/telinit U 2>/dev/null
+}
diff --git a/sys-power/iasl/iasl-20140828.ebuild b/sys-power/iasl/iasl-20140828.ebuild
index 5f8b142b5378..a5c1ae191540 100644
--- a/sys-power/iasl/iasl-20140828.ebuild
+++ b/sys-power/iasl/iasl-20140828.ebuild
@@ -16,7 +16,7 @@ SRC_URI="http://www.acpica.org/sites/acpica/files/${MY_P}.tar.gz
 
 LICENSE="iASL"
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="amd64 ppc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="test"
 
 DEPEND="sys-devel/bison
diff --git a/sys-process/cronutils/metadata.xml b/sys-process/cronutils/metadata.xml
index 23f23b2beb69..9de3a06a8d3e 100644
--- a/sys-process/cronutils/metadata.xml
+++ b/sys-process/cronutils/metadata.xml
@@ -14,5 +14,6 @@
 	</longdescription>
 	<upstream>
 		<remote-id type="google-code">cronutils</remote-id>
+		<remote-id type="github">google/cronutils</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/sys-process/htop/htop-1.0.3-r1.ebuild b/sys-process/htop/htop-1.0.3-r1.ebuild
new file mode 100644
index 000000000000..87f44a46ed8f
--- /dev/null
+++ b/sys-process/htop/htop-1.0.3-r1.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+AUTOTOOLS_AUTORECONF=true
+
+inherit autotools-utils linux-info
+
+DESCRIPTION="interactive process viewer"
+HOMEPAGE="http://hisham.hm/htop/"
+SRC_URI="http://hisham.hm/htop/releases/${PV}/${P}.tar.gz"
+
+LICENSE="BSD GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="kernel_FreeBSD kernel_linux oom openvz unicode vserver"
+
+RDEPEND="sys-libs/ncurses:0=[unicode?]"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+DOCS=( ChangeLog README )
+
+CONFIG_CHECK="~TASKSTATS ~TASK_XACCT ~TASK_IO_ACCOUNTING ~CGROUPS"
+
+# config.h problems
+AUTOTOOLS_IN_SOURCE_BUILD=1
+
+PATCHES=("${FILESDIR}/${P}-tinfo.patch")
+
+pkg_setup() {
+	if use kernel_FreeBSD && ! [[ -f ${ROOT}/compat/linux/proc/stat && -f ${ROOT}/compat/linux/proc/meminfo ]]; then
+		echo
+		eerror "htop requires linprocfs mounted at /compat/linux/proc to build and function."
+		eerror "To mount it, type:"
+		[ -d /compat/linux/proc ] || eerror "mkdir -p /compat/linux/proc"
+		eerror "mount -t linprocfs none /compat/linux/proc"
+		eerror "Alternatively, place this information into /etc/fstab"
+		echo
+		die "htop needs /compat/linux/proc mounted"
+	fi
+
+	if ! has_version sys-process/lsof; then
+		ewarn "To use lsof features in htop(what processes are accessing"
+		ewarn "what files), you must have sys-process/lsof installed."
+	fi
+
+	linux-info_pkg_setup
+}
+
+src_prepare() {
+	rm missing || die
+
+	autotools-utils_src_prepare
+}
+
+src_configure() {
+	[[ $CBUILD != $CHOST ]] && export ac_cv_file__proc_{meminfo,stat}=yes #328971
+
+	local myeconfargs=()
+
+	use kernel_FreeBSD && myeconfargs+=( --with-proc=/compat/linux/proc )
+
+	myeconfargs+=(
+		$(use_enable openvz)
+		$(use_enable kernel_linux cgroup)
+		$(use_enable vserver)
+		$(use_enable unicode)
+		$(use_enable oom)
+		--enable-taskstats
+		)
+	autotools-utils_src_configure
+}
diff --git a/sys-process/numactl/numactl-2.0.10-r2.ebuild b/sys-process/numactl/numactl-2.0.10-r2.ebuild
index 18da72af2930..6ea2ae0eda52 100644
--- a/sys-process/numactl/numactl-2.0.10-r2.ebuild
+++ b/sys-process/numactl/numactl-2.0.10-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="ftp://oss.sgi.com/www/projects/libnuma/download/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 # ARM lacks the __NR_migrate_pages syscall.
-KEYWORDS="~amd64 -arm ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux"
+KEYWORDS="~amd64 -arm ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux"
 IUSE=""
 
 ECONF_SOURCE=${S}
diff --git a/virtual/libusb/libusb-1-r2.ebuild b/virtual/libusb/libusb-1-r2.ebuild
index 7053dc35ad09..87344a07164b 100644
--- a/virtual/libusb/libusb-1-r2.ebuild
+++ b/virtual/libusb/libusb-1-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI=""
 
 LICENSE=""
 SLOT="1"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="udev"
 
 # We force a recent libusb so that downstream consumers of virtual/libusb
diff --git a/www-apache/mod_authnz_external/metadata.xml b/www-apache/mod_authnz_external/metadata.xml
index ba08acf34594..e0670f817568 100644
--- a/www-apache/mod_authnz_external/metadata.xml
+++ b/www-apache/mod_authnz_external/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
+	<maintainer>
+		<email>maintainer-needed@gentoo.org</email>
+	</maintainer>
 	<upstream>
 		<remote-id type="google-code">mod-auth-external</remote-id>
+		<remote-id type="github">phokz/mod-auth-external</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/www-apache/mpm_itk/Manifest b/www-apache/mpm_itk/Manifest
index 3bb4d7ae3159..caeeb7133a46 100644
--- a/www-apache/mpm_itk/Manifest
+++ b/www-apache/mpm_itk/Manifest
@@ -1 +1 @@
-DIST mpm-itk-2.4.7-02.tar.gz 45450 SHA256 f12656326a1d3b92fefe63446032f0939ed9c803d4d9a1f89bae318eb3432e75 SHA512 d5430662b926821b9c17e1d38d4ade61e9ecf886f53c93de700d835abe6f967cfcdba63e7a4c7e5613043a66ca2356fcea45b572322d09c885fd3af46adb3505 WHIRLPOOL 7fc70f900c5d605059d341d46c5f95662e17eaedb44bce0713d31d39ac618970402b5f6850b806f9d5c807354be72a9e7b27414781f43a1b868634ee629b0a94
+DIST mpm-itk-2.4.7-03.tar.gz 45419 SHA256 9479fabd97dbbff5aec0fe60ae2437606dc66302a69933c9a597c015d6c937f6 SHA512 f7f517b55cf8c5d42df8029409be8d1fbd58b3d3d2117c6391e5fb8165bcd58aed42e011cf9fa69ae428c546a070ebe9be4d2e4201ec9b48559829c1295bf3bb WHIRLPOOL 73d2a5307a988775693f55d6e3f521341b43fc886100fbce0f97343775aae33941abd94d60fb0259d3adc6c795c1f2b2550b05c79163cd6101a41a1678bc75e8
diff --git a/www-apache/mpm_itk/mpm_itk-2.4.7_p2.ebuild b/www-apache/mpm_itk/mpm_itk-2.4.7_p2.ebuild
deleted file mode 100644
index b54468bc2afb..000000000000
--- a/www-apache/mpm_itk/mpm_itk-2.4.7_p2.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit apache-module linux-info
-
-MY_PN=${PN/_/-}
-MY_PV=${PV/_p/-0}
-MY_P=${MY_PN}-${MY_PV}
-
-DESCRIPTION="Run virtual hosts under separate users/groups"
-HOMEPAGE="http://mpm-itk.sesse.net/"
-SRC_URI="http://mpm-itk.sesse.net/${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-S="${WORKDIR}/${MY_P}"
-
-# The libcap dependency is automagic, so we require it
-# unconditionally. Reported upstream at,
-#
-# http://lists.err.no/pipermail/mpm-itk/2014-May/000808.html
-#
-#
-# The -threads USE dependency is only reliable as long as we don't
-# support building more than one MPM. See bug #511658.
-#
-DEPEND="sys-libs/libcap
-	>=www-servers/apache-2.4.7[-threads]"
-RDEPEND="${DEPEND}"
-
-APACHE2_MOD_CONF="00_${PN}"
-APACHE2_MOD_DEFINE="MPM_ITK"
-APXS2_ARGS="-c ${PN}.c seccomp.c -lcap"
-need_apache2_4
-
-pkg_setup() {
-	CONFIG_CHECK="~SECCOMP"
-	linux-info_pkg_setup
-
-	local minkv="3.5"
-	if kernel_is -lt ${minkv//./ }; then
-		ewarn "A kernel newer than ${minkv} (with seccomp v2) is needed"
-		ewarn "for LimitUIDRange and LimitGIDRange which we include by"
-		ewarn "default in ${APACHE2_MOD_CONF}.conf."
-	fi
-}
diff --git a/www-apache/mpm_itk/mpm_itk-2.4.7_p3.ebuild b/www-apache/mpm_itk/mpm_itk-2.4.7_p3.ebuild
new file mode 100644
index 000000000000..b930c1ea041d
--- /dev/null
+++ b/www-apache/mpm_itk/mpm_itk-2.4.7_p3.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit apache-module linux-info
+
+MY_PN=${PN/_/-}
+MY_PV=${PV/_p/-0}
+MY_P=${MY_PN}-${MY_PV}
+
+DESCRIPTION="Run virtual hosts under separate users/groups"
+HOMEPAGE="http://mpm-itk.sesse.net/"
+SRC_URI="http://mpm-itk.sesse.net/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+S="${WORKDIR}/${MY_P}"
+
+# The libcap dependency is automagic, so we require it
+# unconditionally. Reported upstream at,
+#
+# http://lists.err.no/pipermail/mpm-itk/2014-May/000808.html
+#
+#
+# The -threads USE dependency is only reliable as long as we don't
+# support building more than one MPM. See bug #511658.
+#
+DEPEND="sys-libs/libcap
+	>=www-servers/apache-2.4.7[-threads]"
+RDEPEND="${DEPEND}"
+
+APACHE2_MOD_CONF="00_${PN}"
+APACHE2_MOD_DEFINE="MPM_ITK"
+APXS2_ARGS="-c ${PN}.c seccomp.c -lcap"
+need_apache2_4
+
+pkg_setup() {
+	CONFIG_CHECK="~SECCOMP"
+	linux-info_pkg_setup
+
+	local minkv="3.5"
+	if kernel_is -lt ${minkv//./ }; then
+		ewarn "A kernel newer than ${minkv} (with seccomp v2) is needed"
+		ewarn "for LimitUIDRange and LimitGIDRange which we include by"
+		ewarn "default in ${APACHE2_MOD_CONF}.conf."
+	fi
+}
diff --git a/www-apache/passenger/Manifest b/www-apache/passenger/Manifest
index 37c2e2320906..304f2c239216 100644
--- a/www-apache/passenger/Manifest
+++ b/www-apache/passenger/Manifest
@@ -2,4 +2,5 @@ DIST passenger-4.0.53.tar.gz 4447609 SHA256 0b8d256cd930f93cfe723392aaa12fa3f9d5
 DIST passenger-4.0.59.tar.gz 4521206 SHA256 8b4756564a5133dc97425883d15d1ba1c9f6566c79e92794dc3e1f5b749238ae SHA512 d29400c71cf9530b41ce8b8d4cf94007e4d77fb4ceff290786506d6b9dfbab790f18423dc5dcd71aef07147ba2610c2982f7ca733a8e491de6a0cb3704c54bfb WHIRLPOOL 4683d19813ecbb284ec3eb9681c6c1a1b84f256f0262e6c2b1941df5872031a30da1396cb22fa1cfbad2f53f8971131ed0418c2ef4c20160a3d67f151d54208a
 DIST passenger-5.0.13.tar.gz 5556161 SHA256 9fef27b97e883e6bc55d817c52b927f2d5cd8bbc2ce79686a3de794d7e0c40e1 SHA512 68ff1e6701e431b1e26ffce8dd46198fffdddaa14bfa2f3917a20d32a7d54b3acac46d1ce797b551d9f988e7e0129d8372158f2e096342e08cb1a614d9fbf716 WHIRLPOOL 85282b61b675a0459a33208dd267d9e3b2284134bd5931df619041b5e4a2265542f9355e7f1feae2c98ffc27128504ecd46dc6493e8cbb8d55e7f9dfbf5deeac
 DIST passenger-5.0.14.tar.gz 5557110 SHA256 dbc994a9d8a0f28f2abeec25191471bbfec6e51d3e0748d7e16947bc8713f6d5 SHA512 39540136547db1b21c61174a4e86a4b5255c1f59036abbfc571eaee6fb03c48d4ec262d7fb1f1a27bf08b093112d8aaeb09c294304b597d0fdcd1fc278167b79 WHIRLPOOL 8cc983685142abbde9e85b12ee7283246fa7ebd627d56516328d6fc2ad5362439da9fcab37fffc129c2b4e992834c5efd09cfa9ee570d2c577dfd27ec8c56f95
+DIST passenger-5.0.16.tar.gz 4925041 SHA256 39799fdfa4873f67764747de1eddbe1fae759b1cd459c1c592ec71eecb462be5 SHA512 98e3c15113429bef4f01c35178c41b63fa9cd52b9fc3fc37e5e2d1a1a8d167057f73f03448b7989899d9fcce65a1a69488ae1f998dbf28368e2ee13aec909550 WHIRLPOOL 9e792dede7beaf6ee86950615cef2d4e81d8353f9077d5a9d50127eb669fe9708e8a61c597b3b5b1ad7645df8c4299060ed918ffcccdb7901db61967cfd61d98
 DIST passenger-5.0.4.tar.gz 5289792 SHA256 5c29f2c1407db515ddccd540443cb34bff7ca180b3e269c2e28a34ad795f99f6 SHA512 a04bcf579a8148b34c34743a87f4f3b180218e871ed6309d7b83e9b4ab88334f01a566896c7406e3ddaf11ba0322128557cf5cfb2bcf5da7e4ea81f0539784ec WHIRLPOOL f2d523266a616d2b893963d5139be0d781a2bf76b122b4c76bb5cb6af7a655e5492b8c58d2f38f97858616108d0c3122278598fcfa7a262bab252e079e888536
diff --git a/www-apache/passenger/passenger-5.0.16.ebuild b/www-apache/passenger/passenger-5.0.16.ebuild
new file mode 100644
index 000000000000..79dd68d10996
--- /dev/null
+++ b/www-apache/passenger/passenger-5.0.16.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+USE_RUBY="ruby19 ruby20 ruby21 ruby22"
+
+inherit apache-module flag-o-matic multilib ruby-ng toolchain-funcs
+
+DESCRIPTION="Passenger (a.k.a. mod_rails) makes deployment of Ruby on Rails applications a breeze"
+HOMEPAGE="http://modrails.com/"
+SRC_URI="http://s3.amazonaws.com/phusion-passenger/releases/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug"
+
+ruby_add_bdepend "dev-ruby/rake"
+
+ruby_add_rdepend "
+	>=dev-ruby/rack-1.0.0:*
+	>=dev-ruby/rake-0.8.1"
+
+# libev is bundled but with adapations that do not seem to be accepted
+# upstream, so we must use the bundled version :-(
+CDEPEND="
+	>=dev-libs/libuv-1.5.0
+	net-misc/curl[ssl]
+	www-servers/apache[apache2_modules_unixd(+)]"
+
+RDEPEND="${RDEPEND} ${CDEPEND}"
+DEPEND="${DEPEND} ${CDEPEND}"
+
+APACHE2_MOD_CONF="30_mod_${PN}-5.0.0 30_mod_${PN}"
+APACHE2_MOD_DEFINE="PASSENGER"
+
+need_apache2
+
+pkg_setup() {
+	use debug && append-flags -DPASSENGER_DEBUG
+}
+
+all_ruby_prepare() {
+	epatch "${FILESDIR}"/${PN}-5.0.4-gentoo.patch
+
+	# Change these with sed instead of a patch so that we can easily use
+	# the toolchain-funcs methods.
+	sed -i -e "/^CC/ s/=.*$/= '$(tc-getCC)'/" \
+		-e "/^CXX/ s/=.*$/= '$(tc-getCXX)'/" \
+		-e 's/PlatformInfo.debugging_cflags//' build/basics.rb || die
+
+	# Avoid fixed debugging CFLAGs.
+	sed -e '/debugging_cflags/areturn ""' -i lib/phusion_passenger/platform_info/compiler.rb || die
+
+	# Use sed here so that we can dynamically set the documentation directory.
+	sed -i -e "s:/usr/share/doc/passenger:/usr/share/doc/${P}:" \
+		-e "s:/usr/lib/apache2/modules/mod_passenger.so:${APACHE_MODULESDIR}/mod_passenger.so:" \
+		-e "s:/usr/lib/phusion-passenger/agents:/usr/libexec/phusion-passenger/agents:" \
+		lib/phusion_passenger.rb || die
+	sed -i -e "s:/usr/lib/phusion-passenger/agents:/usr/libexec/phusion-passenger/agents:" ext/common/ResourceLocator.h || die
+
+	# Don't install a tool that won't work in our setup.
+	sed -i -e '/passenger-install-apache2-module/d' lib/phusion_passenger/packaging.rb || die
+	rm -f bin/passenger-install-apache2-module || die "Unable to remove unneeded install script."
+
+	# Make sure we use the system-provided version where possible
+	rm -rf ext/libuv || die "Unable to remove vendored code."
+
+	# Avoid building documentation to avoid a dependency on mizuho.
+	#sed -i -e 's/, :doc//' build/packaging.rb || die
+	touch doc/*.html || die
+
+	# Use the correct arch-specific lib directory
+	sed -i -e 's:/usr/lib/:/usr/'$(get_libdir)'/:' build/packaging.rb || die
+
+	# Fix hard-coded use of AR
+	sed -i -e "s/ar cru/"$(tc-getAR)" cru/" build/cplusplus_support.rb || die
+}
+
+all_ruby_compile() {
+	V=1 EXTRA_LDFLAGS="${LDFLAGS}" \
+	APXS2="${APXS}" \
+	HTTPD="${APACHE_BIN}" \
+	USE_VENDORED_LIBUV="no" LIBUV_LIBS="-luv" \
+	ruby -S rake apache2 || die "rake failed"
+}
+
+each_ruby_compile() {
+	append-flags -fno-strict-aliasing
+
+	V=1 EXTRA_LDFLAGS="${LDFLAGS}" \
+	APXS2="${APXS}" \
+	HTTPD="${APACHE_BIN}" \
+	USE_VENDORED_LIBUV="no" LIBUV_LIBS="-luv" \
+	${RUBY} -S rake native_support || die "rake failed"
+}
+
+all_ruby_install() {
+	APACHE2_MOD_FILE="${S}/buildout/apache2/mod_${PN}.so"
+	apache-module_src_install
+
+	# Patch in the correct libdir
+	sed -i -e 's:/usr/lib/:/usr/'$(get_libdir)'/:' "${D}${APACHE_MODULES_CONFDIR}/30_mod_${PN}.conf" || die
+
+	dodoc CHANGELOG README.md
+}
+
+each_ruby_install() {
+	DISTDIR="${D}" \
+	RUBYLIBDIR="$(ruby_rbconfig_value vendordir)" \
+	RUBYARCHDIR="$(ruby_rbconfig_value archdir)" \
+	APXS2="${APXS}" \
+	HTTPD="${APACHE_BIN}" \
+	EXTRA_LDFLAGS="${LDFLAGS}" \
+	USE_VENDORED_LIBUV="no" LIBUV_LIBS="-luv" \
+	${RUBY} -S rake fakeroot || die "rake failed"
+}
diff --git a/www-apache/pwauth/metadata.xml b/www-apache/pwauth/metadata.xml
index f0b4684da6fe..a185bd752093 100644
--- a/www-apache/pwauth/metadata.xml
+++ b/www-apache/pwauth/metadata.xml
@@ -1,12 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
+	<maintainer>
+		<email>maintainer-needed@gentoo.org</email>
+	</maintainer>
 	<use>
-		<flag name='domain-aware'>Ignore leading domain names in username
+		<flag name="domain-aware">Ignore leading domain names in username
 			(Windows compat)</flag>
-		<flag name='faillog'>Log failed login attempts</flag>
-		<flag name='ignore-case'>Ignore string case in username (mostly Windows
+		<flag name="faillog">Log failed login attempts</flag>
+		<flag name="ignore-case">Ignore string case in username (mostly Windows
 			compat)</flag>
 	</use>
+	<upstream>
+		<remote-id type="github">phokz/pwauth</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/www-apps/guacamole/Manifest b/www-apps/guacamole/Manifest
index 4c298cb3bda1..4e11870267f4 100644
--- a/www-apps/guacamole/Manifest
+++ b/www-apps/guacamole/Manifest
@@ -1,16 +1,20 @@
 DIST guacamole-auth-jdbc-0.9.7.tar.gz 2997194 SHA256 f112c0ab83e4253f3a914716c5a7e61c4d7dc64d724e7c11bb4b695f386474a5 SHA512 0bfa920fed4b5baabc6f5541d9a5badc0a88c51e95675f00889d9d6f7a2069b07f0bee4ed628b82a4c243dd0a8fb1646a5ba6f822ca5704b1f60b49f3a2fd698 WHIRLPOOL 013ad62f68050b8c431565fa375e6c3c50e2cd1b962b6409c3b79f8652f021f71139de6facf3cd4195b34067ad01fba33bc980bbe4d50d8cc3d7f984555396c9
+DIST guacamole-auth-jdbc-0.9.8.tar.gz 7018542 SHA256 7a4026e1cc3cb08bf4b7c265c91df62a616560b21ec14bbde32f5c52bd0e928a SHA512 c1c1a4f0f33a46108a45c826ad075825846838ad05205579024820f4737db6c96e35c5be3d20c78a0e088cecc08738369bdcf00c6efd43307848a71c710aa394 WHIRLPOOL d05038376e7f5cb1722c0e05a5a70892341806de27cf107c99e6545f3e7d239ff2ea6b7eb3b528099dfd764ff9b79a01e038e7c37ca008f7f502d752b323d836
 DIST guacamole-auth-ldap-0.8.0.tar.gz 382872 SHA256 745e7541ab5db9decb463a7358e17c13cab5843d8458e0bf04f5a8eda8f19064 SHA512 2e775de3757b0e161fd7c6ac19982763bbafec42fef3418cb469cf3cb6bf1783b01486fe28e5a250af7b67107a5c3c73e2ad2b10a4e49b3ca187e76e2b578776 WHIRLPOOL df9a926df2f2a095a816234b6499640149e81acb4b6610d94ff8588e28ae9eaace8c0ca1808d1522aa55531674c53cbc6b5f55f606d7af73918610c9eb095ecf
 DIST guacamole-auth-ldap-0.9.0.tar.gz 382885 SHA256 b9e0440202a4106b6fd0a8cdd9da7bfa476895ce8724edc7d75e80b89bca9780 SHA512 caf228029a4e69ac1ac1f252c761167c1676eadbb362877753710aa28d274f76ed8091102f5a142b871dc7a7e22f98d113c18fa06e46dfbf6ec57c3ea92b435b WHIRLPOOL 3f674c98c6c0bf068426f3c78947f1f09fecc19d55a341b58f9adde8920bc30722077feed7f293d082009991bc08ab8cbddba2569a65e05fcc39b8a91f5f875f
 DIST guacamole-auth-ldap-0.9.2.tar.gz 382892 SHA256 478b0f5a3f9df0de4614b0432707cad443ea9f65ad219cffe904c6a91177250c SHA512 7ff6ed8aeac872aebfe654992208342370f991eabd141ac102ea553cc94b8c69c382344b5c8419745bcdc8f83b77d9b72577c8ddef9e2d000549a5fb1ae70617 WHIRLPOOL 846a673f1d61294b201d95160e2979254537fe80ffbbdc00756ee6202dd9886807a9c1f4b8f60653c528776a5c852cc7382cd14dec624aa10934fbf04e4a4584
 DIST guacamole-auth-ldap-0.9.3.tar.gz 382919 SHA256 0502e3d4e8512fbdd12b144285badfe2cd0b02fa9b0072b0b9772076998c8156 SHA512 e3eebeafd841d304f4c2beb21c1d54327bf0af2201794685c008d1812f05e70c8389888eec1e417c7e08600ebaf6f7f7330cddcf5176c9a12c987ba516155ebe WHIRLPOOL c7d2869d4ede53478cf55be4825dfdae4f47a7c03113e79dbf17afd190c823279f9967c2fefd518de0858484151901e5c3d4592ef3ffcb241c50949d59643068
 DIST guacamole-auth-ldap-0.9.7.tar.gz 384154 SHA256 479307fc54c20f0e4c661e135c0ad7251b3601054adbccdab2b7638cfa9c40bd SHA512 e750a89059a247ac17c7d137f8b7e03f43673a82559b91a39d0d1e69c94bb8212f7a17c335ec69f3c7d892c8ad0aaa746f50dfd247202468fc6c880e9126f1d2 WHIRLPOOL bdce95eb5d8a07de539dd44e55b6b44b746d0d3b12c7caba3c205ae584bdc69a83e5d05b753a650367fb2e172bd42eea0e3a21d3ef61f9e2cb35b8a028ac203c
+DIST guacamole-auth-ldap-0.9.8.tar.gz 1055810 SHA256 712d7462368b690ddecd26a9bac926f9f307c84a63d8af622996d29fea71c99b SHA512 b13947581dfad5b25a423369867c1a98327fd9a6a2124c12fe16c68700caefec217f18d01a1436419cb60dd43bb7f2126f5e47f3aebd069b2ce6a46759c0b402 WHIRLPOOL 270991364222ea8f0202cc0fb76c129859f717e24bd3e1653a880562d077eb9368d8e56f327f60b07f7c2d615b2981dcc604261288cd90630b53087a738369d6
 DIST guacamole-auth-mysql-0.8.2.tar.gz 2101795 SHA256 26902d50237a5bcb65b5dc9e31e7c51d6318614b97200c58c030a655e57aed82 SHA512 9bc5e7a5750d52a3df288088fa331f9e442cea06abf704df3989e714daba03e20b07ff5c531b4966ccc2f50c49124b9b7819447330d3be9ac5cce79c368663c6 WHIRLPOOL bce4711ca03315feb770cd82f07b4370ea8ff74ca38a952827b36428150ee31c3e6deaf633fd7e256047ccf9e361e80b2d46248e5f2f6c3f896363b2e2badd13
 DIST guacamole-auth-mysql-0.9.0.tar.gz 2104231 SHA256 5419d62a8decae579b54773ed70c8f21b03c11a53c24de982e8f84a79d74423e SHA512 00cc09e75f8c977a2465759b97022007fe34ba9272f9b9004eec404419a68b8c0b301fc385b4f09af07bde82510a6f5b808585c78a61b26cabd98529a5b1c4fa WHIRLPOOL cacb8ee6387b43b0c4fd5c473680404828acc8cbdee219930043ef2f18857ca53b1502e8a650f0cbc6a4a2dfbb42d457991043a4823445e261eb2dc53aad9601
 DIST guacamole-auth-mysql-0.9.2.tar.gz 2104317 SHA256 74567dcb03f2b4bbe059a8270c568ccf54a0a0ed8491de4ed2c3500cde0eabc3 SHA512 4422358b1ced34ca468f130807da6f8d7c65f39a0c3e1c7eecf004803ca62ccccda07b5a7a2b72f4b4e8337ad60783e5514af6318c2cc38f37397ba14cd2f552 WHIRLPOOL cc9583781f53110fd53e4f5dd6e2fc24fdd8a1c160fc674db4694ca3517b20846f43e0bb1a172378982303d03e4be8b2cb3a9e0e5e7c52a4d0f708b4da3766f1
 DIST guacamole-auth-mysql-0.9.3.tar.gz 2104479 SHA256 1cd081758b81b7cc082c383c7c2804434cb90ce609f5d02ed5c48fdcd50d13e6 SHA512 b33e1228b261e3857c385260a15f7b3b6088bdcaf2785f837b9525c5469a7af6560610c8064614b438160d98e349487037d78c11737dbef6a83be6b41bd37e4c WHIRLPOOL 371617fecb15b193cb51a3f76896982365e7d1d4c394021eeaec5281f57ce885517240842ce30f9543b002db71907ae550173b8ba75f19c866f297c3c52985a5
 DIST guacamole-auth-noauth-0.9.7.tar.gz 5810 SHA256 0ff433a73dcbc014cc5c7269f408ef01d02ab0d743f4b45a868b0f98a38d61ba SHA512 1f5e6f0b9e035c75edc556ff47a73e8e6e047369306e00e1281a97ac4896c7563b41dfbd66c89926d972e01a5aee3fdd9c0214d91cb84a83f177a4e3df05d537 WHIRLPOOL 7b75d883f6785bee4470cc3dee70e964c36447c0d1434c785e23b2d5bed8b18b3488c04dc4f8ae04f5a12dd54ba88ac7035acea99cd89e855ff264b1c548a09f
+DIST guacamole-auth-noauth-0.9.8.tar.gz 6011 SHA256 3e3c060b37e6fd606b489ffb8b048749208d4124e075e42fb2b1cfe556cf4d4b SHA512 481f7ee88cbc7989734afb23cb9807d2cab71846ecdd17475f0e24afab5d3cd82040d5f448abe3eb01bfd828b9d834a753e0f0ec573b8b8c863fe5e2718ad1a2 WHIRLPOOL 8ad6bb47e47fe3f7e905e4f4e44a41affbe890a38d066357f255006ce0879f29a509255a750d2fae4a3d5e295e1f78fcd8898b22cd03060c2252df9d09859624
 DIST guacamole-client-0.8.3.tar.gz 345097 SHA256 a2e3d96b9f83308caf35068d657882fff9c3977533bb3b125cda1971422112ce SHA512 395ffbb08b877e4af538b1d0859d8e28e3352f2fe41482e7790c9b3c7597f37882ca032d383c7994d5f2e193404c5c267cdf793d642fb551e04465edfe93d7f0 WHIRLPOOL 19a778b40b7220604a7c5ecd93fa8a7680b7efadf304ffb5b747dad52bbf6dffdeed5a16c26cdd3773b6a0a155b7ba23a76b3233bdd2d658c0dc71a4a86ada80
 DIST guacamole-client-0.9.0.tar.gz 314566 SHA256 2f98776e542fccdeb3a120ae266834e56935a30196d0c3088a8fa523a07f3594 SHA512 33dd583cde9188066f0254fe9a531886be79110ef9f0e62fc60771d2751a927f783eb484e5484760e4ed3bc2aaa1f2000f43f953b78122cbdc2b0f19d8141457 WHIRLPOOL 972ea5c2bfe7f7dc2b1cc42ca6bc49485c18e46b161180e6eddf828467dcce76cae58f89ca0a4e847ab33ebb0ee2ffa87b052c94a9707d8b1538cc3f1ac29c20
 DIST guacamole-client-0.9.2.tar.gz 386263 SHA256 c12f9b1b32621cc44d1e428d71eac5798f85f6b8df23edd3920907678205084c SHA512 e9e73b23b64883c64a1bd0908ecc9e685dc23308c3d44bd2c9c691e43fe383424bfc14816d0248b0f2a693da473a3a780a2d2469024aae53587b67f78d0b0af6 WHIRLPOOL 5a25e9942c9d9067bfad063833f89cc003ad8ba99c1ad1a2fd49d901f3c3616dac974f6abc67a4854129ea5160a7f7194a6b3e72e4741b0ff9a71025f57f229f
 DIST guacamole-client-0.9.3.tar.gz 396313 SHA256 e579ef8f5271c19955429b9d064fd58f7554031c078557c1d65e5d51f695d8d1 SHA512 4ec3ec74b1175ce6b3cde4b9669a3f54f21b45c489c592ea3cabd2af670bf0ec9449f8a368d416640ed7348e77c23ad05243b4fdff083a120f432053642f7727 WHIRLPOOL cb44f374acce366964554cd192440cd4eb71e6b5364bff31a853a7769becce34a608358c204702702220e602cf94732af59ab707b4fb38452cbc78fca541829f
 DIST guacamole-client-0.9.7.tar.gz 1580766 SHA256 905c32cb26844d7fca2a135cc6fcbc5017da7a71df5d4fed01786fe404ab9883 SHA512 eb9d9be14e9a55192c2e341fbd9b07d3cf1b3f4f06dbe97cdb5ca5d624362a895a6369100859716d9cf65562fa251424c9b3a36c2a7d4812bfb2814ab96dc5c3 WHIRLPOOL fbdade073fd2be4ea442d1b604f623a1e0046d744b86447e1eabc42643aae70eec62b596e2e014b294f14377c5823a42a498b75c06ded70346446b4ccc9c72b4
+DIST guacamole-client-0.9.8.tar.gz 1685223 SHA256 115107d4404a96abb122e5e4c06071adfe60bdd6bc7ff949dc537578f98e7f8b SHA512 e8152a10c8c51b0adff93ee476287e3c264ddae4de4b581a43009d8613e8cc2276ddd1ff5a53e84d74ff19901ec82433321d176e1335b4445dcbed04afe6f9f8 WHIRLPOOL 3daf2ac277f12360914c8cea0752a146d944ff8eaba01bfade5e8863b5e7d0da2163767b732b6f96120c4bfb2ab2f3eaa38fa700663b114684de12a311cd7411
diff --git a/www-apps/guacamole/guacamole-0.9.8.ebuild b/www-apps/guacamole/guacamole-0.9.8.ebuild
new file mode 100644
index 000000000000..0e27996d9064
--- /dev/null
+++ b/www-apps/guacamole/guacamole-0.9.8.ebuild
@@ -0,0 +1,126 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils
+DESCRIPTION="Guacamole is a html5 vnc client as servlet"
+HOMEPAGE="http://guac-dev.org/"
+SRC_URI="mirror://sourceforge/${PN}/${PN}-client-${PV}.tar.gz
+	mysql? ( http://sourceforge.net/projects/${PN}/files/current/extensions/${PN}-auth-jdbc-${PV}.tar.gz )
+	postgres? ( http://sourceforge.net/projects/${PN}/files/current/extensions/${PN}-auth-jdbc-${PV}.tar.gz )
+	noauth? ( http://sourceforge.net/projects/${PN}/files/current/extensions/${PN}-auth-noauth-${PV}.tar.gz )
+	ldap? ( http://sourceforge.net/projects/guacamole/files/current/extensions/${PN}-auth-ldap-${PV}.tar.gz )"
+S="${WORKDIR}/${PN}-client-${PV}"
+
+LICENSE="MIT"
+
+SLOT="0"
+
+KEYWORDS="~x86 ~amd64"
+
+IUSE="ldap mysql postgres noauth"
+
+DEPEND="dev-java/maven-bin:*"
+
+RDEPEND="${DEPEND}
+	www-servers/tomcat[websockets]
+	>virtual/jre-1.6
+	net-misc/guacamole-server
+	mysql? ( virtual/mysql )
+	postgres? ( dev-db/postgresql )
+	ldap? ( net-nds/openldap )"
+
+src_compile() {
+	mkdir "${HOME}"/.m2
+	cat /usr/share/`readlink /usr/bin/mvn | sed 's:mvn:maven-bin:'`/conf/settings.xml | \
+	sed -e 's:/path/to/local/repo:'${HOME}/.m2':g' -e 's:<!-- localRepo::' >"${S}"/settings.xml
+	mvn -s "${S}"/settings.xml package
+}
+
+src_install() {
+	echo guacd-hostname: localhost >>"${S}/${PN}/doc/example/${PN}.properties"
+	echo guacd-port:     4822 >>"${S}/${PN}/doc/example/${PN}.properties"
+	echo basic-user-mapping: /etc/guacamole/user-mapping.xml >>"${S}/${PN}/doc/example/${PN}.properties"
+	if use noauth; then
+		sed -e 's:basic-user-mapping:#basic-user-mapping:' -i "${S}/${PN}/doc/example/${PN}.properties"
+		echo noauth-config: /etc/guacamole/noauth-config.xml  >>"${S}/${PN}/doc/example/${PN}.properties"
+		insinto "/etc/${PN}/extensions"
+		find "${WORKDIR}/${PN}-auth-noauth-${PV}/" -name '*.jar' -exec doins '{}' +
+		insinto "/etc/guacamole"
+		find "${WORKDIR}/${PN}-auth-noauth-${PV}/doc/example/" -name '*.xml' -exec doins '{}' +
+		elog "Warning: Setting No Authentication is obviously very insecure! Only use it if you know what you are doing!"
+	fi
+	if use mysql; then
+		echo mysql-hostname: localhost >>"${S}/${PN}/doc/example/${PN}.properties"
+		echo mysql-port: 3306 >>"${S}/${PN}/doc/example/${PN}.properties"
+		echo mysql-database: guacamole >>"${S}/${PN}/doc/example/${PN}.properties"
+		echo mysql-username: guacamole >>"${S}/${PN}/doc/example/${PN}.properties"
+		echo mysql-password: some_password >>"${S}/${PN}/doc/example/${PN}.properties"
+		sed -e 's:basic-user-mapping:#basic-user-mapping:' -i "${S}/${PN}/doc/example/${PN}.properties"
+		insinto "/etc/${PN}/extensions"
+		find "${WORKDIR}/${PN}-auth-jdbc-${PV}/mysql/" -name '*.jar' -exec doins '{}' +
+		insinto "/usr/share/${PN}/schema"
+		find "${WORKDIR}/${PN}-auth-jdbc-${PV}/mysql/schema/" -name '*.sql' -exec doins '{}' +
+		insinto "/usr/share/${PN}/schema/upgrade"
+		find "${WORKDIR}/${PN}-auth-jdbc-${PV}/mysql/schema/upgrade/" -name '*.sql' -exec doins '{}' +
+		elog "Please add a mysql database and a user and load the sql files in /usr/share/guacamole/schema/ into it."
+		elog "If this is an update, then you will need to apply the appropriate update script in the location above."
+		elog "You will also need to adjust the DB propeties in /etc/guacamole.properties!"
+		elog "The default user and it's password is \"guacadmin\"."
+		elog "You will also need to download the mysql-connector from here http://dev.mysql.com/downloads/connector/j/"
+		elog "and put the contained .jar file into /etc/guacamole/lib!"
+		elog "-"
+	fi
+	if use postgres; then
+		echo postgresql-hostname: localhost >>"${S}/${PN}/doc/example/${PN}.properties"
+		echo postgresql-port: 5432 >>"${S}/${PN}/doc/example/${PN}.properties"
+		echo postgresql-database: guacamole >>"${S}/${PN}/doc/example/${PN}.properties"
+		echo postgresql-username: guacamole >>"${S}/${PN}/doc/example/${PN}.properties"
+		echo postgresql-password: some_password >>"${S}/${PN}/doc/example/${PN}.properties"
+		sed -e 's:basic-user-mapping:#basic-user-mapping:' -i "${S}/${PN}/doc/example/${PN}.properties"
+		insinto "/etc/${PN}/extensions"
+		find "${WORKDIR}/${PN}-auth-jdbc-${PV}/postgresql/" -name '*.jar' -exec doins '{}' +
+		insinto "/usr/share/${PN}/schema"
+		find "${WORKDIR}/${PN}-auth-jdbc-${PV}/postgresql/schema/" -name '*.sql' -exec doins '{}' +
+		insinto "/usr/share/${PN}/schema/upgrade"
+		find "${WORKDIR}/${PN}-auth-jdbc-${PV}/postgresql/schema/upgrade/" -name '*.sql' -exec doins '{}' +
+		elog "Please add a postgresql database and a user and load the sql files in /usr/share/guacamole/schema/ into it."
+		elog "If this is an update, then you will need to apply the appropriate update script in the location above."
+		elog "You will also need to adjust the DB propeties in /etc/guacamole.properties!"
+		elog "The default user and it's password is \"guacadmin\"."
+		elog "You will also need to download the postgresql-connector from here https://jdbc.postgresql.org/download.html#current"
+		elog "and put the contained .jar file into /etc/guacamole/lib!"
+		elog "-"
+	fi
+	if use ldap; then
+		echo ldap-hostname: localhost >>"${S}/${PN}/doc/example/${PN}.properties"
+		echo ldap-port: 389 >>"${S}/${PN}/doc/example/${PN}.properties"
+		echo ldap-user-base-dn: ou=people,dc=example,dc=net >>"${S}/${PN}/doc/example/${PN}.properties"
+		echo ldap-username-attribute: uid >>"${S}/${PN}/doc/example/${PN}.properties"
+		echo ldap-config-base-dn: ou=groups,dc=example,dc=net >>"${S}/${PN}/doc/example/${PN}.properties"
+		sed -e 's:basic-user-mapping:#basic-user-mapping:' -i "${S}/${PN}/doc/example/${PN}.properties"
+		insinto "/etc/${PN}/extensions"
+		find "${WORKDIR}/${PN}-auth-ldap-${PV}" -name '*.jar' -exec doins '{}' +
+		insinto "/usr/share/${PN}/schema"
+		doins "${WORKDIR}/${PN}-auth-ldap-${PV}/schema/guacConfigGroup.ldif" "${WORKDIR}/${PN}-auth-ldap-${PV}/schema/guacConfigGroup.schema"
+		elog "You will need to add and load the .schema file in /usr/share/guacamole/schema/ to your ldap server."
+		elog "There is also an example .lidf file for creating the users."
+		elog "-"
+	fi
+	insinto "/etc/${PN}"
+	doins "${WORKDIR}/${PN}-client-${PV}/${PN}/doc/example/user-mapping.xml"
+	insinto "/etc/${PN}"
+	doins "${S}/${PN}/doc/example/guacamole.properties"
+	echo "GUACAMOLE_HOME=/etc/guacamole" >98guacamole
+	doenvd 98guacamole
+	insinto "/var/lib/${PN}"
+	newins "${S}/${PN}/target/${P}.war" "${PN}.war"
+	elog "If it is an update, please make sure to delete the old webapp in /var/lib/tomcat-7/webapps/ first!"
+	elog "To deploy guacamole with tomcat, you will need to link the war file and create the configuration!"
+	elog "ln -sf /var/lib/${PN}/${PN}.war /var/lib/tomcat-7/webapps/"
+	elog "You will also need to adjust the configuration in /etc/${PN}/${PN}.properties"
+	elog "See http://guac-dev.org/doc/${PV}/gug/configuring-guacamole.html#initial-setup for a basic setup"
+	elog "or http://guac-dev.org/doc/${PV}/gug/jdbc-auth.html for a database for authentication and host definitions."
+}
diff --git a/www-apps/hiawatha-monitor/Manifest b/www-apps/hiawatha-monitor/Manifest
index 30c029321910..a3c3d74f9cda 100644
--- a/www-apps/hiawatha-monitor/Manifest
+++ b/www-apps/hiawatha-monitor/Manifest
@@ -1,2 +1,3 @@
 DIST monitor-1.0.tar.gz 455196 SHA256 33ce03254464fbabe40c22a7614ae89c227bb9abd5f32988d22ba5068ddda3d9 SHA512 02f97c8d11f90256613ca0437ec195f5f47695228ddb0e4615f7acbc06e2c1b60c52253a716f7560b704fa300fe4022cee7824e084c91d93cf1fcb2912012b93 WHIRLPOOL 7343f032de2f0d6c6550b21f2f9af243dd36bfdc24967561ce47bd11d03e07d3a808bf158c50f410cb06709dd852042f7e912b6f3b8e57ab96397125fb505b57
 DIST monitor-1.2.tar.gz 624099 SHA256 c951c5322632920f8f5609a5b1f2bc1bf2c8a161cac16d8869e9caebd22f030f SHA512 0dd546537563aac74a5cb2a894e930a675f3ac74723cf35f756cc33b690f4dc6ebe2d3ce8e41134ec906a5ba8db343456c5871b5d43fe9ddde2f257c3d7f94b7 WHIRLPOOL 9df543b8c3b5ca5ce9151c4eac274fd6d291ff0e3e2365887da29f5a846742740093b54e2cbe44f3110dbdd789da0e24ad04b130d3aa7629b63e7c0ccddfcc79
+DIST monitor-1.3.tar.gz 588836 SHA256 31c580f476f516b9de54d7fa6c57f0f7b4f58268c68a41a823c5a00129d8cdda SHA512 480ef2d2216a47a7b5758e2ceb089233b5f5b3174460a2b7b43f006c76ce9e12a592574d23b6661b7a5408333a40d6867eee3417ea4aa1a9a0c82772114a21b1 WHIRLPOOL b516e271141e245b5a6875f3fa706b83547211371544246ba275d6c045708454dd519acc111873ca3bb7efb267013b715515923e75b7e76002dbeff75f27ab58
diff --git a/www-apps/hiawatha-monitor/hiawatha-monitor-1.3.ebuild b/www-apps/hiawatha-monitor/hiawatha-monitor-1.3.ebuild
new file mode 100644
index 000000000000..b83521b6afcb
--- /dev/null
+++ b/www-apps/hiawatha-monitor/hiawatha-monitor-1.3.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+MY_P="monitor"
+
+DESCRIPTION="Monitoring application for www-servers/hiawatha"
+HOMEPAGE="http://www.hiawatha-webserver.org/howto/monitor"
+SRC_URI="http://www.hiawatha-webserver.org/files/${MY_P}-${PV}.tar.gz "
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="=dev-lang/php-5*[mysql,xslt]
+	virtual/cron
+	virtual/mysql
+	www-servers/hiawatha[xslt]"
+
+S=${WORKDIR}/${MY_P}
+
+src_install () {
+	default
+
+	rm -f ChangeLog README LICENSE
+
+	insinto /usr/share/${PN}
+	doins -r *
+}
diff --git a/www-apps/horizon/Manifest b/www-apps/horizon/Manifest
deleted file mode 100644
index debd0c823190..000000000000
--- a/www-apps/horizon/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST horizon-2014.1.3.tar.gz 3339100 SHA256 bc220a7cbaeec30681aa55d7eed91fa67505ce31cc1fc904f401ee5e07133997 SHA512 41c6fb097791ab39cde104e5532a0b05011db937421f9162696c0444d776b1beea3755c20e1531108cabf8713b1f43c2d8e76dc2e49ffc552fa0a2fdcb92ed3c WHIRLPOOL c6501d893295ef2202e75bb6a4958ac68862cda97ca49037617960f49344d212e39ab9e37e213d8f51f521baba586425f0d996cf53b4465a05517f40e069efa4
diff --git a/www-apps/horizon/horizon-2014.1.3.ebuild b/www-apps/horizon/horizon-2014.1.3.ebuild
deleted file mode 100644
index 6b2990c40088..000000000000
--- a/www-apps/horizon/horizon-2014.1.3.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="A Django-based project aimed at providing a complete OpenStack Dashboard"
-HOMEPAGE="https://launchpad.net/horizon"
-SRC_URI="https://launchpad.net/${PN}/icehouse/${PV}/+download/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-		>=dev-python/pbr-0.6.0[${PYTHON_USEDEP}]
-		<dev-python/pbr-1.0[${PYTHON_USEDEP}]
-	test? ( >=dev-python/hacking-0.8.0[${PYTHON_USEDEP}]
-			<dev-python/hacking-0.9[${PYTHON_USEDEP}]
-			>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
-			dev-python/django-nose[${PYTHON_USEDEP}]
-			~dev-python/docutils-0.9.1[${PYTHON_USEDEP}]
-			>=dev-python/mox-0.5.3[${PYTHON_USEDEP}]
-			dev-python/nose[${PYTHON_USEDEP}]
-			dev-python/nose-exclude[${PYTHON_USEDEP}]
-			>=dev-python/nosehtmloutput-0.0.3[${PYTHON_USEDEP}]
-			dev-python/nosexcover[${PYTHON_USEDEP}]
-			>=dev-python/openstack-nose-plugin-0.7[${PYTHON_USEDEP}]
-			dev-python/oslo-sphinx[${PYTHON_USEDEP}]
-			dev-python/selenium[${PYTHON_USEDEP}]
-			>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
-			<dev-python/sphinx-1.1.9999[${PYTHON_USEDEP}]
-			>=dev-python/testtools-0.9.34[${PYTHON_USEDEP}]
-	)"
-RDEPEND=">=dev-python/django-1.4[${PYTHON_USEDEP}]
-		<dev-python/django-1.7[${PYTHON_USEDEP}]
-		>=dev-python/django-compressor-1.3[${PYTHON_USEDEP}]
-		>=dev-python/django-openstack-auth-1.1.4[${PYTHON_USEDEP}]
-		!~dev-python/django-openstack-auth-1.1.6[${PYTHON_USEDEP}]
-		>=dev-python/eventlet-0.13.0[${PYTHON_USEDEP}]
-		>=dev-python/httplib2-0.7.5[${PYTHON_USEDEP}]
-		>=dev-python/iso8601-0.1.9[${PYTHON_USEDEP}]
-		>=dev-python/kombu-2.4.8[${PYTHON_USEDEP}]
-		>=dev-python/lesscpy-0.9j[${PYTHON_USEDEP}]
-		>=dev-python/lockfile-0.8[${PYTHON_USEDEP}]
-		>=dev-python/netaddr-0.7.6[${PYTHON_USEDEP}]
-		>=dev-python/python-ceilometerclient-1.0.6[${PYTHON_USEDEP}]
-		>=dev-python/python-cinderclient-1.0.6[${PYTHON_USEDEP}]
-		>=dev-python/python-glanceclient-0.9.0[${PYTHON_USEDEP}]
-		>=dev-python/python-heatclient-0.2.3[${PYTHON_USEDEP}]
-		>=dev-python/python-keystoneclient-0.7.0[${PYTHON_USEDEP}]
-		>=dev-python/python-neutronclient-2.3.4[${PYTHON_USEDEP}]
-		<dev-python/python-neutronclient-3[${PYTHON_USEDEP}]
-		>=dev-python/python-novaclient-2.17.0[${PYTHON_USEDEP}]
-		>=dev-python/python-swiftclient-1.6[${PYTHON_USEDEP}]
-		>=dev-python/python-troveclient-1.0.3[${PYTHON_USEDEP}]
-		>=dev-python/pytz-2010h[${PYTHON_USEDEP}]
-		>=dev-python/six-1.6.0[${PYTHON_USEDEP}]"
-
-PATCHES=(
-)
-
-src_test() {
-	./run_tests.sh -N --coverage
-}
diff --git a/www-apps/horizon/horizon-2014.1.9999.ebuild b/www-apps/horizon/horizon-2014.1.9999.ebuild
deleted file mode 100644
index 230b073ebea8..000000000000
--- a/www-apps/horizon/horizon-2014.1.9999.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 git-2
-
-DESCRIPTION="A Django-based project aimed at providing a complete OpenStack Dashboard"
-HOMEPAGE="https://launchpad.net/horizon"
-EGIT_REPO_URI="https://github.com/openstack/horizon.git"
-EGIT_BRANCH="stable/icehouse"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS=""
-IUSE="test"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-		>=dev-python/pbr-0.6.0[${PYTHON_USEDEP}]
-		<dev-python/pbr-1.0[${PYTHON_USEDEP}]
-	test? ( >=dev-python/hacking-0.8.0[${PYTHON_USEDEP}]
-			<dev-python/hacking-0.9[${PYTHON_USEDEP}]
-			>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
-			dev-python/django-nose[${PYTHON_USEDEP}]
-			~dev-python/docutils-0.9.1[${PYTHON_USEDEP}]
-			>=dev-python/mox-0.5.3[${PYTHON_USEDEP}]
-			dev-python/nose[${PYTHON_USEDEP}]
-			dev-python/nose-exclude[${PYTHON_USEDEP}]
-			>=dev-python/nosehtmloutput-0.0.3[${PYTHON_USEDEP}]
-			dev-python/nosexcover[${PYTHON_USEDEP}]
-			>=dev-python/openstack-nose-plugin-0.7[${PYTHON_USEDEP}]
-			dev-python/oslo-sphinx[${PYTHON_USEDEP}]
-			dev-python/selenium[${PYTHON_USEDEP}]
-			>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
-			<dev-python/sphinx-1.1.9999[${PYTHON_USEDEP}]
-			>=dev-python/testtools-0.9.34[${PYTHON_USEDEP}]
-	)"
-RDEPEND=">=dev-python/django-1.4[${PYTHON_USEDEP}]
-		<dev-python/django-1.7[${PYTHON_USEDEP}]
-		>=dev-python/django-compressor-1.3[${PYTHON_USEDEP}]
-		>=dev-python/django-openstack-auth-1.1.4[${PYTHON_USEDEP}]
-		!~dev-python/django-openstack-auth-1.1.6[${PYTHON_USEDEP}]
-		>=dev-python/eventlet-0.13.0[${PYTHON_USEDEP}]
-		>=dev-python/httplib2-0.7.5[${PYTHON_USEDEP}]
-		>=dev-python/iso8601-0.1.9[${PYTHON_USEDEP}]
-		>=dev-python/kombu-2.4.8[${PYTHON_USEDEP}]
-		>=dev-python/lesscpy-0.9j[${PYTHON_USEDEP}]
-		>=dev-python/lockfile-0.8[${PYTHON_USEDEP}]
-		>=dev-python/netaddr-0.7.6[${PYTHON_USEDEP}]
-		>=dev-python/python-ceilometerclient-1.0.6[${PYTHON_USEDEP}]
-		>=dev-python/python-cinderclient-1.0.6[${PYTHON_USEDEP}]
-		>=dev-python/python-glanceclient-0.9.0[${PYTHON_USEDEP}]
-		>=dev-python/python-heatclient-0.2.3[${PYTHON_USEDEP}]
-		>=dev-python/python-keystoneclient-0.7.0[${PYTHON_USEDEP}]
-		>=dev-python/python-neutronclient-2.3.4[${PYTHON_USEDEP}]
-		<dev-python/python-neutronclient-3[${PYTHON_USEDEP}]
-		>=dev-python/python-novaclient-2.17.0[${PYTHON_USEDEP}]
-		>=dev-python/python-swiftclient-1.6[${PYTHON_USEDEP}]
-		>=dev-python/python-troveclient-1.0.3[${PYTHON_USEDEP}]
-		>=dev-python/pytz-2010h[${PYTHON_USEDEP}]
-		>=dev-python/six-1.6.0[${PYTHON_USEDEP}]"
-
-PATCHES=(
-)
-
-src_test() {
-	./run_tests.sh -N --coverage
-}
diff --git a/www-apps/horizon/horizon-9999.ebuild b/www-apps/horizon/horizon-9999.ebuild
deleted file mode 100644
index 201b2f47f422..000000000000
--- a/www-apps/horizon/horizon-9999.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 git-2
-
-DESCRIPTION="A Django-based project aimed at providing a complete OpenStack Dashboard"
-HOMEPAGE="https://launchpad.net/horizon"
-EGIT_REPO_URI="https://github.com/openstack/horizon.git"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS=""
-IUSE="test"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-		>=dev-python/pbr-0.6.0[${PYTHON_USEDEP}]
-		<dev-python/pbr-1.0[${PYTHON_USEDEP}]
-	test? ( >=dev-python/hacking-0.8.0[${PYTHON_USEDEP}]
-			<dev-python/hacking-0.9[${PYTHON_USEDEP}]
-			>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
-			dev-python/django-nose[${PYTHON_USEDEP}]
-			~dev-python/docutils-0.9.1[${PYTHON_USEDEP}]
-			>=dev-python/mox-0.5.3[${PYTHON_USEDEP}]
-			dev-python/nose[${PYTHON_USEDEP}]
-			dev-python/nose-exclude[${PYTHON_USEDEP}]
-			>=dev-python/nosehtmloutput-0.0.3[${PYTHON_USEDEP}]
-			dev-python/nosexcover[${PYTHON_USEDEP}]
-			>=dev-python/openstack-nose-plugin-0.7[${PYTHON_USEDEP}]
-			dev-python/oslo-sphinx[${PYTHON_USEDEP}]
-			dev-python/selenium[${PYTHON_USEDEP}]
-			>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
-			<dev-python/sphinx-1.2[${PYTHON_USEDEP}]
-			>=dev-python/testtools-0.9.34[${PYTHON_USEDEP}]
-	)"
-RDEPEND=">=dev-python/django-1.4[${PYTHON_USEDEP}]
-		<dev-python/django-1.7[${PYTHON_USEDEP}]
-		>=dev-python/django-compressor-1.3[${PYTHON_USEDEP}]
-		>=dev-python/django-openstack-auth-1.1.4[${PYTHON_USEDEP}]
-		>=dev-python/eventlet-0.13.0[${PYTHON_USEDEP}]
-		>=dev-python/httplib2-0.7.5[${PYTHON_USEDEP}]
-		>=dev-python/iso8601-0.1.9[${PYTHON_USEDEP}]
-		>=dev-python/kombu-2.4.8[${PYTHON_USEDEP}]
-		>=dev-python/lesscpy-0.9j[${PYTHON_USEDEP}]
-		>=dev-python/lockfile-0.8[${PYTHON_USEDEP}]
-		>=dev-python/netaddr-0.7.6[${PYTHON_USEDEP}]
-		>=dev-python/python-ceilometerclient-1.0.6[${PYTHON_USEDEP}]
-		>=dev-python/python-cinderclient-1.0.6[${PYTHON_USEDEP}]
-		>=dev-python/python-glanceclient-0.9.0[${PYTHON_USEDEP}]
-		>=dev-python/python-heatclient-0.2.3[${PYTHON_USEDEP}]
-		>=dev-python/python-keystoneclient-0.7.0[${PYTHON_USEDEP}]
-		>=dev-python/python-neutronclient-2.3.4[${PYTHON_USEDEP}]
-		<dev-python/python-neutronclient-3[${PYTHON_USEDEP}]
-		>=dev-python/python-novaclient-2.17.0[${PYTHON_USEDEP}]
-		>=dev-python/python-swiftclient-1.6[${PYTHON_USEDEP}]
-		>=dev-python/python-troveclient-1.0.3[${PYTHON_USEDEP}]
-		>=dev-python/pytz-2010h[${PYTHON_USEDEP}]
-		>=dev-python/six-1.5.2[${PYTHON_USEDEP}]"
-
-src_test() {
-	./run_tests.sh -N --coverage
-}
diff --git a/www-apps/horizon/metadata.xml b/www-apps/horizon/metadata.xml
deleted file mode 100644
index 55d8c795a551..000000000000
--- a/www-apps/horizon/metadata.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <herd>openstack</herd>
-  <maintainer>
-    <email>prometheanfire@gentoo.org</email>
-    <name>Matthew Thode</name>
-  </maintainer>
-  <longdescription lang="en">
-    Horizon is a Django-based project aimed at providing a complete OpenStack
-	Dashboard along with an extensible framework for building new dashboards
-	from reusable components.
-  </longdescription>
-  <upstream>
-    <remote-id type="launchpad">horizon</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/www-apps/mythweb/Manifest b/www-apps/mythweb/Manifest
index 87e72a94df54..f88a1b3f7f75 100644
--- a/www-apps/mythweb/Manifest
+++ b/www-apps/mythweb/Manifest
@@ -1,3 +1,3 @@
 DIST mythplugins-0.26.0.tar.bz2 36673620 SHA256 4e7f0493f37792c084c1b4d0b5863b4201ebce6d62ab7c6cc31ca74087d83c62 SHA512 51c10f46186e14e69c5626f2ae0955692c71aa7459fd018efaab1b99809cad533a84754d53455017102ff6f94cc9905dc303248a29d4095ba8f4f685bb022f49 WHIRLPOOL a2b995f2a94a2eb22fa0740dd840a2fe2d9d4b808af1dc43e9d83c626d93ed95134d64db2049e4b79379838ae16b1de6547b56277531e2752e6779b3cddbf25a
-DIST mythweb-0.27.1.tar.gz 1686541 SHA256 2758cfe9e0fcef71fec2d7deb9ea5fdd54daa21832da9c56d124659e74a19adc SHA512 6f92b5c0858b8451be3cce48188e04cd987224a16c0b5cb94872fb165ec0e3e5e4aa4f8ba18220e9401c48ddbc36c28a04cc8ebaf819e1340f6eb5133f3bcc69 WHIRLPOOL ea702d678c7cf2f4828dc2666a2dfa93ccdff2a2a2ee15fb4d3fddd857b4c406fca26b478e6531f6a7a2faa7c47520674eb96964364012d99447b4658ddc5d2f
+DIST mythweb-0.27.5.tar.gz 1686597 SHA256 5dc3fd9e60f59dea4264fb064b40d73f2534c99d0399da6223a42d2f563e9d13 SHA512 effa5f9cab6b40423a819f0307aecd1faa397da7d859503162b6229e5da2d4cd0d95d793326768335518cd397fa58ba71ad98c14247feda10e7930f7e023f1af WHIRLPOOL 8721398611db0572f475f5642c397a5d3f0fbe352f0f3ea23dc21cc0ea94e0e6876a713cf0f99331c6fc1f585a62525dc64510737a85667c0e2a14b6f1c6bb10
 DIST mythweb-0.27.tar.gz 1686502 SHA256 7e54d6b388e2e8f3e50515c3fe46113f4217e3989242459a0fa73c928dcca494 SHA512 d166cd764730d844e844b5ba780b5635be6d2329d2051a382ab79579334e51fbfa0e73683e30c312d7618e84c7e63f868d32d5449d0804ff01dc0a592a60d9d1 WHIRLPOOL a2ad85234c2e9e2e6f370355becfca173a672afcb5c7d919fb046ab1a5e735683b96e3b6d36a2c83986116c568f878728988e78a1f27bd1861cd400a999b186a
diff --git a/www-apps/mythweb/mythweb-0.27.1.ebuild b/www-apps/mythweb/mythweb-0.27.5.ebuild
index affada03c0f0..affada03c0f0 100644
--- a/www-apps/mythweb/mythweb-0.27.1.ebuild
+++ b/www-apps/mythweb/mythweb-0.27.5.ebuild
diff --git a/www-apps/rutorrent/metadata.xml b/www-apps/rutorrent/metadata.xml
index e814a67b0855..53065a2d2338 100644
--- a/www-apps/rutorrent/metadata.xml
+++ b/www-apps/rutorrent/metadata.xml
@@ -7,5 +7,6 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="google-code">rutorrent</remote-id>
+		<remote-id type="github">Novik/ruTorrent</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index fc07f8cd8e2b..a08b668a34f1 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -1,6 +1,7 @@
 DIST chromium-44.0.2403.89.tar.xz 292891880 SHA256 badd9aa979487b55bbcce4f54ec16926c6fa7eb46ec2536866200a5e68853a98 SHA512 786923a45c6baaf309ac2fe43309d8b73e5fa7e97f918ec42449b6fefdf52bd9d544e77bc1332abdce0df645d9d564a58781619de4e67f7b0fc9afae37c141e0 WHIRLPOOL 4d31a80a1dfdd3b733199412e1429ce36eeb4f1e60f31401e9e8bb2163d9d4b24b700ce26ec53f82f6b0f4bbca023737ca92e4e494397d55ab6fa20793078caf
 DIST chromium-45.0.2454.46-lite.tar.xz 242538392 SHA256 0bcab2fa404cf5b8192fa1cecf239b6c0c53b536b7deccd08b722a8732d31b9f SHA512 a318624b716f189ff701c0835b2cdc42b49a651fbe8907d969db23c38c2b8dc7152bea919fa0879cbeaebcae58542327409643f382cac31aac046dba436ed53e WHIRLPOOL 3ca0c4c1ea02d24f661fa3f5ffbece198afe1bd07cc42edf93aea406a385972f7f8a576f5a9a0ed99abb396ee142485e8f893955f8085baf1fd94b5d2d9b9ae2
 DIST chromium-45.0.2454.85-lite.tar.xz 242569440 SHA256 fafb4792c69c235d6ea85e904df68a64c51783cb338b783a1092b4ea6c888e71 SHA512 04f482ef18cddaf140224a98189ebd565416e3fe617877d58b2e691fb6030a3c9248720efcb7285cd18a034c345f9a65c677489d8a49f1ac95deafecb9b7d82a WHIRLPOOL 86b382b4dd2406559cef76ae260fcfe26e376bd957be3381b9822f706e8a5fb0ac7240fb00d64858ee1262eec17fadd253acae2b8a9318d3d996fb5d596de665
-DIST chromium-46.0.2486.0-lite.tar.xz 258526052 SHA256 9a1241b712501d8e73d74ff436b74fdf707a60d0f5f9e2ac48c2330965a4acc7 SHA512 bca079598d4ce4116d0d4be519e635079c41bc2aa0ab89699b23687ce2edd819f14df9bc509e4fa9ade5658f527984ee51a0fa651eec5eb81fbaffcc94196e7f WHIRLPOOL e905b36d47bad712e82bcda39d03dbf9c68c21bf25c99c974e8135f67a3fb8c9849d5cb96d291114c256019b35d680bba75d5d4cd4527f37ee9df282b510fe77
+DIST chromium-46.0.2490.13-lite.tar.xz 261760812 SHA256 8b582b05a61b207ebec6a65577e413c00e5f7d330ec1adb24d9681d14640fc88 SHA512 d73f10a8521183ec8253dad8e82c8b6357c080cb76b91b8a8eb69cce05225dd843edf01c04a7478e04a7da22330332832f9c7a63f59346333eda83b9133c4213 WHIRLPOOL 098ec84c56ac43800bd3f5d5f60dcdc167b045b1cf3736bca72b21e1ffbf33937541f810cc2e976f6a86dca0035c4b59000a5532f4974ec2cee9156acd7c488d
 DIST chromium-46.0.2490.6-lite.tar.xz 261745688 SHA256 e3091bf10926b937898d98967a3b387274af9d598add0c57346e44b97bb97371 SHA512 8cb6dbbbe3c640174496ddd032260835f058bf0a71827d48889c04e7882ed0b7d6d80dc3d188bd31223e114d44ea8b966e1dc851625b09d8b26ca4ef17a37795 WHIRLPOOL 6cd5e910425a85633d43831937e51b0a6b353f2a4f7c140e79d7e123ae4b7f50455e6b8864179fd1fb58deb9f1fcbde46748bc4dd940b55c9c5345a471bddc78
 DIST chromium-47.0.2498.0-lite.tar.xz 267586356 SHA256 b83da0a7d8c15dd00623443f6d62f1930b1a4db4020cedb7cffbf7e036b7935d SHA512 f65af999a751d360a66bd721365002110ad6a20b99aaa0304524a2c68093b65236b7a3eef5865cc17aac3d6a576f84170db785da9423b79de5a2646b8c3076fc WHIRLPOOL ca6a23109fbbae3d0ced4b04ae5d92ad5487cc078942482212317840979ceacdc0550c4e25349ff487b4305495ec7a939f9ad46b26bcfb51cafa05a3e745e6a4
+DIST chromium-47.0.2503.0.tar.xz 348185172 SHA256 af42ffc4e5c81685fdbdf8d626b28b9b1cbdb8fc2643bf03cb067e982de31ab9 SHA512 6ea58854c1ec83e35e12f247fce5c517f3770d06e42baf8192c5bc2ce731e3155c9a0de4679aa86f28f0a551d30dae75fab185905bacb825de8d0272809719f0 WHIRLPOOL cf2f93d3a0afde8325ac4a0726171ad4f2eae49e7a21c1ed857ff4ec1e89f59a1bcaaaeed070671b8fea9724cb8da2de56a0d84bcfc118912f2e1f562ef61ce4
diff --git a/www-client/chromium/chromium-45.0.2454.85.ebuild b/www-client/chromium/chromium-45.0.2454.85.ebuild
index 70baec6ccf3d..2df11cab4822 100644
--- a/www-client/chromium/chromium-45.0.2454.85.ebuild
+++ b/www-client/chromium/chromium-45.0.2454.85.ebuild
@@ -187,6 +187,7 @@ src_prepare() {
 	# fi
 
 	epatch "${FILESDIR}/${PN}-system-jinja-r7.patch"
+	epatch "${FILESDIR}/${PN}-tracing-r0.patch"
 
 	epatch_user
 
diff --git a/www-client/chromium/chromium-46.0.2486.0.ebuild b/www-client/chromium/chromium-46.0.2490.13.ebuild
index e96b221c6945..e96b221c6945 100644
--- a/www-client/chromium/chromium-46.0.2486.0.ebuild
+++ b/www-client/chromium/chromium-46.0.2490.13.ebuild
diff --git a/www-client/chromium/chromium-47.0.2503.0.ebuild b/www-client/chromium/chromium-47.0.2503.0.ebuild
new file mode 100644
index 000000000000..346ae3ab1274
--- /dev/null
+++ b/www-client/chromium/chromium-47.0.2503.0.ebuild
@@ -0,0 +1,640 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+PYTHON_COMPAT=( python2_7 )
+
+CHROMIUM_LANGS="am ar bg bn ca cs da de el en_GB es es_LA et fa fi fil fr gu he
+	hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt_BR pt_PT ro ru sk sl sr
+	sv sw ta te th tr uk vi zh_CN zh_TW"
+
+inherit check-reqs chromium eutils flag-o-matic multilib multiprocessing pax-utils \
+	portability python-any-r1 readme.gentoo toolchain-funcs versionator virtualx
+
+DESCRIPTION="Open-source version of Google Chrome web browser"
+HOMEPAGE="http://chromium.org/"
+SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}.tar.xz"
+
+LICENSE="BSD hotwording? ( no-source-code )"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="cups gnome gnome-keyring hidpi hotwording kerberos neon pic +proprietary-codecs pulseaudio selinux +tcmalloc widevine"
+RESTRICT="proprietary-codecs? ( bindist )"
+
+# Native Client binaries are compiled with different set of flags, bug #452066.
+QA_FLAGS_IGNORED=".*\.nexe"
+
+# Native Client binaries may be stripped by the build system, which uses the
+# right tools for it, bug #469144 .
+QA_PRESTRIPPED=".*\.nexe"
+
+RDEPEND=">=app-accessibility/speech-dispatcher-0.8:=
+	app-arch/bzip2:=
+	app-arch/snappy:=
+	cups? ( >=net-print/cups-1.3.11:= )
+	>=dev-libs/elfutils-0.149
+	dev-libs/expat:=
+	dev-libs/glib:=
+	>=dev-libs/jsoncpp-0.5.0-r1:=
+	>=dev-libs/libevent-1.4.13:=
+	dev-libs/libxml2:=[icu]
+	dev-libs/libxslt:=
+	dev-libs/nspr:=
+	>=dev-libs/nss-3.14.3:=
+	dev-libs/re2:=
+	gnome? ( >=gnome-base/gconf-2.24.0:= )
+	gnome-keyring? ( >=gnome-base/libgnome-keyring-3.12:= )
+	>=media-libs/alsa-lib-1.0.19:=
+	media-libs/flac:=
+	media-libs/fontconfig:=
+	media-libs/freetype:=
+	media-libs/harfbuzz:=[icu(+)]
+	media-libs/libexif:=
+	>=media-libs/libjpeg-turbo-1.2.0-r1:=
+	media-libs/libpng:0=
+	>=media-libs/libwebp-0.4.0:=
+	media-libs/speex:=
+	pulseaudio? ( media-sound/pulseaudio:= )
+	sys-apps/dbus:=
+	sys-apps/pciutils:=
+	>=sys-libs/libcap-2.22:=
+	sys-libs/zlib:=[minizip]
+	virtual/udev
+	x11-libs/cairo:=
+	x11-libs/gdk-pixbuf:=
+	x11-libs/gtk+:2=
+	x11-libs/libdrm
+	x11-libs/libX11:=
+	x11-libs/libXcomposite:=
+	x11-libs/libXcursor:=
+	x11-libs/libXdamage:=
+	x11-libs/libXext:=
+	x11-libs/libXfixes:=
+	>=x11-libs/libXi-1.6.0:=
+	x11-libs/libXinerama:=
+	x11-libs/libXrandr:=
+	x11-libs/libXrender:=
+	x11-libs/libXScrnSaver:=
+	x11-libs/libXtst:=
+	x11-libs/pango:=
+	kerberos? ( virtual/krb5 )"
+DEPEND="${RDEPEND}
+	!arm? (
+		dev-lang/yasm
+	)
+	dev-lang/perl
+	dev-perl/JSON
+	>=dev-util/gperf-3.0.3
+	dev-util/ninja
+	sys-apps/hwids[usb(+)]
+	>=sys-devel/bison-2.4.3
+	sys-devel/flex
+	virtual/pkgconfig"
+
+# For nvidia-drivers blocker, see bug #413637 .
+RDEPEND+="
+	!=www-client/chromium-9999
+	!<www-plugins/chrome-binary-plugins-37
+	x11-misc/xdg-utils
+	virtual/opengl
+	virtual/ttf-fonts
+	selinux? ( sec-policy/selinux-chromium )
+	tcmalloc? ( !<x11-drivers/nvidia-drivers-331.20 )
+	widevine? ( www-plugins/chrome-binary-plugins[widevine(-)] )"
+
+# Python dependencies. The DEPEND part needs to be kept in sync
+# with python_check_deps.
+DEPEND+=" $(python_gen_any_dep '
+	dev-python/beautifulsoup:python-2[${PYTHON_USEDEP}]
+	dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
+	dev-python/html5lib[${PYTHON_USEDEP}]
+	dev-python/jinja[${PYTHON_USEDEP}]
+	dev-python/ply[${PYTHON_USEDEP}]
+	dev-python/simplejson[${PYTHON_USEDEP}]
+')"
+python_check_deps() {
+	has_version "dev-python/beautifulsoup:python-2[${PYTHON_USEDEP}]" && \
+		has_version "dev-python/beautifulsoup:4[${PYTHON_USEDEP}]" && \
+		has_version "dev-python/html5lib[${PYTHON_USEDEP}]" && \
+		has_version "dev-python/jinja[${PYTHON_USEDEP}]" && \
+		has_version "dev-python/ply[${PYTHON_USEDEP}]" && \
+		has_version "dev-python/simplejson[${PYTHON_USEDEP}]"
+}
+
+if ! has chromium_pkg_die ${EBUILD_DEATH_HOOKS}; then
+	EBUILD_DEATH_HOOKS+=" chromium_pkg_die";
+fi
+
+DISABLE_AUTOFORMATTING="yes"
+DOC_CONTENTS="
+Some web pages may require additional fonts to display properly.
+Try installing some of the following packages if some characters
+are not displayed properly:
+- media-fonts/arphicfonts
+- media-fonts/bitstream-cyberbit
+- media-fonts/droid
+- media-fonts/ipamonafont
+- media-fonts/ja-ipafonts
+- media-fonts/takao-fonts
+- media-fonts/wqy-microhei
+- media-fonts/wqy-zenhei
+
+Depending on your desktop environment, you may need
+to install additional packages to get icons on the Downloads page.
+
+For KDE, the required package is kde-apps/oxygen-icons.
+
+For other desktop environments, try one of the following:
+- x11-themes/gnome-icon-theme
+- x11-themes/tango-icon-theme
+"
+
+pkg_pretend() {
+	if [[ $(tc-getCC)$ == *gcc* ]] && \
+		[[ $(gcc-major-version)$(gcc-minor-version) -lt 48 ]]; then
+		die 'At least gcc 4.8 is required, see bugs: #535730, #525374, #518668.'
+	fi
+
+	# Check build requirements, bug #541816 and bug #471810 .
+	CHECKREQS_MEMORY="3G"
+	CHECKREQS_DISK_BUILD="5G"
+	eshopts_push -s extglob
+	if is-flagq '-g?(gdb)?([1-9])'; then
+		CHECKREQS_DISK_BUILD="25G"
+	fi
+	eshopts_pop
+	check-reqs_pkg_pretend
+}
+
+pkg_setup() {
+	if [[ "${SLOT}" == "0" ]]; then
+		CHROMIUM_SUFFIX=""
+	else
+		CHROMIUM_SUFFIX="-${SLOT}"
+	fi
+	CHROMIUM_HOME="/usr/$(get_libdir)/chromium-browser${CHROMIUM_SUFFIX}"
+
+	# Make sure the build system will use the right python, bug #344367.
+	python-any-r1_pkg_setup
+
+	chromium_suid_sandbox_check_kernel_config
+}
+
+src_prepare() {
+	# if ! use arm; then
+	#	mkdir -p out/Release/gen/sdk/toolchain || die
+	#	# Do not preserve SELinux context, bug #460892 .
+	#	cp -a --no-preserve=context /usr/$(get_libdir)/nacl-toolchain-newlib \
+	#		out/Release/gen/sdk/toolchain/linux_x86_newlib || die
+	#	touch out/Release/gen/sdk/toolchain/linux_x86_newlib/stamp.untar || die
+	# fi
+
+	epatch "${FILESDIR}/${PN}-system-jinja-r7.patch"
+	epatch "${FILESDIR}/chromium-widevine-r1.patch"
+
+	epatch_user
+
+	# Remove most bundled libraries. Some are still needed.
+	build/linux/unbundle/remove_bundled_libraries.py \
+		'base/third_party/dmg_fp' \
+		'base/third_party/dynamic_annotations' \
+		'base/third_party/icu' \
+		'base/third_party/nspr' \
+		'base/third_party/superfasthash' \
+		'base/third_party/symbolize' \
+		'base/third_party/valgrind' \
+		'base/third_party/xdg_mime' \
+		'base/third_party/xdg_user_dirs' \
+		'breakpad/src/third_party/curl' \
+		'chrome/third_party/mozilla_security_manager' \
+		'courgette/third_party' \
+		'crypto/third_party/nss' \
+		'net/third_party/mozilla_security_manager' \
+		'net/third_party/nss' \
+		'third_party/WebKit' \
+		'third_party/analytics' \
+		'third_party/angle' \
+		'third_party/angle/src/third_party/compiler' \
+		'third_party/boringssl' \
+		'third_party/brotli' \
+		'third_party/cacheinvalidation' \
+		'third_party/catapult' \
+		'third_party/catapult/tracing/third_party/components/polymer' \
+		'third_party/catapult/tracing/third_party/d3' \
+		'third_party/catapult/tracing/third_party/gl-matrix' \
+		'third_party/catapult/tracing/third_party/jszip' \
+		'third_party/catapult/tracing/third_party/tvcm' \
+		'third_party/catapult/tracing/third_party/tvcm/third_party/rcssmin' \
+		'third_party/catapult/tracing/third_party/tvcm/third_party/rjsmin' \
+		'third_party/cld_2' \
+		'third_party/cros_system_api' \
+		'third_party/cython/python_flags.py' \
+		'third_party/devscripts' \
+		'third_party/dom_distiller_js' \
+		'third_party/dom_distiller_js/dist/proto_gen/third_party/dom_distiller_js' \
+		'third_party/ffmpeg' \
+		'third_party/fips181' \
+		'third_party/flot' \
+		'third_party/google_input_tools' \
+		'third_party/google_input_tools/third_party/closure_library' \
+		'third_party/google_input_tools/third_party/closure_library/third_party/closure' \
+		'third_party/hunspell' \
+		'third_party/iccjpeg' \
+		'third_party/icu' \
+		'third_party/jstemplate' \
+		'third_party/khronos' \
+		'third_party/leveldatabase' \
+		'third_party/libXNVCtrl' \
+		'third_party/libaddressinput' \
+		'third_party/libjingle' \
+		'third_party/libphonenumber' \
+		'third_party/libsecret' \
+		'third_party/libsrtp' \
+		'third_party/libudev' \
+		'third_party/libusb' \
+		'third_party/libvpx' \
+		'third_party/libvpx/source/libvpx/third_party/x86inc' \
+		'third_party/libxml/chromium' \
+		'third_party/libwebm' \
+		'third_party/libyuv' \
+		'third_party/lss' \
+		'third_party/lzma_sdk' \
+		'third_party/mesa' \
+		'third_party/modp_b64' \
+		'third_party/mojo' \
+		'third_party/mt19937ar' \
+		'third_party/npapi' \
+		'third_party/openmax_dl' \
+		'third_party/opus' \
+		'third_party/ots' \
+		'third_party/pdfium' \
+		'third_party/pdfium/third_party/agg23' \
+		'third_party/pdfium/third_party/base' \
+		'third_party/pdfium/third_party/bigint' \
+		'third_party/pdfium/third_party/freetype' \
+		'third_party/pdfium/third_party/lcms2-2.6' \
+		'third_party/pdfium/third_party/libjpeg' \
+		'third_party/pdfium/third_party/libopenjpeg20' \
+		'third_party/pdfium/third_party/zlib_v128' \
+		'third_party/polymer' \
+		'third_party/protobuf' \
+		'third_party/qcms' \
+		'third_party/readability' \
+		'third_party/sfntly' \
+		'third_party/skia' \
+		'third_party/smhasher' \
+		'third_party/sqlite' \
+		'third_party/tcmalloc' \
+		'third_party/usrsctp' \
+		'third_party/web-animations-js' \
+		'third_party/webdriver' \
+		'third_party/webrtc' \
+		'third_party/widevine' \
+		'third_party/x86inc' \
+		'third_party/zlib/google' \
+		'url/third_party/mozilla' \
+		'v8/src/third_party/fdlibm' \
+		'v8/src/third_party/valgrind' \
+		--do-remove || die
+}
+
+src_configure() {
+	local myconf=""
+
+	# Never tell the build system to "enable" SSE2, it has a few unexpected
+	# additions, bug #336871.
+	myconf+=" -Ddisable_sse2=1"
+
+	# Disable nacl, we can't build without pnacl (http://crbug.com/269560).
+	myconf+=" -Ddisable_nacl=1"
+
+	# Disable glibc Native Client toolchain, we don't need it (bug #417019).
+	# myconf+=" -Ddisable_glibc=1"
+
+	# TODO: also build with pnacl
+	# myconf+=" -Ddisable_pnacl=1"
+
+	# It would be awkward for us to tar the toolchain and get it untarred again
+	# during the build.
+	# myconf+=" -Ddisable_newlib_untar=1"
+
+	# Make it possible to remove third_party/adobe.
+	echo > "${T}/flapper_version.h" || die
+	myconf+=" -Dflapper_version_h_file=${T}/flapper_version.h"
+
+	# Use system-provided libraries.
+	# TODO: use_system_hunspell (upstream changes needed).
+	# TODO: use_system_icu
+	# TODO: use_system_libsrtp (bug #459932).
+	# TODO: use_system_libusb (http://crbug.com/266149).
+	# TODO: use_system_libvpx (http://crbug.com/494939).
+	# TODO: use_system_opus (https://code.google.com/p/webrtc/issues/detail?id=3077).
+	# TODO: use_system_protobuf (bug #525560).
+	# TODO: use_system_ssl (http://crbug.com/58087).
+	# TODO: use_system_sqlite (http://crbug.com/22208).
+	myconf+="
+		-Duse_system_bzip2=1
+		-Duse_system_flac=1
+		-Duse_system_harfbuzz=1
+		-Duse_system_jsoncpp=1
+		-Duse_system_libevent=1
+		-Duse_system_libjpeg=1
+		-Duse_system_libpng=1
+		-Duse_system_libwebp=1
+		-Duse_system_libxml=1
+		-Duse_system_libxslt=1
+		-Duse_system_minizip=1
+		-Duse_system_nspr=1
+		-Duse_system_re2=1
+		-Duse_system_snappy=1
+		-Duse_system_speex=1
+		-Duse_system_xdg_utils=1
+		-Duse_system_zlib=1"
+
+	# Needed for system icu - we don't need additional data files.
+	myconf+=" -Dicu_use_data_file_flag=0"
+
+	# TODO: patch gyp so that this arm conditional is not needed.
+	if ! use arm; then
+		myconf+="
+			-Duse_system_yasm=1"
+	fi
+
+	# Optional dependencies.
+	# TODO: linux_link_kerberos, bug #381289.
+	myconf+="
+		$(gyp_use cups)
+		$(gyp_use gnome use_gconf)
+		$(gyp_use gnome-keyring use_gnome_keyring)
+		$(gyp_use gnome-keyring linux_link_gnome_keyring)
+		$(gyp_use hidpi enable_hidpi)
+		$(gyp_use hotwording enable_hotwording)
+		$(gyp_use kerberos)
+		$(gyp_use pulseaudio)
+		$(gyp_use tcmalloc use_allocator tcmalloc none)
+		$(gyp_use widevine enable_widevine)"
+
+	# Use explicit library dependencies instead of dlopen.
+	# This makes breakages easier to detect by revdep-rebuild.
+	myconf+="
+		-Dlinux_link_gsettings=1
+		-Dlinux_link_libpci=1
+		-Dlinux_link_libspeechd=1
+		-Dlibspeechd_h_prefix=speech-dispatcher/"
+
+	# TODO: use the file at run time instead of effectively compiling it in.
+	myconf+="
+		-Dusb_ids_path=/usr/share/misc/usb.ids"
+
+	# Save space by removing DLOG and DCHECK messages (about 6% reduction).
+	myconf+="
+		-Dlogging_like_official_build=1"
+
+	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_use_chrome_plugins=0
+		-Dhost_clang=0
+		-Dlinux_use_bundled_binutils=0
+		-Dlinux_use_bundled_gold=0
+		-Dlinux_use_gold_flags=0"
+
+	ffmpeg_branding="$(usex proprietary-codecs Chrome Chromium)"
+	myconf+=" -Dproprietary_codecs=1 -Dffmpeg_branding=${ffmpeg_branding}"
+
+	# Set up Google API keys, see http://www.chromium.org/developers/how-tos/api-keys .
+	# Note: these are for Gentoo use ONLY. For your own distribution,
+	# please get your own set of keys. Feel free to contact chromium@gentoo.org
+	# for more info.
+	myconf+=" -Dgoogle_api_key=AIzaSyDEAOvatFo0eTgsV_ZlEzx0ObmepsMzfAc
+		-Dgoogle_default_client_id=329227923882.apps.googleusercontent.com
+		-Dgoogle_default_client_secret=vgKG0NNv7GoDpbtoFNLxCUXu"
+
+	local myarch="$(tc-arch)"
+	if [[ $myarch = amd64 ]] ; then
+		target_arch=x64
+		ffmpeg_target_arch=x64
+	elif [[ $myarch = x86 ]] ; then
+		target_arch=ia32
+		ffmpeg_target_arch=ia32
+	elif [[ $myarch = arm ]] ; then
+		target_arch=arm
+		ffmpeg_target_arch=$(usex neon arm-neon arm)
+		# TODO: re-enable NaCl (NativeClient).
+		local CTARGET=${CTARGET:-${CHOST}}
+		if [[ $(tc-is-softfloat) == "no" ]]; then
+
+			myconf+=" -Darm_float_abi=hard"
+		fi
+		filter-flags "-mfpu=*"
+		use neon || myconf+=" -Darm_fpu=${ARM_FPU:-vfpv3-d16}"
+
+		if [[ ${CTARGET} == armv[78]* ]]; then
+			myconf+=" -Darmv7=1"
+		else
+			myconf+=" -Darmv7=0"
+		fi
+		myconf+=" -Dsysroot=
+			$(gyp_use neon arm_neon)
+			-Ddisable_nacl=1"
+	else
+		die "Failed to determine target arch, got '$myarch'."
+	fi
+
+	myconf+=" -Dtarget_arch=${target_arch}"
+
+	# Make sure that -Werror doesn't get added to CFLAGS by the build system.
+	# Depending on GCC version the warnings are different and we don't want
+	# the build to fail because of that.
+	myconf+=" -Dwerror="
+
+	# Disable fatal linker warnings, bug 506268.
+	myconf+=" -Ddisable_fatal_linker_warnings=1"
+
+	# Avoid CFLAGS problems, bug #352457, bug #390147.
+	if ! use custom-cflags; then
+		replace-flags "-Os" "-O2"
+		strip-flags
+
+		# Prevent linker from running out of address space, bug #471810 .
+		if use x86; then
+			filter-flags "-g*"
+		fi
+
+		# Prevent libvpx build failures. Bug 530248, 544702, 546984.
+		if [[ ${myarch} == amd64 || ${myarch} == x86 ]]; then
+			filter-flags -mno-mmx -mno-sse2 -mno-ssse3 -mno-sse4.1 -mno-avx2
+		fi
+	fi
+
+	# Make sure the build system will use the right tools, bug #340795.
+	tc-export AR CC CXX RANLIB
+
+	# Tools for building programs to be executed on the build system, bug #410883.
+	export AR_host=$(tc-getBUILD_AR)
+	export CC_host=$(tc-getBUILD_CC)
+	export CXX_host=$(tc-getBUILD_CXX)
+	export LD_host=${CXX_host}
+
+	# Bug 491582.
+	export TMPDIR="${WORKDIR}/temp"
+	mkdir -m 755 "${TMPDIR}" || die
+
+	local build_ffmpeg_args=""
+	if use pic && [[ "${ffmpeg_target_arch}" == "ia32" ]]; then
+		build_ffmpeg_args+=" --disable-asm"
+	fi
+
+	# Re-configure bundled ffmpeg. See bug #491378 for example reasons.
+	einfo "Configuring bundled ffmpeg..."
+	pushd third_party/ffmpeg > /dev/null || die
+	chromium/scripts/build_ffmpeg.py linux ${ffmpeg_target_arch} \
+		--branding ${ffmpeg_branding} -- ${build_ffmpeg_args} || die
+	chromium/scripts/copy_config.sh || die
+	chromium/scripts/generate_gyp.py || die
+	popd > /dev/null || die
+
+	third_party/libaddressinput/chromium/tools/update-strings.py || die
+
+	touch chrome/test/data/webui/i18n_process_css_test.html || die
+
+	einfo "Configuring Chromium..."
+	build/linux/unbundle/replace_gyp_files.py ${myconf} || die
+	egyp_chromium ${myconf} || die
+}
+
+eninja() {
+	if [[ -z ${NINJAOPTS+set} ]]; then
+		local jobs=$(makeopts_jobs)
+		local loadavg=$(makeopts_loadavg)
+
+		if [[ ${MAKEOPTS} == *-j* && ${jobs} != 999 ]]; then
+			NINJAOPTS+=" -j ${jobs}"
+		fi
+		if [[ ${MAKEOPTS} == *-l* && ${loadavg} != 999 ]]; then
+			NINJAOPTS+=" -l ${loadavg}"
+		fi
+	fi
+	set -- ninja -v ${NINJAOPTS} "$@"
+	echo "$@"
+	"$@"
+}
+
+src_compile() {
+	local ninja_targets="chrome chrome_sandbox chromedriver"
+
+	# Build mksnapshot and pax-mark it.
+	eninja -C out/Release mksnapshot || die
+	pax-mark m out/Release/mksnapshot
+
+	# Even though ninja autodetects number of CPUs, we respect
+	# user's options, for debugging with -j 1 or any other reason.
+	eninja -C out/Release ${ninja_targets} || die
+
+	pax-mark m out/Release/chrome
+}
+
+src_install() {
+	exeinto "${CHROMIUM_HOME}"
+	doexe out/Release/chrome || die
+
+	newexe out/Release/chrome_sandbox chrome-sandbox || die
+	fperms 4755 "${CHROMIUM_HOME}/chrome-sandbox"
+
+	doexe out/Release/chromedriver || die
+	use widevine && doexe out/Release/libwidevinecdmadapter.so
+
+	# if ! use arm; then
+	#	doexe out/Release/nacl_helper{,_bootstrap} || die
+	#	insinto "${CHROMIUM_HOME}"
+	#	doins out/Release/nacl_irt_*.nexe || die
+	#	doins out/Release/libppGoogleNaClPluginChrome.so || die
+	# fi
+
+	local sedargs=( -e "s:/usr/lib/:/usr/$(get_libdir)/:g" )
+	if [[ -n ${CHROMIUM_SUFFIX} ]]; then
+		sedargs+=(
+			-e "s:chromium-browser:chromium-browser${CHROMIUM_SUFFIX}:g"
+			-e "s:chromium.desktop:chromium${CHROMIUM_SUFFIX}.desktop:g"
+			-e "s:plugins:plugins --user-data-dir=\${HOME}/.config/chromium${CHROMIUM_SUFFIX}:"
+		)
+	fi
+	sed "${sedargs[@]}" "${FILESDIR}/chromium-launcher-r3.sh" > chromium-launcher.sh || die
+	doexe chromium-launcher.sh
+
+	# It is important that we name the target "chromium-browser",
+	# xdg-utils expect it; bug #355517.
+	dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium-browser${CHROMIUM_SUFFIX} || die
+	# keep the old symlink around for consistency
+	dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium${CHROMIUM_SUFFIX} || die
+
+	dosym "${CHROMIUM_HOME}/chromedriver" /usr/bin/chromedriver${CHROMIUM_SUFFIX} || die
+
+	# Allow users to override command-line options, bug #357629.
+	dodir /etc/chromium || die
+	insinto /etc/chromium
+	newins "${FILESDIR}/chromium.default" "default" || die
+
+	pushd out/Release/locales > /dev/null || die
+	chromium_remove_language_paks
+	popd
+
+	insinto "${CHROMIUM_HOME}"
+	doins out/Release/*.bin || die
+	doins out/Release/*.pak || die
+
+	doins -r out/Release/locales || die
+	doins -r out/Release/resources || die
+
+	newman out/Release/chrome.1 chromium${CHROMIUM_SUFFIX}.1 || die
+	newman out/Release/chrome.1 chromium-browser${CHROMIUM_SUFFIX}.1 || die
+
+	# Install icons and desktop entry.
+	local branding size
+	for size in 16 22 24 32 48 64 128 256 ; do
+		case ${size} in
+			16|32) branding="chrome/app/theme/default_100_percent/chromium" ;;
+				*) branding="chrome/app/theme/chromium" ;;
+		esac
+		newicon -s ${size} "${branding}/product_logo_${size}.png" \
+			chromium-browser${CHROMIUM_SUFFIX}.png
+	done
+
+	local mime_types="text/html;text/xml;application/xhtml+xml;"
+	mime_types+="x-scheme-handler/http;x-scheme-handler/https;" # bug #360797
+	mime_types+="x-scheme-handler/ftp;" # bug #412185
+	mime_types+="x-scheme-handler/mailto;x-scheme-handler/webcal;" # bug #416393
+	make_desktop_entry \
+		chromium-browser${CHROMIUM_SUFFIX} \
+		"Chromium${CHROMIUM_SUFFIX}" \
+		chromium-browser${CHROMIUM_SUFFIX} \
+		"Network;WebBrowser" \
+		"MimeType=${mime_types}\nStartupWMClass=chromium-browser"
+	sed -e "/^Exec/s/$/ %U/" -i "${ED}"/usr/share/applications/*.desktop || die
+
+	# Install GNOME default application entry (bug #303100).
+	if use gnome; then
+		dodir /usr/share/gnome-control-center/default-apps || die
+		insinto /usr/share/gnome-control-center/default-apps
+		newins "${FILESDIR}"/chromium-browser.xml chromium-browser${CHROMIUM_SUFFIX}.xml || die
+		if [[ "${CHROMIUM_SUFFIX}" != "" ]]; then
+			sed "s:chromium-browser:chromium-browser${CHROMIUM_SUFFIX}:g" -i \
+				"${ED}"/usr/share/gnome-control-center/default-apps/chromium-browser${CHROMIUM_SUFFIX}.xml
+		fi
+	fi
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+	gnome2_icon_cache_update
+	readme.gentoo_print_elog
+}
diff --git a/www-client/chromium/files/chromium-tracing-r0.patch b/www-client/chromium/files/chromium-tracing-r0.patch
new file mode 100644
index 000000000000..73121164077f
--- /dev/null
+++ b/www-client/chromium/files/chromium-tracing-r0.patch
@@ -0,0 +1,10 @@
+--- third_party/trace-viewer/tracing/build/generate_about_tracing_contents.orig	2015-09-08 13:14:21.048113295 +0000
++++ third_party/trace-viewer/tracing/build/generate_about_tracing_contents	2015-09-08 13:14:34.232384815 +0000
+@@ -8,6 +8,6 @@
+ 
+ if __name__ == '__main__':
+   top_dir = os.path.abspath(os.path.join(os.path.dirname(__file__), '..', '..'))
+-  sys.path.append(top_dir)
++  sys.path.insert(0, top_dir)
+   from tracing.build import generate_about_tracing_contents
+   sys.exit(generate_about_tracing_contents.main(sys.argv))
diff --git a/www-client/chromium/files/chromium-widevine-r1.patch b/www-client/chromium/files/chromium-widevine-r1.patch
new file mode 100644
index 000000000000..f206878cf073
--- /dev/null
+++ b/www-client/chromium/files/chromium-widevine-r1.patch
@@ -0,0 +1,14 @@
+Minimal patch to get chromium to compile with widevine support
+
+https://bugs.gentoo.org/show_bug.cgi?id=547630
+
+--- a/third_party/widevine/cdm/stub/widevine_cdm_version.h
++++ b/third_party/widevine/cdm/stub/widevine_cdm_version.h
+@@ -10,6 +10,7 @@
+ 
+ #include "third_party/widevine/cdm/widevine_cdm_common.h"
+ 
++#define WIDEVINE_CDM_VERSION_STRING "unknown"
+ #define WIDEVINE_CDM_AVAILABLE
+ 
+ #endif  // WIDEVINE_CDM_VERSION_H_
diff --git a/www-client/chromium/metadata.xml b/www-client/chromium/metadata.xml
index 1022e5d5f2bf..86d5ae4b0308 100644
--- a/www-client/chromium/metadata.xml
+++ b/www-client/chromium/metadata.xml
@@ -9,5 +9,6 @@
 		<flag name="pic">Disable optimized assembly code that is not PIC friendly</flag>
 		<flag name="proprietary-codecs">Enable proprietary codecs like H.264, MP3</flag>
 		<flag name="tcmalloc">Use bundled tcmalloc instead of system malloc</flag>
+		<flag name="widevine">Unsupported closed-source DRM capability (required by Netflix VOD)</flag>
 	</use>
 </pkgmetadata>
diff --git a/www-client/epiphany/epiphany-3.16.3.ebuild b/www-client/epiphany/epiphany-3.16.3.ebuild
index e24049c10606..262428f1f965 100644
--- a/www-client/epiphany/epiphany-3.16.3.ebuild
+++ b/www-client/epiphany/epiphany-3.16.3.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Web"
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="+jit +nss test"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 
 COMMON_DEPEND="
 	>=app-crypt/gcr-3.5.5
diff --git a/www-client/firefox/firefox-38.2.1.ebuild b/www-client/firefox/firefox-38.2.1.ebuild
index 1703a33f0f8a..2c1fe1f145d9 100644
--- a/www-client/firefox/firefox-38.2.1.ebuild
+++ b/www-client/firefox/firefox-38.2.1.ebuild
@@ -38,7 +38,7 @@ inherit check-reqs flag-o-matic toolchain-funcs eutils gnome2-utils mozconfig-v6
 DESCRIPTION="Firefox Web Browser"
 HOMEPAGE="http://www.mozilla.com/firefox"
 
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~ppc ppc64 x86 ~amd64-linux ~x86-linux"
 
 SLOT="0"
 LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
@@ -275,11 +275,11 @@ src_compile() {
 		addpredict "${cards}"
 
 		CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" \
-		MOZ_MAKE_FLAGS="${MAKEOPTS}" SHELL="${SHELL}" \
+		MOZ_MAKE_FLAGS="${MAKEOPTS}" SHELL="${SHELL:-${EPREFIX%/}/bin/bash}" \
 		Xemake -f client.mk profiledbuild || die "Xemake failed"
 	else
 		CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" \
-		MOZ_MAKE_FLAGS="${MAKEOPTS}" SHELL="${SHELL}" \
+		MOZ_MAKE_FLAGS="${MAKEOPTS}" SHELL="${SHELL:-${EPREFIX%/}/bin/bash}" \
 		emake -f client.mk realbuild
 	fi
 
diff --git a/www-client/firefox/firefox-40.0.3.ebuild b/www-client/firefox/firefox-40.0.3.ebuild
index 89f66579cbca..c71527a45f40 100644
--- a/www-client/firefox/firefox-40.0.3.ebuild
+++ b/www-client/firefox/firefox-40.0.3.ebuild
@@ -277,11 +277,11 @@ src_compile() {
 		addpredict "${cards}"
 
 		CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" \
-		MOZ_MAKE_FLAGS="${MAKEOPTS}" SHELL="${SHELL}" \
+		MOZ_MAKE_FLAGS="${MAKEOPTS}" SHELL="${SHELL:-${EPREFIX%/}/bin/bash}" \
 		Xemake -f client.mk profiledbuild || die "Xemake failed"
 	else
 		CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" \
-		MOZ_MAKE_FLAGS="${MAKEOPTS}" SHELL="${SHELL}" \
+		MOZ_MAKE_FLAGS="${MAKEOPTS}" SHELL="${SHELL:-${EPREFIX%/}/bin/bash}" \
 		emake -f client.mk realbuild
 	fi
 
diff --git a/www-client/google-chrome-beta/Manifest b/www-client/google-chrome-beta/Manifest
index 9adfe9983f79..0b30442cbbed 100644
--- a/www-client/google-chrome-beta/Manifest
+++ b/www-client/google-chrome-beta/Manifest
@@ -1,2 +1,2 @@
-DIST google-chrome-beta_46.0.2490.13-1_amd64.deb 47363696 SHA256 63010b3943488ff18be386afc037ff15acc8824d8fc3c43c985db717b6345d7a SHA512 8969d71f98ecf8f171447ae2f79a41ed75be089f303354bc97c83b38adf2f056e830c673f655c9dae3c82a3b6052e87c6e9a14c9b7b9d9f836f9481249d97681 WHIRLPOOL fa62b5eaba91a4da3e67f49d147debaaf48aaa39c6370270d36e46846936394288cd73c58974cf5513b64e76e52cb3dc559dfd1a7fd1df9c74e597244be096aa
-DIST google-chrome-beta_46.0.2490.13-1_i386.deb 46853842 SHA256 8bd65cd1bdfa55a74c67dbd194ab94fcef3e788a3fc9e287019ebcf41294f99c SHA512 0c292a15e5fbf7c51c4b9a2778ed0cd79690c9296d77b2ff32a3a3e0fe778d47c48db8b82871f1d855f72a6fac241f6efd1e9b91496acd26c1c37ea1604cbad6 WHIRLPOOL 5c46e9015ad88451aaf4ed33855795d9ac4a2127f0c915fdab7f0477b6a69bfccded50f9a72495952cbe223c127c1877315132f173423dede2ce436f281fb922
+DIST google-chrome-beta_46.0.2490.22-1_amd64.deb 47444702 SHA256 7c89f77cf3aef24cea2669d3090921ab0b1fcb708fc829acb25ad8ee0c968e6e SHA512 83947209eb05cc245a11b233e3dff69151d2ec22c6bcbf93697ca5c37a0b21321dd8dec995173f2df5c075917c1f55f3f0405250576cbea87cd1f7f5a80ec0e3 WHIRLPOOL 2c7f4ca6bd1f2b2e7dc5d31d6f7801987b198e16be551095b6a31ae036d703da44cee5f3121ccc998ed8d4edcd3393135c11dbc64496cb95b5681df5ccee2092
+DIST google-chrome-beta_46.0.2490.22-1_i386.deb 46838986 SHA256 5a30d9c09677f09de07aba3c8b94237fe65fe1c2e2753fa93d30660c668e9578 SHA512 c0f65fbbfed5d495fff163d9d327a912013abd704e9d0112bcd54da2813666a2c762edd433f87fd212162c11a216917289fb4d8582dae008ff0c423ebc09bae8 WHIRLPOOL dca8318df4630b30787e48c55a2e9c7de5cd5a77d12d6e1cb57a07caf9b0f107925faaf80c478cda3f1a3346c03c7e5d6dd90f8b752713da0f7fe692296cb5df
diff --git a/www-client/google-chrome-beta/google-chrome-beta-46.0.2490.13_p1.ebuild b/www-client/google-chrome-beta/google-chrome-beta-46.0.2490.22_p1.ebuild
index e8b0bfaff40c..e8b0bfaff40c 100644
--- a/www-client/google-chrome-beta/google-chrome-beta-46.0.2490.13_p1.ebuild
+++ b/www-client/google-chrome-beta/google-chrome-beta-46.0.2490.22_p1.ebuild
diff --git a/www-client/google-chrome-unstable/Manifest b/www-client/google-chrome-unstable/Manifest
index 2c9b0b757130..d04c76f3365a 100644
--- a/www-client/google-chrome-unstable/Manifest
+++ b/www-client/google-chrome-unstable/Manifest
@@ -1,2 +1,2 @@
-DIST google-chrome-unstable_47.0.2498.0-1_amd64.deb 47037554 SHA256 a52105bbe58406a1a799477209e67bcf4b435c37ebe68ccc05538d045b01a6d7 SHA512 d6e2e6e97977ad5d2664a9593cc4fcac4e2262326cbbd7964c3b4be883d1844a5f506aaac82343bbed4cd45600b976f088a7f34f49fa28df8f784845eba17363 WHIRLPOOL 8f50f79b92ec3d440f261095c5b4dde0ec61bbcd962f6237fe671ba107d11b8291e57a17c468431c634df59b0767a15776a1e6d54a95ac16f6991fa89e604e23
-DIST google-chrome-unstable_47.0.2498.0-1_i386.deb 46815526 SHA256 07dbc17f698853885c07fd2a5d9b9d761fe97fdfe5cdcfcc338ee9efe1ae5a96 SHA512 c3b63b90e18265fd31892a26daf07fc3268dc645981e0440967a0e55bbd5e89aeecda000cb2ab12d992b968b3847928775ab57d2ded4c615fe548a8f88bcaab0 WHIRLPOOL 5a45d17b7a23feba15e7cf89def0905ee96fe17e3b74130dbde110c9e75cf023f66a78ffeae3c99b7399cf9b8202551c0c305e156cf76c96299e86c7961d5668
+DIST google-chrome-unstable_47.0.2503.0-1_amd64.deb 46995462 SHA256 b3ed506f588f8785ee0db41438b27a82130ccc142b82d02bfc9c81233350b533 SHA512 c22b5f4732a408b078cfb7711c2badf3eb8a0f61959330eff137f3ff87e0cb743a2b749db96ebb510f31c86fcfe69fedddc096a5199e1332ad3f5d0ac52d8ea9 WHIRLPOOL 48bd2c01e5a0445981e426f7272ac5ba7d112f3552c7b37a8ecbd86c4112af985ca494862b0d7d70f578dedb068a8aa75684a8b967c201ad1b4c2c37e97a9429
+DIST google-chrome-unstable_47.0.2503.0-1_i386.deb 47023532 SHA256 d4ca53eace8e13cf5d8aa213a840dc8ff736b0d03ace857928cc8e1ede216055 SHA512 db2c9e9b0e7b747c82a732ba3022dd0806086fe2f11605bec7f7321f6a7d4a3f2fb3d61c395f5673fa5985d14e679753bff1a575f7e93c61b47db4b3bd75b883 WHIRLPOOL 094567bc37845946bbc4e68e73cd2cff3c04ab4584808d763879ba2d978d0fd60abbb840f3ced20c65dc8712f36a411baf12127caafa014687f6ed5512b2a8b2
diff --git a/www-client/google-chrome-unstable/google-chrome-unstable-47.0.2498.0_p1.ebuild b/www-client/google-chrome-unstable/google-chrome-unstable-47.0.2503.0_p1.ebuild
index 16a97bed9bb0..16a97bed9bb0 100644
--- a/www-client/google-chrome-unstable/google-chrome-unstable-47.0.2498.0_p1.ebuild
+++ b/www-client/google-chrome-unstable/google-chrome-unstable-47.0.2503.0_p1.ebuild
diff --git a/www-client/opera-beta/Manifest b/www-client/opera-beta/Manifest
index 70f83133efaf..f33b8c3c0e4d 100644
--- a/www-client/opera-beta/Manifest
+++ b/www-client/opera-beta/Manifest
@@ -1,2 +1,2 @@
-DIST opera-beta_31.0.1889.98_amd64.deb 42652746 SHA256 95ab02349b3c6a609b778a268c4d31f25fd0cfd7dfa0d255a85ea46fdbfdfcab SHA512 ad5cf86e976e73892d89a0c8a9d1c02bb64e2fd9ec80047a347a9c875287df7555ecd9475f1f852fd41e90751da4de59f3fae8488b5e2e072e9dc7f86db265a0 WHIRLPOOL 5946c4d3d91dcb5f85a8a2d39ec5559e5acc0f4d4d60a18988948facf87a4eaf38ad0a75ff9e360fccc8a1804b8033ce1452acdc093376dd62b1e042437b1996
-DIST opera-beta_32.0.1948.4_amd64.deb 42043064 SHA256 41c7aadd1052f65b46c289a629edac72e97ef1d8789ad5767cf4cac2dbc6a9b2 SHA512 0c45ac2a8124fa74791ec2c1a1f756ed369608137b4d17bc8b4b94d523d61057ef146f338a7c3f471a68ba5229a2cb8b74cbb6c61a3e19fed64c000f1fb81a7a WHIRLPOOL 6a5b759665eb0c7a40d08e797f9029492f50fdcfa26e56e006030bfada34008f8f683b0d27a6d79a3c48ea61a97121bea09069e6a03327b906c0df2e70b83a72
+DIST opera-beta_32.0.1948.12_amd64.deb 42068042 SHA256 48a1f9f694fa5a494fd9d494be1d5f69aaeae4d646892596f88a71851bdbaf4a SHA512 d391683fc93c3b81117ac087801465ec49a0586214e0458bf3539371f1e3f97f7d91f10052bbc97378862225f7bb1c1882bd59bce3fa7f437c7d27fee8a4036d WHIRLPOOL 9bb4990d80a931accb77ce59b0c02a1de3e9d414cbf1a6c7a61ec6950ee64a50aca77b7246ad6e91c010b5a3b60f29114232051f48f4577fe9badb01cc7b0ae7
+DIST opera-beta_32.0.1948.19_amd64.deb 43093322 SHA256 1ddcf1f7aba8ba04ec990c1d1c7ca3a3c9d6c58e2c18fb36d24d87178c5088f0 SHA512 c3ff5db796fc8f6ecb4ab2f56a6a7821f5267af3b29081f65b94523804abadf40dc8c77f33e9db0078a578644e836c381a4d1e99765e5864ab7c09a556a0ec62 WHIRLPOOL 9259681db8d6bf6956fc8c2caf4b60d9bffef8c28a9634e2c420cef71a22af7305c30240e9ce04c6ca4999f7118abec5c9743e4c9294fcb2efa4b71c6c414128
diff --git a/www-client/opera-beta/opera-beta-31.0.1889.98.ebuild b/www-client/opera-beta/opera-beta-32.0.1948.12.ebuild
index 6333a1c91c46..6333a1c91c46 100644
--- a/www-client/opera-beta/opera-beta-31.0.1889.98.ebuild
+++ b/www-client/opera-beta/opera-beta-32.0.1948.12.ebuild
diff --git a/www-client/opera-beta/opera-beta-32.0.1948.4.ebuild b/www-client/opera-beta/opera-beta-32.0.1948.19.ebuild
index 6333a1c91c46..6333a1c91c46 100644
--- a/www-client/opera-beta/opera-beta-32.0.1948.4.ebuild
+++ b/www-client/opera-beta/opera-beta-32.0.1948.19.ebuild
diff --git a/www-client/opera-developer/Manifest b/www-client/opera-developer/Manifest
index 01e9deaec4fd..2a3c99ddd53c 100644
--- a/www-client/opera-developer/Manifest
+++ b/www-client/opera-developer/Manifest
@@ -1,6 +1,4 @@
-DIST opera-developer_32.0.1933.0_amd64.deb 41876712 SHA256 36e153c3778ab543ea0b0921534f42dd689aaadd1fe0aac43d5e5fcb832a8a58 SHA512 b8269841d7c40c62a0ca83d2b0cbbf2099b967f23ac604e51b3a8aec880e9614955ae2b3f64a36d3171f4d48c09295df519a0a580aeec77cb634f61adfa0b7ca WHIRLPOOL c961f07f3391c944d8b1197e7ae7757c1b20f812877ab45bdbb391dcb1fb94183ae18296580660bd4ba43707006b428d891d7fb0ce14c8fff7ca878566924e2b
-DIST opera-developer_32.0.1933.0_i386.deb 43936830 SHA256 be60c87212307a06d7628761b9bb16e15c2bc7d711957467b4c55e2f7f868b32 SHA512 bd6c6c659c89d5666665e89216a3b5f188a25e0e5ede89cc3673efc5347d6e88376a751820003ac7417a729da643a69b549259cfc6a74e3f1324011e5a865a9c WHIRLPOOL af169d9669aad3e2f47b6c6b074d74ed7e3e5eba184a56d91a5ea7e833eed3bc902eba365f056aec8127ef5a61185f14f0941af7d0737eb855cd10ecb5f09155
-DIST opera-developer_33.0.1963.0_amd64.deb 42798118 SHA256 fdbf75ef7cfcb7ba20f6c2901b3c79aa3c6ae1fce6cc38a795462e2fde3a98e1 SHA512 79c81e124db3f76a34b8867649e7d1899ef1d7d043252442e30630346473c4aa7b0e787bd931a838116694fc1239ffd46a70e4cd67ed5bf3a684e4d962445a63 WHIRLPOOL bafb36e631248f01b2ad85ee8abeb0e0942b7b68e93cda3f29b094659201fe2de1db4ecb965da5097af859fbf972cdfd7e9f6ac0f06689ac849565a3f27d9a81
-DIST opera-developer_33.0.1963.0_i386.deb 44628338 SHA256 139df998e78b530868de14cf0a8d577ef7c8dddefce032d582097ddf4bb53d49 SHA512 a6f5d9c93169779624dc7d8136c13a26747c730aed461239d60eb302fc8eea481fd2a01f0b94d6908129b5da436fc43998e58e63e7b9e9842a19694429b1dd59 WHIRLPOOL 7be569ce1a4598c22bdff3a26109cd9b27a24ec7c2483ab91b3a016b03b93d158186065c5f76a921716dc08253270b06ced2d853417cf433ef5d5f8c6deccc26
 DIST opera-developer_33.0.1967.0_amd64.deb 42805058 SHA256 8f437307494a6bfb86555acc5c593c04d213032dd4102f945e9d2cfd816f3428 SHA512 aa635998f059fa6e9c8d86b111f222e02caff5121a0a63384871d2c838701f3e43fbb30e8a8ca4f1aadcd347010561c9f3c2c55bbce4724853ef2c04e9f27dbf WHIRLPOOL 0c4695afb4ac1513a82468a8e2963611ecaff743b901f24831e0268bf3e48ee6ae7243f4eac31cd35d4b5da4e68d72adb81ed744a7d05056d274d95b0816cda4
 DIST opera-developer_33.0.1967.0_i386.deb 44644490 SHA256 79d3e1bce980de8611639615ded7ac8ab39ab9d6fd69a85d88c935607edd0b2e SHA512 640fee419fb0e14755352da6af5db120c887b74be70c6cf5c008a0cfb39a2e14b0e8a1d03f7316b8d10fad4f96adcecbcb4750da38f6c8e631a616ee3429f018 WHIRLPOOL ad23394714b298d2559fd7fcec783c30e9e5084005e40d73d905d2fd7b6685b17940fce22d755d5806716248245241690be6813e8c638845bf4d8903c5424ca8
+DIST opera-developer_33.0.1982.0_amd64.deb 43074562 SHA256 3b23b3c07b861d728e00d58969cc6abd0619e55657f5cd5bec1eb562752e8e1b SHA512 82df5908a37e1bf916c8b9b4a7126e1fe426b77ba1f940e9705bb8c18aa56f282e6fc27235b933c2a681a25127c80e572b6275a1025f871240c9b550ae4e1773 WHIRLPOOL 5be7dce53d3e7064e7ec5129e934e53ccbe5ae85b1d86f235431c31678f5fdf91de8568b835e384340838d475fe4749e25e62e3b84751b4af73c2b55d8a472bd
+DIST opera-developer_33.0.1982.0_i386.deb 45087390 SHA256 380ae2394564bdb35b73bb8db5aac437cc837d11422562bdbd0dbf838744d4db SHA512 d5496dc8266601f946e6c649da21da6d2ef7178c2783a9ee7041cf1ce25ceeacd43b29a74ee626e18091d158abc29062e9e5de717958a05cae83c3758c686ec9 WHIRLPOOL 253a68170cd3854134f35ac45c4bec4a60832c22ecce983a119e44c989ebea22cd173474a7e8cce13e64ef0a83b01bcdfd943a813bf9d027ed2ddb54c566645a
diff --git a/www-client/opera-developer/opera-developer-33.0.1963.0.ebuild b/www-client/opera-developer/opera-developer-33.0.1963.0.ebuild
deleted file mode 100644
index bfeded8ebfc9..000000000000
--- a/www-client/opera-developer/opera-developer-33.0.1963.0.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-CHROMIUM_LANGS="
-	af az be bg bn ca cs da de el en_GB en_US es_419 es fil fi fr_CA fr fy gd
-	hi hr hu id it ja kk ko lt lv me mk ms nb nl nn pa pl pt_BR pt_PT ro ru sk
-	sr sv sw ta te th tr uk uz vi zh_CN zh_TW zu
-"
-inherit chromium multilib unpacker
-
-DESCRIPTION="A fast and secure web browser"
-HOMEPAGE="http://www.opera.com/"
-LICENSE="OPERA-2014"
-SLOT="0"
-SRC_URI_BASE="http://get.geo.opera.com/pub/"
-SRC_URI="
-	amd64?	( "${SRC_URI_BASE}${PN}/${PV}/linux/${PN}_${PV}_amd64.deb" )
-	x86?	( "${SRC_URI_BASE}${PN}/${PV}/linux/${PN}_${PV}_i386.deb" )
-"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	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
-	net-misc/curl
-	net-print/cups
-	sys-apps/dbus
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf
-	x11-libs/gtk+:2
-	x11-libs/libX11
-	x11-libs/libXScrnSaver
-	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/libXtst
-	x11-libs/libnotify
-	x11-libs/pango[X]
-"
-
-QA_PREBUILT="*"
-S=${WORKDIR}
-OPERA_HOME="usr/$(get_libdir)/${PN}"
-
-src_unpack() {
-	unpack_deb ${A}
-}
-
-src_prepare() {
-	case ${ARCH} in
-		amd64)
-			mv usr/lib/x86_64-linux-gnu usr/$(get_libdir) || die
-			rm -r usr/lib || die
-			;;
-		x86)
-			mv usr/lib/i386-linux-gnu/${PN} usr/$(get_libdir)/ || die
-			;;
-	esac
-
-	rm usr/bin/${PN} || die
-
-	rm usr/share/doc/${PN}/copyright || die
-	mv usr/share/doc/${PN} usr/share/doc/${PF} || die
-
-	pushd "${OPERA_HOME}/localization" > /dev/null || die
-	chromium_remove_language_paks
-	popd > /dev/null || die
-
-	sed -i \
-		-e 's|^TargetEnvironment|X-&|g' \
-		usr/share/applications/${PN}.desktop || die
-}
-
-src_install() {
-	mv * "${D}" || die
-	dosym ../$(get_libdir)/${PN}/${PN} /usr/bin/${PN}
-	fperms 4711 /usr/$(get_libdir)/${PN}/opera_sandbox
-}
diff --git a/www-client/opera-developer/opera-developer-32.0.1933.0.ebuild b/www-client/opera-developer/opera-developer-33.0.1982.0.ebuild
index bfeded8ebfc9..bfeded8ebfc9 100644
--- a/www-client/opera-developer/opera-developer-32.0.1933.0.ebuild
+++ b/www-client/opera-developer/opera-developer-33.0.1982.0.ebuild
diff --git a/www-client/otter/Manifest b/www-client/otter/Manifest
index d6e577e6c414..8b4346b23018 100644
--- a/www-client/otter/Manifest
+++ b/www-client/otter/Manifest
@@ -1,2 +1 @@
-DIST otter-0.9.06.tar.gz 2484916 SHA256 05ad64329e72c9a6a098a172e8060786b9e8ee5f24909a6714f8f665dc097d22 SHA512 793334e3b3a50fa6f8d0c45f28a1cd47c3a092d16ea0ad4fc26e96e661e2499d37114518dd399e16a3bae4640d61fffa9ab31bf0ceb1c8231286dc88c5284fe6 WHIRLPOOL 07ec17286e6981ffb8a8b77e9d25ba846a8aa776d2f1f723d5397f84926d4bf335fc1ed969757ecf28002e1caf9ea7896802959783873b4b45bf56c15b8d64b6
-DIST otter-0.9.07_p81.tar.gz 2577678 SHA256 e52be272085686b2172ea5b36dbfb1ff84ece46bb9e2f1691a67d5b96fa768f9 SHA512 1e9e5e4b64bd21f46b83984f26dd788f0e79ca3d9640f0789fd2da6cf3f79a8f233247874391f06d9c91f99e8072e509b79c2cfd37c87fa5e98dc7980bb8a26f WHIRLPOOL c7d10bad7cefbfd01eec7ffe1faa0a7a47689a8a58feb93c572bd255b69409338ad5606fead33b7d7b094b0e849a3737f0f2c63000162a36317eef6d18ccbd3c
+DIST otter-0.9.07.tar.gz 2634317 SHA256 1c27509f9736a9c99e12a3ef23b08cc41548ad7f6d7481bf07020fb471788da9 SHA512 035462e7a601e74a6a3dc924caf2d80e38e2ec75d75211d5f83176e0065a0289e8c0fd034643aa01c94dd6cfe9f695a4533e7464e6f019ed9153eec20641fa78 WHIRLPOOL 4c50c76d2d5fc75f9c6545dc57e2b21295e046af1bae9653999bc4880c5bd6021cfb75e125d6c75f3ef76e6c3999bcf271cafc090ab52d63cf84165876541227
diff --git a/www-client/otter/otter-0.9.06.ebuild b/www-client/otter/otter-0.9.06.ebuild
deleted file mode 100644
index 2a267ea2ab5c..000000000000
--- a/www-client/otter/otter-0.9.06.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-WANT_CMAKE="always"
-inherit eutils cmake-utils
-
-DESCRIPTION="Project aiming to recreate classic Opera (12.x) UI using Qt5"
-HOMEPAGE="http://otter-browser.org/"
-SRC_URI="https://github.com/Emdek/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64"
-
-DEPEND="
-	dev-qt/qtconcurrent:5
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5
-	dev-qt/qtmultimedia:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtprintsupport:5
-	dev-qt/qtscript:5
-	dev-qt/qtsql:5
-	dev-qt/qtwebkit:5
-	dev-qt/qtwidgets:5
-"
-RDEPEND="
-	${DEPEND}
-"
-
-S=${WORKDIR}/${PN}-browser-${PV}
-DOCS=( CHANGELOG CONTRIBUTING.md TODO )
-
-src_prepare() {
-	if [[ -n ${LINGUAS} ]]; then
-		local lingua
-		for lingua in resources/translations/*.qm; do
-			lingua=$(basename ${lingua})
-			lingua=${lingua/otter-browser_/}
-			lingua=${lingua/.qm/}
-			if ! has ${lingua} ${LINGUAS}; then
-				rm resources/translations/otter-browser_${lingua}.qm || die
-			fi
-		done
-	fi
-}
-
-src_install() {
-	cmake-utils_src_install
-	domenu ${PN}-browser.desktop
-}
diff --git a/www-client/otter/otter-0.9.07_p81.ebuild b/www-client/otter/otter-0.9.07.ebuild
index bda1f5e25e1f..bda1f5e25e1f 100644
--- a/www-client/otter/otter-0.9.07_p81.ebuild
+++ b/www-client/otter/otter-0.9.07.ebuild
diff --git a/www-client/seamonkey-bin/Manifest b/www-client/seamonkey-bin/Manifest
index df4688918b0d..f28f08108097 100644
--- a/www-client/seamonkey-bin/Manifest
+++ b/www-client/seamonkey-bin/Manifest
@@ -23,5 +23,32 @@ DIST seamonkey-2.33.1-tr.xpi 812398 SHA256 db1d8392f2d8c298d8b8a9a0da835cfcf1467
 DIST seamonkey-2.33.1-uk.xpi 874106 SHA256 5f40259490b909023b318fa633fb8f549071c0bb23f2a1f3037c21c6792570da SHA512 4b0a763f11af9e604ace7cf60bd39d3601869459b28f65c91f3b7c272c5cce7b9d0ab6e676351f244d3f7e4fc86066ac96efc1017a8a59e249445be4c972c15e WHIRLPOOL 9453681ca3c2e82eac6223ed4ee4092dd2f6c1f396b6fcd6d78ada59b293b572edf2a423a9b206d703ce2651bcf6e8f78a39db3e2f8ef4e5ff262b8c2640188f
 DIST seamonkey-2.33.1-zh-CN.xpi 834422 SHA256 1e07dbcfc5739a5e76b13b07327ce81a753e7bfe503a3abd9d5f656d12f918aa SHA512 16a1d1ad2993e0f89027a2fad52f09abe083d283d57a7e9d5f2eddaa3f4ac9f331f179da2b3a4e5d3d437b375cee579cb2c5bafe7a2d49c8e7e898dbb43963a5 WHIRLPOOL 36eb19c03ff8a21b86e23c372c382f6ad63165c658b9fb3152175fa1941562ba8ed41f05c51cd6e36e7fd35f1bf6d691a3ba7f0a4f08c56eead0a783e6ff6cf0
 DIST seamonkey-2.33.1-zh-TW.xpi 860687 SHA256 b0c382d9fc410b7a2c4219511c461ca0cd9df14f5a8ac799cfa46d236af5d636 SHA512 51a4955f8cd7af954bd123388aa130c0ee705bf75311dac520b7b87b1b409b1e2e1093b1e5a75e63ba0a3168eb8ad6f204c935cf421eb89b3ce7529fd659b89f WHIRLPOOL df6ddde364b4276c9f6c78a462a79af9b70cd1c755a517b914b33b05260defb62beb54f74a813226c025d83bf0a87bcdbda209b98b9f8b8a7be4c713f85e7c28
+DIST seamonkey-2.35-be.xpi 844271 SHA256 c1043f743a353dfb46db8f524249c808183e89f4f0f7a6181f9d5304d545f694 SHA512 2683a9e5858680a37b152c77fc15964d9b342e2d2a0fc409968b6cf35758f2bf30b3339dcd5c860ef95c56ed85c224383f95efc3d14999cd0a3e4a396c7c4644 WHIRLPOOL f3f69369b0e225cdbb8fc1ac35e4e2295ed1778df7cabd3c9f4f566b758ee6f7dc2f922e422b5b5175bc2ff2ecc15769e535810a90435d15f57f7b22217eb1bf
+DIST seamonkey-2.35-ca.xpi 835414 SHA256 6b6bc56a6f780f18a8736a554fcec9b042ff8c3a4ecbef9d192d3ad6a67ed150 SHA512 7dd90e4d3124749971c66c5aa49c4a7ba2fa3813df49526d8f42083b0b6b712362005d3e7332a4d74b053360d56beb22f922e6917471f42e81386b7cc5d9b6d0 WHIRLPOOL 8aa4bc9e1d662c3488fe27b490b4bc42536931a82340b5b133b9886efd10836b64da3c7f253cfd83e561f0d9b2ed03cae922a836c9bb0f927a4c28dabd1de64f
+DIST seamonkey-2.35-cs.xpi 830496 SHA256 f1ac05c2f4e123a12697f094c8c336c887f573640e766b63744dc98cea7c224a SHA512 e7b32870956654f59905e31bfed47e54c1c81eef42b33150b9d697319c9aea54955b425a1d0f8899241a3b1747b7561414b17e8ae3bc1825d9a9eb88454ccdd4 WHIRLPOOL ba14199497b61ede105e5f7eebd28da0c6804ac1e67c770aebbfc694e0f046a064b43c9a2ce234f1b26bee6fb35daa820f111c417be14169ae61a63eaf769222
+DIST seamonkey-2.35-de.xpi 838035 SHA256 5a9f9a542f8e815c4263f04e107e489dc6d8bae6b6464cd5f7af2966e9513acf SHA512 ffcd97d184df2d7b0b25bf8bf04055585826675100048d9ccdc453c67030cd20ed5a9adefed79388fc4e507e359233e27d31e6a6bd000b8e62496538da479e60 WHIRLPOOL 8b271aabdae9d8be8f3ab103d489fe5902c0f38caff003c5fc6d9e3840c106e3176ae47f2b207212d2ccd7b68dc52c64f63ac1f3e8f37d4bb3b0b2434591aeed
+DIST seamonkey-2.35-en-GB.xpi 804302 SHA256 e3db5141e431ea31f7d1f1d5a01aa9e0499d49bda0828b4ebfc77802ee365771 SHA512 eb67fa8ff2a1fa2f3649214e29daf56c866ee1ad26809229044ca3a1a9ea5493dbd7c00d3de09ea3c3e46e468ea3e5ffa8878b4d59e8b3aa3be0a67458694b94 WHIRLPOOL e52c054da0f9cacc5565bfeeb84a3cb6a16f09410b56f601920cc3f7e9e8d85c36d8fe94597a383f4cca13a2a71d4347a25b828ece1b19f14b99b649a5d7ec2b
+DIST seamonkey-2.35-es-AR.xpi 852042 SHA256 74c6c241aa7a1395435539b8969e0e9c4f3fcf957f7c6e8e73f5f61fae211575 SHA512 f055a4b759e8a5ab7f46fc5f263b7a351aba8f7249a36e6a3b0922aceb5ce1c40913c2a8dbd10cfb2b19231a8b9f85d6c4fdaa9d7d5a61827e9d8f2a9405b9a2 WHIRLPOOL 5599ffaed17c1630887cd1f5ff3ee4d8e46b886e6a360acdf546f9382810eae41017522175eb67a27708898d55eb048e9c9506fca2ff23dedc160e85b7b3186b
+DIST seamonkey-2.35-es-ES.xpi 830454 SHA256 c242cfb3406ad6048d7f855e22afdb58bd4d6f8d918eb2e96ddfcf64a0b445ad SHA512 bf03b245974264e8c9fa64c679b68b4f2a67b3bab76c07b7cb1478bf8fa071110fe129bd6f42bb878105c1c017672f5c6c2076f0a39bdf5500f5ba3adfe62fa2 WHIRLPOOL fe32e889f67a0e531a28451928cbea897d5b272a62943c9d6b8d39d239857553aaae31d428399d9e309dd8643fe243944cc0cc11c554bbc8a9346d2e5b417910
+DIST seamonkey-2.35-fi.xpi 802373 SHA256 92b7764676bc98f88ec4d9014f4f60577e78ae804ad610a5d6fe1493b554e555 SHA512 4938a8285170f5ebfaa46859aaa8a43e9efc49180a8ae3b79b189d94b660868212a34a83090043ee59b89ef89e10b608390db3692739fc64c95c0af518035b10 WHIRLPOOL 739252f6ac6964e2a7cea6753e7917be2d3f242e8cbe75f4499e12d5f6b72f6b4f01f361004baa2da5b9ccab5a3c79198f6798d238197279dd0fcc6aefb6b250
+DIST seamonkey-2.35-fr.xpi 810945 SHA256 5402fdfbc0d2f169de29a8ad475725ff8765f45c863d290f5ddea03e2f3f85e0 SHA512 48b9cc32e7bf9f8fb39268587d11b265e8471fa3032a11412ec3d0221a5c157027fdd874749a67aa4ac5d2ec56326f3b248f3f715d7772de3f12fae0e1640e38 WHIRLPOOL eb5524efaf01b55ddd587e7a1b7d5d327c596286fd385cc69c969d498deaa13ac39ae3bff0fca78e7aedade1d82dba4f307f8e06f17815aec5c515f6a62df0a7
+DIST seamonkey-2.35-gl.xpi 812465 SHA256 d9f56b51d65db6315937c47613f8f10d8f292195a317c9670c0bdb1c5259f955 SHA512 b0200e6b1a76e6e8189af56e90ddb2f5c4836b716bc004fde07ebc798ba636ac5b9f0578794016a365ddf7d6d4e5bdcd3b27d48edd2f51fc0cf951eae345f048 WHIRLPOOL 5efb32744cda7274aab771f974abd8ffbdc4bf80cfff4dcb346270be40e99c604abf23c59f8209874affe2d0139977b318da225a4d91d12819f20d03166a6cb6
+DIST seamonkey-2.35-hu.xpi 843768 SHA256 fdf492223b9430c6b0b7479193baeb9be473e996057bb52b30fa03024c116ab9 SHA512 f2cd850a83e58fe7c51f79dbd554e9630ce8bc9fdc103851bd3e3ef4a0aeae90495d68da28f0a159ef34d890aad6c0b8ceab8d7c792168832e0ae8f330f4ac81 WHIRLPOOL e096d2c2d44fa6c714aa52a2816c27eb07095bdd0558f160b317264a04f32d6d99fe16c0de8fe0ff9cd4a711d3115b3c3eceb3196cc1dda2590b3f389c51ac5a
+DIST seamonkey-2.35-it.xpi 742125 SHA256 0e6f3c94ba8ab8a6a87655ef4b465fed1dc82c7e6309a8c3e48545e22de3b6cb SHA512 782bf7bdccc821cc6f32118d5047327d86bd596b93d458c883cec2e07eddb3cad12477f296e78a90131ef0d62bcbedb10f3e954ef51fde423c64c32d5ffbbbec WHIRLPOOL 86d125cb3a1ee7380f0ee7bfa1df4387acda024685351448cabb026b302fbe79b2f188cb26f640448651d8a83ada86527dd46178d0d926a12a70103d1b0defef
+DIST seamonkey-2.35-ja.xpi 885520 SHA256 7bc044f438b5fa27af711590999dce35ca747a6aadd093bbd5ed41664519929c SHA512 a011f085284f340030b70c72e32e282565e417e38ac7c9137d5feefc4ba99dc04c4d65e3c9f992950160d4dd12744dda5608eb015f628943e40d335ca339dfb9 WHIRLPOOL 8aac6371bf745069fae02351442478b16c4770a957a8580aca739cd8235e9bae381b60714736604ccf3c866f72b5c4840e0583fc0220cfdff0f390271637bc14
+DIST seamonkey-2.35-lt.xpi 844697 SHA256 6fcc9f475ba069f58fc8685ee4b45c9937c3cff93227bde15fca92ccd3729300 SHA512 4eeada1d8e0cd79a0baf8411013304f383225a63ca6b968ae7406b707ad24f2d5817699957538e3318439987013ff6e77575f63cd2a800db10cba1b25855f427 WHIRLPOOL 1d2cc26867724e47c7d302b9e718596262cdfab1f042d777ad513f0471863eeff8bc64fd6f647dff3d75616b5042d446b8a595b2aac987a241553a1541403890
+DIST seamonkey-2.35-nb-NO.xpi 825491 SHA256 fad48d775baa3f5ee4e145b23ee09e65bb27137da6e127c4f8681bfc93ec539a SHA512 717706fadadecb57a63e4c0b1619d5d54c976803ece47f8449cb728a877bacaba6c91a7db67a9704c0a2c27dc2879c4d77e109502148beea9685c83cec78ca88 WHIRLPOOL 386d5affeb50caa5f7978360c4d25a975a8d876ce8631c7fc8452fee8bf8fe31cad3327098ee21d582f4181ee3b75d6cc98ba9eb0fa567879c3ae22f3131990a
+DIST seamonkey-2.35-nl.xpi 796553 SHA256 7e2948990879f389150adca707af4806b65a5b19c889ae89e87b74084c8a8cf4 SHA512 dc4289cb6f51bd195775f07f5c262b2b6ee3618ca08dcf73ca02a50a0e3af006307cfe17526422b3437074501c1b8913aa57cf48e76e046158d39a887584b3ef WHIRLPOOL 945159ee69875e93f7f57901f6ffcbd4c033ca5bac6f5fcee895ff01a799d78358d4d30a8d2768cc08fdbffc6bed0b6e0026572c8801212c95865ff1ecd026e9
+DIST seamonkey-2.35-pl.xpi 867329 SHA256 5febf28a4936a42d0b6d4e827571f4bd03674c8fafbd7475bd862211d797a513 SHA512 4d745b1f972459fea713b42f4781ea6e558c1f3bd9c77028e5dbf221243922d589eaf398c11e7ff01be5f0bff43a039ae01bff77bb2d1c9ca35c086e01510ad9 WHIRLPOOL ef0d31aaf00f4204a1a5dd7ccee2f144c835430340e2574ee1b72f72cba87f2642c1d1ef6a36cc3bde3c12ffe9d5a46a43df53f95f75150421ff904291c16478
+DIST seamonkey-2.35-pt-PT.xpi 859044 SHA256 90e1818b02c602346b21667e6d52c394762e97925eaf316b040a23e220b8c9ad SHA512 094fc8d11e05c1b95a3f11a0b868a0b9f1e7ce497658a206adba09feec183b8316fae4db6af4291284a44c116be625f84b4e4786b459ab040a2bf6a354bf0751 WHIRLPOOL 781903753a0e5aec8f149d61c28ece87b8ab7a6c9755567895e1fc0243f281e27579575ba5b78b186282c4a3bc69071b8bf749af60f7a29d766b743b54aef266
+DIST seamonkey-2.35-ru.xpi 899811 SHA256 e7036d99ac03e8a717c6dd520d4fa20710eb34723c52b41bab31e7a889fbd126 SHA512 c1beb81fdd1143ceecd1054fbcf79dfe2bbca3a78678c0ad213b61c3973a70c46ee70216fe041a18d57cd6b677d4fac804322e4c09c65b58a9bfa2556d63cf95 WHIRLPOOL 708fac77e6f0d3fc05b986b7bfe6573517672ee6a1bf181c6342774a39d86f5bbc6055457d2f4c043bab80914ac1932106f6c96fc1c6746ee712d8b931f6feb4
+DIST seamonkey-2.35-sk.xpi 857092 SHA256 0fc80d929764e091ab12849878a15fdf6b350191382ecfda6c97e5d3b6029b2c SHA512 2b842c704cfaa9ad88ef59539166cd6bb59ff264e75c803d1bfbbeb67b73e97e76fca1874cb4398b2a3e9890c0a6f4d012b911849886eae8cd42f736b8959497 WHIRLPOOL e202722d4b96728d2f30e096a5cab84504e7953ac10efbc21dd7962605baafca485c9220b305cb8d4ef086b4aaa4850178f962ef2a497f87a0a803fd7df03f5c
+DIST seamonkey-2.35-sv-SE.xpi 825057 SHA256 72a3152ddce1748ee0afbb37c72aeed6da725d91e775ce6e51bbb2459aff14a7 SHA512 63b464e4949d7db4026c46d28ef25c42036b60dc899a399308628bd76e054aace62439133fc51ba9433f480565a795f9db54d575befb906a8bd686becb2f0666 WHIRLPOOL ec4e8d9187fbfee6ff4ed10feb9bf6379a06a87790dce995d6ea8867908d69c355b9ce4f97f08b4447d659fa6139d5476081b68df0ed4be278179b9a298601a1
+DIST seamonkey-2.35-tr.xpi 808778 SHA256 598b5399fb18ef6fcee8e48682f5a70ae9de95b6735601086e1c661bdc72e993 SHA512 8919b576d0e70ddae76248a9519b2bea8c5bf46adfe4f70b7446e7ae0b136a4b09dc1dff05af7c60cd1961024e6f2e97f805f4b24b37f55a24fc7a2a230aab88 WHIRLPOOL 85b8bc2b93d44eadc86f5a140601a04068582855fff02020d1054b27d7c7a9f8d28a086cee5d931711afa558ced5bc3c203081bc4b4c29d693ed5d51e24605d0
+DIST seamonkey-2.35-uk.xpi 874302 SHA256 fce8928dd186da0685c4e9516f35e9edb40a57a632131db3cbaaed6394a628ce SHA512 2a03b5915d61000aebecdb1f90fc09b45bbc03ff2eb171778dc30084c3ee8ac7bbf1abef72074e6c294b0a778b8ab2d17f6a8c189f3295a9e73a73b9fac4d4d1 WHIRLPOOL 5040b9e47d7ea8c1d57a898b1a8d9234c5b36278b69d1d6566c7f03b9cee1e671eee543656b0a5e9aba8133815ac0c77b642898c29ddd27090ca6c6b56c53839
+DIST seamonkey-2.35-zh-CN.xpi 836554 SHA256 40f469d1b0df9a3c7dd2c6d765f9ccdcae3dca211b81ed2985d97c20cdc61a3b SHA512 97714a166a3af31aabf3ccf39c77e4cf8aa09a8c9803acdfe75660cddf2d8d4504bad9ed71293174c7ef484e6a13c9e94f86897f73eff306aa1a61d532fdf979 WHIRLPOOL 7d269108e45baeb3192890ef4c9dc0dbfbe228a85cf962c87c2c191c039718180e7461274ca4da9d13f3a0e9019e4adbdb5dd7164d705324331210836f76d3bd
+DIST seamonkey-2.35-zh-TW.xpi 860776 SHA256 5e6e23d891f08b9b55ccd55ae4d2ce8c5ea9e32232bcadb31749e199dc55b59d SHA512 4f9d791ea3f00b1f7827ba87c33d9ce09f3351fea970ae29393c38f9185ebb928275973aa55bc945154d4850c804367798c40f9d413862e26bd250259ba7e8f9 WHIRLPOOL 8d6dd5feeaa1eacbe51014e90b49651c262ccd44c5aec7b0907ae044630f3c3137f9c9304d3b88b94c158b8f9fb2ad22d40a4f15befaec6fcaf896195c04b90b
 DIST seamonkey-bin_i686-2.33.1.tar.bz2 41382431 SHA256 f52b597a938f2980fc438a96ac38b9d23cb403a7319bb5d60d862f96efc54926 SHA512 4f0261fd1d8acaa445670c1ea720dbb9d8e208df1fa68ff5cb699becf0adb8c8ef5429342e07da73e8b41d8cd2aabbeef9c54387d76f5a9f38f4c028c8cfd26f WHIRLPOOL 519f10c6e08bf1fa7c60b4377de66ae36e68c15a1424f11bb9eace35af242fb3138ca82eaea959842ed8fc7fbf94caec26d0d43f3e848e151046385e018ef307
+DIST seamonkey-bin_i686-2.35.tar.bz2 46884190 SHA256 16eb932d9568c34baddac7a246bbba88ec8cd965874079ee9a3aa6098105b9b4 SHA512 22202d7aa092c7ac6d82cdecd473958b4f81b9d68bb3c89da4c442174c3fb45ef293e1036ce4278972f12d36999e9ea20ac7c8feee02955df57089542d6ad051 WHIRLPOOL 3bdf0b303b2ba094d1499f766f28ae8afde8c53f58c70011836372fdf94d3d911972b6e4af5497c0d0910b48e2f8bbb12b800ef5ca9c4e8a8dbacde2f5a1948f
 DIST seamonkey-bin_x86_64-2.33.1.tar.bz2 40357864 SHA256 94230b84f42b8d16700b1cc536f5888f9fb2088319835f24bcb404110ecf2136 SHA512 5ee9a7e7fbec36a380af612e2a326d379f3fe733eba4a35b29c8ad0927ad0a14e3f5ad9dc0342581019440b1f629e79f07ac91a92ea71622de080e01ffcd1cdc WHIRLPOOL 4f6f701f79ff9837851bea50a8b2cfdcefa4a1d9a4a9d18f3132956d8caa03dab25dd77255ce9835520702dea5cd8aa152dd1263234a6c4d06b260778b662355
+DIST seamonkey-bin_x86_64-2.35.tar.bz2 45688810 SHA256 4486aba8d10d3bfe40047ca708356334b057f71d04d31726e92a55e45b17c0e1 SHA512 ed9291702d98e493b4af4db4ba5f8fdc30ad4b5ab30f2c379f85b06016b7397c871c80cf9d113db579947e9fbf26a1f460134e67b669c1560116d216584e0d78 WHIRLPOOL c26bb3f7b03dd556af18d9a6e7056caae909546acf5bb0d056e952e9da3f9a67acd92cee03f168c76553ef9c6403a8a416b567b5b783d1d536bcc08fced1e7e3
diff --git a/www-client/seamonkey-bin/seamonkey-bin-2.35.ebuild b/www-client/seamonkey-bin/seamonkey-bin-2.35.ebuild
new file mode 100644
index 000000000000..382ecf71c42e
--- /dev/null
+++ b/www-client/seamonkey-bin/seamonkey-bin-2.35.ebuild
@@ -0,0 +1,137 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+
+# This list can be updated with scripts/get_langs.sh from the mozilla overlay
+MOZ_LANGS=(be ca cs de en-GB en-US es-AR es-ES fi fr gl hu it ja lt nb-NO nl pl
+pt-PT ru sk sv-SE tr uk zh-CN zh-TW)
+
+MOZ_PV="${PV/_alpha/a}" # Handle alpha for SRC_URI
+MOZ_PV="${MOZ_PV/_beta/b}" # Handle beta for SRC_URI
+MOZ_PV="${MOZ_PV/_rc/rc}" # Handle rc for SRC_URI
+MOZ_PN="${PN/-bin}"
+MOZ_P="${MOZ_PN}-${MOZ_PV}"
+
+MOZ_LANGPACK_PREFIX="${MOZ_PV}/langpack/${MOZ_P}."
+MOZ_LANGPACK_SUFFIX=".langpack.xpi"
+
+MOZ_HTTP_URI="http://archive.mozilla.org/pub/mozilla.org/${MOZ_PN}/releases"
+
+inherit eutils multilib mozextension pax-utils nsplugins fdo-mime gnome2-utils mozlinguas
+
+DESCRIPTION="Mozilla Application Suite - web browser, email, HTML editor, IRC"
+SRC_URI="${SRC_URI}
+	amd64? ( ${MOZ_HTTP_URI}/${MOZ_PV}/contrib/${MOZ_P}.en-US.linux-x86_64.tar.bz2 -> ${PN}_x86_64-${PV}.tar.bz2 )
+	x86? ( ${MOZ_HTTP_URI}/${MOZ_PV}/linux-i686/en-US/${MOZ_P}.tar.bz2 -> ${PN}_i686-${PV}.tar.bz2 )"
+HOMEPAGE="http://www.seamonkey-project.org/"
+RESTRICT="strip mirror"
+
+KEYWORDS="-* ~amd64 ~x86"
+SLOT="0"
+LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
+IUSE="startup-notification"
+
+DEPEND="app-arch/unzip"
+RDEPEND="dev-libs/atk
+	>=sys-apps/dbus-0.60
+	>=dev-libs/dbus-glib-0.72
+	>=dev-libs/glib-2.26:2
+	>=media-libs/alsa-lib-1.0.16
+	gnome-base/gconf
+	gnome-base/gnome-vfs
+	media-libs/fontconfig
+	>=media-libs/freetype-2.4.10
+	>=x11-libs/cairo-1.10[X]
+	x11-libs/gdk-pixbuf
+	>=x11-libs/gtk+-2.14:2
+	x11-libs/libX11
+	x11-libs/libXcomposite
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXrender
+	x11-libs/libXt
+	>=x11-libs/pango-1.22.0
+	virtual/freedesktop-icon-theme
+"
+
+QA_PREBUILT="
+	opt/${MOZ_PN}/*.so
+	opt/${MOZ_PN}/${MOZ_PN}
+	opt/${MOZ_PN}/${PN}
+	opt/${MOZ_PN}/components/*.so
+	opt/${MOZ_PN}/crashreporter
+	opt/${MOZ_PN}/webapprt-stub
+	opt/${MOZ_PN}/plugin-container
+	opt/${MOZ_PN}/mozilla-xremote-client
+	opt/${MOZ_PN}/updater
+"
+
+S="${WORKDIR}/${MOZ_PN}"
+
+src_unpack() {
+	unpack ${A}
+
+	# Unpack language packs
+	mozlinguas_src_unpack
+}
+
+src_install() {
+	declare MOZILLA_FIVE_HOME=/opt/seamonkey
+
+	# Install seamonkey in /opt
+	dodir ${MOZILLA_FIVE_HOME%/*}
+	mv "${S}" "${D}${MOZILLA_FIVE_HOME}"
+
+	# Install language packs
+	mozlinguas_src_install
+
+	# Create /usr/bin/seamonkey-bin
+	dodir /usr/bin/
+	cat <<EOF >"${D}"/usr/bin/seamonkey-bin
+#!/bin/sh
+unset LD_PRELOAD
+exec /opt/seamonkey/seamonkey "\$@"
+EOF
+	fperms 0755 /usr/bin/seamonkey-bin
+
+	# Install icon and .desktop for menu entry
+	newicon "${D}${MOZILLA_FIVE_HOME}"/chrome/icons/default/default48.png ${PN}.png
+	domenu "${FILESDIR}/icon/${PN}.desktop"
+
+	if use startup-notification; then
+	    echo "StartupNotify=true" >> "${D}"/usr/share/applications/${PN}.desktop
+	fi
+
+	# Fix prefs that make no sense for a system-wide install
+	insinto ${MOZILLA_FIVE_HOME}/defaults/pref/
+	doins "${FILESDIR}"/local-settings.js
+	# Copy preferences file so we can do a simple rename.
+	cp "${FILESDIR}"/all-gentoo-1-cve-2015-4000.js  "${D}"${MOZILLA_FIVE_HOME}/all-gentoo.js
+
+	# revdep-rebuild entry
+	insinto /etc/revdep-rebuild
+	doins "${FILESDIR}"/10${PN} || die
+
+	# Handle plugins dir through nsplugins.eclass
+	share_plugins_dir
+
+	# Required in order to use plugins and even run seamonkey on hardened.
+	pax-mark mr "${ED}"/${MOZILLA_FIVE_HOME}/{seamonkey,seamonkey-bin,plugin-container}
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	# Update mimedb for the new .desktop file
+	fdo-mime_desktop_database_update
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/www-client/vivaldi/Manifest b/www-client/vivaldi/Manifest
index fea6b82f77e5..0e611b6e6940 100644
--- a/www-client/vivaldi/Manifest
+++ b/www-client/vivaldi/Manifest
@@ -1,4 +1,4 @@
-DIST vivaldi-1.0.249.12_p1-amd64.deb 40574020 SHA256 3bb5d316b9d1b37a4b2e48dbffbe4009ae2ea04b7e55da97cde0fabdd9d924fd SHA512 7fe9926fb06353394d0ec83c8e11947253e07163c6e735ff0ef7b35229203ae84a57bdc3dd61aae5602efca188b8ac7e6b2c23a7c807ab5946c4326752cbd69e WHIRLPOOL c3270935189438d83fd4efae904adb0928b0702c8f4733b3dc187f5a19c509846310393ae21801760191f1f3f193378916b3376028b43db5fd78f5fb28cd268b
-DIST vivaldi-1.0.249.12_p1-i386.deb 40849236 SHA256 f9bd5f55225a10db15cd5de7e21a87654bba79218a7db55e1523b1fdafb6a791 SHA512 1db38e119361e9553dfd3b82568c7f0ef27565507ff95bfd94c662db67b44a7cca8aca1411aea6859142cfbb562baba80c46d909aa6ac7494a37b916d79e04b2 WHIRLPOOL 3fc7df277b606f786e658803bc48d054f1444ffe60ec69b77b199d2263b953cfa0d7bfd204f62a2cdb6b34fd7fcec65fcd80a07dc407a14daa87e3db1573bedb
-DIST vivaldi-1.0.252.3_p1-amd64.deb 40639740 SHA256 a0be44cce93dc6062590cf43d30f75dd7d5fabb9568cae4e7ad615384a8df8bd SHA512 7e9e529840d95b42fa57e675b843da39591f1dabfeb68c51357b926b9028cfdba0b5d40712b472117a65a25c57f923c647c2f39a46561c8feb4dd54e0f55ca31 WHIRLPOOL fed5e6d65270e9cf207c74d9ea509860cdb9c089f01310bd3e51aa57f1acebe0736e859552e174d42950a712dbc6ca3e2eecd4f1fa148a7811540c0f2267c3c4
-DIST vivaldi-1.0.252.3_p1-i386.deb 40871886 SHA256 03f6f146a6cea85c8aee9a737689acd514512d627eca962d9c54e28a7cb1d872 SHA512 9fde8947e40b215d4fa937598ca918ae6e1db28dcae757cac189df316338477e17e522fb4175b49293de8bd9fee37627072d5d7dc05da05c8cf487f312204fa6 WHIRLPOOL bdf073d45796e5d3bb656a2e204a65a5689c0ac4fbccbb2ccde0b35ca822d37e2dcede73334dae26bace2e4ae4460744d2752e7c88264e8599a61864fafa7c6a
+DIST vivaldi-1.0.264.3_p1-amd64.deb 40832004 SHA256 1a61c6e6d29dc7179a795ad90aa005aa394ffed893e414b8a6d844c3e0647bf5 SHA512 54ab6010f2b9db1fe3ead02912b47bf33a2a43916bb599415d52ee2103535d54b56867da142e8211241d2cd7c1ed228141ac9b7b549d0225f421b228b549e982 WHIRLPOOL ed084d2373180a7f38aa556e1a9dffb5d306800319425ed836c1a400a742f970bddc8e3e21a0b0487b802a6dbe2e5ea5c9d28a4d4bdd1ce22a39ede261d0ab25
+DIST vivaldi-1.0.264.3_p1-i386.deb 41029914 SHA256 757512e7651c6ed1527dc8a619d4ef31fd3b30724832264609a9063907448084 SHA512 a1b970cd798faf30c1b565faa10019222913a2c92393e3f218a6d2ed34f91a0f491efee86b5e51c23b3688c09f836295c914c790a16529dc6dc821e6039cb474 WHIRLPOOL cd9f311ffbb0576e3714b1c4a33ace876adb3473f0278a52211869b0adc308fd2fe51ca4f7281de097637db7df030b5a8b467db1d51c349be5e6fdae118734c5
+DIST vivaldi-1.0.270.16_p1-amd64.deb 40949174 SHA256 1c3990d3eadbf3fbbb55cc52137ee03c347237c36e294bddbc965d97e64f83dc SHA512 befd6613d0c83b6eb8a7f04d899a52bc193f852d9660111efddbf42b429091501f3371a75f6ac4c684c9a9174932d647107636048bd8b6726e1e689e4d3029a6 WHIRLPOOL 5e29ff5f6453bbfc60060b371be878d240ff9197c5e112b53c037605d9854e406b20cf92695b8a5dde323fb301efd0ada362c6dd0cf0a71b7141b1b464b74a16
+DIST vivaldi-1.0.270.16_p1-i386.deb 41085818 SHA256 0b107e780546b8c5f6f0dbebd4fe552b5ea1b1a1b7447c4b391f73e3f7290a95 SHA512 93f14b285cb6e676082a52ca4084e3c35bc5904749a64223c7dd237198ea8c472edbf44d9fd74d72e1a97a2c0c67c00d31373cd807a750388c3c5391d499fb34 WHIRLPOOL 3f8660b226fec68938b0e5318a1f9c0175dac8ecfc501bb00fef252fdf9924ea3492ba132f78af0b7a86fdd5c5c79b45fc997f6bc272d1234fc96d2125f2b3c0
diff --git a/www-client/vivaldi/vivaldi-1.0.249.12_p1.ebuild b/www-client/vivaldi/vivaldi-1.0.264.3_p1.ebuild
index 69c1403533e0..69c1403533e0 100644
--- a/www-client/vivaldi/vivaldi-1.0.249.12_p1.ebuild
+++ b/www-client/vivaldi/vivaldi-1.0.264.3_p1.ebuild
diff --git a/www-client/vivaldi/vivaldi-1.0.252.3_p1.ebuild b/www-client/vivaldi/vivaldi-1.0.270.16_p1.ebuild
index 69c1403533e0..69c1403533e0 100644
--- a/www-client/vivaldi/vivaldi-1.0.252.3_p1.ebuild
+++ b/www-client/vivaldi/vivaldi-1.0.270.16_p1.ebuild
diff --git a/www-client/xombrero/xombrero-9999.ebuild b/www-client/xombrero/xombrero-9999.ebuild
index fe08580db5c4..9c47df1e5360 100644
--- a/www-client/xombrero/xombrero-9999.ebuild
+++ b/www-client/xombrero/xombrero-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -54,8 +54,12 @@ src_prepare() {
 	sed -i \
 		-e 's/-O2//' \
 		-e 's/-ggdb3//' \
+		-e 's#/usr/local#/usr#' \
 		Makefile || die 'sed Makefile failed.'
 	sed -i \
+		-e 's#/usr/local#/usr#' \
+		GNUmakefile || die 'sed GNUmakefile failed.'
+	sed -i \
 		-e 's#https://www\.cyphertite\.com#https://www.gentoo.org/#' \
 		-e "s#/usr/local#/usr#" \
 		../xombrero.h || die 'sed ../xombrero.c failed.'
diff --git a/www-plugins/chrome-binary-plugins/Manifest b/www-plugins/chrome-binary-plugins/Manifest
index db7685f6243d..623be478d031 100644
--- a/www-plugins/chrome-binary-plugins/Manifest
+++ b/www-plugins/chrome-binary-plugins/Manifest
@@ -1,6 +1,6 @@
-DIST google-chrome-beta_46.0.2490.13-1_amd64.deb 47363696 SHA256 63010b3943488ff18be386afc037ff15acc8824d8fc3c43c985db717b6345d7a SHA512 8969d71f98ecf8f171447ae2f79a41ed75be089f303354bc97c83b38adf2f056e830c673f655c9dae3c82a3b6052e87c6e9a14c9b7b9d9f836f9481249d97681 WHIRLPOOL fa62b5eaba91a4da3e67f49d147debaaf48aaa39c6370270d36e46846936394288cd73c58974cf5513b64e76e52cb3dc559dfd1a7fd1df9c74e597244be096aa
-DIST google-chrome-beta_46.0.2490.13-1_i386.deb 46853842 SHA256 8bd65cd1bdfa55a74c67dbd194ab94fcef3e788a3fc9e287019ebcf41294f99c SHA512 0c292a15e5fbf7c51c4b9a2778ed0cd79690c9296d77b2ff32a3a3e0fe778d47c48db8b82871f1d855f72a6fac241f6efd1e9b91496acd26c1c37ea1604cbad6 WHIRLPOOL 5c46e9015ad88451aaf4ed33855795d9ac4a2127f0c915fdab7f0477b6a69bfccded50f9a72495952cbe223c127c1877315132f173423dede2ce436f281fb922
+DIST google-chrome-beta_46.0.2490.22-1_amd64.deb 47444702 SHA256 7c89f77cf3aef24cea2669d3090921ab0b1fcb708fc829acb25ad8ee0c968e6e SHA512 83947209eb05cc245a11b233e3dff69151d2ec22c6bcbf93697ca5c37a0b21321dd8dec995173f2df5c075917c1f55f3f0405250576cbea87cd1f7f5a80ec0e3 WHIRLPOOL 2c7f4ca6bd1f2b2e7dc5d31d6f7801987b198e16be551095b6a31ae036d703da44cee5f3121ccc998ed8d4edcd3393135c11dbc64496cb95b5681df5ccee2092
+DIST google-chrome-beta_46.0.2490.22-1_i386.deb 46838986 SHA256 5a30d9c09677f09de07aba3c8b94237fe65fe1c2e2753fa93d30660c668e9578 SHA512 c0f65fbbfed5d495fff163d9d327a912013abd704e9d0112bcd54da2813666a2c762edd433f87fd212162c11a216917289fb4d8582dae008ff0c423ebc09bae8 WHIRLPOOL dca8318df4630b30787e48c55a2e9c7de5cd5a77d12d6e1cb57a07caf9b0f107925faaf80c478cda3f1a3346c03c7e5d6dd90f8b752713da0f7fe692296cb5df
 DIST google-chrome-stable_45.0.2454.85-1_amd64.deb 47970800 SHA256 01873f603b06a7f431c957eef912ba8713339a0dfff5003612e1fa91ef54c334 SHA512 6d49859e4adb67639fa9dc93076f598fa084da6447ceabd58b5f499564659bd6db0b4079c3192c78b713da170454a542184bab866fe5968eb6d419fec4f212ef WHIRLPOOL 53baded2a119507f237b0a8c77239c692e240a4c9a1de46bcc0ac62218c53b947a295a983391cb2269b4509d6ef366ad58b0928a3759ad930aec0e6894984246
 DIST google-chrome-stable_45.0.2454.85-1_i386.deb 47646372 SHA256 3bf8a47a853cfdc0bf8c0712371d7c9ec52b43166265aa5d73bc0055cca985a4 SHA512 76f82e7deea32112fc16ed37609ed00e8a158ab5a89f9766fb97b60bc914d1a9d983cfd54b24ea1ead0170da7573ddaf120a1077235a06db9f34f40284d47732 WHIRLPOOL 7db5e7920a2c0e325351c1fbc97ded749e9818807c72b58fe53e0b558f6771febe4a5a38ed1ba86b301e425ea26c03f7f7395ddd77e6e7968903f3d05c071d26
-DIST google-chrome-unstable_47.0.2498.0-1_amd64.deb 47037554 SHA256 a52105bbe58406a1a799477209e67bcf4b435c37ebe68ccc05538d045b01a6d7 SHA512 d6e2e6e97977ad5d2664a9593cc4fcac4e2262326cbbd7964c3b4be883d1844a5f506aaac82343bbed4cd45600b976f088a7f34f49fa28df8f784845eba17363 WHIRLPOOL 8f50f79b92ec3d440f261095c5b4dde0ec61bbcd962f6237fe671ba107d11b8291e57a17c468431c634df59b0767a15776a1e6d54a95ac16f6991fa89e604e23
-DIST google-chrome-unstable_47.0.2498.0-1_i386.deb 46815526 SHA256 07dbc17f698853885c07fd2a5d9b9d761fe97fdfe5cdcfcc338ee9efe1ae5a96 SHA512 c3b63b90e18265fd31892a26daf07fc3268dc645981e0440967a0e55bbd5e89aeecda000cb2ab12d992b968b3847928775ab57d2ded4c615fe548a8f88bcaab0 WHIRLPOOL 5a45d17b7a23feba15e7cf89def0905ee96fe17e3b74130dbde110c9e75cf023f66a78ffeae3c99b7399cf9b8202551c0c305e156cf76c96299e86c7961d5668
+DIST google-chrome-unstable_47.0.2503.0-1_amd64.deb 46995462 SHA256 b3ed506f588f8785ee0db41438b27a82130ccc142b82d02bfc9c81233350b533 SHA512 c22b5f4732a408b078cfb7711c2badf3eb8a0f61959330eff137f3ff87e0cb743a2b749db96ebb510f31c86fcfe69fedddc096a5199e1332ad3f5d0ac52d8ea9 WHIRLPOOL 48bd2c01e5a0445981e426f7272ac5ba7d112f3552c7b37a8ecbd86c4112af985ca494862b0d7d70f578dedb068a8aa75684a8b967c201ad1b4c2c37e97a9429
+DIST google-chrome-unstable_47.0.2503.0-1_i386.deb 47023532 SHA256 d4ca53eace8e13cf5d8aa213a840dc8ff736b0d03ace857928cc8e1ede216055 SHA512 db2c9e9b0e7b747c82a732ba3022dd0806086fe2f11605bec7f7321f6a7d4a3f2fb3d61c395f5673fa5985d14e679753bff1a575f7e93c61b47db4b3bd75b883 WHIRLPOOL 094567bc37845946bbc4e68e73cd2cff3c04ab4584808d763879ba2d978d0fd60abbb840f3ced20c65dc8712f36a411baf12127caafa014687f6ed5512b2a8b2
diff --git a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-45.0.2454.85_p1.ebuild b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-45.0.2454.85_p1.ebuild
index 6cc1fb551149..a3cec8396f86 100644
--- a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-45.0.2454.85_p1.ebuild
+++ b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-45.0.2454.85_p1.ebuild
@@ -80,9 +80,6 @@ src_install() {
 		doins libwidevinecdm.so
 		strings ./chrome | grep -C 1 " (version:" | tail -1 > widevine.version
 		doins widevine.version
-		einfo "Please note that if you intend to use this with www-clients/chromium,"
-		einfo "you'll need to enable the widevine USE flag there as well, in order to"
-		einfo "utilize the widevine USE flag that's been used here."
 	fi
 
 	if use flash; then
diff --git a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-46.0.2490.13_beta1.ebuild b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-46.0.2490.13_beta1.ebuild
deleted file mode 100644
index 6954b2c8b0ea..000000000000
--- a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-46.0.2490.13_beta1.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit multilib unpacker
-
-DESCRIPTION="Binary plugins from Google Chrome for use in Chromium"
-HOMEPAGE="https://www.google.com/chrome"
-
-case ${PV} in
-	*_alpha*|9999*)
-		SLOT="unstable"
-		CHROMEDIR="opt/google/chrome-${SLOT}"
-		MY_PV=${PV/_alpha/-}
-		;;
-	*_beta*)
-		SLOT="beta"
-		CHROMEDIR="opt/google/chrome-${SLOT}"
-		MY_PV=${PV/_beta/-}
-		;;
-	*_p*)
-		SLOT="stable"
-		CHROMEDIR="opt/google/chrome"
-		MY_PV=${PV/_p/-}
-		;;
-	*)
-		die "Invalid value for \${PV}: ${PV}"
-		;;
-esac
-
-MY_PN="google-chrome-${SLOT}"
-MY_P="${MY_PN}_${MY_PV}"
-
-if [[ ${PV} != 9999* ]]; then
-SRC_URI="
-	amd64? (
-		https://dl.google.com/linux/chrome/deb/pool/main/g/${MY_PN}/${MY_P}_amd64.deb
-	)
-	x86? (
-		https://dl.google.com/linux/chrome/deb/pool/main/g/${MY_PN}/${MY_P}_i386.deb
-	)
-"
-KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="google-chrome"
-IUSE="+flash +widevine"
-RESTRICT="bindist mirror strip"
-
-for x in 0 beta stable unstable; do
-	if [[ ${SLOT} != ${x} ]]; then
-		RDEPEND+=" !${CATEGORY}/${PN}:${x}"
-	fi
-done
-
-S="${WORKDIR}/${CHROMEDIR}"
-QA_PREBUILT="*"
-
-pkg_nofetch() {
-	eerror "Please wait 24 hours and sync your portage tree before reporting fetch failures."
-}
-
-if [[ ${PV} == 9999* ]]; then
-src_unpack() {
-	local base="https://dl.google.com/linux/direct"
-	local debarch=${ARCH/x86/i386}
-	wget -O google-chrome.deb "${base}/google-chrome-${SLOT}_current_${debarch}.deb" || die
-	unpack_deb ./google-chrome.deb
-}
-fi
-
-src_install() {
-	local version flapper
-
-	insinto /usr/$(get_libdir)/chromium-browser/
-
-	if use widevine; then
-		doins libwidevinecdm.so
-		strings ./chrome | grep -C 1 " (version:" | tail -1 > widevine.version
-		doins widevine.version
-		einfo "Please note that if you intend to use this with www-clients/chromium,"
-		einfo "you'll need to enable the widevine USE flag there as well, in order to"
-		einfo "utilize the widevine USE flag that's been used here."
-	fi
-
-	if use flash; then
-		doins -r PepperFlash
-
-		# Since this is a live ebuild, we're forced to, unfortuantely,
-		# dynamically construct the command line args for Chromium.
-		version=$(sed -n 's/.*"version": "\(.*\)",.*/\1/p' PepperFlash/manifest.json)
-		flapper="${ROOT}usr/$(get_libdir)/chromium-browser/PepperFlash/libpepflashplayer.so"
-		echo -n "CHROMIUM_FLAGS=\"\${CHROMIUM_FLAGS} " > pepper-flash
-		echo -n "--ppapi-flash-path=$flapper " >> pepper-flash
-		echo "--ppapi-flash-version=$version\"" >> pepper-flash
-
-		insinto /etc/chromium/
-		doins pepper-flash
-	fi
-}
diff --git a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-46.0.2490.22_beta1.ebuild b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-46.0.2490.22_beta1.ebuild
new file mode 100644
index 000000000000..0d9e442ee50b
--- /dev/null
+++ b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-46.0.2490.22_beta1.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit multilib unpacker
+
+DESCRIPTION="Binary plugins from Google Chrome for use in Chromium"
+HOMEPAGE="https://www.google.com/chrome"
+
+case ${PV} in
+	*_alpha*|9999*)
+		SLOT="unstable"
+		CHROMEDIR="opt/google/chrome-${SLOT}"
+		MY_PV=${PV/_alpha/-}
+		;;
+	*_beta*)
+		SLOT="beta"
+		CHROMEDIR="opt/google/chrome-${SLOT}"
+		MY_PV=${PV/_beta/-}
+		;;
+	*_p*)
+		SLOT="stable"
+		CHROMEDIR="opt/google/chrome"
+		MY_PV=${PV/_p/-}
+		;;
+	*)
+		die "Invalid value for \${PV}: ${PV}"
+		;;
+esac
+
+MY_PN="google-chrome-${SLOT}"
+MY_P="${MY_PN}_${MY_PV}"
+
+if [[ ${PV} != 9999* ]]; then
+SRC_URI="
+	amd64? (
+		https://dl.google.com/linux/chrome/deb/pool/main/g/${MY_PN}/${MY_P}_amd64.deb
+	)
+	x86? (
+		https://dl.google.com/linux/chrome/deb/pool/main/g/${MY_PN}/${MY_P}_i386.deb
+	)
+"
+KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="google-chrome"
+IUSE="+flash +widevine"
+RESTRICT="bindist mirror strip"
+
+for x in 0 beta stable unstable; do
+	if [[ ${SLOT} != ${x} ]]; then
+		RDEPEND+=" !${CATEGORY}/${PN}:${x}"
+	fi
+done
+
+S="${WORKDIR}/${CHROMEDIR}"
+QA_PREBUILT="*"
+
+pkg_nofetch() {
+	eerror "Please wait 24 hours and sync your portage tree before reporting fetch failures."
+}
+
+if [[ ${PV} == 9999* ]]; then
+src_unpack() {
+	local base="https://dl.google.com/linux/direct"
+	local debarch=${ARCH/x86/i386}
+	wget -O google-chrome.deb "${base}/google-chrome-${SLOT}_current_${debarch}.deb" || die
+	unpack_deb ./google-chrome.deb
+}
+fi
+
+src_install() {
+	local version flapper
+
+	insinto /usr/$(get_libdir)/chromium-browser/
+
+	if use widevine; then
+		doins libwidevinecdm.so
+		strings ./chrome | grep -C 1 " (version:" | tail -1 > widevine.version
+		doins widevine.version
+	fi
+
+	if use flash; then
+		doins -r PepperFlash
+
+		# Since this is a live ebuild, we're forced to, unfortuantely,
+		# dynamically construct the command line args for Chromium.
+		version=$(sed -n 's/.*"version": "\(.*\)",.*/\1/p' PepperFlash/manifest.json)
+		flapper="${ROOT}usr/$(get_libdir)/chromium-browser/PepperFlash/libpepflashplayer.so"
+		echo -n "CHROMIUM_FLAGS=\"\${CHROMIUM_FLAGS} " > pepper-flash
+		echo -n "--ppapi-flash-path=$flapper " >> pepper-flash
+		echo "--ppapi-flash-version=$version\"" >> pepper-flash
+
+		insinto /etc/chromium/
+		doins pepper-flash
+	fi
+}
diff --git a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-47.0.2498.0_alpha1.ebuild b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-47.0.2498.0_alpha1.ebuild
deleted file mode 100644
index 6954b2c8b0ea..000000000000
--- a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-47.0.2498.0_alpha1.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit multilib unpacker
-
-DESCRIPTION="Binary plugins from Google Chrome for use in Chromium"
-HOMEPAGE="https://www.google.com/chrome"
-
-case ${PV} in
-	*_alpha*|9999*)
-		SLOT="unstable"
-		CHROMEDIR="opt/google/chrome-${SLOT}"
-		MY_PV=${PV/_alpha/-}
-		;;
-	*_beta*)
-		SLOT="beta"
-		CHROMEDIR="opt/google/chrome-${SLOT}"
-		MY_PV=${PV/_beta/-}
-		;;
-	*_p*)
-		SLOT="stable"
-		CHROMEDIR="opt/google/chrome"
-		MY_PV=${PV/_p/-}
-		;;
-	*)
-		die "Invalid value for \${PV}: ${PV}"
-		;;
-esac
-
-MY_PN="google-chrome-${SLOT}"
-MY_P="${MY_PN}_${MY_PV}"
-
-if [[ ${PV} != 9999* ]]; then
-SRC_URI="
-	amd64? (
-		https://dl.google.com/linux/chrome/deb/pool/main/g/${MY_PN}/${MY_P}_amd64.deb
-	)
-	x86? (
-		https://dl.google.com/linux/chrome/deb/pool/main/g/${MY_PN}/${MY_P}_i386.deb
-	)
-"
-KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="google-chrome"
-IUSE="+flash +widevine"
-RESTRICT="bindist mirror strip"
-
-for x in 0 beta stable unstable; do
-	if [[ ${SLOT} != ${x} ]]; then
-		RDEPEND+=" !${CATEGORY}/${PN}:${x}"
-	fi
-done
-
-S="${WORKDIR}/${CHROMEDIR}"
-QA_PREBUILT="*"
-
-pkg_nofetch() {
-	eerror "Please wait 24 hours and sync your portage tree before reporting fetch failures."
-}
-
-if [[ ${PV} == 9999* ]]; then
-src_unpack() {
-	local base="https://dl.google.com/linux/direct"
-	local debarch=${ARCH/x86/i386}
-	wget -O google-chrome.deb "${base}/google-chrome-${SLOT}_current_${debarch}.deb" || die
-	unpack_deb ./google-chrome.deb
-}
-fi
-
-src_install() {
-	local version flapper
-
-	insinto /usr/$(get_libdir)/chromium-browser/
-
-	if use widevine; then
-		doins libwidevinecdm.so
-		strings ./chrome | grep -C 1 " (version:" | tail -1 > widevine.version
-		doins widevine.version
-		einfo "Please note that if you intend to use this with www-clients/chromium,"
-		einfo "you'll need to enable the widevine USE flag there as well, in order to"
-		einfo "utilize the widevine USE flag that's been used here."
-	fi
-
-	if use flash; then
-		doins -r PepperFlash
-
-		# Since this is a live ebuild, we're forced to, unfortuantely,
-		# dynamically construct the command line args for Chromium.
-		version=$(sed -n 's/.*"version": "\(.*\)",.*/\1/p' PepperFlash/manifest.json)
-		flapper="${ROOT}usr/$(get_libdir)/chromium-browser/PepperFlash/libpepflashplayer.so"
-		echo -n "CHROMIUM_FLAGS=\"\${CHROMIUM_FLAGS} " > pepper-flash
-		echo -n "--ppapi-flash-path=$flapper " >> pepper-flash
-		echo "--ppapi-flash-version=$version\"" >> pepper-flash
-
-		insinto /etc/chromium/
-		doins pepper-flash
-	fi
-}
diff --git a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-47.0.2503.0_alpha1.ebuild b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-47.0.2503.0_alpha1.ebuild
new file mode 100644
index 000000000000..0d9e442ee50b
--- /dev/null
+++ b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-47.0.2503.0_alpha1.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit multilib unpacker
+
+DESCRIPTION="Binary plugins from Google Chrome for use in Chromium"
+HOMEPAGE="https://www.google.com/chrome"
+
+case ${PV} in
+	*_alpha*|9999*)
+		SLOT="unstable"
+		CHROMEDIR="opt/google/chrome-${SLOT}"
+		MY_PV=${PV/_alpha/-}
+		;;
+	*_beta*)
+		SLOT="beta"
+		CHROMEDIR="opt/google/chrome-${SLOT}"
+		MY_PV=${PV/_beta/-}
+		;;
+	*_p*)
+		SLOT="stable"
+		CHROMEDIR="opt/google/chrome"
+		MY_PV=${PV/_p/-}
+		;;
+	*)
+		die "Invalid value for \${PV}: ${PV}"
+		;;
+esac
+
+MY_PN="google-chrome-${SLOT}"
+MY_P="${MY_PN}_${MY_PV}"
+
+if [[ ${PV} != 9999* ]]; then
+SRC_URI="
+	amd64? (
+		https://dl.google.com/linux/chrome/deb/pool/main/g/${MY_PN}/${MY_P}_amd64.deb
+	)
+	x86? (
+		https://dl.google.com/linux/chrome/deb/pool/main/g/${MY_PN}/${MY_P}_i386.deb
+	)
+"
+KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="google-chrome"
+IUSE="+flash +widevine"
+RESTRICT="bindist mirror strip"
+
+for x in 0 beta stable unstable; do
+	if [[ ${SLOT} != ${x} ]]; then
+		RDEPEND+=" !${CATEGORY}/${PN}:${x}"
+	fi
+done
+
+S="${WORKDIR}/${CHROMEDIR}"
+QA_PREBUILT="*"
+
+pkg_nofetch() {
+	eerror "Please wait 24 hours and sync your portage tree before reporting fetch failures."
+}
+
+if [[ ${PV} == 9999* ]]; then
+src_unpack() {
+	local base="https://dl.google.com/linux/direct"
+	local debarch=${ARCH/x86/i386}
+	wget -O google-chrome.deb "${base}/google-chrome-${SLOT}_current_${debarch}.deb" || die
+	unpack_deb ./google-chrome.deb
+}
+fi
+
+src_install() {
+	local version flapper
+
+	insinto /usr/$(get_libdir)/chromium-browser/
+
+	if use widevine; then
+		doins libwidevinecdm.so
+		strings ./chrome | grep -C 1 " (version:" | tail -1 > widevine.version
+		doins widevine.version
+	fi
+
+	if use flash; then
+		doins -r PepperFlash
+
+		# Since this is a live ebuild, we're forced to, unfortuantely,
+		# dynamically construct the command line args for Chromium.
+		version=$(sed -n 's/.*"version": "\(.*\)",.*/\1/p' PepperFlash/manifest.json)
+		flapper="${ROOT}usr/$(get_libdir)/chromium-browser/PepperFlash/libpepflashplayer.so"
+		echo -n "CHROMIUM_FLAGS=\"\${CHROMIUM_FLAGS} " > pepper-flash
+		echo -n "--ppapi-flash-path=$flapper " >> pepper-flash
+		echo "--ppapi-flash-version=$version\"" >> pepper-flash
+
+		insinto /etc/chromium/
+		doins pepper-flash
+	fi
+}
diff --git a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-9999.ebuild b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-9999.ebuild
index 6954b2c8b0ea..0d9e442ee50b 100644
--- a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-9999.ebuild
+++ b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-9999.ebuild
@@ -80,9 +80,6 @@ src_install() {
 		doins libwidevinecdm.so
 		strings ./chrome | grep -C 1 " (version:" | tail -1 > widevine.version
 		doins widevine.version
-		einfo "Please note that if you intend to use this with www-clients/chromium,"
-		einfo "you'll need to enable the widevine USE flag there as well, in order to"
-		einfo "utilize the widevine USE flag that's been used here."
 	fi
 
 	if use flash; then
diff --git a/www-servers/apache/apache-2.2.31.ebuild b/www-servers/apache/apache-2.2.31.ebuild
index 4b3ab2d78f75..414698f3de2f 100644
--- a/www-servers/apache/apache-2.2.31.ebuild
+++ b/www-servers/apache/apache-2.2.31.ebuild
@@ -89,7 +89,7 @@ HOMEPAGE="http://httpd.apache.org/"
 # some helper scripts are Apache-1.1, thus both are here
 LICENSE="Apache-2.0 Apache-1.1"
 SLOT="2"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
 IUSE=""
 
 src_configure() {
diff --git a/www-servers/resin/resin-4.0.44-r2.ebuild b/www-servers/resin/resin-4.0.44-r2.ebuild
deleted file mode 100644
index a02ac2496a8f..000000000000
--- a/www-servers/resin/resin-4.0.44-r2.ebuild
+++ /dev/null
@@ -1,199 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-JAVA_PKG_IUSE="source"
-
-inherit java-pkg-2 java-ant-2 eutils flag-o-matic multilib user
-
-DESCRIPTION="A fast Servlet and JSP engine"
-HOMEPAGE="http://www.caucho.com"
-SRC_URI="http://www.caucho.com/download/${P}-src.zip"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="admin doc"
-
-KEYWORDS="~amd64 ~x86"
-
-CDEPEND="dev-java/resin-servlet-api:3.0
-	dev-java/jsr101:0
-	dev-java/mojarra:2.2
-	dev-java/oracle-javamail:0
-	dev-java/validation-api:1.0
-	dev-java/glassfish-xmlrpc-api:0
-	dev-java/glassfish-deployment-api:1.2"
-
-RDEPEND=">=virtual/jre-1.6
-	${CDEPEND}"
-DEPEND=">=virtual/jdk-1.6
-	app-arch/unzip
-	dev-libs/openssl
-	dev-java/ant-core:0
-	${CDEPEND}"
-
-RESIN_HOME="/usr/$(get_libdir)/resin"
-
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-
-EANT_GENTOO_CLASSPATH="
-jsr101
-mojarra-2.2
-oracle-javamail
-validation-api-1.0
-glassfish-xmlrpc-api
-resin-servlet-api-3.0
-glassfish-deployment-api-1.2"
-
-PATCHES=(
-	"${FILESDIR}"/"${PV}"/resin-compile.patch
-	"${FILESDIR}"/"${PV}"/build.xml.patch
-)
-
-pkg_setup() {
-	java-pkg-2_pkg_setup
-	enewgroup resin
-	enewuser resin -1 /bin/bash ${RESIN_HOME} resin
-}
-
-src_prepare() {
-	local vm_version=$(java-pkg_get-vm-version)
-
-	# #558442.
-	if [[ "${vm_version}" == "1.8" ]]; then
-		PATCHES+=("${FILESDIR}"/"${PV}"/VarType.java.patch)
-	fi
-
-	epatch "${PATCHES[@]}"
-
-	# No bundled JARs!
-	rm -f "${S}/modules/ext/"*.jar || die
-	rm -rf "${S}/project-jars" || die
-
-	java-ant_bsfix_one "${S}/build.xml"
-	java-ant_bsfix_one "${S}/build-common.xml"
-
-	rm -rf lib/* || die
-
-	java-pkg_jar-from --into lib jsr101
-	java-pkg_jar-from --into lib mojarra-1.2
-	java-pkg_jar-from --into lib oracle-javamail
-	java-pkg_jar-from --into lib validation-api-1.0
-	java-pkg_jar-from --into lib glassfish-xmlrpc-api
-	java-pkg_jar-from --into lib glassfish-deployment-api-1.2
-	java-pkg_jar-from --into lib resin-servlet-api-3.0 resin-servlet-api.jar
-
-	ln -s $(java-config --jdk-home)/lib/tools.jar || die
-}
-
-src_configure() {
-	append-flags -fPIC -DPIC
-
-	chmod 755 "${S}/configure" || die
-	econf --prefix=${RESIN_HOME} || die "econf failed"
-}
-
-src_compile() {
-	einfo "Building libraries..."
-	emake || die "make failed"
-
-	einfo "Building jars..."
-	eant || die "ant failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "Install failed"
-
-	einfo "Moving configuration to /etc ..."
-	dodir /etc/
-	mv "${D}/${RESIN_HOME}/conf" "${D}/etc/resin" || die "mv of conf failed"
-	dosym /etc/resin ${RESIN_HOME}/conf
-
-	einfo "Rewriting resin.xml ..."
-	sed -i \
-		-e 's,${resin.root}/doc/resin-doc,webapps/resin-doc,' \
-		-e 's,${resin.root}/doc/admin,webapps/admin,' \
-		"${D}/etc/resin/resin.xml" || die
-
-	einfo "Fixing log directory ..."
-	rm -rf "${D}/${RESIN_HOME}/log" || die
-	keepdir /var/log/resin
-	dosym /var/log/resin ${RESIN_HOME}/log
-
-	einfo "Installing basic documentation ..."
-	dodoc README "${S}"/conf/*.xml
-
-	einfo "Installing init.d script ..."
-	newinitd "${FILESDIR}/${PV}/resin.init" resin
-	newconfd "${FILESDIR}/${PV}/resin.conf" resin
-
-	sed -i -e "s,__RESIN_HOME__,${RESIN_HOME},g" "${D}/etc/init.d/resin" || die
-
-	einfo "Fixing location of jars ..."
-	rm -f "${S}/lib/tools.jar" || die
-	java-pkg_dojar "${S}"/lib/*.jar
-	rm -fr "${D}/${RESIN_HOME}/lib" || die
-	dosym /usr/share/resin/lib ${RESIN_HOME}/lib
-
-	einfo "Symlinking directories from /var/lib/resin ..."
-	rm -rf "${D}/${RESIN_HOME}/resin-data" || die
-	rm -rf "${D}/${RESIN_HOME}/watchdog-data" || die
-	dodir /var/lib/resin/webapps
-	keepdir /var/lib/resin/hosts
-	keepdir /var/lib/resin/resin-data
-	keepdir /var/lib/resin/watchdog-data
-	mv "${D}"/${RESIN_HOME}/webapps/* "${D}/var/lib/resin/webapps" || \
-		die "mv of webapps failed"
-	rm -rf "${D}/${RESIN_HOME}/webapps" || die
-	dosym /var/lib/resin/webapps ${RESIN_HOME}/webapps
-	dosym /var/lib/resin/hosts ${RESIN_HOME}/hosts
-	dosym /var/lib/resin/resin-data ${RESIN_HOME}/resin-data
-	dosym /var/lib/resin/watchdog-data ${RESIN_HOME}/watchdog-data
-
-	dosym \
-		"$(java-pkg_getjar resin-servlet-api-3.0 resin-servlet-api.jar)" \
-		"${JAVA_PKG_JARDEST}/resin-servlet-api.jar"
-
-	use admin && {
-		einfo "Installing administration app ..."
-		cp -a "${S}/doc/admin" "${D}/var/lib/resin/webapps/" || die
-	}
-	use doc && {
-		einfo "Installing documentation app ..."
-		cp -a "${S}/doc/resin-doc" "${D}/var/lib/resin/webapps/" || die
-	}
-
-	use source && {
-		einfo "Installing sources ..."
-		java-pkg_dosrc "${S}"/modules/*/src/* > /dev/null
-	}
-
-	einfo "Removing stale directories ..."
-	rm -fr "${D}/${RESIN_HOME}/bin" || die
-	rm -fr "${D}/${RESIN_HOME}/doc" || die
-	rm -fr "${D}/${RESIN_HOME}/keys" || die
-	rm -fr "${D}/${RESIN_HOME}/licenses" || die
-	rm -fr "${D}/etc/resin/"*.orig || die
-
-	einfo "Fixing ownerships and permissions ..."
-	fowners -R 0:root /
-	fowners -R resin:resin /etc/resin
-	fowners -R resin:resin /var/lib/resin
-	fowners -R resin:resin /var/log/resin
-
-	fperms 644 /etc/conf.d/resin
-	fperms 755 /etc/init.d/resin
-	fperms 750 /var/lib/resin
-	fperms 750 /etc/resin
-}
-
-pkg_postinst() {
-	elog
-	elog " User and group 'resin' have been added."
-	elog
-	elog " By default, Resin runs on port 8080. You can change this"
-	elog " value by editing /etc/resin/resin.properties."
-	elog
-}
diff --git a/www-servers/resin/resin-4.0.44-r3.ebuild b/www-servers/resin/resin-4.0.44-r3.ebuild
new file mode 100644
index 000000000000..93b73cc83077
--- /dev/null
+++ b/www-servers/resin/resin-4.0.44-r3.ebuild
@@ -0,0 +1,191 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+JAVA_PKG_IUSE="source"
+
+inherit java-pkg-2 java-ant-2 eutils flag-o-matic multilib user
+
+DESCRIPTION="A fast Servlet and JSP engine"
+HOMEPAGE="http://www.caucho.com"
+SRC_URI="http://www.caucho.com/download/${P}-src.zip"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="admin doc"
+
+KEYWORDS="~amd64 ~x86"
+
+CDEPEND="dev-java/resin-servlet-api:3.0
+	dev-java/jsr101:0
+	dev-java/mojarra:2.2
+	dev-java/oracle-javamail:0
+	dev-java/validation-api:1.0
+	dev-java/glassfish-xmlrpc-api:0
+	dev-java/glassfish-deployment-api:1.2"
+
+RDEPEND=">=virtual/jre-1.6
+	${CDEPEND}"
+DEPEND=">=virtual/jdk-1.6
+	app-arch/unzip
+	dev-libs/openssl
+	dev-java/ant-core:0
+	${CDEPEND}"
+
+RESIN_HOME="/usr/$(get_libdir)/resin"
+
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+
+EANT_GENTOO_CLASSPATH="
+jsr101
+mojarra-2.2
+oracle-javamail
+validation-api-1.0
+glassfish-xmlrpc-api
+resin-servlet-api-3.0
+glassfish-deployment-api-1.2"
+
+PATCHES=(
+	"${FILESDIR}"/"${PV}"/resin-compile.patch
+	"${FILESDIR}"/"${PV}"/build.xml.patch
+)
+
+pkg_setup() {
+	java-pkg-2_pkg_setup
+	enewgroup resin
+	enewuser resin -1 /bin/bash ${RESIN_HOME} resin
+}
+
+src_prepare() {
+	local vm_version=$(java-pkg_get-vm-version)
+
+	# #558442.
+	if [[ "${vm_version}" == "1.8" ]]; then
+		PATCHES+=("${FILESDIR}"/"${PV}"/VarType.java.patch)
+	fi
+
+	epatch "${PATCHES[@]}"
+
+	# No bundled JARs!
+	rm -f "${S}/modules/ext/"*.jar || die
+	rm -rf "${S}/project-jars" || die
+
+	java-ant_bsfix_one "${S}/build.xml"
+	java-ant_bsfix_one "${S}/build-common.xml"
+
+	rm -rf lib/* || die
+
+	ln -s $(java-config --jdk-home)/lib/tools.jar || die
+}
+
+src_configure() {
+	append-flags -fPIC -DPIC
+
+	chmod 755 "${S}/configure" || die
+	econf --prefix=${RESIN_HOME} || die "econf failed"
+}
+
+src_compile() {
+	einfo "Building libraries..."
+	emake || die "make failed"
+
+	einfo "Building jars..."
+	eant || die "ant failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "Install failed"
+
+	einfo "Moving configuration to /etc ..."
+	dodir /etc/
+	mv "${D}/${RESIN_HOME}/conf" "${D}/etc/resin" || die "mv of conf failed"
+	dosym /etc/resin ${RESIN_HOME}/conf
+
+	einfo "Rewriting resin.xml ..."
+	sed -i \
+		-e 's,${resin.root}/doc/resin-doc,webapps/resin-doc,' \
+		-e 's,${resin.root}/doc/admin,webapps/admin,' \
+		"${D}/etc/resin/resin.xml" || die
+
+	einfo "Fixing log directory ..."
+	rm -rf "${D}/${RESIN_HOME}/log" || die
+	keepdir /var/log/resin
+	dosym /var/log/resin ${RESIN_HOME}/log
+
+	einfo "Installing basic documentation ..."
+	dodoc README "${S}"/conf/*.xml
+
+	einfo "Installing init.d script ..."
+	newinitd "${FILESDIR}/${PV}/resin.init" resin
+	newconfd "${FILESDIR}/${PV}/resin.conf" resin
+
+	sed -i -e "s,__RESIN_HOME__,${RESIN_HOME},g" "${D}/etc/init.d/resin" || die
+
+	einfo "Fixing location of jars ..."
+	rm -f "${S}/lib/tools.jar" || die
+	java-pkg_dojar "${S}"/lib/*.jar
+	rm -fr "${D}/${RESIN_HOME}/lib" || die
+	dosym /usr/share/resin/lib ${RESIN_HOME}/lib
+
+	einfo "Symlinking directories from /var/lib/resin ..."
+	rm -rf "${D}/${RESIN_HOME}/resin-data" || die
+	rm -rf "${D}/${RESIN_HOME}/watchdog-data" || die
+	dodir /var/lib/resin/webapps
+	keepdir /var/lib/resin/hosts
+	keepdir /var/lib/resin/resin-data
+	keepdir /var/lib/resin/watchdog-data
+	mv "${D}"/${RESIN_HOME}/webapps/* "${D}/var/lib/resin/webapps" || \
+		die "mv of webapps failed"
+	rm -rf "${D}/${RESIN_HOME}/webapps" || die
+	dosym /var/lib/resin/webapps ${RESIN_HOME}/webapps
+	dosym /var/lib/resin/hosts ${RESIN_HOME}/hosts
+	dosym /var/lib/resin/resin-data ${RESIN_HOME}/resin-data
+	dosym /var/lib/resin/watchdog-data ${RESIN_HOME}/watchdog-data
+
+	dosym \
+		"$(java-pkg_getjar resin-servlet-api-3.0 resin-servlet-api.jar)" \
+		"${JAVA_PKG_JARDEST}/resin-servlet-api.jar"
+
+	use admin && {
+		einfo "Installing administration app ..."
+		cp -a "${S}/doc/admin" "${D}/var/lib/resin/webapps/" || die
+	}
+	use doc && {
+		einfo "Installing documentation app ..."
+		cp -a "${S}/doc/resin-doc" "${D}/var/lib/resin/webapps/" || die
+	}
+
+	use source && {
+		einfo "Installing sources ..."
+		java-pkg_dosrc "${S}"/modules/*/src/* > /dev/null
+	}
+
+	einfo "Removing stale directories ..."
+	rm -fr "${D}/${RESIN_HOME}/bin" || die
+	rm -fr "${D}/${RESIN_HOME}/doc" || die
+	rm -fr "${D}/${RESIN_HOME}/keys" || die
+	rm -fr "${D}/${RESIN_HOME}/licenses" || die
+	rm -fr "${D}/etc/resin/"*.orig || die
+
+	einfo "Fixing ownerships and permissions ..."
+	fowners -R 0:root /
+	fowners -R resin:resin /etc/resin
+	fowners -R resin:resin /var/lib/resin
+	fowners -R resin:resin /var/log/resin
+
+	fperms 644 /etc/conf.d/resin
+	fperms 755 /etc/init.d/resin
+	fperms 750 /var/lib/resin
+	fperms 750 /etc/resin
+}
+
+pkg_postinst() {
+	elog
+	elog " User and group 'resin' have been added."
+	elog
+	elog " By default, Resin runs on port 8080. You can change this"
+	elog " value by editing /etc/resin/resin.properties."
+	elog
+}
diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index ce0df3b99a9d..7f85a7499a83 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -1,7 +1,5 @@
 DIST apache-tomcat-6.0.44-src.tar.gz 3447711 SHA256 c6f01526d58f2ba7b9da496e959d9e68cc49183006077704ab91c36ebebf5a4a SHA512 0d6a1539b28fa8ca3442557889d7d21cc523b18136f6998820ba13f41420536aba65ce78bac526002ee1dd86df3cbc80d9f043a3f765d7cf0b79e58e516030be WHIRLPOOL c65e704466191a0f98ec777e95dda889599ff6a545e7c013fd04bc0b72e0d0edf4491415f243d6a4de60cf76abe5c13ffbcc6d98f78b51490f7b7b43b24ecb97
 DIST apache-tomcat-7.0.59-src.tar.gz 4687344 SHA256 3a1dedda4019db87464fca3aeb4e800a538f0baee96d8b14c9d64967b0d2ea44 SHA512 acc322eee1446dd1bff72910ae9f40a62f88332ee69d6057b3c684e2abf8f28e6df6ab9505900f0b0cf7a5e2e0e80e64b0a790b3b78594ce595ce897706b4bcb WHIRLPOOL 4948964c1746e6ee912ac72c901ba271793610f402bf082455d104e2e8d6dbfa0bf5371d42d48d8ad7c826271fa60d989119a01e700497099022d0cf3564fdff
-DIST apache-tomcat-7.0.63-src.tar.gz 4577737 SHA256 443aa92f2668906fb24cc43ba952068240f445df637a6e5da8d4661527536657 SHA512 677b28aa0131d309aed83afc73a778c16fd27a187e971ea6929b9b6b65268caa2a67cc468b15565a7d5944a60e8528cc26c82437b476ebc41ff9556367349d8a WHIRLPOOL a208ac63ed6f7ce7ac23674d8bb20d523b3fb5d10dfb46d292004f9b296986c4cab690f0252ad53bb4c625c3f58e04b9ddcda5a580fdafea20118b93f544760c
 DIST apache-tomcat-7.0.64-src.tar.gz 4592198 SHA256 d805dec3b387a244c4285ce1f9fc5028bb836716db52f1b1b5036a97dd9ec4dc SHA512 180479b0f5b5604597f850676235fab1f3e63051b503cfa3b4da1e6820505dece73f502249b6e032cfaaad18c9e2d4c057c9854ae5cbf088b214b51e0687ed8c WHIRLPOOL a461d7deae890227052bd83ac97c698821b1f6d6ff97c179b124de9b1b7ccdf1498651a391a03008b840fac730c080682f207db4d44e76d15dba63b266ddee51
 DIST apache-tomcat-8.0.23-src.tar.gz 4868650 SHA256 6293713e78da9bb803060c8ddff982f8f7aef5a2e4b325340088493ce9957ba4 SHA512 cc83194b2847fc2db5448d548c7e65a1198cda02726b070f913a762d324152315886fba09532b879e26d15ec57e04057cc30b3a686b2a2307d6447d17f84e16c WHIRLPOOL b0559a4ef1b4c1f0683e4cce976d31db175d3c4f4d2b809b127e1074d49a6bf764366cc3e91f9a0818afd6de35e662a7aab89866dfd2e61673327c50535bff88
-DIST apache-tomcat-8.0.24-src.tar.gz 4888751 SHA256 184b0d8bda512204a2e565f9175a13f9772a9d13185e1aa228394b45c641474c SHA512 af5619a63db3d1f6d39eb0290c83a38272c31803ee39a40aebfba5f7a0cf67d830ffcbebe518aff8de4a1f8eb44021975d7e43d45b4bd9804e8ca9cfbfc4904a WHIRLPOOL 4d37f4d1fe3ee138252813bd4a65025d0ccceea8aec57aa0c9474ad4902f85938627277f6e4ece30793326c31d7790b0ca0b8d99d7b21857519d7c22c28794e8
 DIST apache-tomcat-8.0.26-src.tar.gz 4904717 SHA256 3725621a73501a6e09438f177acfab7ce11fabeb2b0380a909273410f3b50b3b SHA512 70ef253889916bcca309a8f80675c4c588fef1cc5dc0360c45347107fb56fd546a334ca01e1109775410f7642acf6c75d9887f9403ad4c1d0e30f041f9ce34fb WHIRLPOOL 3c29a5418dfefc12157d8656dfa15a2937668f52d18c21f6dd4a278d2bc4c84d5b6d542daf6244040eabeab57cb759a510b7b1d0e41440a2d9ad62586723dafc
diff --git a/www-servers/tomcat/tomcat-7.0.63.ebuild b/www-servers/tomcat/tomcat-7.0.63.ebuild
deleted file mode 100644
index ec08f2d9754d..000000000000
--- a/www-servers/tomcat/tomcat-7.0.63.ebuild
+++ /dev/null
@@ -1,146 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit eutils java-pkg-2 java-ant-2 prefix user
-
-MY_P="apache-${P}-src"
-
-DESCRIPTION="Tomcat Servlet-3.0/JSP-2.2 Container"
-HOMEPAGE="http://tomcat.apache.org/"
-SRC_URI="mirror://apache/${PN}/tomcat-7/v${PV}/src/${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="7"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="extra-webapps websockets"
-
-RESTRICT="test" # can we run them on a production system?
-
-ECJ_SLOT="4.4"
-SAPI_SLOT="3.0"
-
-COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}
-	dev-java/oracle-javamail:0
-	dev-java/tomcat-servlet-api:${SAPI_SLOT}"
-RDEPEND="${COMMON_DEP}
-	websockets? ( >=virtual/jre-1.7 )
-	!websockets? ( >=virtual/jre-1.6 )
-	!<dev-java/tomcat-native-1.1.24"
-DEPEND="${COMMON_DEP}
-	websockets? ( >=virtual/jdk-1.7 )
-	!websockets? ( >=virtual/jdk-1.6 )
-	test? ( dev-java/ant-junit:0 )"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	java-pkg-2_pkg_setup
-	enewgroup tomcat 265
-	enewuser tomcat 265 -1 /dev/null tomcat
-}
-
-java_prepare() {
-	find -name '*.jar' -type f -delete -print || die
-
-	# Remove bundled javamail, servlet-api
-	rm -rv java/javax/{el,mail,servlet} || die
-
-	epatch "${FILESDIR}/${P}-build.xml.patch"
-
-	# For use of catalina.sh in netbeans
-	sed -i -e "/^# ----- Execute The Requested Command/ a\
-		CLASSPATH=\`java-config --classpath ${PN}-${SLOT}\`" \
-		bin/catalina.sh || die
-}
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-
-EANT_BUILD_TARGET="deploy"
-EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT},oracle-javamail,tomcat-servlet-api-${SAPI_SLOT}"
-EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes"
-EANT_NEEDS_TOOLS="true"
-EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false"
-
-# revisions of the scripts
-IM_REV="-r1"
-INIT_REV="-r1"
-
-src_compile() {
-	use websockets && EANT_EXTRA_ARGS+=" -Djava.7.home=${JAVA_HOME}"
-	EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar)"
-	java-pkg-2_src_compile
-}
-
-src_test() {
-	java-pkg-2_src_test
-}
-
-src_install() {
-	local dest="/usr/share/${PN}-${SLOT}"
-
-	java-pkg_jarinto "${dest}"/bin
-	java-pkg_dojar output/build/bin/*.jar
-	exeinto "${dest}"/bin
-	doexe output/build/bin/*.sh
-
-	java-pkg_jarinto "${dest}"/lib
-	java-pkg_dojar output/build/lib/*.jar
-
-	dodoc RELEASE-NOTES RUNNING.txt
-	use doc && java-pkg_dojavadoc output/dist/webapps/docs/api
-	use source && java-pkg_dosrc java/*
-
-	### Webapps ###
-
-	insinto "${dest}"/webapps
-	doins -r output/build/webapps/{host-manager,manager,ROOT}
-	use extra-webapps && doins -r output/build/webapps/{docs,examples}
-
-	### Config ###
-
-	# create "logs" directory in $CATALINA_BASE
-	# and set correct perms, see #458890
-	dodir "${dest}"/logs
-	fperms 0750 "${dest}"/logs
-
-	# replace the default pw with a random one, see #92281
-	local randpw=$(echo ${RANDOM}|md5sum|cut -c 1-15)
-	sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die
-
-	# prepend gentoo.classpath to common.loader, see #453212
-	sed -i -e 's/^common\.loader=/\0${gentoo.classpath},/' output/build/conf/catalina.properties || die
-
-	insinto "${dest}"
-	doins -r output/build/conf
-
-	### rc ###
-
-	cp "${FILESDIR}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} "${T}" || die
-	eprefixify "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash}
-	sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} || die
-
-	insinto "${dest}"/gentoo
-	doins "${T}"/tomcat.conf
-	exeinto "${dest}"/gentoo
-	newexe "${T}"/tomcat${INIT_REV}.init tomcat.init
-	newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-instance-manager.bash
-}
-
-pkg_postinst() {
-	elog "New ebuilds of Tomcat support running multiple instances. If you used prior version"
-	elog "of Tomcat (<7.0.32), you have to migrate your existing instance to work with new Tomcat."
-	elog "You can find more information at https://wiki.gentoo.org/wiki/Apache_Tomcat"
-
-	elog "To manage Tomcat instances, run:"
-	elog "  ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help"
-
-	ewarn "tomcat-dbcp.jar is not built at this time. Please fetch jar"
-	ewarn "from upstream binary if you need it. Gentoo Bug # 144276"
-
-#	einfo "Please read https://www.gentoo.org/proj/en/java/tomcat6-guide.xml for more information."
-}
diff --git a/www-servers/tomcat/tomcat-8.0.24.ebuild b/www-servers/tomcat/tomcat-8.0.24.ebuild
deleted file mode 100644
index 3074dfa43e93..000000000000
--- a/www-servers/tomcat/tomcat-8.0.24.ebuild
+++ /dev/null
@@ -1,147 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit eutils java-pkg-2 java-ant-2 prefix user
-
-MY_P="apache-${P}-src"
-
-DESCRIPTION="Tomcat Servlet-3.1/JSP-2.3 Container"
-HOMEPAGE="http://tomcat.apache.org/"
-SRC_URI="mirror://apache/${PN}/tomcat-8/v${PV}/src/${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="8"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="extra-webapps"
-
-RESTRICT="test" # can we run them on a production system?
-
-ECJ_SLOT="4.4"
-SAPI_SLOT="3.1"
-
-COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}
-	dev-java/oracle-javamail:0
-	dev-java/tomcat-servlet-api:${SAPI_SLOT}"
-RDEPEND="${COMMON_DEP}
-	!<dev-java/tomcat-native-1.1.24
-	>=virtual/jre-1.7"
-DEPEND="${COMMON_DEP}
-	>=virtual/jdk-1.7
-	test? (
-		>=dev-java/ant-junit-1.9:0
-		dev-java/easymock:3.2
-	)"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	java-pkg-2_pkg_setup
-	enewgroup tomcat 265
-	enewuser tomcat 265 -1 /dev/null tomcat
-}
-
-java_prepare() {
-	find -name '*.jar' -type f -delete -print || die
-
-	# Remove bundled javamail, servlet-api
-	rm -rv java/javax/{el,mail,servlet} || die
-
-	epatch "${FILESDIR}/${P}-build.xml.patch"
-
-	# For use of catalina.sh in netbeans
-	sed -i -e "/^# ----- Execute The Requested Command/ a\
-		CLASSPATH=\`java-config --classpath ${PN}-${SLOT}\`" \
-		bin/catalina.sh || die
-}
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-
-EANT_BUILD_TARGET="deploy"
-EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT},oracle-javamail,tomcat-servlet-api-${SAPI_SLOT}"
-EANT_TEST_GENTOO_CLASSPATH="easymock-3.2"
-EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes"
-EANT_NEEDS_TOOLS="true"
-EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false"
-
-# revisions of the scripts
-IM_REV="-r1"
-INIT_REV="-r1"
-
-src_compile() {
-	EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar)"
-	java-pkg-2_src_compile
-}
-
-src_test() {
-	java-pkg-2_src_test
-}
-
-src_install() {
-	local dest="/usr/share/${PN}-${SLOT}"
-
-	java-pkg_jarinto "${dest}"/bin
-	java-pkg_dojar output/build/bin/*.jar
-	exeinto "${dest}"/bin
-	doexe output/build/bin/*.sh
-
-	java-pkg_jarinto "${dest}"/lib
-	java-pkg_dojar output/build/lib/*.jar
-
-	dodoc RELEASE-NOTES RUNNING.txt
-	use doc && java-pkg_dojavadoc output/dist/webapps/docs/api
-	use source && java-pkg_dosrc java/*
-
-	### Webapps ###
-
-	insinto "${dest}"/webapps
-	doins -r output/build/webapps/{host-manager,manager,ROOT}
-	use extra-webapps && doins -r output/build/webapps/{docs,examples}
-
-	### Config ###
-
-	# create "logs" directory in $CATALINA_BASE
-	# and set correct perms, see #458890
-	dodir "${dest}"/logs
-	fperms 0750 "${dest}"/logs
-
-	# replace the default pw with a random one, see #92281
-	local randpw=$(echo ${RANDOM}|md5sum|cut -c 1-15)
-	sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die
-
-	# prepend gentoo.classpath to common.loader, see #453212
-	sed -i -e 's/^common\.loader=/\0${gentoo.classpath},/' output/build/conf/catalina.properties || die
-
-	insinto "${dest}"
-	doins -r output/build/conf
-
-	### rc ###
-
-	cp "${FILESDIR}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} "${T}" || die
-	eprefixify "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash}
-	sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} || die
-
-	insinto "${dest}"/gentoo
-	doins "${T}"/tomcat.conf
-	exeinto "${dest}"/gentoo
-	newexe "${T}"/tomcat${INIT_REV}.init tomcat.init
-	newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-instance-manager.bash
-}
-
-pkg_postinst() {
-	elog "New ebuilds of Tomcat support running multiple instances. If you used prior version"
-	elog "of Tomcat (<7.0.32), you have to migrate your existing instance to work with new Tomcat."
-	elog "You can find more information at https://wiki.gentoo.org/wiki/Apache_Tomcat"
-
-	elog "To manage Tomcat instances, run:"
-	elog "  ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help"
-
-	ewarn "tomcat-dbcp.jar is not built at this time. Please fetch jar"
-	ewarn "from upstream binary if you need it. Gentoo Bug # 144276"
-
-#	einfo "Please read https://www.gentoo.org/proj/en/java/tomcat6-guide.xml for more information."
-}
diff --git a/x11-apps/mkfontscale/mkfontscale-1.1.2.ebuild b/x11-apps/mkfontscale/mkfontscale-1.1.2.ebuild
index 67a7d3a00866..bb2212c7c2df 100644
--- a/x11-apps/mkfontscale/mkfontscale-1.1.2.ebuild
+++ b/x11-apps/mkfontscale/mkfontscale-1.1.2.ebuild
@@ -16,6 +16,7 @@ RDEPEND="x11-libs/libfontenc
 	sys-libs/zlib
 	app-arch/bzip2"
 DEPEND="${RDEPEND}
+	x11-misc/util-macros
 	x11-proto/xproto
 	app-arch/gzip"
 
diff --git a/x11-apps/rgb/rgb-1.0.6.ebuild b/x11-apps/rgb/rgb-1.0.6.ebuild
index d7046a5ff0e8..f00f37c624a9 100644
--- a/x11-apps/rgb/rgb-1.0.6.ebuild
+++ b/x11-apps/rgb/rgb-1.0.6.ebuild
@@ -12,4 +12,5 @@ KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~
 IUSE=""
 RDEPEND=""
 DEPEND="${RDEPEND}
+	x11-misc/util-macros
 	x11-proto/xproto"
diff --git a/x11-drivers/ati-drivers/ati-drivers-15.7-r1.ebuild b/x11-drivers/ati-drivers/ati-drivers-15.7-r1.ebuild
new file mode 100644
index 000000000000..f06966465584
--- /dev/null
+++ b/x11-drivers/ati-drivers/ati-drivers-15.7-r1.ebuild
@@ -0,0 +1,613 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+MULTILIB_COMPAT=( abi_x86_{32,64} )
+inherit eutils multilib-build linux-info linux-mod systemd toolchain-funcs versionator pax-utils
+
+DESCRIPTION="Ati precompiled drivers for Radeon Evergreen (HD5000 Series) and newer chipsets"
+HOMEPAGE="http://www.amd.com"
+#RUN="${WORKDIR}/fglrx-14.501.1003/amd-driver-installer-14.501.1003-x86.x86_64.run"
+SLOT="1"
+# Uses javascript for download YESSSS
+#DRIVERS_URI="http://www2.ati.com/drivers/linux/amd-catalyst-13.12-linux-x86.x86_64.zip"
+DRIVERS_URI="mirror://gentoo/amd-driver-installer-15.20.1046-x86.x86_64.zip"
+XVBA_SDK_URI="http://developer.amd.com/wordpress/media/2012/10/xvba-sdk-0.74-404001.tar.gz"
+SRC_URI="${DRIVERS_URI} ${XVBA_SDK_URI}"
+FOLDER_PREFIX="common/"
+IUSE="debug +modules qt4 static-libs pax_kernel gdm-hack"
+
+LICENSE="AMD GPL-2 QPL-1.0"
+KEYWORDS="-* ~amd64 ~x86"
+
+RESTRICT="bindist test"
+
+RDEPEND="
+	<=x11-base/xorg-server-1.17.49[-minimal]
+	>=app-eselect/eselect-opengl-1.0.7
+	app-eselect/eselect-opencl
+	sys-power/acpid
+	x11-apps/xauth
+	!x11-libs/xvba-video
+	virtual/glu[${MULTILIB_USEDEP}]
+	x11-libs/libX11[${MULTILIB_USEDEP}]
+	x11-libs/libXext[${MULTILIB_USEDEP}]
+	x11-libs/libXinerama[${MULTILIB_USEDEP}]
+	x11-libs/libXrandr[${MULTILIB_USEDEP}]
+	x11-libs/libXrender[${MULTILIB_USEDEP}]
+	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]
+	)
+	gdm-hack? (
+		x11-base/xorg-server:=
+	)
+"
+if [[ legacy != ${SLOT} ]]; then
+	RDEPEND="${RDEPEND}
+		!x11-drivers/ati-drivers:legacy"
+else
+	RDEPEND="${RDEPEND}
+		!x11-drivers/ati-drivers:1"
+fi
+
+DEPEND="${RDEPEND}
+	x11-proto/inputproto
+	x11-proto/xf86miscproto
+	x11-proto/xf86vidmodeproto
+	x11-proto/xineramaproto
+	x11-libs/libXtst
+	sys-apps/findutils
+	app-misc/pax-utils
+	app-arch/unzip
+"
+
+EMULTILIB_PKG="true"
+
+S="${WORKDIR}"
+
+# QA Silencing
+QA_TEXTRELS="
+	usr/lib*/opengl/ati/lib/libGL.so.1.2
+	usr/lib*/libatiadlxx.so
+	usr/lib*/xorg/modules/glesx.so
+	usr/lib*/libaticaldd.so
+	usr/lib*/dri/fglrx_dri.so
+"
+
+QA_EXECSTACK="
+	opt/bin/atiode
+	opt/bin/amdcccle
+	usr/lib*/opengl/ati/lib/libGL.so.1.2
+	usr/lib*/dri/fglrx_dri.so
+"
+
+QA_WX_LOAD="
+	usr/lib*/opengl/ati/lib/libGL.so.1.2
+	usr/lib*/dri/fglrx_dri.so
+"
+
+QA_PRESTRIPPED="
+	usr/lib\(32\|64\)\?/libXvBAW.so.1.0
+	usr/lib\(32\|64\)\?/opengl/ati/lib/libGL.so.1.2
+	usr/lib\(32\|64\)\?/opengl/ati/extensions/libglx.so
+	usr/lib\(32\|64\)\?/xorg/modules/glesx.so
+	usr/lib\(32\|64\)\?/libAMDXvBA.so.1.0
+	usr/lib\(32\|64\)\?/libaticaldd.so
+	usr/lib\(32\|64\)\?/dri/fglrx_dri.so
+	usr/lib\(32\|64\)\?/OpenCL/vendors/amd/libOpenCL.so.1
+	usr/lib\(32\|64\)\?/OpenCL/vendors/amd/libamdocl\(32\|64\).so
+"
+
+QA_SONAME="
+	usr/lib\(32\|64\)\?/libatiadlxx.so
+	usr/lib\(32\|64\)\?/libaticalcl.so
+	usr/lib\(32\|64\)\?/libaticaldd.so
+	usr/lib\(32\|64\)\?/libaticalrt.so
+	usr/lib\(32\|64\)\?/libamdocl\(32\|64\)\?.so
+	usr/lib\(32\|64\)\?/libamdhsasc\(32\|64\)\?.so
+"
+
+QA_DT_HASH="
+	opt/bin/amdcccle
+	opt/bin/aticonfig
+	opt/bin/atiodcli
+	opt/bin/atiode
+	opt/bin/clinfo
+	opt/bin/fglrxinfo
+	opt/sbin/atieventsd
+	opt/sbin/amdnotifyui
+	usr/lib\(32\|64\)\?/libaticalcl.so
+	usr/lib\(32\|64\)\?/libaticalrt.so
+	usr/lib\(32\|64\)\?/libatiuki.so.1.0
+	usr/lib\(32\|64\)\?/libatiadlxx.so
+	usr/lib\(32\|64\)\?/libfglrx_dm.so.1.0
+	usr/lib\(32\|64\)\?/libXvBAW.so.1.0
+	usr/lib\(32\|64\)\?/libAMDXvBA.so.1.0
+	usr/lib\(32\|64\)\?/xorg/modules/amdxmm.so
+	usr/lib\(32\|64\)\?/xorg/modules/glesx.so
+	usr/lib\(32\|64\)\?/xorg/modules/linux/libfglrxdrm.so
+	usr/lib\(32\|64\)\?/xorg/modules/drivers/fglrx_drv.so
+	usr/lib\(32\|64\)\?/libaticaldd.so
+	usr/lib\(32\|64\)\?/dri/fglrx_dri.so
+	usr/lib\(32\|64\)\?/opengl/ati/extensions/libglx.so
+	usr/lib\(32\|64\)\?/opengl/ati/extensions/fglrx-libglx.so
+	usr/lib\(32\|64\)\?/opengl/ati/lib/fglrx-libGL.so.1.2
+	usr/lib\(32\|64\)\?/opengl/ati/lib/libGL.so.1.2
+	usr/lib\(32\|64\)\?/OpenCL/vendors/amd/libamdocl\(32\|64\)\?.so
+	usr/lib\(32\|64\)\?/OpenCL/vendors/amd/libOpenCL.so.1
+"
+
+pkg_nofetch() {
+	einfo "The driver packages"
+	einfo ${A}
+	einfo "need to be downloaded manually from"
+	einfo "http://support.amd.com/en-us/download/desktop?os=Linux%20x86_64"
+	einfo "and ${XVBA_SDK_URI}"
+}
+
+pkg_pretend() {
+	local CONFIG_CHECK="~MTRR ~!DRM ACPI PCI_MSI !LOCKDEP !PAX_KERNEXEC_PLUGIN_METHOD_OR"
+	use amd64 && CONFIG_CHECK+=" COMPAT"
+
+	local ERROR_MTRR="CONFIG_MTRR required for direct rendering."
+	local ERROR_DRM="CONFIG_DRM must be disabled or compiled as a module and not loaded for direct
+		rendering to work."
+	local ERROR_LOCKDEP="CONFIG_LOCKDEP (lock tracking) exports the symbol lock_acquire
+		as GPL-only. This prevents ${P} from compiling with an error like this:
+		FATAL: modpost: GPL-incompatible module fglrx.ko uses GPL-only symbol 'lock_acquire'"
+	local ERROR_PAX_KERNEXEC_PLUGIN_METHOD_OR="This config option will cause
+		kernel to reject loading the fglrx module with
+		\"ERROR: could not insert 'fglrx': Exec format error.\"
+		You may want to try CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_BTS instead."
+	local ERROR_BKL="CONFIG_BKL must be enabled for kernels 2.6.37-2.6.38."
+
+	# workaround until bug 365543 is solved
+	if use modules; then
+		linux-info_pkg_setup
+		require_configured_kernel
+		kernel_is ge 2 6 37 && kernel_is le 2 6 38 && CONFIG_CHECK+=" BKL"
+		check_extra_config
+		if ! linux_chkconfig_present AGP && \
+			! linux_chkconfig_present PCIEPORTBUS; then
+			ewarn "You don't have AGP and/or PCIe support enabled in the kernel"
+			ewarn "Direct rendering will not work."
+		fi
+	fi
+
+	if ! has XT ${PAX_MARKINGS} && use pax_kernel; then
+		ewarn "You have disabled xattr pax markings for portage."
+		ewarn "This will likely cause programs using ati-drivers provided"
+		ewarn "libraries to be killed kernel."
+	fi
+}
+
+pkg_setup() {
+	if use modules; then
+		MODULE_NAMES="fglrx(video:${S}/${FOLDER_PREFIX}/lib/modules/fglrx/build_mod/2.6.x)"
+		BUILD_TARGETS="kmod_build"
+		linux-mod_pkg_setup
+		BUILD_PARAMS="GCC_VER_MAJ=$(gcc-major-version) KVER=${KV_FULL} KDIR=${KV_OUT_DIR}"
+		BUILD_PARAMS="${BUILD_PARAMS} CFLAGS_MODULE+=\"-DMODULE -DATI -DFGL\""
+		if grep -q arch_compat_alloc_user_space ${KV_DIR}/arch/x86/include/asm/compat.h ; then
+			BUILD_PARAMS="${BUILD_PARAMS} CFLAGS_MODULE+=-DCOMPAT_ALLOC_USER_SPACE=arch_compat_alloc_user_space"
+		else
+			BUILD_PARAMS="${BUILD_PARAMS} CFLAGS_MODULE+=-DCOMPAT_ALLOC_USER_SPACE=compat_alloc_user_space"
+		fi
+	fi
+	# Define module dir.
+	MODULE_DIR="${S}/${FOLDER_PREFIX}/lib/modules/fglrx/build_mod"
+	# get the xorg-server version and set BASE_DIR for that
+	BASE_DIR="${S}/xpic"
+
+	# amd64/x86
+	if use amd64 ; then
+		MY_BASE_DIR="${BASE_DIR}_64a"
+		PKG_LIBDIR=lib64
+		ARCH_DIR="${S}/arch/x86_64"
+	else
+		MY_BASE_DIR="${BASE_DIR}"
+		PKG_LIBDIR=lib
+		ARCH_DIR="${S}/arch/x86"
+	fi
+
+	elog
+	elog "Please note that this driver only supports graphic cards based on"
+	elog "Evergreen chipset and newer."
+	elog "This includes the AMD Radeon HD 5400+ series at this moment."
+	elog
+	elog "If your card is older then use ${CATEGORY}/xf86-video-ati"
+	elog "For migration informations please refer to:"
+	elog "https://www.gentoo.org/proj/en/desktop/x/x11/ati-migration-guide.xml"
+	einfo
+}
+
+src_unpack() {
+	local DRIVERS_DISTFILE XVBA_SDK_DISTFILE
+	DRIVERS_DISTFILE=${DRIVERS_URI##*/}
+	XVBA_SDK_DISTFILE=${XVBA_SDK_URI##*/}
+
+	if [[ ${DRIVERS_DISTFILE} =~ .*\.tar\.gz ]]; then
+		unpack ${DRIVERS_DISTFILE}
+		mkdir -p common
+		mv etc lib usr common || die "Assumed to find etc lib and usr for common"
+	else
+		#please note, RUN may be insanely assigned at top near SRC_URI
+		if [[ ${DRIVERS_DISTFILE} =~ .*\.zip ]]; then
+			unpack ${DRIVERS_DISTFILE}
+			[[ -z "$RUN" ]] && RUN="${S}/${DRIVERS_DISTFILE/%.zip/.run}"
+		else
+			RUN="${DISTDIR}/${DRIVERS_DISTFILE}"
+		fi
+		sh "${RUN}" --extract "${S}" 2>&1 > /dev/null || die
+	fi
+
+	mkdir xvba_sdk
+	cd xvba_sdk
+	unpack ${XVBA_SDK_DISTFILE}
+
+	mkdir -p "${WORKDIR}/extra" || die "mkdir extra failed"
+	cd "${WORKDIR}/extra"
+	tar -xf "../${FOLDER_PREFIX}usr/src/ati/fglrx_sample_source.tgz"
+}
+
+src_prepare() {
+	if use modules; then
+		if use debug; then
+			sed -i '/^#define DRM_DEBUG_CODE/s/0/1/' \
+				"${MODULE_DIR}/firegl_public.c" \
+				|| die "Failed to enable debug output."
+		fi
+	fi
+
+	# These are the userspace utilities that we also have source for.
+	# We rebuild these later.
+	rm \
+		"${ARCH_DIR}"/usr/X11R6/bin/fgl_glxgears \
+		|| die "bin rm failed"
+
+	# in this version amdcccle isn't static, thus we depend on qt4
+	use qt4 || rm "${ARCH_DIR}"/usr/X11R6/bin/amdcccle
+
+	# ACPI fixups
+	sed -i \
+		-e "s:/var/lib/xdm/authdir/authfiles/:/var/run/xauth/:" \
+		-e "s:/var/lib/gdm/:/var/gdm/:" \
+		"${S}/${FOLDER_PREFIX}etc/ati/authatieventsd.sh" \
+		|| die "ACPI fixups failed."
+
+	# Since "who" is in coreutils, we're using that one instead of "finger".
+	sed -i -e 's:finger:who:' \
+		"${S}/${FOLDER_PREFIX}usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh" \
+		|| die "Replacing 'finger' with 'who' failed."
+	# Adjust paths in the script from /usr/X11R6/bin/ to /opt/bin/ and
+	# add function to detect default state.
+	epatch "${FILESDIR}"/ati-powermode-opt-path-3.patch
+
+	# see http://ati.cchtml.com/show_bug.cgi?id=495
+	#epatch "${FILESDIR}"/ati-drivers-old_rsp.patch
+	# first hunk applied upstream second (x32 related) was not
+	epatch "${FILESDIR}"/ati-drivers-x32_something_something.patch
+
+	# compile fix for AGP-less kernel, bug #435322
+	epatch "${FILESDIR}"/ati-drivers-12.9-KCL_AGP_FindCapsRegisters-stub.patch
+
+	epatch "${FILESDIR}/ati-drivers-13.8-beta-include-seq_file.patch"
+
+	# Fix #483400
+	epatch "${FILESDIR}/fgl_glxgears-do-not-include-glATI.patch"
+
+	# Compile fix, https://bugs.gentoo.org/show_bug.cgi?id=454870
+	use pax_kernel && epatch "${FILESDIR}/const-notifier-block.patch"
+
+	# Compile fix, #526602
+	epatch "${FILESDIR}/use-kernel_fpu_begin.patch"
+
+	epatch_user
+
+	cd "${MODULE_DIR}"
+
+	# bugged fglrx build system, this file should be copied by hand
+	cp ${ARCH_DIR}/lib/modules/fglrx/build_mod/libfglrx_ip.a 2.6.x
+
+	convert_to_m 2.6.x/Makefile || die "convert_to_m failed"
+
+	# When built with ati's make.sh it defines a bunch of macros if
+	# certain .config values are set, falling back to less reliable
+	# detection methods if linux/autoconf.h is not available. We
+	# simply use the linux/autoconf.h settings directly, bypassing the
+	# detection script.
+	sed -i -e 's/__SMP__/CONFIG_SMP/' *.c *h || die "SMP sed failed"
+	sed -i -e 's/ifdef MODVERSIONS/ifdef CONFIG_MODVERSIONS/' *.c *.h \
+		|| die "MODVERSIONS sed failed"
+}
+
+src_compile() {
+	use modules && linux-mod_src_compile
+
+	ebegin "Building fgl_glxgears"
+	cd "${S}"/extra/fgl_glxgears
+	# These extra libs/utils either have an Imakefile that does not
+	# work very well without tweaking or a Makefile ignoring CFLAGS
+	# and the like. We bypass those.
+	# The -DUSE_GLU is needed to compile using nvidia headers
+	# according to a comment in ati-drivers-extra-8.33.6.ebuild.
+	"$(tc-getCC)" -o fgl_glxgears ${CFLAGS} ${LDFLAGS} -DUSE_GLU \
+		-I"${S}"/${FOLDER_PREFIX}usr/include fgl_glxgears.c \
+		-lGL -lGLU -lX11 -lm || die "fgl_glxgears build failed"
+	eend $?
+}
+
+src_install() {
+	use modules && linux-mod_src_install
+
+	# We can do two things here, and neither of them is very nice.
+
+	# For direct rendering libGL has to be able to load one or more
+	# dri modules (files ending in _dri.so, like fglrx_dri.so).
+	# Gentoo's mesa looks for these files in the location specified by
+	# LIBGL_DRIVERS_PATH or LIBGL_DRIVERS_DIR, then in the hardcoded
+	# location /usr/$(get_libdir)/dri. Ati's libGL does the same
+	# thing, but the hardcoded location is /usr/X11R6/lib/modules/dri
+	# on x86 and amd64 32bit, /usr/X11R6/lib64/modules/dri on amd64
+	# 64bit. So we can either put the .so files in that (unusual,
+	# compared to "normal" mesa libGL) location or set
+	# LIBGL_DRIVERS_PATH. We currently do the latter. See also bug
+	# 101539.
+
+	# The problem with this approach is that LIBGL_DRIVERS_PATH
+	# *overrides* the default hardcoded location, it does not extend
+	# it. So if ati-drivers is merged but a non-ati libGL is selected
+	# and its hardcoded path does not match our LIBGL_DRIVERS_PATH
+	# (because it changed in a newer mesa or because it was compiled
+	# for a different set of multilib abis than we are) stuff breaks.
+
+	# We create one file per ABI to work with "native" multilib, see
+	# below.
+
+	echo "COLON_SEPARATED=LIBGL_DRIVERS_PATH" > "${T}/03ati-colon-sep"
+	doenvd "${T}/03ati-colon-sep" || die
+
+	# All libraries that we have a 32 bit and 64 bit version of on
+	# amd64 are installed in src_install-libs. Everything else
+	# (including libraries only available in native 64bit on amd64)
+	# goes in here.
+	multilib_foreach_abi src_install-libs
+
+	# This is sorted by the order the files occur in the source tree.
+
+	# X modules.
+	exeinto /usr/$(get_libdir)/xorg/modules/drivers
+	doexe "${MY_BASE_DIR}"/usr/X11R6/${PKG_LIBDIR}/modules/drivers/fglrx_drv.so
+	exeinto /usr/$(get_libdir)/xorg/modules/linux
+	doexe "${MY_BASE_DIR}"/usr/X11R6/${PKG_LIBDIR}/modules/linux/libfglrxdrm.so
+	exeinto /usr/$(get_libdir)/xorg/modules
+	doexe "${MY_BASE_DIR}"/usr/X11R6/${PKG_LIBDIR}/modules/{glesx.so,amdxmm.so}
+
+	#516816
+	if use gdm-hack; then
+		sed -i 's#/proc/%i/fd/0#/etc/ati/xvrn#g' "${D}/usr/$(get_libdir)/xorg/modules/drivers/fglrx_drv.so" || die "Applying gdm-hack failed"
+	fi
+
+	# Arch-specific files.
+	# (s)bin.
+	into /opt
+	dosbin "${ARCH_DIR}"/usr/sbin/atieventsd
+	use qt4 && dosbin "${ARCH_DIR}"/usr/sbin/amdnotifyui
+	dobin "${ARCH_DIR}"/usr/bin/clinfo
+	# We cleaned out the compilable stuff in src_unpack
+	dobin "${ARCH_DIR}"/usr/X11R6/bin/*
+
+	# Common files.
+	# etc.
+	insinto /etc/ati
+	exeinto /etc/ati
+	# Everything except for the authatieventsd.sh script.
+	doins ${FOLDER_PREFIX}etc/ati/{logo*,control,signature,amdpcsdb.default}
+	doexe ${FOLDER_PREFIX}etc/ati/authatieventsd.sh
+
+	# include.
+	insinto /usr
+	doins -r ${FOLDER_PREFIX}usr/include
+	insinto /usr/include/X11/extensions
+
+	# Just the atigetsysteminfo.sh script.
+	into /usr
+	dosbin ${FOLDER_PREFIX}usr/sbin/*
+
+	# data files for the control panel.
+	if use qt4 ; then
+		insinto /usr/share
+		doins -r ${FOLDER_PREFIX}usr/share/ati
+		insinto /usr/share/pixmaps
+		doins ${FOLDER_PREFIX}usr/share/icons/ccc_large.xpm
+		make_desktop_entry amdcccle 'AMD Catalyst Control Center' \
+			ccc_large System
+	fi
+
+	# doc.
+	dohtml -r ${FOLDER_PREFIX}usr/share/doc/fglrx
+
+	doman ${FOLDER_PREFIX}usr/share/man/man8/atieventsd.8
+
+	pushd ${FOLDER_PREFIX}usr/share/doc/fglrx/examples/etc/acpi > /dev/null
+
+	exeinto /etc/acpi
+	doexe ati-powermode.sh
+	insinto /etc/acpi/events
+	doins events/*
+
+	popd > /dev/null
+
+	# Done with the "source" tree. Install tools we rebuilt:
+	dobin extra/fgl_glxgears/fgl_glxgears
+	newdoc extra/fgl_glxgears/README README.fgl_glxgears
+
+	# Gentoo-specific stuff:
+	newinitd "${FILESDIR}"/atieventsd.init atieventsd
+	echo 'ATIEVENTSDOPTS=""' > "${T}"/atieventsd.conf
+	newconfd "${T}"/atieventsd.conf atieventsd
+	systemd_dounit "${FILESDIR}/atieventsd.service"
+
+	# PowerXpress stuff
+	exeinto /usr/$(get_libdir)/fglrx
+	doexe "${FILESDIR}"/switchlibGL || die "doexe switchlibGL failed"
+	cp "${FILESDIR}"/switchlibGL "${T}"/switchlibglx
+	doexe "${T}"/switchlibglx || die "doexe switchlibglx failed"
+
+	#516816
+	use gdm-hack && Xorg -version > "${D}/etc/ati/xvrn" 2>&1
+}
+
+src_install-libs() {
+	if [[ "${ABI}" == "amd64" ]]; then
+		local EX_BASE_DIR="${BASE_DIR}_64a"
+		local pkglibdir=lib64
+		local MY_ARCH_DIR="${S}/arch/x86_64"
+		local oclsuffix=64
+	else
+		local EX_BASE_DIR="${BASE_DIR}"
+		local pkglibdir=lib
+		local MY_ARCH_DIR="${S}/arch/x86"
+		local oclsuffix=32
+	fi
+	einfo "ati tree '${pkglibdir}' -> '$(get_libdir)' on system"
+
+	local ATI_ROOT=/usr/$(get_libdir)/opengl/ati
+	# To make sure we do not miss a spot when these change.
+	local libmajor=1 libminor=2
+	local libver=${libmajor}.${libminor}
+
+	# The GLX libraries
+	# (yes, this really is "lib" even on amd64/multilib --marienz)
+	exeinto ${ATI_ROOT}/lib
+	newexe "${MY_ARCH_DIR}"/usr/X11R6/${pkglibdir}/fglrx/fglrx-libGL.so.${libver} \
+		libGL.so.${libver}
+	dosym libGL.so.${libver} ${ATI_ROOT}/lib/libGL.so.${libmajor}
+	dosym libGL.so.${libver} ${ATI_ROOT}/lib/libGL.so
+
+	if multilib_is_native_abi; then
+		exeinto ${ATI_ROOT}/extensions
+		doexe "${EX_BASE_DIR}"/usr/X11R6/${pkglibdir}/modules/extensions/fglrx/fglrx-libglx.so
+		mv "${D}"/${ATI_ROOT}/extensions/{fglrx-,}libglx.so
+
+		#516816
+		if use gdm-hack; then
+			sed -i 's#/proc/%i/fd/0#/etc/ati/xvrn#g' "${D}/${ATI_ROOT}/extensions/libglx.so" || die "Applying gdm-hack failed"
+		fi
+	fi
+
+	# other libs
+	exeinto /usr/$(get_libdir)
+	# Everything except for the libGL.so installed some row above
+	doexe $(find "${MY_ARCH_DIR}"/usr/X11R6/${pkglibdir} \
+		-maxdepth 1 -type f -name '*.so*' -not -name '*libGL.so*')
+	insinto /usr/$(get_libdir)
+	doins $(find "${MY_ARCH_DIR}"/usr/X11R6/${pkglibdir} \
+		-maxdepth 1 -type f -not -name '*.so*')
+
+	# DRI modules, installed into the path used by recent versions of mesa.
+	exeinto /usr/$(get_libdir)/dri
+	doexe "${MY_ARCH_DIR}"/usr/X11R6/${pkglibdir}/modules/dri/fglrx_dri.so
+
+	# AMD Cal and OpenCL libraries
+	exeinto /usr/$(get_libdir)/OpenCL/vendors/amd
+	doexe "${MY_ARCH_DIR}"/usr/${pkglibdir}/libamdocl*.so*
+	doexe "${MY_ARCH_DIR}"/usr/${pkglibdir}/libOpenCL*.so*
+	dosym libOpenCL.so.${libmajor} /usr/$(get_libdir)/OpenCL/vendors/amd/libOpenCL.so
+	exeinto /usr/$(get_libdir)
+	doexe "${MY_ARCH_DIR}"/usr/${pkglibdir}/libati*.so*
+
+	# OpenCL vendor files
+	insinto /etc/OpenCL/vendors/
+	cat > "${T}"/amdocl${oclsuffix}.icd <<-EOF
+		/usr/$(get_libdir)/OpenCL/vendors/amd/libamdocl${oclsuffix}.so
+	EOF
+	doins "${T}"/amdocl${oclsuffix}.icd
+
+	local envname="${T}"/04ati-dri-path
+	if [[ -n ${ABI} ]]; then
+		envname="${envname}-${ABI}"
+	fi
+	echo "LIBGL_DRIVERS_PATH=/usr/$(get_libdir)/dri" > "${envname}"
+	doenvd "${envname}"
+
+	# Silence the QA notice by creating missing soname symlinks
+	for so in $(find "${D}"/usr/$(get_libdir) -maxdepth 1 -name *.so.[0-9].[0-9])
+	do
+		local soname=${so##*/}
+		local soname_one=${soname%.[0-9]}
+		local soname_zero=${soname_one%.[0-9]}
+		dosym ${soname} /usr/$(get_libdir)/${soname_one}
+		dosym ${soname_one} /usr/$(get_libdir)/${soname_zero}
+	done
+
+	# See https://bugs.gentoo.org/show_bug.cgi?id=443466
+	dodir /etc/revdep-rebuild/
+	echo "SEARCH_DIRS_MASK=\"/opt/bin/clinfo\"" > "${ED}/etc/revdep-rebuild/62-ati-drivers"
+
+	#remove static libs if not wanted
+	use static-libs || rm -rf "${D}"/usr/$(get_libdir)/libfglrx_dm.a
+
+	#install xvba sdk headers
+	doheader xvba_sdk/include/amdxvba.h
+
+	# VA-API internal wrapper
+	dosym /usr/$(get_libdir)/libXvBAW.so.1.0 /usr/$(get_libdir)/va/drivers/fglrx_drv_video.so
+
+	if use pax_kernel; then
+		pax-mark m "${D}"/usr/lib*/opengl/ati/lib/libGL.so.1.2 || die "pax-mark failed"
+	fi
+}
+
+pkg_postinst() {
+	elog "To switch to AMD OpenGL, run \"eselect opengl set ati\""
+	elog "To change your xorg.conf you can use the bundled \"aticonfig\""
+	elog
+	elog "If you experience unexplained segmentation faults and kernel crashes"
+	elog "with this driver and multi-threaded applications such as wine,"
+	elog "set UseFastTLS in xorg.conf to either 0 or 1, but not 2."
+	elog
+	elog "Fully rebooting the system after an ${PN} update is recommended"
+	elog "Stopping Xorg, reloading fglrx kernel module and restart Xorg"
+	elog "might not work"
+	elog
+
+	use modules && linux-mod_pkg_postinst
+	"${ROOT}"/usr/bin/eselect opengl set --use-old ati
+	"${ROOT}"/usr/bin/eselect opencl set --use-old amd
+
+	if has_version "x11-drivers/xf86-video-intel[sna]"; then
+		ewarn "It is reported that xf86-video-intel built with USE=\"sna\" causes the X server"
+		ewarn "to crash on systems that use hybrid AMD/Intel graphics. If you experience"
+		ewarn "this crash, downgrade to xf86-video-intel-2.20.2 or earlier or"
+		ewarn "try disabling sna for xf86-video-intel."
+		ewarn "For details, see https://bugs.gentoo.org/show_bug.cgi?id=430000"
+	fi
+
+	if use pax_kernel; then
+		ewarn "Please run \"revdep-pax -s libGL.so.1 -me\" after installation and"
+		ewarn "after you have run \"eselect opengl set ati\". Executacle"
+		ewarn "revdep-pax is part of package sys-apps/elfix."
+	fi
+}
+
+pkg_preinst() {
+	use modules && linux-mod_pkg_preinst
+}
+
+pkg_prerm() {
+	"${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11
+}
+
+pkg_postrm() {
+	use modules && linux-mod_pkg_postrm
+	"${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11
+}
diff --git a/x11-drivers/ati-drivers/files/atieventsd.service b/x11-drivers/ati-drivers/files/atieventsd.service
new file mode 100644
index 000000000000..72df6c4cb4fc
--- /dev/null
+++ b/x11-drivers/ati-drivers/files/atieventsd.service
@@ -0,0 +1,9 @@
+[Unit]
+Description=Catalyst event Daemon
+Requires=acpid.socket
+
+[Service]
+ExecStart=/opt/sbin/atieventsd --nodaemon
+
+[Install]
+WantedBy=multi-user.target
diff --git a/x11-drivers/nvidia-drivers/Manifest b/x11-drivers/nvidia-drivers/Manifest
index 29b31675716c..52dc1de4e919 100644
--- a/x11-drivers/nvidia-drivers/Manifest
+++ b/x11-drivers/nvidia-drivers/Manifest
@@ -1,38 +1,54 @@
 DIST NVIDIA-FreeBSD-x86-173.14.39.tar.gz 20038266 SHA256 63a922ce4c5b676b4cb1ace98094dace4cc5408f2553e183df7b2127777a238b SHA512 96982fe7e0751c52fbef534193de09d187b99c1984c05e791223eb804719d8b3ba72efd983f227661ded4b71569bdbb914f1f629ab73a8bc9b8172832ccf3ec6 WHIRLPOOL 21f5906f42adf0064c7a7f81ac8e323de488e6d36356ee42c31a15c31ebb64335d5e2cff0ff022d41de480f9e0a57b3b96387f17151c7b59eceba2c61a7a102b
 DIST NVIDIA-FreeBSD-x86-304.125.tar.gz 34494889 SHA256 806d0bff9d394390b3a257472bc342857f150e9dba6673e6b930f47a93ec0269 SHA512 d2760196d3f0dfb1837d496bd11dbedab6a2bf3de98da35f16c92133452b915b425a718f72e560f5d6483caf5e2e5bcf99a462b2e392d7a08c77b59695649108 WHIRLPOOL eb008e1956043d48af5f928dc594c8ae9c8a946834d889db5b4a9b3f16bfaeb311221e5d3f83c8c599dee860b54a42030dccf2aaec31dffb6e8460bf646b82ad
+DIST NVIDIA-FreeBSD-x86-304.128.tar.gz 34479549 SHA256 c26d0ce5bda8965b37a8b8f91e8580f98b740e16dd21f3aaf7fb6bc84d3dd363 SHA512 9b7cd4fdb59c8d4783c2625d8e301869e1ddae0b7d3f81e9ca2eea4722168ddf513c7ed5853ce34607e219aa11c4da687c5e68a6d2021bf3aa54969cd3337ba2 WHIRLPOOL 98ada42a1b73d6858343fccd2aebe2c345e3275f7f7371e14980ef87a8407f0167e01c6963e498feba29860bf3ffbd2245789dc3ad3cff97635af1820bb42edf
 DIST NVIDIA-FreeBSD-x86-331.113.tar.gz 56371300 SHA256 f3b4b5ddf5977223646d2cdb0617ea8a5f667814ca23b29cb225c5685eacd9d7 SHA512 5c45142807a5b8ecb5e037921e4e449f4710a65358579087429e14ee50124863e6a65fbf8cc73efec22bd8ca85d3eb5a815c7301403dd3236e0bb0b177e5f3e8 WHIRLPOOL 97240066b1c45c887770bfe8539b733a2957fdc1511af5b08de4149b0ce9fedc87b6aa8ee8d243793d225c98c09681e4cca93dd1c5f601389637644e659d7863
 DIST NVIDIA-FreeBSD-x86-340.76.tar.gz 59362290 SHA256 0abbcc3bed3f017e7f1887a5c2d014e2b5a020462071998986ed49cdb8e7119f SHA512 e6d8b6d03fe0f9ab25ddeef680e0159ea4073d03762d3419761c02b917edefa9a1f81c209bd386838141c1924364c81126b0a356c325b056a0c2451865bed5eb WHIRLPOOL 7ec0cef6f92bfbd4c8b6a051dc8de4b6b138f63fd4f7e18756178a9aebb91ea32523d5ca885481d8c8c3d1531b153699f4e5606c155d6c3aa79a340637d3744b
+DIST NVIDIA-FreeBSD-x86-340.93.tar.gz 59385673 SHA256 094dc6df60b8e57cf9b94d982cb29c32d5e0c1d81796dbadb39145e78a3b0086 SHA512 ae5ef62aa8dea2f67026dc9e7f369294895516cd443daa277ac2c783ef1fe85df23706aef70cbce41722d239a50c562b66210fd76f662186e25c58b38e617230 WHIRLPOOL 816b2b8c1de3609c03059fbb6f102f54fba5fcc64539745701ef3e20e435ca767ff8fe93c7f0242fcee5fb941210781a526b67cf693a48974723ccbf8e95595f
 DIST NVIDIA-FreeBSD-x86-343.36.tar.gz 59205879 SHA256 8634e7537eca778790296f8355e39ae9a7e16642648e671a6c9339ee55fe340c SHA512 35fcf57d5e830cbe3c07ec70362ad9f0ff6ec327c6b11b6d3c533315e59031501501b9fdb80a3bef720506e5221ad84496745ce13d2c9885076f1c8e8537ba46 WHIRLPOOL 3ed3230dc190e7670c960743d94b8db1c0d9908b597f952746d851b403847e7b2836f1c60e6af0fe73072c1fda3971dfacc37c21908c227b2c20b5045dbfd61f
 DIST NVIDIA-FreeBSD-x86-346.87.tar.gz 58003852 SHA256 72481c38989c1aa1835485d2222e6a98f12f7265518fef4bd2c089fe8023d32e SHA512 6a8bf0671a48f9bfe74f844586985d7132a56b4056536e5581d695414bdebd4e393ac85bd6dd6d06f89a46dfd3b4aea0953bb254cab1b1ade2b383292686d6ae WHIRLPOOL 2358746b56d426be75af6a6665b78f2bcbf8abd7dcf954203cc09d945baf89b75fa004fec4be31cd407efc46bf2aaf5add1010ade7a6616fe8347d8954e892ef
+DIST NVIDIA-FreeBSD-x86-346.96.tar.gz 58010757 SHA256 a27d7b79c053702bf6524b2c4725321fa557be18a585735e0b8122d884348c3e SHA512 f05ff7f98ae56ef992c21440e94dc12537f91353c9ba6fbe74b5928744823cb0cce38e7aa2da6c88569dda52f9ae0f6674c29255db155a2fada9b78f024dda8d WHIRLPOOL d21cfd27971847dac0118429b58b34be24f19fefc9ee05f70454e7c350d4a8678e2d01f7db72e05bd1026c45fa9373783b9817efcf76f70b70f6a5ecd8a5bc7c
 DIST NVIDIA-FreeBSD-x86-349.16.tar.gz 59441939 SHA256 d8b633790036f032b48196503bc6a85ca82de54edd2409f7c1ec86c053e89e07 SHA512 7d914c74b8b4b50931f27f085ca587fab9a4ba0dafab1cdbb751605cdf702b84e2e31b999b374c7adaa096d6dac6268e9b2ff6fcde5ac37b6dbdfd0ebf4a1422 WHIRLPOOL ab68e75c05a0cf2df803fcf3755c366a04cf6f973bb02b673df58dcdee6cb13a4cb5e6fec5270918c725603780b2fefbb89927789b92ddd01647852d34562b9a
 DIST NVIDIA-FreeBSD-x86-352.30.tar.gz 55043903 SHA256 6d91dce0171a0c7c21d9ce2c4c371940e4ccd273941c3c32bfd04bdc4166d2ae SHA512 cb3e160292f80aaae5d3a17fa9dbba9f3799e42e2a86c2ddae41ff2bce1ac80c68f15dc512fc3879bd7e9fdc8af472852e9d5d3c2ab5afe4e1c9cde7017fbfd9 WHIRLPOOL 351861aab1a22193f71e8231f76397ccc89a1109f583c0cc512ed1657263dd224211b7505e8b7647282bad0f85e15a38ae4d3da7d88ad45dde8d05e87877f157
-DIST NVIDIA-FreeBSD-x86-355.06.tar.gz 56677167 SHA256 49f691695228e0c2effcee4ad0f3ea90bb1086d0dd28af8f88eb10231753010a SHA512 f8698a6afb10d27e27559f56029fa38db9d0d5a7d4ead7a1f4097f113b618eb4b73c82ebbf1c53b0766a43e6a0dfe8eec9a85200b85df450f3c8d70aa713cbb4 WHIRLPOOL bf97c042f55b43ac5d9e286b2eadb75cab6d8a12e8cc54c061a9b0bcaabfd8d8b4df81f73ffff02df058fccd762afff16063b12e1d186b0e31f3aa6dece5d323
+DIST NVIDIA-FreeBSD-x86-352.41.tar.gz 55205144 SHA256 dadc8281bc13559aa4672b2436e7f7f6227fe3073882ba46765f156deb26e4c2 SHA512 6e4314e8ab4578343972ce0bd5eb0f6c847dcdf5b682b9ac04fa4fc9e0757a645d935c32d41fb18ad1468a62f5edb0f5081c2082071ce930f6205c72716f94fd WHIRLPOOL 33bb2954c4dbfe15456d467c0a41c8ac585f7f1b046e2540b7ef943434cd33c2ffe863bb80f193a783eb52a356a79e57af304b3f2a83c298de4bb601f2fd8876
+DIST NVIDIA-FreeBSD-x86-355.11.tar.gz 56832647 SHA256 3d4d5d8fcf558a8f5f1a88846161b1a89bd7fc66c0268b40613c7e3457f5ce7b SHA512 744d9b8c48b82bac0bfeea5e8b2b2bbaa0e6a183cbd1f5d4f782fa7b21a6f6c5b252e556a8b2161c3b5d43938ef8fabf6cb36f995ee823fbf792f3c9a92b87e1 WHIRLPOOL 43bceb8e8d3b00789cf2c8163a055b1d2405ef93e471fda4c4e2146093289891557f4ec8debfe6bca89ad6ed6dc2e389f1d3060759a71e8949df343bc31b85b9
 DIST NVIDIA-FreeBSD-x86-96.43.23.tar.gz 15463464 SHA256 18d855db8381eda1a6cf548c9e5095fc5bb8694bf1d6e24fc1072fba4e54cd78 SHA512 42d7b1b76cdb3b23680363e565614a22112162a5dd3639cb804fe670c0c3f3f23595bbefa3f78afdc6a8ca848446dee853c7a355f2c96a0d01b354753ba2785c WHIRLPOOL f8e59ce521990cd9edee441e73f973f074db492952807a0931e362102874cddbb47604ff5c5eb20a0cbde27f9b6d4e440dd12cc2e5a20c9cb65bf3c0b3e62511
 DIST NVIDIA-FreeBSD-x86_64-304.125.tar.gz 35498616 SHA256 46b14b8c5ee1c02ff5e30afc9c99f4dd2edc426ccb2b73764093a1787639699d SHA512 34d48f24b1f5019b23c2937f8b5280fcc596764e1f5833cfe33db5e4d8395a0d69aa4c4214a5b97620dbaade73ac0fa333c36cceb4a137bb26d3ba37c31a0eb7 WHIRLPOOL 82677bd2aec3a60fe64211170573ef702b1dd1ab5a71ec922fb56b8d40f2163c0151a7c7f8bdace9127c8afcaf278f8f23a1cb585a8ad3bb7a0d42787ab17fb2
+DIST NVIDIA-FreeBSD-x86_64-304.128.tar.gz 35481444 SHA256 ee38635fb02eb598dd0cdfdbc9014096774104d75ba42fee7688126e531fed8f SHA512 36b045bd556512c83fc841e5d379b1af70b47df99f7042b64d3ed009f3dadb8e7a06e34506b839d0e936de06064c343aac370dad3fe96ea53aa3e25322eda0ff WHIRLPOOL bc53f009da857ca34396f6d49e9c8774e0062cfb437a1b711256b3c0bbbd50d49bb4691697ce7bee347533aeb150d7fe6d061170c1ca9ced6a694694399542c8
 DIST NVIDIA-FreeBSD-x86_64-331.113.tar.gz 47509194 SHA256 c848e187c79064ea3f52406312aa09d06f0aaef5063be7522b2b2319c43c872c SHA512 4e206719afcee47179e0756ac67fc4e61d513efb1cd0264b28726d6de16846feee873a2df362bf645b0527d395b6d82f5b54dbc447bccb74128d7bff37bb7b1b WHIRLPOOL a51b0bd9f7301d9bb76b54ffa44337ad4d875125281c4b9921e66a76d434879832f542df9c6ba436ef83fb3fa0afe5197f3425f1b7aa16274aca5080259f343d
 DIST NVIDIA-FreeBSD-x86_64-340.76.tar.gz 60206978 SHA256 60037d035b9af9f1d4dcdd5033e1b28b0cd4c7ca94f6bcb8d267e037a930fdc0 SHA512 d478eac282dfb43205f7464d6542cf1f71ed4dea6b8381314affb8647d104c5ddf7e658b6b8eb5e0bdb18207b92f76c574b24959ce23034d375cc712998e6e7c WHIRLPOOL 98ebffd792a47e3a9ef369976db11909bc13551f38977f85ece41e5a31a790c2c173badfc166e3a0bfe4361d5221129d19364c074ba11fc4aa9062d5cb1499a8
+DIST NVIDIA-FreeBSD-x86_64-340.93.tar.gz 60215584 SHA256 07208f6a832c2da8748b1c4f8b5ce42a7b617f2ee1ac59155fecaff952c30988 SHA512 c480df2f36c3d6eba53af9c3070e1561ae7c56cd5d31fb531dcb6897ca02d0d205c0ce99597304ea36b7b75b173e31a9a4c07ddd143ad13884aff0a7c3479bce WHIRLPOOL c1b28898ffe733961bdb622e8b430715c74871cfaab0348a9e5990df5a92676e8fb8c199ea1f1a06fa6c6ded65877b987b802a7a9ea0b7023cbaa62fb52eda01
 DIST NVIDIA-FreeBSD-x86_64-343.36.tar.gz 60045074 SHA256 aa189d9fd6448ed49ff4a8dd09dd15c06f6b3ef662fd3d960b4853c485cbab8a SHA512 23c38de071ac6e2c87db2c767b07f243703e55cd6485eb8e538fb72f38e9856b7ff28430fdd7eccc4728f3d36c14eac8b1fbf7155fe864ead93ed4218d5b65b5 WHIRLPOOL 401cdc5675d5fe60b6ca492be912573e9fc56a0a67ad680e2cada783ec8a34c15c6ca1a495c8fdbf09e384bc420295750540f5c77907c459c80f400d8291e44a
 DIST NVIDIA-FreeBSD-x86_64-346.87.tar.gz 58770347 SHA256 fb91a3f66562843465cb6eb28d7d078a31dd9d9ccd65d63d87ee3d7cd7e91d8e SHA512 f1d0e1acfc0eae69d4db3200410babe559d72f46ae7d2beca4f214a35d2b6418bf6b9c333df669f2e77256e1e55959401c0525ae6568121e9b3e6aac0e77bc66 WHIRLPOOL 0df2ee60b2f49c36559aba1135d67a71b9f99dd71c8eb6f19221887f152f7b639176721f2ab3d9b75ae7de62a4248117a15ba25c2af2c469559688c0e6dc5577
+DIST NVIDIA-FreeBSD-x86_64-346.96.tar.gz 58774970 SHA256 89daaff29afe92d825ec8c00149a703b4eb234e4f16bbfb98673f077521bcff9 SHA512 99fd84f1b2177b4af2fd83088c4f8a9a6259f059c002a771ff9c3993953787dd96f83322e4ce611234674a00792a83fa439af915d6ad6886af6de2d88de94edb WHIRLPOOL 5bca7c540c713b8e070b7d8412bcc2547335b9379429dc3a04ab50eae22c03eaa922486a900b2ab3cf147e0c4f2e8d3b60e81aa329b6b2956c28d2b32900082c
 DIST NVIDIA-FreeBSD-x86_64-349.16.tar.gz 60290477 SHA256 b4cb3f3738f8a68b90fb7830ff9b48d9f1e51d3aa6e2dd555b690b4848101a86 SHA512 47c3f59f76b644e5ac69197a22ec8d17d764aa9090049633d274c579d59af8b36780e7a1aa97fa92414eb3c0e76d36e7bdf317f20ed2647482866cd5575f134d WHIRLPOOL a5455b5329211f92ca8f6e87fb796d9844e293878d4a64d2ef6a40a15b57687e66ab81baefb0132790d922b6b4e0c577469c75f98ad208433e14760cc77c6bf7
 DIST NVIDIA-FreeBSD-x86_64-352.30.tar.gz 56681273 SHA256 5fed650cb7b4298d6dac9750ee2e396b2fe24902700c16784c2d38ef0ecd80c1 SHA512 18f878325a02cf5caaba24b7892f55d0ce554492a563dce0a720741c39652c0520708432406d6c78c61fb6f92a4c9dae52dd428c02e3e8442188c49e693edc4d WHIRLPOOL aa2ea6d143a3382fef6a012ee3bfac26df26e1dcdb54ab5d34eab893b1a0459e2a1875925ccda3d531bb59d9336a166d4e369055151ecabae31356be19fd288f
-DIST NVIDIA-FreeBSD-x86_64-355.06.tar.gz 53894942 SHA256 65c5c44bdb6eb19817dfce99df052430b471b9412bd53b95b3723847b195f108 SHA512 f0bb9cff6b914a4526f48f91cb12a10a4ed99a7b550a76b73b087a8f08c90a0d5e8b6b0fb8eb866a1a7dcacbc1242064736c53a164aa48c85c9416a10e68f9ac WHIRLPOOL 989924bd876d440952a13492ea79794f2ca0a9fd026a8fd231d0d52a98bd5610a6560f628998b754cdc62b5e7c2e47948f2bbc2b01415666f433d126db26e06d
+DIST NVIDIA-FreeBSD-x86_64-352.41.tar.gz 56851306 SHA256 4af779cd17c0cb00df3fd280d7d8199f0e41617b501c810632ebd1c8ca3012f9 SHA512 84ad4ac30c76af62532420a4f62dffe5386d047d999f66ad9cf0fceb4c7aac29cad6370560a01b0de772057d78f84df76ddc5686a41a155318566640fa859939 WHIRLPOOL 77e4a736e7296402190a7fb79024e62b9178bddc7ee0dbba212ceb1882ecd086a9a3c10bb862c985ec4c5ecfc8335e5672a81a5e486f20c9126209fcc761b8ac
+DIST NVIDIA-FreeBSD-x86_64-355.11.tar.gz 54031364 SHA256 3637a879905bb541bf02f9bcdfe37c242a52ec6071671a0ba33581efdce1504e SHA512 84add7d90c7f45d19d736ee70c1c4a6434be1c512bafa29cbbf9221e99a31fc383971696dce99da5a77a171eb3537c98cfec7005ff061411ac9c310fa219c906 WHIRLPOOL d8ade5d63c3ef78fa92f9dc07934eed8fdd4ead1e40f1820ad95feb166264a95a800879e1fc6374bf2deef419b0838b4864796d9f81a81110d06ccd9b65c459d
 DIST NVIDIA-Linux-x86-173.14.39-pkg0.run 15134997 SHA256 a09935f37121ed3db8ae3da63a0d8e9d4348a19c859811c9fe44d6ce8e3eab23 SHA512 e24e15ccec725d3cbca502c2b77061776a81ef92917a950adec4ff6bdc34f10903aa654433177ea74be0dade4af81c5380d5710d375a5ea445940d06154bde93 WHIRLPOOL fce3d8e4f6cdf698f5a057514b6fe220bb1011025bdce5bd4cf0e424fb4d306d38251b6726bda03f290ea8137d5a95ed418cf8751722879f9042462abd9181b6
 DIST NVIDIA-Linux-x86-304.125.run 40589395 SHA256 aec5b3a792910e152d5af756ef6fd7224c448c564564c7c448ab8ec3fc78c4f7 SHA512 cd77736790876b66c1e88bf30b7a93f755c0f94118edda8fde1701dc07dc4eb60f89a27b0ed432db74729f269cb239f32f3c5e045d701f60baf69da7fc0d0ea7 WHIRLPOOL 85cd375e1b67bbabe9a8119affec20b7a9a258f8b5be89d755f7ea596a94f98df053e8ade33f1aba1f74f753dcb636268c4f2074a09eaf68d858241f1482552c
+DIST NVIDIA-Linux-x86-304.128.run 40607927 SHA256 f6aa695b3375473e3444412e4a3b7ef6bd8b13e3f3678f4cbe7a3649b5129068 SHA512 9822b61872ae28751cd5c41714048612f7ddf0fd9f02e6340598150afbea43dddeba88482a8c88bcf893b015d14b2a2cf5157ed60583da57fdfe183ecb620c90 WHIRLPOOL 6ffb8d0638af82c3a844f699c57379863fbef3a79b1308bb382c38015fbf26889e41f911f327b63a955586c1c636ecc4ad399fc12db189739d9e80fd63ed1390
 DIST NVIDIA-Linux-x86-331.113.run 37300924 SHA256 42535a99ab68452d30d9c3fad2fb162db01d1f6821115a3c1733ed203efd588b SHA512 bc820609e0379cc5805a5428cc364795b8a5d9e5a2a4395a1ddaa1dda85e6acc59368f87f5974a39fb42bd272458627b2c742fbf1f7fedddb17102439883b111 WHIRLPOOL 1d7b5cb8be5bb76dbe1b238aab4e39ccda0e5b07da268f0652966e79d5e0d2192773316d8f22a2d6a551305b17b610242918822e94e43263c9dbfba8a48bf49b
 DIST NVIDIA-Linux-x86-340.76.run 38818911 SHA256 9b29d93b49009caed84a8852825c3e7c6ebbbba8ec99b03ee5113108c8b036d0 SHA512 45d7b29670f9ca50de80d6d61260015b45f74422bbd12039923d04ae8b033b903b27e9f4c174461055f3cf45a4af44565ce9a8b9cd671e0e54d37770a1156839 WHIRLPOOL da7e072a56e3aff8b4688e60c5acd76c97804fa582d21c70dce043b13fa2317d1021f19927e827cf6132aebe2d40371c750e3eb56697bc7eda16bb7369bf2994
+DIST NVIDIA-Linux-x86-340.93.run 38703394 SHA256 4a81c158302c595e1e72b5a1812eb3c67c8cf584ca74b1bc24163dad5289d612 SHA512 7507553bd4b11cac2cd882cd8afba59e773f58a26e67ee7e781c488be963a4f1eb54dcd72b40b29d33dd81c74d4748a76c1632b2c8ea08b524b4318c18b5dfe5 WHIRLPOOL 242190999da74f2fe4bfe4b223f43dec6ec73d97afd1e84e2c78c5fd5616d9814b647067ddf3f591ea8064d29234491de1c6f87b442e240d2aac4a1e598aefad
 DIST NVIDIA-Linux-x86-343.36.run 41073259 SHA256 8cc1c99fbda29b3258f57dbdacef11921aca2e3ac106ef591f0815716e1b829e SHA512 a6287cf8ad6379daa7c6d7ae6bc08f9985ad9e9353de6d88eb72d8a1acad3e25eb65076b904152c6ddd8ac54b9afcdbb7a5dfb9a46e75c5654be87b3df0e48e1 WHIRLPOOL 7aaa7977a850314045bcfcc36a8f6ed8b3f487ec972e109ea48cbe3edda4ff29c0bf02e7c11dacf6a3e71783259dc809840c32e301aa16f2d4394d7f07cffc0a
 DIST NVIDIA-Linux-x86-346.87.run 41303879 SHA256 0050d31e3c9d91d2372ddfe05ad7e217cdb68cd65aad60406a0c7ea878793999 SHA512 10b923847571576fbe31a037a16bdbaf9bac38caa7b380c12805f60163d6b0a359465e0d6acfa869c72dae701f62eb416b5874872e5cc34ae6cb5659ea899231 WHIRLPOOL ea7bc4cc1d70160f42bfcc082acbc00d39112d66e03f0b6cf17294cf9ac9b543e5242ddba3286eb3eff0f32d37227f40016dd40cf5e34ff1b26640bbba88f58b
+DIST NVIDIA-Linux-x86-346.96.run 40751579 SHA256 8a299ddce7d34389206599a306a41d30754bb9bddda1be1a7fd85012f9aedf39 SHA512 9d413dd0559a4035a842527371cb1a27030c9eaeff510e529d2a205ea3eddc6e5666989418a6172aead4f5b2a924cf4cbf05269cb435dc2516af37eb35ba5d4d WHIRLPOOL 055127105804f2a6dc5067b20e771b4c12ad9dad62f4e874719385c7115e8394a8618eed3d6b330c8b5d90cbd3ae7fd09998e2a0017e35b4adca0f626110f238
 DIST NVIDIA-Linux-x86-349.16.run 42751511 SHA256 35c8d00ece6a450e8e72aac2bff45e89ce40ffbe3278802e8a0b4ff65c793d11 SHA512 d3609c4ccfbf6b005a8c58dc5bc3091c7b603229bb27bf48c545fafd9d7175a06ab4d5b414586a5234f2699bed4f613b809c058dff4e1f5fe4416adc53c4d3ab WHIRLPOOL ff4ff2f83e50c6675ec35035a2bd0d534acfb2f8fbb4d5b2d00770dae3b4f48db83fa789c57a6f958f13d8bdbb68971c5ba10cf2fc7b0c4a5a8cb836a09d4586
 DIST NVIDIA-Linux-x86-352.30.run 42931523 SHA256 563eb858584f3eec38f137055039cd4addc7bb4c8f47f90e87a0cc1f88db32e3 SHA512 53f03aa6bd0162d5cc068f4626f465a4a2f79c56609d8d3a86999f4cfcb4113752598337a0b893c6005b529924b677a0fd43c4e9e782b7e6e7d3d50337a07fc7 WHIRLPOOL ca56068eb5dd45b081634cabea1e9f96c54d388de79a19d7237059c45ee110118decb5a8d658605b65517ac39adae623b2c366e5d7bec219c8b9169ee71d7767
-DIST NVIDIA-Linux-x86-355.06.run 42921947 SHA256 741ba8e974f0592d3a7940cc16f9ea7b69fe8f42908c8e81988b9814a74d7859 SHA512 9229747fcdb34fefe14a89e70cc41f476cadc491245d7bc50ff7ca8b484b41f94bd900f4910eba9b6183cb0ed872cafc8918bfde82975fed5c56612b545406e9 WHIRLPOOL 1af2fc985e59686b147d7506cafd9d9e8097f071a096af103c7ef7fd22a0f684abd6b6aa25b5e82edb488c7e901f5ee41d1f9d89998c9a6a65795884ca5e3979
+DIST NVIDIA-Linux-x86-352.41.run 42407126 SHA256 b3fc5af7bb2852305272ffb3d5d73fbfba639d6a2af9e34a007dde3c6133f6e3 SHA512 7c06aff7916b28b58be63b41e8e24203b35cbb6353712b651b7b461d006a4f636dd461faa4a98060c4dc0e0f0c99f51332600f9f494a91b3af839b965cb81c5a WHIRLPOOL 206071a60f49353d944d7268a6f76e6fbc2369203ba6071d68a8c662a93e8e7458b586ada91f75f5d355d845aae455d7b0d19e40d23cc3de1e83e6c4367568e5
+DIST NVIDIA-Linux-x86-355.11.run 43569515 SHA256 94ce6b879581b931b84d83a9111040b9a5aa9306b012b4380cd93f6ffede3066 SHA512 450caea472c5e1b3d7098adba28d18c1221cf809c6bd0071466ff2a946dd0eca6555475f5f6bc044fb19a21c8939b1020357d4aeb0ce47d0edfcda071a66fd46 WHIRLPOOL 3a95e83ab3f46e64150caf1489aa3173aae69919bf432eabcdd0501de8bcdee5402cdb33e149a4d5d429ccb85e4b4af9b30bec5516ad7b7f091ae42f6093d26f
 DIST NVIDIA-Linux-x86-96.43.23-pkg0.run 11504817 SHA256 51e6adf4ba73071622045fc37169f80db3ae3e784dff53b29d35146a04042142 SHA512 bed5726e57637481fe4e3c03a65ec14fe949f00860e729ebde408f4fd861d7bfdc296a78bc2f5d42e8b282db09f4bbde1e0545df7228fa20227080dc4b868ba7 WHIRLPOOL 6d4fd1786c11f4e326cc3101d0bb1a2f8b63c25c3dd59f10188f8355759e2861ce44fd53d60258b513d5a1d6124d0f91ba8edf4d3668b6feabfb3e8d585f14fe
 DIST NVIDIA-Linux-x86_64-173.14.39-pkg2.run 21100833 SHA256 15a953666d5681ba54c97498b578ffd286a1dc96d605f3b02110f3f99813100e SHA512 a65cd496e6ed57f771c3d99f37f616a1242d97844f6faef7a807825ad899c0e536a99fde397020839f0857883b934032f9491024f3047a6b06d3eea1f5d77713 WHIRLPOOL dc5f243b7d1de7e2d1b7f005e018a2940d63335b11a7c83c234b348b7a1839e9131169d2ea928bd8c2f549a4535149b03e16e6c94d59dfa745f7f904ff790a45
 DIST NVIDIA-Linux-x86_64-304.125.run 69108272 SHA256 c654889b85a18326f2c610260a8fbc3b1bb6f9b8be1c052a46a213f60bd62262 SHA512 75bd5700281b0aa4e19be5b779e3484711ce3db92641a32f3bf5e890601b353b23113f6218d5a2fa6b2c8d93702fac92810013c7c0f8efe484b0a39d09b1b073 WHIRLPOOL d8b9794253b1ab270680da7420f50df5ab6aa4d5123bad695be5b7891b2df55bf06ecdd0b221fd29e799077c0a64da8059df16ebea9a3535e402f2c0cf482dcf
+DIST NVIDIA-Linux-x86_64-304.128.run 69091465 SHA256 e301342b93af24a6676519cb3a7fbe5d557b6a23a588ef121478b7fbab8a495f SHA512 493b6c9647122c9fda5ac3146f3e8f60000d3efd09e93762d49d70266baffeba493479fb046cf2f6465b2ce9e53a8699254cbd165b5a3efcefee5fca9fb11056 WHIRLPOOL fe9735282f91e8e68c50325a4c0506d18347b53fb11f0328a6d0fc1f395ec3d2ea48a510b90f3c05f1c447b40db94216a0445eadac220ff500c5864439845b1b
 DIST NVIDIA-Linux-x86_64-331.113.run 60509547 SHA256 e9d5eb4394ef31825f7a86290b19b522851d1b599284095d81bac0f33a996219 SHA512 f71f3d20016bebe4e7f83704a7539f0d53c92a2598a34f9f48ad421e5743ef554aa97315f2a762f132b730b1f37c5811aa617fed3c5a90d3e2e9cc5320e366b7 WHIRLPOOL 2f06c45cb4750eb5c7d6a2ff4e4c3abaf813df135da13691f30238baf89c2fa1477d5694088f268d8681cf719889b9e2644fc1d707785113703cd2e4d7c0b27f
 DIST NVIDIA-Linux-x86_64-340.76.run 69955037 SHA256 3bf670e9a2bdb184648dec54ce06fab65e798a9a4c9dd5155e2be4efee3e0994 SHA512 59ad49a49f170ec971e2b5ee3a45b9f972521bc4b7ab6f02f46a5cfc5b1998841195cc5c91dffc417d2183de39c5a589eabf7b48864e0c6842363a75051db40c WHIRLPOOL 8c846f2b5b6f56bd2962fe4660751a4485e0ddd2186bde0affccece32271b03f4f3c226377c0b1877ea391ab130ed6f282c316f227205488a63e4f0a19db82cc
+DIST NVIDIA-Linux-x86_64-340.93.run 69813449 SHA256 ea2ac747fd473ea55ed5f6263bd314efa94c71384f3e03d527f8d550ba84c218 SHA512 f7540f3a49ccd67346b81332e4bfd03becef135f7e777cef3256fe33b3313456456ae095a352e333bbf6463bb13b9486a70718fa4c4355d66222bb0a7437de29 WHIRLPOOL e5286fbcaeffbcd3bd66c5adba8c20eb9cd64915b38606289cfab41a754a46b250667e6ac3485f8c3ed3b5a16bc14dcce6a9227d486be71d5b58298ca7d70f4d
 DIST NVIDIA-Linux-x86_64-343.36.run 73775989 SHA256 2285efa2c0e6675d8724e47a09403630a674c32e514bdcfb54cec3c81810fc78 SHA512 6e76e54b24b0c1fa16e94eaf0f99d2e7dfd28e5aaae0bcb6df3e6d4e20c7a13d5d30902e2bc9bc7609c8d87e5ec8fbf16a5a2dd513bb9d761714176c4ce5e283 WHIRLPOOL 73040a3f3073486c5d6d0a5d84be7d478a3c15bb4aee21f3c590592afe2845f8e9c7064010ddc8f93b764e48940e523952abf9978d09cd32ec1ce8b644e59eb6
 DIST NVIDIA-Linux-x86_64-346.87.run 74056785 SHA256 908446b20c9992cc6a7700866d36c13d9f53646837842d096d91b35644ee4e31 SHA512 fa192cd5b1dc44bcf23abd188b3fa292ad04cf8cc6b10042c465f10371db55e7218bd37e3101309a9b4c7e58b863c26526d33966a57ea7761d75dc04d382a119 WHIRLPOOL 6666aedd8ceffa0694ecb884e548db32899f3372b14b4fefba05ff4361655c4a1b4ff5d6b9a3ac7f354f140511fb11be01e287cb7efcdee6dcbe95bf5d6f5a75
+DIST NVIDIA-Linux-x86_64-346.96.run 73538317 SHA256 229b28a6b65965a248d07223d941de7d79b54cee7c6574f1037293e8a8026727 SHA512 188f8aac88085c3cac9637e87f4d9259d0c508075bbbf684775650a12f4760f47ba9e92f79e8bbe96d33ee014092edd38efce7dd730f67e0f11c2079eca938c5 WHIRLPOOL c9f4a5163018dc0b53aeff84b410cb34720d06ca7bdd17ce166ad3a2b057ffe94e6773594cd617fce79d9d0a02e5e1cd0525ca30dade7247ad5b7b20ff661a64
 DIST NVIDIA-Linux-x86_64-349.16.run 77513301 SHA256 f980b22729b20c9eb3a3a800af524da181afbc78e2409a3f83845894983f8322 SHA512 143999f5401ac8634049786073203fab7e8d23dc9e0d4d62d4c6ba9945c20f7d4034c37d0f721aae540503f6bcffbf200a0af70520ae7ee10a2529ed92a14866 WHIRLPOOL 9a6817c03d11253ed606294d2cc2b5f2c4c612af2f8b6f72228a9e21d4991f8bcf248a28ff70d6f477860a64bcf795ec0ee2f73c34904e5cdf0979d41e370042
 DIST NVIDIA-Linux-x86_64-352.30.run 77669309 SHA256 4c5fb75ba94c97b6d70ddb9ea2cb11b5ed01829b5f671d9e8abce7afba20aef5 SHA512 165d2053ffb6f9251b3dbff7516541f363c460397cb0c83e4e867a9df4202082e524c8afc25402bd97d7f7ec769ec00fbec041070ee59ea88908d9f55aaeb2b7 WHIRLPOOL dc9e6abee93c49be6096e86e68a880727dcfb92b311fefac3b2e5b88d17d795e615c6cba0e5db32ce4ed4ec462a46ca659516e707e378d30f4543e6a67975852
-DIST NVIDIA-Linux-x86_64-355.06.run 75926474 SHA256 898304e1455bbccad4a3da3520d7fe17db254413f3458d0a296b45fb9cf2bcd6 SHA512 e9c617c2877ba9049f1242664dc6796c09714c495dbe7ec7705fdaf788c0ab11f35cb7a48058670ab4a56d777b7e02bc1e1f7b90959e4f1dd687a8f2f805f8a4 WHIRLPOOL 909025e9a4705a6ae1be9d1572c0491fdeeb708b3746fd2b2b38ab7e34d37c54f279861c8b33d36a71dd173ec15937b050bbc4c8c554dbeb60174348e005f201
+DIST NVIDIA-Linux-x86_64-352.41.run 77180264 SHA256 0eb60d0543a0e7c5c3cfec13702005ffec6e2b8c7f22c631f324736ba2a1a832 SHA512 e898eda296de9b3158b0d0ab62a806d9ffed4d06ac378281009d82e0f4dc6579b1507661c022de8cdc25c506c642169baead79bf45567b31d8a6369885a17592 WHIRLPOOL 5e5c670cbad0998dd90858ac0b4a7ad110903c33b04b4dcb216af625191b9bf955cb77588a0bd4d23059d357dd9ef3dfd7b7ed72ec46da1388cfa2f2b0413ab4
+DIST NVIDIA-Linux-x86_64-355.11.run 76490009 SHA256 a59b425381add9d9058dc2d987bf3087ab59c43224b5eb04c3f273f5886451ed SHA512 bfc7ab7741183408aa0226dc29176c8ffe08566fbea7cebf78f4aa30627dc27ddf90bb82951c99006b34bc481be15712b4f5867ef543a32bfe3fe81a8e6ddeae WHIRLPOOL bb5d3397a855a53c2cd7e48056564085b906550f856207932e4670fef995030a3a7bcc0a9b97fee2e60aaff9b41c4a954afc57585441f5dec92c795358da810a
 DIST NVIDIA-Linux-x86_64-96.43.23-pkg2.run 15962375 SHA256 ce8d8253e7dab7da63fbdac449ebf190cd0c10cbfffea0f8d0165515f851bc64 SHA512 04bec1187a6024a2b9839f008ec829281f1f2602dae2e639030bc385943186506bcaa2b46a230b2ab87f9217190841abc62f9e2d6395ab5559623389c31c6563 WHIRLPOOL 0651c44a51a1a06fcff5bfddbf9c3e408977e03263c7fe806cb6c01f9fe92f716dfe4e5190ffe1048bde72fcffdc8bca8267e74dd43ba5c9dfb22b6201fcc2bb
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-304.128.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-304.128.ebuild
new file mode 100644
index 000000000000..8aa6cd6ec05c
--- /dev/null
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-304.128.ebuild
@@ -0,0 +1,457 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils flag-o-matic linux-info linux-mod multilib nvidia-driver \
+	portability toolchain-funcs unpacker user versionator udev
+
+NV_URI="http://us.download.nvidia.com/XFree86/"
+X86_NV_PACKAGE="NVIDIA-Linux-x86-${PV}"
+AMD64_NV_PACKAGE="NVIDIA-Linux-x86_64-${PV}"
+X86_FBSD_NV_PACKAGE="NVIDIA-FreeBSD-x86-${PV}"
+AMD64_FBSD_NV_PACKAGE="NVIDIA-FreeBSD-x86_64-${PV}"
+
+DESCRIPTION="NVIDIA Accelerated Graphics Driver"
+HOMEPAGE="http://www.nvidia.com/"
+SRC_URI="
+	amd64-fbsd? ( ${NV_URI}FreeBSD-x86_64/${PV}/${AMD64_FBSD_NV_PACKAGE}.tar.gz )
+	amd64? ( ${NV_URI}Linux-x86_64/${PV}/${AMD64_NV_PACKAGE}.run )
+	x86-fbsd? ( ${NV_URI}FreeBSD-x86/${PV}/${X86_FBSD_NV_PACKAGE}.tar.gz )
+	x86? ( ${NV_URI}Linux-x86/${PV}/${X86_NV_PACKAGE}.run )
+"
+
+LICENSE="GPL-2 NVIDIA-r1"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE="acpi multilib kernel_FreeBSD kernel_linux pax_kernel +tools +X"
+RESTRICT="bindist mirror strip"
+EMULTILIB_PKG="true"
+
+COMMON="app-eselect/eselect-opencl
+	kernel_linux? ( >=sys-libs/glibc-2.6.1 )
+	X? (
+		>=app-eselect/eselect-opengl-1.0.9
+	)"
+DEPEND="${COMMON}
+	kernel_linux? (
+		virtual/linux-sources
+		virtual/pkgconfig
+	)"
+RDEPEND="${COMMON}
+	acpi? ( sys-power/acpid )
+	tools? (
+		dev-libs/atk
+		dev-libs/glib:2
+		x11-libs/gdk-pixbuf
+		x11-libs/gtk+:2
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/pango[X]
+		x11-libs/pangox-compat
+	)
+	X? (
+		<x11-base/xorg-server-1.17.99:=
+		x11-libs/libXvMC
+		multilib? (
+			>=x11-libs/libX11-1.6.2[abi_x86_32]
+			>=x11-libs/libXext-1.3.2[abi_x86_32]
+		)
+	)
+"
+PDEPEND="X? ( >=x11-libs/libvdpau-0.3-r1 )"
+
+REQUIRED_USE="tools? ( X )"
+
+QA_PREBUILT="opt/* usr/lib*"
+
+S=${WORKDIR}/
+
+pkg_pretend() {
+
+	if use amd64 && has_multilib_profile && \
+		[ "${DEFAULT_ABI}" != "amd64" ]; then
+		eerror "This ebuild doesn't currently support changing your default ABI"
+		die "Unexpected \${DEFAULT_ABI} = ${DEFAULT_ABI}"
+	fi
+
+	if use kernel_linux && kernel_is ge 4 3; then
+		ewarn "Gentoo supports kernels which are supported by NVIDIA"
+		ewarn "which are limited to the following kernels:"
+		ewarn "<sys-kernel/gentoo-sources-4.3"
+		ewarn "<sys-kernel/vanilla-sources-4.3"
+		ewarn ""
+		ewarn "You are free to utilize epatch_user to provide whatever"
+		ewarn "support you feel is appropriate, but will not receive"
+		ewarn "support as a result of those changes."
+		ewarn ""
+		ewarn "Do not file a bug report about this."
+	fi
+
+	# Since Nvidia ships 3 different series of drivers, we need to give the user
+	# some kind of guidance as to what version they should install. This tries
+	# to point the user in the right direction but can't be perfect. check
+	# nvidia-driver.eclass
+	nvidia-driver-check-warning
+
+	# Kernel features/options to check for
+	CONFIG_CHECK="~ZONE_DMA ~MTRR ~SYSVIPC ~!LOCKDEP"
+	use x86 && CONFIG_CHECK+=" ~HIGHMEM"
+
+	# Now do the above checks
+	use kernel_linux && check_extra_config
+}
+
+pkg_setup() {
+	# try to turn off distcc and ccache for people that have a problem with it
+	export DISTCC_DISABLE=1
+	export CCACHE_DISABLE=1
+
+	if use kernel_linux; then
+		linux-mod_pkg_setup
+		MODULE_NAMES="nvidia(video:${S}/kernel)"
+		BUILD_PARAMS="IGNORE_CC_MISMATCH=yes V=1 SYSSRC=${KV_DIR} \
+		SYSOUT=${KV_OUT_DIR} CC=$(tc-getBUILD_CC)"
+		# linux-mod_src_compile calls set_arch_to_kernel, which
+		# sets the ARCH to x86 but NVIDIA's wrapping Makefile
+		# expects x86_64 or i386 and then converts it to x86
+		# later on in the build process
+		BUILD_FIXES="ARCH=$(uname -m | sed -e 's/i.86/i386/')"
+	fi
+
+	# set variables to where files are in the package structure
+	if use kernel_FreeBSD; then
+		use x86-fbsd   && S="${WORKDIR}/${X86_FBSD_NV_PACKAGE}"
+		use amd64-fbsd && S="${WORKDIR}/${AMD64_FBSD_NV_PACKAGE}"
+		NV_DOC="${S}/doc"
+		NV_OBJ="${S}/obj"
+		NV_SRC="${S}/src"
+		NV_MAN="${S}/x11/man"
+		NV_X11="${S}/obj"
+		NV_SOVER=1
+	elif use kernel_linux; then
+		NV_DOC="${S}"
+		NV_OBJ="${S}"
+		NV_SRC="${S}/kernel"
+		NV_MAN="${S}"
+		NV_X11="${S}"
+		NV_SOVER=${PV}
+	else
+		die "Could not determine proper NVIDIA package"
+	fi
+}
+
+src_unpack() {
+	if ! use kernel_FreeBSD; then
+		cd "${S}"
+		unpack_makeself
+	else
+		unpack ${A}
+	fi
+}
+
+src_prepare() {
+	# Please add a brief description for every added patch
+
+	if use kernel_linux; then
+		if kernel_is lt 2 6 9 ; then
+			eerror "You must build this against 2.6.9 or higher kernels."
+		fi
+
+		# If greater than 2.6.5 use M= instead of SUBDIR=
+		convert_to_m "${NV_SRC}"/Makefile.kbuild
+	fi
+
+	if use pax_kernel; then
+		ewarn "Using PAX patches is not supported. You will be asked to"
+		ewarn "use a standard kernel should you have issues. Should you"
+		ewarn "need support with these patches, contact the PaX team."
+		epatch "${FILESDIR}"/${PN}-pax-const.patch
+		epatch "${FILESDIR}"/${PN}-pax-usercopy.patch
+	fi
+
+	cat <<- EOF > "${S}"/nvidia.icd
+		/usr/$(get_libdir)/libnvidia-opencl.so
+	EOF
+
+	# Allow user patches so they can support RC kernels and whatever else
+	epatch_user
+}
+
+src_compile() {
+	# This is already the default on Linux, as there's no toplevel Makefile, but
+	# on FreeBSD there's one and triggers the kernel module build, as we install
+	# it by itself, pass this.
+
+	cd "${NV_SRC}"
+	if use kernel_FreeBSD; then
+		MAKE="$(get_bmake)" CFLAGS="-Wno-sign-compare" emake CC="$(tc-getCC)" \
+			LD="$(tc-getLD)" LDFLAGS="$(raw-ldflags)" || die
+	elif use kernel_linux; then
+		MAKEOPTS=-j1 linux-mod_src_compile
+	fi
+}
+
+# Install nvidia library:
+# the first parameter is the library to install
+# the second parameter is the provided soversion
+# the third parameter is the target directory if its not /usr/lib
+donvidia() {
+	# Full path to library minus SOVER
+	MY_LIB="$1"
+
+	# SOVER to use
+	MY_SOVER="$2"
+
+	# Where to install
+	MY_DEST="$3"
+
+	if [[ -z "${MY_DEST}" ]]; then
+		MY_DEST="/usr/$(get_libdir)"
+		action="dolib.so"
+	else
+		exeinto ${MY_DEST}
+		action="doexe"
+	fi
+
+	# Get just the library name
+	libname=$(basename $1)
+
+	# Install the library with the correct SOVER
+	${action} ${MY_LIB}.${MY_SOVER} || \
+		die "failed to install ${libname}"
+
+	# If SOVER wasn't 1, then we need to create a .1 symlink
+	if [[ "${MY_SOVER}" != "1" ]]; then
+		dosym ${libname}.${MY_SOVER} \
+			${MY_DEST}/${libname}.1 || \
+			die "failed to create ${libname} symlink"
+	fi
+
+	# Always create the symlink from the raw lib to the .1
+	dosym ${libname}.1 \
+		${MY_DEST}/${libname} || \
+		die "failed to create ${libname} symlink"
+}
+
+src_install() {
+	if use kernel_linux; then
+		linux-mod_src_install
+
+		# Add the aliases
+		# This file is tweaked with the appropriate video group in
+		# pkg_preinst, see bug #491414
+		insinto /etc/modprobe.d
+		newins "${FILESDIR}"/nvidia-169.07 nvidia.conf
+
+		# Ensures that our device nodes are created when not using X
+		exeinto "$(get_udevdir)"
+		doexe "${FILESDIR}"/nvidia-udev.sh
+		udev_newrules "${FILESDIR}"/nvidia.udev-rule 99-nvidia.rules
+	elif use kernel_FreeBSD; then
+		if use x86-fbsd; then
+			insinto /boot/modules
+			doins "${S}/src/nvidia.kld"
+		fi
+
+		exeinto /boot/modules
+		doexe "${S}/src/nvidia.ko"
+	fi
+
+	# NVIDIA kernel <-> userspace driver config lib
+	donvidia ${NV_OBJ}/libnvidia-cfg.so ${NV_SOVER}
+
+	if use kernel_linux; then
+		# NVIDIA video decode <-> CUDA
+		donvidia ${NV_OBJ}/libnvcuvid.so ${NV_SOVER}
+	fi
+
+	if use X; then
+		# Xorg DDX driver
+		insinto /usr/$(get_libdir)/xorg/modules/drivers
+		doins ${NV_X11}/nvidia_drv.so
+
+		# Xorg GLX driver
+		donvidia ${NV_X11}/libglx.so ${NV_SOVER} \
+			/usr/$(get_libdir)/opengl/nvidia/extensions
+
+		# XvMC driver
+		dolib.a ${NV_X11}/libXvMCNVIDIA.a || \
+			die "failed to install libXvMCNVIDIA.so"
+		donvidia ${NV_X11}/libXvMCNVIDIA.so ${NV_SOVER}
+		dosym libXvMCNVIDIA.so.${NV_SOVER} \
+			/usr/$(get_libdir)/libXvMCNVIDIA_dynamic.so.1 || \
+			die "failed to create libXvMCNVIDIA_dynamic.so symlink"
+	fi
+
+	# OpenCL ICD for NVIDIA
+	if use kernel_linux; then
+		insinto /etc/OpenCL/vendors
+		doins nvidia.icd
+		donvidia ${NV_OBJ}/libnvidia-opencl.so ${NV_SOVER}
+	fi
+
+	# Documentation
+	dohtml ${NV_DOC}/html/*
+	if use kernel_FreeBSD; then
+		dodoc "${NV_DOC}/README"
+		use X && doman "${NV_MAN}/nvidia-xconfig.1"
+		use tools && doman "${NV_MAN}/nvidia-settings.1"
+	else
+		# Docs
+		newdoc "${NV_DOC}/README.txt" README
+		dodoc "${NV_DOC}/NVIDIA_Changelog"
+		doman "${NV_MAN}/nvidia-smi.1.gz"
+		use X && doman "${NV_MAN}/nvidia-xconfig.1.gz"
+		use tools && doman "${NV_MAN}/nvidia-settings.1.gz"
+		doman "${NV_MAN}/nvidia-cuda-proxy-control.1.gz"
+	fi
+
+	# Helper Apps
+	exeinto /opt/bin/
+
+	if use X; then
+		doexe ${NV_OBJ}/nvidia-xconfig
+	fi
+
+	if use kernel_linux ; then
+		doexe ${NV_OBJ}/nvidia-debugdump
+		doexe ${NV_OBJ}/nvidia-cuda-proxy-control
+		doexe ${NV_OBJ}/nvidia-cuda-proxy-server
+		doexe ${NV_OBJ}/nvidia-smi
+		newinitd "${FILESDIR}/nvidia-smi.init" nvidia-smi
+	fi
+
+	if use tools; then
+		doexe ${NV_OBJ}/nvidia-settings
+	fi
+
+	dobin ${NV_OBJ}/nvidia-bug-report.sh
+
+	# Desktop entries for nvidia-settings
+	if use tools ; then
+		# There is no icon in the FreeBSD tarball.
+		use kernel_FreeBSD || newicon ${NV_OBJ}/nvidia-settings.png ${PN}-settings.png
+		domenu "${FILESDIR}"/${PN}-settings.desktop
+		exeinto /etc/X11/xinit/xinitrc.d
+		doexe "${FILESDIR}"/95-nvidia-settings
+	fi
+
+	#doenvd "${FILESDIR}"/50nvidia-prelink-blacklist
+
+	if has_multilib_profile && use multilib ; then
+		local OABI=${ABI}
+		for ABI in $(get_install_abis) ; do
+			src_install-libs
+		done
+		ABI=${OABI}
+		unset OABI
+	else
+		src_install-libs
+	fi
+
+	is_final_abi || die "failed to iterate through all ABIs"
+
+	readme.gentoo_create_doc
+}
+
+src_install-libs() {
+	local inslibdir=$(get_libdir)
+	local GL_ROOT="/usr/$(get_libdir)/opengl/nvidia/lib"
+	local CL_ROOT="/usr/$(get_libdir)/OpenCL/vendors/nvidia"
+	local libdir=${NV_OBJ}
+
+	if use kernel_linux && has_multilib_profile && \
+			[[ ${ABI} == "x86" ]] ; then
+		libdir=${NV_OBJ}/32
+	fi
+
+	if use X; then
+		# The GLX libraries
+		donvidia ${libdir}/libGL.so ${NV_SOVER} ${GL_ROOT}
+		donvidia ${libdir}/libnvidia-glcore.so ${NV_SOVER}
+		if use kernel_FreeBSD; then
+			donvidia ${libdir}/libnvidia-tls.so ${NV_SOVER} ${GL_ROOT}
+		else
+			donvidia ${libdir}/tls/libnvidia-tls.so ${NV_SOVER} ${GL_ROOT}
+		fi
+
+		# VDPAU
+		donvidia ${libdir}/libvdpau_nvidia.so ${NV_SOVER}
+	fi
+
+	# NVIDIA monitoring library
+	if use kernel_linux ; then
+		donvidia ${libdir}/libnvidia-ml.so ${NV_SOVER}
+	fi
+
+	# CUDA & OpenCL
+	if use kernel_linux; then
+		donvidia ${libdir}/libcuda.so ${NV_SOVER}
+		donvidia ${libdir}/libnvidia-compiler.so ${NV_SOVER}
+		donvidia ${libdir}/libOpenCL.so 1.0.0 ${CL_ROOT}
+	fi
+}
+
+pkg_preinst() {
+	if use kernel_linux; then
+		linux-mod_pkg_preinst
+
+		local videogroup="$(egetent group video | cut -d ':' -f 3)"
+		if [ -z "${videogroup}" ]; then
+			eerror "Failed to determine the video group gid"
+			die "Failed to determine the video group gid"
+		else
+			sed -i \
+				-e "s:PACKAGE:${PF}:g" \
+				-e "s:VIDEOGID:${videogroup}:" \
+				"${D}"/etc/modprobe.d/nvidia.conf || die
+		fi
+	fi
+
+	# Clean the dynamic libGL stuff's home to ensure
+	# we dont have stale libs floating around
+	if [ -d "${ROOT}"/usr/lib/opengl/nvidia ] ; then
+		rm -rf "${ROOT}"/usr/lib/opengl/nvidia/*
+	fi
+	# Make sure we nuke the old nvidia-glx's env.d file
+	if [ -e "${ROOT}"/etc/env.d/09nvidia ] ; then
+		rm -f "${ROOT}"/etc/env.d/09nvidia
+	fi
+}
+
+pkg_postinst() {
+	use kernel_linux && linux-mod_pkg_postinst
+
+	# Switch to the nvidia implementation
+	use X && "${ROOT}"/usr/bin/eselect opengl set --use-old nvidia
+	"${ROOT}"/usr/bin/eselect opencl set --use-old nvidia
+
+	readme.gentoo_print_elog
+
+	if ! use X; then
+		elog "You have elected to not install the X.org driver. Along with"
+		elog "this the OpenGL libraries, XvMC, and VDPAU libraries were not"
+		elog "installed. Additionally, once the driver is loaded your card"
+		elog "and fan will run at max speed which may not be desirable."
+		elog "Use the 'nvidia-smi' init script to have your card and fan"
+		elog "speed scale appropriately."
+		elog
+	fi
+	if ! use tools; then
+		elog "USE=tools controls whether the nvidia-settings application"
+		elog "is installed. If you would like to use it, enable that"
+		elog "flag and re-emerge this ebuild. Optionally you can install"
+		elog "media-video/nvidia-settings"
+		elog
+	fi
+}
+
+pkg_prerm() {
+	use X && "${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11
+}
+
+pkg_postrm() {
+	use kernel_linux && linux-mod_pkg_postrm
+	use X && "${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11
+}
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-340.93.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-340.93.ebuild
new file mode 100644
index 000000000000..6eef187a484a
--- /dev/null
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-340.93.ebuild
@@ -0,0 +1,479 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils flag-o-matic linux-info linux-mod multilib nvidia-driver \
+	portability toolchain-funcs unpacker user udev
+
+NV_URI="http://us.download.nvidia.com/XFree86/"
+X86_NV_PACKAGE="NVIDIA-Linux-x86-${PV}"
+AMD64_NV_PACKAGE="NVIDIA-Linux-x86_64-${PV}"
+X86_FBSD_NV_PACKAGE="NVIDIA-FreeBSD-x86-${PV}"
+AMD64_FBSD_NV_PACKAGE="NVIDIA-FreeBSD-x86_64-${PV}"
+
+DESCRIPTION="NVIDIA Accelerated Graphics Driver"
+HOMEPAGE="http://www.nvidia.com/"
+SRC_URI="
+	amd64-fbsd? ( ${NV_URI}FreeBSD-x86_64/${PV}/${AMD64_FBSD_NV_PACKAGE}.tar.gz )
+	amd64? ( ${NV_URI}Linux-x86_64/${PV}/${AMD64_NV_PACKAGE}.run )
+	x86-fbsd? ( ${NV_URI}FreeBSD-x86/${PV}/${X86_FBSD_NV_PACKAGE}.tar.gz )
+	x86? ( ${NV_URI}Linux-x86/${PV}/${X86_NV_PACKAGE}.run )
+"
+
+LICENSE="GPL-2 NVIDIA-r2"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE="acpi multilib kernel_FreeBSD kernel_linux pax_kernel +tools +X uvm"
+RESTRICT="bindist mirror strip"
+EMULTILIB_PKG="true"
+
+COMMON="
+	app-eselect/eselect-opencl
+	kernel_linux? ( >=sys-libs/glibc-2.6.1 )
+	X? (
+		>=app-eselect/eselect-opengl-1.0.9
+	)
+"
+DEPEND="
+	${COMMON}
+	app-arch/xz-utils
+	kernel_linux? ( virtual/linux-sources )
+"
+RDEPEND="
+	${COMMON}
+	acpi? ( sys-power/acpid )
+	tools? (
+		dev-libs/atk
+		dev-libs/glib:2
+		x11-libs/gdk-pixbuf
+		>=x11-libs/gtk+-2.4:2
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/pango[X]
+	)
+	X? (
+		<x11-base/xorg-server-1.17.99:=
+		>=x11-libs/libvdpau-0.3-r1
+		multilib? (
+			>=x11-libs/libX11-1.6.2[abi_x86_32]
+			>=x11-libs/libXext-1.3.2[abi_x86_32]
+		)
+	)
+"
+
+REQUIRED_USE="tools? ( X )"
+
+QA_PREBUILT="opt/* usr/lib*"
+
+S=${WORKDIR}/
+
+pkg_pretend() {
+
+	if use amd64 && has_multilib_profile && \
+		[ "${DEFAULT_ABI}" != "amd64" ]; then
+		eerror "This ebuild doesn't currently support changing your default ABI"
+		die "Unexpected \${DEFAULT_ABI} = ${DEFAULT_ABI}"
+	fi
+
+	if use kernel_linux && kernel_is ge 4 3; then
+		ewarn "Gentoo supports kernels which are supported by NVIDIA"
+		ewarn "which are limited to the following kernels:"
+		ewarn "<sys-kernel/gentoo-sources-4.3"
+		ewarn "<sys-kernel/vanilla-sources-4.3"
+		ewarn ""
+		ewarn "You are free to utilize epatch_user to provide whatever"
+		ewarn "support you feel is appropriate, but will not receive"
+		ewarn "support as a result of those changes."
+		ewarn ""
+		ewarn "Do not file a bug report about this."
+	fi
+
+	# Since Nvidia ships 3 different series of drivers, we need to give the user
+	# some kind of guidance as to what version they should install. This tries
+	# to point the user in the right direction but can't be perfect. check
+	# nvidia-driver.eclass
+	nvidia-driver-check-warning
+
+	# Kernel features/options to check for
+	CONFIG_CHECK="~ZONE_DMA ~MTRR ~SYSVIPC ~!LOCKDEP"
+	use x86 && CONFIG_CHECK+=" ~HIGHMEM"
+
+	# Now do the above checks
+	use kernel_linux && check_extra_config
+}
+
+pkg_setup() {
+	# try to turn off distcc and ccache for people that have a problem with it
+	export DISTCC_DISABLE=1
+	export CCACHE_DISABLE=1
+
+	if use kernel_linux; then
+		MODULE_NAMES="nvidia(video:${S}/kernel)"
+		use uvm && MODULE_NAMES+=" nvidia-uvm(video:${S}/kernel/uvm)"
+
+		# This needs to run after MODULE_NAMES (so that the eclass checks
+		# whether the kernel supports loadable modules) but before BUILD_PARAMS
+		# is set (so that KV_DIR is populated).
+		linux-mod_pkg_setup
+
+		BUILD_PARAMS="IGNORE_CC_MISMATCH=yes V=1 SYSSRC=${KV_DIR} \
+		SYSOUT=${KV_OUT_DIR} CC=$(tc-getBUILD_CC)"
+
+		# linux-mod_src_compile calls set_arch_to_kernel, which
+		# sets the ARCH to x86 but NVIDIA's wrapping Makefile
+		# expects x86_64 or i386 and then converts it to x86
+		# later on in the build process
+		BUILD_FIXES="ARCH=$(uname -m | sed -e 's/i.86/i386/')"
+	fi
+
+	# set variables to where files are in the package structure
+	if use kernel_FreeBSD; then
+		use x86-fbsd   && S="${WORKDIR}/${X86_FBSD_NV_PACKAGE}"
+		use amd64-fbsd && S="${WORKDIR}/${AMD64_FBSD_NV_PACKAGE}"
+		NV_DOC="${S}/doc"
+		NV_OBJ="${S}/obj"
+		NV_SRC="${S}/src"
+		NV_MAN="${S}/x11/man"
+		NV_X11="${S}/obj"
+		NV_SOVER=1
+	elif use kernel_linux; then
+		NV_DOC="${S}"
+		NV_OBJ="${S}"
+		NV_SRC="${S}/kernel"
+		NV_MAN="${S}"
+		NV_X11="${S}"
+		NV_SOVER=${PV}
+	else
+		die "Could not determine proper NVIDIA package"
+	fi
+}
+
+src_prepare() {
+	# Please add a brief description for every added patch
+
+	if use kernel_linux; then
+		if kernel_is lt 2 6 9 ; then
+			eerror "You must build this against 2.6.9 or higher kernels."
+		fi
+
+		# If greater than 2.6.5 use M= instead of SUBDIR=
+#		convert_to_m "${NV_SRC}"/Makefile.kbuild
+	fi
+
+	if use pax_kernel; then
+		ewarn "Using PAX patches is not supported. You will be asked to"
+		ewarn "use a standard kernel should you have issues. Should you"
+		ewarn "need support with these patches, contact the PaX team."
+		epatch "${FILESDIR}"/${PN}-331.13-pax-usercopy.patch
+		epatch "${FILESDIR}"/${PN}-337.12-pax-constify.patch
+	fi
+
+	# Allow user patches so they can support RC kernels and whatever else
+	epatch_user
+}
+
+src_compile() {
+	# This is already the default on Linux, as there's no toplevel Makefile, but
+	# on FreeBSD there's one and triggers the kernel module build, as we install
+	# it by itself, pass this.
+
+	cd "${NV_SRC}"
+	if use kernel_FreeBSD; then
+		MAKE="$(get_bmake)" CFLAGS="-Wno-sign-compare" emake CC="$(tc-getCC)" \
+			LD="$(tc-getLD)" LDFLAGS="$(raw-ldflags)" || die
+	elif use kernel_linux; then
+		use uvm && MAKEOPTS=-j1
+		linux-mod_src_compile
+	fi
+}
+
+# Install nvidia library:
+# the first parameter is the library to install
+# the second parameter is the provided soversion
+# the third parameter is the target directory if its not /usr/lib
+donvidia() {
+	# Full path to library minus SOVER
+	MY_LIB="$1"
+
+	# SOVER to use
+	MY_SOVER="$2"
+
+	# Where to install
+	MY_DEST="$3"
+
+	if [[ -z "${MY_DEST}" ]]; then
+		MY_DEST="/usr/$(get_libdir)"
+		action="dolib.so"
+	else
+		exeinto ${MY_DEST}
+		action="doexe"
+	fi
+
+	# Get just the library name
+	libname=$(basename $1)
+
+	# Install the library with the correct SOVER
+	${action} ${MY_LIB}.${MY_SOVER} || \
+		die "failed to install ${libname}"
+
+	# If SOVER wasn't 1, then we need to create a .1 symlink
+	if [[ "${MY_SOVER}" != "1" ]]; then
+		dosym ${libname}.${MY_SOVER} \
+			${MY_DEST}/${libname}.1 || \
+			die "failed to create ${libname} symlink"
+	fi
+
+	# Always create the symlink from the raw lib to the .1
+	dosym ${libname}.1 \
+		${MY_DEST}/${libname} || \
+		die "failed to create ${libname} symlink"
+}
+
+src_install() {
+	if use kernel_linux; then
+		linux-mod_src_install
+
+		# Add the aliases
+		# This file is tweaked with the appropriate video group in
+		# pkg_preinst, see bug #491414
+		insinto /etc/modprobe.d
+		newins "${FILESDIR}"/nvidia-169.07 nvidia.conf
+		use uvm && doins "${FILESDIR}"/nvidia-uvm.conf
+
+		# Ensures that our device nodes are created when not using X
+		exeinto "$(get_udevdir)"
+		doexe "${FILESDIR}"/nvidia-udev.sh
+		udev_newrules "${FILESDIR}"/nvidia.udev-rule 99-nvidia.rules
+	elif use kernel_FreeBSD; then
+		if use x86-fbsd; then
+			insinto /boot/modules
+			doins "${S}/src/nvidia.kld"
+		fi
+
+		exeinto /boot/modules
+		doexe "${S}/src/nvidia.ko"
+	fi
+
+	# NVIDIA kernel <-> userspace driver config lib
+	donvidia ${NV_OBJ}/libnvidia-cfg.so ${NV_SOVER}
+
+	# NVIDIA framebuffer capture library
+	donvidia ${NV_OBJ}/libnvidia-fbc.so ${NV_SOVER}
+
+	# NVIDIA video encode/decode <-> CUDA
+	if use kernel_linux; then
+		donvidia ${NV_OBJ}/libnvcuvid.so ${NV_SOVER}
+		donvidia ${NV_OBJ}/libnvidia-encode.so ${NV_SOVER}
+	fi
+
+	if use X; then
+		# Xorg DDX driver
+		insinto /usr/$(get_libdir)/xorg/modules/drivers
+		doins ${NV_X11}/nvidia_drv.so
+
+		# Xorg GLX driver
+		donvidia ${NV_X11}/libglx.so ${NV_SOVER} \
+			/usr/$(get_libdir)/opengl/nvidia/extensions
+	fi
+
+	# OpenCL ICD for NVIDIA
+	if use kernel_linux; then
+		insinto /etc/OpenCL/vendors
+		doins ${NV_OBJ}/nvidia.icd
+	fi
+
+	# Documentation
+	dohtml ${NV_DOC}/html/*
+	if use kernel_FreeBSD; then
+		dodoc "${NV_DOC}/README"
+		use X && doman "${NV_MAN}/nvidia-xconfig.1"
+		use tools && doman "${NV_MAN}/nvidia-settings.1"
+	else
+		# Docs
+		newdoc "${NV_DOC}/README.txt" README
+		dodoc "${NV_DOC}/NVIDIA_Changelog"
+		doman "${NV_MAN}/nvidia-smi.1.gz"
+		use X && doman "${NV_MAN}/nvidia-xconfig.1.gz"
+		use tools && doman "${NV_MAN}/nvidia-settings.1.gz"
+		doman "${NV_MAN}/nvidia-cuda-mps-control.1.gz"
+	fi
+
+	# Helper Apps
+	exeinto /opt/bin/
+
+	if use X; then
+		doexe ${NV_OBJ}/nvidia-xconfig
+	fi
+
+	if use kernel_linux ; then
+		doexe ${NV_OBJ}/nvidia-cuda-mps-control
+		doexe ${NV_OBJ}/nvidia-cuda-mps-server
+		doexe ${NV_OBJ}/nvidia-debugdump
+		doexe ${NV_OBJ}/nvidia-persistenced
+		doexe ${NV_OBJ}/nvidia-smi
+
+		# install nvidia-modprobe setuid and symlink in /usr/bin (bug #505092)
+		doexe ${NV_OBJ}/nvidia-modprobe
+		fowners root:video /opt/bin/nvidia-modprobe
+		fperms 4710 /opt/bin/nvidia-modprobe
+		dosym /{opt,usr}/bin/nvidia-modprobe
+
+		doman nvidia-cuda-mps-control.1.gz
+		doman nvidia-modprobe.1.gz
+		doman nvidia-persistenced.1.gz
+		newinitd "${FILESDIR}/nvidia-smi.init" nvidia-smi
+		newconfd "${FILESDIR}/nvidia-persistenced.conf" nvidia-persistenced
+		newinitd "${FILESDIR}/nvidia-persistenced.init" nvidia-persistenced
+	fi
+
+	if use tools; then
+		doexe ${NV_OBJ}/nvidia-settings
+		insinto /usr/share/nvidia/
+		doins nvidia-application-profiles-${PV}-key-documentation
+		insinto /etc/nvidia
+		newins nvidia-application-profiles-${PV}-rc nvidia-application-profiles-rc
+	fi
+
+	dobin ${NV_OBJ}/nvidia-bug-report.sh
+
+	# Desktop entries for nvidia-settings
+	if use tools ; then
+		# There is no icon in the FreeBSD tarball.
+		use kernel_FreeBSD || newicon ${NV_OBJ}/nvidia-settings.png ${PN}-settings.png
+		domenu "${FILESDIR}"/${PN}-settings.desktop
+		exeinto /etc/X11/xinit/xinitrc.d
+		doexe "${FILESDIR}"/95-nvidia-settings
+	fi
+
+	#doenvd "${FILESDIR}"/50nvidia-prelink-blacklist
+
+	if has_multilib_profile && use multilib ; then
+		local OABI=${ABI}
+		for ABI in $(get_install_abis) ; do
+			src_install-libs
+		done
+		ABI=${OABI}
+		unset OABI
+	else
+		src_install-libs
+	fi
+
+	is_final_abi || die "failed to iterate through all ABIs"
+
+	readme.gentoo_create_doc
+}
+
+src_install-libs() {
+	local inslibdir=$(get_libdir)
+	local GL_ROOT="/usr/$(get_libdir)/opengl/nvidia/lib"
+	local CL_ROOT="/usr/$(get_libdir)/OpenCL/vendors/nvidia"
+	local libdir=${NV_OBJ}
+
+	if use kernel_linux && has_multilib_profile && \
+			[[ ${ABI} == "x86" ]] ; then
+		libdir=${NV_OBJ}/32
+	fi
+
+	if use X; then
+		# The GLX libraries
+		donvidia ${libdir}/libEGL.so ${NV_SOVER} ${GL_ROOT}
+		donvidia ${libdir}/libGL.so ${NV_SOVER} ${GL_ROOT}
+		donvidia ${libdir}/libGLESv1_CM.so ${NV_SOVER} ${GL_ROOT}
+		donvidia ${libdir}/libnvidia-eglcore.so ${NV_SOVER}
+		donvidia ${libdir}/libnvidia-glcore.so ${NV_SOVER}
+		donvidia ${libdir}/libnvidia-glsi.so ${NV_SOVER}
+		donvidia ${libdir}/libnvidia-ifr.so ${NV_SOVER}
+		if use kernel_FreeBSD; then
+			donvidia ${libdir}/libnvidia-tls.so ${NV_SOVER}
+		else
+			donvidia ${libdir}/tls/libnvidia-tls.so ${NV_SOVER}
+		fi
+
+		# VDPAU
+		donvidia ${libdir}/libvdpau_nvidia.so ${NV_SOVER}
+
+		# GLES v2 libraries
+		insinto ${GL_ROOT}
+		doexe ${libdir}/libGLESv2.so.${PV}
+		dosym libGLESv2.so.${PV} ${GL_ROOT}/libGLESv2.so.2
+		dosym libGLESv2.so.2 ${GL_ROOT}/libGLESv2.so
+	fi
+
+	# NVIDIA monitoring library
+	if use kernel_linux ; then
+		donvidia ${libdir}/libnvidia-ml.so ${NV_SOVER}
+	fi
+
+	# CUDA & OpenCL
+	if use kernel_linux; then
+		donvidia ${libdir}/libcuda.so ${NV_SOVER}
+		donvidia ${libdir}/libnvidia-compiler.so ${NV_SOVER}
+		donvidia ${libdir}/libOpenCL.so 1.0.0 ${CL_ROOT}
+		donvidia ${libdir}/libnvidia-opencl.so ${NV_SOVER}
+	fi
+}
+
+pkg_preinst() {
+	if use kernel_linux; then
+		linux-mod_pkg_preinst
+
+		local videogroup="$(egetent group video | cut -d ':' -f 3)"
+		if [ -z "${videogroup}" ]; then
+			eerror "Failed to determine the video group gid"
+			die "Failed to determine the video group gid"
+		else
+			sed -i \
+				-e "s:PACKAGE:${PF}:g" \
+				-e "s:VIDEOGID:${videogroup}:" \
+				"${D}"/etc/modprobe.d/nvidia.conf || die
+		fi
+	fi
+
+	# Clean the dynamic libGL stuff's home to ensure
+	# we dont have stale libs floating around
+	if [ -d "${ROOT}"/usr/lib/opengl/nvidia ] ; then
+		rm -rf "${ROOT}"/usr/lib/opengl/nvidia/*
+	fi
+	# Make sure we nuke the old nvidia-glx's env.d file
+	if [ -e "${ROOT}"/etc/env.d/09nvidia ] ; then
+		rm -f "${ROOT}"/etc/env.d/09nvidia
+	fi
+}
+
+pkg_postinst() {
+	use kernel_linux && linux-mod_pkg_postinst
+
+	# Switch to the nvidia implementation
+	use X && "${ROOT}"/usr/bin/eselect opengl set --use-old nvidia
+	"${ROOT}"/usr/bin/eselect opencl set --use-old nvidia
+
+	readme.gentoo_print_elog
+
+	if ! use X; then
+		elog "You have elected to not install the X.org driver. Along with"
+		elog "this the OpenGL libraries and VDPAU libraries were not"
+		elog "installed. Additionally, once the driver is loaded your card"
+		elog "and fan will run at max speed which may not be desirable."
+		elog "Use the 'nvidia-smi' init script to have your card and fan"
+		elog "speed scale appropriately."
+		elog
+	fi
+	if ! use tools; then
+		elog "USE=tools controls whether the nvidia-settings application"
+		elog "is installed. If you would like to use it, enable that"
+		elog "flag and re-emerge this ebuild. Optionally you can install"
+		elog "media-video/nvidia-settings"
+		elog
+	fi
+}
+
+pkg_prerm() {
+	use X && "${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11
+}
+
+pkg_postrm() {
+	use kernel_linux && linux-mod_pkg_postrm
+	use X && "${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11
+}
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-346.96.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-346.96.ebuild
new file mode 100644
index 000000000000..cfa3416ffa24
--- /dev/null
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-346.96.ebuild
@@ -0,0 +1,489 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils flag-o-matic linux-info linux-mod multilib nvidia-driver \
+	portability toolchain-funcs unpacker user udev
+
+NV_URI="http://us.download.nvidia.com/XFree86/"
+X86_NV_PACKAGE="NVIDIA-Linux-x86-${PV}"
+AMD64_NV_PACKAGE="NVIDIA-Linux-x86_64-${PV}"
+X86_FBSD_NV_PACKAGE="NVIDIA-FreeBSD-x86-${PV}"
+AMD64_FBSD_NV_PACKAGE="NVIDIA-FreeBSD-x86_64-${PV}"
+
+DESCRIPTION="NVIDIA Accelerated Graphics Driver"
+HOMEPAGE="http://www.nvidia.com/"
+SRC_URI="
+	amd64-fbsd? ( ${NV_URI}FreeBSD-x86_64/${PV}/${AMD64_FBSD_NV_PACKAGE}.tar.gz )
+	amd64? ( ${NV_URI}Linux-x86_64/${PV}/${AMD64_NV_PACKAGE}.run )
+	x86-fbsd? ( ${NV_URI}FreeBSD-x86/${PV}/${X86_FBSD_NV_PACKAGE}.tar.gz )
+	x86? ( ${NV_URI}Linux-x86/${PV}/${X86_NV_PACKAGE}.run )
+"
+
+LICENSE="GPL-2 NVIDIA-r2"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86 ~amd64-fbsd ~x86-fbsd"
+RESTRICT="bindist mirror strip"
+EMULTILIB_PKG="true"
+
+IUSE="acpi multilib kernel_FreeBSD kernel_linux pax_kernel +tools gtk2 gtk3 +X uvm"
+REQUIRED_USE="
+	tools? ( X || ( gtk2 gtk3 ) )
+"
+
+COMMON="
+	app-eselect/eselect-opencl
+	kernel_linux? ( >=sys-libs/glibc-2.6.1 )
+	X? (
+		>=app-eselect/eselect-opengl-1.0.9
+	)
+"
+DEPEND="
+	${COMMON}
+	app-arch/xz-utils
+	kernel_linux? ( virtual/linux-sources )
+"
+RDEPEND="
+	${COMMON}
+	acpi? ( sys-power/acpid )
+	tools? (
+		dev-libs/atk
+		dev-libs/glib:2
+		x11-libs/gdk-pixbuf
+		gtk2? ( >=x11-libs/gtk+-2.4:2 )
+		gtk3? ( x11-libs/gtk+:3 )
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/pango[X]
+	)
+	X? (
+		<x11-base/xorg-server-1.17.99:=
+		>=x11-libs/libvdpau-0.3-r1
+		multilib? (
+			>=x11-libs/libX11-1.6.2[abi_x86_32]
+			>=x11-libs/libXext-1.3.2[abi_x86_32]
+		)
+	)
+"
+
+QA_PREBUILT="opt/* usr/lib*"
+
+S=${WORKDIR}/
+
+pkg_pretend() {
+	if use amd64 && has_multilib_profile && \
+		[ "${DEFAULT_ABI}" != "amd64" ]; then
+		eerror "This ebuild doesn't currently support changing your default ABI"
+		die "Unexpected \${DEFAULT_ABI} = ${DEFAULT_ABI}"
+	fi
+
+	if use kernel_linux && kernel_is ge 4 3; then
+		ewarn "Gentoo supports kernels which are supported by NVIDIA"
+		ewarn "which are limited to the following kernels:"
+		ewarn "<sys-kernel/gentoo-sources-4.3"
+		ewarn "<sys-kernel/vanilla-sources-4.3"
+		ewarn ""
+		ewarn "You are free to utilize epatch_user to provide whatever"
+		ewarn "support you feel is appropriate, but will not receive"
+		ewarn "support as a result of those changes."
+		ewarn ""
+		ewarn "Do not file a bug report about this."
+	fi
+
+	# Since Nvidia ships 3 different series of drivers, we need to give the user
+	# some kind of guidance as to what version they should install. This tries
+	# to point the user in the right direction but can't be perfect. check
+	# nvidia-driver.eclass
+	nvidia-driver-check-warning
+
+	# Kernel features/options to check for
+	CONFIG_CHECK="~ZONE_DMA ~MTRR ~SYSVIPC ~!LOCKDEP"
+	use x86 && CONFIG_CHECK+=" ~HIGHMEM"
+
+	# Now do the above checks
+	use kernel_linux && check_extra_config
+}
+
+pkg_setup() {
+	# try to turn off distcc and ccache for people that have a problem with it
+	export DISTCC_DISABLE=1
+	export CCACHE_DISABLE=1
+
+	if use kernel_linux; then
+		MODULE_NAMES="nvidia(video:${S}/kernel)"
+		use uvm && MODULE_NAMES+=" nvidia-uvm(video:${S}/kernel/uvm)"
+
+		# This needs to run after MODULE_NAMES (so that the eclass checks
+		# whether the kernel supports loadable modules) but before BUILD_PARAMS
+		# is set (so that KV_DIR is populated).
+		linux-mod_pkg_setup
+
+		BUILD_PARAMS="IGNORE_CC_MISMATCH=yes V=1 SYSSRC=${KV_DIR} \
+		SYSOUT=${KV_OUT_DIR} CC=$(tc-getBUILD_CC)"
+
+		# linux-mod_src_compile calls set_arch_to_kernel, which
+		# sets the ARCH to x86 but NVIDIA's wrapping Makefile
+		# expects x86_64 or i386 and then converts it to x86
+		# later on in the build process
+		BUILD_FIXES="ARCH=$(uname -m | sed -e 's/i.86/i386/')"
+	fi
+
+	# set variables to where files are in the package structure
+	if use kernel_FreeBSD; then
+		use x86-fbsd   && S="${WORKDIR}/${X86_FBSD_NV_PACKAGE}"
+		use amd64-fbsd && S="${WORKDIR}/${AMD64_FBSD_NV_PACKAGE}"
+		NV_DOC="${S}/doc"
+		NV_OBJ="${S}/obj"
+		NV_SRC="${S}/src"
+		NV_MAN="${S}/x11/man"
+		NV_X11="${S}/obj"
+		NV_SOVER=1
+	elif use kernel_linux; then
+		NV_DOC="${S}"
+		NV_OBJ="${S}"
+		NV_SRC="${S}/kernel"
+		NV_MAN="${S}"
+		NV_X11="${S}"
+		NV_SOVER=${PV}
+	else
+		die "Could not determine proper NVIDIA package"
+	fi
+}
+
+src_prepare() {
+	# Please add a brief description for every added patch
+
+	if use kernel_linux; then
+		if kernel_is lt 2 6 9 ; then
+			eerror "You must build this against 2.6.9 or higher kernels."
+		fi
+
+		# If greater than 2.6.5 use M= instead of SUBDIR=
+#		convert_to_m "${NV_SRC}"/Makefile.kbuild
+	fi
+
+	if use pax_kernel; then
+		ewarn "Using PAX patches is not supported. You will be asked to"
+		ewarn "use a standard kernel should you have issues. Should you"
+		ewarn "need support with these patches, contact the PaX team."
+		epatch "${FILESDIR}"/${PN}-346.16-pax-usercopy.patch
+		epatch "${FILESDIR}"/${PN}-346.16-pax-constify.patch
+	fi
+
+	# Allow user patches so they can support RC kernels and whatever else
+	epatch_user
+}
+
+src_compile() {
+	# This is already the default on Linux, as there's no toplevel Makefile, but
+	# on FreeBSD there's one and triggers the kernel module build, as we install
+	# it by itself, pass this.
+
+	cd "${NV_SRC}"
+	if use kernel_FreeBSD; then
+		MAKE="$(get_bmake)" CFLAGS="-Wno-sign-compare" emake CC="$(tc-getCC)" \
+			LD="$(tc-getLD)" LDFLAGS="$(raw-ldflags)" || die
+	elif use kernel_linux; then
+		MAKEOPTS=-j1
+		linux-mod_src_compile
+	fi
+}
+
+# Install nvidia library:
+# the first parameter is the library to install
+# the second parameter is the provided soversion
+# the third parameter is the target directory if its not /usr/lib
+donvidia() {
+	# Full path to library minus SOVER
+	MY_LIB="$1"
+
+	# SOVER to use
+	MY_SOVER="$2"
+
+	# Where to install
+	MY_DEST="$3"
+
+	if [[ -z "${MY_DEST}" ]]; then
+		MY_DEST="/usr/$(get_libdir)"
+		action="dolib.so"
+	else
+		exeinto ${MY_DEST}
+		action="doexe"
+	fi
+
+	# Get just the library name
+	libname=$(basename $1)
+
+	# Install the library with the correct SOVER
+	${action} ${MY_LIB}.${MY_SOVER} || \
+		die "failed to install ${libname}"
+
+	# If SOVER wasn't 1, then we need to create a .1 symlink
+	if [[ "${MY_SOVER}" != "1" ]]; then
+		dosym ${libname}.${MY_SOVER} \
+			${MY_DEST}/${libname}.1 || \
+			die "failed to create ${libname} symlink"
+	fi
+
+	# Always create the symlink from the raw lib to the .1
+	dosym ${libname}.1 \
+		${MY_DEST}/${libname} || \
+		die "failed to create ${libname} symlink"
+}
+
+src_install() {
+	if use kernel_linux; then
+		linux-mod_src_install
+
+		# Add the aliases
+		# This file is tweaked with the appropriate video group in
+		# pkg_preinst, see bug #491414
+		insinto /etc/modprobe.d
+		newins "${FILESDIR}"/nvidia-169.07 nvidia.conf
+		use uvm && doins "${FILESDIR}"/nvidia-uvm.conf
+
+		# Ensures that our device nodes are created when not using X
+		exeinto "$(get_udevdir)"
+		doexe "${FILESDIR}"/nvidia-udev.sh
+		udev_newrules "${FILESDIR}"/nvidia.udev-rule 99-nvidia.rules
+	elif use kernel_FreeBSD; then
+		if use x86-fbsd; then
+			insinto /boot/modules
+			doins "${S}/src/nvidia.kld"
+		fi
+
+		exeinto /boot/modules
+		doexe "${S}/src/nvidia.ko"
+	fi
+
+	# NVIDIA kernel <-> userspace driver config lib
+	donvidia ${NV_OBJ}/libnvidia-cfg.so ${NV_SOVER}
+
+	# NVIDIA framebuffer capture library
+	donvidia ${NV_OBJ}/libnvidia-fbc.so ${NV_SOVER}
+
+	# NVIDIA video encode/decode <-> CUDA
+	if use kernel_linux; then
+		donvidia ${NV_OBJ}/libnvcuvid.so ${NV_SOVER}
+		donvidia ${NV_OBJ}/libnvidia-encode.so ${NV_SOVER}
+	fi
+
+	if use X; then
+		# Xorg DDX driver
+		insinto /usr/$(get_libdir)/xorg/modules/drivers
+		doins ${NV_X11}/nvidia_drv.so
+
+		# Xorg GLX driver
+		donvidia ${NV_X11}/libglx.so ${NV_SOVER} \
+			/usr/$(get_libdir)/opengl/nvidia/extensions
+
+		# Xorg nvidia.conf
+		if has_version '>=x11-base/xorg-server-1.16'; then
+			insinto /usr/share/X11/xorg.conf.d
+			newins {,50-}nvidia-drm-outputclass.conf
+		fi
+	fi
+
+	# OpenCL ICD for NVIDIA
+	if use kernel_linux; then
+		insinto /etc/OpenCL/vendors
+		doins ${NV_OBJ}/nvidia.icd
+	fi
+
+	# Documentation
+	dohtml ${NV_DOC}/html/*
+	if use kernel_FreeBSD; then
+		dodoc "${NV_DOC}/README"
+		use X && doman "${NV_MAN}/nvidia-xconfig.1"
+		use tools && doman "${NV_MAN}/nvidia-settings.1"
+	else
+		# Docs
+		newdoc "${NV_DOC}/README.txt" README
+		dodoc "${NV_DOC}/NVIDIA_Changelog"
+		doman "${NV_MAN}/nvidia-smi.1.gz"
+		use X && doman "${NV_MAN}/nvidia-xconfig.1.gz"
+		use tools && doman "${NV_MAN}/nvidia-settings.1.gz"
+		doman "${NV_MAN}/nvidia-cuda-mps-control.1.gz"
+	fi
+
+	# Helper Apps
+	exeinto /opt/bin/
+
+	if use X; then
+		doexe ${NV_OBJ}/nvidia-xconfig
+	fi
+
+	if use kernel_linux ; then
+		doexe ${NV_OBJ}/nvidia-cuda-mps-control
+		doexe ${NV_OBJ}/nvidia-cuda-mps-server
+		doexe ${NV_OBJ}/nvidia-debugdump
+		doexe ${NV_OBJ}/nvidia-persistenced
+		doexe ${NV_OBJ}/nvidia-smi
+
+		# install nvidia-modprobe setuid and symlink in /usr/bin (bug #505092)
+		doexe ${NV_OBJ}/nvidia-modprobe
+		fowners root:video /opt/bin/nvidia-modprobe
+		fperms 4710 /opt/bin/nvidia-modprobe
+		dosym /{opt,usr}/bin/nvidia-modprobe
+
+		doman nvidia-cuda-mps-control.1.gz
+		doman nvidia-modprobe.1.gz
+		doman nvidia-persistenced.1.gz
+		newinitd "${FILESDIR}/nvidia-smi.init" nvidia-smi
+		newconfd "${FILESDIR}/nvidia-persistenced.conf" nvidia-persistenced
+		newinitd "${FILESDIR}/nvidia-persistenced.init" nvidia-persistenced
+	fi
+
+	if use tools; then
+		doexe ${NV_OBJ}/nvidia-settings
+		use gtk2 && donvidia libnvidia-gtk2.so ${PV}
+		use gtk3 && donvidia libnvidia-gtk3.so ${PV}
+		insinto /usr/share/nvidia/
+		doins nvidia-application-profiles-${PV}-key-documentation
+		insinto /etc/nvidia
+		newins nvidia-application-profiles-${PV}-rc nvidia-application-profiles-rc
+	fi
+
+	dobin ${NV_OBJ}/nvidia-bug-report.sh
+
+	# Desktop entries for nvidia-settings
+	if use tools ; then
+		# There is no icon in the FreeBSD tarball.
+		use kernel_FreeBSD || newicon ${NV_OBJ}/nvidia-settings.png ${PN}-settings.png
+		domenu "${FILESDIR}"/${PN}-settings.desktop
+		exeinto /etc/X11/xinit/xinitrc.d
+		doexe "${FILESDIR}"/95-nvidia-settings
+	fi
+
+	#doenvd "${FILESDIR}"/50nvidia-prelink-blacklist
+
+	if has_multilib_profile && use multilib ; then
+		local OABI=${ABI}
+		for ABI in $(get_install_abis) ; do
+			src_install-libs
+		done
+		ABI=${OABI}
+		unset OABI
+	else
+		src_install-libs
+	fi
+
+	is_final_abi || die "failed to iterate through all ABIs"
+
+	readme.gentoo_create_doc
+}
+
+src_install-libs() {
+	local inslibdir=$(get_libdir)
+	local GL_ROOT="/usr/$(get_libdir)/opengl/nvidia/lib"
+	local CL_ROOT="/usr/$(get_libdir)/OpenCL/vendors/nvidia"
+	local libdir=${NV_OBJ}
+
+	if use kernel_linux && has_multilib_profile && \
+			[[ ${ABI} == "x86" ]] ; then
+		libdir=${NV_OBJ}/32
+	fi
+
+	if use X; then
+		# The GLX libraries
+		donvidia ${libdir}/libEGL.so ${NV_SOVER} ${GL_ROOT}
+		donvidia ${libdir}/libGL.so ${NV_SOVER} ${GL_ROOT}
+		donvidia ${libdir}/libGLESv1_CM.so ${NV_SOVER} ${GL_ROOT}
+		donvidia ${libdir}/libnvidia-eglcore.so ${NV_SOVER}
+		donvidia ${libdir}/libnvidia-glcore.so ${NV_SOVER}
+		donvidia ${libdir}/libnvidia-glsi.so ${NV_SOVER}
+		donvidia ${libdir}/libnvidia-ifr.so ${NV_SOVER}
+		if use kernel_FreeBSD; then
+			donvidia ${libdir}/libnvidia-tls.so ${NV_SOVER}
+		else
+			donvidia ${libdir}/tls/libnvidia-tls.so ${NV_SOVER}
+		fi
+
+		# VDPAU
+		donvidia ${libdir}/libvdpau_nvidia.so ${NV_SOVER}
+
+		# GLES v2 libraries
+		insinto ${GL_ROOT}
+		doexe ${libdir}/libGLESv2.so.${PV}
+		dosym libGLESv2.so.${PV} ${GL_ROOT}/libGLESv2.so.2
+		dosym libGLESv2.so.2 ${GL_ROOT}/libGLESv2.so
+	fi
+
+	# NVIDIA monitoring library
+	if use kernel_linux ; then
+		donvidia ${libdir}/libnvidia-ml.so ${NV_SOVER}
+	fi
+
+	# CUDA & OpenCL
+	if use kernel_linux; then
+		donvidia ${libdir}/libcuda.so ${NV_SOVER}
+		donvidia ${libdir}/libnvidia-compiler.so ${NV_SOVER}
+		donvidia ${libdir}/libOpenCL.so 1.0.0 ${CL_ROOT}
+		donvidia ${libdir}/libnvidia-opencl.so ${NV_SOVER}
+	fi
+}
+
+pkg_preinst() {
+	if use kernel_linux; then
+		linux-mod_pkg_preinst
+
+		local videogroup="$(egetent group video | cut -d ':' -f 3)"
+		if [ -z "${videogroup}" ]; then
+			eerror "Failed to determine the video group gid"
+			die "Failed to determine the video group gid"
+		else
+			sed -i \
+				-e "s:PACKAGE:${PF}:g" \
+				-e "s:VIDEOGID:${videogroup}:" \
+				"${D}"/etc/modprobe.d/nvidia.conf || die
+		fi
+	fi
+
+	# Clean the dynamic libGL stuff's home to ensure
+	# we dont have stale libs floating around
+	if [ -d "${ROOT}"/usr/lib/opengl/nvidia ] ; then
+		rm -rf "${ROOT}"/usr/lib/opengl/nvidia/*
+	fi
+	# Make sure we nuke the old nvidia-glx's env.d file
+	if [ -e "${ROOT}"/etc/env.d/09nvidia ] ; then
+		rm -f "${ROOT}"/etc/env.d/09nvidia
+	fi
+}
+
+pkg_postinst() {
+	use kernel_linux && linux-mod_pkg_postinst
+
+	# Switch to the nvidia implementation
+	use X && "${ROOT}"/usr/bin/eselect opengl set --use-old nvidia
+	"${ROOT}"/usr/bin/eselect opencl set --use-old nvidia
+
+	readme.gentoo_print_elog
+
+	if ! use X; then
+		elog "You have elected to not install the X.org driver. Along with"
+		elog "this the OpenGL libraries and VDPAU libraries were not"
+		elog "installed. Additionally, once the driver is loaded your card"
+		elog "and fan will run at max speed which may not be desirable."
+		elog "Use the 'nvidia-smi' init script to have your card and fan"
+		elog "speed scale appropriately."
+		elog
+	fi
+	if ! use tools; then
+		elog "USE=tools controls whether the nvidia-settings application"
+		elog "is installed. If you would like to use it, enable that"
+		elog "flag and re-emerge this ebuild. Optionally you can install"
+		elog "media-video/nvidia-settings"
+		elog
+	fi
+}
+
+pkg_prerm() {
+	use X && "${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11
+}
+
+pkg_postrm() {
+	use kernel_linux && linux-mod_pkg_postrm
+	use X && "${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11
+}
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-352.41.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-352.41.ebuild
new file mode 100644
index 000000000000..cfa3416ffa24
--- /dev/null
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-352.41.ebuild
@@ -0,0 +1,489 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils flag-o-matic linux-info linux-mod multilib nvidia-driver \
+	portability toolchain-funcs unpacker user udev
+
+NV_URI="http://us.download.nvidia.com/XFree86/"
+X86_NV_PACKAGE="NVIDIA-Linux-x86-${PV}"
+AMD64_NV_PACKAGE="NVIDIA-Linux-x86_64-${PV}"
+X86_FBSD_NV_PACKAGE="NVIDIA-FreeBSD-x86-${PV}"
+AMD64_FBSD_NV_PACKAGE="NVIDIA-FreeBSD-x86_64-${PV}"
+
+DESCRIPTION="NVIDIA Accelerated Graphics Driver"
+HOMEPAGE="http://www.nvidia.com/"
+SRC_URI="
+	amd64-fbsd? ( ${NV_URI}FreeBSD-x86_64/${PV}/${AMD64_FBSD_NV_PACKAGE}.tar.gz )
+	amd64? ( ${NV_URI}Linux-x86_64/${PV}/${AMD64_NV_PACKAGE}.run )
+	x86-fbsd? ( ${NV_URI}FreeBSD-x86/${PV}/${X86_FBSD_NV_PACKAGE}.tar.gz )
+	x86? ( ${NV_URI}Linux-x86/${PV}/${X86_NV_PACKAGE}.run )
+"
+
+LICENSE="GPL-2 NVIDIA-r2"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86 ~amd64-fbsd ~x86-fbsd"
+RESTRICT="bindist mirror strip"
+EMULTILIB_PKG="true"
+
+IUSE="acpi multilib kernel_FreeBSD kernel_linux pax_kernel +tools gtk2 gtk3 +X uvm"
+REQUIRED_USE="
+	tools? ( X || ( gtk2 gtk3 ) )
+"
+
+COMMON="
+	app-eselect/eselect-opencl
+	kernel_linux? ( >=sys-libs/glibc-2.6.1 )
+	X? (
+		>=app-eselect/eselect-opengl-1.0.9
+	)
+"
+DEPEND="
+	${COMMON}
+	app-arch/xz-utils
+	kernel_linux? ( virtual/linux-sources )
+"
+RDEPEND="
+	${COMMON}
+	acpi? ( sys-power/acpid )
+	tools? (
+		dev-libs/atk
+		dev-libs/glib:2
+		x11-libs/gdk-pixbuf
+		gtk2? ( >=x11-libs/gtk+-2.4:2 )
+		gtk3? ( x11-libs/gtk+:3 )
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/pango[X]
+	)
+	X? (
+		<x11-base/xorg-server-1.17.99:=
+		>=x11-libs/libvdpau-0.3-r1
+		multilib? (
+			>=x11-libs/libX11-1.6.2[abi_x86_32]
+			>=x11-libs/libXext-1.3.2[abi_x86_32]
+		)
+	)
+"
+
+QA_PREBUILT="opt/* usr/lib*"
+
+S=${WORKDIR}/
+
+pkg_pretend() {
+	if use amd64 && has_multilib_profile && \
+		[ "${DEFAULT_ABI}" != "amd64" ]; then
+		eerror "This ebuild doesn't currently support changing your default ABI"
+		die "Unexpected \${DEFAULT_ABI} = ${DEFAULT_ABI}"
+	fi
+
+	if use kernel_linux && kernel_is ge 4 3; then
+		ewarn "Gentoo supports kernels which are supported by NVIDIA"
+		ewarn "which are limited to the following kernels:"
+		ewarn "<sys-kernel/gentoo-sources-4.3"
+		ewarn "<sys-kernel/vanilla-sources-4.3"
+		ewarn ""
+		ewarn "You are free to utilize epatch_user to provide whatever"
+		ewarn "support you feel is appropriate, but will not receive"
+		ewarn "support as a result of those changes."
+		ewarn ""
+		ewarn "Do not file a bug report about this."
+	fi
+
+	# Since Nvidia ships 3 different series of drivers, we need to give the user
+	# some kind of guidance as to what version they should install. This tries
+	# to point the user in the right direction but can't be perfect. check
+	# nvidia-driver.eclass
+	nvidia-driver-check-warning
+
+	# Kernel features/options to check for
+	CONFIG_CHECK="~ZONE_DMA ~MTRR ~SYSVIPC ~!LOCKDEP"
+	use x86 && CONFIG_CHECK+=" ~HIGHMEM"
+
+	# Now do the above checks
+	use kernel_linux && check_extra_config
+}
+
+pkg_setup() {
+	# try to turn off distcc and ccache for people that have a problem with it
+	export DISTCC_DISABLE=1
+	export CCACHE_DISABLE=1
+
+	if use kernel_linux; then
+		MODULE_NAMES="nvidia(video:${S}/kernel)"
+		use uvm && MODULE_NAMES+=" nvidia-uvm(video:${S}/kernel/uvm)"
+
+		# This needs to run after MODULE_NAMES (so that the eclass checks
+		# whether the kernel supports loadable modules) but before BUILD_PARAMS
+		# is set (so that KV_DIR is populated).
+		linux-mod_pkg_setup
+
+		BUILD_PARAMS="IGNORE_CC_MISMATCH=yes V=1 SYSSRC=${KV_DIR} \
+		SYSOUT=${KV_OUT_DIR} CC=$(tc-getBUILD_CC)"
+
+		# linux-mod_src_compile calls set_arch_to_kernel, which
+		# sets the ARCH to x86 but NVIDIA's wrapping Makefile
+		# expects x86_64 or i386 and then converts it to x86
+		# later on in the build process
+		BUILD_FIXES="ARCH=$(uname -m | sed -e 's/i.86/i386/')"
+	fi
+
+	# set variables to where files are in the package structure
+	if use kernel_FreeBSD; then
+		use x86-fbsd   && S="${WORKDIR}/${X86_FBSD_NV_PACKAGE}"
+		use amd64-fbsd && S="${WORKDIR}/${AMD64_FBSD_NV_PACKAGE}"
+		NV_DOC="${S}/doc"
+		NV_OBJ="${S}/obj"
+		NV_SRC="${S}/src"
+		NV_MAN="${S}/x11/man"
+		NV_X11="${S}/obj"
+		NV_SOVER=1
+	elif use kernel_linux; then
+		NV_DOC="${S}"
+		NV_OBJ="${S}"
+		NV_SRC="${S}/kernel"
+		NV_MAN="${S}"
+		NV_X11="${S}"
+		NV_SOVER=${PV}
+	else
+		die "Could not determine proper NVIDIA package"
+	fi
+}
+
+src_prepare() {
+	# Please add a brief description for every added patch
+
+	if use kernel_linux; then
+		if kernel_is lt 2 6 9 ; then
+			eerror "You must build this against 2.6.9 or higher kernels."
+		fi
+
+		# If greater than 2.6.5 use M= instead of SUBDIR=
+#		convert_to_m "${NV_SRC}"/Makefile.kbuild
+	fi
+
+	if use pax_kernel; then
+		ewarn "Using PAX patches is not supported. You will be asked to"
+		ewarn "use a standard kernel should you have issues. Should you"
+		ewarn "need support with these patches, contact the PaX team."
+		epatch "${FILESDIR}"/${PN}-346.16-pax-usercopy.patch
+		epatch "${FILESDIR}"/${PN}-346.16-pax-constify.patch
+	fi
+
+	# Allow user patches so they can support RC kernels and whatever else
+	epatch_user
+}
+
+src_compile() {
+	# This is already the default on Linux, as there's no toplevel Makefile, but
+	# on FreeBSD there's one and triggers the kernel module build, as we install
+	# it by itself, pass this.
+
+	cd "${NV_SRC}"
+	if use kernel_FreeBSD; then
+		MAKE="$(get_bmake)" CFLAGS="-Wno-sign-compare" emake CC="$(tc-getCC)" \
+			LD="$(tc-getLD)" LDFLAGS="$(raw-ldflags)" || die
+	elif use kernel_linux; then
+		MAKEOPTS=-j1
+		linux-mod_src_compile
+	fi
+}
+
+# Install nvidia library:
+# the first parameter is the library to install
+# the second parameter is the provided soversion
+# the third parameter is the target directory if its not /usr/lib
+donvidia() {
+	# Full path to library minus SOVER
+	MY_LIB="$1"
+
+	# SOVER to use
+	MY_SOVER="$2"
+
+	# Where to install
+	MY_DEST="$3"
+
+	if [[ -z "${MY_DEST}" ]]; then
+		MY_DEST="/usr/$(get_libdir)"
+		action="dolib.so"
+	else
+		exeinto ${MY_DEST}
+		action="doexe"
+	fi
+
+	# Get just the library name
+	libname=$(basename $1)
+
+	# Install the library with the correct SOVER
+	${action} ${MY_LIB}.${MY_SOVER} || \
+		die "failed to install ${libname}"
+
+	# If SOVER wasn't 1, then we need to create a .1 symlink
+	if [[ "${MY_SOVER}" != "1" ]]; then
+		dosym ${libname}.${MY_SOVER} \
+			${MY_DEST}/${libname}.1 || \
+			die "failed to create ${libname} symlink"
+	fi
+
+	# Always create the symlink from the raw lib to the .1
+	dosym ${libname}.1 \
+		${MY_DEST}/${libname} || \
+		die "failed to create ${libname} symlink"
+}
+
+src_install() {
+	if use kernel_linux; then
+		linux-mod_src_install
+
+		# Add the aliases
+		# This file is tweaked with the appropriate video group in
+		# pkg_preinst, see bug #491414
+		insinto /etc/modprobe.d
+		newins "${FILESDIR}"/nvidia-169.07 nvidia.conf
+		use uvm && doins "${FILESDIR}"/nvidia-uvm.conf
+
+		# Ensures that our device nodes are created when not using X
+		exeinto "$(get_udevdir)"
+		doexe "${FILESDIR}"/nvidia-udev.sh
+		udev_newrules "${FILESDIR}"/nvidia.udev-rule 99-nvidia.rules
+	elif use kernel_FreeBSD; then
+		if use x86-fbsd; then
+			insinto /boot/modules
+			doins "${S}/src/nvidia.kld"
+		fi
+
+		exeinto /boot/modules
+		doexe "${S}/src/nvidia.ko"
+	fi
+
+	# NVIDIA kernel <-> userspace driver config lib
+	donvidia ${NV_OBJ}/libnvidia-cfg.so ${NV_SOVER}
+
+	# NVIDIA framebuffer capture library
+	donvidia ${NV_OBJ}/libnvidia-fbc.so ${NV_SOVER}
+
+	# NVIDIA video encode/decode <-> CUDA
+	if use kernel_linux; then
+		donvidia ${NV_OBJ}/libnvcuvid.so ${NV_SOVER}
+		donvidia ${NV_OBJ}/libnvidia-encode.so ${NV_SOVER}
+	fi
+
+	if use X; then
+		# Xorg DDX driver
+		insinto /usr/$(get_libdir)/xorg/modules/drivers
+		doins ${NV_X11}/nvidia_drv.so
+
+		# Xorg GLX driver
+		donvidia ${NV_X11}/libglx.so ${NV_SOVER} \
+			/usr/$(get_libdir)/opengl/nvidia/extensions
+
+		# Xorg nvidia.conf
+		if has_version '>=x11-base/xorg-server-1.16'; then
+			insinto /usr/share/X11/xorg.conf.d
+			newins {,50-}nvidia-drm-outputclass.conf
+		fi
+	fi
+
+	# OpenCL ICD for NVIDIA
+	if use kernel_linux; then
+		insinto /etc/OpenCL/vendors
+		doins ${NV_OBJ}/nvidia.icd
+	fi
+
+	# Documentation
+	dohtml ${NV_DOC}/html/*
+	if use kernel_FreeBSD; then
+		dodoc "${NV_DOC}/README"
+		use X && doman "${NV_MAN}/nvidia-xconfig.1"
+		use tools && doman "${NV_MAN}/nvidia-settings.1"
+	else
+		# Docs
+		newdoc "${NV_DOC}/README.txt" README
+		dodoc "${NV_DOC}/NVIDIA_Changelog"
+		doman "${NV_MAN}/nvidia-smi.1.gz"
+		use X && doman "${NV_MAN}/nvidia-xconfig.1.gz"
+		use tools && doman "${NV_MAN}/nvidia-settings.1.gz"
+		doman "${NV_MAN}/nvidia-cuda-mps-control.1.gz"
+	fi
+
+	# Helper Apps
+	exeinto /opt/bin/
+
+	if use X; then
+		doexe ${NV_OBJ}/nvidia-xconfig
+	fi
+
+	if use kernel_linux ; then
+		doexe ${NV_OBJ}/nvidia-cuda-mps-control
+		doexe ${NV_OBJ}/nvidia-cuda-mps-server
+		doexe ${NV_OBJ}/nvidia-debugdump
+		doexe ${NV_OBJ}/nvidia-persistenced
+		doexe ${NV_OBJ}/nvidia-smi
+
+		# install nvidia-modprobe setuid and symlink in /usr/bin (bug #505092)
+		doexe ${NV_OBJ}/nvidia-modprobe
+		fowners root:video /opt/bin/nvidia-modprobe
+		fperms 4710 /opt/bin/nvidia-modprobe
+		dosym /{opt,usr}/bin/nvidia-modprobe
+
+		doman nvidia-cuda-mps-control.1.gz
+		doman nvidia-modprobe.1.gz
+		doman nvidia-persistenced.1.gz
+		newinitd "${FILESDIR}/nvidia-smi.init" nvidia-smi
+		newconfd "${FILESDIR}/nvidia-persistenced.conf" nvidia-persistenced
+		newinitd "${FILESDIR}/nvidia-persistenced.init" nvidia-persistenced
+	fi
+
+	if use tools; then
+		doexe ${NV_OBJ}/nvidia-settings
+		use gtk2 && donvidia libnvidia-gtk2.so ${PV}
+		use gtk3 && donvidia libnvidia-gtk3.so ${PV}
+		insinto /usr/share/nvidia/
+		doins nvidia-application-profiles-${PV}-key-documentation
+		insinto /etc/nvidia
+		newins nvidia-application-profiles-${PV}-rc nvidia-application-profiles-rc
+	fi
+
+	dobin ${NV_OBJ}/nvidia-bug-report.sh
+
+	# Desktop entries for nvidia-settings
+	if use tools ; then
+		# There is no icon in the FreeBSD tarball.
+		use kernel_FreeBSD || newicon ${NV_OBJ}/nvidia-settings.png ${PN}-settings.png
+		domenu "${FILESDIR}"/${PN}-settings.desktop
+		exeinto /etc/X11/xinit/xinitrc.d
+		doexe "${FILESDIR}"/95-nvidia-settings
+	fi
+
+	#doenvd "${FILESDIR}"/50nvidia-prelink-blacklist
+
+	if has_multilib_profile && use multilib ; then
+		local OABI=${ABI}
+		for ABI in $(get_install_abis) ; do
+			src_install-libs
+		done
+		ABI=${OABI}
+		unset OABI
+	else
+		src_install-libs
+	fi
+
+	is_final_abi || die "failed to iterate through all ABIs"
+
+	readme.gentoo_create_doc
+}
+
+src_install-libs() {
+	local inslibdir=$(get_libdir)
+	local GL_ROOT="/usr/$(get_libdir)/opengl/nvidia/lib"
+	local CL_ROOT="/usr/$(get_libdir)/OpenCL/vendors/nvidia"
+	local libdir=${NV_OBJ}
+
+	if use kernel_linux && has_multilib_profile && \
+			[[ ${ABI} == "x86" ]] ; then
+		libdir=${NV_OBJ}/32
+	fi
+
+	if use X; then
+		# The GLX libraries
+		donvidia ${libdir}/libEGL.so ${NV_SOVER} ${GL_ROOT}
+		donvidia ${libdir}/libGL.so ${NV_SOVER} ${GL_ROOT}
+		donvidia ${libdir}/libGLESv1_CM.so ${NV_SOVER} ${GL_ROOT}
+		donvidia ${libdir}/libnvidia-eglcore.so ${NV_SOVER}
+		donvidia ${libdir}/libnvidia-glcore.so ${NV_SOVER}
+		donvidia ${libdir}/libnvidia-glsi.so ${NV_SOVER}
+		donvidia ${libdir}/libnvidia-ifr.so ${NV_SOVER}
+		if use kernel_FreeBSD; then
+			donvidia ${libdir}/libnvidia-tls.so ${NV_SOVER}
+		else
+			donvidia ${libdir}/tls/libnvidia-tls.so ${NV_SOVER}
+		fi
+
+		# VDPAU
+		donvidia ${libdir}/libvdpau_nvidia.so ${NV_SOVER}
+
+		# GLES v2 libraries
+		insinto ${GL_ROOT}
+		doexe ${libdir}/libGLESv2.so.${PV}
+		dosym libGLESv2.so.${PV} ${GL_ROOT}/libGLESv2.so.2
+		dosym libGLESv2.so.2 ${GL_ROOT}/libGLESv2.so
+	fi
+
+	# NVIDIA monitoring library
+	if use kernel_linux ; then
+		donvidia ${libdir}/libnvidia-ml.so ${NV_SOVER}
+	fi
+
+	# CUDA & OpenCL
+	if use kernel_linux; then
+		donvidia ${libdir}/libcuda.so ${NV_SOVER}
+		donvidia ${libdir}/libnvidia-compiler.so ${NV_SOVER}
+		donvidia ${libdir}/libOpenCL.so 1.0.0 ${CL_ROOT}
+		donvidia ${libdir}/libnvidia-opencl.so ${NV_SOVER}
+	fi
+}
+
+pkg_preinst() {
+	if use kernel_linux; then
+		linux-mod_pkg_preinst
+
+		local videogroup="$(egetent group video | cut -d ':' -f 3)"
+		if [ -z "${videogroup}" ]; then
+			eerror "Failed to determine the video group gid"
+			die "Failed to determine the video group gid"
+		else
+			sed -i \
+				-e "s:PACKAGE:${PF}:g" \
+				-e "s:VIDEOGID:${videogroup}:" \
+				"${D}"/etc/modprobe.d/nvidia.conf || die
+		fi
+	fi
+
+	# Clean the dynamic libGL stuff's home to ensure
+	# we dont have stale libs floating around
+	if [ -d "${ROOT}"/usr/lib/opengl/nvidia ] ; then
+		rm -rf "${ROOT}"/usr/lib/opengl/nvidia/*
+	fi
+	# Make sure we nuke the old nvidia-glx's env.d file
+	if [ -e "${ROOT}"/etc/env.d/09nvidia ] ; then
+		rm -f "${ROOT}"/etc/env.d/09nvidia
+	fi
+}
+
+pkg_postinst() {
+	use kernel_linux && linux-mod_pkg_postinst
+
+	# Switch to the nvidia implementation
+	use X && "${ROOT}"/usr/bin/eselect opengl set --use-old nvidia
+	"${ROOT}"/usr/bin/eselect opencl set --use-old nvidia
+
+	readme.gentoo_print_elog
+
+	if ! use X; then
+		elog "You have elected to not install the X.org driver. Along with"
+		elog "this the OpenGL libraries and VDPAU libraries were not"
+		elog "installed. Additionally, once the driver is loaded your card"
+		elog "and fan will run at max speed which may not be desirable."
+		elog "Use the 'nvidia-smi' init script to have your card and fan"
+		elog "speed scale appropriately."
+		elog
+	fi
+	if ! use tools; then
+		elog "USE=tools controls whether the nvidia-settings application"
+		elog "is installed. If you would like to use it, enable that"
+		elog "flag and re-emerge this ebuild. Optionally you can install"
+		elog "media-video/nvidia-settings"
+		elog
+	fi
+}
+
+pkg_prerm() {
+	use X && "${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11
+}
+
+pkg_postrm() {
+	use kernel_linux && linux-mod_pkg_postrm
+	use X && "${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11
+}
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-355.06-r1.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-355.06-r1.ebuild
deleted file mode 100644
index dfa465b22db8..000000000000
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-355.06-r1.ebuild
+++ /dev/null
@@ -1,500 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils flag-o-matic linux-info linux-mod multilib nvidia-driver \
-	portability toolchain-funcs unpacker user udev
-
-NV_URI="http://us.download.nvidia.com/XFree86/"
-X86_NV_PACKAGE="NVIDIA-Linux-x86-${PV}"
-AMD64_NV_PACKAGE="NVIDIA-Linux-x86_64-${PV}"
-X86_FBSD_NV_PACKAGE="NVIDIA-FreeBSD-x86-${PV}"
-AMD64_FBSD_NV_PACKAGE="NVIDIA-FreeBSD-x86_64-${PV}"
-
-DESCRIPTION="NVIDIA Accelerated Graphics Driver"
-HOMEPAGE="http://www.nvidia.com/"
-SRC_URI="
-	amd64-fbsd? ( ${NV_URI}FreeBSD-x86_64/${PV}/${AMD64_FBSD_NV_PACKAGE}.tar.gz )
-	amd64? ( ${NV_URI}Linux-x86_64/${PV}/${AMD64_NV_PACKAGE}.run )
-	x86-fbsd? ( ${NV_URI}FreeBSD-x86/${PV}/${X86_FBSD_NV_PACKAGE}.tar.gz )
-	x86? ( ${NV_URI}Linux-x86/${PV}/${X86_NV_PACKAGE}.run )
-"
-
-LICENSE="GPL-2 NVIDIA-r2"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86 ~amd64-fbsd ~x86-fbsd"
-RESTRICT="bindist mirror strip"
-EMULTILIB_PKG="true"
-
-IUSE="acpi multilib kernel_FreeBSD kernel_linux pax_kernel +tools gtk2 gtk3 +X uvm"
-REQUIRED_USE="
-	tools? ( X || ( gtk2 gtk3 ) )
-"
-
-COMMON="
-	app-eselect/eselect-opencl
-	kernel_linux? ( >=sys-libs/glibc-2.6.1 )
-	X? (
-		>=app-eselect/eselect-opengl-1.0.9
-	)
-"
-DEPEND="
-	${COMMON}
-	app-arch/xz-utils
-	kernel_linux? ( virtual/linux-sources )
-"
-RDEPEND="
-	${COMMON}
-	acpi? ( sys-power/acpid )
-	tools? (
-		dev-libs/atk
-		dev-libs/glib:2
-		x11-libs/gdk-pixbuf
-		gtk2? ( >=x11-libs/gtk+-2.4:2 )
-		gtk3? ( x11-libs/gtk+:3 )
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/pango[X]
-	)
-	X? (
-		<x11-base/xorg-server-1.17.99:=
-		>=x11-libs/libvdpau-0.3-r1
-		multilib? (
-			>=x11-libs/libX11-1.6.2[abi_x86_32]
-			>=x11-libs/libXext-1.3.2[abi_x86_32]
-		)
-	)
-"
-
-QA_PREBUILT="opt/* usr/lib*"
-
-S=${WORKDIR}/
-
-pkg_pretend() {
-	if use amd64 && has_multilib_profile && \
-		[ "${DEFAULT_ABI}" != "amd64" ]; then
-		eerror "This ebuild doesn't currently support changing your default ABI"
-		die "Unexpected \${DEFAULT_ABI} = ${DEFAULT_ABI}"
-	fi
-
-	if use kernel_linux && kernel_is ge 4 2; then
-		ewarn "Gentoo supports kernels which are supported by NVIDIA"
-		ewarn "which are limited to the following kernels:"
-		ewarn "<sys-kernel/gentoo-sources-4.2"
-		ewarn "<sys-kernel/vanilla-sources-4.2"
-		ewarn ""
-		ewarn "You are free to utilize epatch_user to provide whatever"
-		ewarn "support you feel is appropriate, but will not receive"
-		ewarn "support as a result of those changes."
-		ewarn ""
-		ewarn "Do not file a bug report about this."
-	fi
-
-	# Since Nvidia ships 3 different series of drivers, we need to give the user
-	# some kind of guidance as to what version they should install. This tries
-	# to point the user in the right direction but can't be perfect. check
-	# nvidia-driver.eclass
-	nvidia-driver-check-warning
-
-	# Kernel features/options to check for
-	CONFIG_CHECK="~ZONE_DMA ~MTRR ~SYSVIPC ~!LOCKDEP"
-	use x86 && CONFIG_CHECK+=" ~HIGHMEM"
-
-	# Now do the above checks
-	use kernel_linux && check_extra_config
-}
-
-pkg_setup() {
-	# try to turn off distcc and ccache for people that have a problem with it
-	export DISTCC_DISABLE=1
-	export CCACHE_DISABLE=1
-
-	if use kernel_linux; then
-		MODULE_NAMES="nvidia(video:${S}/kernel)"
-		use uvm && MODULE_NAMES+=" nvidia-uvm(video:${S}/kernel)"
-
-		# This needs to run after MODULE_NAMES (so that the eclass checks
-		# whether the kernel supports loadable modules) but before BUILD_PARAMS
-		# is set (so that KV_DIR is populated).
-		linux-mod_pkg_setup
-
-		BUILD_PARAMS="IGNORE_CC_MISMATCH=yes V=1 SYSSRC=${KV_DIR} \
-		SYSOUT=${KV_OUT_DIR} CC=$(tc-getBUILD_CC) NV_VERBOSE=1"
-
-		# linux-mod_src_compile calls set_arch_to_kernel, which
-		# sets the ARCH to x86 but NVIDIA's wrapping Makefile
-		# expects x86_64 or i386 and then converts it to x86
-		# later on in the build process
-		BUILD_FIXES="ARCH=$(uname -m | sed -e 's/i.86/i386/')"
-	fi
-
-	# set variables to where files are in the package structure
-	if use kernel_FreeBSD; then
-		use x86-fbsd   && S="${WORKDIR}/${X86_FBSD_NV_PACKAGE}"
-		use amd64-fbsd && S="${WORKDIR}/${AMD64_FBSD_NV_PACKAGE}"
-		NV_DOC="${S}/doc"
-		NV_OBJ="${S}/obj"
-		NV_SRC="${S}/src"
-		NV_MAN="${S}/x11/man"
-		NV_X11="${S}/obj"
-		NV_SOVER=1
-	elif use kernel_linux; then
-		NV_DOC="${S}"
-		NV_OBJ="${S}"
-		NV_SRC="${S}/kernel"
-		NV_MAN="${S}"
-		NV_X11="${S}"
-		NV_SOVER=${PV}
-	else
-		die "Could not determine proper NVIDIA package"
-	fi
-}
-
-src_prepare() {
-	# Please add a brief description for every added patch
-
-	if use kernel_linux; then
-		if kernel_is lt 2 6 9; then
-			eerror "You must build this against 2.6.9 or higher kernels."
-		fi
-
-		# If greater than 2.6.5 use M= instead of SUBDIR=
-#		convert_to_m "${NV_SRC}"/Makefile.kbuild
-	fi
-
-	if use pax_kernel; then
-		ewarn "Using PAX patches is not supported. You will be asked to"
-		ewarn "use a standard kernel should you have issues. Should you"
-		ewarn "need support with these patches, contact the PaX team."
-		epatch "${FILESDIR}"/${PN}-346.16-pax-usercopy.patch
-		epatch "${FILESDIR}"/${PN}-346.16-pax-constify.patch
-	fi
-
-	# Allow user patches so they can support RC kernels and whatever else
-	epatch_user
-}
-
-src_compile() {
-	# This is already the default on Linux, as there's no toplevel Makefile, but
-	# on FreeBSD there's one and triggers the kernel module build, as we install
-	# it by itself, pass this.
-
-	cd "${NV_SRC}"
-	if use kernel_FreeBSD; then
-		MAKE="$(get_bmake)" CFLAGS="-Wno-sign-compare" emake CC="$(tc-getCC)" \
-			LD="$(tc-getLD)" LDFLAGS="$(raw-ldflags)" || die
-	elif use kernel_linux; then
-		MAKEOPTS=-j1
-		linux-mod_src_compile
-	fi
-}
-
-# Install nvidia library:
-# the first parameter is the library to install
-# the second parameter is the provided soversion
-# the third parameter is the target directory if it is not /usr/lib
-donvidia() {
-	# Full path to library minus SOVER
-	MY_LIB="$1"
-
-	# SOVER to use
-	MY_SOVER="$2"
-
-	# Where to install
-	MY_DEST="$3"
-
-	if [[ -z "${MY_DEST}" ]]; then
-		MY_DEST="/usr/$(get_libdir)"
-		action="dolib.so"
-	else
-		exeinto ${MY_DEST}
-		action="doexe"
-	fi
-
-	# Get just the library name
-	libname=$(basename $1)
-
-	# Install the library with the correct SOVER
-	${action} ${MY_LIB}.${MY_SOVER} || \
-		die "failed to install ${libname}"
-
-	# If SOVER wasn't 1, then we need to create a .1 symlink
-	if [[ "${MY_SOVER}" != "1" ]]; then
-		dosym ${libname}.${MY_SOVER} \
-			${MY_DEST}/${libname}.1 || \
-			die "failed to create ${libname} symlink"
-	fi
-
-	# Always create the symlink from the raw lib to the .1
-	dosym ${libname}.1 \
-		${MY_DEST}/${libname} || \
-		die "failed to create ${libname} symlink"
-}
-
-src_install() {
-	if use kernel_linux; then
-		linux-mod_src_install
-
-		# Add the aliases
-		# This file is tweaked with the appropriate video group in
-		# pkg_preinst, see bug #491414
-		insinto /etc/modprobe.d
-		newins "${FILESDIR}"/nvidia-169.07 nvidia.conf
-		use uvm && doins "${FILESDIR}"/nvidia-uvm.conf
-
-		# Ensures that our device nodes are created when not using X
-		exeinto "$(get_udevdir)"
-		doexe "${FILESDIR}"/nvidia-udev.sh
-		udev_newrules "${FILESDIR}"/nvidia.udev-rule 99-nvidia.rules
-	elif use kernel_FreeBSD; then
-		if use x86-fbsd; then
-			insinto /boot/modules
-			doins "${S}/src/nvidia.kld"
-		fi
-
-		exeinto /boot/modules
-		doexe "${S}/src/nvidia.ko"
-	fi
-
-	# NVIDIA kernel <-> userspace driver config lib
-	donvidia ${NV_OBJ}/libnvidia-cfg.so ${NV_SOVER}
-
-	# NVIDIA framebuffer capture library
-	donvidia ${NV_OBJ}/libnvidia-fbc.so ${NV_SOVER}
-
-	# NVIDIA video encode/decode <-> CUDA
-	if use kernel_linux; then
-		donvidia ${NV_OBJ}/libnvcuvid.so ${NV_SOVER}
-		donvidia ${NV_OBJ}/libnvidia-encode.so ${NV_SOVER}
-	fi
-
-	if use X; then
-		# Xorg DDX driver
-		insinto /usr/$(get_libdir)/xorg/modules/drivers
-		doins ${NV_X11}/nvidia_drv.so
-
-		# Xorg GLX driver
-		donvidia ${NV_X11}/libglx.so ${NV_SOVER} \
-			/usr/$(get_libdir)/opengl/nvidia/extensions
-
-		# Xorg nvidia.conf
-		if has_version '>=x11-base/xorg-server-1.16'; then
-			insinto /usr/share/X11/xorg.conf.d
-			newins {,50-}nvidia-drm-outputclass.conf
-		fi
-	fi
-
-	# OpenCL ICD for NVIDIA
-	if use kernel_linux; then
-		insinto /etc/OpenCL/vendors
-		doins ${NV_OBJ}/nvidia.icd
-	fi
-
-	# Documentation
-	dohtml ${NV_DOC}/html/*
-	if use kernel_FreeBSD; then
-		dodoc "${NV_DOC}/README"
-		use X && doman "${NV_MAN}/nvidia-xconfig.1"
-		use tools && doman "${NV_MAN}/nvidia-settings.1"
-	else
-		# Docs
-		newdoc "${NV_DOC}/README.txt" README
-		dodoc "${NV_DOC}/NVIDIA_Changelog"
-		doman "${NV_MAN}/nvidia-smi.1.gz"
-		use X && doman "${NV_MAN}/nvidia-xconfig.1.gz"
-		use tools && doman "${NV_MAN}/nvidia-settings.1.gz"
-		doman "${NV_MAN}/nvidia-cuda-mps-control.1.gz"
-	fi
-
-	# Helper Apps
-	exeinto /opt/bin/
-
-	if use X; then
-		doexe ${NV_OBJ}/nvidia-xconfig
-	fi
-
-	if use kernel_linux; then
-		doexe ${NV_OBJ}/nvidia-cuda-mps-control
-		doexe ${NV_OBJ}/nvidia-cuda-mps-server
-		doexe ${NV_OBJ}/nvidia-debugdump
-		doexe ${NV_OBJ}/nvidia-persistenced
-		doexe ${NV_OBJ}/nvidia-smi
-
-		# install nvidia-modprobe setuid and symlink in /usr/bin (bug #505092)
-		doexe ${NV_OBJ}/nvidia-modprobe
-		fowners root:video /opt/bin/nvidia-modprobe
-		fperms 4710 /opt/bin/nvidia-modprobe
-		dosym /{opt,usr}/bin/nvidia-modprobe
-
-		doman nvidia-cuda-mps-control.1.gz
-		doman nvidia-modprobe.1.gz
-		doman nvidia-persistenced.1.gz
-		newinitd "${FILESDIR}/nvidia-smi.init" nvidia-smi
-		newconfd "${FILESDIR}/nvidia-persistenced.conf" nvidia-persistenced
-		newinitd "${FILESDIR}/nvidia-persistenced.init" nvidia-persistenced
-	fi
-
-	if use tools; then
-		doexe ${NV_OBJ}/nvidia-settings
-		use gtk2 && donvidia libnvidia-gtk2.so ${PV}
-		use gtk3 && donvidia libnvidia-gtk3.so ${PV}
-		insinto /usr/share/nvidia/
-		doins nvidia-application-profiles-${PV}-key-documentation
-		insinto /etc/nvidia
-		newins nvidia-application-profiles-${PV}-rc nvidia-application-profiles-rc
-	fi
-
-	dobin ${NV_OBJ}/nvidia-bug-report.sh
-
-	# Desktop entries for nvidia-settings
-	if use tools; then
-		# There is no icon in the FreeBSD tarball.
-		use kernel_FreeBSD || newicon ${NV_OBJ}/nvidia-settings.png ${PN}-settings.png
-		domenu "${FILESDIR}"/${PN}-settings.desktop
-		exeinto /etc/X11/xinit/xinitrc.d
-		doexe "${FILESDIR}"/95-nvidia-settings
-	fi
-
-	#doenvd "${FILESDIR}"/50nvidia-prelink-blacklist
-
-	if has_multilib_profile && use multilib; then
-		local OABI=${ABI}
-		for ABI in $(get_install_abis); do
-			src_install-libs
-		done
-		ABI=${OABI}
-		unset OABI
-	else
-		src_install-libs
-	fi
-
-	is_final_abi || die "failed to iterate through all ABIs"
-
-	readme.gentoo_create_doc
-}
-
-src_install-libs() {
-	local inslibdir=$(get_libdir)
-	local GL_ROOT="/usr/$(get_libdir)/opengl/nvidia/lib"
-	local CL_ROOT="/usr/$(get_libdir)/OpenCL/vendors/nvidia"
-	local libdir=${NV_OBJ}
-
-	if use kernel_linux && has_multilib_profile && [[ ${ABI} == "x86" ]]; then
-		libdir=${NV_OBJ}/32
-	fi
-
-	if use X; then
-		NV_GLX_LIBRARIES=(
-			"libEGL.so 1 ${GL_ROOT}"
-			"libEGL_nvidia.so 0 ${GL_ROOT}"
-			"libGL.so ${NV_SOVER} ${GL_ROOT}"
-			"libGLESv1_CM.so ${NV_SOVER} ${GL_ROOT}"
-			"libGLdispatch.so 0 ${GL_ROOT}"
-			"libOpenCL.so 1.0.0 ${CL_ROOT}"
-			"libOpenGL.so 0 ${GL_ROOT}"
-			"libcuda.so ${NV_SOVER}"
-			"libnvcuvid.so ${NV_SOVER}"
-			"libnvidia-compiler.so ${NV_SOVER}"
-			"libnvidia-eglcore.so ${NV_SOVER}"
-			"libnvidia-encode.so ${NV_SOVER}"
-			"libnvidia-fbc.so ${NV_SOVER}"
-			"libnvidia-glcore.so ${NV_SOVER}"
-			"libnvidia-glsi.so ${NV_SOVER}"
-			"libnvidia-ifr.so ${NV_SOVER}"
-			"libnvidia-opencl.so ${NV_SOVER}"
-			"libvdpau.so ${NV_SOVER} ${GL_ROOT}"
-			"libvdpau_nvidia.so ${NV_SOVER}"
-			"libvdpau_trace.so ${NV_SOVER} ${GL_ROOT}"
-		)
-		if use kernel_linux && has_multilib_profile && [[ ${ABI} == "amd64" ]];
-		then
-			NV_GLX_LIBRARIES+=( "libnvidia-wfb.so ${NV_SOVER}" )
-		fi
-
-		if use kernel_FreeBSD; then
-			NV_GLX_LIBRARIES+=( "libnvidia-tls.so ${NV_SOVER}" )
-		fi
-
-		if use kernel_linux; then
-			NV_GLX_LIBRARIES+=(
-				"libnvidia-ml.so ${NV_SOVER}"
-				"tls/libnvidia-tls.so ${NV_SOVER}"
-			)
-		fi
-
-		for NV_LIB in "${NV_GLX_LIBRARIES[@]}"; do
-			donvidia ${libdir}/${NV_LIB}
-		done
-
-		# GLES v2 library is special
-		insinto ${GL_ROOT}
-		doexe ${libdir}/libGLESv2.so.${PV}
-		dosym libGLESv2.so.${PV} ${GL_ROOT}/libGLESv2.so.2
-		dosym libGLESv2.so.2 ${GL_ROOT}/libGLESv2.so
-	fi
-}
-
-pkg_preinst() {
-	if use kernel_linux; then
-		linux-mod_pkg_preinst
-
-		local videogroup="$(egetent group video | cut -d ':' -f 3)"
-		if [ -z "${videogroup}" ]; then
-			eerror "Failed to determine the video group gid"
-			die "Failed to determine the video group gid"
-		else
-			sed -i \
-				-e "s:PACKAGE:${PF}:g" \
-				-e "s:VIDEOGID:${videogroup}:" \
-				"${D}"/etc/modprobe.d/nvidia.conf || die
-		fi
-	fi
-
-	# Clean the dynamic libGL stuff's home to ensure
-	# we dont have stale libs floating around
-	if [ -d "${ROOT}"/usr/lib/opengl/nvidia ]; then
-		rm -rf "${ROOT}"/usr/lib/opengl/nvidia/*
-	fi
-	# Make sure we nuke the old nvidia-glx's env.d file
-	if [ -e "${ROOT}"/etc/env.d/09nvidia ]; then
-		rm -f "${ROOT}"/etc/env.d/09nvidia
-	fi
-}
-
-pkg_postinst() {
-	use kernel_linux && linux-mod_pkg_postinst
-
-	# Switch to the nvidia implementation
-	use X && "${ROOT}"/usr/bin/eselect opengl set --use-old nvidia
-	"${ROOT}"/usr/bin/eselect opencl set --use-old nvidia
-
-	readme.gentoo_print_elog
-
-	if ! use X; then
-		elog "You have elected to not install the X.org driver. Along with"
-		elog "this the OpenGL libraries and VDPAU libraries were not"
-		elog "installed. Additionally, once the driver is loaded your card"
-		elog "and fan will run at max speed which may not be desirable."
-		elog "Use the 'nvidia-smi' init script to have your card and fan"
-		elog "speed scale appropriately."
-		elog
-	fi
-	if ! use tools; then
-		elog "USE=tools controls whether the nvidia-settings application"
-		elog "is installed. If you would like to use it, enable that"
-		elog "flag and re-emerge this ebuild. Optionally you can install"
-		elog "media-video/nvidia-settings"
-		elog
-	fi
-}
-
-pkg_prerm() {
-	use X && "${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11
-}
-
-pkg_postrm() {
-	use kernel_linux && linux-mod_pkg_postrm
-	use X && "${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11
-}
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-355.11.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-355.11.ebuild
new file mode 100644
index 000000000000..410fa72d1e1e
--- /dev/null
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-355.11.ebuild
@@ -0,0 +1,500 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils flag-o-matic linux-info linux-mod multilib nvidia-driver \
+	portability toolchain-funcs unpacker user udev
+
+NV_URI="http://us.download.nvidia.com/XFree86/"
+X86_NV_PACKAGE="NVIDIA-Linux-x86-${PV}"
+AMD64_NV_PACKAGE="NVIDIA-Linux-x86_64-${PV}"
+X86_FBSD_NV_PACKAGE="NVIDIA-FreeBSD-x86-${PV}"
+AMD64_FBSD_NV_PACKAGE="NVIDIA-FreeBSD-x86_64-${PV}"
+
+DESCRIPTION="NVIDIA Accelerated Graphics Driver"
+HOMEPAGE="http://www.nvidia.com/"
+SRC_URI="
+	amd64-fbsd? ( ${NV_URI}FreeBSD-x86_64/${PV}/${AMD64_FBSD_NV_PACKAGE}.tar.gz )
+	amd64? ( ${NV_URI}Linux-x86_64/${PV}/${AMD64_NV_PACKAGE}.run )
+	x86-fbsd? ( ${NV_URI}FreeBSD-x86/${PV}/${X86_FBSD_NV_PACKAGE}.tar.gz )
+	x86? ( ${NV_URI}Linux-x86/${PV}/${X86_NV_PACKAGE}.run )
+"
+
+LICENSE="GPL-2 NVIDIA-r2"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86 ~amd64-fbsd ~x86-fbsd"
+RESTRICT="bindist mirror strip"
+EMULTILIB_PKG="true"
+
+IUSE="acpi multilib kernel_FreeBSD kernel_linux pax_kernel +tools gtk2 gtk3 +X uvm"
+REQUIRED_USE="
+	tools? ( X || ( gtk2 gtk3 ) )
+"
+
+COMMON="
+	app-eselect/eselect-opencl
+	kernel_linux? ( >=sys-libs/glibc-2.6.1 )
+	X? (
+		>=app-eselect/eselect-opengl-1.0.9
+	)
+"
+DEPEND="
+	${COMMON}
+	app-arch/xz-utils
+	kernel_linux? ( virtual/linux-sources )
+"
+RDEPEND="
+	${COMMON}
+	acpi? ( sys-power/acpid )
+	tools? (
+		dev-libs/atk
+		dev-libs/glib:2
+		x11-libs/gdk-pixbuf
+		gtk2? ( >=x11-libs/gtk+-2.4:2 )
+		gtk3? ( x11-libs/gtk+:3 )
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/pango[X]
+	)
+	X? (
+		<x11-base/xorg-server-1.17.99:=
+		>=x11-libs/libvdpau-0.3-r1
+		multilib? (
+			>=x11-libs/libX11-1.6.2[abi_x86_32]
+			>=x11-libs/libXext-1.3.2[abi_x86_32]
+		)
+	)
+"
+
+QA_PREBUILT="opt/* usr/lib*"
+
+S=${WORKDIR}/
+
+pkg_pretend() {
+	if use amd64 && has_multilib_profile && \
+		[ "${DEFAULT_ABI}" != "amd64" ]; then
+		eerror "This ebuild doesn't currently support changing your default ABI"
+		die "Unexpected \${DEFAULT_ABI} = ${DEFAULT_ABI}"
+	fi
+
+	if use kernel_linux && kernel_is ge 4 3; then
+		ewarn "Gentoo supports kernels which are supported by NVIDIA"
+		ewarn "which are limited to the following kernels:"
+		ewarn "<sys-kernel/gentoo-sources-4.3"
+		ewarn "<sys-kernel/vanilla-sources-4.3"
+		ewarn ""
+		ewarn "You are free to utilize epatch_user to provide whatever"
+		ewarn "support you feel is appropriate, but will not receive"
+		ewarn "support as a result of those changes."
+		ewarn ""
+		ewarn "Do not file a bug report about this."
+	fi
+
+	# Since Nvidia ships 3 different series of drivers, we need to give the user
+	# some kind of guidance as to what version they should install. This tries
+	# to point the user in the right direction but can't be perfect. check
+	# nvidia-driver.eclass
+	nvidia-driver-check-warning
+
+	# Kernel features/options to check for
+	CONFIG_CHECK="~ZONE_DMA ~MTRR ~SYSVIPC ~!LOCKDEP"
+	use x86 && CONFIG_CHECK+=" ~HIGHMEM"
+
+	# Now do the above checks
+	use kernel_linux && check_extra_config
+}
+
+pkg_setup() {
+	# try to turn off distcc and ccache for people that have a problem with it
+	export DISTCC_DISABLE=1
+	export CCACHE_DISABLE=1
+
+	if use kernel_linux; then
+		MODULE_NAMES="nvidia(video:${S}/kernel)"
+		use uvm && MODULE_NAMES+=" nvidia-uvm(video:${S}/kernel)"
+
+		# This needs to run after MODULE_NAMES (so that the eclass checks
+		# whether the kernel supports loadable modules) but before BUILD_PARAMS
+		# is set (so that KV_DIR is populated).
+		linux-mod_pkg_setup
+
+		BUILD_PARAMS="IGNORE_CC_MISMATCH=yes V=1 SYSSRC=${KV_DIR} \
+		SYSOUT=${KV_OUT_DIR} CC=$(tc-getBUILD_CC) NV_VERBOSE=1"
+
+		# linux-mod_src_compile calls set_arch_to_kernel, which
+		# sets the ARCH to x86 but NVIDIA's wrapping Makefile
+		# expects x86_64 or i386 and then converts it to x86
+		# later on in the build process
+		BUILD_FIXES="ARCH=$(uname -m | sed -e 's/i.86/i386/')"
+	fi
+
+	# set variables to where files are in the package structure
+	if use kernel_FreeBSD; then
+		use x86-fbsd   && S="${WORKDIR}/${X86_FBSD_NV_PACKAGE}"
+		use amd64-fbsd && S="${WORKDIR}/${AMD64_FBSD_NV_PACKAGE}"
+		NV_DOC="${S}/doc"
+		NV_OBJ="${S}/obj"
+		NV_SRC="${S}/src"
+		NV_MAN="${S}/x11/man"
+		NV_X11="${S}/obj"
+		NV_SOVER=1
+	elif use kernel_linux; then
+		NV_DOC="${S}"
+		NV_OBJ="${S}"
+		NV_SRC="${S}/kernel"
+		NV_MAN="${S}"
+		NV_X11="${S}"
+		NV_SOVER=${PV}
+	else
+		die "Could not determine proper NVIDIA package"
+	fi
+}
+
+src_prepare() {
+	# Please add a brief description for every added patch
+
+	if use kernel_linux; then
+		if kernel_is lt 2 6 9; then
+			eerror "You must build this against 2.6.9 or higher kernels."
+		fi
+
+		# If greater than 2.6.5 use M= instead of SUBDIR=
+#		convert_to_m "${NV_SRC}"/Makefile.kbuild
+	fi
+
+	if use pax_kernel; then
+		ewarn "Using PAX patches is not supported. You will be asked to"
+		ewarn "use a standard kernel should you have issues. Should you"
+		ewarn "need support with these patches, contact the PaX team."
+		epatch "${FILESDIR}"/${PN}-346.16-pax-usercopy.patch
+		epatch "${FILESDIR}"/${PN}-346.16-pax-constify.patch
+	fi
+
+	# Allow user patches so they can support RC kernels and whatever else
+	epatch_user
+}
+
+src_compile() {
+	# This is already the default on Linux, as there's no toplevel Makefile, but
+	# on FreeBSD there's one and triggers the kernel module build, as we install
+	# it by itself, pass this.
+
+	cd "${NV_SRC}"
+	if use kernel_FreeBSD; then
+		MAKE="$(get_bmake)" CFLAGS="-Wno-sign-compare" emake CC="$(tc-getCC)" \
+			LD="$(tc-getLD)" LDFLAGS="$(raw-ldflags)" || die
+	elif use kernel_linux; then
+		MAKEOPTS=-j1
+		linux-mod_src_compile
+	fi
+}
+
+# Install nvidia library:
+# the first parameter is the library to install
+# the second parameter is the provided soversion
+# the third parameter is the target directory if it is not /usr/lib
+donvidia() {
+	# Full path to library minus SOVER
+	MY_LIB="$1"
+
+	# SOVER to use
+	MY_SOVER="$2"
+
+	# Where to install
+	MY_DEST="$3"
+
+	if [[ -z "${MY_DEST}" ]]; then
+		MY_DEST="/usr/$(get_libdir)"
+		action="dolib.so"
+	else
+		exeinto ${MY_DEST}
+		action="doexe"
+	fi
+
+	# Get just the library name
+	libname=$(basename $1)
+
+	# Install the library with the correct SOVER
+	${action} ${MY_LIB}.${MY_SOVER} || \
+		die "failed to install ${libname}"
+
+	# If SOVER wasn't 1, then we need to create a .1 symlink
+	if [[ "${MY_SOVER}" != "1" ]]; then
+		dosym ${libname}.${MY_SOVER} \
+			${MY_DEST}/${libname}.1 || \
+			die "failed to create ${libname} symlink"
+	fi
+
+	# Always create the symlink from the raw lib to the .1
+	dosym ${libname}.1 \
+		${MY_DEST}/${libname} || \
+		die "failed to create ${libname} symlink"
+}
+
+src_install() {
+	if use kernel_linux; then
+		linux-mod_src_install
+
+		# Add the aliases
+		# This file is tweaked with the appropriate video group in
+		# pkg_preinst, see bug #491414
+		insinto /etc/modprobe.d
+		newins "${FILESDIR}"/nvidia-169.07 nvidia.conf
+		use uvm && doins "${FILESDIR}"/nvidia-uvm.conf
+
+		# Ensures that our device nodes are created when not using X
+		exeinto "$(get_udevdir)"
+		doexe "${FILESDIR}"/nvidia-udev.sh
+		udev_newrules "${FILESDIR}"/nvidia.udev-rule 99-nvidia.rules
+	elif use kernel_FreeBSD; then
+		if use x86-fbsd; then
+			insinto /boot/modules
+			doins "${S}/src/nvidia.kld"
+		fi
+
+		exeinto /boot/modules
+		doexe "${S}/src/nvidia.ko"
+	fi
+
+	# NVIDIA kernel <-> userspace driver config lib
+	donvidia ${NV_OBJ}/libnvidia-cfg.so ${NV_SOVER}
+
+	# NVIDIA framebuffer capture library
+	donvidia ${NV_OBJ}/libnvidia-fbc.so ${NV_SOVER}
+
+	# NVIDIA video encode/decode <-> CUDA
+	if use kernel_linux; then
+		donvidia ${NV_OBJ}/libnvcuvid.so ${NV_SOVER}
+		donvidia ${NV_OBJ}/libnvidia-encode.so ${NV_SOVER}
+	fi
+
+	if use X; then
+		# Xorg DDX driver
+		insinto /usr/$(get_libdir)/xorg/modules/drivers
+		doins ${NV_X11}/nvidia_drv.so
+
+		# Xorg GLX driver
+		donvidia ${NV_X11}/libglx.so ${NV_SOVER} \
+			/usr/$(get_libdir)/opengl/nvidia/extensions
+
+		# Xorg nvidia.conf
+		if has_version '>=x11-base/xorg-server-1.16'; then
+			insinto /usr/share/X11/xorg.conf.d
+			newins {,50-}nvidia-drm-outputclass.conf
+		fi
+	fi
+
+	# OpenCL ICD for NVIDIA
+	if use kernel_linux; then
+		insinto /etc/OpenCL/vendors
+		doins ${NV_OBJ}/nvidia.icd
+	fi
+
+	# Documentation
+	dohtml ${NV_DOC}/html/*
+	if use kernel_FreeBSD; then
+		dodoc "${NV_DOC}/README"
+		use X && doman "${NV_MAN}/nvidia-xconfig.1"
+		use tools && doman "${NV_MAN}/nvidia-settings.1"
+	else
+		# Docs
+		newdoc "${NV_DOC}/README.txt" README
+		dodoc "${NV_DOC}/NVIDIA_Changelog"
+		doman "${NV_MAN}/nvidia-smi.1.gz"
+		use X && doman "${NV_MAN}/nvidia-xconfig.1.gz"
+		use tools && doman "${NV_MAN}/nvidia-settings.1.gz"
+		doman "${NV_MAN}/nvidia-cuda-mps-control.1.gz"
+	fi
+
+	# Helper Apps
+	exeinto /opt/bin/
+
+	if use X; then
+		doexe ${NV_OBJ}/nvidia-xconfig
+	fi
+
+	if use kernel_linux; then
+		doexe ${NV_OBJ}/nvidia-cuda-mps-control
+		doexe ${NV_OBJ}/nvidia-cuda-mps-server
+		doexe ${NV_OBJ}/nvidia-debugdump
+		doexe ${NV_OBJ}/nvidia-persistenced
+		doexe ${NV_OBJ}/nvidia-smi
+
+		# install nvidia-modprobe setuid and symlink in /usr/bin (bug #505092)
+		doexe ${NV_OBJ}/nvidia-modprobe
+		fowners root:video /opt/bin/nvidia-modprobe
+		fperms 4710 /opt/bin/nvidia-modprobe
+		dosym /{opt,usr}/bin/nvidia-modprobe
+
+		doman nvidia-cuda-mps-control.1.gz
+		doman nvidia-modprobe.1.gz
+		doman nvidia-persistenced.1.gz
+		newinitd "${FILESDIR}/nvidia-smi.init" nvidia-smi
+		newconfd "${FILESDIR}/nvidia-persistenced.conf" nvidia-persistenced
+		newinitd "${FILESDIR}/nvidia-persistenced.init" nvidia-persistenced
+	fi
+
+	if use tools; then
+		doexe ${NV_OBJ}/nvidia-settings
+		use gtk2 && donvidia libnvidia-gtk2.so ${PV}
+		use gtk3 && donvidia libnvidia-gtk3.so ${PV}
+		insinto /usr/share/nvidia/
+		doins nvidia-application-profiles-${PV}-key-documentation
+		insinto /etc/nvidia
+		newins nvidia-application-profiles-${PV}-rc nvidia-application-profiles-rc
+	fi
+
+	dobin ${NV_OBJ}/nvidia-bug-report.sh
+
+	# Desktop entries for nvidia-settings
+	if use tools; then
+		# There is no icon in the FreeBSD tarball.
+		use kernel_FreeBSD || newicon ${NV_OBJ}/nvidia-settings.png ${PN}-settings.png
+		domenu "${FILESDIR}"/${PN}-settings.desktop
+		exeinto /etc/X11/xinit/xinitrc.d
+		doexe "${FILESDIR}"/95-nvidia-settings
+	fi
+
+	#doenvd "${FILESDIR}"/50nvidia-prelink-blacklist
+
+	if has_multilib_profile && use multilib; then
+		local OABI=${ABI}
+		for ABI in $(get_install_abis); do
+			src_install-libs
+		done
+		ABI=${OABI}
+		unset OABI
+	else
+		src_install-libs
+	fi
+
+	is_final_abi || die "failed to iterate through all ABIs"
+
+	readme.gentoo_create_doc
+}
+
+src_install-libs() {
+	local inslibdir=$(get_libdir)
+	local GL_ROOT="/usr/$(get_libdir)/opengl/nvidia/lib"
+	local CL_ROOT="/usr/$(get_libdir)/OpenCL/vendors/nvidia"
+	local libdir=${NV_OBJ}
+
+	if use kernel_linux && has_multilib_profile && [[ ${ABI} == "x86" ]]; then
+		libdir=${NV_OBJ}/32
+	fi
+
+	if use X; then
+		NV_GLX_LIBRARIES=(
+			"libEGL.so 1 ${GL_ROOT}"
+			"libEGL_nvidia.so 0 ${GL_ROOT}"
+			"libGL.so ${NV_SOVER} ${GL_ROOT}"
+			"libGLESv1_CM.so ${NV_SOVER} ${GL_ROOT}"
+			"libGLdispatch.so 0 ${GL_ROOT}"
+			"libOpenCL.so 1.0.0 ${CL_ROOT}"
+			"libOpenGL.so 0 ${GL_ROOT}"
+			"libcuda.so ${NV_SOVER}"
+			"libnvcuvid.so ${NV_SOVER}"
+			"libnvidia-compiler.so ${NV_SOVER}"
+			"libnvidia-eglcore.so ${NV_SOVER}"
+			"libnvidia-encode.so ${NV_SOVER}"
+			"libnvidia-fbc.so ${NV_SOVER}"
+			"libnvidia-glcore.so ${NV_SOVER}"
+			"libnvidia-glsi.so ${NV_SOVER}"
+			"libnvidia-ifr.so ${NV_SOVER}"
+			"libnvidia-opencl.so ${NV_SOVER}"
+			"libvdpau.so ${NV_SOVER} ${GL_ROOT}"
+			"libvdpau_nvidia.so ${NV_SOVER}"
+			"libvdpau_trace.so ${NV_SOVER} ${GL_ROOT}"
+		)
+		if use kernel_linux && has_multilib_profile && [[ ${ABI} == "amd64" ]];
+		then
+			NV_GLX_LIBRARIES+=( "libnvidia-wfb.so ${NV_SOVER}" )
+		fi
+
+		if use kernel_FreeBSD; then
+			NV_GLX_LIBRARIES+=( "libnvidia-tls.so ${NV_SOVER}" )
+		fi
+
+		if use kernel_linux; then
+			NV_GLX_LIBRARIES+=(
+				"libnvidia-ml.so ${NV_SOVER}"
+				"tls/libnvidia-tls.so ${NV_SOVER}"
+			)
+		fi
+
+		for NV_LIB in "${NV_GLX_LIBRARIES[@]}"; do
+			donvidia ${libdir}/${NV_LIB}
+		done
+
+		# GLES v2 library is special
+		insinto ${GL_ROOT}
+		doexe ${libdir}/libGLESv2.so.${PV}
+		dosym libGLESv2.so.${PV} ${GL_ROOT}/libGLESv2.so.2
+		dosym libGLESv2.so.2 ${GL_ROOT}/libGLESv2.so
+	fi
+}
+
+pkg_preinst() {
+	if use kernel_linux; then
+		linux-mod_pkg_preinst
+
+		local videogroup="$(egetent group video | cut -d ':' -f 3)"
+		if [ -z "${videogroup}" ]; then
+			eerror "Failed to determine the video group gid"
+			die "Failed to determine the video group gid"
+		else
+			sed -i \
+				-e "s:PACKAGE:${PF}:g" \
+				-e "s:VIDEOGID:${videogroup}:" \
+				"${D}"/etc/modprobe.d/nvidia.conf || die
+		fi
+	fi
+
+	# Clean the dynamic libGL stuff's home to ensure
+	# we dont have stale libs floating around
+	if [ -d "${ROOT}"/usr/lib/opengl/nvidia ]; then
+		rm -rf "${ROOT}"/usr/lib/opengl/nvidia/*
+	fi
+	# Make sure we nuke the old nvidia-glx's env.d file
+	if [ -e "${ROOT}"/etc/env.d/09nvidia ]; then
+		rm -f "${ROOT}"/etc/env.d/09nvidia
+	fi
+}
+
+pkg_postinst() {
+	use kernel_linux && linux-mod_pkg_postinst
+
+	# Switch to the nvidia implementation
+	use X && "${ROOT}"/usr/bin/eselect opengl set --use-old nvidia
+	"${ROOT}"/usr/bin/eselect opencl set --use-old nvidia
+
+	readme.gentoo_print_elog
+
+	if ! use X; then
+		elog "You have elected to not install the X.org driver. Along with"
+		elog "this the OpenGL libraries and VDPAU libraries were not"
+		elog "installed. Additionally, once the driver is loaded your card"
+		elog "and fan will run at max speed which may not be desirable."
+		elog "Use the 'nvidia-smi' init script to have your card and fan"
+		elog "speed scale appropriately."
+		elog
+	fi
+	if ! use tools; then
+		elog "USE=tools controls whether the nvidia-settings application"
+		elog "is installed. If you would like to use it, enable that"
+		elog "flag and re-emerge this ebuild. Optionally you can install"
+		elog "media-video/nvidia-settings"
+		elog
+	fi
+}
+
+pkg_prerm() {
+	use X && "${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11
+}
+
+pkg_postrm() {
+	use kernel_linux && linux-mod_pkg_postrm
+	use X && "${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11
+}
diff --git a/x11-drivers/xf86-video-virtualbox/Manifest b/x11-drivers/xf86-video-virtualbox/Manifest
index 1d763fe14654..a5b92fd2dd7f 100644
--- a/x11-drivers/xf86-video-virtualbox/Manifest
+++ b/x11-drivers/xf86-video-virtualbox/Manifest
@@ -1,4 +1,4 @@
 DIST VirtualBox-4.3.28.tar.bz2 100092002 SHA256 e157ab76d1958ae2c56b2a3875194fbff3de82486ad0e30032fd5bd772297c31 SHA512 b6e849a1420515b6dbda8cee0ab64940dd93296ec58cde76676ac257ff3dad0459aa1fd0bda7e1d0abc751d2d59f055465b198a546fdbb4e70e934a78654a8fc WHIRLPOOL 1b739f1f989032e07829a23ffadadd49e31109d70b0effbc44126a48a165218ff3ebafa576fa0e4f2af76a404033b60e5c9804ac43db5dd3024f1eca25ca70da
 DIST VirtualBox-4.3.30.tar.bz2 97428942 SHA256 ea9569ec16cd6202ee61bcadb2506d31ac12fd343adb91565773a05eaaea9a36 SHA512 d0817335cf4bd196da93b91ede6bc9e48ca0d471166ab2790dbf508a4574e4ace54a86053932abf3b4e804c583e80a713d2ab2e556dc15bee6ef3a62f88b95fc WHIRLPOOL 47cbd702e83cc737e04b5862cc6c52e32be244dc1dc0145f582f57b2f19bb898f0f4b200576a28f10a3290691f1ffd43c256e8c8eb5545a9723be8eefca88a38
-DIST VirtualBox-5.0.0.tar.bz2 109816664 SHA256 bb71356c8f82012c9b5ae16e12302eb111c71ae7b063ada7688fbfa8aa10c2f7 SHA512 c9557820fa04215b1b7905babfab340a01ad2cf733a18462fc608f8db5d0aa908e9ec0d92b3c77075e8a1322c10c92f58f8f14608aa3480052ca730ebd507636 WHIRLPOOL 7cda1523e0cd2851cbea5bb7a202963bac67cc6af29d0ec9a706dcec53746e50e6c85ccea014604eca9558ccaa45e9d2ce05b2eb64dbb54a7edac5f538634134
 DIST VirtualBox-5.0.2.tar.bz2 109872963 SHA256 f290c220d62af2a7fdabb1934c1a0b924b68968a236bb2509bcb507d2c19485e SHA512 fc89cfe475aa02182b04e19a62d52d02b4ff5d2afb082ed3cf11b36288b19f7be15b0e76ae2fd8b9b2c3d5456b316453f112c3b711d242915688adf24623e0c1 WHIRLPOOL 23de881fa6233ce97a1ceeca900657019466df08dc0890355b9d415cd8f4fe8d6877f06218b2455a75be69cfa13d3b2a35855fb641832b300788273af1d26b32
+DIST VirtualBox-5.0.4.tar.bz2 109865904 SHA256 b19e23fc8e71f38aef7c059f44e59fcbff3bb2ce85baa8de81f1629b85f68fcf SHA512 4349792390f0a236faef0bdb06806dde604373dcccf83351f805508a2fdcae9f729a5e793ac53c4d134c50e48c0624b340328a7bb21ddcf15ed69a08365eb2b5 WHIRLPOOL cacf3193231a8500a3b475ede2d0f0458a656d87d3d97b78ccb743c1606f7f6ec58f6d56cb1bc0a40e9eb279d4cbeeab3318d1e71be3dead07fe4ccff6bdfbcf
diff --git a/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-5.0.0.ebuild b/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-5.0.4.ebuild
index f250ea436c5f..f250ea436c5f 100644
--- a/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-5.0.0.ebuild
+++ b/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-5.0.4.ebuild
diff --git a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.30.8-r2.ebuild b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.30.8-r2.ebuild
index 192d7fbef70a..b5550a670b2a 100644
--- a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.30.8-r2.ebuild
+++ b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.30.8-r2.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="http://www.gtk.org/"
 
 LICENSE="LGPL-2+"
 SLOT="2"
-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="+X debug +introspection jpeg jpeg2k tiff test"
 
 COMMON_DEPEND="
diff --git a/x11-libs/gnome-pty-helper/gnome-pty-helper-0.40.2.ebuild b/x11-libs/gnome-pty-helper/gnome-pty-helper-0.40.2.ebuild
index 890ad6f4c9eb..fcb7922ce639 100644
--- a/x11-libs/gnome-pty-helper/gnome-pty-helper-0.40.2.ebuild
+++ b/x11-libs/gnome-pty-helper/gnome-pty-helper-0.40.2.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://wiki.gnome.org/action/show/Apps/Terminal/VTE"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
 IUSE="+hardened"
 
 # gnome-pty-helper was spit out with 0.27.90
diff --git a/x11-libs/goffice/goffice-0.10.23.ebuild b/x11-libs/goffice/goffice-0.10.23.ebuild
index 3b351e27f315..630e90fa6f8e 100644
--- a/x11-libs/goffice/goffice-0.10.23.ebuild
+++ b/x11-libs/goffice/goffice-0.10.23.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://git.gnome.org/browse/goffice/"
 
 LICENSE="GPL-2"
 SLOT="0.10"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris"
 IUSE="+introspection"
 
 # Build fails with -gtk
diff --git a/x11-libs/gtk+/Manifest b/x11-libs/gtk+/Manifest
index c59b726b84ed..c46e9dd69e54 100644
--- a/x11-libs/gtk+/Manifest
+++ b/x11-libs/gtk+/Manifest
@@ -1,10 +1,6 @@
 DIST gtk+-1.2.10-r8-gentoo.diff.bz2 81223 SHA256 517bdadbaa0e13285b2d72a667b311219342306d4f68d838c3c1dbc5bfbf1684 SHA512 aaef9275ff6330a9fe1cbe1e40def181329d79cd33eb2b2ff5ae9cba5fa57e706716233ac7515f621d913f81343eb8244c6669e6411f7d50ca69187bf8d4fd86 WHIRLPOOL 2aacaa61e3291ff3c96a724e02a1fd250fa1574a69c730fa8635c28926c4134b780e9695e3aec3a6fd27b6e25848fcaee4075e17cd47bed2851bdcf311f19020
 DIST gtk+-1.2.10.tar.gz 2868322 SHA256 3fb843ea671c89b909fd145fa09fd2276af3312e58cbab29ed1c93b462108c34 SHA512 6a05062520954287b0e24a95169d18c216145ee79d1fa7f54222db32c8e39e011e3dc49886d3bc4de1cc1ebd71f5744e41891cde8d5c2759f637e71c390a235f WHIRLPOOL 906a78c2e2664b1cbd70fb9e64ce6ca1155b2a59c169eab986f5b4b90e937f380a5d35e2e28eb56913b0fbdfb53abeca5ef6823f92a3ab3906cd4e9f7c595b15
-DIST gtk+-2.24.25.tar.xz 13327832 SHA256 38af1020cb8ff3d10dda2c8807f11e92af9d2fa4045de61c62eedb7fbc7ea5b3 SHA512 e102eabbd86e9e697402b4d915172dd3838374b7b8a16b95369ed602228857a013fdba7b6b8d742f925ff8d340b63a90b56c1ddbd4405d8dc454144c705ac08d WHIRLPOOL b4bcf058bcc582627be35bb8ba45a933c3814f007599df59172e537fc99003f51edac7011cf36783caad4e191c622f6fa044a6ff6e0ae3f4de7635c3815807a3
-DIST gtk+-2.24.27.tar.xz 13349252 SHA256 20cb10cae43999732a9af2e9aac4d1adebf2a9c2e1ba147050976abca5cd24f4 SHA512 ffe981a41137302713a411039238604e92d41146e25ea0643857ec40388ddfe69cbb15bdc1aa8300b87ddbb4d6fbcf0054cdb7ba39634fbe4bfd1802f5bc8ac6 WHIRLPOOL 02259afb7a410fe941b9cc20e8031d61d5dd90f2ac532e3b8525b203997cfa57999286cd59e76ef152a68de35f08e8712dc4b9cd107633f2ba2433eba633197c
 DIST gtk+-2.24.28.tar.xz 13354884 SHA256 b2c6441e98bc5232e5f9bba6965075dcf580a8726398f7374d39f90b88ed4656 SHA512 86d563645ca70c1e14afd4b38d925f496e596cbf6181f2e95310f58c2f4152aaecc559e3c513e6d405fcf48d8d413d59a9d72782216529c1280bd8e1947d7760 WHIRLPOOL b4943bb7792f962e0fc50a118f0dbce58a79678e1a98632717a2f3bda4ddd99b62ce9aed3b14f1c0912a4b53eb975991527843985f625c5a9e052db4889acfb0
-DIST gtk+-3.12.2.tar.xz 15015024 SHA256 61d74eea74231b1ea4b53084a9d6fc9917ab0e1d71b69d92cbf60a4b4fb385d0 SHA512 4a8d2f52328587d73e30f363bdbbd91322dae0198f5581a2da3ebbe96ef0a0635193d2537e8fc127dc0950a24df42862233edd3a873dcbd166dc675bae849c9e WHIRLPOOL 26328632d78f986d25e40d8773ff3cc90a0b3a5bafb4f21224504bd1c8c78995df556e8337d7b374f047bfff2bd0b9e0082ec163591f7a0a035260b8a2db2932
 DIST gtk+-3.14.13.tar.xz 15784112 SHA256 b1efcb1ef299f9b205e6f4512428315fd03484e5790f65bd3ac164e84ade90b0 SHA512 e4fcca57fe58821832ee0b542d86033a1028c19e2248929e25a8c16ef05603a93815556591bcc025995bfab1238ad4060fcdf4920ec2df22ab3175b404f3a207 WHIRLPOOL 36a77983701da6041f0762013638303d323a42487a6f6508e92dfa0571f8f13b8598a8187e9665e6eeb62e41b7c2533a1fe9d2b68f097e85599d373969d52da0
-DIST gtk+-3.14.9.tar.xz 15716588 SHA256 3be9560e6e99388d7706a168e3353ecd63fc30ec4f7f8bea23889e71ab7b6c64 SHA512 3b64142d65ec4b4e0ed709c2fac629d80b95dac03481a3d6f8e3cc6c351ac779fe172a1edee552df7b3c40287f10c97fa0e99212e5f0e6b4751e3d8efd0896e5 WHIRLPOOL bc45b3722913ebb90bff944ec724909d01e3e976d49f8bd273500de2af9de7dcedc85e24fca36226816993a10cb87f4477f4498cc67946449855b37a0790a2fa
-DIST gtk+-3.16.4.tar.xz 18235768 SHA256 1ee5dbd7a4cb81a91eaa1b7ae64ba5a3eab6a3c0a764155583ab96524590fc8e SHA512 02a021e9911054ad03adef943b0faae478903a9e1d10a584009ee84364ecdb541a27533ba11ed980bc2a6f39833490c180514efc2ca3669f7c5dc4a388f3f53d WHIRLPOOL 954c19f5478cac7b72aa3153a5fa7a876b0248d3f0cb0df02dfdc4c96d16975893e03c32988fbb2b46731a1661c4fa54fb1fc9e8a125621287eb739a3c47468b
 DIST gtk+-3.16.5.tar.xz 18263356 SHA256 b87c99d127eb962fc857c246b77a65322cdffd7dcbcf46a83bce2040e0f4bc31 SHA512 f8dd318d5d72e8c59534bf49e505de3575f7519d57398030f4c47a576c3b37e4f00fec1b5a3ba2a3769e94373504dfb6ca24b1015f1e8f8f7dca6f46114b95f8 WHIRLPOOL 9c7ca6a76bde91912043ccfb26375327628fb2206b0e613116c9b6b1f1d078cccf075690b7749d76e8ddea3e3118ecae79e49be98490db29a7a2042f843d0b97
+DIST gtk+-3.16.6.tar.xz 18273872 SHA256 4d12726d0856a968b41802ae5c5971d7e9bac532717e309d3f81b9989da5ffbe SHA512 0b3417c57ef755c8eb498b6800cd9e1dc1df01d508425c968944aaa0d7ff50f25a00370f9a6ccf23a87cc9f7fb251447e63055149264b997ee5a681e98dc54ec WHIRLPOOL f944cce4396d2519d357ef75f1e9d420b64d77004110f0e7d2eb643ae5b3f8182db5be28e35269a57ecfe9cbc3280dc65008c30ce1c977d64d0fbb317e6f6bce
diff --git a/x11-libs/gtk+/files/gtk+-2.24.20-darwin-quartz-pasteboard.patch b/x11-libs/gtk+/files/gtk+-2.24.20-darwin-quartz-pasteboard.patch
deleted file mode 100644
index a07e6537d22e..000000000000
--- a/x11-libs/gtk+/files/gtk+-2.24.20-darwin-quartz-pasteboard.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-gdk_quartz_target_to_pasteboard_type_libgtk_only was moved in
-a269c2f8d26a588c4b61ad605ef496e89759cc03
-https://mail.gnome.org/archives/commits-list/2013-March/msg20203.html
-https://bugzilla.gnome.org/show_bug.cgi?id=704766
-
---- gtk/gtkclipboard-quartz.c
-+++ gtk/gtkclipboard-quartz.c
-@@ -33,6 +33,7 @@
- #include "gtktextbuffer.h"
- #include "gtkquartz.h"
- #include "gtkalias.h"
-+#include "quartz/gdkquartz.h"
- 
- enum {
-   OWNER_CHANGE,
diff --git a/x11-libs/gtk+/files/gtk+-3.12.2-darwin10.6.patch b/x11-libs/gtk+/files/gtk+-3.12.2-darwin10.6.patch
deleted file mode 100644
index 3955677f4c35..000000000000
--- a/x11-libs/gtk+/files/gtk+-3.12.2-darwin10.6.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-Fix for Mac Os 10.7
-
-src_compile:
-gtkapplication-quartz-menu.c:265: error: incompatible type for argument 1 of 'roundf'
-make[4]: *** [libgtk_3_la-gtkapplication-quartz-menu.lo] Error 1
-
-More info:
-https://trac.macports.org/ticket/43283
-https://bugzilla.gnome.org/show_bug.cgi?id=727366
-https://bugs.gentoo.org/show_bug.cgi?id=519058
-
---- gtk/gtkapplication-quartz-menu.c.orig	2014-05-08 01:40:39.000000000 +0200
-+++ gtk/gtkapplication-quartz-menu.c	2014-05-15 11:16:09.000000000 +0200
-@@ -30,6 +30,16 @@
- 
- #import <Cocoa/Cocoa.h>
- 
-+#if !defined(MAC_OS_X_VERSION_10_7) || \
-+MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_7
-+
-+@interface NSScreen (LionAPI)
-+- (CGFloat)backingScaleFactor;
-+- (NSRect)convertRectToBacking:(NSRect)aRect;
-+@end
-+
-+#endif // 10.7
-+
- #define ICON_SIZE 16
- 
- #define BLACK               "#000000"
-@@ -262,7 +272,7 @@
-         }
- 
-       theme = gtk_icon_theme_get_default ();
--      scale = roundf ([[NSScreen mainScreen] backingScaleFactor]);
-+      scale = [[NSScreen mainScreen] respondsToSelector:@selector(backingScaleFactor)] ? roundf ([[NSScreen mainScreen] backingScaleFactor]) : 1.;
-       info = gtk_icon_theme_lookup_by_gicon_for_scale (theme, icon, ICON_SIZE, scale, GTK_ICON_LOOKUP_USE_BUILTIN);
- 
-       if (info != NULL)
diff --git a/x11-libs/gtk+/gtk+-1.2.10-r12.ebuild b/x11-libs/gtk+/gtk+-1.2.10-r12.ebuild
deleted file mode 100644
index 3a5c423f155e..000000000000
--- a/x11-libs/gtk+/gtk+-1.2.10-r12.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-GNOME_TARBALL_SUFFIX="gz"
-inherit gnome.org eutils toolchain-funcs autotools
-
-DESCRIPTION="The GIMP Toolkit"
-HOMEPAGE="http://www.gtk.org/"
-SRC_URI="${SRC_URI} http://www.ibiblio.org/gentoo/distfiles/gtk+-1.2.10-r8-gentoo.diff.bz2"
-
-LICENSE="LGPL-2.1+"
-SLOT="1"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd"
-IUSE="nls debug"
-
-# Supported languages and translated documentation
-# Be sure all languages are prefixed with a single space!
-MY_AVAILABLE_LINGUAS=" az ca cs da de el es et eu fi fr ga gl hr hu it ja ko lt nl nn no pl pt_BR pt ro ru sk sl sr sv tr uk vi"
-IUSE="${IUSE} ${MY_AVAILABLE_LINGUAS// / linguas_}"
-
-RDEPEND=">=dev-libs/glib-1.2:1
-	x11-libs/libXi
-	x11-libs/libXt"
-DEPEND="${RDEPEND}
-	x11-proto/inputproto
-	x11-proto/xextproto
-	nls? ( sys-devel/gettext dev-util/intltool )"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-m4.patch
-	epatch "${FILESDIR}"/${P}-automake.patch
-	epatch "${FILESDIR}"/${P}-cleanup.patch
-	epatch "${DISTDIR}"/gtk+-1.2.10-r8-gentoo.diff.bz2
-	epatch "${FILESDIR}"/${PN}-1.2-locale_fix.patch
-	epatch "${FILESDIR}"/${P}-as-needed.patch
-	sed -i '/libtool.m4/,/AM_PROG_NM/d' acinclude.m4 #168198
-	epatch "${FILESDIR}"/${P}-automake-1.13.patch #467520
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=
-	use nls || myconf="${myconf} --disable-nls"
-	strip-linguas ${MY_AVAILABLE_LINGUAS}
-
-	if use debug ; then
-		myconf="${myconf} --enable-debug=yes"
-	else
-		myconf="${myconf} --enable-debug=minimum"
-	fi
-
-	econf \
-		--sysconfdir=/etc \
-		--with-xinput=xfree \
-		--with-x \
-		${myconf}
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)"
-}
-
-src_install() {
-	default
-
-	dodoc AUTHORS ChangeLog* HACKING
-	dodoc NEWS* README* TODO
-	docinto docs
-	cd docs
-	dodoc *.txt *.gif text/*
-	dohtml -r html
-
-	#install nice, clean-looking gtk+ style
-	insinto /usr/share/themes/Gentoo/gtk
-	doins "${FILESDIR}"/gtkrc
-}
-
-pkg_postinst() {
-	if [[ -e /etc/X11/gtk/gtkrc ]] ; then
-		ewarn "Older versions added /etc/X11/gtk/gtkrc which changed settings for"
-		ewarn "all themes it seems.  Please remove it manually as it will not due"
-		ewarn "to /env protection."
-	fi
-
-	echo ""
-	einfo "The old gtkrc is available through the new Gentoo gtk theme."
-}
diff --git a/x11-libs/gtk+/gtk+-2.24.25.ebuild b/x11-libs/gtk+/gtk+-2.24.25.ebuild
deleted file mode 100644
index 9c97d5687925..000000000000
--- a/x11-libs/gtk+/gtk+-2.24.25.ebuild
+++ /dev/null
@@ -1,272 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="no"
-
-inherit eutils flag-o-matic gnome2 multilib virtualx autotools readme.gentoo multilib-minimal
-
-DESCRIPTION="Gimp ToolKit +"
-HOMEPAGE="http://www.gtk.org/"
-
-LICENSE="LGPL-2+"
-SLOT="2"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="aqua cups debug examples +introspection test vim-syntax xinerama"
-
-# NOTE: cairo[svg] dep is due to bug 291283 (not patched to avoid eautoreconf)
-COMMON_DEPEND="
-	!aqua? (
-		>=x11-libs/libXrender-0.9.8[${MULTILIB_USEDEP}]
-		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libXi-1.7.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libXrandr-1.4.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libXcursor-1.1.14[${MULTILIB_USEDEP}]
-		>=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}]
-		>=x11-libs/libXcomposite-0.4.4-r1[${MULTILIB_USEDEP}]
-		>=x11-libs/libXdamage-1.1.4-r1[${MULTILIB_USEDEP}]
-		>=x11-libs/cairo-1.12.14-r4:=[X,svg,${MULTILIB_USEDEP}]
-		>=x11-libs/gdk-pixbuf-2.30.7:2[X,introspection?,${MULTILIB_USEDEP}]
-	)
-	aqua? (
-		>=x11-libs/cairo-1.6:=[aqua,svg]
-		x11-libs/gdk-pixbuf:2[introspection?]
-	)
-	xinerama? ( >=x11-libs/libXinerama-1.1.3[${MULTILIB_USEDEP}] )
-	>=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]
-	>=x11-libs/pango-1.36.3[introspection?,${MULTILIB_USEDEP}]
-	>=dev-libs/atk-2.10.0[introspection?,${MULTILIB_USEDEP}]
-	>=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}]
-	x11-misc/shared-mime-info
-	cups? ( >=net-print/cups-1.7.1-r2:=[${MULTILIB_USEDEP}] )
-	introspection? ( >=dev-libs/gobject-introspection-0.9.3 )
-	!<gnome-base/gail-1000
-"
-DEPEND="${COMMON_DEPEND}
-	dev-libs/gobject-introspection-common
-	sys-devel/gettext
-	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
-	!aqua? (
-		>=x11-proto/xextproto-7.2.1-r1[${MULTILIB_USEDEP}]
-		>=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}]
-		>=x11-proto/inputproto-2.3[${MULTILIB_USEDEP}]
-		>=x11-proto/damageproto-1.2.1-r1[${MULTILIB_USEDEP}]
-	)
-	xinerama? ( >=x11-proto/xineramaproto-1.2.1-r1[${MULTILIB_USEDEP}] )
-	>=dev-util/gtk-doc-am-1.20
-	test? (
-		x11-themes/hicolor-icon-theme
-		media-fonts/font-misc-misc
-		media-fonts/font-cursor-misc )
-"
-
-# gtk+-2.24.8 breaks Alt key handling in <=x11-libs/vte-0.28.2:0
-# Add blocker against old gtk-builder-convert to be sure we maintain both
-# in sync.
-RDEPEND="${COMMON_DEPEND}
-	!<dev-util/gtk-builder-convert-${PV}
-	!<x11-libs/vte-0.28.2-r201:0
-	abi_x86_32? (
-		!<=app-emulation/emul-linux-x86-gtklibs-20140508
-		!app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)]
-	)
-"
-PDEPEND="vim-syntax? ( app-vim/gtk-syntax )"
-
-DISABLE_AUTOFORMATTING="yes"
-DOC_CONTENTS="To make the gtk2 file chooser use 'current directory' mode by default,
-edit ~/.config/gtk-2.0/gtkfilechooser.ini to contain the following:
-[Filechooser Settings]
-StartupMode=cwd"
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/gtk-query-immodules-2.0
-)
-
-strip_builddir() {
-	local rule=$1
-	shift
-	local directory=$1
-	shift
-	sed -e "s/^\(${rule} =.*\)${directory}\(.*\)$/\1\2/" -i $@ \
-		|| die "Could not strip director ${directory} from build."
-}
-
-set_gtk2_confdir() {
-	# An arch specific config directory is used on multilib systems
-	GTK2_CONFDIR="/etc/gtk-2.0/${CHOST}"
-}
-
-src_prepare() {
-	# Fix building due to moved definition, upstream bug #704766
-	epatch "${FILESDIR}"/${PN}-2.24.20-darwin-quartz-pasteboard.patch
-
-	# Fix tests running when building out of sources, bug #510596
-	epatch "${FILESDIR}"/${PN}-2.24.24-out-of-source.patch
-
-	# marshalers code was pre-generated with glib-2.31, upstream bug #671763
-	rm -v gdk/gdkmarshalers.c gtk/gtkmarshal.c gtk/gtkmarshalers.c \
-		perf/marshalers.c || die
-
-	# Stop trying to build unmaintained docs, bug #349754
-	strip_builddir SUBDIRS tutorial docs/Makefile.am docs/Makefile.in
-	strip_builddir SUBDIRS faq docs/Makefile.am docs/Makefile.in
-
-	# -O3 and company cause random crashes in applications. Bug #133469
-	replace-flags -O3 -O2
-	strip-flags
-
-	if ! use test; then
-		# don't waste time building tests
-		strip_builddir SRC_SUBDIRS tests Makefile.{am,in}
-		strip_builddir SUBDIRS tests gdk/Makefile.{am,in} gtk/Makefile.{am,in}
-	else
-		# Non-working test in gentoo's env
-		sed 's:\(g_test_add_func ("/ui-tests/keys-events.*\):/*\1*/:g' \
-			-i gtk/tests/testing.c || die "sed 1 failed"
-
-		# Cannot work because glib is too clever to find real user's home
-		# gentoo bug #285687, upstream bug #639832
-		# XXX: /!\ Pay extra attention to second sed when bumping /!\
-		sed '/TEST_PROGS.*recentmanager/d' -i gtk/tests/Makefile.am \
-			|| die "failed to disable recentmanager test (1)"
-		sed '/^TEST_PROGS =/,+3 s/recentmanager//' -i gtk/tests/Makefile.in \
-			|| die "failed to disable recentmanager test (2)"
-		sed 's:\({ "GtkFileChooserButton".*},\):/*\1*/:g' -i gtk/tests/object.c \
-			|| die "failed to disable recentmanager test (3)"
-
-		# Skip tests known to fail
-		# https://bugzilla.gnome.org/show_bug.cgi?id=646609
-		sed -e '/g_test_add_func.*test_text_access/s:^://:' \
-			-i "${S}/gtk/tests/testing.c" || die
-
-		# https://bugzilla.gnome.org/show_bug.cgi?id=617473
-		sed -i -e 's:pltcheck.sh:$(NULL):g' \
-			gtk/Makefile.am || die
-
-		# UI tests require immodules already installed; bug #413185
-		if ! has_version 'x11-libs/gtk+:2'; then
-			ewarn "Disabling UI tests because this is the first install of"
-			ewarn "gtk+:2 on this machine. Please re-run the tests after $P"
-			ewarn "has been installed."
-			sed '/g_test_add_func.*ui-tests/ d' \
-				-i gtk/tests/testing.c || die "sed 2 failed"
-		fi
-	fi
-
-	if ! use examples; then
-		# don't waste time building demos
-		strip_builddir SRC_SUBDIRS demos Makefile.am Makefile.in
-	fi
-
-	epatch_user
-
-	eautoreconf
-
-	gnome2_src_prepare
-}
-
-multilib_src_configure() {
-	[[ ${ABI} == ppc64 ]] && append-flags -mminimal-toc
-
-	# Passing --disable-debug is not recommended for production use
-	ECONF_SOURCE=${S} \
-	gnome2_src_configure \
-		$(usex aqua --with-gdktarget=quartz --with-gdktarget=x11) \
-		$(usex aqua "" --with-xinput) \
-		$(usex debug --enable-debug=yes "") \
-		$(use_enable cups cups auto) \
-		$(multilib_native_use_enable introspection) \
-		$(use_enable xinerama) \
-		--disable-papi \
-		CUPS_CONFIG="${EPREFIX}/usr/bin/${CHOST}-cups-config"
-
-	# work-around gtk-doc out-of-source brokedness
-	if multilib_is_native_abi; then
-		local d
-		for d in gdk gtk libgail-util; do
-			ln -s "${S}"/docs/reference/${d}/html docs/reference/${d}/html || die
-		done
-	fi
-}
-
-multilib_src_test() {
-	unset DBUS_SESSION_BUS_ADDRESS
-	Xemake check
-}
-
-multilib_src_install() {
-	gnome2_src_install
-
-	# add -framework Carbon to the .pc files
-	use aqua && for i in gtk+-2.0.pc gtk+-quartz-2.0.pc gtk+-unix-print-2.0.pc; do
-		sed -i -e "s:Libs\: :Libs\: -framework Carbon :" "${ED%/}"/usr/lib/pkgconfig/$i || die "sed failed"
-	done
-}
-
-multilib_src_install_all() {
-	# see bug #133241
-	echo 'gtk-fallback-icon-theme = "gnome"' > "${T}/gtkrc"
-	insinto /usr/share/gtk-2.0
-	doins "${T}"/gtkrc
-
-	dodoc AUTHORS ChangeLog* HACKING NEWS* README*
-
-	# dev-util/gtk-builder-convert split off into a separate package, #402905
-	rm "${ED}"usr/bin/gtk-builder-convert || die
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	set_gtk2_confdir
-
-	multilib_pkg_postinst() {
-		"${CHOST}"-gtk-query-immodules-2.0 --update-cache \
-			|| die "Update immodules cache failed (for ${ABI})"
-	}
-	multilib_parallel_foreach_abi multilib_pkg_postinst
-
-	if [ -e "${EROOT%/}/etc/gtk-2.0/gtk.immodules" ]; then
-		elog "File /etc/gtk-2.0/gtk.immodules has been moved to \$CHOST"
-		elog "aware location. Removing deprecated file."
-		rm -f ${EROOT%/}/etc/gtk-2.0/gtk.immodules
-	fi
-
-	if [ -e "${EROOT%/}${GTK2_CONFDIR}/gtk.immodules" ]; then
-		elog "File /etc/gtk-2.0/gtk.immodules has been moved to"
-		elog "${EROOT%/}/usr/$(get_libdir)/gtk-2.0/2.10.0/immodules.cache"
-		elog "Removing deprecated file."
-		rm -f ${EROOT%/}${GTK2_CONFDIR}/gtk.immodules
-	fi
-
-	# pixbufs are now handled by x11-libs/gdk-pixbuf
-	if [ -e "${EROOT%/}${GTK2_CONFDIR}/gdk-pixbuf.loaders" ]; then
-		elog "File ${EROOT%/}${GTK2_CONFDIR}/gdk-pixbuf.loaders is now handled by x11-libs/gdk-pixbuf"
-		elog "Removing deprecated file."
-		rm -f ${EROOT%/}${GTK2_CONFDIR}/gdk-pixbuf.loaders
-	fi
-
-	# two checks needed since we dropped multilib conditional
-	if [ -e "${EROOT%/}/etc/gtk-2.0/gdk-pixbuf.loaders" ]; then
-		elog "File ${EROOT%/}/etc/gtk-2.0/gdk-pixbuf.loaders is now handled by x11-libs/gdk-pixbuf"
-		elog "Removing deprecated file."
-		rm -f ${EROOT%/}/etc/gtk-2.0/gdk-pixbuf.loaders
-	fi
-
-	if [ -e "${EROOT%/}"/usr/lib/gtk-2.0/2.[^1]* ]; then
-		elog "You need to rebuild ebuilds that installed into" "${EROOT%/}"/usr/lib/gtk-2.0/2.[^1]*
-		elog "to do that you can use qfile from portage-utils:"
-		elog "emerge -va1 \$(qfile -qC ${EPREFIX}/usr/lib/gtk-2.0/2.[^1]*)"
-	fi
-
-	if ! has_version "app-text/evince"; then
-		elog "Please install app-text/evince for print preview functionality."
-		elog "Alternatively, check \"gtk-print-preview-command\" documentation and"
-		elog "add it to your gtkrc."
-	fi
-
-	readme.gentoo_print_elog
-}
diff --git a/x11-libs/gtk+/gtk+-2.24.27.ebuild b/x11-libs/gtk+/gtk+-2.24.27.ebuild
deleted file mode 100644
index 44d199680b72..000000000000
--- a/x11-libs/gtk+/gtk+-2.24.27.ebuild
+++ /dev/null
@@ -1,300 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="yes"
-GNOME2_LA_PUNT="yes"
-
-inherit autotools eutils flag-o-matic gnome2 multilib virtualx readme.gentoo multilib-minimal
-
-DESCRIPTION="Gimp ToolKit +"
-HOMEPAGE="http://www.gtk.org/"
-
-LICENSE="LGPL-2+"
-SLOT="2"
-IUSE="aqua cups examples +introspection test vim-syntax xinerama"
-REQUIRED_USE="
-	xinerama? ( !aqua )
-"
-
-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"
-
-# NOTE: cairo[svg] dep is due to bug 291283 (not patched to avoid eautoreconf)
-COMMON_DEPEND="
-	>=dev-libs/atk-2.10.0[introspection?,${MULTILIB_USEDEP}]
-	>=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]
-	>=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}]
-	>=x11-libs/cairo-1.12.14-r4:=[aqua?,svg,${MULTILIB_USEDEP}]
-	>=x11-libs/gdk-pixbuf-2.30.7:2[introspection?,${MULTILIB_USEDEP}]
-	>=x11-libs/pango-1.36.3[introspection?,${MULTILIB_USEDEP}]
-	x11-misc/shared-mime-info
-
-	cups? ( >=net-print/cups-1.7.1-r2:=[${MULTILIB_USEDEP}] )
-	introspection? ( >=dev-libs/gobject-introspection-0.9.3 )
-	!aqua? (
-		>=x11-libs/cairo-1.12.14-r4:=[X]
-		>=x11-libs/gdk-pixbuf-2.30.7:2[X]
-		>=x11-libs/libXrender-0.9.8[${MULTILIB_USEDEP}]
-		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libXi-1.7.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libXrandr-1.4.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libXcursor-1.1.14[${MULTILIB_USEDEP}]
-		>=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}]
-		>=x11-libs/libXcomposite-0.4.4-r1[${MULTILIB_USEDEP}]
-		>=x11-libs/libXdamage-1.1.4-r1[${MULTILIB_USEDEP}]
-		xinerama? ( >=x11-libs/libXinerama-1.1.3[${MULTILIB_USEDEP}] )
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	dev-libs/gobject-introspection-common
-	>=dev-util/gtk-doc-am-1.20
-	sys-devel/gettext
-	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
-	!aqua? (
-		>=x11-proto/xextproto-7.2.1-r1[${MULTILIB_USEDEP}]
-		>=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}]
-		>=x11-proto/inputproto-2.3[${MULTILIB_USEDEP}]
-		>=x11-proto/damageproto-1.2.1-r1[${MULTILIB_USEDEP}]
-		xinerama? ( >=x11-proto/xineramaproto-1.2.1-r1[${MULTILIB_USEDEP}] )
-	)
-	test? (
-		x11-themes/hicolor-icon-theme
-		media-fonts/font-misc-misc
-		media-fonts/font-cursor-misc )
-"
-
-# gtk+-2.24.8 breaks Alt key handling in <=x11-libs/vte-0.28.2:0
-# Add blocker against old gtk-builder-convert to be sure we maintain both
-# in sync.
-RDEPEND="${COMMON_DEPEND}
-	!<gnome-base/gail-1000
-	!<dev-util/gtk-builder-convert-${PV}
-	!<x11-libs/vte-0.28.2-r201:0
-	abi_x86_32? (
-		!<=app-emulation/emul-linux-x86-gtklibs-20140508
-		!app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)]
-	)
-"
-# librsvg for svg icons (PDEPEND to avoid circular dep), bug #547710
-PDEPEND="gnome-base/librsvg[${MULTILIB_USEDEP}]
-	vim-syntax? ( app-vim/gtk-syntax )
-"
-
-DISABLE_AUTOFORMATTING="yes"
-DOC_CONTENTS="To make the gtk2 file chooser use 'current directory' mode by default,
-edit ~/.config/gtk-2.0/gtkfilechooser.ini to contain the following:
-[Filechooser Settings]
-StartupMode=cwd"
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/gtk-query-immodules-2.0
-)
-
-strip_builddir() {
-	local rule=$1
-	shift
-	local directory=$1
-	shift
-	sed -e "s/^\(${rule} =.*\)${directory}\(.*\)$/\1\2/" -i $@ \
-		|| die "Could not strip director ${directory} from build."
-}
-
-set_gtk2_confdir() {
-	# An arch specific config directory is used on multilib systems
-	GTK2_CONFDIR="/etc/gtk-2.0/${CHOST}"
-}
-
-src_prepare() {
-	# Fix tests running when building out of sources, bug #510596, upstream bug #730319
-	epatch "${FILESDIR}"/${PN}-2.24.24-out-of-source.patch
-
-	# marshalers code was pre-generated with glib-2.31, upstream bug #662109
-	rm -v gdk/gdkmarshalers.c gtk/gtkmarshal.c gtk/gtkmarshalers.c \
-		perf/marshalers.c || die
-
-	# Stop trying to build unmaintained docs, bug #349754, upstream bug #623150
-	strip_builddir SUBDIRS tutorial docs/Makefile.{am,in}
-	strip_builddir SUBDIRS faq docs/Makefile.{am,in}
-
-	# -O3 and company cause random crashes in applications, bug #133469
-	replace-flags -O3 -O2
-	strip-flags
-
-	if ! use test ; then
-		# don't waste time building tests
-		strip_builddir SRC_SUBDIRS tests Makefile.{am,in}
-		strip_builddir SUBDIRS tests gdk/Makefile.{am,in} gtk/Makefile.{am,in}
-	else
-		# Non-working test in gentoo's env
-		sed 's:\(g_test_add_func ("/ui-tests/keys-events.*\):/*\1*/:g' \
-			-i gtk/tests/testing.c || die "sed 1 failed"
-
-		# Cannot work because glib is too clever to find real user's home
-		# gentoo bug #285687, upstream bug #639832
-		# XXX: /!\ Pay extra attention to second sed when bumping /!\
-		sed '/TEST_PROGS.*recentmanager/d' -i gtk/tests/Makefile.am \
-			|| die "failed to disable recentmanager test (1)"
-		sed '/^TEST_PROGS =/,+3 s/recentmanager//' -i gtk/tests/Makefile.in \
-			|| die "failed to disable recentmanager test (2)"
-		sed 's:\({ "GtkFileChooserButton".*},\):/*\1*/:g' -i gtk/tests/object.c \
-			|| die "failed to disable recentmanager test (3)"
-
-		# https://bugzilla.gnome.org/show_bug.cgi?id=617473
-		sed -i -e 's:pltcheck.sh:$(NULL):g' \
-			gtk/Makefile.am || die
-
-		# UI tests require immodules already installed; bug #413185
-		if ! has_version 'x11-libs/gtk+:2'; then
-			ewarn "Disabling UI tests because this is the first install of"
-			ewarn "gtk+:2 on this machine. Please re-run the tests after $P"
-			ewarn "has been installed."
-			sed '/g_test_add_func.*ui-tests/ d' \
-				-i gtk/tests/testing.c || die "sed 2 failed"
-		fi
-	fi
-
-	if ! use examples; then
-		# don't waste time building demos
-		strip_builddir SRC_SUBDIRS demos Makefile.{am,in}
-	fi
-
-	epatch_user
-
-	eautoreconf
-	gnome2_src_prepare
-}
-
-multilib_src_configure() {
-	[[ ${ABI} == ppc64 ]] && append-flags -mminimal-toc
-
-	ECONF_SOURCE=${S} \
-	gnome2_src_configure \
-		$(usex aqua --with-gdktarget=quartz --with-gdktarget=x11) \
-		$(usex aqua "" --with-xinput) \
-		$(use_enable cups cups auto) \
-		$(multilib_native_use_enable introspection) \
-		$(use_enable xinerama) \
-		--disable-papi \
-		CUPS_CONFIG="${EPREFIX}/usr/bin/${CHOST}-cups-config"
-
-	# work-around gtk-doc out-of-source brokedness
-	if multilib_is_native_abi; then
-		local d
-		for d in gdk gtk libgail-util; do
-			ln -s "${S}"/docs/reference/${d}/html docs/reference/${d}/html || die
-		done
-	fi
-}
-
-multilib_src_test() {
-	unset DBUS_SESSION_BUS_ADDRESS
-	Xemake check
-}
-
-multilib_src_install() {
-	gnome2_src_install
-
-	# add -framework Carbon to the .pc files
-	if use aqua ; then
-		for i in gtk+-2.0.pc gtk+-quartz-2.0.pc gtk+-unix-print-2.0.pc; do
-			sed -e "s:Libs\: :Libs\: -framework Carbon :" \
-				-i "${ED%/}"/usr/$(get_libdir)/pkgconfig/$i || die "sed failed"
-		done
-	fi
-}
-
-multilib_src_install_all() {
-	# see bug #133241
-	echo 'gtk-fallback-icon-theme = "gnome"' > "${T}/gtkrc"
-	insinto /usr/share/gtk-2.0
-	doins "${T}"/gtkrc
-
-	dodoc AUTHORS ChangeLog* HACKING NEWS* README*
-
-	# dev-util/gtk-builder-convert split off into a separate package, #402905
-	rm "${ED}"usr/bin/gtk-builder-convert || die
-
-	readme.gentoo_create_doc
-}
-
-pkg_preinst() {
-	gnome2_pkg_preinst
-
-	multilib_pkg_preinst() {
-		# Make immodules.cache belongs to gtk+ alone
-		local cache="usr/$(get_libdir)/gtk-2.0/2.10.0/immodules.cache"
-
-		if [[ -e ${EROOT}${cache} ]]; then
-			cp "${EROOT}"${cache} "${ED}"/${cache} || die
-		else
-			touch "${ED}"/${cache} || die
-		fi
-	}
-	multilib_parallel_foreach_abi multilib_pkg_preinst
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-
-	multilib_pkg_postinst() {
-		gnome2_query_immodules_gtk2 \
-			|| die "Update immodules cache failed (for ${ABI})"
-	}
-	multilib_parallel_foreach_abi multilib_pkg_postinst
-
-	set_gtk2_confdir
-
-	if [ -e "${EROOT%/}/etc/gtk-2.0/gtk.immodules" ]; then
-		elog "File /etc/gtk-2.0/gtk.immodules has been moved to \$CHOST"
-		elog "aware location. Removing deprecated file."
-		rm -f ${EROOT%/}/etc/gtk-2.0/gtk.immodules
-	fi
-
-	if [ -e "${EROOT%/}${GTK2_CONFDIR}/gtk.immodules" ]; then
-		elog "File /etc/gtk-2.0/gtk.immodules has been moved to"
-		elog "${EROOT%/}/usr/$(get_libdir)/gtk-2.0/2.10.0/immodules.cache"
-		elog "Removing deprecated file."
-		rm -f ${EROOT%/}${GTK2_CONFDIR}/gtk.immodules
-	fi
-
-	# pixbufs are now handled by x11-libs/gdk-pixbuf
-	if [ -e "${EROOT%/}${GTK2_CONFDIR}/gdk-pixbuf.loaders" ]; then
-		elog "File ${EROOT%/}${GTK2_CONFDIR}/gdk-pixbuf.loaders is now handled by x11-libs/gdk-pixbuf"
-		elog "Removing deprecated file."
-		rm -f ${EROOT%/}${GTK2_CONFDIR}/gdk-pixbuf.loaders
-	fi
-
-	# two checks needed since we dropped multilib conditional
-	if [ -e "${EROOT%/}/etc/gtk-2.0/gdk-pixbuf.loaders" ]; then
-		elog "File ${EROOT%/}/etc/gtk-2.0/gdk-pixbuf.loaders is now handled by x11-libs/gdk-pixbuf"
-		elog "Removing deprecated file."
-		rm -f ${EROOT%/}/etc/gtk-2.0/gdk-pixbuf.loaders
-	fi
-
-	if [ -e "${EROOT%/}"/usr/lib/gtk-2.0/2.[^1]* ]; then
-		elog "You need to rebuild ebuilds that installed into" "${EROOT%/}"/usr/lib/gtk-2.0/2.[^1]*
-		elog "to do that you can use qfile from portage-utils:"
-		elog "emerge -va1 \$(qfile -qC ${EPREFIX}/usr/lib/gtk-2.0/2.[^1]*)"
-	fi
-
-	if ! has_version "app-text/evince"; then
-		elog "Please install app-text/evince for print preview functionality."
-		elog "Alternatively, check \"gtk-print-preview-command\" documentation and"
-		elog "add it to your gtkrc."
-	fi
-
-	readme.gentoo_print_elog
-}
-
-pkg_postrm() {
-	gnome2_pkg_postrm
-
-	if [[ -z ${REPLACED_BY_VERSIONS} ]]; then
-		multilib_pkg_postrm() {
-			rm -f "${EROOT}"usr/$(get_libdir)/gtk-2.0/2.10.0/immodules.cache
-		}
-		multilib_foreach_abi multilib_pkg_postrm
-	fi
-}
diff --git a/x11-libs/gtk+/gtk+-3.12.2.ebuild b/x11-libs/gtk+/gtk+-3.12.2.ebuild
deleted file mode 100644
index 09ad0e1e3d66..000000000000
--- a/x11-libs/gtk+/gtk+-3.12.2.ebuild
+++ /dev/null
@@ -1,224 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-
-inherit eutils flag-o-matic gnome2 multilib virtualx
-
-DESCRIPTION="Gimp ToolKit +"
-HOMEPAGE="http://www.gtk.org/"
-
-LICENSE="LGPL-2+"
-SLOT="3"
-# NOTE: This gtk+ has multi-gdk-backend support, see:
-#  * https://blogs.gnome.org/kris/2010/12/29/gdk-3-0-on-mac-os-x/
-#  * https://mail.gnome.org/archives/gtk-devel-list/2010-November/msg00099.html
-# I tried this and got it all compiling, but the end result is unusable as it
-# horribly mixes up the backends -- grobian
-IUSE="aqua cloudprint colord cups debug examples +introspection test vim-syntax wayland X xinerama"
-REQUIRED_USE="
-	|| ( aqua wayland X )
-	xinerama? ( X )
-"
-
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-# FIXME: introspection data is built against system installation of gtk+:3
-# NOTE: cairo[svg] dep is due to bug 291283 (not patched to avoid eautoreconf)
-# Use gtk+:2 for gtk-update-icon-cache
-COMMON_DEPEND="
-	>=dev-libs/atk-2.7.5[introspection?]
-	>=dev-libs/glib-2.39.5:2
-	media-libs/fontconfig
-	>=x11-libs/cairo-1.12[aqua?,glib,svg,X?]
-	>=x11-libs/gdk-pixbuf-2.27.1:2[introspection?,X?]
-	>=x11-libs/gtk+-2.24:2
-	>=x11-libs/pango-1.32.4[introspection?]
-	x11-misc/shared-mime-info
-
-	cloudprint? (
-		>=net-libs/rest-0.7
-		>=dev-libs/json-glib-1.0 )
-	colord? ( >=x11-misc/colord-0.1.9:0= )
-	cups? ( >=net-print/cups-1.2 )
-	introspection? ( >=dev-libs/gobject-introspection-1.39 )
-	wayland? (
-		>=dev-libs/wayland-1.3.90
-		media-libs/mesa[wayland]
-		>=x11-libs/libxkbcommon-0.2
-	)
-	X? (
-		>=app-accessibility/at-spi2-atk-2.5.3
-		x11-libs/libXrender
-		x11-libs/libX11
-		>=x11-libs/libXi-1.3
-		x11-libs/libXext
-		>=x11-libs/libXrandr-1.3
-		x11-libs/libXcursor
-		x11-libs/libXfixes
-		x11-libs/libXcomposite
-		x11-libs/libXdamage
-		xinerama? ( x11-libs/libXinerama )
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	app-text/docbook-xsl-stylesheets
-	app-text/docbook-xml-dtd:4.1.2
-	dev-libs/libxslt
-	dev-util/gdbus-codegen
-	>=dev-util/gtk-doc-am-1.20
-	sys-devel/gettext
-	virtual/pkgconfig
-	X? (
-		x11-proto/xextproto
-		x11-proto/xproto
-		x11-proto/inputproto
-		x11-proto/damageproto
-		xinerama? ( x11-proto/xineramaproto )
-	)
-	test? (
-		media-fonts/font-misc-misc
-		media-fonts/font-cursor-misc )
-"
-# gtk+-3.2.2 breaks Alt key handling in <=x11-libs/vte-0.30.1:2.90
-# gtk+-3.3.18 breaks scrolling in <=x11-libs/vte-0.31.0:2.90
-# >=xorg-server-1.11.4 needed for
-#  https://mail.gnome.org/archives/desktop-devel-list/2012-March/msg00024.html
-RDEPEND="${COMMON_DEPEND}
-	!<gnome-base/gail-1000
-	!<x11-libs/vte-0.31.0:2.90
-	X? ( !<x11-base/xorg-server-1.11.4 )
-"
-PDEPEND="vim-syntax? ( app-vim/gtk-syntax )"
-
-strip_builddir() {
-	local rule=$1
-	shift
-	local directory=$1
-	shift
-	sed -e "s/^\(${rule} =.*\)${directory}\(.*\)$/\1\2/" -i $@ \
-		|| die "Could not strip director ${directory} from build."
-}
-
-src_prepare() {
-	# -O3 and company cause random crashes in applications. Bug #133469
-	replace-flags -O3 -O2
-	strip-flags
-
-	# Build fix on Darwin 10.6; bug #519058
-	epatch "${FILESDIR}/${P}-darwin10.6.patch"
-
-	if ! use test ; then
-		# don't waste time building tests
-		strip_builddir SRC_SUBDIRS testsuite Makefile.am
-		strip_builddir SRC_SUBDIRS testsuite Makefile.in
-		strip_builddir SRC_SUBDIRS tests Makefile.am
-		strip_builddir SRC_SUBDIRS tests Makefile.in
-	fi
-
-	if ! use examples; then
-		# don't waste time building demos
-		strip_builddir SRC_SUBDIRS demos Makefile.am
-		strip_builddir SRC_SUBDIRS demos Makefile.in
-		strip_builddir SRC_SUBDIRS examples Makefile.am
-		strip_builddir SRC_SUBDIRS examples Makefile.in
-	fi
-
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# Passing --disable-debug is not recommended for production use
-	# need libdir here to avoid a double slash in a path that libtool doesn't
-	# grok so well during install (// between $EPREFIX and usr ...)
-	gnome2_src_configure \
-		$(use_enable aqua quartz-backend) \
-		$(use_enable cloudprint) \
-		$(use_enable colord) \
-		$(use_enable cups cups auto) \
-		$(usex debug --enable-debug=yes "") \
-		$(use_enable introspection) \
-		$(use_enable wayland wayland-backend) \
-		$(use_enable X x11-backend) \
-		$(use_enable X xcomposite) \
-		$(use_enable X xdamage) \
-		$(use_enable X xfixes) \
-		$(use_enable X xkb) \
-		$(use_enable X xrandr) \
-		$(use_enable xinerama) \
-		--disable-papi \
-		--enable-man \
-		--enable-gtk2-dependency \
-		--with-xml-catalog="${EPREFIX}"/etc/xml/catalog \
-		--libdir="${EPREFIX}"/usr/$(get_libdir)
-}
-
-src_test() {
-	# Tests require a new gnome-themes-standard, but adding it to DEPEND
-	# would result in circular dependencies.
-	# https://bugzilla.gnome.org/show_bug.cgi?id=669562
-	if ! has_version '>=x11-themes/gnome-themes-standard-3.6[gtk]'; then
-		ewarn "Tests will be skipped because >=gnome-themes-standard-3.6[gtk]"
-		ewarn "is not installed. Please re-run tests after installing the"
-		ewarn "required version of gnome-themes-standard."
-		return 0
-	fi
-
-	# FIXME: this should be handled at eclass level
-	"${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/gtk" || die
-
-	unset DBUS_SESSION_BUS_ADDRESS
-	GSETTINGS_SCHEMA_DIR="${S}/gtk" Xemake check
-}
-
-src_install() {
-	gnome2_src_install
-
-	insinto /etc/gtk-3.0
-	doins "${FILESDIR}"/settings.ini
-
-	dodoc AUTHORS ChangeLog* HACKING NEWS* README*
-
-	# add -framework Carbon to the .pc files
-	if use aqua ; then
-		for i in gtk+-3.0.pc gtk+-quartz-3.0.pc gtk+-unix-print-3.0.pc; do
-			sed -e "s:Libs\: :Libs\: -framework Carbon :" \
-				-i "${ED}"usr/$(get_libdir)/pkgconfig/$i || die "sed failed"
-		done
-	fi
-}
-
-pkg_preinst() {
-	gnome2_pkg_preinst
-
-	# Make sure loaders.cache belongs to gdk-pixbuf alone
-	local cache="usr/$(get_libdir)/gtk-3.0/3.0.0/immodules.cache"
-
-	if [[ -e ${EROOT}${cache} ]]; then
-		cp "${EROOT}"${cache} "${ED}"/${cache} || die
-	else
-		touch "${ED}"/${cache} || die
-	fi
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	gnome2_query_immodules_gtk3
-
-	if ! has_version "app-text/evince"; then
-		elog "Please install app-text/evince for print preview functionality."
-		elog "Alternatively, check \"gtk-print-preview-command\" documentation and"
-		elog "add it to your settings.ini file."
-	fi
-}
-
-pkg_postrm() {
-	gnome2_pkg_postrm
-
-	if [[ -z ${REPLACED_BY_VERSIONS} ]]; then
-		rm -f "${EROOT}"usr/$(get_libdir)/gtk-3.0/3.0.0/immodules.cache
-	fi
-}
diff --git a/x11-libs/gtk+/gtk+-3.14.9.ebuild b/x11-libs/gtk+/gtk+-3.14.9.ebuild
deleted file mode 100644
index bd1434aa99ae..000000000000
--- a/x11-libs/gtk+/gtk+-3.14.9.ebuild
+++ /dev/null
@@ -1,244 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="yes"
-GNOME2_LA_PUNT="yes"
-
-inherit autotools eutils flag-o-matic gnome2 multilib virtualx multilib-minimal
-
-DESCRIPTION="Gimp ToolKit +"
-HOMEPAGE="http://www.gtk.org/"
-
-LICENSE="LGPL-2+"
-SLOT="3"
-IUSE="aqua broadway cloudprint colord cups examples +introspection test vim-syntax wayland X xinerama"
-REQUIRED_USE="
-	|| ( aqua wayland X )
-	xinerama? ( X )
-"
-
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-# FIXME: introspection data is built against system installation of gtk+:3
-# NOTE: cairo[svg] dep is due to bug 291283 (not patched to avoid eautoreconf)
-# Use gtk+:2 for gtk-update-icon-cache
-COMMON_DEPEND="
-	>=dev-libs/atk-2.12[introspection?,${MULTILIB_USEDEP}]
-	>=dev-libs/glib-2.41.2:2[${MULTILIB_USEDEP}]
-	media-libs/fontconfig[${MULTILIB_USEDEP}]
-	>=x11-libs/cairo-1.12[aqua?,glib,svg,X?,${MULTILIB_USEDEP}]
-	>=x11-libs/gdk-pixbuf-2.30:2[introspection?,X?,${MULTILIB_USEDEP}]
-	>=x11-libs/gtk+-2.24:2[${MULTILIB_USEDEP}]
-	>=x11-libs/pango-1.36.7[introspection?,${MULTILIB_USEDEP}]
-	x11-misc/shared-mime-info
-
-	cloudprint? (
-		>=net-libs/rest-0.7[${MULTILIB_USEDEP}]
-		>=dev-libs/json-glib-1.0[${MULTILIB_USEDEP}] )
-	colord? ( >=x11-misc/colord-0.1.9:0=[${MULTILIB_USEDEP}] )
-	cups? ( >=net-print/cups-1.2[${MULTILIB_USEDEP}] )
-	introspection? ( >=dev-libs/gobject-introspection-1.39 )
-	wayland? (
-		>=dev-libs/wayland-1.5.91[${MULTILIB_USEDEP}]
-		media-libs/mesa[wayland,${MULTILIB_USEDEP}]
-		>=x11-libs/libxkbcommon-0.2[${MULTILIB_USEDEP}]
-	)
-	X? (
-		>=app-accessibility/at-spi2-atk-2.5.3[${MULTILIB_USEDEP}]
-		x11-libs/libXrender[${MULTILIB_USEDEP}]
-		x11-libs/libX11[${MULTILIB_USEDEP}]
-		>=x11-libs/libXi-1.3[${MULTILIB_USEDEP}]
-		x11-libs/libXext[${MULTILIB_USEDEP}]
-		>=x11-libs/libXrandr-1.3[${MULTILIB_USEDEP}]
-		x11-libs/libXcursor[${MULTILIB_USEDEP}]
-		x11-libs/libXfixes[${MULTILIB_USEDEP}]
-		x11-libs/libXcomposite[${MULTILIB_USEDEP}]
-		x11-libs/libXdamage[${MULTILIB_USEDEP}]
-		xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	app-text/docbook-xsl-stylesheets
-	app-text/docbook-xml-dtd:4.1.2
-	dev-libs/libxslt
-	dev-libs/gobject-introspection-common
-	>=dev-util/gdbus-codegen-2.38.2
-	>=dev-util/gtk-doc-am-1.20
-	sys-devel/gettext
-	virtual/pkgconfig[${MULTILIB_USEDEP}]
-	X? (
-		x11-proto/xextproto[${MULTILIB_USEDEP}]
-		x11-proto/xproto[${MULTILIB_USEDEP}]
-		x11-proto/inputproto[${MULTILIB_USEDEP}]
-		x11-proto/damageproto[${MULTILIB_USEDEP}]
-		xinerama? ( x11-proto/xineramaproto[${MULTILIB_USEDEP}] )
-	)
-	test? (
-		media-fonts/font-misc-misc
-		media-fonts/font-cursor-misc )
-"
-# gtk+-3.2.2 breaks Alt key handling in <=x11-libs/vte-0.30.1:2.90
-# gtk+-3.3.18 breaks scrolling in <=x11-libs/vte-0.31.0:2.90
-# >=xorg-server-1.11.4 needed for
-#  https://mail.gnome.org/archives/desktop-devel-list/2012-March/msg00024.html
-RDEPEND="${COMMON_DEPEND}
-	!<gnome-base/gail-1000
-	!<x11-libs/vte-0.31.0:2.90
-	>=x11-themes/adwaita-icon-theme-3.14
-	X? ( !<x11-base/xorg-server-1.11.4 )
-	abi_x86_32? (
-		!<=app-emulation/emul-linux-x86-gtklibs-20140508-r3
-		!app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)]
-	)
-"
-# librsvg for svg icons (PDEPEND to avoid circular dep), bug #547710
-PDEPEND="gnome-base/librsvg[${MULTILIB_USEDEP}]
-	vim-syntax? ( app-vim/gtk-syntax )
-"
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/gtk-query-immodules-3.0
-)
-
-strip_builddir() {
-	local rule=$1
-	shift
-	local directory=$1
-	shift
-	sed -e "s/^\(${rule} =.*\)${directory}\(.*\)$/\1\2/" -i $@ \
-		|| die "Could not strip director ${directory} from build."
-}
-
-src_prepare() {
-	# https://bugzilla.gnome.org/show_bug.cgi?id=738835
-	epatch "${FILESDIR}"/${PN}-non-bash-support.patch
-
-	# -O3 and company cause random crashes in applications. Bug #133469
-	replace-flags -O3 -O2
-	strip-flags
-
-	if ! use test ; then
-		# don't waste time building tests
-		strip_builddir SRC_SUBDIRS testsuite Makefile.{am,in}
-		strip_builddir SRC_SUBDIRS tests Makefile.{am,in}
-	fi
-
-	if ! use examples; then
-		# don't waste time building demos
-		strip_builddir SRC_SUBDIRS demos Makefile.{am,in}
-		strip_builddir SRC_SUBDIRS examples Makefile.{am,in}
-	fi
-
-	epatch_user
-
-	eautoreconf
-	gnome2_src_prepare
-}
-
-multilib_src_configure() {
-	# need libdir here to avoid a double slash in a path that libtool doesn't
-	# grok so well during install (// between $EPREFIX and usr ...)
-	ECONF_SOURCE=${S} \
-	gnome2_src_configure \
-		$(use_enable aqua quartz-backend) \
-		$(use_enable broadway broadway-backend) \
-		$(use_enable cloudprint) \
-		$(use_enable colord) \
-		$(use_enable cups cups auto) \
-		$(multilib_native_use_enable introspection) \
-		$(use_enable wayland wayland-backend) \
-		$(use_enable X x11-backend) \
-		$(use_enable X xcomposite) \
-		$(use_enable X xdamage) \
-		$(use_enable X xfixes) \
-		$(use_enable X xkb) \
-		$(use_enable X xrandr) \
-		$(use_enable xinerama) \
-		--disable-papi \
-		--enable-man \
-		--enable-gtk2-dependency \
-		--with-xml-catalog="${EPREFIX}"/etc/xml/catalog \
-		--libdir="${EPREFIX}"/usr/$(get_libdir) \
-		CUPS_CONFIG="${EPREFIX}/usr/bin/${CHOST}-cups-config"
-
-	# work-around gtk-doc out-of-source brokedness
-	if multilib_is_native_abi; then
-		local d
-		for d in gdk gtk libgail-util; do
-			ln -s "${S}"/docs/reference/${d}/html docs/reference/${d}/html || die
-		done
-	fi
-}
-
-multilib_src_test() {
-	# FIXME: this should be handled at eclass level
-	"${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/gtk" || die
-
-	unset DBUS_SESSION_BUS_ADDRESS
-	unset DISPLAY #527682
-	GSETTINGS_SCHEMA_DIR="${S}/gtk" Xemake check
-}
-
-multilib_src_install() {
-	gnome2_src_install
-
-	# add -framework Carbon to the .pc files, bug #????
-	if use aqua ; then
-		for i in gtk+-3.0.pc gtk+-quartz-3.0.pc gtk+-unix-print-3.0.pc; do
-			sed -e "s:Libs\: :Libs\: -framework Carbon :" \
-				-i "${ED%/}"/usr/$(get_libdir)/pkgconfig/$i || die "sed failed"
-		done
-	fi
-}
-
-multilib_src_install_all() {
-	insinto /etc/gtk-3.0
-	doins "${FILESDIR}"/settings.ini
-
-	dodoc AUTHORS ChangeLog* HACKING NEWS* README*
-}
-
-pkg_preinst() {
-	gnome2_pkg_preinst
-
-	multilib_pkg_preinst() {
-		# Make immodules.cache belongs to gtk+ alone
-		local cache="usr/$(get_libdir)/gtk-3.0/3.0.0/immodules.cache"
-
-		if [[ -e ${EROOT}${cache} ]]; then
-			cp "${EROOT}"${cache} "${ED}"/${cache} || die
-		else
-			touch "${ED}"/${cache} || die
-		fi
-	}
-	multilib_parallel_foreach_abi multilib_pkg_preinst
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-
-	multilib_pkg_postinst() {
-		gnome2_query_immodules_gtk3 \
-			|| die "Update immodules cache failed (for ${ABI})"
-	}
-	multilib_parallel_foreach_abi multilib_pkg_postinst
-
-	if ! has_version "app-text/evince"; then
-		elog "Please install app-text/evince for print preview functionality."
-		elog "Alternatively, check \"gtk-print-preview-command\" documentation and"
-		elog "add it to your settings.ini file."
-	fi
-}
-
-pkg_postrm() {
-	gnome2_pkg_postrm
-
-	if [[ -z ${REPLACED_BY_VERSIONS} ]]; then
-		multilib_pkg_postrm() {
-			rm -f "${EROOT}"usr/$(get_libdir)/gtk-3.0/3.0.0/immodules.cache
-		}
-		multilib_foreach_abi multilib_pkg_postrm
-	fi
-}
diff --git a/x11-libs/gtk+/gtk+-3.16.4.ebuild b/x11-libs/gtk+/gtk+-3.16.4.ebuild
deleted file mode 100644
index c989e870a8e1..000000000000
--- a/x11-libs/gtk+/gtk+-3.16.4.ebuild
+++ /dev/null
@@ -1,249 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="yes"
-GNOME2_LA_PUNT="yes"
-
-inherit autotools eutils flag-o-matic gnome2 multilib virtualx multilib-minimal
-
-DESCRIPTION="Gimp ToolKit +"
-HOMEPAGE="http://www.gtk.org/"
-
-LICENSE="LGPL-2+"
-SLOT="3"
-IUSE="aqua broadway cloudprint colord cups examples +introspection test vim-syntax wayland X xinerama"
-REQUIRED_USE="
-	|| ( aqua wayland X )
-	xinerama? ( X )
-"
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-# FIXME: introspection data is built against system installation of gtk+:3
-# NOTE: cairo[svg] dep is due to bug 291283 (not patched to avoid eautoreconf)
-COMMON_DEPEND="
-	>=dev-libs/atk-2.15[introspection?,${MULTILIB_USEDEP}]
-	>=dev-libs/glib-2.43.4:2[${MULTILIB_USEDEP}]
-	media-libs/fontconfig[${MULTILIB_USEDEP}]
-	>=media-libs/libepoxy-1.0[${MULTILIB_USEDEP}]
-	>=x11-libs/cairo-1.14[aqua?,glib,svg,X?,${MULTILIB_USEDEP}]
-	>=x11-libs/gdk-pixbuf-2.30:2[introspection?,X?,${MULTILIB_USEDEP}]
-	>=x11-libs/pango-1.36.7[introspection?,${MULTILIB_USEDEP}]
-	x11-misc/shared-mime-info
-
-	cloudprint? (
-		>=net-libs/rest-0.7[${MULTILIB_USEDEP}]
-		>=dev-libs/json-glib-1.0[${MULTILIB_USEDEP}] )
-	colord? ( >=x11-misc/colord-0.1.9:0=[${MULTILIB_USEDEP}] )
-	cups? ( >=net-print/cups-1.2[${MULTILIB_USEDEP}] )
-	introspection? ( >=dev-libs/gobject-introspection-1.39 )
-	wayland? (
-		>=dev-libs/wayland-1.5.91[${MULTILIB_USEDEP}]
-		media-libs/mesa[wayland,${MULTILIB_USEDEP}]
-		>=x11-libs/libxkbcommon-0.2[${MULTILIB_USEDEP}]
-	)
-	X? (
-		>=app-accessibility/at-spi2-atk-2.5.3[${MULTILIB_USEDEP}]
-		x11-libs/libXrender[${MULTILIB_USEDEP}]
-		x11-libs/libX11[${MULTILIB_USEDEP}]
-		>=x11-libs/libXi-1.3[${MULTILIB_USEDEP}]
-		x11-libs/libXext[${MULTILIB_USEDEP}]
-		>=x11-libs/libXrandr-1.3[${MULTILIB_USEDEP}]
-		x11-libs/libXcursor[${MULTILIB_USEDEP}]
-		x11-libs/libXfixes[${MULTILIB_USEDEP}]
-		x11-libs/libXcomposite[${MULTILIB_USEDEP}]
-		x11-libs/libXdamage[${MULTILIB_USEDEP}]
-		xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	app-text/docbook-xsl-stylesheets
-	app-text/docbook-xml-dtd:4.1.2
-	dev-libs/libxslt
-	dev-libs/gobject-introspection-common
-	>=dev-util/gdbus-codegen-2.38.2
-	>=dev-util/gtk-doc-am-1.20
-	>=sys-devel/gettext-0.18.3[${MULTILIB_USEDEP}]
-	virtual/pkgconfig[${MULTILIB_USEDEP}]
-	X? (
-		x11-proto/xextproto[${MULTILIB_USEDEP}]
-		x11-proto/xproto[${MULTILIB_USEDEP}]
-		x11-proto/inputproto[${MULTILIB_USEDEP}]
-		x11-proto/damageproto[${MULTILIB_USEDEP}]
-		xinerama? ( x11-proto/xineramaproto[${MULTILIB_USEDEP}] )
-	)
-	test? (
-		media-fonts/font-misc-misc
-		media-fonts/font-cursor-misc )
-	examples? ( media-libs/libcanberra[gtk3] )
-"
-# gtk+-3.2.2 breaks Alt key handling in <=x11-libs/vte-0.30.1:2.90
-# gtk+-3.3.18 breaks scrolling in <=x11-libs/vte-0.31.0:2.90
-# >=xorg-server-1.11.4 needed for
-#  https://mail.gnome.org/archives/desktop-devel-list/2012-March/msg00024.html
-RDEPEND="${COMMON_DEPEND}
-	>=dev-util/gtk-update-icon-cache-3
-	!<gnome-base/gail-1000
-	!<x11-libs/vte-0.31.0:2.90
-	>=x11-themes/adwaita-icon-theme-3.14
-	X? ( !<x11-base/xorg-server-1.11.4 )
-	abi_x86_32? (
-		!<=app-emulation/emul-linux-x86-gtklibs-20140508-r3
-		!app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)]
-	)
-"
-# librsvg for svg icons (PDEPEND to avoid circular dep), bug #547710
-PDEPEND="
-	gnome-base/librsvg[${MULTILIB_USEDEP}]
-	vim-syntax? ( app-vim/gtk-syntax )
-"
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/gtk-query-immodules-3.0
-)
-
-strip_builddir() {
-	local rule=$1
-	shift
-	local directory=$1
-	shift
-	sed -e "s/^\(${rule} =.*\)${directory}\(.*\)$/\1\2/" -i $@ \
-		|| die "Could not strip director ${directory} from build."
-}
-
-src_prepare() {
-	# -O3 and company cause random crashes in applications. Bug #133469
-	replace-flags -O3 -O2
-	strip-flags
-
-	if ! use test ; then
-		# don't waste time building tests
-		strip_builddir SRC_SUBDIRS testsuite Makefile.{am,in}
-
-		# the tests dir needs to be build now because since commit
-		# 7ff3c6df80185e165e3bf6aa31bd014d1f8bf224 tests/gtkgears.o needs to be there
-		# strip_builddir SRC_SUBDIRS tests Makefile.{am,in}
-	fi
-
-	if ! use examples; then
-		# don't waste time building demos
-		strip_builddir SRC_SUBDIRS demos Makefile.{am,in}
-		strip_builddir SRC_SUBDIRS examples Makefile.{am,in}
-	fi
-
-	# gtk-update-icon-cache is installed by dev-util/gtk-update-icon-cache 
-	epatch "${FILESDIR}"/${PN}-3.16.2-remove_update-icon-cache.patch
-
-	epatch_user
-
-	eautoreconf
-	gnome2_src_prepare
-}
-
-multilib_src_configure() {
-	# need libdir here to avoid a double slash in a path that libtool doesn't
-	# grok so well during install (// between $EPREFIX and usr ...)
-	ECONF_SOURCE=${S} \
-	gnome2_src_configure \
-		$(use_enable aqua quartz-backend) \
-		$(use_enable broadway broadway-backend) \
-		$(use_enable cloudprint) \
-		$(use_enable colord) \
-		$(use_enable cups cups auto) \
-		$(multilib_native_use_enable introspection) \
-		$(use_enable wayland wayland-backend) \
-		$(use_enable X x11-backend) \
-		$(use_enable X xcomposite) \
-		$(use_enable X xdamage) \
-		$(use_enable X xfixes) \
-		$(use_enable X xkb) \
-		$(use_enable X xrandr) \
-		$(use_enable xinerama) \
-		--disable-papi \
-		--disable-mir-backend \
-		--enable-man \
-		--with-xml-catalog="${EPREFIX}"/etc/xml/catalog \
-		--libdir="${EPREFIX}"/usr/$(get_libdir) \
-		CUPS_CONFIG="${EPREFIX}/usr/bin/${CHOST}-cups-config"
-
-	# work-around gtk-doc out-of-source brokedness
-	if multilib_is_native_abi; then
-		local d
-		for d in gdk gtk libgail-util; do
-			ln -s "${S}"/docs/reference/${d}/html docs/reference/${d}/html || die
-		done
-	fi
-}
-
-multilib_src_test() {
-	# FIXME: this should be handled at eclass level
-	"${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/gtk" || die
-
-	unset DBUS_SESSION_BUS_ADDRESS
-	unset DISPLAY #527682
-	GSETTINGS_SCHEMA_DIR="${S}/gtk" Xemake check
-}
-
-multilib_src_install() {
-	gnome2_src_install
-
-	# add -framework Carbon to the .pc files, bug #???
-	if use aqua ; then
-		for i in gtk+-3.0.pc gtk+-quartz-3.0.pc gtk+-unix-print-3.0.pc; do
-			sed -e "s:Libs\: :Libs\: -framework Carbon :" \
-				-i "${ED%/}"/usr/$(get_libdir)/pkgconfig/$i || die "sed failed"
-		done
-	fi
-}
-
-multilib_src_install_all() {
-	insinto /etc/gtk-3.0
-	doins "${FILESDIR}"/settings.ini
-
-	dodoc AUTHORS ChangeLog* HACKING NEWS* README*
-}
-
-pkg_preinst() {
-	gnome2_pkg_preinst
-
-	multilib_pkg_preinst() {
-		# Make immodules.cache belongs to gtk+ alone
-		local cache="usr/$(get_libdir)/gtk-3.0/3.0.0/immodules.cache"
-
-		if [[ -e ${EROOT}${cache} ]]; then
-			cp "${EROOT}"${cache} "${ED}"/${cache} || die
-		else
-			touch "${ED}"/${cache} || die
-		fi
-	}
-	multilib_parallel_foreach_abi multilib_pkg_preinst
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-
-	multilib_pkg_postinst() {
-		gnome2_query_immodules_gtk3 \
-			|| die "Update immodules cache failed (for ${ABI})"
-	}
-	multilib_parallel_foreach_abi multilib_pkg_postinst
-
-	if ! has_version "app-text/evince"; then
-		elog "Please install app-text/evince for print preview functionality."
-		elog "Alternatively, check \"gtk-print-preview-command\" documentation and"
-		elog "add it to your settings.ini file."
-	fi
-}
-
-pkg_postrm() {
-	gnome2_pkg_postrm
-
-	if [[ -z ${REPLACED_BY_VERSIONS} ]]; then
-		multilib_pkg_postrm() {
-			rm -f "${EROOT}"usr/$(get_libdir)/gtk-3.0/3.0.0/immodules.cache
-		}
-		multilib_foreach_abi multilib_pkg_postrm
-	fi
-}
diff --git a/x11-libs/gtk+/gtk+-3.16.6.ebuild b/x11-libs/gtk+/gtk+-3.16.6.ebuild
new file mode 100644
index 000000000000..d9dd8c209b65
--- /dev/null
+++ b/x11-libs/gtk+/gtk+-3.16.6.ebuild
@@ -0,0 +1,249 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="yes"
+GNOME2_LA_PUNT="yes"
+
+inherit autotools eutils flag-o-matic gnome2 multilib virtualx multilib-minimal
+
+DESCRIPTION="Gimp ToolKit +"
+HOMEPAGE="http://www.gtk.org/"
+
+LICENSE="LGPL-2+"
+SLOT="3"
+IUSE="aqua broadway cloudprint colord cups examples +introspection test vim-syntax wayland X xinerama"
+REQUIRED_USE="
+	|| ( aqua wayland X )
+	xinerama? ( X )
+"
+
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+# FIXME: introspection data is built against system installation of gtk+:3
+# NOTE: cairo[svg] dep is due to bug 291283 (not patched to avoid eautoreconf)
+COMMON_DEPEND="
+	>=dev-libs/atk-2.15[introspection?,${MULTILIB_USEDEP}]
+	>=dev-libs/glib-2.43.4:2[${MULTILIB_USEDEP}]
+	media-libs/fontconfig[${MULTILIB_USEDEP}]
+	>=media-libs/libepoxy-1.0[${MULTILIB_USEDEP}]
+	>=x11-libs/cairo-1.14[aqua?,glib,svg,X?,${MULTILIB_USEDEP}]
+	>=x11-libs/gdk-pixbuf-2.30:2[introspection?,X?,${MULTILIB_USEDEP}]
+	>=x11-libs/pango-1.36.7[introspection?,${MULTILIB_USEDEP}]
+	x11-misc/shared-mime-info
+
+	cloudprint? (
+		>=net-libs/rest-0.7[${MULTILIB_USEDEP}]
+		>=dev-libs/json-glib-1.0[${MULTILIB_USEDEP}] )
+	colord? ( >=x11-misc/colord-0.1.9:0=[${MULTILIB_USEDEP}] )
+	cups? ( >=net-print/cups-1.2[${MULTILIB_USEDEP}] )
+	introspection? ( >=dev-libs/gobject-introspection-1.39:= )
+	wayland? (
+		>=dev-libs/wayland-1.5.91[${MULTILIB_USEDEP}]
+		media-libs/mesa[wayland,${MULTILIB_USEDEP}]
+		>=x11-libs/libxkbcommon-0.2[${MULTILIB_USEDEP}]
+	)
+	X? (
+		>=app-accessibility/at-spi2-atk-2.5.3[${MULTILIB_USEDEP}]
+		x11-libs/libXrender[${MULTILIB_USEDEP}]
+		x11-libs/libX11[${MULTILIB_USEDEP}]
+		>=x11-libs/libXi-1.3[${MULTILIB_USEDEP}]
+		x11-libs/libXext[${MULTILIB_USEDEP}]
+		>=x11-libs/libXrandr-1.3[${MULTILIB_USEDEP}]
+		x11-libs/libXcursor[${MULTILIB_USEDEP}]
+		x11-libs/libXfixes[${MULTILIB_USEDEP}]
+		x11-libs/libXcomposite[${MULTILIB_USEDEP}]
+		x11-libs/libXdamage[${MULTILIB_USEDEP}]
+		xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	app-text/docbook-xsl-stylesheets
+	app-text/docbook-xml-dtd:4.1.2
+	dev-libs/libxslt
+	dev-libs/gobject-introspection-common
+	>=dev-util/gdbus-codegen-2.38.2
+	>=dev-util/gtk-doc-am-1.20
+	>=sys-devel/gettext-0.18.3[${MULTILIB_USEDEP}]
+	virtual/pkgconfig[${MULTILIB_USEDEP}]
+	X? (
+		x11-proto/xextproto[${MULTILIB_USEDEP}]
+		x11-proto/xproto[${MULTILIB_USEDEP}]
+		x11-proto/inputproto[${MULTILIB_USEDEP}]
+		x11-proto/damageproto[${MULTILIB_USEDEP}]
+		xinerama? ( x11-proto/xineramaproto[${MULTILIB_USEDEP}] )
+	)
+	test? (
+		media-fonts/font-misc-misc
+		media-fonts/font-cursor-misc )
+	examples? ( media-libs/libcanberra[gtk3] )
+"
+# gtk+-3.2.2 breaks Alt key handling in <=x11-libs/vte-0.30.1:2.90
+# gtk+-3.3.18 breaks scrolling in <=x11-libs/vte-0.31.0:2.90
+# >=xorg-server-1.11.4 needed for
+#  https://mail.gnome.org/archives/desktop-devel-list/2012-March/msg00024.html
+RDEPEND="${COMMON_DEPEND}
+	>=dev-util/gtk-update-icon-cache-3
+	!<gnome-base/gail-1000
+	!<x11-libs/vte-0.31.0:2.90
+	>=x11-themes/adwaita-icon-theme-3.14
+	X? ( !<x11-base/xorg-server-1.11.4 )
+	abi_x86_32? (
+		!<=app-emulation/emul-linux-x86-gtklibs-20140508-r3
+		!app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)]
+	)
+"
+# librsvg for svg icons (PDEPEND to avoid circular dep), bug #547710
+PDEPEND="
+	gnome-base/librsvg[${MULTILIB_USEDEP}]
+	vim-syntax? ( app-vim/gtk-syntax )
+"
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/gtk-query-immodules-3.0
+)
+
+strip_builddir() {
+	local rule=$1
+	shift
+	local directory=$1
+	shift
+	sed -e "s/^\(${rule} =.*\)${directory}\(.*\)$/\1\2/" -i $@ \
+		|| die "Could not strip director ${directory} from build."
+}
+
+src_prepare() {
+	# -O3 and company cause random crashes in applications. Bug #133469
+	replace-flags -O3 -O2
+	strip-flags
+
+	if ! use test ; then
+		# don't waste time building tests
+		strip_builddir SRC_SUBDIRS testsuite Makefile.{am,in}
+
+		# the tests dir needs to be build now because since commit
+		# 7ff3c6df80185e165e3bf6aa31bd014d1f8bf224 tests/gtkgears.o needs to be there
+		# strip_builddir SRC_SUBDIRS tests Makefile.{am,in}
+	fi
+
+	if ! use examples; then
+		# don't waste time building demos
+		strip_builddir SRC_SUBDIRS demos Makefile.{am,in}
+		strip_builddir SRC_SUBDIRS examples Makefile.{am,in}
+	fi
+
+	# gtk-update-icon-cache is installed by dev-util/gtk-update-icon-cache 
+	epatch "${FILESDIR}"/${PN}-3.16.2-remove_update-icon-cache.patch
+
+	epatch_user
+
+	eautoreconf
+	gnome2_src_prepare
+}
+
+multilib_src_configure() {
+	# need libdir here to avoid a double slash in a path that libtool doesn't
+	# grok so well during install (// between $EPREFIX and usr ...)
+	ECONF_SOURCE=${S} \
+	gnome2_src_configure \
+		$(use_enable aqua quartz-backend) \
+		$(use_enable broadway broadway-backend) \
+		$(use_enable cloudprint) \
+		$(use_enable colord) \
+		$(use_enable cups cups auto) \
+		$(multilib_native_use_enable introspection) \
+		$(use_enable wayland wayland-backend) \
+		$(use_enable X x11-backend) \
+		$(use_enable X xcomposite) \
+		$(use_enable X xdamage) \
+		$(use_enable X xfixes) \
+		$(use_enable X xkb) \
+		$(use_enable X xrandr) \
+		$(use_enable xinerama) \
+		--disable-papi \
+		--disable-mir-backend \
+		--enable-man \
+		--with-xml-catalog="${EPREFIX}"/etc/xml/catalog \
+		--libdir="${EPREFIX}"/usr/$(get_libdir) \
+		CUPS_CONFIG="${EPREFIX}/usr/bin/${CHOST}-cups-config"
+
+	# work-around gtk-doc out-of-source brokedness
+	if multilib_is_native_abi; then
+		local d
+		for d in gdk gtk libgail-util; do
+			ln -s "${S}"/docs/reference/${d}/html docs/reference/${d}/html || die
+		done
+	fi
+}
+
+multilib_src_test() {
+	# FIXME: this should be handled at eclass level
+	"${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/gtk" || die
+
+	unset DBUS_SESSION_BUS_ADDRESS
+	unset DISPLAY #527682
+	GSETTINGS_SCHEMA_DIR="${S}/gtk" Xemake check
+}
+
+multilib_src_install() {
+	gnome2_src_install
+
+	# add -framework Carbon to the .pc files, bug #???
+	if use aqua ; then
+		for i in gtk+-3.0.pc gtk+-quartz-3.0.pc gtk+-unix-print-3.0.pc; do
+			sed -e "s:Libs\: :Libs\: -framework Carbon :" \
+				-i "${ED%/}"/usr/$(get_libdir)/pkgconfig/$i || die "sed failed"
+		done
+	fi
+}
+
+multilib_src_install_all() {
+	insinto /etc/gtk-3.0
+	doins "${FILESDIR}"/settings.ini
+
+	dodoc AUTHORS ChangeLog* HACKING NEWS* README*
+}
+
+pkg_preinst() {
+	gnome2_pkg_preinst
+
+	multilib_pkg_preinst() {
+		# Make immodules.cache belongs to gtk+ alone
+		local cache="usr/$(get_libdir)/gtk-3.0/3.0.0/immodules.cache"
+
+		if [[ -e ${EROOT}${cache} ]]; then
+			cp "${EROOT}"${cache} "${ED}"/${cache} || die
+		else
+			touch "${ED}"/${cache} || die
+		fi
+	}
+	multilib_parallel_foreach_abi multilib_pkg_preinst
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+
+	multilib_pkg_postinst() {
+		gnome2_query_immodules_gtk3 \
+			|| die "Update immodules cache failed (for ${ABI})"
+	}
+	multilib_parallel_foreach_abi multilib_pkg_postinst
+
+	if ! has_version "app-text/evince"; then
+		elog "Please install app-text/evince for print preview functionality."
+		elog "Alternatively, check \"gtk-print-preview-command\" documentation and"
+		elog "add it to your settings.ini file."
+	fi
+}
+
+pkg_postrm() {
+	gnome2_pkg_postrm
+
+	if [[ -z ${REPLACED_BY_VERSIONS} ]]; then
+		multilib_pkg_postrm() {
+			rm -f "${EROOT}"usr/$(get_libdir)/gtk-3.0/3.0.0/immodules.cache
+		}
+		multilib_foreach_abi multilib_pkg_postrm
+	fi
+}
diff --git a/x11-libs/gtksourceview/gtksourceview-3.16.1.ebuild b/x11-libs/gtksourceview/gtksourceview-3.16.1.ebuild
index 6aaa8c3e8da1..ff90a1a4bfd3 100644
--- a/x11-libs/gtksourceview/gtksourceview-3.16.1.ebuild
+++ b/x11-libs/gtksourceview/gtksourceview-3.16.1.ebuild
@@ -16,7 +16,7 @@ LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="3.0/3"
 IUSE="glade +introspection vala"
 REQUIRED_USE="vala? ( introspection )"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 
 # Note: has native OSX support, prefix teams, attack!
 RDEPEND="
diff --git a/x11-libs/libpciaccess/libpciaccess-0.13.3.ebuild b/x11-libs/libpciaccess/libpciaccess-0.13.3.ebuild
index b35235fb4414..94915571c9f5 100644
--- a/x11-libs/libpciaccess/libpciaccess-0.13.3.ebuild
+++ b/x11-libs/libpciaccess/libpciaccess-0.13.3.ebuild
@@ -9,7 +9,7 @@ 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"
-IUSE="minimal zlib"
+IUSE="zlib"
 
 DEPEND="!<x11-base/xorg-server-1.5
 	zlib? (	>=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}] )"
diff --git a/x11-libs/libpciaccess/libpciaccess-0.13.4.ebuild b/x11-libs/libpciaccess/libpciaccess-0.13.4.ebuild
index 7e58b9b95ef7..4a8bec652fd9 100644
--- a/x11-libs/libpciaccess/libpciaccess-0.13.4.ebuild
+++ b/x11-libs/libpciaccess/libpciaccess-0.13.4.ebuild
@@ -9,7 +9,7 @@ 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"
-IUSE="minimal zlib"
+IUSE="zlib"
 
 DEPEND="!<x11-base/xorg-server-1.5
 	zlib? (	>=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}] )"
diff --git a/x11-libs/libvdpau/Manifest b/x11-libs/libvdpau/Manifest
index c457aa214d44..ba78f71e5420 100644
--- a/x11-libs/libvdpau/Manifest
+++ b/x11-libs/libvdpau/Manifest
@@ -1,4 +1,3 @@
-DIST libvdpau-0.7.tar.gz 486636 SHA256 24dc08467ce8c59d6cfbf0d34d2dd1f86b4ff62e90777e0a8f513c5c9de9bce0 SHA512 c0ebb124956372a59eaa7e5c9330b6d4f32acd924aa620c4c037f3917623860887231b9b9f4c0a375a300c82a3e0b7284afbe9139d8562f6a74a85848d362286 WHIRLPOOL d88a439231267386b53b4e9be8820e225f40bf8e77895f2d28fbcbd1ced19e70d23d49a55618d0bcadd44086f5df880badff47d05871c6e6fee02a5cf075ef15
-DIST libvdpau-0.8.tar.gz 487359 SHA256 73a7d11cc1abed8bcaf1392bd361fc00fd43bd85bbeafb12a64bdd0bcb4101ed SHA512 c7e7c74f4849f83bed170f4428c381f868f34cbb59444c4e65af4ad1eac19ea9450aa422b35af6c031c2b168a73282fe7bf96d69d5581f24d3c689aa849d1c56 WHIRLPOOL f1ff7d08e326abc1750f0faca9359c366f98970f562dd56037d674d971183cf39289afe0b83192cc162fcfad92ebb3b24f1f652df59095d53b30da90e77a3347
 DIST libvdpau-0.9.tar.gz 526619 SHA256 e32957140835a545a01a3972db1143e01174db3d9c0017e51f6a3bf8b09c0e6e SHA512 8e69712a91e17c3388742f2a4c0a8887113fe06a81dbedf1faa7fc3985a289cd067a9134399f9747fd4b3b1499c46e7871a3b34f74f6e9c95b07ea877739e51f WHIRLPOOL b04824b5867636c25f029909fd9c82fe142bafcbe2544234c31cf34b4616417c362801b8ab817e59b741eb3b8232b0dedef1664dbd5a856cec6634328eb6defc
+DIST libvdpau-1.1.1.tar.gz 541752 SHA256 5fe093302432ef05086ca2ee429c789b7bf843e166d482d166e56859b08bef55 SHA512 e094494fc820c2395c9dbb4e69daa89334b9186e2ad1a6c06671c7f844568db191ce4d1d9df95c4536579864bcc8541eb6fd159c377bc73c228cdf2a0fea50fb WHIRLPOOL a17e69104ef89606592e0242af9d2397e6d1647d55e14d02f2816e997d4d84c5a68cd2f9b7388abd47025abb850a09883f83a77585e194f3bac89ac190d47d46
 DIST libvdpau-1.1.tar.gz 535945 SHA256 aea4e783f220bf26ba2139ccd866a0ee5005fa03af5e08c41fbc939118263919 SHA512 9ef5a643f93934b55a0e1d9d0785c96489abd64ee9ea05b3bd8f7e802ff8bb00af279ac37d3aa65b133255c520b8b32bb7356728de6131df0a2cd87c4048c43e WHIRLPOOL 568227ca8e3aec60e366b04038ddce655883c39dc28015a5f6b83552714fe5661b877da6746d150cea1ce35b1cf27e9eb4e1b4103b9eaa1794523230e0485c10
diff --git a/x11-libs/libvdpau/libvdpau-0.7.ebuild b/x11-libs/libvdpau/libvdpau-0.7.ebuild
deleted file mode 100644
index d3660d6f0238..000000000000
--- a/x11-libs/libvdpau/libvdpau-0.7.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit autotools-multilib
-
-DESCRIPTION="VDPAU wrapper and trace libraries"
-HOMEPAGE="http://www.freedesktop.org/wiki/Software/VDPAU"
-SRC_URI="http://people.freedesktop.org/~aplattner/vdpau/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="doc dri"
-
-RDEPEND=">=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
-	dri? ( >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}] )
-	!=x11-drivers/nvidia-drivers-180*
-	!=x11-drivers/nvidia-drivers-185*
-	!=x11-drivers/nvidia-drivers-190*
-	abi_x86_32? ( !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? (
-		app-doc/doxygen
-		media-gfx/graphviz
-		virtual/latex-base
-		)
-	dri? ( >=x11-proto/dri2proto-2.2 )"
-
-src_configure() {
-	local myeconfargs=(
-		--docdir="${EPREFIX}"/usr/share/doc/${PF}
-		$(use_enable doc documentation)
-		$(use dri || echo --disable-dri2)
-	)
-
-	autotools-multilib_src_configure
-}
-
-src_install() {
-	autotools-multilib_src_install
-	prune_libtool_files --modules
-}
diff --git a/x11-libs/libvdpau/libvdpau-0.8.ebuild b/x11-libs/libvdpau/libvdpau-0.8.ebuild
deleted file mode 100644
index f0efcf65c56c..000000000000
--- a/x11-libs/libvdpau/libvdpau-0.8.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-VIRTUALX_REQUIRED="test"
-inherit autotools-multilib virtualx
-
-DESCRIPTION="VDPAU wrapper and trace libraries"
-HOMEPAGE="http://www.freedesktop.org/wiki/Software/VDPAU"
-SRC_URI="http://people.freedesktop.org/~aplattner/vdpau/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="doc dri"
-
-RDEPEND=">=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
-	dri? ( >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}] )
-	!=x11-drivers/nvidia-drivers-180*
-	!=x11-drivers/nvidia-drivers-185*
-	!=x11-drivers/nvidia-drivers-190*
-	abi_x86_32? ( !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? (
-		app-doc/doxygen
-		media-gfx/graphviz
-		virtual/latex-base
-		)
-	dri? ( >=x11-proto/dri2proto-2.2 )"
-
-src_configure() {
-	local myeconfargs=(
-		--docdir="${EPREFIX}"/usr/share/doc/${PF}
-		$(use_enable doc documentation)
-		$(use dri || echo --disable-dri2)
-	)
-
-	autotools-multilib_src_configure
-}
-
-multilib_src_test() {
-	Xemake check
-}
-
-src_install() {
-	autotools-multilib_src_install
-	prune_libtool_files --modules
-}
diff --git a/x11-libs/libvdpau/libvdpau-1.1.1.ebuild b/x11-libs/libvdpau/libvdpau-1.1.1.ebuild
new file mode 100644
index 000000000000..518bf7a08602
--- /dev/null
+++ b/x11-libs/libvdpau/libvdpau-1.1.1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+VIRTUALX_REQUIRED="test"
+inherit autotools-multilib flag-o-matic virtualx
+
+DESCRIPTION="VDPAU wrapper and trace libraries"
+HOMEPAGE="http://www.freedesktop.org/wiki/Software/VDPAU"
+SRC_URI="http://people.freedesktop.org/~aplattner/vdpau/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE="doc dri"
+
+RDEPEND=">=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+	dri? ( >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}] )
+	!=x11-drivers/nvidia-drivers-180*
+	!=x11-drivers/nvidia-drivers-185*
+	!=x11-drivers/nvidia-drivers-190*
+	abi_x86_32? ( !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	doc? (
+		app-doc/doxygen
+		media-gfx/graphviz
+		virtual/latex-base
+		)
+	dri? ( >=x11-proto/dri2proto-2.2 )"
+
+src_configure() {
+	append-cppflags -D_GNU_SOURCE
+	local myeconfargs=(
+		--docdir="${EPREFIX}"/usr/share/doc/${PF}
+		$(use_enable doc documentation)
+		$(use dri || echo --disable-dri2)
+	)
+
+	autotools-multilib_src_configure
+}
+
+multilib_src_test() {
+	Xemake check
+}
+
+src_install() {
+	autotools-multilib_src_install
+	prune_libtool_files --modules
+}
diff --git a/x11-libs/libvdpau/metadata.xml b/x11-libs/libvdpau/metadata.xml
index a445a73fcbed..52363bff0cba 100644
--- a/x11-libs/libvdpau/metadata.xml
+++ b/x11-libs/libvdpau/metadata.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>
-		<email>cardoe@gentoo.org</email>
-		<name>Doug Goldstein</name>
+		<email>jer@gentoo.org</email>
+		<name>Jeroen Roovers</name>
 	</maintainer>
 </pkgmetadata>
diff --git a/x11-libs/qwt/qwt-6.1.2-r1.ebuild b/x11-libs/qwt/qwt-6.1.2-r1.ebuild
index 0b678c3f629f..52d528e73aee 100644
--- a/x11-libs/qwt/qwt-6.1.2-r1.ebuild
+++ b/x11-libs/qwt/qwt-6.1.2-r1.ebuild
@@ -15,25 +15,25 @@ SRC_URI="mirror://sourceforge/project/${PN}/${PN}/${PV/_/-}/${MY_P}.tar.bz2"
 LICENSE="qwt mathml? ( LGPL-2.1 Nokia-Qt-LGPL-Exception-1.1 )"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
 SLOT="6"
-IUSE="doc examples mathml opengl qt4 qt5 static-libs svg"
+IUSE="designer doc examples mathml opengl qt4 qt5 static-libs svg"
 
 REQUIRED_USE="|| ( qt4 qt5 )"
 
 DEPEND="
 	!<x11-libs/qwt-5.2.3
 	qt4? (
-		dev-qt/designer:4
 		dev-qt/qtcore:4
 		dev-qt/qtgui:4
+		designer? ( dev-qt/designer:4 )
 		opengl? ( dev-qt/qtopengl:4 )
 		svg? ( dev-qt/qtsvg:4 )
 	)
 	qt5? (
-		dev-qt/designer:5
 		dev-qt/qtcore:5
 		dev-qt/qtgui:5
 		dev-qt/qtconcurrent:5
 		dev-qt/qtwidgets:5
+		designer? ( dev-qt/designer:5 )
 		opengl? ( dev-qt/qtopengl:5 )
 		svg? ( dev-qt/qtsvg:5 )
 	)
@@ -56,11 +56,12 @@ src_prepare() {
 		QWT_INSTALL_LIBS = "${EPREFIX}/usr/$(get_libdir)"
 		QWT_INSTALL_HEADERS = "${EPREFIX}/usr/include/qwt6"
 		QWT_INSTALL_DOCS = "${EPREFIX}/usr/share/doc/${PF}"
-		QWT_CONFIG += QwtPlot QwtWidgets QwtDesigner QwtPkgConfig
+		QWT_CONFIG += QwtPlot QwtWidgets QwtPkgConfig
 		VERSION = ${PV/_*}
 		QWT_VERSION = ${PV/_*}
 	EOF
 
+	use designer && echo "QWT_CONFIG += QwtDesigner" >> qwtconfig.pri
 	use mathml && echo "QWT_CONFIG += QwtMathML" >> qwtconfig.pri
 	use opengl && echo "QWT_CONFIG += QwtOpenGL" >> qwtconfig.pri
 	use svg && echo "QWT_CONFIG += QwtSvg" >> qwtconfig.pri
diff --git a/x11-libs/vte/vte-0.40.2.ebuild b/x11-libs/vte/vte-0.40.2.ebuild
index 1d2a47c710fe..33908a94416b 100644
--- a/x11-libs/vte/vte-0.40.2.ebuild
+++ b/x11-libs/vte/vte-0.40.2.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://wiki.gnome.org/action/show/Apps/Terminal/VTE"
 LICENSE="LGPL-2+"
 SLOT="2.91"
 IUSE="+crypt debug glade +introspection vala"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~x64-solaris ~x86-solaris"
 
 PDEPEND=">=x11-libs/gnome-pty-helper-${PV}"
 RDEPEND="
diff --git a/x11-libs/wxGTK/wxGTK-3.0.2.0-r1.ebuild b/x11-libs/wxGTK/wxGTK-3.0.2.0-r1.ebuild
index dd98df7c60b6..80332684641f 100644
--- a/x11-libs/wxGTK/wxGTK-3.0.2.0-r1.ebuild
+++ b/x11-libs/wxGTK/wxGTK-3.0.2.0-r1.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="http://wxwidgets.org/"
 SRC_URI="mirror://sourceforge/wxpython/wxPython-src-${PV}.tar.bz2
 	doc? ( mirror://sourceforge/wxpython/wxPython-docs-${PV}.tar.bz2 )"
 
-KEYWORDS="alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~sh sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="+X aqua doc debug gstreamer libnotify opengl sdl tiff webkit"
 
 SLOT="3.0"
diff --git a/x11-misc/basqet/metadata.xml b/x11-misc/basqet/metadata.xml
index 7aa61dde7f6e..c1ca52bbfce4 100644
--- a/x11-misc/basqet/metadata.xml
+++ b/x11-misc/basqet/metadata.xml
@@ -4,5 +4,6 @@
 	<herd>qt</herd>
 	<upstream>
 		<remote-id type="google-code">basqet</remote-id>
+		<remote-id type="bitbucket">ridderby/basqet</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/x11-misc/colord/Manifest b/x11-misc/colord/Manifest
index 029df26c031f..579483a1a90e 100644
--- a/x11-misc/colord/Manifest
+++ b/x11-misc/colord/Manifest
@@ -1,3 +1,3 @@
 DIST colord-1.2.10.tar.xz 1203248 SHA256 1dea0453cc778326e700f6cb0a206836a57dedfb0fbdc3acaf2be02ea77a963a SHA512 fdf6f41e84fb37905e3c2e37a7d095d5271759f17e292cf5cf23f846ea6805949185c1a0548c4c4e24e2a385e655cd30609423921b0389076f5373ca1b8578e7 WHIRLPOOL d70fd0d3fde030f6c592f49ae146ccbb38c00ad0c28e2253ea8e2e00436c19fc4cf53aead6360e04eb7509a8d94bd07ffab6dde5592fd050dd37de3355b76f87
 DIST colord-1.2.11.tar.xz 1205468 SHA256 dac29c83659703a8548db561bc670832f26b30f7a88ed90a6530eb052a10df8f SHA512 fec46d295b1b4caba7c0a666eccbf3ce325fab4bd56e6a841cfdd9b7a381384dff3c71a744dda0e88ed2e99519c278c1ee495e6b8870c74cb4939dbc08d4bb96 WHIRLPOOL 7372d1a52c897e133fa75c8e06c47b3f7035cb01a3ec858f74ddc741613b11554a2d6dac6c886347f4e82baa16091cc41232a5deb3db4ae5a4930be0d1de6f41
-DIST colord-1.2.9.tar.xz 1200936 SHA256 48ce0db4f327c94c2bec11fed98a9a73f580d34c6edcd636d90831fe3bea5ae4 SHA512 d25497fa6460e5ffd7ce872bf16b60916e879cdd3aaec4c81dd4ab8446949767f3d3d49a3e654813445b049a9653334ba22d8e9a91cf6699c6063c01be382a75 WHIRLPOOL ca8edc19b162e4e97c263c1bc64d2a655d5adafeb2cb64c8bdbd7eb4e20052ce76f8ad332168088a97e654d20f0c5215d62829fed7471ac69faed3a79fc9f283
+DIST colord-1.2.12.tar.xz 1214992 SHA256 d5241864c16a37f9e40d38d5009255456495a67f170ce0dc9250774442d68c3a SHA512 5ce8f4fd10b92ec0cb54a05017ab050753381663a43e40d959606bb5f71ddce5456a3d67f8ce0538a2c945136834c66615f3615fdfb3e1eaaf5f5ca7a9e9c4eb WHIRLPOOL 5b04acfc8de34758252f0215371f75b9ccab8f80194a9624d6b4c3651929266032f3e9e1e05b48fb82572891e93d6082739c022b2624978b0f8ece7e323e1b48
diff --git a/x11-misc/colord/colord-1.2.12.ebuild b/x11-misc/colord/colord-1.2.12.ebuild
new file mode 100644
index 000000000000..e6e9171e254b
--- /dev/null
+++ b/x11-misc/colord/colord-1.2.12.ebuild
@@ -0,0 +1,171 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+VALA_USE_DEPEND="vapigen"
+
+inherit autotools bash-completion-r1 check-reqs eutils gnome2 user systemd udev vala multilib-minimal
+
+DESCRIPTION="System service to accurately color manage input and output devices"
+HOMEPAGE="http://www.freedesktop.org/software/colord/"
+SRC_URI="http://www.freedesktop.org/software/colord/releases/${P}.tar.xz"
+
+LICENSE="GPL-2+"
+SLOT="0/2" # subslot = libcolord soname version
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+
+# We prefer policykit enabled by default, bug #448058
+IUSE="argyllcms examples extra-print-profiles +gusb +introspection +policykit scanner systemd +udev vala"
+REQUIRED_USE="
+	gusb? ( udev )
+	scanner? ( udev )
+	vala? ( introspection )
+"
+
+COMMON_DEPEND="
+	dev-db/sqlite:3=
+	>=dev-libs/glib-2.36:2[${MULTILIB_USEDEP}]
+	>=media-libs/lcms-2.6:2=[${MULTILIB_USEDEP}]
+	argyllcms? ( media-gfx/argyllcms )
+	gusb? ( >=dev-libs/libgusb-0.2.2[introspection?,${MULTILIB_USEDEP}] )
+	introspection? ( >=dev-libs/gobject-introspection-0.9.8:= )
+	policykit? ( >=sys-auth/polkit-0.103 )
+	scanner? (
+		media-gfx/sane-backends
+		sys-apps/dbus )
+	systemd? ( >=sys-apps/systemd-44:0= )
+	udev? (
+		virtual/udev
+		virtual/libgudev:=
+		virtual/libudev:=[${MULTILIB_USEDEP}]
+	)
+"
+RDEPEND="${COMMON_DEPEND}
+	!media-gfx/shared-color-profiles
+	!<=media-gfx/colorhug-client-0.1.13
+"
+DEPEND="${COMMON_DEPEND}
+	dev-libs/libxslt
+	>=dev-util/gtk-doc-am-1.9
+	>=dev-util/intltool-0.35
+	>=sys-devel/gettext-0.17
+	virtual/pkgconfig[${MULTILIB_USEDEP}]
+	extra-print-profiles? ( media-gfx/argyllcms )
+	vala? ( $(vala_depend) )
+"
+
+# FIXME: needs pre-installed dbus service files
+RESTRICT="test"
+
+# According to upstream comment in colord.spec.in, building the extra print
+# profiles requires >=4G of memory
+CHECKREQS_MEMORY="4G"
+
+pkg_pretend() {
+	use extra-print-profiles && check-reqs_pkg_pretend
+}
+
+pkg_setup() {
+	use extra-print-profiles && check-reqs_pkg_setup
+	enewgroup colord
+	enewuser colord -1 -1 /var/lib/colord colord
+}
+
+src_prepare() {
+	# Adapt to Gentoo paths
+	sed -i -e 's/spotread/argyll-spotread/' \
+		src/sensors/cd-sensor-argyll.c \
+		configure.ac || die
+
+	eautoreconf
+	use vala && vala_src_prepare
+	gnome2_src_prepare
+}
+
+multilib_src_configure() {
+	# Reverse tools require gusb
+	# bash-completion test does not work on gentoo
+	local myconf=(
+		--disable-bash-completion
+		--disable-examples
+		--disable-static
+		--enable-libcolordcompat
+		--with-daemon-user=colord
+		--localstatedir="${EPREFIX}"/var
+		$(multilib_native_use_enable argyllcms argyllcms-sensor)
+		$(multilib_native_use_enable extra-print-profiles print-profiles)
+		$(multilib_native_usex extra-print-profiles COLPROF="$(type -P argyll-colprof)" "")
+		$(use_enable gusb)
+		$(multilib_native_use_enable gusb reverse)
+		$(multilib_native_use_enable introspection)
+		$(multilib_native_use_enable policykit polkit)
+		$(multilib_native_use_enable scanner sane)
+		$(multilib_native_use_enable systemd systemd-login)
+		$(use_enable udev)
+		--with-udevrulesdir="$(get_udevdir)"/rules.d
+		$(multilib_native_use_enable vala)
+		"$(systemd_with_unitdir)"
+	)
+
+	if ! multilib_is_native_abi; then
+		# disable some extraneous checks
+		myconf+=(
+			SQLITE_{CFLAGS,LIBS}=' '
+			GUDEV_{CFLAGS,LIBS}=' '
+		)
+	fi
+
+	ECONF_SOURCE=${S} \
+	gnome2_src_configure "${myconf[@]}"
+}
+
+multilib_src_compile() {
+	if multilib_is_native_abi; then
+		gnome2_src_compile
+	else
+		emake -C lib/colord
+		use gusb && emake -C lib/colorhug
+		emake -C lib/compat
+	fi
+}
+
+multilib_src_test() {
+	if multilib_is_native_abi; then
+		default
+	else
+		emake -C lib/colord check
+		use gusb && emake -C lib/colorhug check
+		emake -C lib/compat check
+	fi
+}
+
+multilib_src_install() {
+	if multilib_is_native_abi; then
+		gnome2_src_install
+	else
+		gnome2_src_install -C lib/colord
+		use gusb && gnome2_src_install -C lib/colorhug
+		gnome2_src_install -C lib/compat
+		gnome2_src_install -C contrib/session-helper install-libcolord_includeHEADERS
+	fi
+}
+
+multilib_src_install_all() {
+	DOCS="AUTHORS ChangeLog MAINTAINERS NEWS README.md TODO"
+	einstalldocs
+
+	newbashcomp data/colormgr colormgr
+
+	# Ensure config and profile directories exist and /var/lib/colord/*
+	# is writable by colord user
+	keepdir /var/lib/color{,d}/icc
+	fowners colord:colord /var/lib/colord{,/icc}
+
+	if use examples; then
+		docinto examples
+		dodoc examples/*.c
+	fi
+}
diff --git a/x11-misc/colord/colord-1.2.9.ebuild b/x11-misc/colord/colord-1.2.9.ebuild
deleted file mode 100644
index 7b4e1b9181f9..000000000000
--- a/x11-misc/colord/colord-1.2.9.ebuild
+++ /dev/null
@@ -1,172 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-VALA_USE_DEPEND="vapigen"
-VALA_MIN_API_VERSION="0.18"
-
-inherit autotools bash-completion-r1 check-reqs eutils gnome2 multilib-minimal user systemd udev vala
-
-DESCRIPTION="System service to accurately color manage input and output devices"
-HOMEPAGE="http://www.freedesktop.org/software/colord/"
-SRC_URI="http://www.freedesktop.org/software/colord/releases/${P}.tar.xz"
-
-LICENSE="GPL-2+"
-SLOT="0/2" # subslot = libcolord soname version
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
-
-# We prefer policykit enabled by default, bug #448058
-IUSE="argyllcms examples extra-print-profiles +gusb +introspection +policykit scanner systemd +udev vala"
-REQUIRED_USE="
-	gusb? ( udev )
-	scanner? ( udev )
-	vala? ( introspection )
-"
-
-COMMON_DEPEND="
-	dev-db/sqlite:3=
-	>=dev-libs/glib-2.36:2[${MULTILIB_USEDEP}]
-	>=media-libs/lcms-2.6:2=[${MULTILIB_USEDEP}]
-	argyllcms? ( media-gfx/argyllcms )
-	gusb? ( >=dev-libs/libgusb-0.2.2[introspection?,${MULTILIB_USEDEP}] )
-	introspection? ( >=dev-libs/gobject-introspection-0.9.8 )
-	policykit? ( >=sys-auth/polkit-0.103 )
-	scanner? (
-		media-gfx/sane-backends
-		sys-apps/dbus )
-	systemd? ( >=sys-apps/systemd-44:0= )
-	udev? (
-		virtual/udev
-		virtual/libgudev:=
-		virtual/libudev:=[${MULTILIB_USEDEP}]
-	)
-"
-RDEPEND="${COMMON_DEPEND}
-	!media-gfx/shared-color-profiles
-	!<=media-gfx/colorhug-client-0.1.13
-"
-DEPEND="${COMMON_DEPEND}
-	dev-libs/libxslt
-	>=dev-util/gtk-doc-am-1.9
-	>=dev-util/intltool-0.35
-	>=sys-devel/gettext-0.17
-	virtual/pkgconfig[${MULTILIB_USEDEP}]
-	extra-print-profiles? ( media-gfx/argyllcms )
-	vala? ( $(vala_depend) )
-"
-
-# FIXME: needs pre-installed dbus service files
-RESTRICT="test"
-
-# According to upstream comment in colord.spec.in, building the extra print
-# profiles requires >=4G of memory
-CHECKREQS_MEMORY="4G"
-
-pkg_pretend() {
-	use extra-print-profiles && check-reqs_pkg_pretend
-}
-
-pkg_setup() {
-	use extra-print-profiles && check-reqs_pkg_setup
-	enewgroup colord
-	enewuser colord -1 -1 /var/lib/colord colord
-}
-
-src_prepare() {
-	# Adapt to Gentoo paths
-	sed -i -e 's/spotread/argyll-spotread/' \
-		src/sensors/cd-sensor-argyll.c \
-		configure.ac || die
-
-	eautoreconf
-	use vala && vala_src_prepare
-	gnome2_src_prepare
-}
-
-multilib_src_configure() {
-	# Reverse tools require gusb
-	# bash-completion test does not work on gentoo
-	local myconf=(
-		--disable-bash-completion
-		--disable-examples
-		--disable-static
-		--enable-libcolordcompat
-		--with-daemon-user=colord
-		--localstatedir="${EPREFIX}"/var
-		$(multilib_native_use_enable argyllcms argyllcms-sensor)
-		$(multilib_native_use_enable extra-print-profiles print-profiles)
-		$(multilib_native_usex extra-print-profiles COLPROF="$(type -P argyll-colprof)" "")
-		$(use_enable gusb)
-		$(multilib_native_use_enable gusb reverse)
-		$(multilib_native_use_enable introspection)
-		$(multilib_native_use_enable policykit polkit)
-		$(multilib_native_use_enable scanner sane)
-		$(multilib_native_use_enable systemd systemd-login)
-		$(use_enable udev)
-		--with-udevrulesdir="$(get_udevdir)"/rules.d
-		$(multilib_native_use_enable vala)
-		"$(systemd_with_unitdir)"
-	)
-
-	if ! multilib_is_native_abi; then
-		# disable some extraneous checks
-		myconf+=(
-			SQLITE_{CFLAGS,LIBS}=' '
-			GUDEV_{CFLAGS,LIBS}=' '
-		)
-	fi
-
-	ECONF_SOURCE=${S} \
-	gnome2_src_configure "${myconf[@]}"
-}
-
-multilib_src_compile() {
-	if multilib_is_native_abi; then
-		gnome2_src_compile
-	else
-		emake -C lib/colord
-		use gusb && emake -C lib/colorhug
-		emake -C lib/compat
-	fi
-}
-
-multilib_src_test() {
-	if multilib_is_native_abi; then
-		default
-	else
-		emake -C lib/colord check
-		use gusb && emake -C lib/colorhug check
-		emake -C lib/compat check
-	fi
-}
-
-multilib_src_install() {
-	if multilib_is_native_abi; then
-		gnome2_src_install
-	else
-		gnome2_src_install -C lib/colord
-		use gusb && gnome2_src_install -C lib/colorhug
-		gnome2_src_install -C lib/compat
-		gnome2_src_install -C contrib/session-helper install-libcolord_includeHEADERS
-	fi
-}
-
-multilib_src_install_all() {
-	DOCS="AUTHORS ChangeLog MAINTAINERS NEWS README.md TODO"
-	einstalldocs
-
-	newbashcomp data/colormgr colormgr
-
-	# Ensure config and profile directories exist and /var/lib/colord/*
-	# is writable by colord user
-	keepdir /var/lib/color{,d}/icc
-	fowners colord:colord /var/lib/colord{,/icc}
-
-	if use examples; then
-		docinto examples
-		dodoc examples/*.c
-	fi
-}
diff --git a/x11-misc/gpaste/gpaste-3.16.2.1.ebuild b/x11-misc/gpaste/gpaste-3.16.2.1.ebuild
index 47b2d4f6ae86..24fec00606c9 100644
--- a/x11-misc/gpaste/gpaste-3.16.2.1.ebuild
+++ b/x11-misc/gpaste/gpaste-3.16.2.1.ebuild
@@ -18,7 +18,7 @@ KEYWORDS="~amd64 ~x86"
 IUSE="+applet gnome vala"
 
 CDEPEND="
-	dev-util/appdata-tools
+	dev-libs/appstream-glib
 	>=dev-libs/glib-2.44:2
 	>=dev-libs/gobject-introspection-1.44.0
 	sys-apps/dbus
diff --git a/x11-misc/grun/metadata.xml b/x11-misc/grun/metadata.xml
index 11cb726ccd43..62788e9b0972 100644
--- a/x11-misc/grun/metadata.xml
+++ b/x11-misc/grun/metadata.xml
@@ -4,5 +4,6 @@
 	<herd>desktop-misc</herd>
 	<upstream>
 		<remote-id type="google-code">grun</remote-id>
+		<remote-id type="github">lrgc/grun</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/x11-misc/ktsuss/metadata.xml b/x11-misc/ktsuss/metadata.xml
index 1d6819a1c170..a6a88629dac8 100644
--- a/x11-misc/ktsuss/metadata.xml
+++ b/x11-misc/ktsuss/metadata.xml
@@ -9,5 +9,6 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="google-code">ktsuss</remote-id>
+		<remote-id type="github">nomius/ktsuss</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/x11-misc/qlipper/metadata.xml b/x11-misc/qlipper/metadata.xml
index dc439f7e84f5..417967a8329b 100644
--- a/x11-misc/qlipper/metadata.xml
+++ b/x11-misc/qlipper/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>qt</herd>
+	<herd>qt</herd>
+	<upstream>
+		<remote-id type="github">pvanek/qlipper</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/x11-misc/qxkb/metadata.xml b/x11-misc/qxkb/metadata.xml
index dc439f7e84f5..32bdd4ceba31 100644
--- a/x11-misc/qxkb/metadata.xml
+++ b/x11-misc/qxkb/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>qt</herd>
+	<herd>qt</herd>
+	<upstream>
+		<remote-id type="github">disels/qxkb</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/x11-misc/rofi/Manifest b/x11-misc/rofi/Manifest
index ccb3713a7a9c..cfdf1ada139d 100644
--- a/x11-misc/rofi/Manifest
+++ b/x11-misc/rofi/Manifest
@@ -1,2 +1,2 @@
-DIST rofi-0.15.5.tar.xz 124952 SHA256 3d7fefc986003527237ffc59a27158e4680e8c6daa6d45374e50734a19996dcf SHA512 4925912cc575a83d3b3fbe08b767798f3e3834dc1d818894ac1537f2eb8a102219029a9c35f8085e81d9c30cfecad86e44ae4707e5149a14ba144f79e08880bc WHIRLPOOL 2bceb26240ceeb0870bb2d7cc630079cc5fd53ae88ec5ce425d9371b6363f1a874e52f8d1e9373a8956f16c6779cdf9d1fb9c6ec50fc96a62d00c6d1241cd98c
 DIST rofi-0.15.7.tar.xz 125824 SHA256 8c35d3d2a36cc61ae6b5dcc6a07a590e3d6d446944ec6e37dd5a3c3fcff64188 SHA512 51caaaf6f2280c24b65386a3e38591b601e06f9d7ffa132023c93d86cb9ccf8ac1d1e2dec6886128ebdac6558fae3c718c21e489c4bd13575aeee2143ecdac13 WHIRLPOOL a9de957c8cee9682608c35363d1142ec624fb4ce8f22c96da9dc35259afab599fd48dc1e9d528c287fecaa5e1a3c20efe51f1c9159913d7aa7878bbd98814578
+DIST rofi-0.15.8.tar.xz 129980 SHA256 13aa2194c87f183c217069292092b38b9ab12115abb0bf312c6d48b22c3b369f SHA512 9c43bdef60a229af371e992a0363e81d5bc09704e5579ffce38c6f0218df9e7607efe13744b700d8b3fa01f3654193afa2f95cd86383ab668573b51902030bb6 WHIRLPOOL 3c9863cafecd606d4f7514328bc3434e60b2bf24faa3f77478c836efa4ea3e4c7037eb4588a76ae23c29294504c9a5b983a86f59ca2c784520a66fadd3f2ce18
diff --git a/x11-misc/rofi/rofi-0.15.5.ebuild b/x11-misc/rofi/rofi-0.15.8.ebuild
index 6de1ac970986..6de1ac970986 100644
--- a/x11-misc/rofi/rofi-0.15.5.ebuild
+++ b/x11-misc/rofi/rofi-0.15.8.ebuild
diff --git a/x11-misc/sddm/Manifest b/x11-misc/sddm/Manifest
index ffdf15a403d6..7fa0ac18140b 100644
--- a/x11-misc/sddm/Manifest
+++ b/x11-misc/sddm/Manifest
@@ -1 +1,2 @@
 DIST sddm-0.11.0.tar.gz 4735807 SHA256 80d53f075c275f744bd547523d6d640baccfacb4e463a71ec0facb8231b832ce SHA512 9dd2b80788e3cfdb353e64f709db451e04828991976b8b0f74c0e97dbf467fa2744702c73e5e50137eec10dac92df7dacd83fb458f75dd595556fc95fb1759f7 WHIRLPOOL 079c5093374710c2a3247a3e27dd26f3d10962c7cb8f260b80a4ba17a72e63676012d4b8e50f8f4bffc43124efdf05c7e14aefe86253b391345c7fa98a2d4c2f
+DIST sddm-0.12.0.tar.xz 3866620 SHA256 7d7504bf8a717a9131a2f32be852d7631365d21a468ca2649c8245f24ff29ae0 SHA512 d1d9f60634cb2a71096d92321a7a8b33efb8879a766979ca7c1d31ac5f1dbde8253384070338eef80f777db1cd78eef540e9111151f7f9e7d8e648d557e58047 WHIRLPOOL 58d21ead822b85bf3f0f6375cfadee6225dd9bf696e786fe68f283def43b4107d11e14b357d60b0278266270f9ddcb6a9b86285bc3b1a19644583f6ebebc4990
diff --git a/x11-misc/sddm/files/sddm-0.10.0-consolekit.patch b/x11-misc/sddm/files/sddm-0.10.0-consolekit.patch
deleted file mode 100644
index acdfdc1a43e2..000000000000
--- a/x11-misc/sddm/files/sddm-0.10.0-consolekit.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/data/scripts/Xsession b/data/scripts/Xsession
-index a5d270d..4b48524 100755
---- a/data/scripts/Xsession
-+++ b/data/scripts/Xsession
-@@ -74,7 +74,7 @@ case $session in
-     exec xterm -geometry 80x24-0-0
-     ;;
-   *)
--    eval exec "$session"
-+    eval exec ck-launch-session "$session"
-     ;;
- esac
- exec xmessage -center -buttons OK:0 -default OK "Sorry, cannot execute $session. Check $DESKTOP_SESSION.desktop."
diff --git a/x11-misc/sddm/files/sddm-0.11.0-consolekit2.patch b/x11-misc/sddm/files/sddm-0.11.0-consolekit2.patch
deleted file mode 100644
index 7f6f3f7f8113..000000000000
--- a/x11-misc/sddm/files/sddm-0.11.0-consolekit2.patch
+++ /dev/null
@@ -1,91 +0,0 @@
-From 7a8024639ee3ae7e128a9dc3efce90a07b4d316c Mon Sep 17 00:00:00 2001
-From: Eric Koegel <eric.koegel@gmail.com>
-Date: Mon, 6 Jul 2015 11:16:38 +0300
-Subject: [PATCH] ConsoleKit2 support for system actions
-
-This adds support for calling ConsoleKit2's DBUS API for shutdown,
-reboot, suspend, and hibernate. It does so by using the exact same
-interface as login1, making it a shared seat manager backend.
----
- INSTALL                     |  4 ++--
- src/daemon/PowerManager.cpp | 26 +++++++++++++++++---------
- 2 files changed, 19 insertions(+), 11 deletions(-)
-
-diff --git a/INSTALL b/INSTALL
-index 77b6a8b..5d16710 100644
---- a/INSTALL
-+++ b/INSTALL
-@@ -30,8 +30,8 @@ its home set to `/var/lib/sddm` by default.
- SDDM depends on PAM for authorization and XCB to communicate with the X server.
- Apart from other things, it also depends on Qt for the user interface and event
- loop management.
--SDDM can optionally make use of logind (the systemd login manager API) or
--upower to enable support for suspend, hibernate etc.
-+SDDM can optionally make use of logind (the systemd login manager API), or
-+ConsoleKit2, or upower to enable support for suspend, hibernate etc.
- In order to build the man pages, you will need `rst2man` installed. It is
- provided by the python `docutils` package
- 
-diff --git a/src/daemon/PowerManager.cpp b/src/daemon/PowerManager.cpp
-index 3a4d25d..6329032 100644
---- a/src/daemon/PowerManager.cpp
-+++ b/src/daemon/PowerManager.cpp
-@@ -59,8 +59,8 @@ namespace SDDM {
- 
-     class UPowerBackend : public PowerManagerBackend {
-     public:
--        UPowerBackend() {
--            m_interface = new QDBusInterface(UPOWER_SERVICE, UPOWER_PATH, UPOWER_OBJECT, QDBusConnection::systemBus());
-+        UPowerBackend(const QString & service, const QString & path, const QString & interface) {
-+            m_interface = new QDBusInterface(service, path, interface, QDBusConnection::systemBus());
-         }
- 
-         ~UPowerBackend() {
-@@ -110,20 +110,24 @@ namespace SDDM {
-     };
- 
-     /**********************************************/
--    /* LOGIN1 BACKEND                             */
-+    /* LOGIN1 && ConsoleKit2 BACKEND              */
-     /**********************************************/
- 
- #define LOGIN1_SERVICE  QStringLiteral("org.freedesktop.login1")
- #define LOGIN1_PATH     QStringLiteral("/org/freedesktop/login1")
- #define LOGIN1_OBJECT   QStringLiteral("org.freedesktop.login1.Manager")
- 
--    class Login1Backend : public PowerManagerBackend {
-+#define CK2_SERVICE  QStringLiteral("org.freedesktop.ConsoleKit")
-+#define CK2_PATH     QStringLiteral("/org/freedesktop/ConsoleKit/Manager")
-+#define CK2_OBJECT   QStringLiteral("org.freedesktop.ConsoleKit.Manager")
-+
-+    class SeatManagerBackend : public PowerManagerBackend {
-     public:
--        Login1Backend() {
--            m_interface = new QDBusInterface(LOGIN1_SERVICE, LOGIN1_PATH, LOGIN1_OBJECT, QDBusConnection::systemBus());
-+        SeatManagerBackend(const QString & service, const QString & path, const QString & interface) {
-+            m_interface = new QDBusInterface(service, path, interface, QDBusConnection::systemBus());
-         }
- 
--        ~Login1Backend() {
-+        ~SeatManagerBackend() {
-             delete m_interface;
-         }
- 
-@@ -194,11 +198,15 @@ namespace SDDM {
- 
-         // check if login1 interface exists
-         if (interface->isServiceRegistered(LOGIN1_SERVICE))
--            m_backends << new Login1Backend();
-+            m_backends << new SeatManagerBackend(LOGIN1_SERVICE, LOGIN1_PATH, LOGIN1_OBJECT);
-+
-+        // check if ConsoleKit2 interface exists
-+        if (interface->isServiceRegistered(CK2_SERVICE))
-+            m_backends << new SeatManagerBackend(CK2_SERVICE, CK2_PATH, CK2_OBJECT);
- 
-         // check if upower interface exists
-         if (interface->isServiceRegistered(UPOWER_SERVICE))
--            m_backends << new UPowerBackend();
-+            m_backends << new UPowerBackend(UPOWER_SERVICE, UPOWER_PATH, UPOWER_OBJECT);
-     }
- 
-     PowerManager::~PowerManager() {
diff --git a/x11-misc/sddm/files/sddm-0.11.0-upower.patch b/x11-misc/sddm/files/sddm-0.11.0-upower.patch
deleted file mode 100644
index 387f106c29bb..000000000000
--- a/x11-misc/sddm/files/sddm-0.11.0-upower.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/daemon/PowerManager.cpp	2015-08-17 00:52:12.786176023 +0200
-+++ b/src/daemon/PowerManager.cpp	2015-08-17 00:53:30.259207476 +0200
-@@ -209,7 +209,7 @@
- #endif // HAVE_CONSOLEKIT2
- 
-         // check if upower interface exists
--        if (interface->isServiceRegistered(UPOWER_SERVICE))
-+//        if (interface->isServiceRegistered(UPOWER_SERVICE))
-             m_backends << new UPowerBackend(UPOWER_SERVICE, UPOWER_PATH, UPOWER_OBJECT);
-     }
- 
diff --git a/x11-misc/sddm/files/sddm-0.12.0-respect-user-flags.patch b/x11-misc/sddm/files/sddm-0.12.0-respect-user-flags.patch
new file mode 100644
index 000000000000..67a662186615
--- /dev/null
+++ b/x11-misc/sddm/files/sddm-0.12.0-respect-user-flags.patch
@@ -0,0 +1,26 @@
+diff -u CMakeLists.txt CMakeLists.txt 
+--- CMakeLists.txt      2015-09-05 22:40:50.000000000 +0200
++++ CMakeLists.txt      2015-09-07 12:15:33.419530808 +0200
+@@ -35,22 +35,6 @@
+ # Definitions
+ add_definitions(-Wall -std=c++11 -DQT_NO_CAST_FROM_ASCII)
+ 
+-# Default build type
+-if(NOT CMAKE_BUILD_TYPE)
+-    set(CMAKE_BUILD_TYPE Release)
+-endif()
+-
+-# Handle build type
+-if(CMAKE_BUILD_TYPE MATCHES [Dd]ebug)
+-    message(STATUS "Debug build")
+-    add_definitions(-DDEBUG)
+-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -O0")
+-else()
+-    message(STATUS "Release build")
+-    add_definitions(-DNDEBUG)
+-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O2")
+-endif()
+-
+ # Default absolute paths
+ if(NOT DEFINED CMAKE_INSTALL_SYSCONFDIR)
+     set(CMAKE_INSTALL_SYSCONFDIR "/etc")
diff --git a/x11-misc/sddm/sddm-0.11.0-r1.ebuild b/x11-misc/sddm/sddm-0.11.0-r1.ebuild
deleted file mode 100644
index 2cab5ed1980c..000000000000
--- a/x11-misc/sddm/sddm-0.11.0-r1.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit cmake-utils toolchain-funcs user
-
-DESCRIPTION="Simple Desktop Display Manager"
-HOMEPAGE="https://github.com/sddm/sddm"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64 ~arm ~x86"
-
-LICENSE="GPL-2+ MIT CC-BY-3.0 public-domain"
-SLOT="0"
-IUSE="consolekit systemd +upower"
-REQUIRED_USE="?? ( upower systemd )"
-
-RDEPEND="sys-libs/pam
-	>=x11-base/xorg-server-1.15.1
-	x11-libs/libxcb[xkb(-)]
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtdeclarative:5
-	dev-qt/linguist-tools:5
-	dev-qt/qttest:5
-	systemd? ( sys-apps/systemd:= )
-	upower? ( || ( sys-power/upower sys-power/upower-pm-utils ) )"
-DEPEND="${RDEPEND}
-	>=sys-devel/gcc-4.7.0
-	virtual/pkgconfig"
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		[[ $(gcc-version) < 4.7 ]] && \
-			die 'The active compiler needs to be gcc 4.7 (or newer)'
-	fi
-}
-
-src_prepare() {
-	use consolekit && epatch "${FILESDIR}/${P}-consolekit.patch"
-	use upower && epatch "${FILESDIR}/${PN}-0.10.0-upower.patch"
-	# fix bug 552318
-	epatch "${FILESDIR}/${P}-dbus-config.patch"
-
-	# respect user's cflags
-	sed -e 's|-Wall -march=native||' \
-		-e 's|-O2||' \
-		-i CMakeLists.txt || die 'sed failed'
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_no systemd SYSTEMD)
-		-DDBUS_CONFIG_FILENAME:STRING="org.freedesktop.sddm.conf"
-	)
-	cmake-utils_src_configure
-}
-
-pkg_postinst() {
-	if use consolekit; then
-		ewarn "This display manager doesn't have native built-in ConsoleKit support."
-		ewarn "In order to use ConsoleKit pam module with this display manager,"
-		ewarn "you should remove the \"nox11\" parameter from pm_ck_connector.so"
-		ewarn "line in /etc/pam.d/system-login"
-	fi
-	ewarn "Add the sddm user manually to the video group"
-	ewarn "if you experience flickering or other rendering issues of sddm-greeter"
-	ewarn "see https://github.com/gentoo/qt/pull/52"
-}
-
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 /var/lib/sddm ${PN}
-}
diff --git a/x11-misc/sddm/sddm-0.11.0-r2.ebuild b/x11-misc/sddm/sddm-0.11.0-r2.ebuild
deleted file mode 100644
index 5057c94fd70b..000000000000
--- a/x11-misc/sddm/sddm-0.11.0-r2.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit cmake-utils toolchain-funcs user
-
-DESCRIPTION="Simple Desktop Display Manager"
-HOMEPAGE="https://github.com/sddm/sddm"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64 ~arm ~x86"
-
-LICENSE="GPL-2+ MIT CC-BY-3.0 public-domain"
-SLOT="0"
-IUSE="consolekit systemd +upower"
-REQUIRED_USE="?? ( upower systemd )"
-
-RDEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtdeclarative:5
-	dev-qt/linguist-tools:5
-	dev-qt/qttest:5
-	sys-libs/pam
-	>=x11-base/xorg-server-1.15.1
-	x11-libs/libxcb[xkb(-)]
-	consolekit? ( >=sys-auth/consolekit-0.9.4 )
-	systemd? ( sys-apps/systemd:= )
-	upower? ( || ( sys-power/upower sys-power/upower-pm-utils ) )"
-DEPEND="${RDEPEND}
-	>=sys-devel/gcc-4.7.0
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}/${P}-consolekit2.patch"
-	"${FILESDIR}/${P}-dbus-config.patch"
-)
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != binary  && $(tc-getCC) == *gcc* ]]; then
-		if [[ $(gcc-major-version) -lt 4 || $(gcc-major-version) == 4 && $(gcc-minor-version) -lt 7 ]] ; then
-			die 'The active compiler needs to be gcc 4.7 (or newer)'
-		fi
-	fi
-}
-
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 /var/lib/sddm ${PN}
-}
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	use consolekit && epatch "${FILESDIR}/${PN}-0.10.0-consolekit.patch"
-	use upower && epatch "${FILESDIR}/${P}-upower.patch"
-
-	# respect user's cflags
-	sed -e 's|-Wall -march=native||' \
-		-e 's|-O2||' \
-		-i CMakeLists.txt || die 'sed failed'
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_no systemd SYSTEMD)
-		-DDBUS_CONFIG_FILENAME:STRING="org.freedesktop.sddm.conf"
-	)
-	cmake-utils_src_configure
-}
-
-pkg_postinst() {
-	ewarn "Add the sddm user manually to the video group"
-	ewarn "if you experience flickering or other rendering issues of sddm-greeter"
-	ewarn "see https://github.com/gentoo/qt/pull/52"
-}
diff --git a/x11-misc/sddm/sddm-0.11.0-r3.ebuild b/x11-misc/sddm/sddm-0.11.0-r3.ebuild
new file mode 100644
index 000000000000..5c7c96445b93
--- /dev/null
+++ b/x11-misc/sddm/sddm-0.11.0-r3.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit cmake-utils toolchain-funcs user
+
+DESCRIPTION="Simple Desktop Display Manager"
+HOMEPAGE="https://github.com/sddm/sddm"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~amd64 ~arm ~x86"
+
+LICENSE="GPL-2+ MIT CC-BY-3.0 public-domain"
+SLOT="0"
+IUSE="consolekit systemd"
+
+RDEPEND="sys-libs/pam
+	>=x11-base/xorg-server-1.15.1
+	x11-libs/libxcb[xkb(-)]
+	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
+	dev-qt/qtdeclarative:5
+	dev-qt/linguist-tools:5
+	dev-qt/qttest:5
+	systemd? ( sys-apps/systemd:= )
+	!systemd? ( || ( sys-power/upower sys-power/upower-pm-utils ) )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != binary  && $(tc-getCC) == *gcc* ]]; then
+		if [[ $(gcc-major-version) -lt 4 || $(gcc-major-version) == 4 && $(gcc-minor-version) -lt 7 ]] ; then
+			die 'The active compiler needs to be gcc 4.7 (or newer)'
+		fi
+	fi
+}
+
+src_prepare() {
+	use consolekit && epatch "${FILESDIR}/${P}-consolekit.patch"
+	use !systemd && epatch "${FILESDIR}/${PN}-0.10.0-upower.patch"
+	# fix bug 552318
+	epatch "${FILESDIR}/${P}-dbus-config.patch"
+
+	# respect user's cflags
+	sed -e 's|-Wall -march=native||' \
+		-e 's|-O2||' \
+		-i CMakeLists.txt || die 'sed failed'
+}
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_no systemd SYSTEMD)
+		-DDBUS_CONFIG_FILENAME:STRING="org.freedesktop.sddm.conf"
+	)
+	cmake-utils_src_configure
+}
+
+pkg_postinst() {
+	if use consolekit; then
+		ewarn "This display manager doesn't have native built-in ConsoleKit support."
+		ewarn "In order to use ConsoleKit pam module with this display manager,"
+		ewarn "you should remove the \"nox11\" parameter from pm_ck_connector.so"
+		ewarn "line in /etc/pam.d/system-login"
+	fi
+	ewarn "Add the sddm user manually to the video group"
+	ewarn "if you experience flickering or other rendering issues of sddm-greeter"
+	ewarn "see https://github.com/gentoo/qt/pull/52"
+}
+
+pkg_postinst() {
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 /var/lib/${PN} ${PN} video
+}
diff --git a/x11-misc/sddm/sddm-0.12.0.ebuild b/x11-misc/sddm/sddm-0.12.0.ebuild
new file mode 100644
index 000000000000..9eca3ca7ea26
--- /dev/null
+++ b/x11-misc/sddm/sddm-0.12.0.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit cmake-utils user
+
+DESCRIPTION="Simple Desktop Display Manager"
+HOMEPAGE="https://github.com/${PN}/${PN}"
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.xz"
+KEYWORDS="~amd64 ~x86"
+
+LICENSE="GPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0 public-domain"
+SLOT="0"
+IUSE="consolekit +pam systemd"
+
+RDEPEND="dev-qt/qtcore:5
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5
+	dev-qt/qtdeclarative:5
+	dev-qt/qtnetwork:5
+	dev-qt/linguist-tools:5
+	dev-qt/qttest:5
+	>=x11-base/xorg-server-1.15.1
+	x11-libs/libxcb[xkb(-)]
+	consolekit? ( >=sys-auth/consolekit-0.9.4 )
+	pam? ( sys-libs/pam )
+	systemd? ( sys-apps/systemd:= )
+	!systemd? ( || ( sys-power/upower sys-power/upower-pm-utils ) )"
+
+DEPEND="${RDEPEND}
+	dev-python/docutils
+	virtual/pkgconfig"
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != binary  && $(tc-getCC) == *gcc* ]]; then
+		if [[ $(gcc-major-version) -lt 4 || $(gcc-major-version) == 4 && $(gcc-minor-version) -lt 7 ]] ; then
+			die 'The active compiler needs to be gcc 4.7 (or newer)'
+		fi
+	fi
+}
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	epatch "${FILESDIR}/${P}-respect-user-flags.patch"
+	use consolekit && epatch "${FILESDIR}/${PN}-0.11.0-consolekit.patch"
+}
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_no pam PAM)
+		$(cmake-utils_use_no systemd SYSTEMD)
+		-DBUILD_MAN_PAGES=ON
+		-DDBUS_CONFIG_FILENAME="org.freedesktop.sddm.conf"
+		)
+
+	cmake-utils_src_configure
+}
+
+pkg_postinst() {
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 /var/lib/${PN} ${PN} video
+}
diff --git a/x11-misc/wbar/metadata.xml b/x11-misc/wbar/metadata.xml
index a5d082ae569c..2b43af1b2da0 100644
--- a/x11-misc/wbar/metadata.xml
+++ b/x11-misc/wbar/metadata.xml
@@ -7,5 +7,6 @@
 	</use>
 	<upstream>
 		<remote-id type="google-code">wbar</remote-id>
+		<remote-id type="github">rodolf0/wbar</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/x11-misc/xvkbd/xvkbd-3.6.ebuild b/x11-misc/xvkbd/xvkbd-3.6.ebuild
index 39089235a439..850129160cc9 100644
--- a/x11-misc/xvkbd/xvkbd-3.6.ebuild
+++ b/x11-misc/xvkbd/xvkbd-3.6.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://homepage3.nifty.com/tsato/xvkbd/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86"
+KEYWORDS="amd64 ppc ~x86"
 
 RDEPEND="
 	x11-libs/libX11
diff --git a/x11-plugins/pidgin-opensteamworks/Manifest b/x11-plugins/pidgin-opensteamworks/Manifest
index 83d30e1a0c56..b3e06e8c6256 100644
--- a/x11-plugins/pidgin-opensteamworks/Manifest
+++ b/x11-plugins/pidgin-opensteamworks/Manifest
@@ -1,3 +1,4 @@
+DIST pidgin-opensteamworks-1.6.1.tar.gz 750495 SHA256 6a63248ed67f85185d32760246a22fea58e49af2d8a604abaa2cb3a3b5368a01 SHA512 9f025538460dda01d769501326cf7ac597e069bdef3437eea89f392bede7e620e854a8c0b0659315a0834c8f2f60a38680f1f1bdccdb65d3b13f64f7981ee55b WHIRLPOOL 30e13bbd16b560b690a38214d1fadfd4a6da7566e29035623e7b6178357baadd647c692257f251803112e61baa25aaff59281fdc70e49d9fbdf90effa023eac1
 DIST pidgin-opensteamworks-1.6.tar.gz 750167 SHA256 57dc7a3f13a5064f4374c76e693bc8f7a4f19c589949beedb7c739946bfa3e4e SHA512 1b536d4e5b34fbeb5dd48ffab30a03e17b94359d8d6243ab9482b1c0c1e404cb56a62d8f878b478e83c9d81d44a4d77eb6b9695a942dc817b445c9d7b751d58c WHIRLPOOL 679f38ff4d954db580d8185ca5edebcf5a78515b5e5c1d4a634e7f7ed9caf684c698837836ab09e0195916b0b239fd90aad37db5416f3982d912a99ebf98bee2
 DIST pidgin-opensteamworks-icons.zip 3252 SHA256 9af30f18b607fd16911c2e41b0fb594508583335804f25193da7846ea39f9fa9 SHA512 823f400bb4df9c6ddb65d8a01ec182fbbadeb955bc3e9590e88773b092b0cf79e50fc6c20d9b72def7fe9f8d6e1ac7cc087fbdb3f6ed4b76c343a29f18e6ea06 WHIRLPOOL 6b57fd61f15755b4c8f5090d7ab94974e1d8e5bd873fdc943ae762b3db97c0b65b295f8288747c98390fb1f52af27849840b084ca0e39bd88542f694decf0ff7
 DIST steam-mobile-1.4.tar.bz2 23293 SHA256 d7ac0396b17c7a45bdffaa4b1ccbc4b13118b64e9ea495fa5af629a8e29c8fab SHA512 20ac50ea49c1c0724aeb839fe46ac8a9b5a52d903ebf9bb18ab665fd32cdc4d80a426a0c2714724495ee73d758da2dbb891ac618b0689239485841fe6e6c0953 WHIRLPOOL 9f9e6ed0c1045e2fada9ea214b2be9560fc6d5937619cda403242c30ad8b1a4536fb6c0a92c311ca2998aed245d2fee5da9b48a6c8766e5c098688552bee6da7
diff --git a/x11-plugins/pidgin-opensteamworks/pidgin-opensteamworks-1.6.1.ebuild b/x11-plugins/pidgin-opensteamworks/pidgin-opensteamworks-1.6.1.ebuild
new file mode 100644
index 000000000000..6d7ea1ce8976
--- /dev/null
+++ b/x11-plugins/pidgin-opensteamworks/pidgin-opensteamworks-1.6.1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit toolchain-funcs
+
+DESCRIPTION="Steam protocol plugin for pidgin"
+HOMEPAGE="https://github.com/eionrobb/pidgin-opensteamworks"
+SRC_URI="https://github.com/EionRobb/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+RDEPEND="dev-libs/glib:2
+	dev-libs/json-glib
+	dev-libs/nss
+	gnome-base/libgnome-keyring
+	net-im/pidgin"
+DEPEND="${RDEPEND}
+	app-arch/unzip
+	virtual/pkgconfig"
+
+S=${WORKDIR}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		tc-export CC PKG_CONFIG
+	fi
+}
+
+src_prepare() {
+	# see https://code.google.com/p/pidgin-opensteamworks/issues/detail?id=31
+	cp "${FILESDIR}"/${PN}-1.3-Makefile "${S}"/${P}/steam-mobile/Makefile || die
+	unzip "${S}"/${P}/steam-mobile/releases/icons.zip || die
+}
+
+src_compile() {
+	pushd ${P}/steam-mobile || die
+	default
+	popd || die
+}
+
+src_install() {
+	pushd ${P}/steam-mobile || die
+	default
+	popd || die
+	insinto /usr/share/pixmaps/pidgin/protocols
+	doins -r "${WORKDIR}"/{16,48}
+	dodoc ${P}/README.md
+}
diff --git a/x11-plugins/pidgintex/metadata.xml b/x11-plugins/pidgintex/metadata.xml
index 820799abbc00..a3441f9bf467 100644
--- a/x11-plugins/pidgintex/metadata.xml
+++ b/x11-plugins/pidgintex/metadata.xml
@@ -8,5 +8,6 @@ intended for math but mathTeX is fully compatible with LaTeX and any package can
 be used and mimeTeX also supports many other features.</longdescription>
 	<upstream>
 		<remote-id type="google-code">pidgintex</remote-id>
+		<remote-id type="github">Micket/pidgintex</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/x11-plugins/prpltwtr/metadata.xml b/x11-plugins/prpltwtr/metadata.xml
index 812e5886b4c9..fed61c0c299f 100644
--- a/x11-plugins/prpltwtr/metadata.xml
+++ b/x11-plugins/prpltwtr/metadata.xml
@@ -7,5 +7,6 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="google-code">prpltwtr</remote-id>
+		<remote-id type="github">mikeage/prpltwtr</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/x11-terms/gnome-terminal/gnome-terminal-3.16.2-r2.ebuild b/x11-terms/gnome-terminal/gnome-terminal-3.16.2-r2.ebuild
index e8ad4ac15308..38e979a22d8a 100644
--- a/x11-terms/gnome-terminal/gnome-terminal-3.16.2-r2.ebuild
+++ b/x11-terms/gnome-terminal/gnome-terminal-3.16.2-r2.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Terminal/"
 LICENSE="GPL-3+"
 SLOT="0"
 IUSE="debug +gnome-shell +nautilus vanilla"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux"
 
 # FIXME: automagic dependency on gtk+[X]
 RDEPEND="
diff --git a/x11-terms/guake/guake-0.5.1.ebuild b/x11-terms/guake/guake-0.5.1.ebuild
index 823ee197c24a..4311c9bf9c2a 100644
--- a/x11-terms/guake/guake-0.5.1.ebuild
+++ b/x11-terms/guake/guake-0.5.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -12,7 +12,7 @@ inherit autotools gnome2 python-single-r1
 
 DESCRIPTION="Drop-down terminal for GTK+ desktops"
 HOMEPAGE="https://github.com/Guake/guake"
-SRC_URI="https://github.com/${PN^}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/x11-terms/guake/guake-0.5.2.ebuild b/x11-terms/guake/guake-0.5.2.ebuild
index a2be1bf36cf9..b7de99a60ea2 100644
--- a/x11-terms/guake/guake-0.5.2.ebuild
+++ b/x11-terms/guake/guake-0.5.2.ebuild
@@ -12,7 +12,7 @@ inherit autotools gnome2 python-single-r1
 
 DESCRIPTION="Drop-down terminal for GTK+ desktops"
 HOMEPAGE="https://github.com/Guake/guake"
-SRC_URI="https://github.com/${PN^}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/x11-terms/guake/guake-0.6.1.ebuild b/x11-terms/guake/guake-0.6.1.ebuild
index 49f933adda9a..4311c9bf9c2a 100644
--- a/x11-terms/guake/guake-0.6.1.ebuild
+++ b/x11-terms/guake/guake-0.6.1.ebuild
@@ -12,7 +12,7 @@ inherit autotools gnome2 python-single-r1
 
 DESCRIPTION="Drop-down terminal for GTK+ desktops"
 HOMEPAGE="https://github.com/Guake/guake"
-SRC_URI="https://github.com/${PN^}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/x11-terms/guake/guake-0.7.0.ebuild b/x11-terms/guake/guake-0.7.0.ebuild
index f62f5ce75243..791869257bca 100644
--- a/x11-terms/guake/guake-0.7.0.ebuild
+++ b/x11-terms/guake/guake-0.7.0.ebuild
@@ -12,7 +12,7 @@ inherit autotools eutils gnome2 python-single-r1
 
 DESCRIPTION="Drop-down terminal for GTK+ desktops"
 HOMEPAGE="https://github.com/Guake/guake"
-SRC_URI="https://github.com/${PN^}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/x11-terms/guake/guake-0.7.2.ebuild b/x11-terms/guake/guake-0.7.2.ebuild
index 8d97e7efbac7..f6523dd92c71 100644
--- a/x11-terms/guake/guake-0.7.2.ebuild
+++ b/x11-terms/guake/guake-0.7.2.ebuild
@@ -12,7 +12,7 @@ inherit autotools eutils gnome2 python-single-r1
 
 DESCRIPTION="Drop-down terminal for GTK+ desktops"
 HOMEPAGE="https://github.com/Guake/guake"
-SRC_URI="https://github.com/${PN^}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/x11-terms/guake/guake-0.8.0.ebuild b/x11-terms/guake/guake-0.8.0.ebuild
index 1ee09ee91601..0cdc6ed49b4a 100644
--- a/x11-terms/guake/guake-0.8.0.ebuild
+++ b/x11-terms/guake/guake-0.8.0.ebuild
@@ -12,7 +12,7 @@ inherit autotools eutils gnome2 python-single-r1
 
 DESCRIPTION="Drop-down terminal for GTK+ desktops"
 HOMEPAGE="https://github.com/Guake/guake"
-SRC_URI="https://github.com/${PN^}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/x11-terms/mlterm/Manifest b/x11-terms/mlterm/Manifest
index 3c171ef542de..dcc398db313d 100644
--- a/x11-terms/mlterm/Manifest
+++ b/x11-terms/mlterm/Manifest
@@ -1,3 +1,2 @@
-DIST mlterm-3.0.11.tar.gz 4328395 SHA256 808f15756aa40ada65a9b5760d9d1e4f281b62bb915ab51f4dd44e21a43f1e55 SHA512 e624ed4be1dce7b827e22981648d5574e9ae0543dbf2ca0bd9d7ab9fe17860c160e2bd7ad4a36044018daface70533518de7b9feba80e26605dc14d9e4d26d72 WHIRLPOOL 173721847d75878e445b928773298b53d93aebac88f727095406cb2e6e1460088cec1a83e53e2bc87d1f85c7656794aadf3def62f9f1e3919e676f7a9ecfa6f8
 DIST mlterm-3.4.5.tar.gz 3659801 SHA256 7df146099e1d578caddaeb7e93459f96ca1e2381fcc51157a25fe00336072752 SHA512 a85d092680dfe5498a90a4ad4935d441e41efa4ce3aa26f2e8897ef254f9c20d053bb045b5709626ee5bb4c9fdecda9f311a26db7fac6d6369d50336af7ab1f5 WHIRLPOOL 4533009727ad30b94b9b2814a17464975986df7eb2a42b383e654b1233651455a1ff938fae5273af350ccce29cbe08c7e68d26237a511ab7e3fcc45d05665b58
 DIST mlterm-3.5.0.tar.gz 3707639 SHA256 dedb211c52a8cdaa8891920da0a4f08f4b72f7b3514a5acb038b38419b24e4d3 SHA512 aaeac36a23d8544428b511760a5a23a843509fb75ceec59fea6f012d1626ca99f2772b9b18155d6b527482de649304b7e01ee8b7caef211bf5a01d71718d5ca8 WHIRLPOOL 347286ddcdc4aa97f6ebaa55ddcc0d8930f8396491b2d999d504cea2041d61b9eea090b70921b6f35c4f3eef26093403fcdde6538b1fcdb21299aae348b906ad
diff --git a/x11-terms/mlterm/mlterm-3.0.11-r1.ebuild b/x11-terms/mlterm/mlterm-3.0.11-r1.ebuild
deleted file mode 100644
index d4e9eb62fd24..000000000000
--- a/x11-terms/mlterm/mlterm-3.0.11-r1.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="3"
-inherit autotools eutils
-
-IUSE="bidi debug gtk ibus libssh2 m17n-lib nls scim static-libs uim xft"
-
-DESCRIPTION="A multi-lingual terminal emulator"
-HOMEPAGE="http://mlterm.sourceforge.net/"
-SRC_URI="mirror://sourceforge/mlterm/${P}.tar.gz"
-
-SLOT="0"
-KEYWORDS="amd64 hppa ppc ppc64 x86"
-LICENSE="BSD"
-
-RDEPEND="|| ( sys-libs/libutempter sys-apps/utempter )
-	x11-libs/libX11
-	x11-libs/libICE
-	x11-libs/libSM
-	gtk? ( x11-libs/gtk+:2 )
-	xft? ( x11-libs/libXft )
-	bidi? ( >=dev-libs/fribidi-0.10.4 )
-	ibus? ( >=app-i18n/ibus-1.3 )
-	libssh2? ( net-libs/libssh2 )
-	nls? ( virtual/libintl )
-	uim? ( >=app-i18n/uim-1.0 )
-	scim? ( >=app-i18n/scim-1.4 )
-	m17n-lib? ( >=dev-libs/m17n-lib-1.2.0 )"
-#	vte? ( x11-libs/vte )
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )"
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PN}-2.9.4-uim15-fix.patch \
-		"${FILESDIR}"/${PN}-3.0.5-ibus.patch \
-		"${FILESDIR}"/${PN}-3.0.7-underlinking.patch
-
-	eautoconf
-}
-
-src_configure() {
-	local myconf
-
-	if use gtk ; then
-		myconf="${myconf} --with-imagelib=gdk-pixbuf"
-	else
-		myconf="${myconf} --with-tools=mlclient,mlcc"
-	fi
-
-	if use xft ; then
-		myconf="${myconf} --with-type-engines=xft"
-	else
-		myconf="${myconf} --with-type-engines=xcore"
-	fi
-
-	# iiimf isn't stable enough
-	#myconf="${myconf} $(use_enable iiimf)"
-
-	econf --enable-utmp \
-		$(use_enable bidi fribidi) \
-		$(use_enable debug) \
-		$(use_enable ibus) \
-		$(use_enable libssh2 ssh2) \
-		$(use_enable nls) \
-		$(use_enable uim) \
-		$(use_enable scim) \
-		$(use_enable m17n-lib m17nlib) \
-		$(use_enable static-libs static) \
-		${myconf} || die "econf failed"
-}
-
-src_install () {
-	emake DESTDIR="${D}" install || die
-
-	if ! use static-libs ; then
-		find "${ED}" -name '*.la' -delete || die
-	fi
-
-	doicon contrib/icon/mlterm* || die
-	make_desktop_entry mlterm mlterm mlterm-icon "System;TerminalEmulator" || die
-
-	dodoc ChangeLog README || die
-
-	docinto ja
-	dodoc doc/ja/* || die
-	docinto en
-	dodoc doc/en/* || die
-}
diff --git a/x11-terms/roxterm/roxterm-2.9.3.ebuild b/x11-terms/roxterm/roxterm-2.9.3.ebuild
deleted file mode 100644
index 1f02fd0d597f..000000000000
--- a/x11-terms/roxterm/roxterm-2.9.3.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit gnome2-utils python toolchain-funcs
-
-DESCRIPTION="A terminal emulator designed to integrate with the ROX environment"
-HOMEPAGE="http://roxterm.sourceforge.net/"
-SRC_URI="mirror://sourceforge/roxterm/${P}.tar.bz2"
-
-LICENSE="GPL-2 LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="nls"
-
-RDEPEND=">=dev-libs/dbus-glib-0.100
-	>=dev-libs/glib-2.28
-	x11-libs/gtk+:3
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/vte:2.90"
-DEPEND="${RDEPEND}
-	dev-lang/python:2.7
-	dev-libs/libxslt
-	dev-python/lockfile
-	virtual/pkgconfig
-	|| ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] )
-	nls? ( app-text/po4a sys-devel/gettext )"
-
-pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
-}
-
-src_prepare() {
-	python_convert_shebangs 2 mscript.py
-}
-
-src_configure() {
-	local myconf=( CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" --prefix=/usr --docdir=/usr/share/doc/${PF} --destdir="${D}" )
-	use nls || myconf+=( --disable-gettext --disable-po4a --disable-translations )
-	./mscript.py configure "${myconf[@]}"
-}
-
-src_compile() {
-	./mscript.py build
-}
-
-src_install() {
-	./mscript.py install
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/x11-terms/terminator/Manifest b/x11-terms/terminator/Manifest
index 1f8d777adf7c..3990ad0aa2eb 100644
--- a/x11-terms/terminator/Manifest
+++ b/x11-terms/terminator/Manifest
@@ -1,2 +1,3 @@
 DIST terminator-0.97.tar.gz 5025337 SHA256 0281b568913f392eec92ebee3c6fea15afe4f4e01869bad38d9efe0eb305be49 SHA512 ac1dfb5c014323ddd3b3347645ac26083d96fe8e895d31c5992d185863d40b5f1a67c5db1315b48f483d9511faeb1adb16133a4aef1e1f178656f3437d4a7470 WHIRLPOOL 9d83bd34e1018dc535af573af27d08b425def1af5498de7be793e7c90298d0140c2e78479bae4264fa7315bcfa9b36d2d464f822b58af0d7452802a3cfc18583
+DIST terminator-0.98.tar.gz 6007243 SHA256 0a6d8c9ffe36d67e60968fbf2752c521e5d498ceda42ef171ad3e966c02f26c1 SHA512 c40ac1929bb446239f769d33f37a6d49ee79ea10755dda4bbbd228763f13661f0ef7efd950a592462150237e516077311318e2a19c9f08adac76a418cf633573 WHIRLPOOL b9a6e9bba8a945ca51aca6936b00dfc51b9c1d266315450b2f63af2d64600c18a7ff9cce712a342f236aded0bbda07b7d1a979685f68d45006a14cf7b0d9a160
 DIST terminator_0.96.tar.gz 264226 SHA256 d708c783c36233fcafbd0139a91462478ae40f5cf696ef4acfcaf5891a843201 SHA512 f74b5887ea7a11bf5c6866eae5e879a60badd81dd5056cfd0fdb5e4940b81917e6cd05ea50b56a9c7beba8e9fc9e842b25d3c8ad3ed7b574b72f43a1d4fc6c5e WHIRLPOOL 53fed7d74a3a76e7cca01cb0ab7f1780f981b81aec9606a1f4416c3e786773aca41abac174e40f1b49b9285edc9d7c8fcf599395c09a9a23ec3ec4d745e35b55
diff --git a/x11-terms/terminator/terminator-0.96-r2.ebuild b/x11-terms/terminator/terminator-0.96-r2.ebuild
deleted file mode 100644
index a9adbdf3eb05..000000000000
--- a/x11-terms/terminator/terminator-0.96-r2.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-DISTUTILS_NO_PARALLEL_BUILD=true
-
-inherit gnome2 distutils-r1
-
-DESCRIPTION="Multiple GNOME terminals in one window"
-HOMEPAGE="http://www.tenshu.net/p/terminator.html"
-SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${PN}_${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="dbus gnome +libnotify"
-
-RDEPEND="
-	dev-libs/keybinder:0[python]
-	x11-libs/vte:0[python]
-	dbus? ( sys-apps/dbus )
-	gnome? (
-		dev-python/gconf-python
-		dev-python/libgnome-python
-		dev-python/pygobject:2[${PYTHON_USEDEP}]
-		dev-python/pygtk:2[${PYTHON_USEDEP}]
-		)
-	libnotify? ( dev-python/notify-python[${PYTHON_USEDEP}] )"
-DEPEND="dev-util/intltool"
-
-python_prepare_all() {
-	local PATCHES=(
-		"${FILESDIR}"/0.90-without-icon-cache.patch
-		"${FILESDIR}"/0.94-session.patch
-	)
-	distutils-r1_python_prepare_all
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-}
-
-pkg_postrm() {
-	gnome2_pkg_postrm
-}
diff --git a/x11-terms/terminator/terminator-0.96-r3.ebuild b/x11-terms/terminator/terminator-0.96-r3.ebuild
deleted file mode 100644
index f4711d75c06d..000000000000
--- a/x11-terms/terminator/terminator-0.96-r3.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-DISTUTILS_NO_PARALLEL_BUILD=true
-
-inherit gnome2 distutils-r1
-
-DESCRIPTION="Multiple GNOME terminals in one window"
-HOMEPAGE="http://www.tenshu.net/p/terminator.html"
-SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${PN}_${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="dbus gnome +libnotify"
-
-RDEPEND="
-	dev-libs/keybinder:0[python]
-	x11-libs/vte:0[python]
-	dbus? ( sys-apps/dbus )
-	gnome? (
-		dev-python/gconf-python
-		dev-python/libgnome-python
-		dev-python/pygobject:2[${PYTHON_USEDEP}]
-		dev-python/pygtk:2[${PYTHON_USEDEP}]
-		)
-	libnotify? ( dev-python/notify-python[${PYTHON_USEDEP}] )"
-DEPEND="dev-util/intltool"
-
-python_prepare_all() {
-	local PATCHES=(
-		"${FILESDIR}"/0.90-without-icon-cache.patch
-		"${FILESDIR}"/0.94-session.patch
-	)
-
-	local i p
-	if [[ -n "${LINGUAS+x}" ]] ; then
-		pushd "${S}"/po > /dev/null
-		strip-linguas -i .
-		for i in *.po; do
-			if ! has ${i%.po} ${LINGUAS} ; then
-				rm ${i} || die
-			fi
-		done
-		popd > /dev/null
-	fi
-
-	distutils-r1_python_prepare_all
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-}
-
-pkg_postrm() {
-	gnome2_pkg_postrm
-}
diff --git a/x11-terms/terminator/terminator-0.97.ebuild b/x11-terms/terminator/terminator-0.97.ebuild
deleted file mode 100644
index b88a5f671306..000000000000
--- a/x11-terms/terminator/terminator-0.97.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-DISTUTILS_NO_PARALLEL_BUILD=true
-
-inherit gnome2 distutils-r1
-
-DESCRIPTION="Multiple GNOME terminals in one window"
-HOMEPAGE="http://www.tenshu.net/p/terminator.html"
-SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="dbus gnome +libnotify"
-
-RDEPEND="
-	dev-libs/keybinder:0[python]
-	x11-libs/vte:0[python]
-	dbus? ( sys-apps/dbus )
-	gnome? (
-		dev-python/gconf-python
-		dev-python/libgnome-python
-		dev-python/pygobject:2[${PYTHON_USEDEP}]
-		dev-python/pygtk:2[${PYTHON_USEDEP}]
-		)
-	libnotify? ( dev-python/notify-python[${PYTHON_USEDEP}] )"
-DEPEND="dev-util/intltool"
-
-S="${WORKDIR}"/trunk
-
-python_prepare_all() {
-	local PATCHES=(
-		"${FILESDIR}"/0.90-without-icon-cache.patch
-		"${FILESDIR}"/0.94-session.patch
-	)
-
-	local i p
-	if [[ -n "${LINGUAS+x}" ]] ; then
-		pushd "${S}"/po > /dev/null
-		strip-linguas -i .
-		for i in *.po; do
-			if ! has ${i%.po} ${LINGUAS} ; then
-				rm ${i} || die
-			fi
-		done
-		popd > /dev/null
-	fi
-
-	distutils-r1_python_prepare_all
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-}
-
-pkg_postrm() {
-	gnome2_pkg_postrm
-}
diff --git a/x11-terms/terminator/terminator-0.98.ebuild b/x11-terms/terminator/terminator-0.98.ebuild
new file mode 100644
index 000000000000..d5c931d61ac5
--- /dev/null
+++ b/x11-terms/terminator/terminator-0.98.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit gnome2 distutils-r1 virtualx
+
+DESCRIPTION="Multiple GNOME terminals in one window"
+HOMEPAGE="http://www.tenshu.net/p/terminator.html"
+SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="dbus doc gnome +libnotify"
+
+RDEPEND="
+	dev-libs/keybinder:0[python]
+	x11-libs/vte:0[python]
+	dbus? ( sys-apps/dbus )
+	gnome? (
+		dev-python/gconf-python
+		dev-python/libgnome-python
+		dev-python/pygobject:2[${PYTHON_USEDEP}]
+		dev-python/pygtk:2[${PYTHON_USEDEP}]
+		)
+	libnotify? ( dev-python/notify-python[${PYTHON_USEDEP}] )"
+DEPEND="dev-util/intltool"
+
+python_prepare_all() {
+	local PATCHES=(
+		"${FILESDIR}"/0.90-without-icon-cache.patch
+		"${FILESDIR}"/0.94-session.patch
+	)
+
+	local i p
+	if [[ -n "${LINGUAS+x}" ]] ; then
+		pushd "${S}"/po > /dev/null
+		strip-linguas -i .
+		for i in *.po; do
+			if ! has ${i%.po} ${LINGUAS} ; then
+				rm ${i} || die
+			fi
+		done
+		popd > /dev/null
+	fi
+
+	sed \
+		-e "/'share', 'doc'/s:${PN}:${PF}:g" \
+		-i setup.py terminatorlib/util.py || die
+
+	use doc || \
+		sed \
+			-e '/install_documentation/s:True:False:g' \
+			-i setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	VIRTUALX_COMMAND="esetup.py"
+	virtualmake test
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+}
+
+pkg_postrm() {
+	gnome2_pkg_postrm
+}
diff --git a/x11-themes/adwaita-icon-theme/adwaita-icon-theme-3.16.2.1.ebuild b/x11-themes/adwaita-icon-theme/adwaita-icon-theme-3.16.2.1.ebuild
index 340084a3a87a..8c0a1ceb4ce9 100644
--- a/x11-themes/adwaita-icon-theme/adwaita-icon-theme-3.16.2.1.ebuild
+++ b/x11-themes/adwaita-icon-theme/adwaita-icon-theme-3.16.2.1.ebuild
@@ -17,7 +17,7 @@ LICENSE="|| ( LGPL-3 CC-BY-SA-3.0 )
 	branding? ( CC-Sampling-Plus-1.0 )"
 SLOT="0"
 IUSE="branding"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
 
 COMMON_DEPEND="
 	>=x11-themes/hicolor-icon-theme-0.10
diff --git a/x11-themes/claws-mail-themes/Manifest b/x11-themes/claws-mail-themes/Manifest
index a66f5e064faf..92eb436410bd 100644
--- a/x11-themes/claws-mail-themes/Manifest
+++ b/x11-themes/claws-mail-themes/Manifest
@@ -1 +1,2 @@
 DIST claws-mail-themes-20120129.tar.gz 3557127 SHA256 57c2423381bd6c4f06372037390170fd2a2d5d35add3dfa3e9a32fefd90e598a SHA512 8429710cfe6ccd54bc938087cbfe5c035f50e20f152ce80f680c71ea5df3968c5966ec64029211c8bd3087f79a5c648c10d4950401ef483e52ef8231bf8da2d0 WHIRLPOOL c0271193ef4be6cac131aa97081a11c9a30b03303e1fcfa55d767757d2a2cc39b38ab5c5c6baddb5eb803e8b9e9c31dab6b2d35c4f00faf712030fa3c40cc54e
+DIST claws-mail-themes-20140629.tar.gz 3611756 SHA256 bda60d0600d1931b08c67da62bf0dc79aaff8e0d0ca21aadf3a4fa4347483cc9 SHA512 afde84c76185445f0a8ede874ee3a9b1d20cc2c390c4393aa07d1fc4aca3614d74885679cd3a296544e36d1dc8b08d623deca1616e984dc921c9ccf12f58bea9 WHIRLPOOL f5c5d004011df6f8ec665987d0c093c71aad0f1918f15fa194942e0e9b6b740c123bccee8f413c21b935846d0d596a1f6a66fa62cf266f9bf3034a38ed8002a3
diff --git a/x11-themes/claws-mail-themes/claws-mail-themes-20140629.ebuild b/x11-themes/claws-mail-themes/claws-mail-themes-20140629.ebuild
new file mode 100644
index 000000000000..49ce42ca66d5
--- /dev/null
+++ b/x11-themes/claws-mail-themes/claws-mail-themes-20140629.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+DESCRIPTION="Iconsets for Claws Mail"
+HOMEPAGE="http://www.claws-mail.org/"
+SRC_URI="http://www.claws-mail.org/themes/${P}.tar.gz"
+
+LICENSE="GPL-2 GPL-3 CC-BY-3.0 CC-BY-SA-2.5 CC-BY-NC-SA-3.0 CC-BY-ND-3.0 MPL-1.1 freedist public-domain all-rights-reserved"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~x86"
+RESTRICT="mirror bindist"
+
+RDEPEND="mail-client/claws-mail"
+DEPEND=""
+
+src_install() {
+	insinto /usr/share/claws-mail/themes
+	doins -r *
+}
diff --git a/x11-themes/gnome-backgrounds/gnome-backgrounds-3.16.0.ebuild b/x11-themes/gnome-backgrounds/gnome-backgrounds-3.16.0.ebuild
index d3c4b3a68a36..fa041739be25 100644
--- a/x11-themes/gnome-backgrounds/gnome-backgrounds-3.16.0.ebuild
+++ b/x11-themes/gnome-backgrounds/gnome-backgrounds-3.16.0.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://git.gnome.org/browse/gnome-backgrounds"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
 IUSE=""
 
 RDEPEND="!<x11-themes/gnome-themes-standard-3.14"
diff --git a/x11-themes/gnome-themes-standard/gnome-themes-standard-3.16.2.ebuild b/x11-themes/gnome-themes-standard/gnome-themes-standard-3.16.2.ebuild
index 246bba32bf8e..d4cc9eab9ba4 100644
--- a/x11-themes/gnome-themes-standard/gnome-themes-standard-3.16.2.ebuild
+++ b/x11-themes/gnome-themes-standard/gnome-themes-standard-3.16.2.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://git.gnome.org/browse/gnome-themes-standard/"
 LICENSE="LGPL-2.1+"
 SLOT="0"
 IUSE="+gtk"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~x64-solaris ~x86-solaris"
 
 COMMON_DEPEND="
 	gnome-base/librsvg:2[${MULTILIB_USEDEP}]
diff --git a/x11-themes/gtk-engines/files/gtk-engines-2.20.2-auto-mnemonics.patch b/x11-themes/gtk-engines/files/gtk-engines-2.20.2-auto-mnemonics.patch
new file mode 100644
index 000000000000..dc6ca97c8547
--- /dev/null
+++ b/x11-themes/gtk-engines/files/gtk-engines-2.20.2-auto-mnemonics.patch
@@ -0,0 +1,12 @@
+diff -up gtk-engines-2.19.0/themes/Clearlooks/gtk-2.0/gtkrc.mnemonics gtk-engines-2.19.0/themes/Clearlooks/gtk-2.0/gtkrc
+--- gtk-engines-2.19.0/themes/Clearlooks/gtk-2.0/gtkrc.mnemonics	2010-03-23 19:47:09.838066932 -0400
++++ gtk-engines-2.19.0/themes/Clearlooks/gtk-2.0/gtkrc	2010-01-12 22:29:47.507357239 -0500
+@@ -3,6 +3,8 @@
+ 
+ gtk-color-scheme = "base_color:#ffffff\nfg_color:#000000\ntooltip_fg_color:#000000\nselected_bg_color:#86ABD9\nselected_fg_color:#ffffff\ntext_color:#1A1A1A\nbg_color:#EDECEB\ntooltip_bg_color:#E7F3FD"
+ 
++gtk-auto-mnemonics = 1
++
+ style "default" {
+ 	xthickness = 1
+ 	ythickness = 1
diff --git a/x11-themes/gtk-engines/files/gtk-engines-2.20.2-change-bullet.patch b/x11-themes/gtk-engines/files/gtk-engines-2.20.2-change-bullet.patch
new file mode 100644
index 000000000000..bc80a92bf511
--- /dev/null
+++ b/x11-themes/gtk-engines/files/gtk-engines-2.20.2-change-bullet.patch
@@ -0,0 +1,11 @@
+--- gtk-engines-2.18.2/themes/Clearlooks/gtk-2.0/gtkrc.change-bullet	2009-08-25 11:25:25.348520380 -0400
++++ gtk-engines-2.18.2/themes/Clearlooks/gtk-2.0/gtkrc	2009-08-25 11:26:30.477514482 -0400
+@@ -16,6 +16,8 @@ style "default" {
+ 
+ 	GtkCheckButton::indicator-size = 14
+ 
++	GtkEntry::invisible-char = 0x2022
++
+ 	GtkPaned::handle-size = 6
+ 
+ 	GtkRange::trough-border = 0
diff --git a/x11-themes/gtk-engines/files/gtk-engines-2.20.2-java-look.patch b/x11-themes/gtk-engines/files/gtk-engines-2.20.2-java-look.patch
new file mode 100644
index 000000000000..b038366db282
--- /dev/null
+++ b/x11-themes/gtk-engines/files/gtk-engines-2.20.2-java-look.patch
@@ -0,0 +1,22 @@
+--- gtk-engines-2.19.0/themes/Clearlooks/gtk-2.0/gtkrc.orig	2011-11-27 14:25:46.523593240 -0800
++++ gtk-engines-2.19.0/themes/Clearlooks/gtk-2.0/gtkrc	2011-11-27 14:25:34.400658810 -0800
+@@ -207,8 +207,8 @@
+ }
+ 
+ style "menu" {
+-	xthickness = 0
+-	ythickness = 0
++	xthickness = 2
++	ythickness = 2
+ 
+ 	bg[NORMAL]        = shade (1.08, @bg_color)
+ 
+@@ -229,7 +229,7 @@
+ # 2. The line should go to the edges (ie. no border at the left/right)
+ style "separator_menu_item" {
+ 	xthickness = 1
+-	ythickness = 0
++	ythickness = 1
+ 
+ 	GtkSeparatorMenuItem::horizontal-padding = 0
+ 	GtkWidget::wide-separators = 1
diff --git a/x11-themes/gtk-engines/files/gtk-engines-2.20.2-tooltips.patch b/x11-themes/gtk-engines/files/gtk-engines-2.20.2-tooltips.patch
new file mode 100644
index 000000000000..898fc0ce56fe
--- /dev/null
+++ b/x11-themes/gtk-engines/files/gtk-engines-2.20.2-tooltips.patch
@@ -0,0 +1,25 @@
+diff -up gtk-engines-2.18.4/themes/Clearlooks/gtk-2.0/gtkrc.tooltips gtk-engines-2.18.4/themes/Clearlooks/gtk-2.0/gtkrc
+--- gtk-engines-2.18.4/themes/Clearlooks/gtk-2.0/gtkrc.tooltips	2009-10-23 17:28:48.131886076 -0400
++++ gtk-engines-2.18.4/themes/Clearlooks/gtk-2.0/gtkrc	2009-10-23 17:29:58.968890361 -0400
+@@ -1,7 +1,7 @@
+ 
+ # Please keep this gtkrc in sync with the other ones from Clearlooks based themes.
+ 
+-gtk-color-scheme = "base_color:#ffffff\nfg_color:#000000\ntooltip_fg_color:#000000\nselected_bg_color:#86ABD9\nselected_fg_color:#ffffff\ntext_color:#1A1A1A\nbg_color:#EDECEB\ntooltip_bg_color:#F5F5B5"
++gtk-color-scheme = "base_color:#ffffff\nfg_color:#000000\ntooltip_fg_color:#000000\nselected_bg_color:#86ABD9\nselected_fg_color:#ffffff\ntext_color:#1A1A1A\nbg_color:#EDECEB\ntooltip_bg_color:#E7F3FD"
+ 
+ style "default" {
+ 	xthickness = 1
+@@ -276,9 +276,11 @@ style "treeview_header" = "default" {
+ }
+ 
+ style "tooltips" {
+-	xthickness = 4
++	xthickness = 8
+ 	ythickness = 4
+ 
++	GtkWidget::new-tooltip-style = 1
++
+ 	bg[NORMAL]        = @tooltip_bg_color
+ 	fg[NORMAL]        = @tooltip_fg_color
+ }
diff --git a/x11-themes/gtk-engines/files/gtk-engines-2.20.2-window-dragging.patch b/x11-themes/gtk-engines/files/gtk-engines-2.20.2-window-dragging.patch
new file mode 100644
index 000000000000..94abccd81ba8
--- /dev/null
+++ b/x11-themes/gtk-engines/files/gtk-engines-2.20.2-window-dragging.patch
@@ -0,0 +1,12 @@
+diff -up gtk-engines-2.19.0/themes/Clearlooks/gtk-2.0/gtkrc.dragbar gtk-engines-2.19.0/themes/Clearlooks/gtk-2.0/gtkrc
+--- gtk-engines-2.19.0/themes/Clearlooks/gtk-2.0/gtkrc.dragbar	2010-03-23 19:50:58.478062184 -0400
++++ gtk-engines-2.19.0/themes/Clearlooks/gtk-2.0/gtkrc	2010-03-23 19:51:13.611066722 -0400
+@@ -203,6 +203,8 @@ style "comboboxentry" {
+ 
+ style "menubar" {
+ 
++        GtkWidget::window-dragging = 1
++
+ 	engine "clearlooks" {
+ 		hint = "menubar"
+ 	}
diff --git a/x11-themes/gtk-engines/gtk-engines-2.20.2-r2.ebuild b/x11-themes/gtk-engines/gtk-engines-2.20.2-r2.ebuild
new file mode 100644
index 000000000000..eb5439da4daa
--- /dev/null
+++ b/x11-themes/gtk-engines/gtk-engines-2.20.2-r2.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+GNOME_TARBALL_SUFFIX="bz2"
+
+inherit eutils gnome2 multilib-minimal
+
+DESCRIPTION="GTK+2 standard engines and themes"
+HOMEPAGE="http://www.gtk.org/"
+
+LICENSE="LGPL-2.1"
+SLOT="2"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~x86-macos ~x64-solaris ~x86-solaris"
+IUSE="accessibility lua"
+
+RDEPEND="
+	>=x11-libs/gtk+-2.24.23:2[${MULTILIB_USEDEP}]
+	lua? ( dev-lang/lua:0[${MULTILIB_USEDEP}] )
+	abi_x86_32? (
+		!<=app-emulation/emul-linux-x86-gtklibs-20140508
+		!app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)]
+	)
+"
+DEPEND="${RDEPEND}
+	>=dev-util/intltool-0.31
+	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
+"
+
+src_prepare() {
+	# Patch from 2.21.x, fixes building with glib-2.32, bug #410455
+	epatch "${FILESDIR}/${P}-glib.h.patch"
+
+	# Fix java apps look, bug #523074
+	epatch "${FILESDIR}/${P}-java-look.patch"
+
+	# Apply Fedora fixes/improvements
+	epatch "${FILESDIR}"/${P}-auto-mnemonics.patch
+	epatch "${FILESDIR}"/${P}-change-bullet.patch
+	epatch "${FILESDIR}"/${P}-tooltips.patch
+	epatch "${FILESDIR}"/${P}-window-dragging.patch
+
+	gnome2_src_prepare
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE=${S} \
+	gnome2_src_configure \
+		--enable-animation \
+		$(use_enable lua) \
+		$(use_with lua system-lua) \
+		$(use_enable accessibility hc)
+}
+
+multilib_src_install() {
+	gnome2_src_install
+}
+
+multilib_src_install_all() {
+	einstalldocs
+}
diff --git a/x11-wm/afterstep/Manifest b/x11-wm/afterstep/Manifest
index a133cbb0c621..eb97e36b0ca0 100644
--- a/x11-wm/afterstep/Manifest
+++ b/x11-wm/afterstep/Manifest
@@ -1,2 +1,3 @@
 DIST AfterStep-2.2.11.tar.bz2 6126237 SHA256 ca7e872fc4d8320899667087d934e0672a3f38264a5207ea314d3c20242903aa SHA512 cf6663427656162f20cce596f63c7368c66fb336d5865dda5127f5aae123c61d647444336cc4c339ae6c64e5f25e837c0ba8889d30b1298ef26569505e0ff3d9 WHIRLPOOL 057d2420776be19db7ddf69ca7a7a2dae570dcca3b9fad4e56e8c9b4268d1f6c5dc6cbcc45b6caab41b3c06dcf7efe2b06289cf2684ac22a3dc2879282ff898f
+DIST AfterStep-2.2.12.tar.bz2 6132233 SHA256 ff15da51d4122b8e0286567052951e11a746e7d878dade9ce37f9217439ffbc8 SHA512 5cac6ce74b24cbcc5b8e8a6f7cc9308e110f0d09597af1fa0a8730d5f5111932a23332629bc4d372fc8d9583a514d97e35f747b17decf8d4ebfe5e3f20cdbbee WHIRLPOOL eca804facc37252ebd8e3b8d02f23b6fc66f8a8895337bcfd5cbd1f88f4e09868d0e2005a8be29be785b1259914bca132da7ac63f584964e535c3108a0182028
 DIST AfterStep-2.2.9.tar.bz2 6094706 SHA256 678493cd3ec44eee219d65fee0e612f2d1e36f8b93cbabdf40a22133c0617148
diff --git a/x11-wm/afterstep/afterstep-2.2.12.ebuild b/x11-wm/afterstep/afterstep-2.2.12.ebuild
new file mode 100644
index 000000000000..20ebf4c9db2c
--- /dev/null
+++ b/x11-wm/afterstep/afterstep-2.2.12.ebuild
@@ -0,0 +1,120 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit autotools eutils flag-o-matic
+
+DESCRIPTION="A feature rich NeXTish window manager"
+HOMEPAGE="http://www.afterstep.org/"
+SRC_URI="ftp://ftp.afterstep.org/stable/AfterStep-${PV}.tar.bz2
+	mirror://sourceforge/${PN}/AfterStep-${PV}.tar.bz2"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="alsa debug dbus gif gtk jpeg cpu_flags_x86_mmx nls png svg tiff xinerama"
+
+RDEPEND="media-libs/freetype
+	alsa? ( media-libs/alsa-lib )
+	dbus? ( sys-apps/dbus )
+	jpeg? ( virtual/jpeg:= )
+	gif? ( >=media-libs/giflib-4.1.0 )
+	gtk? ( x11-libs/gtk+:2 )
+	png? ( media-libs/libpng:0= )
+	svg? ( gnome-base/librsvg:2 )
+	tiff? ( media-libs/tiff:0 )
+	x11-libs/libICE
+	x11-libs/libXext
+	x11-libs/libSM
+	x11-libs/libXmu
+	x11-libs/libXt
+	x11-libs/libX11
+	x11-libs/libXpm
+	x11-libs/libXrender
+	xinerama? ( x11-libs/libXinerama )"
+DEPEND="${RDEPEND}
+	!!media-libs/libafterimage
+	x11-proto/xextproto
+	x11-proto/xproto
+	xinerama? ( x11-proto/xineramaproto )"
+
+S=${WORKDIR}/${PN}-devel-${PV}
+
+src_prepare() {
+	sed -i -e '/^install:/s:install.alternative ::' Makefile.in || die
+	sed -i -e '/CFLAGS="-O3"/d' libAfter{Base,Image}/configure || die
+	sed -i -e '/STRIP_BINARIES/s:-s::' autoconf/configure.in || die #252119
+	sed -i -e '/--with-builtin-gif/s/$with_gif/no/' autoconf/configure.in || die #253259
+
+	pushd autoconf >/dev/null
+	eautoreconf
+	cp autoconf/config.h.in ./ || die
+	cp configure ../ || die
+	popd >/dev/null
+
+	pushd libAfterBase >/dev/null
+	eautoreconf
+	popd >/dev/null
+}
+
+src_configure() {
+	local myconf
+
+	use debug && myconf="--enable-gdb --enable-warn --enable-gprof
+		--enable-audit --enable-trace --enable-trace-x"
+
+	# Explanation of configure options
+	# ================================
+	# --with-helpcommand="xterm -e man" -  Avoid installing xiterm
+	# --with-xpm - Contained in xfree
+	# --disable-availability - So we can use complete paths for menuitems
+	# --enable-ascp - The AfterStep ControlPanel is abandoned
+	# LDCONFIG - bug #265841
+
+	LDCONFIG=/bin/true econf \
+		$(use_enable alsa) \
+		$(use_enable cpu_flags_x86_mmx mmx-optimization) \
+		$(use_enable nls i18n) \
+		$(use_enable xinerama) \
+		$(use_with dbus dbus1) \
+		$(use_with gif) \
+		$(use_with gtk) \
+		$(use_with jpeg) \
+		$(use_with png) \
+		$(use_with tiff) \
+		$(use_with svg) \
+		--with-helpcommand="xterm -e man" \
+		--disable-availability \
+		--disable-staticlibs \
+		--enable-ascp=no \
+		${myconf}
+}
+
+src_compile() {
+	# gcc: ../libAfterConf/libAfterConf.a: No such file or directory
+	# make[1]: *** [PrintDesktopEntries] Error 1
+	emake -j1
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	# Create a symlink from MonitorWharf to Wharf
+	rm "${D}"/usr/bin/MonitorWharf
+	dosym /usr/bin/Wharf /usr/bin/MonitorWharf
+
+	# Handle the documentation
+	dodoc ChangeLog INSTALL NEW* README* TEAM
+	cp -pPR TODO "${D}"/usr/share/doc/${PF}/
+	dodir /usr/share/doc/${PF}/html
+	cp -pPR doc/* "${D}"/usr/share/doc/${PF}/html
+	rm "${D}"/usr/share/doc/${PF}/html/{Makefile*,afterstepdoc.in}
+
+	insinto /usr/share/xsessions
+	newins AfterStep.desktop.final AfterStep.desktop
+
+	# For desktop managers like GDM or KDE
+	exeinto /etc/X11/Sessions
+	doexe "${FILESDIR}"/${PN}
+}
diff --git a/x11-wm/evilwm/Manifest b/x11-wm/evilwm/Manifest
index 06c560dc1fc7..f1577f614290 100644
--- a/x11-wm/evilwm/Manifest
+++ b/x11-wm/evilwm/Manifest
@@ -1,2 +1,3 @@
 DIST evilwm-1.0.1.tar.gz 31468 SHA256 79640a68f6dd7e67a1767767aba486e192d7663ccb2588154d2419b47b9ec457
 DIST evilwm-1.1.0.tar.gz 40309 SHA256 cdc763c875b64ee3734f3cb764249e91ec659f550177ec1bb564304260ef0c75
+DIST evilwm-1.1.1.tar.gz 40150 SHA256 79589c296a5915ee0bae1d231e8912601fc794d9f0a9cacb6b648ff9a5f2602a SHA512 a11af475f057bf18adef339f4772ff1291a25a19c86b7f18a4ce7821e70b039c256151232da6cca616ceea7d9242a60b055d654ce26e85384c6ba687ede7898d WHIRLPOOL 0b44393f0b62cc1396b3ad92c0ca3c618082532d2364a915a9cc33a0058b4c334e98c43a57a818c081b666a2edfb78e58410d4b2f3ae9d6ef092e4ced0972448
diff --git a/x11-wm/evilwm/evilwm-1.1.1.ebuild b/x11-wm/evilwm/evilwm-1.1.1.ebuild
new file mode 100644
index 000000000000..eb3382b64d3b
--- /dev/null
+++ b/x11-wm/evilwm/evilwm-1.1.1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit toolchain-funcs
+
+MY_P=${P/_}
+
+DESCRIPTION="A minimalist, no frills window manager for X"
+HOMEPAGE="http://www.6809.org.uk/evilwm/"
+SRC_URI="http://www.6809.org.uk/${PN}/${MY_P}.tar.gz"
+
+LICENSE="MIT 9wm"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~sparc64-solaris"
+IUSE=""
+
+RDEPEND="x11-libs/libX11
+	x11-libs/libXrandr
+	x11-libs/libXext"
+DEPEND="${RDEPEND}
+	x11-proto/xproto"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	sed -e 's/^#define DEF_FONT.*/#define DEF_FONT "fixed"/' \
+		-i evilwm.h || die
+
+	sed -e '/Encoding/d' \
+		-i ${PN}.desktop || die
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" || die
+}
+
+src_install() {
+	emake DESTDIR="${D}" prefix="${EPREFIX}/usr" INSTALL_STRIP="" install || die
+	dodoc ChangeLog README TODO || die
+
+	echo -e "#!${EPREFIX}/bin/sh\nexec \"${EPREFIX}/usr/bin/${PN}\"" > "${T}"/${PN}
+	exeinto /etc/X11/Sessions
+	doexe "${T}"/${PN} || die
+}
diff --git a/x11-wm/evilwm/metadata.xml b/x11-wm/evilwm/metadata.xml
index 14ec3954f6b7..dca146209aa5 100644
--- a/x11-wm/evilwm/metadata.xml
+++ b/x11-wm/evilwm/metadata.xml
@@ -1,7 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
+	<herd>proxy-maintainers</herd>
+	<maintainer>
+		<email>jaco@uls.co.za</email>
+		<name>Jaco Kroon</name>
+		<description>Proxy-Maintainer. Assign bugs to him</description>
+	</maintainer>
 	<longdescription>
 	A minimalist window manager for the X Window System. It maximises screen 
 	real estate and provides good keyboard control. It is currently based on 
diff --git a/x11-wm/i3/Manifest b/x11-wm/i3/Manifest
index 4425d538817f..8d2e17075467 100644
--- a/x11-wm/i3/Manifest
+++ b/x11-wm/i3/Manifest
@@ -1,3 +1,3 @@
-DIST i3-4.10.3.tar.bz2 941295 SHA256 9290857bd5a4d1a792544d763bedd53104a683f3e721b5631811827a388107d3 SHA512 914456663158d04868fc15820e3ca3c12663f6af120d2e249b0e2930214808cf19d719acbef9aed2931a322973e92e0da85a2e1d72a135e5894e81f14f2889f1 WHIRLPOOL ddca44ea2a9aeae140df26945860279987690bc7bedcb4395da2c1d52593081934f7cb2d819ff2d575eca855c29078a4155363fe0b116853ce637b86a4700d9e
+DIST i3-4.10.4.tar.bz2 940744 SHA256 dd4fa7a5c5b8feaf83f196fc181bfd33aff65c11d81c91b3ae9d9d3d2540655e SHA512 e777d1ca8ebeada185dfe11443a8b731cb72b6f836a0848e24291ea5d70e4b6d6c414acd58c156be97bd90d07ba4019a713cdb406a24fda33afeae08ceb6ed18 WHIRLPOOL 5bfaeb74d8f1c3dc10719bcac56087d7716e0a7a6c251495db256af1d1342eea3baae4b5c4f6c8131efa89393016c0dd0a56b17ff1f7bd757185dbf4747e7441
 DIST i3-4.8.tar.bz2 939690 SHA256 502c34290f239780bb40352191f0500e8f35d2446eddb573c67c27873d6a1b6b SHA512 fd6f92da857246119f1ae710b6c5168128fa2da5eae8308550b1b9c75879f060cac8246897333f3d67e18de36828a11dd12b4ccee9bd6cd6ad32e2b44c50b43e WHIRLPOOL 6c6288cb66ffdbf225df0dfcdc4f540cd36d7c8333a9f9d9c363cb6580d6a7c1ca0deb227a8f46ac907f2afc6e4e46efc448a51f0764a167bb9639956beae4ef
 DIST i3-4.9.1.tar.bz2 939630 SHA256 b70deff027c7d05276c9646e53faeeeccdde706370b9b337a633bed85b16dc43 SHA512 7a8f71dd944faae426a2239b8bf12ea1cfc83a95c49fcb64ded8321ef302f3277af7d2ecd84d99cef47aba73e5a1091f94e37e9ed2af78c4722ffee507477c90 WHIRLPOOL 15cd2722beaeef642815edd44ff189ff0d003fefbff71c067b94a65dadb55cd15dd1a142a37499fa55cc80424dbdc74cb979c8998d740addcc492eaf025e467f
diff --git a/x11-wm/i3/i3-4.10.3.ebuild b/x11-wm/i3/i3-4.10.4.ebuild
index 17b045c57b66..17b045c57b66 100644
--- a/x11-wm/i3/i3-4.10.3.ebuild
+++ b/x11-wm/i3/i3-4.10.4.ebuild
diff --git a/x11-wm/muffin/muffin-2.6.1.ebuild b/x11-wm/muffin/muffin-2.6.1.ebuild
index 9caa380f2154..f3d4b131b00b 100644
--- a/x11-wm/muffin/muffin-2.6.1.ebuild
+++ b/x11-wm/muffin/muffin-2.6.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/linuxmint/muffin/archive/${PV}.tar.gz -> ${P}.tar.gz
 LICENSE="GPL-2+"
 SLOT="0"
 IUSE="+introspection test xinerama"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 COMMON_DEPEND="
 	>=x11-libs/pango-1.2[X,introspection?]
diff --git a/x11-wm/mutter/mutter-3.16.3.ebuild b/x11-wm/mutter/mutter-3.16.3.ebuild
index c464ffd720f5..3a4a7f7dea6e 100644
--- a/x11-wm/mutter/mutter-3.16.3.ebuild
+++ b/x11-wm/mutter/mutter-3.16.3.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://git.gnome.org/browse/mutter/"
 LICENSE="GPL-2+"
 SLOT="0"
 IUSE="+introspection +kms test wayland"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 
 # libXi-1.7.4 or newer needed per:
 # https://bugzilla.gnome.org/show_bug.cgi?id=738944
diff --git a/x11-wm/spectrwm/spectrwm-2.7.2.ebuild b/x11-wm/spectrwm/spectrwm-2.7.2.ebuild
index 818af1484215..d487508bf85d 100644
--- a/x11-wm/spectrwm/spectrwm-2.7.2.ebuild
+++ b/x11-wm/spectrwm/spectrwm-2.7.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://opensource.conformal.com/snapshots/${PN}/${P}.tgz"
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="x11-misc/dmenu"
diff --git a/xfce-extra/xfce4-mailwatch-plugin/xfce4-mailwatch-plugin-1.2.0.ebuild b/xfce-extra/xfce4-mailwatch-plugin/xfce4-mailwatch-plugin-1.2.0.ebuild
index 9014ad2c3b21..636c0a77370b 100644
--- a/xfce-extra/xfce4-mailwatch-plugin/xfce4-mailwatch-plugin-1.2.0.ebuild
+++ b/xfce-extra/xfce4-mailwatch-plugin/xfce4-mailwatch-plugin-1.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -14,16 +14,16 @@ SLOT="0"
 KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux"
 IUSE="debug ipv6 ssl"
 
-RDEPEND=">=dev-libs/glib-2
-	>=x11-libs/gtk+-2.18:2
-	x11-libs/libX11
+RDEPEND=">=dev-libs/glib-2:=
+	>=x11-libs/gtk+-2.18:2=
+	x11-libs/libX11:=
 	>=xfce-base/exo-0.7.2
-	>=xfce-base/libxfce4ui-4.10
-	>=xfce-base/libxfce4util-4.10
+	>=xfce-base/libxfce4ui-4.10:=
+	>=xfce-base/libxfce4util-4.10:=
 	>=xfce-base/xfce4-panel-4.10
 	ssl? (
-		dev-libs/libgcrypt:0
-		>=net-libs/gnutls-2
+		dev-libs/libgcrypt:0=
+		>=net-libs/gnutls-2:=
 		)"
 DEPEND="${RDEPEND}
 	dev-util/intltool